From 3cd8fb25647f24645fc77dcb57216a5eaac0384c Mon Sep 17 00:00:00 2001
From: core <core@coredoes.dev>
Date: Mon, 20 Feb 2023 12:01:32 -0500
Subject: [PATCH] refactor

---
 tfweb/package.json                            |  1 +
 tfweb/src/components/Header.svelte            | 18 ++++++++---------
 tfweb/src/components/Theme.svelte             |  4 ++--
 tfweb/src/{scripts => lib}/PersistentStore.ts |  0
 tfweb/src/{scripts => lib}/i18n.ts            | 10 +++++-----
 tfweb/src/{ => lib}/i18n/en.json              |  0
 tfweb/src/{ => lib}/i18n/jp.json              |  0
 tfweb/src/{ => lib}/i18n/nl.json              |  0
 tfweb/src/{scripts => lib}/logger.ts          |  2 +-
 tfweb/src/lib/stores/LocaleStore.ts           |  3 +++
 tfweb/src/lib/stores/ThemeStore.ts            |  3 +++
 tfweb/src/routes/+layout.ts                   |  1 +
 tfweb/src/routes/auth/login/+page.svelte      | 20 ++++++++++++++++---
 tfweb/src/stores/LocaleStore.ts               |  3 ---
 tfweb/src/stores/ThemeStore.ts                |  3 ---
 tfweb/svelte.config.js                        | 10 ++++++++--
 tfweb/yarn.lock                               |  5 +++++
 17 files changed, 54 insertions(+), 29 deletions(-)
 rename tfweb/src/{scripts => lib}/PersistentStore.ts (100%)
 rename tfweb/src/{scripts => lib}/i18n.ts (84%)
 rename tfweb/src/{ => lib}/i18n/en.json (100%)
 rename tfweb/src/{ => lib}/i18n/jp.json (100%)
 rename tfweb/src/{ => lib}/i18n/nl.json (100%)
 rename tfweb/src/{scripts => lib}/logger.ts (98%)
 create mode 100644 tfweb/src/lib/stores/LocaleStore.ts
 create mode 100644 tfweb/src/lib/stores/ThemeStore.ts
 create mode 100644 tfweb/src/routes/+layout.ts
 delete mode 100644 tfweb/src/stores/LocaleStore.ts
 delete mode 100644 tfweb/src/stores/ThemeStore.ts

diff --git a/tfweb/package.json b/tfweb/package.json
index b9af103..657b12b 100644
--- a/tfweb/package.json
+++ b/tfweb/package.json
@@ -29,6 +29,7 @@
 	},
 	"type": "module",
 	"dependencies": {
+		"@sveltejs/adapter-static": "^2.0.1",
 		"a17t": "^0.10.1"
 	}
 }
diff --git a/tfweb/src/components/Header.svelte b/tfweb/src/components/Header.svelte
index 2d35b82..78e9df7 100644
--- a/tfweb/src/components/Header.svelte
+++ b/tfweb/src/components/Header.svelte
@@ -1,10 +1,8 @@
 <script lang="ts">
-    import {t} from "../scripts/i18n";
-    import {theme} from "../stores/ThemeStore.js";
-    import {get} from "svelte/store";
-    import {onMount} from "svelte";
-    import {getCurrentLocale, locales} from "../scripts/i18n.js";
-    import {locale} from "../stores/LocaleStore";
+    import {t} from "$lib/i18n";
+    import {theme} from "$lib/stores/ThemeStore.js";
+    import {getCurrentLocale, locales} from "$lib/i18n.js";
+    import {locale} from "$lib/stores/LocaleStore";
 
     function toggleTheme() {
         if ($theme === "dark") {
@@ -47,19 +45,19 @@
                 </div>
 
                 <div class:hidden={!dropdownOpen}
-                     class="transition absolute right-0 z-10 mt-2 w-56 origin-top-right rounded-md bg-slate-100 dark:bg-slate-700 shadow-lg ring-1 ring-black ring-opacity-5 focus:outline-none"
+                     class="transition absolute right-0 z-10 w-min mt-2 origin-top-right rounded-md bg-slate-100 dark:bg-slate-700 shadow-lg ring-1 ring-black ring-opacity-5 focus:outline-none"
                      role="menu" aria-orientation="vertical" aria-labelledby="menu-button" tabindex="-1" on:mouseleave={closeIfOpen}>
                     <div class="p-2" role="none">
 
-                        <div class="rounded p-2 bg-slate-200 dark:bg-slate-600" role="menuitem" tabindex="-1">
+                        <div class="whitespace-nowrap rounded p-2 bg-slate-200 dark:bg-slate-600" role="menuitem" tabindex="-1">
                             <div>
                                 <span class="mr-3 fi fi-{t('common.flag')}"></span>
-                                <span class="mt-0.2">{t("common.localeName")} - {t("common.selected")}</span>
+                                <span class="mt-0.2 mr-0.5">{t("common.localeName")} <span class="text-slate-400">- {t("common.selected")}</span></span>
                             </div>
                         </div>
 
                         {#each Object.keys(locales) as locale, i}
-                            {#if getCurrentLocale() != locale}
+                            {#if getCurrentLocale() !== locale}
                                 <div class="rounded p-2 mt-2 hover:bg-slate-300 hover:dark:bg-slate-800 transition"
                                      role="menuitem" tabindex="-1" on:click={() => {setLocale(locale)}}>
                                     <div>
diff --git a/tfweb/src/components/Theme.svelte b/tfweb/src/components/Theme.svelte
index 429466f..9fda3c8 100644
--- a/tfweb/src/components/Theme.svelte
+++ b/tfweb/src/components/Theme.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
     import {onMount} from "svelte";
-    import {Logger, logSetup} from "../scripts/logger";
-    import {theme} from "../stores/ThemeStore";
+    import {Logger, logSetup} from "$lib/logger";
+    import {theme} from "$lib/stores/ThemeStore";
     import {get} from "svelte/store";
 
     onMount(() => {
diff --git a/tfweb/src/scripts/PersistentStore.ts b/tfweb/src/lib/PersistentStore.ts
similarity index 100%
rename from tfweb/src/scripts/PersistentStore.ts
rename to tfweb/src/lib/PersistentStore.ts
diff --git a/tfweb/src/scripts/i18n.ts b/tfweb/src/lib/i18n.ts
similarity index 84%
rename from tfweb/src/scripts/i18n.ts
rename to tfweb/src/lib/i18n.ts
index c0a82d7..c28cac7 100644
--- a/tfweb/src/scripts/i18n.ts
+++ b/tfweb/src/lib/i18n.ts
@@ -1,10 +1,10 @@
-import {locale} from "../stores/LocaleStore";
+import {locale} from "$lib/stores/LocaleStore";
 import {get} from "svelte/store";
 
-import en from "../i18n/en.json";
-import jp from "../i18n/jp.json";
-import nl from "../i18n/nl.json";
-import {Logger, logSetup} from "./logger";
+import en from "$lib/i18n/en.json";
+import jp from "$lib/i18n/jp.json";
+import nl from "$lib/i18n/nl.json";
+import {Logger, logSetup} from "$lib/logger";
 
 logSetup();
 const logger = new Logger("i18n");
diff --git a/tfweb/src/i18n/en.json b/tfweb/src/lib/i18n/en.json
similarity index 100%
rename from tfweb/src/i18n/en.json
rename to tfweb/src/lib/i18n/en.json
diff --git a/tfweb/src/i18n/jp.json b/tfweb/src/lib/i18n/jp.json
similarity index 100%
rename from tfweb/src/i18n/jp.json
rename to tfweb/src/lib/i18n/jp.json
diff --git a/tfweb/src/i18n/nl.json b/tfweb/src/lib/i18n/nl.json
similarity index 100%
rename from tfweb/src/i18n/nl.json
rename to tfweb/src/lib/i18n/nl.json
diff --git a/tfweb/src/scripts/logger.ts b/tfweb/src/lib/logger.ts
similarity index 98%
rename from tfweb/src/scripts/logger.ts
rename to tfweb/src/lib/logger.ts
index 97c6361..a4d9a87 100644
--- a/tfweb/src/scripts/logger.ts
+++ b/tfweb/src/lib/logger.ts
@@ -90,7 +90,7 @@ export function consoleLogDump() {
 }
 
 export class Logger {
-    private name: string;
+    private readonly name: string;
 
     constructor(name: string) {
         this.name = name;
diff --git a/tfweb/src/lib/stores/LocaleStore.ts b/tfweb/src/lib/stores/LocaleStore.ts
new file mode 100644
index 0000000..9384e37
--- /dev/null
+++ b/tfweb/src/lib/stores/LocaleStore.ts
@@ -0,0 +1,3 @@
+import { persist } from "$lib/PersistentStore";
+
+export const locale = persist("lang", "en");
\ No newline at end of file
diff --git a/tfweb/src/lib/stores/ThemeStore.ts b/tfweb/src/lib/stores/ThemeStore.ts
new file mode 100644
index 0000000..ffe7975
--- /dev/null
+++ b/tfweb/src/lib/stores/ThemeStore.ts
@@ -0,0 +1,3 @@
+import { persist } from "$lib/PersistentStore";
+
+export const theme = persist("theme", "light");
\ No newline at end of file
diff --git a/tfweb/src/routes/+layout.ts b/tfweb/src/routes/+layout.ts
new file mode 100644
index 0000000..c8cacf0
--- /dev/null
+++ b/tfweb/src/routes/+layout.ts
@@ -0,0 +1 @@
+export const prerender = true;
\ No newline at end of file
diff --git a/tfweb/src/routes/auth/login/+page.svelte b/tfweb/src/routes/auth/login/+page.svelte
index c90b2b3..ecc2ccf 100644
--- a/tfweb/src/routes/auth/login/+page.svelte
+++ b/tfweb/src/routes/auth/login/+page.svelte
@@ -1,3 +1,17 @@
-<script>
-    import Header from "../../../components/Header.svelte";
-</script>
\ No newline at end of file
+<script lang="ts">
+    import {t} from "$lib/i18n";
+
+    let email = "";
+    function generateMagicLink() {
+
+    }
+</script>
+
+<h1>{t('login.title')}</h1>
+<h2>{t('login.subtitle')}</h2>
+
+<form on:submit|preventDefault={generateMagicLink}>
+    <label for="email">{t('login.prompt')}</label>
+    <input type="text" id="email" bind:value={email} />
+    <button>{t('login.actionButtonText')}</button>
+</form>
diff --git a/tfweb/src/stores/LocaleStore.ts b/tfweb/src/stores/LocaleStore.ts
deleted file mode 100644
index c071378..0000000
--- a/tfweb/src/stores/LocaleStore.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import { persist } from "../scripts/PersistentStore";
-
-export const locale = persist("lang", "en");
\ No newline at end of file
diff --git a/tfweb/src/stores/ThemeStore.ts b/tfweb/src/stores/ThemeStore.ts
deleted file mode 100644
index 1bdb296..0000000
--- a/tfweb/src/stores/ThemeStore.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import { persist } from "../scripts/PersistentStore";
-
-export const theme = persist("theme", "light");
\ No newline at end of file
diff --git a/tfweb/svelte.config.js b/tfweb/svelte.config.js
index 87f198f..2cde54d 100644
--- a/tfweb/svelte.config.js
+++ b/tfweb/svelte.config.js
@@ -1,4 +1,4 @@
-import adapter from '@sveltejs/adapter-auto';
+import adapter from '@sveltejs/adapter-static';
 import { vitePreprocess } from '@sveltejs/kit/vite';
 
 /** @type {import('@sveltejs/kit').Config} */
@@ -8,7 +8,13 @@ const config = {
 	preprocess: vitePreprocess(),
 
 	kit: {
-		adapter: adapter()
+		adapter: adapter({
+			pages: 'build',
+			assets: 'build',
+			fallback: null,
+			precompress: false,
+			strict: true
+		})
 	}
 };
 
diff --git a/tfweb/yarn.lock b/tfweb/yarn.lock
index 76dd13f..d0e85ff 100644
--- a/tfweb/yarn.lock
+++ b/tfweb/yarn.lock
@@ -197,6 +197,11 @@
   dependencies:
     import-meta-resolve "^2.2.0"
 
+"@sveltejs/adapter-static@^2.0.1":
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/@sveltejs/adapter-static/-/adapter-static-2.0.1.tgz#b76f7742ae635e1c063efcab8c6de064255f6292"
+  integrity sha512-o5/q3YwD/ErxYCFlK1v3ydvldyNKk1lh3oeyxn4mhz+Pkbx/uuxhzmbOpytTlp5aVqNHDVsb04xadUzOFCDDzw==
+
 "@sveltejs/kit@^1.5.0":
   version "1.7.2"
   resolved "https://registry.yarnpkg.com/@sveltejs/kit/-/kit-1.7.2.tgz#ec90d5f7d18a8c40e5a6d8dfae43acaa00f6b199"