fix theme loading

BanxiaServer · May 20, 2023 · 662fad6 · 662fad6
1 parent 544d0a1
commit 662fad6
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 17 deletions.
diff --git a/src-tauri/src/main.rs b/src-tauri/src/main.rs
@@ -157,7 +157,7 @@ fn main() -> Result<(), ArgsError> {
     println!("You running as a non-elevated user. Some stuff will almost definitely not work.");
     println!("===============================================================================");
 
-    reopen_as_admin();
+    //reopen_as_admin();
   }
 
   // Setup datadir/cultivation just in case something went funky and it wasn't made

diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json
@@ -12,12 +12,12 @@
   "tauri": {
     "allowlist": {
       "fs": {
-        "scope": ["$DATA", "$DATA/cultivation", "$DATA/cultivation/*"]
+        "scope": ["$DATA", "$DATA/cultivation", "$DATA/cultivation/**"]
       },
       "protocol": {
         "all": true,
         "asset": true,
-        "assetScope": ["$DATA", "$DATA/cultivation", "$DATA/cultivation/*"]
+        "assetScope": ["$DATA", "$DATA/cultivation", "$DATA/cultivation/**"]
       },
       "all": true
     },
@@ -53,7 +53,7 @@
       }
     },
     "security": {
-      "csp": "default-src 'self' https://asset.localhost; img-src 'self'; img-src https://* asset: https://asset.localhost"
+      "csp": "default-src 'self'; img-src 'self'; img-src https://* asset: https://asset.localhost; media-src https://* asset: https://asset.localhost"
     },
     "updater": {
       "active": false,

diff --git a/src/utils/themes.ts b/src/utils/themes.ts
@@ -88,26 +88,32 @@ export async function loadTheme(theme: ThemeList, document: Document) {
   const cssIncludes = theme.includes.css
   const jsIncludes = theme.includes.js
 
+  console.log(theme.includes)
+
   // Load CSS files
-  cssIncludes.forEach((css) => {
-    if (!css) return
+  if (cssIncludes) {
+    cssIncludes?.forEach((css) => {
+      if (!css) return
 
-    const link = document.createElement('link')
+      const link = document.createElement('link')
 
-    link.rel = 'stylesheet'
-    link.href = convertFileSrc(theme.path + '/' + css)
-    head.appendChild(link)
-  })
+      link.rel = 'stylesheet'
+      link.href = convertFileSrc(theme.path + '/' + css)
+      head.appendChild(link)
+    })
+  }
 
   // Load JS files
-  jsIncludes.forEach((js) => {
-    if (!js) return
+  if (jsIncludes) {
+    jsIncludes.forEach((js) => {
+      if (!js) return
 
-    const script = document.createElement('script')
+      const script = document.createElement('script')
 
-    script.src = convertFileSrc(theme.path + '/' + js)
-    head.appendChild(script)
-  })
+      script.src = convertFileSrc(theme.path + '/' + js)
+      head.appendChild(script)
+    })
+  }
 
   // Set custom background
   if (theme.customBackgroundURL) {