Merge pull request #21 from OmegaRogue/pull-request-no-injection

1.5.4

index.html

@@ -21,9 +21,20 @@
     }
 
     function toggleExportConfig() {
+        (async () => {
+            let config = await window.api.localAppConfig();
+            let code = document.getElementById("export-text");
+            let text = JSON.stringify(config, null, 4);
+            let txt = document.createTextNode(text);
+            code.appendChild(txt);
+        })();
         document.querySelector('.config-export').classList.toggle('hidden2');
     }
 
+    function copyText() {
+        navigator.clipboard.writeText(text);
+    }
+
 </script>
 <div class="content">
     <div class="button-controls">
@@ -112,17 +123,6 @@ <h3>Put this in your <code>config.json</code> file to include it installation-wi
             <pre><code id="export-text"></code></pre>
             <button onclick="copyText()">Copy</button>
             <button onclick="toggleExportConfig()">Close</button>
-            <script>
-                const config = await window.api.localAppConfig();
-                code = document.getElementById("export-text");
-                const text = JSON.stringify(config, null, 4);
-                txt = document.createTextNode(text);
-                code.appendChild(txt);
-
-                function copyText() {
-                    navigator.clipboard.writeText(text);
-                }
-            </script>
         </div>
     </section>
 

src/main.ts

@@ -13,6 +13,7 @@ getAppConfig();
 
 /* Remove the comment (//) from the line below to ignore certificate errors (useful for self-signed certificates) */
 
+getAppConfig();
 //app.commandLine.appendSwitch("ignore-certificate-errors");
 
 function getUserData(): UserData {

src/renderer.ts

@@ -37,6 +37,7 @@ document.querySelector("#add-game").addEventListener("click", async () => {
     if (!gameUrl || !gameName) return alert("Please enter a game name and url");
     const newGameItem = {name: gameName, url: gameUrl, id: Math.round(Math.random() * 1000000)} as GameConfig;
     await updateGameList((appConfig) => {
+        appConfig.games = appConfig?.games ?? [];
         appConfig.games.push(newGameItem);
     });
     gameUrlField.value = "";