From 2606ad355e5928719c6bbfcfab63a9905d30a575 Mon Sep 17 00:00:00 2001
From: DutchEllie <personal@quenten.nl>
Date: Mon, 4 Jul 2022 19:41:06 +0200
Subject: [PATCH] Caching properly?

---
 src/components/homepage/rightbar.svelte         |   6 +++---
 src/components/misc/hamburger.svelte            |   2 +-
 src/components/misc/musicselectionmodal.svelte  |   2 +-
 src/routes/__layout.svelte                      |   2 +-
 src/service-worker.ts                           |   3 ++-
 src/stores/musicStore.ts                        |  16 ++++++++--------
 static/{ => assets}/images/grid.svg             |   0
 static/{ => assets}/images/icons8-menu.svg      |   0
 static/{ => assets}/images/lines.png            | Bin
 static/{ => assets}/images/literallyme.jpg      | Bin
 static/{ => assets}/images/whydidyoudothis.png  | Bin
 static/{ => assets}/music/MUUUSIC-MAN!.opus     | Bin
 .../music/Tokusya-Seizon Wonder-la-der!!.mp3    | Bin
 .../music/diamond-city-lights-lazulight.opus    | Bin
 static/{ => assets}/music/error-towa.mp3        | Bin
 static/{ => assets}/music/godish.m4a            | Bin
 .../music/im-glad-youre-evil-too.m4a            | Bin
 .../{ => assets}/music/kegarenaki-barajuuji.mp3 | Bin
 static/{ => assets}/music/servant-of-evil.m4a   | Bin
 static/{ => assets}/music/tsunami-finana.opus   | Bin
 svelte.config.js                                |   5 -----
 21 files changed, 16 insertions(+), 20 deletions(-)
 rename static/{ => assets}/images/grid.svg (100%)
 rename static/{ => assets}/images/icons8-menu.svg (100%)
 rename static/{ => assets}/images/lines.png (100%)
 rename static/{ => assets}/images/literallyme.jpg (100%)
 rename static/{ => assets}/images/whydidyoudothis.png (100%)
 rename static/{ => assets}/music/MUUUSIC-MAN!.opus (100%)
 rename static/{ => assets}/music/Tokusya-Seizon Wonder-la-der!!.mp3 (100%)
 rename static/{ => assets}/music/diamond-city-lights-lazulight.opus (100%)
 rename static/{ => assets}/music/error-towa.mp3 (100%)
 rename static/{ => assets}/music/godish.m4a (100%)
 rename static/{ => assets}/music/im-glad-youre-evil-too.m4a (100%)
 rename static/{ => assets}/music/kegarenaki-barajuuji.mp3 (100%)
 rename static/{ => assets}/music/servant-of-evil.m4a (100%)
 rename static/{ => assets}/music/tsunami-finana.opus (100%)

diff --git a/src/components/homepage/rightbar.svelte b/src/components/homepage/rightbar.svelte
index db8144b..4392ad8 100644
--- a/src/components/homepage/rightbar.svelte
+++ b/src/components/homepage/rightbar.svelte
@@ -1,12 +1,12 @@
 <script>
-	let img = '/images/literallyme.jpg';
+	let img = '/assets/images/literallyme.jpg';
 	let clicked = false;
 	function cursify() {
 		if (!clicked) {
-			img = '/images/whydidyoudothis.png';
+			img = '/assets/images/whydidyoudothis.png';
 			clicked = true;
 		} else {
-			img = '/images/literallyme.jpg';
+			img = '/assets/images/literallyme.jpg';
 			clicked = false;
 		}
 	}
diff --git a/src/components/misc/hamburger.svelte b/src/components/misc/hamburger.svelte
index 2ae0404..72fc3de 100644
--- a/src/components/misc/hamburger.svelte
+++ b/src/components/misc/hamburger.svelte
@@ -10,7 +10,7 @@
 	}}
 	class="w-full h-full min-w-max"
 >
-	<img src="/images/icons8-menu.svg" alt="Hamburger menu" />
+	<img src="/assets/images/icons8-menu.svg" alt="Hamburger menu" />
 </button>
 
 <Menu bind:open />
diff --git a/src/components/misc/musicselectionmodal.svelte b/src/components/misc/musicselectionmodal.svelte
index 789c81f..fcef1c1 100644
--- a/src/components/misc/musicselectionmodal.svelte
+++ b/src/components/misc/musicselectionmodal.svelte
@@ -62,7 +62,7 @@
 							setSong({
 								musicTitle: 'MUUUSIC MAN!',
 								musicArtist: 'MatPat',
-								musicUrl: '/music/MUUUSIC-MAN!.opus'
+								musicUrl: '/assets/music/MUUUSIC-MAN!.opus'
 							});
 						}}
 						class="mt-3 hover:cursor-pointer underline max-w-full shadow-lg hover:shadow-xl w-max bg-indigo-100 p-2 rounded-md"
diff --git a/src/routes/__layout.svelte b/src/routes/__layout.svelte
index 18a21b2..6c7fa59 100644
--- a/src/routes/__layout.svelte
+++ b/src/routes/__layout.svelte
@@ -38,7 +38,7 @@
 	<Musicplayer />
 </div>
 <div
-	class="flex flex-col bg-gradient-to-tr from-[#A2D2FF] to-[#FFAFCC] w-screen text-murasaki overflow-auto min-h-screen relative "
+	class="flex flex-col bg-gradient-to-tr from-[#A2D2FF] to-[#FFAFCC] w-full text-murasaki overflow-auto min-h-screen relative "
 >
 	<!-- Page content -->
 	<div class="" style="padding-bottom: {footerHeight + 10}px;">
diff --git a/src/service-worker.ts b/src/service-worker.ts
index 2e12c9a..4872e87 100644
--- a/src/service-worker.ts
+++ b/src/service-worker.ts
@@ -6,7 +6,7 @@ import { build, files, version } from '$service-worker';
 
 const worker = (self as unknown) as ServiceWorkerGlobalScope;
 const STATIC_CACHE_NAME = `cache${version}`
-const APP_CACHE_NAME = `cache${version}`;
+const APP_CACHE_NAME = `offline${version}`;
 
 // Hardcoded bunch of routes to always preemptively cache
 const routes = ["/", "/about"];
@@ -92,6 +92,7 @@ worker.addEventListener("fetch", (event) => {
   // Don't try to cache protocols other than http/https
   const isHttp = url.protocol.startsWith("http");
   const isStaticAsset = staticAssets.has(url.href);
+  const isDev = url.host === self.location.host;
   const skipBecauseUncached = event.request.cache === 'only-if-cached' && !isStaticAsset;
 
   if (isHttp && !skipBecauseUncached) {
diff --git a/src/stores/musicStore.ts b/src/stores/musicStore.ts
index 06bc01e..4d5bfa3 100644
--- a/src/stores/musicStore.ts
+++ b/src/stores/musicStore.ts
@@ -3,43 +3,43 @@ import { readable } from "svelte/store";
 const musicStore = readable([
 	{
 		musicTitle: "I'm glad you're evil too (feat. Hatsune Miku)",
-		musicUrl: "/music/im-glad-youre-evil-too.m4a",
+		musicUrl: "/assets/music/im-glad-youre-evil-too.m4a",
 		musicArtist: "PinocchioP",
 	},
 	{
 		musicTitle: "God-ish (神っぽいな) feat. Hatsune Miku",
 		musicArtist: "PinocchioP",
-		musicUrl: "/music/godish.m4a",
+		musicUrl: "/assets/music/godish.m4a",
 	},
 	{
 		musicTitle: "Servant of Evil (悪ノ召使) feat. Kagamine Len",
 		musicArtist: "Mothy / Akuno-p",
-		musicUrl: "/music/servant-of-evil.m4a"
+		musicUrl: "/assets/music/servant-of-evil.m4a"
 	},
 	{
 		musicTitle: "Tokusya-Seizon Wonder-la-der!!",
 		musicArtist: "Amane Kanata",
-		musicUrl: "/music/Tokusya-Seizon Wonder-la-der!!.mp3"
+		musicUrl: "/assets/music/Tokusya-Seizon Wonder-la-der!!.mp3"
 	},
 	{
 		musicTitle: "Kegarenaki Barajuuji",
 		musicArtist: "Ariabl'eyeS",
-		musicUrl: "/music/kegarenaki-barajuuji.mp3"
+		musicUrl: "/assets/music/kegarenaki-barajuuji.mp3"
 	},
 	{
 		musicTitle: "-ERROR (Cover)",
 		musicArtist: "Tokoyami Towa",
-		musicUrl: "/music/error-towa.mp3"
+		musicUrl: "/assets/music/error-towa.mp3"
 	},
 	{
 		musicTitle: "Diamond City Lights",
 		musicArtist: "LazuLight",
-		musicUrl: "/music/diamond-city-lights-lazulight.opus"
+		musicUrl: "/assets/music/diamond-city-lights-lazulight.opus"
 	},
 	{
 		musicTitle: "TSUNAMI",
 		musicArtist: "Finana Ryugu",
-		musicUrl: "/music/tsunami-finana.opus"
+		musicUrl: "/assets/music/tsunami-finana.opus"
 	}
 ]);
 
diff --git a/static/images/grid.svg b/static/assets/images/grid.svg
similarity index 100%
rename from static/images/grid.svg
rename to static/assets/images/grid.svg
diff --git a/static/images/icons8-menu.svg b/static/assets/images/icons8-menu.svg
similarity index 100%
rename from static/images/icons8-menu.svg
rename to static/assets/images/icons8-menu.svg
diff --git a/static/images/lines.png b/static/assets/images/lines.png
similarity index 100%
rename from static/images/lines.png
rename to static/assets/images/lines.png
diff --git a/static/images/literallyme.jpg b/static/assets/images/literallyme.jpg
similarity index 100%
rename from static/images/literallyme.jpg
rename to static/assets/images/literallyme.jpg
diff --git a/static/images/whydidyoudothis.png b/static/assets/images/whydidyoudothis.png
similarity index 100%
rename from static/images/whydidyoudothis.png
rename to static/assets/images/whydidyoudothis.png
diff --git a/static/music/MUUUSIC-MAN!.opus b/static/assets/music/MUUUSIC-MAN!.opus
similarity index 100%
rename from static/music/MUUUSIC-MAN!.opus
rename to static/assets/music/MUUUSIC-MAN!.opus
diff --git a/static/music/Tokusya-Seizon Wonder-la-der!!.mp3 b/static/assets/music/Tokusya-Seizon Wonder-la-der!!.mp3
similarity index 100%
rename from static/music/Tokusya-Seizon Wonder-la-der!!.mp3
rename to static/assets/music/Tokusya-Seizon Wonder-la-der!!.mp3
diff --git a/static/music/diamond-city-lights-lazulight.opus b/static/assets/music/diamond-city-lights-lazulight.opus
similarity index 100%
rename from static/music/diamond-city-lights-lazulight.opus
rename to static/assets/music/diamond-city-lights-lazulight.opus
diff --git a/static/music/error-towa.mp3 b/static/assets/music/error-towa.mp3
similarity index 100%
rename from static/music/error-towa.mp3
rename to static/assets/music/error-towa.mp3
diff --git a/static/music/godish.m4a b/static/assets/music/godish.m4a
similarity index 100%
rename from static/music/godish.m4a
rename to static/assets/music/godish.m4a
diff --git a/static/music/im-glad-youre-evil-too.m4a b/static/assets/music/im-glad-youre-evil-too.m4a
similarity index 100%
rename from static/music/im-glad-youre-evil-too.m4a
rename to static/assets/music/im-glad-youre-evil-too.m4a
diff --git a/static/music/kegarenaki-barajuuji.mp3 b/static/assets/music/kegarenaki-barajuuji.mp3
similarity index 100%
rename from static/music/kegarenaki-barajuuji.mp3
rename to static/assets/music/kegarenaki-barajuuji.mp3
diff --git a/static/music/servant-of-evil.m4a b/static/assets/music/servant-of-evil.m4a
similarity index 100%
rename from static/music/servant-of-evil.m4a
rename to static/assets/music/servant-of-evil.m4a
diff --git a/static/music/tsunami-finana.opus b/static/assets/music/tsunami-finana.opus
similarity index 100%
rename from static/music/tsunami-finana.opus
rename to static/assets/music/tsunami-finana.opus
diff --git a/svelte.config.js b/svelte.config.js
index 711d4e7..566124a 100644
--- a/svelte.config.js
+++ b/svelte.config.js
@@ -10,11 +10,6 @@ const config = {
 	],
 	kit: {
 		adapter: adapter(),
-		serviceWorker: {
-			files: (filePath) => {
-				return true;
-			}
-		}
 	},
 };