From bf7d2eb8ef431693486e4ddd8245a9f58e68d582 Mon Sep 17 00:00:00 2001
From: mat <git@matdoes.dev>
Date: Sat, 19 Oct 2024 08:31:23 +0000
Subject: [PATCH] fix /buttons/degrees not loading data immediately

---
 src/routes/buttons/+page.svelte         |  1 -
 src/routes/buttons/degrees/+page.svelte | 34 +++++++++++++++----------
 src/routes/buttons/sites/+page.svelte   |  0
 3 files changed, 20 insertions(+), 15 deletions(-)
 delete mode 100644 src/routes/buttons/sites/+page.svelte

diff --git a/src/routes/buttons/+page.svelte b/src/routes/buttons/+page.svelte
index 1f084ff..7defe84 100644
--- a/src/routes/buttons/+page.svelte
+++ b/src/routes/buttons/+page.svelte
@@ -8,7 +8,6 @@
 		pageIndexFromName,
 	} from './88x31'
 	import { writable } from 'svelte/store'
-	import { page } from '$app/stores'
 	import ButtonLink from './ButtonLink.svelte'
 	import ExternalLinkIcon from './ExternalLinkIcon.svelte'
 	import ExternalLink from './ExternalLink.svelte'
diff --git a/src/routes/buttons/degrees/+page.svelte b/src/routes/buttons/degrees/+page.svelte
index 7e29bee..0afc403 100644
--- a/src/routes/buttons/degrees/+page.svelte
+++ b/src/routes/buttons/degrees/+page.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import { writable } from 'svelte/store'
-	import { pageIndexFromName, data } from '../88x31'
+	import { pageIndexFromName, data, downloadData } from '../88x31'
 	import ButtonLink from '../ButtonLink.svelte'
 	import { onMount } from 'svelte'
 	import { page } from '$app/stores'
@@ -99,22 +99,26 @@
 		localStorage.setItem('88x31-degrees-targetPage', $targetPage)
 	}
 
-	onMount(() => {
-		return page.subscribe(async (page) => {
-			const hash = decodeURIComponent(page.url.hash.slice(1))
-			let [origin, target] = hash.split('→')
+	onMount(async () => {
+		await downloadData()
 
-			if (origin === undefined) origin = ''
-			if (target === undefined) target = ''
-
-			if (origin === '') origin = localStorage.getItem('88x31-degrees-originPage') ?? ''
-			if (target === '') target = localStorage.getItem('88x31-degrees-targetPage') ?? ''
-
-			if (origin !== '' && $originPage !== origin) originPage.set(origin)
-			if (target !== '' && $targetPage !== target) targetPage.set(target)
-		})
+		updateFromHash()
 	})
 
+	function updateFromHash() {
+		const hash = decodeURIComponent(location.hash.slice(1))
+		let [origin, target] = hash.split('→')
+
+		if (origin === undefined) origin = ''
+		if (target === undefined) target = ''
+
+		if (origin === '') origin = localStorage.getItem('88x31-degrees-originPage') ?? ''
+		if (target === '') target = localStorage.getItem('88x31-degrees-targetPage') ?? ''
+
+		if (origin !== '' && $originPage !== origin) originPage.set(origin)
+		if (target !== '' && $targetPage !== target) targetPage.set(target)
+	}
+
 	originPage.subscribe(calculatePath)
 	targetPage.subscribe(calculatePath)
 
@@ -126,6 +130,8 @@
 	}
 </script>
 
+<svelte:window on:hashchange={updateFromHash} />
+
 <input
 	type="text"
 	bind:value={$originPage}
diff --git a/src/routes/buttons/sites/+page.svelte b/src/routes/buttons/sites/+page.svelte
deleted file mode 100644
index e69de29..0000000