From 6519f501d3314bbfdb4bd89a1ec0cb3591bdd6e1 Mon Sep 17 00:00:00 2001
From: dragonwocky <thedragonring.bod@gmail.com>
Date: Fri, 3 Feb 2023 21:10:50 +1100
Subject: [PATCH] fix: move nord/neutral to themes folder, reword sponsor
 perks, dont trigger reload btn when agreeing to privacy policy

---
 src/core/menu/islands/Banner.mjs                 |  13 +++++++------
 src/core/menu/islands/Onboarding.mjs             |   1 +
 src/{extensions => themes}/neutral/app.css       |   0
 src/{extensions => themes}/neutral/mod.json      |   0
 src/{extensions => themes}/neutral/neutral.png   | Bin
 src/{extensions => themes}/neutral/variables.css |   0
 src/{extensions => themes}/nord/mod.json         |   0
 src/{extensions => themes}/nord/nord.png         | Bin
 src/{extensions => themes}/nord/variables.css    |   0
 9 files changed, 8 insertions(+), 6 deletions(-)
 rename src/{extensions => themes}/neutral/app.css (100%)
 rename src/{extensions => themes}/neutral/mod.json (100%)
 rename src/{extensions => themes}/neutral/neutral.png (100%)
 rename src/{extensions => themes}/neutral/variables.css (100%)
 rename src/{extensions => themes}/nord/mod.json (100%)
 rename src/{extensions => themes}/nord/nord.png (100%)
 rename src/{extensions => themes}/nord/variables.css (100%)

diff --git a/src/core/menu/islands/Banner.mjs b/src/core/menu/islands/Banner.mjs
index 2ac201c..b9ed77a 100644
--- a/src/core/menu/islands/Banner.mjs
+++ b/src/core/menu/islands/Banner.mjs
@@ -10,7 +10,8 @@ import { Description } from "../components/Description.mjs";
 import { useState } from "../state.mjs";
 
 const updateGuide =
-  "https://notion-enhancer.github.io/getting-started/updating/";
+    "https://notion-enhancer.github.io/getting-started/updating/",
+  tsAndCs = "https://notion-enhancer.github.io/about/terms-and-conditions/";
 
 const rectToStyle = (rect) =>
   ["width", "height", "top", "bottom", "left", "right"]
@@ -168,11 +169,11 @@ function Banner({ updateAvailable, isDevelopmentBuild }) {
       <!-- Disclaimer: these perks are only a draft, for anyone reading this.
       This information may change at any time. -->
       <${Description} class="mt-[6px]">
-        Sponsors receive access to priority support channels, private developer
-        previews, and role cosmetics on Discord. A one-time donation is
-        equivalent to 1 month of sponsorship perks. To claim your Discord role,
-        join the server <a href="https://discord.gg/sFWPXtA">here</a> and follow
-        the instructions in the <b>#welcome</b> channel.
+        Sponsors help make open-source development sustainable and receive
+        access to priority support channels, private developer previews, and
+        role cosmetics on Discord. A one-time donation is equivalent to 1 month
+        of sponsor perks. To learn more about perks, read the
+        <a href=${tsAndCs} class="ml-[3px]">Terms & Conditions</a>.
       <//>
     </div>`;
   initDatabase()
diff --git a/src/core/menu/islands/Onboarding.mjs b/src/core/menu/islands/Onboarding.mjs
index 4e59783..5ce153c 100644
--- a/src/core/menu/islands/Onboarding.mjs
+++ b/src/core/menu/islands/Onboarding.mjs
@@ -36,6 +36,7 @@ function Onboarding() {
       <div class="flex items-center my-[14px] gap-[8px]">
         <${Checkbox}
           _set=${(checked) => ($submitAgreement.disabled = !checked)}
+          _requireReload=${false}
         />
         <p class="typography text-[14px] mr-[16px]">
           I have read and agree to the
diff --git a/src/extensions/neutral/app.css b/src/themes/neutral/app.css
similarity index 100%
rename from src/extensions/neutral/app.css
rename to src/themes/neutral/app.css
diff --git a/src/extensions/neutral/mod.json b/src/themes/neutral/mod.json
similarity index 100%
rename from src/extensions/neutral/mod.json
rename to src/themes/neutral/mod.json
diff --git a/src/extensions/neutral/neutral.png b/src/themes/neutral/neutral.png
similarity index 100%
rename from src/extensions/neutral/neutral.png
rename to src/themes/neutral/neutral.png
diff --git a/src/extensions/neutral/variables.css b/src/themes/neutral/variables.css
similarity index 100%
rename from src/extensions/neutral/variables.css
rename to src/themes/neutral/variables.css
diff --git a/src/extensions/nord/mod.json b/src/themes/nord/mod.json
similarity index 100%
rename from src/extensions/nord/mod.json
rename to src/themes/nord/mod.json
diff --git a/src/extensions/nord/nord.png b/src/themes/nord/nord.png
similarity index 100%
rename from src/extensions/nord/nord.png
rename to src/themes/nord/nord.png
diff --git a/src/extensions/nord/variables.css b/src/themes/nord/variables.css
similarity index 100%
rename from src/extensions/nord/variables.css
rename to src/themes/nord/variables.css