diff --git a/components.json b/components.json index 16aece3..d9e3cc8 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/app.postcss", - "baseColor": "slate" - }, - "aliases": { - "components": "$lib/components", - "utils": "$lib/utils" - } -} \ No newline at end of file + "$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" + } +} diff --git a/src/app.postcss b/src/lib/styles/app.postcss similarity index 100% rename from src/app.postcss rename to src/lib/styles/app.postcss diff --git a/src/routes/(protected)/collection/+page.server.ts b/src/routes/(app)/(protected)/collection/+page.server.ts similarity index 98% rename from src/routes/(protected)/collection/+page.server.ts rename to src/routes/(app)/(protected)/collection/+page.server.ts index cd0d789..6a47057 100644 --- a/src/routes/(protected)/collection/+page.server.ts +++ b/src/routes/(app)/(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/(protected)/collection/+page.svelte b/src/routes/(app)/(protected)/collection/+page.svelte similarity index 100% rename from src/routes/(protected)/collection/+page.svelte rename to src/routes/(app)/(protected)/collection/+page.svelte diff --git a/src/routes/(protected)/list/+layout.server.ts b/src/routes/(app)/(protected)/list/+layout.server.ts similarity index 100% rename from src/routes/(protected)/list/+layout.server.ts rename to src/routes/(app)/(protected)/list/+layout.server.ts diff --git a/src/routes/(protected)/list/+layout.svelte b/src/routes/(app)/(protected)/list/+layout.svelte similarity index 100% rename from src/routes/(protected)/list/+layout.svelte rename to src/routes/(app)/(protected)/list/+layout.svelte diff --git a/src/routes/(protected)/list/[id]/+page.server.ts b/src/routes/(app)/(protected)/list/[id]/+page.server.ts similarity index 100% rename from src/routes/(protected)/list/[id]/+page.server.ts rename to src/routes/(app)/(protected)/list/[id]/+page.server.ts diff --git a/src/routes/(protected)/list/[id]/+page.svelte b/src/routes/(app)/(protected)/list/[id]/+page.svelte similarity index 100% rename from src/routes/(protected)/list/[id]/+page.svelte rename to src/routes/(app)/(protected)/list/[id]/+page.svelte diff --git a/src/routes/(protected)/profile/+page.server.ts b/src/routes/(app)/(protected)/profile/+page.server.ts similarity index 100% rename from src/routes/(protected)/profile/+page.server.ts rename to src/routes/(app)/(protected)/profile/+page.server.ts diff --git a/src/routes/(protected)/profile/+page.svelte b/src/routes/(app)/(protected)/profile/+page.svelte similarity index 100% rename from src/routes/(protected)/profile/+page.svelte rename to src/routes/(app)/(protected)/profile/+page.svelte diff --git a/src/routes/(protected)/wishlist/+page.server.ts b/src/routes/(app)/(protected)/wishlist/+page.server.ts similarity index 100% rename from src/routes/(protected)/wishlist/+page.server.ts rename to src/routes/(app)/(protected)/wishlist/+page.server.ts diff --git a/src/routes/(protected)/wishlist/+page.svelte b/src/routes/(app)/(protected)/wishlist/+page.svelte similarity index 100% rename from src/routes/(protected)/wishlist/+page.svelte rename to src/routes/(app)/(protected)/wishlist/+page.svelte diff --git a/src/routes/+error.svelte b/src/routes/(app)/+error.svelte similarity index 100% rename from src/routes/+error.svelte rename to src/routes/(app)/+error.svelte diff --git a/src/routes/(app)/+layout.svelte b/src/routes/(app)/+layout.svelte new file mode 100644 index 0000000..42d44db --- /dev/null +++ b/src/routes/(app)/+layout.svelte @@ -0,0 +1,213 @@ + + +{#if !dev} + +{/if} + +
+
+ +
+ + + +
+ +
+
+ + + +{#if $boredState?.loading} + +
+ +

Loading...

+
+
+
+{/if} +{#if isOpen} +
+ +
+{/if} + + diff --git a/src/routes/+page.server.ts b/src/routes/(app)/+page.server.ts similarity index 100% rename from src/routes/+page.server.ts rename to src/routes/(app)/+page.server.ts diff --git a/src/routes/+page.svelte b/src/routes/(app)/+page.svelte similarity index 100% rename from src/routes/+page.svelte rename to src/routes/(app)/+page.svelte diff --git a/src/routes/about/+page.svelte b/src/routes/(app)/about/+page.svelte similarity index 100% rename from src/routes/about/+page.svelte rename to src/routes/(app)/about/+page.svelte diff --git a/src/routes/about/+page.ts b/src/routes/(app)/about/+page.ts similarity index 100% rename from src/routes/about/+page.ts rename to src/routes/(app)/about/+page.ts diff --git a/src/routes/(protected)/admin/+layout.server.ts b/src/routes/(app)/admin/+layout.server.ts similarity index 100% rename from src/routes/(protected)/admin/+layout.server.ts rename to src/routes/(app)/admin/+layout.server.ts diff --git a/src/routes/(protected)/admin/+layout.svelte b/src/routes/(app)/admin/+layout.svelte similarity index 100% rename from src/routes/(protected)/admin/+layout.svelte rename to src/routes/(app)/admin/+layout.svelte diff --git a/src/routes/(protected)/admin/+page.svelte b/src/routes/(app)/admin/+page.svelte similarity index 100% rename from src/routes/(protected)/admin/+page.svelte rename to src/routes/(app)/admin/+page.svelte diff --git a/src/routes/game/[id]/+error.svelte b/src/routes/(app)/game/[id]/+error.svelte similarity index 100% rename from src/routes/game/[id]/+error.svelte rename to src/routes/(app)/game/[id]/+error.svelte diff --git a/src/routes/game/[id]/+page.server.ts b/src/routes/(app)/game/[id]/+page.server.ts similarity index 100% rename from src/routes/game/[id]/+page.server.ts rename to src/routes/(app)/game/[id]/+page.server.ts diff --git a/src/routes/game/[id]/+page.svelte b/src/routes/(app)/game/[id]/+page.svelte similarity index 99% rename from src/routes/game/[id]/+page.svelte rename to src/routes/(app)/game/[id]/+page.svelte index 07d1ea6..994b9ea 100644 --- a/src/routes/game/[id]/+page.svelte +++ b/src/routes/(app)/game/[id]/+page.svelte @@ -66,7 +66,7 @@ {:else} - or to add to a list. + or to add to a list. {/if} diff --git a/src/routes/search/+error.svelte b/src/routes/(app)/search/+error.svelte similarity index 100% rename from src/routes/search/+error.svelte rename to src/routes/(app)/search/+error.svelte diff --git a/src/routes/search/+page.server.ts b/src/routes/(app)/search/+page.server.ts similarity index 100% rename from src/routes/search/+page.server.ts rename to src/routes/(app)/search/+page.server.ts diff --git a/src/routes/search/+page.svelte b/src/routes/(app)/search/+page.svelte similarity index 100% rename from src/routes/search/+page.svelte rename to src/routes/(app)/search/+page.svelte diff --git a/src/routes/(auth)/+layout.svelte b/src/routes/(auth)/+layout.svelte new file mode 100644 index 0000000..95d9e6e --- /dev/null +++ b/src/routes/(auth)/+layout.svelte @@ -0,0 +1,156 @@ + + +
+ +
+
+ +
+
+

+ "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." +

+
Bradley
+
+
+
+ +
+ +
+
+ + \ No newline at end of file diff --git a/src/routes/(auth)/login/+page.svelte b/src/routes/(auth)/login/+page.svelte index eb9e50f..04c83ba 100644 --- a/src/routes/(auth)/login/+page.svelte +++ b/src/routes/(auth)/login/+page.svelte @@ -45,19 +45,17 @@ \ 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 0dc6874..4fd0431 100644 --- a/src/routes/(auth)/sign-up/+page.svelte +++ b/src/routes/(auth)/sign-up/+page.svelte @@ -43,7 +43,7 @@ Bored Game | Sign Up -
+