From 561300de64373b883b6c456f552c3dedc3c2d71d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thea=20Sch=C3=B6bl?= <dev@theaninova.de>
Date: Wed, 15 Nov 2023 01:46:23 +0100
Subject: [PATCH] refactor: cleanup

---
 src/env.d.ts                            |  6 ++---
 src/lib/components/layout/Layout.svelte | 34 +++++--------------------
 src/lib/dialogs/ConfirmDialog.svelte    | 17 -------------
 src/lib/dialogs/confirm-dialog.ts       |  1 -
 src/routes/+layout.ts                   |  4 +--
 src/routes/ConnectionPopup.svelte       | 11 +++++++-
 src/routes/Footer.svelte                |  7 +++--
 src/routes/config/layout/+page.svelte   |  4 ---
 src/routes/config/settings/+page.svelte |  9 +++----
 vite.config.ts                          |  9 +++----
 10 files changed, 33 insertions(+), 69 deletions(-)

diff --git a/src/env.d.ts b/src/env.d.ts
index e10a2a24..74e23365 100644
--- a/src/env.d.ts
+++ b/src/env.d.ts
@@ -7,11 +7,11 @@ interface ImportMetaEnv {
   readonly TAURI_ARCH?: string
   readonly TAURI_DEBUG?: boolean
   readonly TAURI_PLATFORM_TYPE?: string
+
+  readonly VITE_HOMEPAGE_URL: string
+  readonly VITE_BUGS_URL: string
 }
 
 interface ImportMeta {
   readonly env: ImportMetaEnv
 }
-
-declare const HOMEPAGE_URL: string
-declare const BUGS_URL: string
diff --git a/src/lib/components/layout/Layout.svelte b/src/lib/components/layout/Layout.svelte
index f0d4a49f..577382ab 100644
--- a/src/lib/components/layout/Layout.svelte
+++ b/src/lib/components/layout/Layout.svelte
@@ -1,13 +1,10 @@
 <script lang="ts">
-  import {deviceLayout, serialPort} from "$lib/serial/connection"
+  import {serialPort} from "$lib/serial/connection"
   import {action} from "$lib/title"
   import GenericLayout from "$lib/components/layout/GenericLayout.svelte"
   import {getContext} from "svelte"
   import type {Writable} from "svelte/store"
-  import {csvLayoutToJson, isCsvLayout} from "$lib/backup/compat/legacy-layout"
-  import type {CharaLayoutFile} from "$lib/share/chara-file"
-
-  export let layoutOverride: "ONE" | "LITE" | undefined = undefined
+  import type {VisualLayout} from "$lib/serialization/visual-layout"
 
   $: device = $serialPort?.device ?? "ONE"
   const activeLayer = getContext<Writable<number>>("active-layer")
@@ -19,20 +16,10 @@
   ] as const
 
   const layouts = {
-    ONE: () => import("$lib/assets/layouts/one.yml"),
-    LITE: () => import("$lib/assets/layouts/lite.yml"),
-    X: () => import("$lib/assets/layouts/generic/103-key.yml"),
+    ONE: () => import("$lib/assets/layouts/one.yml").then(it => it.default as VisualLayout),
+    LITE: () => import("$lib/assets/layouts/lite.yml").then(it => it.default as VisualLayout),
+    X: () => import("$lib/assets/layouts/generic/103-key.yml").then(it => it.default as VisualLayout),
   }
-
-  async function importLayout() {
-    const file = await fileInput.files?.item(0)?.text()
-    if (!file) return
-    const importedLayout = isCsvLayout(file) ? csvLayoutToJson(file) : (JSON.parse(file) as CharaLayoutFile)
-    if (importedLayout.type === "layout" && importedLayout.charaVersion === 1)
-      $deviceLayout = importedLayout.layout
-  }
-
-  let fileInput: HTMLInputElement
 </script>
 
 <div class="container">
@@ -49,21 +36,12 @@
     {/each}
   </fieldset>
 
-  {#await layouts[layoutOverride || device]() then { default: visualLayout }}
+  {#await layouts[device]() then visualLayout}
     <GenericLayout {visualLayout} />
   {/await}
 </div>
 
 <style lang="scss">
-  .controls {
-    display: grid;
-    grid-template-columns: 1fr auto 1fr;
-    align-items: center;
-    justify-content: center;
-
-    width: 100%;
-  }
-
   .container {
     display: flex;
     flex-direction: column;
diff --git a/src/lib/dialogs/ConfirmDialog.svelte b/src/lib/dialogs/ConfirmDialog.svelte
index 31967f7e..7e654a54 100644
--- a/src/lib/dialogs/ConfirmDialog.svelte
+++ b/src/lib/dialogs/ConfirmDialog.svelte
@@ -27,26 +27,9 @@
     text-align: center;
   }
 
-  dialog {
-    min-width: 300px;
-    max-width: 512px;
-
-    color: var(--md-sys-color-on-background);
-
-    background: var(--md-sys-color-background);
-    border: none;
-    border-radius: 38px;
-    box-shadow: 0 0 48px rgba(0 0 0 / 60%);
-  }
-
   .buttons {
     display: flex;
     justify-content: flex-end;
     width: 100%;
   }
-
-  dialog::backdrop {
-    opacity: 0.5;
-    background: black;
-  }
 </style>
diff --git a/src/lib/dialogs/confirm-dialog.ts b/src/lib/dialogs/confirm-dialog.ts
index f1f3597e..ae257566 100644
--- a/src/lib/dialogs/confirm-dialog.ts
+++ b/src/lib/dialogs/confirm-dialog.ts
@@ -15,7 +15,6 @@ export async function askForConfirmation(
       abortTitle,
     },
   })
-  dialog.show()
 
   let resolvePromise: (value: boolean) => void
   const resultPromise = new Promise<boolean>(resolve => {
diff --git a/src/routes/+layout.ts b/src/routes/+layout.ts
index 487add9d..73f669d9 100644
--- a/src/routes/+layout.ts
+++ b/src/routes/+layout.ts
@@ -6,9 +6,9 @@ export const prerender = true
 export const trailingSlash = "always"
 
 export const load = (async ({url, data, fetch}) => {
-  const importFile = new URLSearchParams(url.search).get("import")
+  const importFile = browser && new URLSearchParams(url.search).get("import")
   return {
     ...data,
-    importFile: browser && importFile ? await charaFileFromUriComponent(importFile, fetch) : undefined,
+    importFile: importFile ? await charaFileFromUriComponent(importFile, fetch) : undefined,
   }
 }) satisfies LayoutLoad
diff --git a/src/routes/ConnectionPopup.svelte b/src/routes/ConnectionPopup.svelte
index a1d803b7..f1e695d6 100644
--- a/src/routes/ConnectionPopup.svelte
+++ b/src/routes/ConnectionPopup.svelte
@@ -57,7 +57,16 @@
       </div>
     </div>
     {#if powerDialog}
-      <div class="backdrop" transition:fade={{duration: 250}} on:click={() => (powerDialog = !powerDialog)} />
+      <div
+        class="backdrop"
+        role="button"
+        tabindex="-1"
+        transition:fade={{duration: 250}}
+        on:click={() => (powerDialog = !powerDialog)}
+        on:keypress={event => {
+          if (event.key === "Enter") powerDialog = !powerDialog
+        }}
+      />
       <dialog open transition:slide={{duration: 250}}>
         <h3>{$LL.deviceManager.bootMenu.TITLE()}</h3>
         <button
diff --git a/src/routes/Footer.svelte b/src/routes/Footer.svelte
index fcf0e9d2..1e578eca 100644
--- a/src/routes/Footer.svelte
+++ b/src/routes/Footer.svelte
@@ -34,10 +34,13 @@
 <footer>
   <ul>
     <li>
-      <a href={HOMEPAGE_URL} rel="noreferrer" target="_blank"><span class="icon">commit</span> v{version}</a>
+      <!-- svelte-ignore not-defined -->
+      <a href={import.meta.env.VITE_HOMEPAGE_URL} rel="noreferrer" target="_blank"
+        ><span class="icon">commit</span> v{version}</a
+      >
     </li>
     <li>
-      <a href={BUGS_URL} rel="noreferrer" target="_blank"
+      <a href={import.meta.env.VITE_BUGS_URL} rel="noreferrer" target="_blank"
         ><span class="icon">bug_report</span> File an issue</a
       >
     </li>
diff --git a/src/routes/config/layout/+page.svelte b/src/routes/config/layout/+page.svelte
index 2acc8dda..fb534c93 100644
--- a/src/routes/config/layout/+page.svelte
+++ b/src/routes/config/layout/+page.svelte
@@ -65,8 +65,4 @@
     width: 100%;
     height: 100%;
   }
-
-  input[type="file"] {
-    display: none;
-  }
 </style>
diff --git a/src/routes/config/settings/+page.svelte b/src/routes/config/settings/+page.svelte
index 2d09417f..da8a23e2 100644
--- a/src/routes/config/settings/+page.svelte
+++ b/src/routes/config/settings/+page.svelte
@@ -97,7 +97,7 @@
     </fieldset>
 
     <fieldset>
-      <legend><label>Device</label></legend>
+      <legend>Device</legend>
       <label>Boot message<input type="checkbox" use:setting={{id: 93}} /></label>
       <label>Realtime Feedback<input type="checkbox" use:setting={{id: 92}} /></label>
       <label>
@@ -118,7 +118,7 @@
       <fieldset>
         <legend><label><input type="checkbox" />RGB</label></legend>
         <label>Brightness<input type="range" min="0" max="50" step="1" /></label>
-        <label>Color</label>
+        Color
         <label>Reactive Keys<input type="checkbox" /></label>
       </fieldset>
     {/if}
@@ -141,10 +141,6 @@
   legend > label {
     font-size: 24px;
     font-weight: bold;
-
-    > input {
-      font-size: 12px;
-    }
   }
 
   fieldset {
@@ -230,6 +226,7 @@
     }
   }
 
+  // stylelint-disable-next-line
   form label:has(:global(.pending-changes)) {
     color: var(--md-sys-color-tertiary);
   }
diff --git a/vite.config.ts b/vite.config.ts
index ee550f93..50efd1ce 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -13,6 +13,9 @@ const {homepage, bugs} = JSON.parse(
   await readFile(fileURLToPath(new URL("package.json", import.meta.url)), "utf8"),
 )
 
+process.env.VITE_HOMEPAGE_URL = homepage
+process.env.VITE_BUGS_URL = bugs.url
+
 export default defineConfig({
   build: {
     // we rely on the serial api, so just chrome is fine
@@ -21,11 +24,7 @@ export default defineConfig({
       external: isTauri ? [/virtual:pwa.*/] : [],
     },
   },
-  define: {
-    HOMEPAGE_URL: `"${homepage}"`,
-    BUGS_URL: `"${bugs.url}"`,
-  },
-  envPrefix: "TAURI_",
+  envPrefix: ["TAURI_", "VITE_"],
   plugins: [
     ViteYaml(),
     sveltekit(),