From 85b69ea89fbd08c3019f32b57a284337b6555cad Mon Sep 17 00:00:00 2001
From: Matt Strapp <matt@mattstrapp.net>
Date: Fri, 20 Oct 2023 14:08:54 -0500
Subject: uh

Signed-off-by: Matt Strapp <matt@mattstrapp.net>
---
 app/.gitignore                             |  3 +-
 app/src/lib/components/Navigation.svelte   | 70 ++++++++++++++++++++++++++++++
 app/src/lib/components/ReloadPrompt.svelte | 32 ++++++++++++++
 app/src/lib/svelte/Navigation.svelte       | 70 ------------------------------
 app/src/lib/svelte/ReloadPrompt.svelte     | 32 --------------
 app/src/routes/+layout.svelte              |  8 ++--
 app/svelte.config.js                       |  3 --
 7 files changed, 108 insertions(+), 110 deletions(-)
 create mode 100644 app/src/lib/components/Navigation.svelte
 create mode 100644 app/src/lib/components/ReloadPrompt.svelte
 delete mode 100644 app/src/lib/svelte/Navigation.svelte
 delete mode 100644 app/src/lib/svelte/ReloadPrompt.svelte

diff --git a/app/.gitignore b/app/.gitignore
index ef995c0..b8f5758 100644
--- a/app/.gitignore
+++ b/app/.gitignore
@@ -3,9 +3,10 @@ node_modules
 /build
 /.svelte-kit
 /package
-/dev-dist
 .env
 .env.*
 !.env.example
 vite.config.js.timestamp-*
 vite.config.ts.timestamp-*
+
+/dev-dist
\ No newline at end of file
diff --git a/app/src/lib/components/Navigation.svelte b/app/src/lib/components/Navigation.svelte
new file mode 100644
index 0000000..2e5ba98
--- /dev/null
+++ b/app/src/lib/components/Navigation.svelte
@@ -0,0 +1,70 @@
+<script lang="ts">
+  import { page } from '$app/stores'
+
+  import Icon from '@iconify/svelte'
+  import homeIcon from '@iconify/icons-carbon/home'
+  import logoGithub from '@iconify/icons-carbon/logo-github'
+  import menuIcon from '@iconify/icons-carbon/menu'
+  import pageBreak from '@iconify/icons-carbon/page-break'
+
+  import { AppRail, AppRailAnchor, getDrawerStore } from '@skeletonlabs/skeleton'
+
+  const drawerStore = getDrawerStore()
+
+  function drawerClose(): void {
+    drawerStore.close()
+  }
+
+  /**
+   * If the menu prop is true, then the close menu button will be rendered.
+   */
+  export let menu = false
+</script>
+
+<AppRail>
+  <svelte:fragment slot="lead">
+    {#if menu}
+      <AppRailAnchor on:click={drawerClose} title="Close Menu" value={0} href="javascript:;">
+        <svelte:fragment slot="lead">
+          <Icon icon={menuIcon} width="25" />
+        </svelte:fragment>
+        Close Menu
+      </AppRailAnchor>
+    {/if}
+  </svelte:fragment>
+  <AppRailAnchor
+    href="/"
+    selected={$page.url.pathname === '/'}
+    on:click={drawerClose}
+    title="Homepage"
+  >
+    <svelte:fragment slot="lead">
+      <Icon icon={homeIcon} width="35" />
+    </svelte:fragment>
+    Home!
+  </AppRailAnchor>
+  <AppRailAnchor
+    href="/truncate"
+    selected={$page.url.pathname === '/truncate'}
+    on:click={drawerClose}
+    title="Truncate Files"
+  >
+    <svelte:fragment slot="lead">
+      <Icon icon={pageBreak} width="35" />
+    </svelte:fragment>
+    Truncate!
+  </AppRailAnchor>
+  <svelte:fragment slot="trail">
+    <AppRailAnchor
+      href="https://github.com/rosstheross/rosstheross.github.io"
+      rel="noreferrer"
+      on:click={drawerClose}
+      title="Source Code"
+    >
+      <svelte:fragment slot="lead">
+        <Icon icon={logoGithub} width="35" />
+      </svelte:fragment>
+      Source!
+    </AppRailAnchor>
+  </svelte:fragment>
+</AppRail>
diff --git a/app/src/lib/components/ReloadPrompt.svelte b/app/src/lib/components/ReloadPrompt.svelte
new file mode 100644
index 0000000..e6effbb
--- /dev/null
+++ b/app/src/lib/components/ReloadPrompt.svelte
@@ -0,0 +1,32 @@
+<script lang="ts">
+  import { getToastStore } from '@skeletonlabs/skeleton'
+  import { useRegisterSW } from 'virtual:pwa-register/svelte'
+
+  const toastStore = getToastStore()
+
+  const { updateServiceWorker } = useRegisterSW({
+    onRegisteredSW(r) {
+      console.log('SW Registered: ', r)
+    },
+    onNeedRefresh() {
+      toastStore.trigger({
+        message: 'A new version of the application is available.',
+        autohide: false,
+        action: {
+          label: 'Refresh',
+          response: updateServiceWorker,
+        },
+      })
+    },
+    onOfflineReady() {
+      toastStore.trigger({
+        background: 'variant-filled-success',
+        message: 'Now ready for offline use!',
+        timeout: 5000,
+      })
+    },
+    onRegisterError(err) {
+      console.error('SW Registration Error: ', err)
+    },
+  })
+</script>
diff --git a/app/src/lib/svelte/Navigation.svelte b/app/src/lib/svelte/Navigation.svelte
deleted file mode 100644
index 2e5ba98..0000000
--- a/app/src/lib/svelte/Navigation.svelte
+++ /dev/null
@@ -1,70 +0,0 @@
-<script lang="ts">
-  import { page } from '$app/stores'
-
-  import Icon from '@iconify/svelte'
-  import homeIcon from '@iconify/icons-carbon/home'
-  import logoGithub from '@iconify/icons-carbon/logo-github'
-  import menuIcon from '@iconify/icons-carbon/menu'
-  import pageBreak from '@iconify/icons-carbon/page-break'
-
-  import { AppRail, AppRailAnchor, getDrawerStore } from '@skeletonlabs/skeleton'
-
-  const drawerStore = getDrawerStore()
-
-  function drawerClose(): void {
-    drawerStore.close()
-  }
-
-  /**
-   * If the menu prop is true, then the close menu button will be rendered.
-   */
-  export let menu = false
-</script>
-
-<AppRail>
-  <svelte:fragment slot="lead">
-    {#if menu}
-      <AppRailAnchor on:click={drawerClose} title="Close Menu" value={0} href="javascript:;">
-        <svelte:fragment slot="lead">
-          <Icon icon={menuIcon} width="25" />
-        </svelte:fragment>
-        Close Menu
-      </AppRailAnchor>
-    {/if}
-  </svelte:fragment>
-  <AppRailAnchor
-    href="/"
-    selected={$page.url.pathname === '/'}
-    on:click={drawerClose}
-    title="Homepage"
-  >
-    <svelte:fragment slot="lead">
-      <Icon icon={homeIcon} width="35" />
-    </svelte:fragment>
-    Home!
-  </AppRailAnchor>
-  <AppRailAnchor
-    href="/truncate"
-    selected={$page.url.pathname === '/truncate'}
-    on:click={drawerClose}
-    title="Truncate Files"
-  >
-    <svelte:fragment slot="lead">
-      <Icon icon={pageBreak} width="35" />
-    </svelte:fragment>
-    Truncate!
-  </AppRailAnchor>
-  <svelte:fragment slot="trail">
-    <AppRailAnchor
-      href="https://github.com/rosstheross/rosstheross.github.io"
-      rel="noreferrer"
-      on:click={drawerClose}
-      title="Source Code"
-    >
-      <svelte:fragment slot="lead">
-        <Icon icon={logoGithub} width="35" />
-      </svelte:fragment>
-      Source!
-    </AppRailAnchor>
-  </svelte:fragment>
-</AppRail>
diff --git a/app/src/lib/svelte/ReloadPrompt.svelte b/app/src/lib/svelte/ReloadPrompt.svelte
deleted file mode 100644
index e6effbb..0000000
--- a/app/src/lib/svelte/ReloadPrompt.svelte
+++ /dev/null
@@ -1,32 +0,0 @@
-<script lang="ts">
-  import { getToastStore } from '@skeletonlabs/skeleton'
-  import { useRegisterSW } from 'virtual:pwa-register/svelte'
-
-  const toastStore = getToastStore()
-
-  const { updateServiceWorker } = useRegisterSW({
-    onRegisteredSW(r) {
-      console.log('SW Registered: ', r)
-    },
-    onNeedRefresh() {
-      toastStore.trigger({
-        message: 'A new version of the application is available.',
-        autohide: false,
-        action: {
-          label: 'Refresh',
-          response: updateServiceWorker,
-        },
-      })
-    },
-    onOfflineReady() {
-      toastStore.trigger({
-        background: 'variant-filled-success',
-        message: 'Now ready for offline use!',
-        timeout: 5000,
-      })
-    },
-    onRegisterError(err) {
-      console.error('SW Registration Error: ', err)
-    },
-  })
-</script>
diff --git a/app/src/routes/+layout.svelte b/app/src/routes/+layout.svelte
index 034ac0e..52385fc 100644
--- a/app/src/routes/+layout.svelte
+++ b/app/src/routes/+layout.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import Navigation from '$lib/svelte/Navigation.svelte'
+  import Navigation from '$lib/components/Navigation.svelte'
   import Icon from '@iconify/svelte'
   import menuIcon from '@iconify/icons-carbon/menu'
   import {
@@ -28,12 +28,12 @@
     })
   }
 
-  $: webManifestLink = pwaInfo ? pwaInfo.webManifest.linkTag : ''
+  $: webManifest = pwaInfo ? pwaInfo.webManifest.linkTag : ''
 </script>
 
 <svelte:head>
   <!-- eslint-disable-next-line svelte/no-at-html-tags VitePWA can probably be trusted -->
-  {@html webManifestLink}
+  {@html webManifest}
 </svelte:head>
 
 <Drawer>
@@ -64,6 +64,6 @@
   <slot />
 </AppShell>
 
-{#await import('$lib/svelte/ReloadPrompt.svelte') then { default: ReloadPrompt }}
+{#await import('$lib/components/ReloadPrompt.svelte') then { default: ReloadPrompt }}
   <ReloadPrompt />
 {/await}
diff --git a/app/svelte.config.js b/app/svelte.config.js
index 722e99b..9484cb8 100644
--- a/app/svelte.config.js
+++ b/app/svelte.config.js
@@ -9,9 +9,6 @@ const config = {
   preprocess: [vitePreprocess()],
 
   kit: {
-    // adapter-auto only supports some environments, see https://kit.svelte.dev/docs/adapter-auto for a list.
-    // If your environment is not supported or you settled on a specific environment, switch out the adapter.
-    // See https://kit.svelte.dev/docs/adapters for more information about adapters.
     adapter: adapter(),
   },
 }
-- 
cgit v1.2.3