frontend: resolve CSP issues and fix settings saving problem

open-goal · Jul 22, 2023 · cb81c40 · cb81c40
1 parent a181890
commit cb81c40
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 11 deletions.
diff --git a/src-tauri/src/config.rs b/src-tauri/src/config.rs
@@ -542,7 +542,7 @@ impl LauncherConfig {
     if let Some(features) = &mut game_config.features {
       features
         .texture_packs
-        .retain(|pack| cleanup_list.contains(pack));
+        .retain(|pack| !cleanup_list.contains(pack));
       self.save_config()?;
     }
     Ok(())

diff --git a/src-tauri/src/main.rs b/src-tauri/src/main.rs
@@ -123,7 +123,7 @@ fn main() {
       //
       // This allows us to avoid hacky globals, and pass around information (in this case, the config)
       // to the relevant places
-      let mut config = tokio::sync::Mutex::new(config::LauncherConfig::load_config(
+      let config = tokio::sync::Mutex::new(config::LauncherConfig::load_config(
         app.path_resolver().app_config_dir(),
       ));
       app.manage(config);

diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json
@@ -69,9 +69,6 @@
         "visible": true,
         "focus": true
       }
-    ],
-    "security": {
-      "csp": "default-src 'self'; img-src 'self' asset: https://asset.localhost"
-    }
+    ]
   }
 }
diff --git a/src/components/games/features/texture-packs/TexturePacks.svelte b/src/components/games/features/texture-packs/TexturePacks.svelte
@@ -296,11 +296,15 @@
               {/if}
               <!-- Buttons -->
               <div class="mt-2 flex flex-row gap-2">
-                <Toggle
-                  bind:checked={pack.enabled}
-                  class="m-0"
-                  color="orange"
-                />
+                <Button
+                  size={"xs"}
+                  color={pack.enabled ? "green" : "red"}
+                  on:click={() => {
+                    pack.enabled = !pack.enabled;
+                  }}
+                >
+                  {pack.enabled ? "Enabled" : "Disabled"}
+                </Button>
               </div>
               <div class="mt-2 flex flex-row gap-2">
                 {#if pack.enabled}