From 1d07c3a0a96aa6de21d91619d9438826c711672f Mon Sep 17 00:00:00 2001
From: purple <hello@prpl.wtf>
Date: Wed, 2 Aug 2023 13:46:05 +0200
Subject: [PATCH] Dashboard css is now copied to resources/scripts/css

---
 blueprint.sh                               | 11 +++++------
 resources/scripts/{ => css}/extensions.css |  0
 resources/scripts/index.tsx                |  2 +-
 3 files changed, 6 insertions(+), 7 deletions(-)
 rename resources/scripts/{ => css}/extensions.css (100%)

diff --git a/blueprint.sh b/blueprint.sh
index 1d77431..916b56d 100644
--- a/blueprint.sh
+++ b/blueprint.sh
@@ -412,9 +412,9 @@ if [[ ( $2 == "-i" ) || ( $2 == "-install" ) ]]; then
   fi;
   if [[ $dashboard_css != "" ]]; then
     YARN="y";
-    sed -i "s~@import url(/assets/extensions/$identifier/dashboard.style.css);~~g" resources/scripts/extensions.css;
-    sed -i "s~/\* client.css \*/~/\* client.css \*/\n@import url(/assets/extensions/$identifier/dashboard.style.css);~g" resources/scripts/extensions.css;
-    cp .blueprint/tmp/$n/$dashboard_css public/assets/extensions/$identifier/dashboard.style.css;
+    sed -i "s~@import url(/css/$identifier.css);~~g" resources/scripts/css/extensions.css;
+    sed -i "s~/\* client.css \*/~/\* client.css \*/\n@import url(/css/$identifier.css);~g" resources/scripts/css/extensions.css;
+    cp .blueprint/tmp/$n/$dashboard_css resources/scripts/css/$identifier.css;
   fi;
 
   if [[ $name == *"~"* ]]; then log_yellow "[WARNING] 'name' contains '~' and may result in an error.";fi;
@@ -534,7 +534,7 @@ if [[ ( $2 == "-i" ) || ( $2 == "-install" ) ]]; then
   fi;
 
   chown -R www-data:www-data $FOLDER/data/extensions/$identifier;
-  chmod -R +x .blueprint/data/extensions/$identifier/*;
+  chmod -R +x .blueprint/data/extensions/*;
 
   if [[ ( $flags == *"hasInstallScript,"* ) || ( $flags == *"hasInstallScript" ) ]]; then
     log_yellow "[WARNING] This extension uses a custom installation script, proceed with caution.";
@@ -648,8 +648,7 @@ if [[ ( $2 == "-r" ) || ( $2 == "-remove" ) ]]; then
   # Remove dashboard css
   if [[ $dashboard_css != "" ]]; then
     log_bright "[INFO] Removing dashboard css..";
-    sed -i "s~@import url(/assets/extensions/$identifier/dashboard.style.css);~~g" resources/scripts/extensions.css;
-    sed -i "s~@import url(/assets/extensions/$identifier/client.style.css);~~g" resources/scripts/extensions.css; #this removes changes made in older versions of blueprint
+    sed -i "s~@import url(/css/$identifier.css);~~g" resources/scripts/css/extensions.css;
     YARN="y";
   fi;
 
diff --git a/resources/scripts/extensions.css b/resources/scripts/css/extensions.css
similarity index 100%
rename from resources/scripts/extensions.css
rename to resources/scripts/css/extensions.css
diff --git a/resources/scripts/index.tsx b/resources/scripts/index.tsx
index 0095139..401a0c3 100644
--- a/resources/scripts/index.tsx
+++ b/resources/scripts/index.tsx
@@ -2,7 +2,7 @@ import React from 'react';
 import ReactDOM from 'react-dom';
 import App from '@/components/App';
 import { setConfig } from 'react-hot-loader';
-import './extensions.css';
+import './css/extensions.css';
 
 // Enable language support.
 import './i18n';