From 73077c7565859f7f6a1c9b55ca7dc623c305b1dc Mon Sep 17 00:00:00 2001
From: wearrrrr <contact@wearr.dev>
Date: Tue, 30 Jul 2024 04:01:36 -0500
Subject: [PATCH] Migrate window.loadedContentStorage and
 window.currentlySelectedTab to Alu namespace vars.

---
 src/alu.d.ts                    |  7 +++++++
 src/layouts/Layout.astro        | 12 +++---------
 src/pages/[lang]/settings.astro | 15 ++++++++-------
 3 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/src/alu.d.ts b/src/alu.d.ts
index 27159d9..5e017aa 100644
--- a/src/alu.d.ts
+++ b/src/alu.d.ts
@@ -1,6 +1,13 @@
 export declare global {
   namespace Alu {
     let store: AluStore;
+    // Settings Content Store (orig. window.loadedContentStorage)
+    let settings: {
+      contentStore: {
+        [key: string]: string;
+      }
+      currentPage: string;
+    }
 
     type DefaultKeys = {
       [key: string]: AluKey;
diff --git a/src/layouts/Layout.astro b/src/layouts/Layout.astro
index e1b729c..b3fad00 100644
--- a/src/layouts/Layout.astro
+++ b/src/layouts/Layout.astro
@@ -158,21 +158,15 @@ const { title, optionalPreloads } = Astro.props;
         pointer-events: all;
       }
 
-      body,
-      html {
-        margin: 0;
-        padding: 0;
-        height: 100%;
-        font-family: "Varela Round", sans-serif;
-      }
-
       body {
         background-color: var(--background-color);
         max-width: 100vw;
-        margin: 0;
         display: flex;
         flex-direction: column;
         min-height: 100vh;
+        margin: 0;
+        padding: 0;
+        font-family: "Varela Round", sans-serif;
       }
       body > * {
         opacity: 1;
diff --git a/src/pages/[lang]/settings.astro b/src/pages/[lang]/settings.astro
index 463e9b0..d393f16 100644
--- a/src/pages/[lang]/settings.astro
+++ b/src/pages/[lang]/settings.astro
@@ -56,16 +56,16 @@ export function getStaticPaths() {
     </div>
   </main>
   <script is:inline>
-    window.loadedContentStorage = {};
-    window.currentlySelectedTab;
+    Alu.settings.contentStore = {};
+    Alu.settings.currentPage;
     function settingsLoad() {
       document.addEventListener("astro:before-swap", () => {
-        window.currentlySelectedTab = "";
+        Alu.settings.currentPage = "";
       });
       Array.from(document.getElementsByClassName("setting-tab")).forEach((tab) => {
         const contentToLoad = document.getElementById("content-" + tab.id);
         if (contentToLoad) {
-          window.loadedContentStorage[tab.id] = contentToLoad.innerHTML;
+          Alu.settings.contentStore[tab.id] = contentToLoad.innerHTML;
           contentToLoad.remove();
         }
 
@@ -75,13 +75,14 @@ export function getStaticPaths() {
       });
     }
     function loadContent(tabID) {
-      if (window.currentlySelectedTab == tabID) return;
-      else window.currentlySelectedTab = tabID;
+      let curTabID = Alu.settings.currentPage
+      if (curTabID == tabID) return;
+      else curTabID = tabID;
       const currentContent = document.getElementById("current-content");
       if (currentContent) {
         currentContent.style.opacity = "0";
         setTimeout(() => {
-          currentContent.innerHTML = window.loadedContentStorage[tabID];
+          currentContent.innerHTML = Alu.settings.contentStore[tabID];
           currentContent.style.opacity = "1";
           document.dispatchEvent(new CustomEvent("setting-tabLoad", { detail: tabID }));
         }, 250);