Merge pull request #6 from skyblockstats/sveltekit-v1

Sveltekit v1
author: mat <27899617+mat-1@users.noreply.github.com> 2022-12-15 20:19:42 -0600
committer: GitHub <noreply@github.com> 2022-12-15 20:19:42 -0600
commit: ed5eedab8f9fc90dadf5c442cf559572d1b35f0c (patch)
tree: 01a763fd11810e9970f14f7dae180e95b279de9a /src
parent: 89bf3d31e36ad3bdfd45461ee6fb69a4c791f848 (diff)
parent: 103689520f51991a1e9a4ca5829fe2f46d1a32c2 (diff)
download: skyblock-stats-ed5eedab8f9fc90dadf5c442cf559572d1b35f0c.tar.gz
skyblock-stats-ed5eedab8f9fc90dadf5c442cf559572d1b35f0c.tar.bz2
skyblock-stats-ed5eedab8f9fc90dadf5c442cf559572d1b35f0c.zip
71 files changed, 455 insertions, 598 deletions
diff --git a/src/app.d.ts b/src/app.d.ts
index b41fa6f..9f4467d 100644
--- a/src/app.d.ts
+++ b/src/app.d.ts
@@ -3,10 +3,13 @@
 // // See https://kit.svelte.dev/docs/typescript
 // // for information about these interfaces
 declare namespace App {
+	// interface Error { }
+
 	interface Locals {
 		sid: string | undefined
 	}
 
+	// interface PageData { }
 
 	interface Platform {
 		env: {
@@ -18,9 +21,4 @@ declare namespace App {
 		}
 	}
 
-	interface Session {
-		sid: string | undefined
-	}
-
-	// interface Stuff {}
 }
diff --git a/src/app.html b/src/app.html
index e0a73a9..b9273a6 100644
--- a/src/app.html
+++ b/src/app.html
@@ -1,14 +1,17 @@
 <!DOCTYPE html>
 <html lang="en">
-	<head>
-		<meta charset="utf-8">
-		<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-		<meta name="theme-color" content="#010101">
-		<meta property="og:site_name" content="Hypixel SkyBlock Stats">
-		<meta property="og:type" content="website"/>
-		%svelte.head%
-	</head>
-	<body>
-		%svelte.body%
-	</body>
-</html>
+
+<head>
+	<meta charset="utf-8">
+	<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+	<meta name="theme-color" content="#010101">
+	<meta property="og:site_name" content="Hypixel SkyBlock Stats">
+	<meta property="og:type" content="website" />
+	%sveltekit.head%
+</head>
+
+<body>
+	%sveltekit.body%
+</body>
+
+</html>
+\ No newline at end of file
diff --git a/src/hooks.server.ts b/src/hooks.server.ts
new file mode 100644
index 0000000..0d2087b
--- /dev/null
+++ b/src/hooks.server.ts
@@ -0,0 +1,7 @@
+import type { Handle } from '@sveltejs/kit'
+
+export const handle = (async ({ event, resolve }) => {
+	event.locals.sid = event.cookies.get('sid')
+	const response = await resolve(event)
+	return response
+}) satisfies Handle
+\ No newline at end of file
diff --git a/src/hooks.ts b/src/hooks.ts
deleted file mode 100644
index 3fa9299..0000000
--- a/src/hooks.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import cookie from 'cookie'
-import type { ExternalFetch, GetSession, Handle } from '@sveltejs/kit'
-
-
-export const handle: Handle = async ({ event, resolve }) => {
-	const cookies = cookie.parse(event.request.headers.get('cookie') || '')
-
-	event.locals.sid = cookies.sid
-
-	const response = await resolve(event)
-
-	return response
-}
-
-export const getSession: GetSession = async ({ locals }) => {
-	return {
-		sid: locals.sid
-	}
-}
-
-// export const externalFetch: ExternalFetch = async (request) => {
-// 	const response = await fetch(request)
-
-// 	return response
-// }
-\ No newline at end of file
diff --git a/src/lib/AuctionPriceScatterplot.svelte b/src/lib/AuctionPriceScatterplot.svelte
index da1aed2..17a09f1 100644
--- a/src/lib/AuctionPriceScatterplot.svelte
+++ b/src/lib/AuctionPriceScatterplot.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { browser } from '$app/env'
+	import { browser } from '$app/environment'
 
 	import type { ItemAuctionsSchema, SimpleAuctionSchema } from './APITypes'
 	import type { PreviewedAuctionData } from './utils'
diff --git a/src/lib/BackgroundImage.svelte b/src/lib/BackgroundImage.svelte
index 0b2f043..17d8705 100644
--- a/src/lib/BackgroundImage.svelte
+++ b/src/lib/BackgroundImage.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import { onDestroy, onMount } from 'svelte'
-	import { browser } from '$app/env'
+	import { browser } from '$app/environment'
 
 	export let url: string
 	let styleHtml = `<style class="background-image-style">:root{--background:url(${url})}</style>`
diff --git a/src/lib/Collapsible.svelte b/src/lib/Collapsible.svelte
index a7b6105..68fee79 100644
--- a/src/lib/Collapsible.svelte
+++ b/src/lib/Collapsible.svelte
@@ -4,7 +4,7 @@
 	Collapsible content that works without JS but is enhanced by it.
  -->
 <script lang="ts">
-	import { browser } from '$app/env'
+	import { browser } from '$app/environment'
 	import { onMount } from 'svelte'
 	import { cleanId } from './utils'
 
diff --git a/src/lib/LoginButton.svelte b/src/lib/LoginButton.svelte
index bba078e..7ebf5d7 100644
--- a/src/lib/LoginButton.svelte
+++ b/src/lib/LoginButton.svelte
@@ -6,7 +6,7 @@
 	{#if loggedIn}
 		<a href="/profile"><button class="login-button">Edit profile</button></a>
 	{:else}
-		<a href="/login">
+		<a href="/login" rel="external">
 			<button class="login-button"
 				><img src="/discord-mark-light.svg" alt="Discord logo" />Log in with Discord</button
 			>
diff --git a/src/lib/MayorSkin.svelte b/src/lib/MayorSkin.svelte
index ad0a9a8..193a3d5 100644
--- a/src/lib/MayorSkin.svelte
+++ b/src/lib/MayorSkin.svelte
@@ -16,6 +16,7 @@
 		// special mayors
 		derpy: 'be0f89466528ad5eca5a6506adddd896ff78c4fd21facaa74a8c4a809c89207',
 		scorpius: '8f26fa0c47536e78e337257d898af8b1ebc87c0894503375234035ff2c7ef8f0',
+		finnegan: 'e7747fbee9fb39be39b00d3d483eb2f88b4bae82417ab5cb1b1aa930dd7b6689',
 
 		// unique mayors
 		technoblade: '786c039d969d1839155255e38e7b06a626ea9f8baf9cb55e0a77311efe18a3e',
@@ -23,14 +24,21 @@
 		faith: '64b39d0756b92b8b7599d1f971580088954e21c5f60c673d0d4f63693fb002b5',
 	}
 
-	let url: string
+	let url: string | undefined
 	$: {
-		if (name.toLowerCase() === 'derpy') url = '/villager.png'
-		else url = `https://mc-heads.net/body/${skinIds[name.toLowerCase()]}`
+		if (name.toLowerCase() === 'jerry') url = '/villager.png'
+		else {
+			const skinId = skinIds[name.toLowerCase()]
+			url = skinId ? `https://mc-heads.net/body/${skinId}` : undefined
+		}
 	}
 </script>
 
-<img src={url} alt="Mayor {toTitleCase(name)}" />
+{#if url}
+	<img src={url} alt="Mayor {toTitleCase(name)}" />
+{:else}
+	<div class="no-skin-found">Unknown mayor</div>
+{/if}
 
 <style>
 	img {
@@ -39,4 +47,12 @@
 		height: 12em;
 		margin: 0 auto;
 	}
+
+	.no-skin-found {
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		height: 12em;
+		margin: 0 auto;
+	}
 </style>
diff --git a/src/lib/layout/Loader.svelte b/src/lib/layout/Loader.svelte
index 3884e55..dd04924 100644
--- a/src/lib/layout/Loader.svelte
+++ b/src/lib/layout/Loader.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { browser } from '$app/env'
+	import { browser } from '$app/environment'
 	import { navigating } from '$app/stores'
 
 	let progress = 0
diff --git a/src/lib/minecraft/inventory.ts b/src/lib/minecraft/inventory.ts
index 227ed0c..5bd79c2 100644
--- a/src/lib/minecraft/inventory.ts
+++ b/src/lib/minecraft/inventory.ts
@@ -1,6 +1,6 @@
 import * as skyblockAssets from 'skyblock-assets'
 import { vanilla } from '$lib/packs'
-import { browser } from '$app/env'
+import { browser } from '$app/environment'
 
 export interface Item {
     id?: string
diff --git a/src/params/username.ts b/src/params/username.ts
new file mode 100644
index 0000000..855481a
--- /dev/null
+++ b/src/params/username.ts
@@ -0,0 +1,5 @@
+import type { ParamMatcher } from '@sveltejs/kit'
+
+export const match = ((param) => {
+	return /^\w{2,16}$/.test(param)
+}) satisfies ParamMatcher
+\ No newline at end of file
diff --git a/src/routes/__error.svelte b/src/routes/+error.svelte
index 3057f19..83b4407 100644
--- a/src/routes/__error.svelte
+++ b/src/routes/+error.svelte
@@ -1,22 +1,12 @@
-<script lang="ts" context="module">
-	import type { Load } from '@sveltejs/kit'
-
-	export const load: Load = async ({ error, status }) => {
-		return {
-			props: {
-				error,
-				status,
-			},
-		}
-	}
-</script>
-
 <script lang="ts">
 	import Header from '$lib/Header.svelte'
 	import Head from '$lib/Head.svelte'
 
-	export let status: number
-	export let error: Error
+	import { page } from '$app/stores'
+
+	// sveltekit bug: types of error and status say they can be null but they can't
+	let error = $page.error!
+	let status = $page.status!
 </script>
 
 <Head title={error.message} />
@@ -26,7 +16,7 @@
 	<div>
 		<h1>{status}</h1>
 		<p>{error.message}</p>
-		<a href="/" sveltekit:prefetch>Home</a>
+		<a href="/" data-sveltekit-preload-data="hover">Home</a>
 	</div>
 </main>
 
diff --git a/src/routes/__layout.svelte b/src/routes/+layout.svelte
index 74e29b9..74e29b9 100644
--- a/src/routes/__layout.svelte
+++ b/src/routes/+layout.svelte
diff --git a/src/routes/+page.server.ts b/src/routes/+page.server.ts
new file mode 100644
index 0000000..4596c1b
--- /dev/null
+++ b/src/routes/+page.server.ts
@@ -0,0 +1,7 @@
+import type { ServerLoad } from '@sveltejs/kit'
+
+export const load = (({ locals }) => {
+	return {
+		loggedIn: locals.sid !== undefined,
+	}
+}) satisfies ServerLoad
diff --git a/src/routes/index.svelte b/src/routes/+page.svelte
index 851f70e..3c518fb 100644
--- a/src/routes/index.svelte
+++ b/src/routes/+page.svelte
@@ -1,15 +1,3 @@
-<script lang="ts" context="module">
-	import type { Load } from '@sveltejs/kit'
-
-	export const load: Load = async ({ params, fetch, session }) => {
-		return {
-			props: {
-				loggedIn: session.sid !== undefined,
-			},
-		}
-	}
-</script>
-
 <script lang="ts">
 	import Username from '$lib/minecraft/Username.svelte'
 	import SearchUser from '$lib/SearchUser.svelte'
@@ -17,10 +5,12 @@
 	import Head from '$lib/Head.svelte'
 	import Emoji from '$lib/Emoji.svelte'
 	import LoginButton from '$lib/LoginButton.svelte'
+	import type { PageData } from './$types'
 
 	export const hydrate = false
 
-	export let loggedIn: boolean
+	export let data: PageData
+	export let loggedIn: boolean = data.loggedIn
 </script>
 
 <svelte:head>
diff --git a/src/routes/[player=username]/+page.ts b/src/routes/[player=username]/+page.ts
new file mode 100644
index 0000000..289cd48
--- /dev/null
+++ b/src/routes/[player=username]/+page.ts
@@ -0,0 +1,6 @@
+import { redirect } from '@sveltejs/kit'
+import type { PageLoad } from './$types'
+
+export const load = (({ params }) => {
+	throw redirect(303, `/player/${params.player}`)
+}) satisfies PageLoad
+\ No newline at end of file
diff --git a/src/routes/[player].ts b/src/routes/[player].ts
deleted file mode 100644
index 3f79368..0000000
--- a/src/routes/[player].ts
+++ /dev/null
@@ -1,14 +0,0 @@
-import type { ParamMatcher, RequestHandler } from '@sveltejs/kit'
-
-export const match: ParamMatcher = (param) => {
-	return /^\w{2,16}$/.test(param)
-}
-
-export const get: RequestHandler = async ({ params }) => {
-	return {
-		status: 303,
-		headers: {
-			location: `/player/${params.player}`
-		}
-	}
-}
-\ No newline at end of file
diff --git a/src/routes/auctionprices.svelte b/src/routes/auctionprices/+page.svelte
index ac75c86..844af04 100644
--- a/src/routes/auctionprices.svelte
+++ b/src/routes/auctionprices/+page.svelte
@@ -1,21 +1,3 @@
-<script lang="ts" context="module">
-	import type { Load } from '@sveltejs/kit'
-	import { fetchApi } from '$lib/api'
-
-	export const load: Load = async ({ params, fetch }) => {
-		const auctionItemsPromise = fetchApi(`auctionitems`, fetch).then(r => r.json())
-		const data = await fetchApi(`auctionprices`, fetch).then(r => r.json())
-		const auctionItems = await auctionItemsPromise
-
-		return {
-			props: {
-				data,
-				auctionItems,
-			},
-		}
-	}
-</script>
-
 <script lang="ts">
 	import Header from '$lib/Header.svelte'
 	import Head from '$lib/Head.svelte'
@@ -23,12 +5,15 @@
 	import type { ItemAuctionsSchema } from '$lib/APITypes'
 	import AuctionPriceScatterplot from '$lib/AuctionPriceScatterplot.svelte'
 	import AuctionPreviewTooltip from '$lib/AuctionPreviewTooltip.svelte'
-	import { browser } from '$app/env'
+	import { browser } from '$app/environment'
 	import Item from '$lib/minecraft/Item.svelte'
 	import furfskyReborn from 'skyblock-assets/matchers/furfsky_reborn.json'
+	import type { PageData } from './$types'
+	import { fetchApi } from '$lib/api'
 
-	export let data: ItemAuctionsSchema[]
-	export let auctionItems: Record<string, { display: { name: string }; vanillaId?: string }>
+	export let data: PageData
+	let auctionPrices: ItemAuctionsSchema[] = data.prices
+	let auctionItems: Record<string, { display: { name: string }; vanillaId?: string }> = data.items
 
 	let currentlyPreviewedAuction: PreviewedAuctionData | null = null
 
diff --git a/src/routes/auctionprices/+page.ts b/src/routes/auctionprices/+page.ts
new file mode 100644
index 0000000..31af8e3
--- /dev/null
+++ b/src/routes/auctionprices/+page.ts
@@ -0,0 +1,13 @@
+import type { PageLoad } from './$types'
+import { fetchApi } from '$lib/api'
+
+export const load = (async ({ fetch }) => {
+	const auctionItemsPromise = fetchApi(`auctionitems`, fetch).then(r => r.json())
+	const prices = await fetchApi(`auctionprices`, fetch).then(r => r.json())
+	const items = await auctionItemsPromise
+
+	return {
+		prices,
+		items,
+	}
+}) satisfies PageLoad
diff --git a/src/routes/chat.svelte b/src/routes/chat/+page.svelte
index df7aeee..df7aeee 100644
--- a/src/routes/chat.svelte
+++ b/src/routes/chat/+page.svelte
diff --git a/src/routes/election.svelte b/src/routes/election/+page.svelte
index ad869a1..d270425 100644
--- a/src/routes/election.svelte
+++ b/src/routes/election/+page.svelte
@@ -1,29 +1,12 @@
-<script lang="ts" context="module">
-	import type { Load } from '@sveltejs/kit'
-	import { fetchApi } from '$lib/api'
-
-	export const load: Load = async ({ params, fetch }) => {
-		const data = await fetchApi(`election?t=${Math.floor(Date.now() / 1000)}`, fetch).then(r =>
-			r.json()
-		)
-
-		return {
-			props: {
-				data,
-			},
-		}
-	}
-</script>
-
 <script lang="ts">
 	import Header from '$lib/Header.svelte'
 	import Head from '$lib/Head.svelte'
 	import { colorCodes, formattingCodeToHtml, millisecondsToTime, skyblockTime } from '$lib/utils'
 	import type { ElectionData } from '$lib/APITypes'
 	import { onDestroy, onMount } from 'svelte'
-	import MayorSkin from '$lib/MayorSkin.svelte'
+	import MayorSkin from '../../lib/MayorSkin.svelte'
 	import { invalidate } from '$app/navigation'
-	import { browser } from '$app/env'
+	import { browser } from '$app/environment'
 
 	export let data: ElectionData
 
@@ -73,16 +56,9 @@
 				<b>Last API update:</b>
 				{millisecondsToTime(currentTime - data.lastUpdated, {
 					smallestUnit: 1,
-					parts: 1,
+					parts: 3,
 				})} ago
 			</p>
-			<p>
-				<b>Next API update:</b>
-				{millisecondsToTime(10 * 60 * 1000 - (currentTime - data.lastUpdated), {
-					smallestUnit: 1,
-					parts: 1,
-				})}
-			</p>
 		</div>
 	{/if}
 	<h1>SkyBlock Mayor Election Status</h1>
diff --git a/src/routes/election/+page.ts b/src/routes/election/+page.ts
new file mode 100644
index 0000000..e41087d
--- /dev/null
+++ b/src/routes/election/+page.ts
@@ -0,0 +1,8 @@
+import { fetchApi } from '$lib/api'
+import type { PageLoad } from './$types'
+
+export const load = (async ({ fetch }) => {
+	return await fetchApi(`election?t=${Math.floor(Date.now() / 1000)}`, fetch).then(r =>
+		r.json()
+	)
+}) satisfies PageLoad
diff --git a/src/routes/items.svelte b/src/routes/items/+page.svelte
index 82b3ee3..e378bdf 100644
--- a/src/routes/items.svelte
+++ b/src/routes/items/+page.svelte
@@ -1,18 +1,3 @@
-<script lang="ts" context="module">
-	import type { Load } from '@sveltejs/kit'
-	import { fetchApi } from '$lib/api'
-
-	export const load: Load = async ({ params, fetch }) => {
-		const data = await fetchApi(`items`, fetch).then(r => r.json())
-
-		return {
-			props: {
-				data,
-			},
-		}
-	}
-</script>
-
 <script lang="ts">
 	import Header from '$lib/Header.svelte'
 	import Head from '$lib/Head.svelte'
diff --git a/src/routes/items/+page.ts b/src/routes/items/+page.ts
new file mode 100644
index 0000000..e5bb249
--- /dev/null
+++ b/src/routes/items/+page.ts
@@ -0,0 +1,6 @@
+import { fetchApi } from '$lib/api'
+import type { PageLoad } from './$types'
+
+export const load = (async ({ fetch }) => {
+	return await fetchApi(`items`, fetch).then(r => r.json())
+}) satisfies PageLoad
diff --git a/src/routes/leaderboard/+page.ts b/src/routes/leaderboard/+page.ts
new file mode 100644
index 0000000..68f69ac
--- /dev/null
+++ b/src/routes/leaderboard/+page.ts
@@ -0,0 +1,6 @@
+import { redirect } from '@sveltejs/kit'
+import type { PageLoad } from './$types'
+
+export const load = (() => {
+    throw redirect(303, '/leaderboards')
+}) satisfies PageLoad
diff --git a/src/routes/leaderboard/[name].ts b/src/routes/leaderboard/[name].ts
deleted file mode 100644
index 11f3468..0000000
--- a/src/routes/leaderboard/[name].ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import type { RequestHandler } from '@sveltejs/kit'
-
-// The route /leaderboard/<name> was moved to /leaderboards/<name> for
-// consistency.
-export const get: RequestHandler = ({ params }) => {
-    return {
-        status: 303,
-        headers: {
-            location: `/leaderboards/${params.name}`
-        }
-    }
-}
diff --git a/src/routes/leaderboard/[name]/+server.ts b/src/routes/leaderboard/[name]/+server.ts
new file mode 100644
index 0000000..2a1dd38
--- /dev/null
+++ b/src/routes/leaderboard/[name]/+server.ts
@@ -0,0 +1,7 @@
+import { redirect, type RequestHandler } from '@sveltejs/kit'
+
+// The route /leaderboard/<name> was moved to /leaderboards/<name> for
+// consistency.
+export const GET = (({ params }) => {
+    throw redirect(303, `/leaderboards/${params.name}`)
+}) satisfies RequestHandler
diff --git a/src/routes/leaderboard/index.ts b/src/routes/leaderboard/index.ts
deleted file mode 100644
index e904469..0000000
--- a/src/routes/leaderboard/index.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import type { RequestHandler } from '@sveltejs/kit'
-
-
-export const get: RequestHandler = () => {
-    return {
-        status: 303,
-        headers: {
-            location: '/leaderboards'
-        }
-    }
-}
diff --git a/src/routes/leaderboards/index.svelte b/src/routes/leaderboards/+page.svelte
index 50687c8..1d66ef5 100644
--- a/src/routes/leaderboards/index.svelte
+++ b/src/routes/leaderboards/+page.svelte
@@ -1,18 +1,3 @@
-<script lang="ts" context="module">
-	import type { Load } from '@sveltejs/kit'
-	import { fetchApi } from '$lib/api'
-
-	export const load: Load = async ({ fetch }) => {
-		const data = await fetchApi(`leaderboards`, fetch).then(r => r.json())
-
-		return {
-			props: {
-				data,
-			},
-		}
-	}
-</script>
-
 <script lang="ts">
 	import Header from '$lib/Header.svelte'
 	import Head from '$lib/Head.svelte'
diff --git a/src/routes/leaderboards/+page.ts b/src/routes/leaderboards/+page.ts
new file mode 100644
index 0000000..f28ac79
--- /dev/null
+++ b/src/routes/leaderboards/+page.ts
@@ -0,0 +1,6 @@
+import type { PageLoad } from './$types'
+import { fetchApi } from '$lib/api'
+
+export const load = (async ({ fetch }) => {
+	return await fetchApi(`leaderboards`, fetch).then(r => r.json())
+}) satisfies PageLoad
diff --git a/src/routes/leaderboards/[name].svelte b/src/routes/leaderboards/[name]/+page.svelte
index 75000a9..cfb7311 100644
--- a/src/routes/leaderboards/[name].svelte
+++ b/src/routes/leaderboards/[name]/+page.svelte
@@ -1,22 +1,3 @@
-<script lang="ts" context="module">
-	import type { Load } from '@sveltejs/kit'
-	import { fetchApi } from '$lib/api'
-
-	export const load: Load = async ({ params, fetch }) => {
-		const dataText = await fetchApi(`leaderboards/${params.name}`, fetch).then(r => r.text())
-
-		const data = JSON.parse(dataText)
-
-		if (data.list.length === 0) return { status: 404, error: 'Unknown leaderboard' }
-
-		return {
-			props: {
-				data,
-			},
-		} as any
-	}
-</script>
-
 <script lang="ts">
 	import Header from '$lib/Header.svelte'
 	import Head from '$lib/Head.svelte'
diff --git a/src/routes/leaderboards/[name]/+page.ts b/src/routes/leaderboards/[name]/+page.ts
new file mode 100644
index 0000000..735be61
--- /dev/null
+++ b/src/routes/leaderboards/[name]/+page.ts
@@ -0,0 +1,13 @@
+import type { PageLoad } from './$types'
+import { fetchApi } from '$lib/api'
+import { error } from '@sveltejs/kit'
+
+export const load = (async ({ params, fetch }) => {
+	const dataText = await fetchApi(`leaderboards/${params.name}`, fetch).then(r => r.text())
+
+	const data = JSON.parse(dataText)
+
+	if (data.list.length === 0) throw error(404, 'Unknown leaderboard')
+
+	return data
+}) satisfies PageLoad
diff --git a/src/routes/loggedin.ts b/src/routes/loggedin/+server.ts
index 9ae28ef..4772cf6 100644
--- a/src/routes/loggedin.ts
+++ b/src/routes/loggedin/+server.ts
@@ -1,7 +1,7 @@
 import { fetchApi } from '$lib/api'
-import type { RequestHandler } from '@sveltejs/kit'
+import { redirect, type RequestHandler, } from '@sveltejs/kit'
 
-export const get: RequestHandler = async ({ url }) => {
+export const GET = (async ({ url, cookies }) => {
 	const code = url.searchParams.get('code')
 	const redirectUri = `${url.protocol}//${url.host}/loggedin`
 	const response = await fetchApi(`accounts/createsession`, fetch, {
@@ -20,18 +20,11 @@ export const get: RequestHandler = async ({ url }) => {
 	})
 
 	if (response.ok) {
-		return {
-			status: 303,
-			headers: {
-				location: '/verify',
-				'Set-Cookie': `sid=${response.session_id}; Max-Age=31536000000; Path=/; HttpOnly`
-			}
-		}
+		cookies.set('sid', response.session_id, {
+			maxAge: 31536000000,
+			httpOnly: true,
+		})
+		throw redirect(303, '/verify')
 	}
-	return {
-		status: 303,
-		headers: {
-			location: '/login',
-		}
-	}
-}
+	throw redirect(303, '/login')
+}) satisfies RequestHandler
diff --git a/src/routes/login.ts b/src/routes/login.ts
deleted file mode 100644
index 1cd9b23..0000000
--- a/src/routes/login.ts
+++ /dev/null
@@ -1,36 +0,0 @@
-import type { RequestHandler } from '@sveltejs/kit'
-import env from '$lib/env'
-
-
-export const get: RequestHandler = async ({ request, platform }) => {
-	const host = request.headers.get('host')
-
-	const clientId = env(platform).DISCORD_CLIENT_ID
-
-	if (!clientId)
-		return {
-			status: 500,
-			headers: {
-				'content-type': 'text/plain',
-			},
-			body: 'DISCORD_CLIENT_ID is not set as an environment variable. Please contact the owner of the website if this was expected to work.',
-		}
-
-	if (!host)
-		return {
-			status: 400,
-			headers: {
-				'content-type': 'text/plain',
-			},
-			body: 'Host header is required.',
-		}
-
-	const protocol = request.url.startsWith('https') ? 'https' : 'http'
-
-	return {
-		status: 303,
-		headers: {
-			location: `https://discord.com/oauth2/authorize?client_id=${clientId}&redirect_uri=${protocol}://${host}%2Floggedin&response_type=code&scope=identify`
-		}
-	}
-}
diff --git a/src/routes/login/+server.ts b/src/routes/login/+server.ts
new file mode 100644
index 0000000..684f11e
--- /dev/null
+++ b/src/routes/login/+server.ts
@@ -0,0 +1,18 @@
+import env from '$lib/env'
+import { error, redirect, type RequestHandler } from '@sveltejs/kit'
+
+export const GET = (async ({ request, platform }) => {
+	const host = request.headers.get('host')
+
+	const clientId = env(platform).DISCORD_CLIENT_ID
+
+	if (!clientId)
+		throw error(500, 'DISCORD_CLIENT_ID is not set as an environment variable. Please contact the owner of the website if this was expected to work.')
+
+	if (!host)
+		throw error(400, 'Host header is required.')
+
+	const protocol = request.url.startsWith('https') ? 'https' : 'http'
+
+	throw redirect(303, `https://discord.com/oauth2/authorize?client_id=${clientId}&redirect_uri=${protocol}://${host}%2Floggedin&response_type=code&scope=identify`)
+}) satisfies RequestHandler
diff --git a/src/routes/logout.ts b/src/routes/logout/+server.ts
index 25be86c..2e0f40d 100644
--- a/src/routes/logout.ts
+++ b/src/routes/logout/+server.ts
@@ -1,7 +1,7 @@
 import { fetchApi } from '$lib/api'
-import type { RequestHandler } from '@sveltejs/kit'
+import { redirect, type RequestHandler } from '@sveltejs/kit'
 
-export const get: RequestHandler = async ({ locals, url }) => {
+export const GET = (async ({ url, cookies, locals }) => {
 	// if the sid is wrong, nothing to do
 	if (url.searchParams.has('sid') && url.searchParams.get('sid') === locals.sid) {
 		await fetchApi(`accounts/session`, fetch, {
@@ -17,12 +17,7 @@ export const get: RequestHandler = async ({ locals, url }) => {
 				throw new Error(res.statusText)
 		})
 	}
-	return {
-		status: 303,
-		headers: {
-			location: '/',
-			'Set-Cookie': 'sid=; expires=Thu, 01 Jan 1970 00:00:00 GMT; path=/;'
-		}
-	}
 
-}
+	cookies.delete('sid')
+	throw redirect(303, '/')
+}) as RequestHandler
diff --git a/src/routes/player/+page.server.ts b/src/routes/player/+page.server.ts
new file mode 100644
index 0000000..eafae71
--- /dev/null
+++ b/src/routes/player/+page.server.ts
@@ -0,0 +1,12 @@
+import { redirect } from '@sveltejs/kit'
+import type { Actions } from './$types'
+
+export const actions: Actions = {
+    default: async ({ request }) => {
+        const form = await request.formData()
+
+        const player = form.get('user-search')
+
+        throw redirect(303, `/player/${player}`)
+    }
+}
+\ No newline at end of file
diff --git a/src/routes/player/[player]/index.svelte b/src/routes/player/[player]/+page.svelte
index 5a51816..6711864 100644
--- a/src/routes/player/[player]/index.svelte
+++ b/src/routes/player/[player]/+page.svelte
@@ -1,34 +1,3 @@
-<script lang="ts" context="module">
-	import type { Load } from '@sveltejs/kit'
-	import { fetchApi } from '$lib/api'
-
-	export const load: Load = async ({ params, fetch }) => {
-		const player: string = params.player
-
-		const data = await fetchApi(`player/${player}?customization=true`, fetch).then(r => r.json())
-
-		if (!data.player) {
-			return {
-				status: 404,
-				error: 'Unknown player',
-			}
-		}
-
-		if (data.player.username !== player) {
-			return {
-				redirect: `/player/${data.player.username}`,
-				status: 302,
-			} as any
-		}
-
-		return {
-			props: {
-				data,
-			},
-		}
-	}
-</script>
-
 <script lang="ts">
 	import type { CleanPlayer, CleanProfile, CleanUser } from '$lib/APITypes'
 	import BackgroundImage from '$lib/BackgroundImage.svelte'
@@ -40,9 +9,9 @@
 	import { MODE_EMOJIS, DEFAULT_MODE_EMOJI } from '$lib/profile'
 	import Tooltip from '$lib/Tooltip.svelte'
 	import { cleanId } from '$lib/utils'
-	import { navigating } from '$app/stores'
+	import type { PageData } from './$types'
 
-	export let data: CleanUser & { player: CleanPlayer }
+	export let data: PageData
 
 	let activeProfile: CleanProfile | null = null
 	let activeProfileLastSave: number = 0
@@ -97,7 +66,7 @@
 					<a
 						class="profile-name"
 						href="/player/{data.player?.username}/{profile.name}"
-						sveltekit:prefetch
+						data-sveltekit-preload-data="hover"
 					>
 						{profile.name}
 					</a>
diff --git a/src/routes/player/[player]/+page.ts b/src/routes/player/[player]/+page.ts
new file mode 100644
index 0000000..023c3ff
--- /dev/null
+++ b/src/routes/player/[player]/+page.ts
@@ -0,0 +1,19 @@
+import type { PageLoad } from './$types'
+import { fetchApi } from '$lib/api'
+import { error, redirect } from '@sveltejs/kit'
+
+export const load = (async ({ params, fetch }) => {
+	const player: string = params.player!
+
+	const data = await fetchApi(`player/${player}?customization=true`, fetch).then(r => r.json())
+
+	if (!data.player) {
+		throw error(404, 'Unknown player')
+	}
+
+	if (data.player.username !== player) {
+		throw redirect(302, `/player/${data.player.username}`)
+	}
+
+	return data
+}) satisfies PageLoad
diff --git a/src/routes/player/[player]/[profile].svelte b/src/routes/player/[player]/[profile]/+page.svelte
index e686164..8a3adbb 100644
--- a/src/routes/player/[player]/[profile].svelte
+++ b/src/routes/player/[player]/[profile]/+page.svelte
@@ -1,92 +1,41 @@
-<script lang="ts" context="module">
-	import type { Load } from '@sveltejs/kit'
-	import { loadPack } from '$lib/packs'
-	import { fetchApi } from '$lib/api'
-
-	export const load: Load = async ({ params, fetch }) => {
-		const player: string = params.player
-		const profile: string = params.profile
-		const data: CleanMemberProfile = await fetchApi(
-			`player/${player}/${profile}?customization=true`,
-			fetch
-		).then(async r => {
-			const text = await r.text()
-			try {
-				return JSON.parse(text)
-			} catch (e) {
-				throw new Error(`Invalid JSON: ${text}`)
-			}
-		})
-
-		if (!data.member) {
-			return {
-				status: 404,
-				error: 'Unknown profile',
-			}
-		}
-
-		if (data.member.username !== player) {
-			return {
-				redirect: `/player/${data.member.username}/${data.profile.name}`,
-				status: 302,
-			} as any
-		}
-		if (!data.member.left && data.profile.name !== profile) {
-			return {
-				redirect: `/player/${data.member.username}/${data.profile.name}`,
-				status: 302,
-			} as any
-		}
-
-		const packName = params.pack ?? data?.customization?.pack
-
-		let pack = await loadPack(packName)
-
-		return {
-			props: {
-				data,
-				pack,
-			},
-		}
-	}
-</script>
-
 <script lang="ts">
 	import { inventoryIconMap, skyblockItemToUrl } from '$lib/minecraft/inventory'
-	import FarmingContests from '$lib/sections/FarmingContests.svelte'
-	import Leaderboards from '$lib/sections/Leaderboards.svelte'
-	import Inventories from '$lib/sections/Inventories.svelte'
-	import Collections from '$lib/sections/Collections.svelte'
+	import FarmingContests from './sections/FarmingContests.svelte'
+	import Leaderboards from './sections/Leaderboards.svelte'
+	import Achievements from './sections/Achievements.svelte'
+	import Inventories from './sections/Inventories.svelte'
+	import Collections from './sections/Collections.svelte'
 	import { chooseDefaultBackground } from '$lib/backgrounds'
 	import BackgroundImage from '$lib/BackgroundImage.svelte'
 	import type { CleanMemberProfile } from '$lib/APITypes'
 	import Username from '$lib/minecraft/Username.svelte'
-	import StatList from '$lib/sections/StatList.svelte'
-	import Infobox from '$lib/sections/Infobox.svelte'
-	import Minions from '$lib/sections/Minions.svelte'
-	import Slayers from '$lib/sections/Slayers.svelte'
+	import StatList from './sections/StatList.svelte'
+	import Auctions from './sections/Auctions.svelte'
+	import Infobox from './sections/Infobox.svelte'
+	import Minions from './sections/Minions.svelte'
+	import Essence from './sections/Essence.svelte'
+	import Slayers from './sections/Slayers.svelte'
 	import type { MatcherFile } from 'skyblock-assets'
-	import Claimed from '$lib/sections/Claimed.svelte'
+	import Claimed from './sections/Claimed.svelte'
 	import Collapsible from '$lib/Collapsible.svelte'
-	import Skills from '$lib/sections/Skills.svelte'
+	import Skills from './sections/Skills.svelte'
 	import { generateInfobox } from '$lib/profile'
-	import Zones from '$lib/sections/Zones.svelte'
-	import Armor from '$lib/sections/Armor.svelte'
-	import Harp from '$lib/sections/Harp.svelte'
-	import Pets from '$lib/sections/Pets.svelte'
-	import Coop from '$lib/sections/Coop.svelte'
-	import Bank from '$lib/sections/Bank.svelte'
+	import Zones from './sections/Zones.svelte'
+	import Armor from './sections/Armor.svelte'
+	import Harp from './sections/Harp.svelte'
+	import Pets from './sections/Pets.svelte'
+	import Coop from './sections/Coop.svelte'
+	import Bank from './sections/Bank.svelte'
+	import type { PageData } from './$types'
 	import Header from '$lib/Header.svelte'
 	import Emoji from '$lib/Emoji.svelte'
 	import { cleanId } from '$lib/utils'
 	import Head from '$lib/Head.svelte'
 	import Toc from '$lib/Toc.svelte'
-	import Achievements from '$lib/sections/Achievements.svelte'
-	import Essence from '$lib/sections/Essence.svelte'
-	import Auctions from '$lib/sections/Auctions.svelte'
 
-	export let data: CleanMemberProfile
-	export let pack: MatcherFile
+	export let data: PageData & CleanMemberProfile
+
+	export let pack: MatcherFile = data.pack
 
 	let categories: string[] = []
 	function setCategories() {
diff --git a/src/routes/player/[player]/[profile]/+page.ts b/src/routes/player/[player]/[profile]/+page.ts
new file mode 100644
index 0000000..34a4e2a
--- /dev/null
+++ b/src/routes/player/[player]/[profile]/+page.ts
@@ -0,0 +1,40 @@
+import type { CleanMemberProfile } from '$lib/APITypes'
+import type { PageLoad } from './$types'
+import { loadPack } from '$lib/packs'
+import { fetchApi } from '$lib/api'
+import { error, redirect } from '@sveltejs/kit'
+
+export const load = (async ({ params, fetch, url }) => {
+	const player: string = params.player
+	const profile: string = params.profile
+	const data: CleanMemberProfile = await fetchApi(
+		`player/${player}/${profile}?customization=true`,
+		fetch
+	).then(async r => {
+		const text = await r.text()
+		try {
+			return JSON.parse(text)
+		} catch (e) {
+			throw new Error(`Invalid JSON: ${text}`)
+		}
+	})
+
+	if (!data.member) {
+		throw error(404, 'Unknown profile')
+	}
+
+	if (data.member.username !== player) {
+		throw redirect(302, `/player/${data.member.username}/${data.profile.name}`)
+	}
+	if (!data.member.left && data.profile.name !== profile) {
+		throw redirect(302, `/player/${data.member.username}/${data.profile.name}`)
+	}
+
+	const packName = url.searchParams.get('pack') ?? data?.customization?.pack
+	const pack = await loadPack(packName)
+
+	return {
+		...data,
+		pack,
+	}
+}) satisfies PageLoad
diff --git a/src/lib/sections/AccessoryBagUpgrades.svelte b/src/routes/player/[player]/[profile]/sections/AccessoryBagUpgrades.svelte
index 74530d1..74530d1 100644
--- a/src/lib/sections/AccessoryBagUpgrades.svelte
+++ b/src/routes/player/[player]/[profile]/sections/AccessoryBagUpgrades.svelte
diff --git a/src/lib/sections/Achievements.svelte b/src/routes/player/[player]/[profile]/sections/Achievements.svelte
index 92ba468..92ba468 100644
--- a/src/lib/sections/Achievements.svelte
+++ b/src/routes/player/[player]/[profile]/sections/Achievements.svelte
diff --git a/src/lib/sections/Armor.svelte b/src/routes/player/[player]/[profile]/sections/Armor.svelte
index 285a898..285a898 100644
--- a/src/lib/sections/Armor.svelte
+++ b/src/routes/player/[player]/[profile]/sections/Armor.svelte
diff --git a/src/lib/sections/Auctions.svelte b/src/routes/player/[player]/[profile]/sections/Auctions.svelte
index 50d47b6..50d47b6 100644
--- a/src/lib/sections/Auctions.svelte
+++ b/src/routes/player/[player]/[profile]/sections/Auctions.svelte
diff --git a/src/lib/sections/Bank.svelte b/src/routes/player/[player]/[profile]/sections/Bank.svelte
index 9bd2b8f..9bd2b8f 100644
--- a/src/lib/sections/Bank.svelte
+++ b/src/routes/player/[player]/[profile]/sections/Bank.svelte
diff --git a/src/lib/sections/Claimed.svelte b/src/routes/player/[player]/[profile]/sections/Claimed.svelte
index 8f44796..8f44796 100644
--- a/src/lib/sections/Claimed.svelte
+++ b/src/routes/player/[player]/[profile]/sections/Claimed.svelte
diff --git a/src/lib/sections/Collections.svelte b/src/routes/player/[player]/[profile]/sections/Collections.svelte
index 4baa660..4baa660 100644
--- a/src/lib/sections/Collections.svelte
+++ b/src/routes/player/[player]/[profile]/sections/Collections.svelte
diff --git a/src/lib/sections/Coop.svelte b/src/routes/player/[player]/[profile]/sections/Coop.svelte
index ff858f1..ff858f1 100644
--- a/src/lib/sections/Coop.svelte
+++ b/src/routes/player/[player]/[profile]/sections/Coop.svelte
diff --git a/src/lib/sections/Essence.svelte b/src/routes/player/[player]/[profile]/sections/Essence.svelte
index 244dbcd..244dbcd 100644
--- a/src/lib/sections/Essence.svelte
+++ b/src/routes/player/[player]/[profile]/sections/Essence.svelte
diff --git a/src/lib/sections/FarmingContests.svelte b/src/routes/player/[player]/[profile]/sections/FarmingContests.svelte
index 8eef53d..8eef53d 100644
--- a/src/lib/sections/FarmingContests.svelte
+++ b/src/routes/player/[player]/[profile]/sections/FarmingContests.svelte
diff --git a/src/lib/sections/Harp.svelte b/src/routes/player/[player]/[profile]/sections/Harp.svelte
index 6a5c9cc..6a5c9cc 100644
--- a/src/lib/sections/Harp.svelte
+++ b/src/routes/player/[player]/[profile]/sections/Harp.svelte
diff --git a/src/lib/sections/Infobox.svelte b/src/routes/player/[player]/[profile]/sections/Infobox.svelte
index f8d2889..f8d2889 100644
--- a/src/lib/sections/Infobox.svelte
+++ b/src/routes/player/[player]/[profile]/sections/Infobox.svelte
diff --git a/src/lib/sections/Inventories.svelte b/src/routes/player/[player]/[profile]/sections/Inventories.svelte
index 1dd7d28..1dd7d28 100644
--- a/src/lib/sections/Inventories.svelte
+++ b/src/routes/player/[player]/[profile]/sections/Inventories.svelte
diff --git a/src/lib/sections/Leaderboards.svelte b/src/routes/player/[player]/[profile]/sections/Leaderboards.svelte
index 817f59a..817f59a 100644
--- a/src/lib/sections/Leaderboards.svelte
+++ b/src/routes/player/[player]/[profile]/sections/Leaderboards.svelte
diff --git a/src/lib/sections/Minions.svelte b/src/routes/player/[player]/[profile]/sections/Minions.svelte
index 856d8f0..856d8f0 100644
--- a/src/lib/sections/Minions.svelte
+++ b/src/routes/player/[player]/[profile]/sections/Minions.svelte
diff --git a/src/lib/sections/Pets.svelte b/src/routes/player/[player]/[profile]/sections/Pets.svelte
index 7f660c4..7f660c4 100644
--- a/src/lib/sections/Pets.svelte
+++ b/src/routes/player/[player]/[profile]/sections/Pets.svelte
diff --git a/src/lib/sections/Skills.svelte b/src/routes/player/[player]/[profile]/sections/Skills.svelte
index 8fc5aaf..8fc5aaf 100644
--- a/src/lib/sections/Skills.svelte
+++ b/src/routes/player/[player]/[profile]/sections/Skills.svelte
diff --git a/src/lib/sections/Slayers.svelte b/src/routes/player/[player]/[profile]/sections/Slayers.svelte
index 40fa67d..40fa67d 100644
--- a/src/lib/sections/Slayers.svelte
+++ b/src/routes/player/[player]/[profile]/sections/Slayers.svelte
diff --git a/src/lib/sections/StatList.svelte b/src/routes/player/[player]/[profile]/sections/StatList.svelte
index 38604d7..38604d7 100644
--- a/src/lib/sections/StatList.svelte
+++ b/src/routes/player/[player]/[profile]/sections/StatList.svelte
diff --git a/src/lib/sections/Zones.svelte b/src/routes/player/[player]/[profile]/sections/Zones.svelte
index f7e993b..f7e993b 100644
--- a/src/lib/sections/Zones.svelte
+++ b/src/routes/player/[player]/[profile]/sections/Zones.svelte
diff --git a/src/routes/player/index.ts b/src/routes/player/index.ts
deleted file mode 100644
index 4644499..0000000
--- a/src/routes/player/index.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-import type { RequestHandler } from '@sveltejs/kit'
-
-export const post: RequestHandler = async ({ request }) => {
-    const form = await request.formData()
-
-    const player = form.get('user-search')
-
-    return {
-        status: 303,
-        headers: {
-            location: `/player/${player}`
-        }
-    }
-}
-\ No newline at end of file
diff --git a/src/routes/profile/+page.server.ts b/src/routes/profile/+page.server.ts
new file mode 100644
index 0000000..60c24c1
--- /dev/null
+++ b/src/routes/profile/+page.server.ts
@@ -0,0 +1,7 @@
+import type { ServerLoad } from '@sveltejs/kit'
+
+export const load = (({ locals }) => {
+	return {
+		sid: locals.sid
+	}
+}) satisfies ServerLoad
diff --git a/src/routes/profile/index.svelte b/src/routes/profile/+page.svelte
index 4da4a8f..244d1a2 100644
--- a/src/routes/profile/index.svelte
+++ b/src/routes/profile/+page.svelte
@@ -1,65 +1,21 @@
-<script lang="ts" context="module">
-	import type { Load } from '@sveltejs/kit'
-	import { fetchApi } from '$lib/api'
-	import type { AccountCustomization, AccountSchema, CleanUser, SessionSchema } from '$lib/APITypes'
-	import Head from '$lib/Head.svelte'
-	import Header from '$lib/Header.svelte'
-	import donators from '../../_donators.json'
-	import admins from '../../_admins.json'
-
-	export const load: Load = async ({ fetch, session }) => {
-		const sessionResponse: { session: SessionSchema | null; account: AccountSchema | null } | null =
-			await fetchApi(`accounts/session`, fetch, {
-				method: 'POST',
-				headers: {
-					'Content-Type': 'application/json',
-				},
-				body: JSON.stringify({
-					uuid: session.sid,
-				}),
-			}).then(r => r.json())
-
-		const playerResponse = sessionResponse?.account
-			? await fetchApi(`player/${sessionResponse.account.minecraftUuid}`, fetch).then(r => r.json())
-			: null
-
-		// redirect to /login if the user is not logged in
-		if (
-			!sessionResponse ||
-			!sessionResponse.account ||
-			!sessionResponse.session ||
-			!playerResponse.player
-		) {
-			return { redirect: '/login', status: 303 }
-		}
-
-		const isDonator =
-			donators.find(d => d?.uuid === sessionResponse.account?.minecraftUuid) !== undefined
-		const isAdmin = admins.find(a => a === sessionResponse.account?.minecraftUuid) !== undefined
-
-		return {
-			props: {
-				session: sessionResponse.session,
-				account: sessionResponse.account,
-				player: playerResponse,
-				isDonator: isDonator || isAdmin,
-			},
-		}
-	}
-</script>
-
 <script lang="ts">
 	import Emoji from '$lib/Emoji.svelte'
-	import { browser } from '$app/env'
+	import { browser } from '$app/environment'
 	import Tooltip from '$lib/Tooltip.svelte'
 	import { onDestroy, onMount } from 'svelte'
 	import backgroundNames from '../../_backgrounds.json'
+	import type { AccountCustomization, AccountSchema, CleanUser, SessionSchema } from '$lib/APITypes'
+	import type { PageData } from './$types'
+	import Head from '$lib/Head.svelte'
+	import Header from '$lib/Header.svelte'
+
+	export let data: PageData
 
-	export let session: SessionSchema
-	export let account: AccountSchema
-	export let player: CleanUser
+	export let session: SessionSchema = data.session
+	export let account: AccountSchema = data.account
+	export let player: CleanUser = data.player
 
-	export let isDonator: boolean
+	export let isDonator: boolean = data.isDonator
 
 	let pack: AccountCustomization['pack'] = account?.customization?.pack ?? 'furfsky_reborn'
 	let blurBackground: AccountCustomization['blurBackground'] =
@@ -172,6 +128,11 @@
 				style="background-image: url(/backgrounds-small/{thisBackgroundName})"
 				title={thisBackgroundName}
 				on:click={() => (backgroundName = thisBackgroundName)}
+				on:keypress={e => {
+					if (e.key === 'Enter') {
+						backgroundName = thisBackgroundName
+					}
+				}}
 			/>
 		{/each}
 	</div>
diff --git a/src/routes/profile/+page.ts b/src/routes/profile/+page.ts
new file mode 100644
index 0000000..cdd2a93
--- /dev/null
+++ b/src/routes/profile/+page.ts
@@ -0,0 +1,44 @@
+import { fetchApi } from '$lib/api'
+import type { AccountSchema, SessionSchema } from '$lib/APITypes'
+import donators from '../../_donators.json'
+import admins from '../../_admins.json'
+import type { PageLoad } from './$types'
+import { redirect } from '@sveltejs/kit'
+
+export const load = (async ({ fetch, data }) => {
+	const sessionResponse: { session: SessionSchema | null; account: AccountSchema | null } | null =
+		await fetchApi(`accounts/session`, fetch, {
+			method: 'POST',
+			headers: {
+				'Content-Type': 'application/json',
+			},
+			body: JSON.stringify({
+				uuid: data.sid,
+			}),
+		}).then(r => r.json())
+
+	const playerResponse = sessionResponse?.account
+		? await fetchApi(`player/${sessionResponse.account.minecraftUuid}`, fetch).then(r => r.json())
+		: null
+
+	// redirect to /login if the user is not logged in
+	if (
+		!sessionResponse ||
+		!sessionResponse.account ||
+		!sessionResponse.session ||
+		!playerResponse.player
+	) {
+		throw redirect(303, '/login')
+	}
+
+	const isDonator =
+		donators.find(d => d?.uuid === sessionResponse.account?.minecraftUuid) !== undefined
+	const isAdmin = admins.find(a => a === sessionResponse.account?.minecraftUuid) !== undefined
+
+	return {
+		session: sessionResponse.session,
+		account: sessionResponse.account,
+		player: playerResponse,
+		isDonator: isDonator || isAdmin,
+	}
+}) as PageLoad
diff --git a/src/routes/profile/update.ts b/src/routes/profile/update/+server.ts
index 168cba8..7190fb8 100644
--- a/src/routes/profile/update.ts
+++ b/src/routes/profile/update/+server.ts
@@ -1,11 +1,11 @@
 import { fetchApi } from '$lib/api'
 import type { AccountSchema, SessionSchema } from '$lib/APITypes'
-import type { RequestHandler } from '@sveltejs/kit'
-import backgroundFileNames from '../../_backgrounds.json'
-import donators from '../../_donators.json'
-import admins from '../../_admins.json'
-import type { JSONValue } from '@sveltejs/kit/types/internal'
+import backgroundFileNames from '../../../_backgrounds.json'
+import donators from '../../../_donators.json'
+import admins from '../../../_admins.json'
 import env from '$lib/env'
+import type { PageServerLoad } from '../$types'
+import { error, json } from '@sveltejs/kit'
 
 const emojiRegex = /^(\u00a9|\u00ae|[\u2000-\u3300]|\ud83c[\ud000-\udfff]|\ud83d[\ud000-\udfff]|\ud83e[\ud000-\udfff])$/
 
@@ -15,19 +15,13 @@ function isValidEmoji(emoji: string) {
 }
 
 
-export const patch: RequestHandler = async ({ request, locals, platform }) => {
+export const PATCH = (async ({ request, locals, platform }) => {
 	if (locals.sid === undefined) {
-		return {
-			body: { ok: false, error: 'You are not logged in.' },
-			status: 401,
-		}
+		throw error(401, 'You are not logged in.')
 	}
 	const key = env(platform).SKYBLOCK_STATS_API_KEY
 	if (!key) {
-		return {
-			body: { ok: false, error: 'The SKYBLOCK_STATS_API_KEY environment variable is not set.' },
-			status: 500,
-		}
+		throw error(500, 'The SKYBLOCK_STATS_API_KEY environment variable is not set.')
 	}
 	const data = await request.json()
 
@@ -41,10 +35,7 @@ export const patch: RequestHandler = async ({ request, locals, platform }) => {
 		}),
 	}).then(r => r.json())
 	if (!sessionResponse.session || !sessionResponse.account?.minecraftUuid)
-		return {
-			body: { ok: false, error: 'Invalid session.' },
-			status: 401,
-		}
+		throw error(401, 'Invalid session.')
 
 	const backgroundName = data.backgroundName
 	const pack = data.pack
@@ -55,49 +46,28 @@ export const patch: RequestHandler = async ({ request, locals, platform }) => {
 	const isAdmin = admins.includes(sessionResponse.account?.minecraftUuid)
 
 	if (typeof backgroundName !== 'undefined' && typeof backgroundName !== 'string') {
-		return {
-			body: { ok: false, error: 'Invalid background.' },
-			status: 400,
-		}
+		throw error(400, 'Invalid background.')
 	}
 	if (typeof pack !== 'string') {
-		return {
-			body: { ok: false, error: 'Invalid pack.' },
-			status: 400,
-		}
+		throw error(400, 'Invalid pack.')
 	}
 	if (typeof blurBackground !== 'boolean') {
-		return {
-			body: { ok: false, error: 'Invalid blurBackground.' },
-			status: 400,
-		}
+		throw error(400, 'Invalid blurBackground.')
 	}
 	if (typeof emoji !== 'undefined' && typeof emoji !== 'string') {
-		return {
-			body: { ok: false, error: 'Invalid emoji.' },
-			status: 400,
-		}
+		throw error(400, 'Invalid emoji.')
 	}
 
 	// prevent people from putting non-existent backgrounds
 	if (backgroundName && !backgroundFileNames.includes(backgroundName))
-		return {
-			body: { ok: false, error: 'Invalid background.' },
-			status: 400,
-		}
+		throw error(400, 'Invalid background.')
 	const backgroundUrl = backgroundName ? `/backgrounds/${backgroundName}` : undefined
 
 	if (emoji) {
 		if (!isDonator && !isAdmin)
-			return {
-				body: { ok: false, error: 'You are not allowed to use emojis.' },
-				status: 401,
-			}
+			throw error(401, 'You are not allowed to use emojis.')
 		if (!isValidEmoji(emoji))
-			return {
-				body: { ok: false, error: 'Invalid emoji.' },
-				status: 400,
-			}
+			throw error(400, 'Invalid emoji.')
 	}
 
 	const updatedAccount: AccountSchema = {
@@ -118,9 +88,8 @@ export const patch: RequestHandler = async ({ request, locals, platform }) => {
 		},
 		body: JSON.stringify(updatedAccount),
 	}).then(r => r.json())
+	console.log(response)
 
 
-	return {
-		body: { ok: true } as JSONValue,
-	}
-}
-\ No newline at end of file
+	return json({ ok: true })
+}) satisfies PageServerLoad
+\ No newline at end of file
diff --git a/src/routes/verify.ts b/src/routes/verify.ts
deleted file mode 100644
index 3321164..0000000
--- a/src/routes/verify.ts
+++ /dev/null
@@ -1,75 +0,0 @@
-import { fetchApi } from '$lib/api'
-import type { AccountSchema, CleanUser, SessionSchema } from '$lib/APITypes'
-import type { RequestHandler } from '@sveltejs/kit'
-import env from '$lib/env'
-
-
-function redirect(status: number, location: string) {
-	return {
-		status,
-		headers: {
-			location,
-		},
-	}
-}
-
-export const post: RequestHandler = async ({ request, locals, platform }) => {
-	const key = env(platform).SKYBLOCK_STATS_API_KEY
-	if (!key) {
-		return redirect(303, `/verify?error=NO_KEY`)
-	}
-	if (locals.sid === undefined) {
-		return redirect(303, '/login')
-	}
-
-	const form = await request.formData()
-
-	// username or uuid
-	const playerIdentifier = form.get('ign')
-	if (!playerIdentifier) {
-		return redirect(303, `/verify?error=NO_IGN`)
-	}
-
-	const playerResponse: CleanUser = await fetchApi(`player/${playerIdentifier}`, fetch).then(res => res.json())
-	const sessionResponse: { session: SessionSchema | null, account: AccountSchema | null } = await fetchApi(`accounts/session`, fetch, {
-		method: 'POST',
-		headers: {
-			'Content-Type': 'application/json',
-		},
-		body: JSON.stringify({
-			uuid: locals.sid,
-		}),
-	}).then(r => r.json())
-
-	if (!sessionResponse.session)
-		return redirect(303, '/login')
-
-	const hypixelDiscordName = playerResponse.player?.socials.discord
-
-	if (!hypixelDiscordName)
-		return redirect(303, `/verify?error=NOT_LINKED`)
-
-	const discordUser = sessionResponse.session.discord_user
-	const actualDiscordName = discordUser.name
-	// some people link themselves as <id>#<discrim> instead of <name>#<discrim>
-	const actualDiscordIdDiscrim = `${discordUser.id}#${discordUser.name.split('#')[1]}`
-
-	if (!(hypixelDiscordName === actualDiscordName || hypixelDiscordName === actualDiscordIdDiscrim))
-		return redirect(303, `/verify?error=WRONG_NAME&current=${encodeURIComponent(hypixelDiscordName)}&correct=${encodeURIComponent(actualDiscordName)}`)
-
-	const updatedAccount: AccountSchema = {
-		discordId: sessionResponse.session.discord_user.id,
-		minecraftUuid: playerResponse.player?.uuid
-	}
-
-	await fetchApi(`accounts/update`, fetch, {
-		method: 'POST',
-		headers: {
-			'Content-Type': 'application/json',
-			key: key
-		},
-		body: JSON.stringify(updatedAccount),
-	}).then(r => r.json())
-
-	return redirect(303, '/profile')
-}
-\ No newline at end of file
diff --git a/src/routes/verify/+page.server.ts b/src/routes/verify/+page.server.ts
new file mode 100644
index 0000000..bd3ea7f
--- /dev/null
+++ b/src/routes/verify/+page.server.ts
@@ -0,0 +1,75 @@
+import { fetchApi } from '$lib/api'
+import type { AccountSchema, CleanUser, SessionSchema } from '$lib/APITypes'
+import { redirect, type RequestHandler, type ServerLoad } from '@sveltejs/kit'
+import env from '$lib/env'
+import type { Actions } from './$types'
+
+
+export const actions: Actions = {
+	default: async ({ platform, locals, request }) => {
+		const key = env(platform).SKYBLOCK_STATS_API_KEY
+		if (!key) {
+			throw redirect(303, `/verify?error=NO_KEY`)
+		}
+		if (locals.sid === undefined) {
+			throw redirect(303, '/login')
+		}
+
+		const form = await request.formData()
+
+		// username or uuid
+		const playerIdentifier = form.get('ign')
+		if (!playerIdentifier) {
+			throw redirect(303, `/verify?error=NO_IGN`)
+		}
+
+		const playerResponse: CleanUser = await fetchApi(`player/${playerIdentifier}`, fetch).then(res => res.json())
+		const sessionResponse: { session: SessionSchema | null, account: AccountSchema | null } = await fetchApi(`accounts/session`, fetch, {
+			method: 'POST',
+			headers: {
+				'Content-Type': 'application/json',
+			},
+			body: JSON.stringify({
+				uuid: locals.sid,
+			}),
+		}).then(r => r.json())
+
+		if (!sessionResponse.session)
+			throw redirect(303, '/login')
+
+		const hypixelDiscordName = playerResponse.player?.socials.discord
+
+		if (!hypixelDiscordName)
+			throw redirect(303, `/verify?error=NOT_LINKED`)
+
+		const discordUser = sessionResponse.session.discord_user
+		const actualDiscordName = discordUser.name
+		// some people link themselves as <id>#<discrim> instead of <name>#<discrim>
+		const actualDiscordIdDiscrim = `${discordUser.id}#${discordUser.name.split('#')[1]}`
+
+		if (!(hypixelDiscordName === actualDiscordName || hypixelDiscordName === actualDiscordIdDiscrim))
+			throw redirect(303, `/verify?error=WRONG_NAME&current=${encodeURIComponent(hypixelDiscordName)}&correct=${encodeURIComponent(actualDiscordName)}`)
+
+		const updatedAccount: AccountSchema = {
+			discordId: sessionResponse.session.discord_user.id,
+			minecraftUuid: playerResponse.player?.uuid
+		}
+
+		await fetchApi(`accounts/update`, fetch, {
+			method: 'POST',
+			headers: {
+				'Content-Type': 'application/json',
+				key: key
+			},
+			body: JSON.stringify(updatedAccount),
+		}).then(r => r.json())
+
+		throw redirect(303, '/profile')
+	}
+}
+
+export const load = (({ locals }) => {
+	return {
+		sid: locals.sid
+	}
+}) satisfies ServerLoad
diff --git a/src/routes/verify.svelte b/src/routes/verify/+page.svelte
index 20de403..4edc50d 100644
--- a/src/routes/verify.svelte
+++ b/src/routes/verify/+page.svelte
@@ -1,27 +1,14 @@
-<script lang="ts" context="module">
-	import type { Load } from '@sveltejs/kit'
-	export const load: Load = async ({ session, url }) => {
-		if (session.sid === undefined) {
-			return { redirect: '/login', status: 303 }
-		}
-		return {
-			props: {
-				errorCode: url.searchParams.get('error'),
-				current: url.searchParams.get('current'),
-				correct: url.searchParams.get('correct'),
-			},
-		}
-	}
-</script>
-
 <script lang="ts">
 	import Emoji from '$lib/Emoji.svelte'
 	import Head from '$lib/Head.svelte'
 	import Header from '$lib/Header.svelte'
+	import type { PageData } from './$types'
+
+	export let data: PageData
 
-	export let errorCode: string | null
-	export let current: string | null
-	export let correct: string | null
+	export let errorCode: string | null = data.errorCode
+	export let current: string | null = data.current
+	export let correct: string | null = data.correct
 
 	const errorCodes = {
 		NO_IGN: 'Please enter a valid Minecraft username.',
diff --git a/src/routes/verify/+page.ts b/src/routes/verify/+page.ts
new file mode 100644
index 0000000..8e5f698
--- /dev/null
+++ b/src/routes/verify/+page.ts
@@ -0,0 +1,13 @@
+import { redirect } from '@sveltejs/kit'
+import type { PageLoad } from './$types'
+
+export const load = (async ({ data, url }) => {
+	if (data.sid === undefined) {
+		throw redirect(303, '/login')
+	}
+	return {
+		errorCode: url.searchParams.get('error'),
+		current: url.searchParams.get('current'),
+		correct: url.searchParams.get('correct'),
+	}
+}) satisfies PageLoad
author	mat <27899617+mat-1@users.noreply.github.com>	2022-12-15 20:19:42 -0600
committer	GitHub <noreply@github.com>	2022-12-15 20:19:42 -0600
commit	ed5eedab8f9fc90dadf5c442cf559572d1b35f0c (patch)
tree	01a763fd11810e9970f14f7dae180e95b279de9a /src
parent	89bf3d31e36ad3bdfd45461ee6fb69a4c791f848 (diff)
parent	103689520f51991a1e9a4ca5829fe2f46d1a32c2 (diff)
download	skyblock-stats-ed5eedab8f9fc90dadf5c442cf559572d1b35f0c.tar.gz skyblock-stats-ed5eedab8f9fc90dadf5c442cf559572d1b35f0c.tar.bz2 skyblock-stats-ed5eedab8f9fc90dadf5c442cf559572d1b35f0c.zip