From 0e19b7b0d342eadb4fbf29a17e2e338f183e070a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thea=20Sch=C3=B6bl?= <dev@theaninova.de>
Date: Wed, 5 Jul 2023 23:39:36 +0200
Subject: [PATCH] switch deploy method

---
 src/lib/components/Navigation.svelte | 19 +++++++++----------
 src/routes/+error.svelte             |  6 ++++++
 src/routes/+layout.js                |  3 ++-
 src/routes/+page.js                  |  3 +--
 src/routes/config/+layout.svelte     |  7 +++----
 src/routes/config/+page.js           |  3 +--
 static/.htaccess                     | 16 ++++++++++++++++
 svelte.config.js                     |  7 ++++++-
 8 files changed, 44 insertions(+), 20 deletions(-)
 create mode 100644 src/routes/+error.svelte
 create mode 100644 static/.htaccess

diff --git a/src/lib/components/Navigation.svelte b/src/lib/components/Navigation.svelte
index 2601002c..cdf6dc26 100644
--- a/src/lib/components/Navigation.svelte
+++ b/src/lib/components/Navigation.svelte
@@ -1,19 +1,18 @@
 <script>
   import {serialPort, syncing} from "$lib/serial/connection.js"
   import {browser} from "$app/environment"
-  import {base} from "$app/paths"
 </script>
 
 <nav>
-  <a href={base} class="title">dot i/o</a>
+  <a href="/" class="title">dot i/o</a>
 
   <div class="steps">
-    <a href={base} title="CPM - characters per minute" class="icon train cpm">music_note</a>
-    <a href={base} title="ChM - chords mastered" class="icon train chords">piano</a>
-    <a href={base} title="aWPM - average words per minute" class="icon test avg">avg_pace</a>
-    <a href={base} title="StM - sentences mastered" class="icon train sentences">lyrics</a>
-    <a href={base} title="tWPM - top words per minute" class="icon test top">speed</a>
-    <a href={base} title="CM - concepts mastered" class="icon train concepts">cognition</a>
+    <a href="/" title="CPM - characters per minute" class="icon train cpm">music_note</a>
+    <a href="/" title="ChM - chords mastered" class="icon train chords">piano</a>
+    <a href="/" title="aWPM - average words per minute" class="icon test avg">avg_pace</a>
+    <a href="/" title="StM - sentences mastered" class="icon train sentences">lyrics</a>
+    <a href="/" title="tWPM - top words per minute" class="icon test top">speed</a>
+    <a href="/" title="CM - concepts mastered" class="icon train concepts">cognition</a>
   </div>
 
   <div class="actions">
@@ -29,7 +28,7 @@
       </abbr>
     {/if}
     <a
-      href="{base}/device-manager"
+      href="/device-manager"
       title="Device Manager"
       class="icon connect"
       class:error={$serialPort === undefined}
@@ -37,7 +36,7 @@
     >
       cable
     </a>
-    <a href={base} title="Statistics" class="icon account">person</a>
+    <a href="/" title="Statistics" class="icon account">person</a>
   </div>
 </nav>
 
diff --git a/src/routes/+error.svelte b/src/routes/+error.svelte
new file mode 100644
index 00000000..9c3b4088
--- /dev/null
+++ b/src/routes/+error.svelte
@@ -0,0 +1,6 @@
+<script>
+  import {page} from "$app/stores"
+</script>
+
+<h1>{$page.status}</h1>
+<pre>{$page.error.message}</pre>
diff --git a/src/routes/+layout.js b/src/routes/+layout.js
index aaf46e44..6335a519 100644
--- a/src/routes/+layout.js
+++ b/src/routes/+layout.js
@@ -1,2 +1,3 @@
 export const prerender = true
-export const trailingSlash = "always"
+
+export const trailingSlash = "never"
diff --git a/src/routes/+page.js b/src/routes/+page.js
index fd40daba..f62a6d70 100644
--- a/src/routes/+page.js
+++ b/src/routes/+page.js
@@ -1,7 +1,6 @@
 import {redirect} from "@sveltejs/kit"
-import {base} from "$app/paths"
 
 /** @type {import("./$types").PageLoad} */
 export function load() {
-  throw redirect(307, `${base}/config/`)
+  throw redirect(300, "/config")
 }
diff --git a/src/routes/config/+layout.svelte b/src/routes/config/+layout.svelte
index 54be0e35..4305d784 100644
--- a/src/routes/config/+layout.svelte
+++ b/src/routes/config/+layout.svelte
@@ -1,17 +1,16 @@
 <script>
-  import {base} from "$app/paths"
   import {page} from "$app/stores"
 </script>
 
 <nav>
-  <a href="{base}/config/chords/" class:active={$page.url.pathname.endsWith("chords/")}>
+  <a href="/config/chords" class:active={$page.url.pathname.endsWith("chords/")}>
     <span class="icon">piano</span>Chords
   </a>
-  <a href="{base}/config/layout/" class:active={$page.url.pathname.endsWith("layout/")}>
+  <a href="/config/layout" class:active={$page.url.pathname.endsWith("layout/")}>
     <span class="icon">keyboard</span>
     Layout
   </a>
-  <a href="{base}/config/settings/" class:active={$page.url.pathname.endsWith("settings/")}>
+  <a href="/config/settings" class:active={$page.url.pathname.endsWith("settings/")}>
     <span class="icon">settings</span>
     Settings
   </a>
diff --git a/src/routes/config/+page.js b/src/routes/config/+page.js
index edc9df0e..877ffcce 100644
--- a/src/routes/config/+page.js
+++ b/src/routes/config/+page.js
@@ -1,7 +1,6 @@
 import {redirect} from "@sveltejs/kit"
-import {base} from "$app/paths"
 
 /** @type {import("./$types").PageLoad} */
 export function load() {
-  throw redirect(307, `${base}/config/chords/`)
+  throw redirect(300, "/config/chords")
 }
diff --git a/static/.htaccess b/static/.htaccess
new file mode 100644
index 00000000..1a649181
--- /dev/null
+++ b/static/.htaccess
@@ -0,0 +1,16 @@
+RewriteEngine On
+
+# force https
+RewriteCond %{HTTPS}  !=on
+RewriteRule ^/?(.*) https://%{SERVER_NAME}/$1 [R,L]
+
+# SPA mode
+RewriteBase /
+RewriteRule ^200\.html$ - [L]
+RewriteCond %{REQUEST_FILENAME} !-f
+RewriteCond %{REQUEST_FILENAME} !-d
+RewriteRule . /200.html [L]
+
+# remove trailing slash
+RewriteCond %{REQUEST_FILENAME} !-d
+RewriteRule ^(.*)/$ /$1 [L,R=301]
diff --git a/svelte.config.js b/svelte.config.js
index 49944fab..475968f6 100644
--- a/svelte.config.js
+++ b/svelte.config.js
@@ -5,7 +5,12 @@ import preprocess from "svelte-preprocess"
 const config = {
   preprocess: [preprocess()],
   kit: {
-    adapter: adapter(),
+    paths: {
+      relative: false,
+    },
+    adapter: adapter({
+      fallback: "200.html",
+    }),
   },
 }