From 3d37c62392982bf82ea081b10b5a0587a23d8723 Mon Sep 17 00:00:00 2001
From: Bradley Shellnut <bradleyshellnut@pm.me>
Date: Mon, 11 Sep 2023 17:31:15 -0700
Subject: [PATCH 1/2] Reverting auth refactor.

---
 components.json                               |  24 +-
 src/{lib/styles => }/app.postcss              |   0
 src/routes/(app)/+layout.svelte               | 213 -----------------
 src/routes/(auth)/+layout.svelte              | 156 -------------
 src/routes/(auth)/login/+page.svelte          |  38 ++--
 src/routes/(auth)/sign-up/+page.svelte        |  11 +-
 .../admin/+layout.server.ts                   |   0
 .../admin/+layout.svelte                      |   0
 .../{(app) => (protected)}/admin/+page.svelte |   0
 .../(protected)/collection/+page.server.ts    |   2 +-
 .../(protected)/collection/+page.svelte       |   0
 .../(protected)/list/+layout.server.ts        |   0
 .../(protected)/list/+layout.svelte           |   0
 .../(protected)/list/[id]/+page.server.ts     |   0
 .../(protected)/list/[id]/+page.svelte        |   0
 .../(protected)/profile/+page.server.ts       |   0
 .../(protected)/profile/+page.svelte          |   0
 .../(protected)/wishlist/+page.server.ts      |   0
 .../(protected)/wishlist/+page.svelte         |   0
 src/routes/{(app) => }/+error.svelte          |   0
 src/routes/+layout.svelte                     | 214 +++++++++++++++++-
 src/routes/{(app) => }/+page.server.ts        |   0
 src/routes/{(app) => }/+page.svelte           |   0
 src/routes/{(app) => }/about/+page.svelte     |   0
 src/routes/{(app) => }/about/+page.ts         |   0
 src/{lib/utils => routes}/api.ts              |   0
 .../{(app) => }/game/[id]/+error.svelte       |   0
 .../{(app) => }/game/[id]/+page.server.ts     |   1 +
 src/routes/{(app) => }/game/[id]/+page.svelte |   2 +-
 src/routes/{(app) => }/search/+error.svelte   |   0
 src/routes/{(app) => }/search/+page.server.ts |   0
 src/routes/{(app) => }/search/+page.svelte    |   0
 32 files changed, 241 insertions(+), 420 deletions(-)
 rename src/{lib/styles => }/app.postcss (100%)
 delete mode 100644 src/routes/(app)/+layout.svelte
 delete mode 100644 src/routes/(auth)/+layout.svelte
 rename src/routes/{(app) => (protected)}/admin/+layout.server.ts (100%)
 rename src/routes/{(app) => (protected)}/admin/+layout.svelte (100%)
 rename src/routes/{(app) => (protected)}/admin/+page.svelte (100%)
 rename src/routes/{(app) => }/(protected)/collection/+page.server.ts (98%)
 rename src/routes/{(app) => }/(protected)/collection/+page.svelte (100%)
 rename src/routes/{(app) => }/(protected)/list/+layout.server.ts (100%)
 rename src/routes/{(app) => }/(protected)/list/+layout.svelte (100%)
 rename src/routes/{(app) => }/(protected)/list/[id]/+page.server.ts (100%)
 rename src/routes/{(app) => }/(protected)/list/[id]/+page.svelte (100%)
 rename src/routes/{(app) => }/(protected)/profile/+page.server.ts (100%)
 rename src/routes/{(app) => }/(protected)/profile/+page.svelte (100%)
 rename src/routes/{(app) => }/(protected)/wishlist/+page.server.ts (100%)
 rename src/routes/{(app) => }/(protected)/wishlist/+page.svelte (100%)
 rename src/routes/{(app) => }/+error.svelte (100%)
 rename src/routes/{(app) => }/+page.server.ts (100%)
 rename src/routes/{(app) => }/+page.svelte (100%)
 rename src/routes/{(app) => }/about/+page.svelte (100%)
 rename src/routes/{(app) => }/about/+page.ts (100%)
 rename src/{lib/utils => routes}/api.ts (100%)
 rename src/routes/{(app) => }/game/[id]/+error.svelte (100%)
 rename src/routes/{(app) => }/game/[id]/+page.server.ts (96%)
 rename src/routes/{(app) => }/game/[id]/+page.svelte (99%)
 rename src/routes/{(app) => }/search/+error.svelte (100%)
 rename src/routes/{(app) => }/search/+page.server.ts (100%)
 rename src/routes/{(app) => }/search/+page.svelte (100%)

diff --git a/components.json b/components.json
index d9e3cc8..16aece3 100644
--- a/components.json
+++ b/components.json
@@ -1,13 +1,13 @@
 {
-	"$schema": "https://shadcn-svelte.com/schema.json",
-	"style": "default",
-	"tailwind": {
-		"config": "tailwind.config.js",
-		"css": "src/lib/styles/app.postcss",
-		"baseColor": "slate"
-	},
-	"aliases": {
-		"components": "$lib/components",
-		"utils": "$lib/utils"
-	}
-}
+  "$schema": "https://shadcn-svelte.com/schema.json",
+  "style": "default",
+  "tailwind": {
+    "config": "tailwind.config.js",
+    "css": "src/app.postcss",
+    "baseColor": "slate"
+  },
+  "aliases": {
+    "components": "$lib/components",
+    "utils": "$lib/utils"
+  }
+}
\ No newline at end of file
diff --git a/src/lib/styles/app.postcss b/src/app.postcss
similarity index 100%
rename from src/lib/styles/app.postcss
rename to src/app.postcss
diff --git a/src/routes/(app)/+layout.svelte b/src/routes/(app)/+layout.svelte
deleted file mode 100644
index 42d44db..0000000
--- a/src/routes/(app)/+layout.svelte
+++ /dev/null
@@ -1,213 +0,0 @@
-<script lang="ts">
-	// import "../app.postcss";
-	import { onMount } from "svelte";
-	import { getFlash } from 'sveltekit-flash-message/client';
-	import toast, { Toaster } from 'svelte-french-toast';
-  import { navigating, page } from '$app/stores';
-	import { browser } from '$app/environment';
-	import debounce from 'just-debounce-it';
-	import 'iconify-icon';
-	import Transition from '$lib/components/transition/index.svelte';
-	import Analytics from '$lib/components/analytics.svelte';
-	import Header from '$lib/components/header/index.svelte';
-	import Footer from '$lib/components/footer.svelte';
-	import Loading from '$lib/components/loading.svelte';
-	import Portal from '$lib/Portal.svelte';
-	import { boredState } from '$lib/stores/boredState';
-	import { collectionStore } from '$lib/stores/collectionStore';
-	import { wishlistStore } from '$lib/stores/wishlistStore';
-	import { theme } from '$state/theme';
-	import type { SavedGameType } from '$lib/types';
-
-	$: {
-		if ($navigating) {
-			debounce(() => {
-				boredState.update((n) => ({ ...n, loading: true }));
-			}, 250);
-		}
-		if (!$navigating) {
-			boredState.update((n) => ({ ...n, loading: false }));
-		}
-	}
-
-	$: isOpen = $boredState?.dialog?.isOpen;
-
-	if (browser) {
-	const collator = new Intl.Collator('en');
-
-	let collectionEmpty = $collectionStore.length === 0 || false;
-	let wishlistEmpty = $wishlistStore.length === 0 || false;
-	if (wishlistEmpty && localStorage?.wishlist && localStorage?.wishlist?.length !== 0) {
-		const wishlist: SavedGameType[] = JSON.parse(localStorage.wishlist);
-		if (wishlist?.length !== 0) {
-			wishlist.sort((a, b) => collator.compare(a.name, b.name));
-			for (const item of wishlist) {
-				if (!item?.searchTerms) {
-					item.searchTerms = `${item?.name?.toLowerCase()}`;
-				}
-				if (!item?.includeInRandom) {
-					item.includeInRandom = false;
-				}
-			}
-			wishlistStore.addAll(wishlist);
-		}
-	}
-	if (collectionEmpty && localStorage?.collection && localStorage?.collection?.length !== 0) {
-		const collection: SavedGameType[] = JSON.parse(localStorage.collection);
-		if (collection?.length !== 0) {
-			collection.sort((a, b) => collator.compare(a.name, b.name));
-			for (const item of collection) {
-				if (!item?.searchTerms) {
-					item.searchTerms = `${item?.name?.toLowerCase()}`;
-				}
-			}
-			collectionStore.addAll(collection);
-		}
-	}
-}
-
-	const dev = process.env.NODE_ENV !== 'production';
-
-	export let data;
-	$: ({ user } = data);
-
-	const flash = getFlash(page, {
-		clearAfterMs: 6000
-	});
-	let flashType;
-	let flashMessage;
-	$: flashType = $flash?.type;
-	$: flashMessage = $flash?.message;
-
-	// if ($flash && flashType && flashMessage) {
-	// 	switch (flashType) {
-	// 		case 'success':
-	// 			toast.success(flashMessage);
-	// 			break;
-	// 		case 'error':
-	// 			toast.error(flashMessage);
-	// 			break;
-	// 		default:
-	// 			toast.error(flashMessage);
-	// 	}
-	// }
-
-	onMount(() => {
-		// set the theme to the user's active theme
-		$theme = user?.theme || 'system';
-		document.querySelector('html')?.setAttribute('data-theme', $theme);
-	});
-
-	flash.subscribe(($flash) => {
-		if (!$flash) return;
-
-		if ($flash.type == 'success') {
-			toast.success($flash.message);
-		} else {
-			toast.error($flash.message, {
-				duration: 5000
-			});
-		}
-
-		// Clearing the flash message could sometimes
-		// be required here to avoid double-toasting.
-		flash.set(undefined);
-	});
-</script>
-
-{#if !dev}
-	<Analytics />
-{/if}
-
-<div class="wrapper">
-	<Header user={data.user} />
-
-	<main>
-		<Transition url={data.url} transition={{ type: 'page' }}>
-			<slot />
-		</Transition>
-	</main>
-
-	<Footer />
-</div>
-
-<Toaster />
-
-{#if $boredState?.loading}
-	<Portal>
-			<div class="loading">
-				<Loading></Loading>
-				<h3>Loading...</h3>
-			</div>
-		<div class="background"></div>
-	</Portal>
-{/if}
-{#if isOpen}
-	<div class="container">
-		<svelte:component this={$boredState?.dialog?.content}></svelte:component>
-	</div>
-{/if}
-
-<style lang="postcss">
-	.flash {
-		display: inline-block;
-		position: absolute;
-		place-items: center;
-		padding: 0.5rem;
-		border-radius: 2px;
-	}
-
-	.loading {
-		position: fixed;
-		top: 50%;
-		left: 50%;
-		transform: translate(-50%, -50%);
-		z-index: 101;
-		display: grid;
-		place-items: center;
-		gap: 1rem;
-
-		& h3 {
-			color: white;
-		}
-	}
-
-	.background {
-		background: black;
-		opacity: 0.8;
-		cursor: none;
-		inset: 0;
-		position: fixed;
-		z-index: 100;
-	}
-
-	.wrapper {
-		display: grid;
-		grid-template-rows: auto 1fr auto;
-		min-height: 100vh;
-	}
-
-	main {
-		flex: 1;
-		display: flex;
-		flex-direction: column;
-		max-width: 850px;
-		margin: 0 auto;
-		padding: 2rem 0rem;
-		max-width: 80vw;
-
-		@media (min-width: 1600px) {
-			max-width: 70vw;
-		}
-
-		box-sizing: border-box;
-	}
-
-	:global(.dialog-overlay) {
-		position: fixed;
-		inset: 0;
-		z-index: 100;
-		background-color: rgb(0 0 0);
-		opacity: 0.8;
-	}
-</style>
diff --git a/src/routes/(auth)/+layout.svelte b/src/routes/(auth)/+layout.svelte
deleted file mode 100644
index 95d9e6e..0000000
--- a/src/routes/(auth)/+layout.svelte
+++ /dev/null
@@ -1,156 +0,0 @@
-<script lang="ts">
-	import { page } from "$app/stores";
-	import { Button } from "$lib/components/ui/button";
-	import Logo from "$lib/components/logo.svelte";
-
-	$: link = {
-		label: $page.url.pathname === "/sign-up" ? "Login" : "Sign up",
-		href: $page.url.pathname === "/sign-up" ? "/login" : "/sign-up"
-	};
-
-	$: console.log($page.url.pathname);
-</script>
-
-<div class="container">
-	<Button
-		href={$page.url.pathname === "/sign-up" ? "/login" : "/sign-up"}
-		variant="ghost"
-		class="auth-button"
-	>
-		{#if $page.url.pathname === "/sign-up"}
-			Login
-		{:else}
-			Sign up
-		{/if}
-	</Button>
-	<div class="auth-marketing">
-		<div
-			class="image"
-			style="
-				background-image:
-					url(https://images.unsplash.com/photo-1588591795084-1770cb3be374?ixlib=rb-4.0.3&ixid=M3wxMjA3fDB8MHxwaG90by1wYWdlfHx8fGVufDB8fHx8fA%3D%3D&auto=format&fit=crop&w=2070&q=80"
-		/>
-		<a href="/" class="logo">
-			<div class="logo-image">
-				<Logo />
-			</div>
-			Bored Game
-		</a>
-		<div class="quote-wrapper">
-			<blockquote class="quote">
-				<p>
-					"How many games do I own? What was the last one I played? What haven't I played in a long time? If this sound like you then Bored Game is your new best friend."
-				</p>
-				<footer>Bradley</footer>
-			</blockquote>
-		</div>
-	</div>
-
-	<div class="auth-form">
-		<slot />
-	</div>
-</div>
-
-<style lang="postcss">
-	.container {
-		display: none;
-		position: relative;
-		flex-direction: column;
-		justify-content: center;
-		align-items: center;
-		height: 100%;
-		min-height: 100vh;
-
-		@media (min-width: 768px) {
-			display: grid
-		}
-		@media (min-width: 1024px) {
-			padding-left: 0;
-			padding-right: 0;
-			grid-template-columns: repeat(2, minmax(0, 1fr));
-			max-width: none;
-		}
-	}
-
-	:global(.auth-button) {
-		position: absolute;
-		top: 1rem;
-		right: 1rem;
-
-		@media (min-width: 768px) {
-			top: 2rem;
-			right: 2rem;
-		}
-	}
-
-	.auth-marketing {
-		display: none;
-		position: relative;
-		padding: 2.5rem;
-		flex-direction: column;
-		height: 100%;
-		color: #ffffff;
-
-		@media (min-width: 1024px) {
-			display: flex;
-		}
-
-		.image {
-			position: absolute;
-			top: 0;
-			right: 0;
-			bottom: 0;
-			left: 0;
-			background-size: cover;
-		}
-
-		.logo {
-			display: flex;
-			position: relative;
-			z-index: 20;
-			gap: 0.5rem;
-			align-items: center;
-			font-size: 1.125rem;
-			line-height: 1.75rem;
-			font-weight: 500;
-			transition-property: color, background-color, border-color,text-decoration-color, fill, stroke;
-			transition-timing-function: cubic-bezier(0.4, 0, 0.2, 1);
-			transition-duration: 300ms;
-
-			&:hover {
-				color: hsl(var(--muted-foreground));
-			}
-
-			.logo-image {
-				width: 2rem;
-				height: 2rem;
-			}
-		}
-
-		.quote-wrapper {
-			position: relative;
-			z-index: 20;
-			margin-top: auto;
-
-			.quote {
-				margin-top: 0.5rem;
-
-				p {
-					font-size: 1.125rem;
-					line-height: 1.75rem;
-				}
-			}
-
-			.footer {
-				font-size: 0.875rem;
-				line-height: 1.25rem;
-			}
-		}
-	}
-
-	.auth-form {
-		@media (min-width: 1024px) {
-			padding: 2rem;
-		}
-	}
-</style>
\ No newline at end of file
diff --git a/src/routes/(auth)/login/+page.svelte b/src/routes/(auth)/login/+page.svelte
index 04c83ba..eb9e50f 100644
--- a/src/routes/(auth)/login/+page.svelte
+++ b/src/routes/(auth)/login/+page.svelte
@@ -45,17 +45,19 @@
 </svelte:head>
 
 <div class="login">
-	<form method="POST" use:enhance class="grid max-w-sm items-center gap-2">
-		<h2
-			class="scroll-m-20 border-b pb-2 text-3xl font-semibold tracking-tight transition-colors first:mt-0"
-		>
-			Log into your account
-		</h2>
-		<Label for="username">Username</Label>
-		<Input type="text" id="username" name="username" placeholder="Username" autocomplete="username" data-invalid={$errors.username} bind:value={$form.username} required />
-		<Label for="password">Password</Label>
-		<Input type="password" id="password" name="password" placeholder="Password" autocomplete="password" data-invalid={$errors.password} bind:value={$form.password} required />
-		<Button type="submit">Login</Button>
+	<form method="POST" use:enhance>
+		<div class="grid w-full max-w-sm items-center gap-2">
+			<h2
+				class="scroll-m-20 border-b pb-2 text-3xl font-semibold tracking-tight transition-colors first:mt-0"
+			>
+				Log into your account
+			</h2>
+			<Label for="username">Username</Label>
+			<Input type="text" id="username" name="username" placeholder="Username" autocomplete="username" data-invalid={$errors.username} bind:value={$form.username} required />
+			<Label for="password">Password</Label>
+			<Input type="password" id="password" name="password" placeholder="Password" autocomplete="password" data-invalid={$errors.password} bind:value={$form.password} required />
+			<Button type="submit">Sign In</Button>
+		</div>
 	</form>
 	{#if $errors._errors}
 		<Alert.Root variant="destructive">
@@ -66,23 +68,11 @@
 			</Alert.Description>
 		</Alert.Root>
 	{/if}
-	<p class="px-8 text-center text-sm text-muted-foreground">
-		By clicking continue, you agree to our
-		<a href="/terms-of-service" class="underline underline-offset-4 hover:text-primary">
-			Terms of Service
-		</a>
-		and
-		<a href="/privacy" class="underline underline-offset-4 hover:text-primary"> Privacy Policy </a>
-		.
-	</p>
 </div>
 
 <style lang="postcss">
 	.login {
 		display: grid;
-		width: 100%;
-		max-width: 24rem;
-		margin-left: auto;
-		margin-right: auto;
+		gap: 2rem;
 	}
 </style>
\ No newline at end of file
diff --git a/src/routes/(auth)/sign-up/+page.svelte b/src/routes/(auth)/sign-up/+page.svelte
index 4fd0431..0dc6874 100644
--- a/src/routes/(auth)/sign-up/+page.svelte
+++ b/src/routes/(auth)/sign-up/+page.svelte
@@ -43,7 +43,7 @@
 	<title>Bored Game | Sign Up</title>
 </svelte:head>
 
-<div class="page sign-up">
+<div class="page">
 	<form method="POST" action="/sign-up" use:enhance>
 		<div class="grid w-full max-w-sm items-center gap-2.5">
 			<h2
@@ -120,12 +120,5 @@
   </form>
 </div>
 
-<style lang="postcss">
-	.sign-up {
-		display: grid;
-		width: 100%;
-		max-width: 24rem;
-		margin-left: auto;
-		margin-right: auto;
-	}
+<style scoped>
 </style>
\ No newline at end of file
diff --git a/src/routes/(app)/admin/+layout.server.ts b/src/routes/(protected)/admin/+layout.server.ts
similarity index 100%
rename from src/routes/(app)/admin/+layout.server.ts
rename to src/routes/(protected)/admin/+layout.server.ts
diff --git a/src/routes/(app)/admin/+layout.svelte b/src/routes/(protected)/admin/+layout.svelte
similarity index 100%
rename from src/routes/(app)/admin/+layout.svelte
rename to src/routes/(protected)/admin/+layout.svelte
diff --git a/src/routes/(app)/admin/+page.svelte b/src/routes/(protected)/admin/+page.svelte
similarity index 100%
rename from src/routes/(app)/admin/+page.svelte
rename to src/routes/(protected)/admin/+page.svelte
diff --git a/src/routes/(app)/(protected)/collection/+page.server.ts b/src/routes/(protected)/collection/+page.server.ts
similarity index 98%
rename from src/routes/(app)/(protected)/collection/+page.server.ts
rename to src/routes/(protected)/collection/+page.server.ts
index 6a47057..cd0d789 100644
--- a/src/routes/(app)/(protected)/collection/+page.server.ts
+++ b/src/routes/(protected)/collection/+page.server.ts
@@ -1,6 +1,6 @@
 import { error, fail, redirect } from '@sveltejs/kit';
 import { setError, superValidate } from 'sveltekit-superforms/server';
-import type { PageServerLoad } from '../../../$types.js';
+import type { PageServerLoad } from '../../$types.js';
 import prisma from '$lib/prisma.js';
 import { modifyListGameSchema, type ListGame } from '$lib/config/zod-schemas.js';
 import type { CollectionItemWithGame } from '$lib/types.js';
diff --git a/src/routes/(app)/(protected)/collection/+page.svelte b/src/routes/(protected)/collection/+page.svelte
similarity index 100%
rename from src/routes/(app)/(protected)/collection/+page.svelte
rename to src/routes/(protected)/collection/+page.svelte
diff --git a/src/routes/(app)/(protected)/list/+layout.server.ts b/src/routes/(protected)/list/+layout.server.ts
similarity index 100%
rename from src/routes/(app)/(protected)/list/+layout.server.ts
rename to src/routes/(protected)/list/+layout.server.ts
diff --git a/src/routes/(app)/(protected)/list/+layout.svelte b/src/routes/(protected)/list/+layout.svelte
similarity index 100%
rename from src/routes/(app)/(protected)/list/+layout.svelte
rename to src/routes/(protected)/list/+layout.svelte
diff --git a/src/routes/(app)/(protected)/list/[id]/+page.server.ts b/src/routes/(protected)/list/[id]/+page.server.ts
similarity index 100%
rename from src/routes/(app)/(protected)/list/[id]/+page.server.ts
rename to src/routes/(protected)/list/[id]/+page.server.ts
diff --git a/src/routes/(app)/(protected)/list/[id]/+page.svelte b/src/routes/(protected)/list/[id]/+page.svelte
similarity index 100%
rename from src/routes/(app)/(protected)/list/[id]/+page.svelte
rename to src/routes/(protected)/list/[id]/+page.svelte
diff --git a/src/routes/(app)/(protected)/profile/+page.server.ts b/src/routes/(protected)/profile/+page.server.ts
similarity index 100%
rename from src/routes/(app)/(protected)/profile/+page.server.ts
rename to src/routes/(protected)/profile/+page.server.ts
diff --git a/src/routes/(app)/(protected)/profile/+page.svelte b/src/routes/(protected)/profile/+page.svelte
similarity index 100%
rename from src/routes/(app)/(protected)/profile/+page.svelte
rename to src/routes/(protected)/profile/+page.svelte
diff --git a/src/routes/(app)/(protected)/wishlist/+page.server.ts b/src/routes/(protected)/wishlist/+page.server.ts
similarity index 100%
rename from src/routes/(app)/(protected)/wishlist/+page.server.ts
rename to src/routes/(protected)/wishlist/+page.server.ts
diff --git a/src/routes/(app)/(protected)/wishlist/+page.svelte b/src/routes/(protected)/wishlist/+page.svelte
similarity index 100%
rename from src/routes/(app)/(protected)/wishlist/+page.svelte
rename to src/routes/(protected)/wishlist/+page.svelte
diff --git a/src/routes/(app)/+error.svelte b/src/routes/+error.svelte
similarity index 100%
rename from src/routes/(app)/+error.svelte
rename to src/routes/+error.svelte
diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte
index 726d501..4ec91ac 100644
--- a/src/routes/+layout.svelte
+++ b/src/routes/+layout.svelte
@@ -1,7 +1,213 @@
 <script lang="ts">
-	import "$lib/styles/app.postcss";
+	import "../app.postcss";
+	import { onMount } from "svelte";
+	import { getFlash } from 'sveltekit-flash-message/client';
+	import toast, { Toaster } from 'svelte-french-toast';
+  import { navigating, page } from '$app/stores';
+	import { browser } from '$app/environment';
+	import debounce from 'just-debounce-it';
+	import 'iconify-icon';
+	import Transition from '$lib/components/transition/index.svelte';
+	import Analytics from '$lib/components/analytics.svelte';
+	import Header from '$lib/components/header/index.svelte';
+	import Footer from '$lib/components/footer.svelte';
+	import Loading from '$lib/components/loading.svelte';
+	import Portal from '$lib/Portal.svelte';
+	import { boredState } from '$lib/stores/boredState';
+	import { collectionStore } from '$lib/stores/collectionStore';
+	import { wishlistStore } from '$lib/stores/wishlistStore';
+	import { theme } from '$state/theme';
+	import type { SavedGameType } from '$lib/types';
+
+	$: {
+		if ($navigating) {
+			debounce(() => {
+				boredState.update((n) => ({ ...n, loading: true }));
+			}, 250);
+		}
+		if (!$navigating) {
+			boredState.update((n) => ({ ...n, loading: false }));
+		}
+	}
+
+	$: isOpen = $boredState?.dialog?.isOpen;
+
+	if (browser) {
+	const collator = new Intl.Collator('en');
+
+	let collectionEmpty = $collectionStore.length === 0 || false;
+	let wishlistEmpty = $wishlistStore.length === 0 || false;
+	if (wishlistEmpty && localStorage?.wishlist && localStorage?.wishlist?.length !== 0) {
+		const wishlist: SavedGameType[] = JSON.parse(localStorage.wishlist);
+		if (wishlist?.length !== 0) {
+			wishlist.sort((a, b) => collator.compare(a.name, b.name));
+			for (const item of wishlist) {
+				if (!item?.searchTerms) {
+					item.searchTerms = `${item?.name?.toLowerCase()}`;
+				}
+				if (!item?.includeInRandom) {
+					item.includeInRandom = false;
+				}
+			}
+			wishlistStore.addAll(wishlist);
+		}
+	}
+	if (collectionEmpty && localStorage?.collection && localStorage?.collection?.length !== 0) {
+		const collection: SavedGameType[] = JSON.parse(localStorage.collection);
+		if (collection?.length !== 0) {
+			collection.sort((a, b) => collator.compare(a.name, b.name));
+			for (const item of collection) {
+				if (!item?.searchTerms) {
+					item.searchTerms = `${item?.name?.toLowerCase()}`;
+				}
+			}
+			collectionStore.addAll(collection);
+		}
+	}
+}
+
+	const dev = process.env.NODE_ENV !== 'production';
+
+	export let data;
+	$: ({ user } = data);
+
+	const flash = getFlash(page, {
+		clearAfterMs: 6000
+	});
+	let flashType;
+	let flashMessage;
+	$: flashType = $flash?.type;
+	$: flashMessage = $flash?.message;
+
+	// if ($flash && flashType && flashMessage) {
+	// 	switch (flashType) {
+	// 		case 'success':
+	// 			toast.success(flashMessage);
+	// 			break;
+	// 		case 'error':
+	// 			toast.error(flashMessage);
+	// 			break;
+	// 		default:
+	// 			toast.error(flashMessage);
+	// 	}
+	// }
+
+	onMount(() => {
+		// set the theme to the user's active theme
+		$theme = user?.theme || 'system';
+		document.querySelector('html')?.setAttribute('data-theme', $theme);
+	});
+
+	flash.subscribe(($flash) => {
+		if (!$flash) return;
+
+		if ($flash.type == 'success') {
+			toast.success($flash.message);
+		} else {
+			toast.error($flash.message, {
+				duration: 5000
+			});
+		}
+
+		// Clearing the flash message could sometimes
+		// be required here to avoid double-toasting.
+		flash.set(undefined);
+	});
 </script>
 
-<div class="relative flex min-h-screen flex-col">
-	<slot />
-</div>
\ No newline at end of file
+{#if !dev}
+	<Analytics />
+{/if}
+
+<div class="wrapper">
+	<Header user={data.user} />
+
+	<main>
+		<Transition url={data.url} transition={{ type: 'page' }}>
+			<slot />
+		</Transition>
+	</main>
+
+	<Footer />
+</div>
+
+<Toaster />
+
+{#if $boredState?.loading}
+	<Portal>
+			<div class="loading">
+				<Loading></Loading>
+				<h3>Loading...</h3>
+			</div>
+		<div class="background"></div>
+	</Portal>
+{/if}
+{#if isOpen}
+	<div class="container">
+		<svelte:component this={$boredState?.dialog?.content}></svelte:component>
+	</div>
+{/if}
+
+<style lang="postcss">
+	.flash {
+		display: inline-block;
+		position: absolute;
+		place-items: center;
+		padding: 0.5rem;
+		border-radius: 2px;
+	}
+
+	.loading {
+		position: fixed;
+		top: 50%;
+		left: 50%;
+		transform: translate(-50%, -50%);
+		z-index: 101;
+		display: grid;
+		place-items: center;
+		gap: 1rem;
+
+		& h3 {
+			color: white;
+		}
+	}
+
+	.background {
+		background: black;
+		opacity: 0.8;
+		cursor: none;
+		inset: 0;
+		position: fixed;
+		z-index: 100;
+	}
+
+	.wrapper {
+		display: grid;
+		grid-template-rows: auto 1fr auto;
+		min-height: 100vh;
+	}
+
+	main {
+		flex: 1;
+		display: flex;
+		flex-direction: column;
+		max-width: 850px;
+		margin: 0 auto;
+		padding: 2rem 0rem;
+		max-width: 80vw;
+
+		@media (min-width: 1600px) {
+			max-width: 70vw;
+		}
+
+		box-sizing: border-box;
+	}
+
+	:global(.dialog-overlay) {
+		position: fixed;
+		inset: 0;
+		z-index: 100;
+		background-color: rgb(0 0 0);
+		opacity: 0.8;
+	}
+</style>
diff --git a/src/routes/(app)/+page.server.ts b/src/routes/+page.server.ts
similarity index 100%
rename from src/routes/(app)/+page.server.ts
rename to src/routes/+page.server.ts
diff --git a/src/routes/(app)/+page.svelte b/src/routes/+page.svelte
similarity index 100%
rename from src/routes/(app)/+page.svelte
rename to src/routes/+page.svelte
diff --git a/src/routes/(app)/about/+page.svelte b/src/routes/about/+page.svelte
similarity index 100%
rename from src/routes/(app)/about/+page.svelte
rename to src/routes/about/+page.svelte
diff --git a/src/routes/(app)/about/+page.ts b/src/routes/about/+page.ts
similarity index 100%
rename from src/routes/(app)/about/+page.ts
rename to src/routes/about/+page.ts
diff --git a/src/lib/utils/api.ts b/src/routes/api.ts
similarity index 100%
rename from src/lib/utils/api.ts
rename to src/routes/api.ts
diff --git a/src/routes/(app)/game/[id]/+error.svelte b/src/routes/game/[id]/+error.svelte
similarity index 100%
rename from src/routes/(app)/game/[id]/+error.svelte
rename to src/routes/game/[id]/+error.svelte
diff --git a/src/routes/(app)/game/[id]/+page.server.ts b/src/routes/game/[id]/+page.server.ts
similarity index 96%
rename from src/routes/(app)/game/[id]/+page.server.ts
rename to src/routes/game/[id]/+page.server.ts
index 2af373e..ae61aea 100644
--- a/src/routes/(app)/game/[id]/+page.server.ts
+++ b/src/routes/game/[id]/+page.server.ts
@@ -1,5 +1,6 @@
 import { error } from '@sveltejs/kit';
 import prisma from '$lib/prisma.js';
+import { boardGameApi } from '../../api';
 
 export const load = async ({ params, setHeaders, locals }) => {
 	try {
diff --git a/src/routes/(app)/game/[id]/+page.svelte b/src/routes/game/[id]/+page.svelte
similarity index 99%
rename from src/routes/(app)/game/[id]/+page.svelte
rename to src/routes/game/[id]/+page.svelte
index 994b9ea..07d1ea6 100644
--- a/src/routes/(app)/game/[id]/+page.svelte
+++ b/src/routes/game/[id]/+page.svelte
@@ -66,7 +66,7 @@
 			<AddToList {in_collection} {in_wishlist} game_id={game.id} {wishlist} {collection} />
 		{:else}
 			<span>
-				<Button href="/sign-up">Sign Up</Button> or <Button href="/login">Login</Button> to add to a list.
+				<Button href="/sign-up">Sign Up</Button> or <Button href="/login">Sign In</Button> to add to a list.
 			</span>
 		{/if}
 	</div>
diff --git a/src/routes/(app)/search/+error.svelte b/src/routes/search/+error.svelte
similarity index 100%
rename from src/routes/(app)/search/+error.svelte
rename to src/routes/search/+error.svelte
diff --git a/src/routes/(app)/search/+page.server.ts b/src/routes/search/+page.server.ts
similarity index 100%
rename from src/routes/(app)/search/+page.server.ts
rename to src/routes/search/+page.server.ts
diff --git a/src/routes/(app)/search/+page.svelte b/src/routes/search/+page.svelte
similarity index 100%
rename from src/routes/(app)/search/+page.svelte
rename to src/routes/search/+page.svelte

From 2781774758ae23f6366222bdb80136dd00748031 Mon Sep 17 00:00:00 2001
From: Bradley Shellnut <bradleyshellnut@pm.me>
Date: Tue, 12 Sep 2023 10:56:58 -0700
Subject: [PATCH 2/2] Update prisma fix landing.

---
 package.json                                  |  2 +-
 pnpm-lock.yaml                                | 20 +++++++++----------
 src/lib/components/search/random/index.svelte |  2 --
 src/routes/+page.svelte                       |  6 +++---
 4 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/package.json b/package.json
index 9c8e1a4..fc83f3b 100644
--- a/package.json
+++ b/package.json
@@ -73,7 +73,7 @@
 		"@lucia-auth/adapter-prisma": "^3.0.1",
 		"@lukeed/uuid": "^2.0.1",
 		"@melt-ui/svelte": "^0.37.6",
-		"@prisma/client": "5.1.1",
+		"@prisma/client": "5.2.0",
 		"@types/feather-icons": "^4.29.1",
 		"bits-ui": "^0.0.27",
 		"class-variance-authority": "^0.6.1",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index dd88e33..e84c5d6 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -22,7 +22,7 @@ dependencies:
     version: 2.0.0(lucia@2.4.2)
   '@lucia-auth/adapter-prisma':
     specifier: ^3.0.1
-    version: 3.0.1(@prisma/client@5.1.1)(lucia@2.4.2)
+    version: 3.0.1(@prisma/client@5.2.0)(lucia@2.4.2)
   '@lukeed/uuid':
     specifier: ^2.0.1
     version: 2.0.1
@@ -30,8 +30,8 @@ dependencies:
     specifier: ^0.37.6
     version: 0.37.6(svelte@4.2.0)
   '@prisma/client':
-    specifier: 5.1.1
-    version: 5.1.1(prisma@5.2.0)
+    specifier: 5.2.0
+    version: 5.2.0(prisma@5.2.0)
   '@types/feather-icons':
     specifier: ^4.29.1
     version: 4.29.1
@@ -1160,13 +1160,13 @@ packages:
       lucia: 2.4.2
     dev: false
 
-  /@lucia-auth/adapter-prisma@3.0.1(@prisma/client@5.1.1)(lucia@2.4.2):
+  /@lucia-auth/adapter-prisma@3.0.1(@prisma/client@5.2.0)(lucia@2.4.2):
     resolution: {integrity: sha512-JZNl+721M5ApjtNiH+WUYstiC8cffcI/Y9IzKsa0uUhQMIHl2ObCrgO0R3fgHnjWHBjhQoK36g/r/iSJIDppBA==}
     peerDependencies:
       '@prisma/client': ^4.2.0 || ^5.0.0
       lucia: ^2.0.0
     dependencies:
-      '@prisma/client': 5.1.1(prisma@5.2.0)
+      '@prisma/client': 5.2.0(prisma@5.2.0)
       lucia: 2.4.2
     dev: false
 
@@ -1265,8 +1265,8 @@ packages:
   /@polka/url@1.0.0-next.21:
     resolution: {integrity: sha512-a5Sab1C4/icpTZVzZc5Ghpz88yQtGOyNqYXcZgOssB2uuAr+wF/MvN6bgtW32q7HHrvBki+BsZ0OuNv6EV3K9g==}
 
-  /@prisma/client@5.1.1(prisma@5.2.0):
-    resolution: {integrity: sha512-fxcCeK5pMQGcgCqCrWsi+I2rpIbk0rAhdrN+ke7f34tIrgPwA68ensrpin+9+fZvuV2OtzHmuipwduSY6HswdA==}
+  /@prisma/client@5.2.0(prisma@5.2.0):
+    resolution: {integrity: sha512-AiTjJwR4J5Rh6Z/9ZKrBBLel3/5DzUNntMohOy7yObVnVoTNVFi2kvpLZlFuKO50d7yDspOtW6XBpiAd0BVXbQ==}
     engines: {node: '>=16.13'}
     requiresBuild: true
     peerDependencies:
@@ -1275,12 +1275,12 @@ packages:
       prisma:
         optional: true
     dependencies:
-      '@prisma/engines-version': 5.1.1-1.6a3747c37ff169c90047725a05a6ef02e32ac97e
+      '@prisma/engines-version': 5.2.0-25.2804dc98259d2ea960602aca6b8e7fdc03c1758f
       prisma: 5.2.0
     dev: false
 
-  /@prisma/engines-version@5.1.1-1.6a3747c37ff169c90047725a05a6ef02e32ac97e:
-    resolution: {integrity: sha512-owZqbY/wucbr65bXJ/ljrHPgQU5xXTSkmcE/JcbqE1kusuAXV/TLN3/exmz21SZ5rJ7WDkyk70J2G/n68iogbQ==}
+  /@prisma/engines-version@5.2.0-25.2804dc98259d2ea960602aca6b8e7fdc03c1758f:
+    resolution: {integrity: sha512-jsnKT5JIDIE01lAeCj2ghY9IwxkedhKNvxQeoyLs6dr4ZXynetD0vTy7u6wMJt8vVPv8I5DPy/I4CFaoXAgbtg==}
     dev: false
 
   /@prisma/engines@5.2.0:
diff --git a/src/lib/components/search/random/index.svelte b/src/lib/components/search/random/index.svelte
index 7086ac6..2075152 100644
--- a/src/lib/components/search/random/index.svelte
+++ b/src/lib/components/search/random/index.svelte
@@ -3,9 +3,7 @@
 	import type { SearchSchema } from '$lib/zodValidation';
 	import { boredState } from '$lib/stores/boredState';
 	import { gameStore } from '$lib/stores/gameSearchStore';
-	import { ToastType } from '$lib/types';
   import { superForm } from 'sveltekit-superforms/client';
-	import { toast } from '../../toast/toast';
 	import { Button } from '$components/ui/button';
 
 	export let data: SuperValidated<SearchSchema>;
diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte
index a7017f7..d7e43a5 100644
--- a/src/routes/+page.svelte
+++ b/src/routes/+page.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
-	import TextSearch from '$lib/components/search/textSearch/index.svelte';
+	// import TextSearch from '$lib/components/search/textSearch/index.svelte';
 	import RandomSearch from '$lib/components/search/random/index.svelte';
-	import Random from '$lib/components/random/index.svelte';
+	// import Random from '$lib/components/random/index.svelte';
 
 	export let data;
 	export let formData;
@@ -21,7 +21,7 @@
 		<p>Or pick a random game!</p>
 		<div class="random-buttons">
 			<RandomSearch data={data.form} />
-			<Random />
+			<!-- <Random /> -->
 		</div>
 	</section>
 	<!-- <TextSearch showButton advancedSearch data={data.form} /> -->