From 529e261023319d9b813e01d6f78aaadefb9c0107 Mon Sep 17 00:00:00 2001 From: Eclypsed Date: Sun, 21 Jan 2024 01:48:49 -0500 Subject: [PATCH] Redoing account section --- src/hooks.server.js | 2 +- src/lib/components/utility/navbar.svelte | 25 ------- src/routes/(app)/+layout.svelte | 28 +++++--- src/routes/(app)/account/+page.svelte | 30 ++++++++ src/routes/{(app) => (settings)}/+layout.js | 0 src/routes/(settings)/settings/+layout.svelte | 70 ++++--------------- src/routes/(settings)/settings/+page.svelte | 57 ++++++++++++--- src/routes/+layout.server.js | 8 +++ src/routes/+layout.svelte | 2 +- 9 files changed, 117 insertions(+), 105 deletions(-) delete mode 100644 src/lib/components/utility/navbar.svelte create mode 100644 src/routes/(app)/account/+page.svelte rename src/routes/{(app) => (settings)}/+layout.js (100%) create mode 100644 src/routes/+layout.server.js diff --git a/src/hooks.server.js b/src/hooks.server.js index b48df33..a31d3b1 100644 --- a/src/hooks.server.js +++ b/src/hooks.server.js @@ -4,7 +4,7 @@ import jwt from 'jsonwebtoken' /** @type {import('@sveltejs/kit').Handle} */ export async function handle({ event, resolve }) { - const nonProtectedRoutes = ['/login'] + const nonProtectedRoutes = ['/login', '/api'] const urlpath = event.url.pathname if (urlpath.startsWith('/api') && event.request.headers.get('apikey') !== SECRET_INTERNAL_API_KEY && event.url.searchParams.get('apikey') !== SECRET_INTERNAL_API_KEY) { diff --git a/src/lib/components/utility/navbar.svelte b/src/lib/components/utility/navbar.svelte deleted file mode 100644 index 253d6b7..0000000 --- a/src/lib/components/utility/navbar.svelte +++ /dev/null @@ -1,25 +0,0 @@ - - - - - diff --git a/src/routes/(app)/+layout.svelte b/src/routes/(app)/+layout.svelte index 5680b7b..31d961b 100644 --- a/src/routes/(app)/+layout.svelte +++ b/src/routes/(app)/+layout.svelte @@ -11,14 +11,18 @@ header: 'Home', icon: 'fa-solid fa-house', }, - '/library': { - header: 'Libray', - icon: 'fa-solid fa-bars-staggered', + '/account': { + header: data.username, + icon: 'fa-solid fa-user', }, '/search': { header: 'Search', icon: 'fa-solid fa-search', }, + '/library': { + header: 'Libray', + icon: 'fa-solid fa-bars-staggered', + }, } const pageTransitionTime = 200 @@ -71,17 +75,21 @@ {#if $pageWidth >= 768}
-
+
{#each Object.entries(contentTabs) as [page, tabData]} {#if data.url === page} - {:else} - {/if} {/each} diff --git a/src/routes/(app)/account/+page.svelte b/src/routes/(app)/account/+page.svelte new file mode 100644 index 0000000..6a04224 --- /dev/null +++ b/src/routes/(app)/account/+page.svelte @@ -0,0 +1,30 @@ + + +
+
+
+
+ +
+
+
{data.username}
+
Other info about the user
+
+
+
+ + + + + + +
+
+
+
This is where things like history would go
+
+
diff --git a/src/routes/(app)/+layout.js b/src/routes/(settings)/+layout.js similarity index 100% rename from src/routes/(app)/+layout.js rename to src/routes/(settings)/+layout.js diff --git a/src/routes/(settings)/settings/+layout.svelte b/src/routes/(settings)/settings/+layout.svelte index 237a2dd..24d428e 100644 --- a/src/routes/(settings)/settings/+layout.svelte +++ b/src/routes/(settings)/settings/+layout.svelte @@ -1,68 +1,22 @@ -
- -
+
+

+ history.back()}> + + + Account +

+
-
+
diff --git a/src/routes/(settings)/settings/+page.svelte b/src/routes/(settings)/settings/+page.svelte index b0e21f8..bebbc8f 100644 --- a/src/routes/(settings)/settings/+page.svelte +++ b/src/routes/(settings)/settings/+page.svelte @@ -1,13 +1,50 @@ - -
- - + diff --git a/src/routes/+layout.server.js b/src/routes/+layout.server.js new file mode 100644 index 0000000..28979b3 --- /dev/null +++ b/src/routes/+layout.server.js @@ -0,0 +1,8 @@ +/** @type {import('./$types').LayoutLoad} */ +export const load = ({ url, locals }) => { + return { + url: url.pathname, + userId: locals.userId, + username: locals.username, + } +} diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte index 2d0405d..b16bec7 100644 --- a/src/routes/+layout.svelte +++ b/src/routes/+layout.svelte @@ -20,7 +20,7 @@ -
+