diff options
| -rw-r--r-- | src/components/AppHeader.svelte | 4 | ||||
| -rw-r--r-- | src/components/LandingHeader.svelte | 4 | ||||
| -rw-r--r-- | src/lib/utils.js | 2 | ||||
| -rw-r--r-- | src/routes/(app)/+layout.server.js | 2 | ||||
| -rw-r--r-- | src/routes/(app)/[username]/generate/+page.svelte | 2 | ||||
| -rw-r--r-- | src/routes/(app)/[username]/request/[id]/+page.svelte | 2 | ||||
| -rw-r--r-- | src/routes/(app)/register/+page.server.js | 4 | ||||
| -rw-r--r-- | src/routes/(app)/support/+page.svelte | 2 |
8 files changed, 11 insertions, 11 deletions
diff --git a/src/components/AppHeader.svelte b/src/components/AppHeader.svelte index d3a9b300..74afd7b9 100644 --- a/src/components/AppHeader.svelte +++ b/src/components/AppHeader.svelte @@ -39,10 +39,10 @@ > <nav class="flex justify-end items-center space-x-4 p-5"> {#if user} - <a href={`/${user.username}/dashboard`}> + <a href={`/${user.username}`}> <button class="bg-white p-2 rounded-full w-12 h-12 md:w-16 md:h-16 drop-shadow-xl border border-black/10 {$page - .url.pathname === `/${user.username}/dashboard` + .url.pathname === `/${user.username}` ? 'opacity-100' : 'opacity-70 hover:opacity-80'}" ><Icon icon="home" style="mx-auto w-6 md:w-8" /> diff --git a/src/components/LandingHeader.svelte b/src/components/LandingHeader.svelte index f7317a58..2c3bcd6a 100644 --- a/src/components/LandingHeader.svelte +++ b/src/components/LandingHeader.svelte @@ -54,7 +54,7 @@ {:else} <button class="border rounded-full px-6 py-2 font-bold" - on:click={() => goto(`/${user.username}/dashboard`)} + on:click={() => goto(`/${user.username}`)} >{$t('nav.account')} </button> <button @@ -102,7 +102,7 @@ {:else} <button class="border rounded-full px-6 py-2 font-bold block" - on:click={() => goto(`/${user.username}/dashboard`)} + on:click={() => goto(`/${user.username}`)} >{$t('nav.account')} </button> <button diff --git a/src/lib/utils.js b/src/lib/utils.js index ef1e997b..948696bb 100644 --- a/src/lib/utils.js +++ b/src/lib/utils.js @@ -86,7 +86,7 @@ export function reverseFormat(val, locale) { return Number.isNaN(reversedVal) ? 0 : +reversedVal; } -export let protectedRoutes = [/customers/, /dashboard/, /settings/, /payments/]; +export let protectedRoutes = [/customers/, /settings/, /payments/]; export const success = (m) => { toast.pop(); diff --git a/src/routes/(app)/+layout.server.js b/src/routes/(app)/+layout.server.js index 11337c2a..881dbccc 100644 --- a/src/routes/(app)/+layout.server.js +++ b/src/routes/(app)/+layout.server.js @@ -20,7 +20,7 @@ export async function load({ cookies, request, url, params }) { } if (user && ['/', '/login', '/register'].includes(pathname) && request.method === 'GET') { - throw redirect(307, `/${user.username}/dashboard`); + throw redirect(307, `/${user.username}`); } if ( diff --git a/src/routes/(app)/[username]/generate/+page.svelte b/src/routes/(app)/[username]/generate/+page.svelte index bd72592f..32a38592 100644 --- a/src/routes/(app)/[username]/generate/+page.svelte +++ b/src/routes/(app)/[username]/generate/+page.svelte @@ -37,7 +37,7 @@ try { user.pin = $pin; await post(`/${user.username}/generate`, user); - goto($loginRedirect || `/${user.username}/dashboard`, { invalidateAll: true }); + goto($loginRedirect || `/${user.username}`, { invalidateAll: true }); } catch (e) { $pin = ''; if (e.message?.startsWith('Pin')) { diff --git a/src/routes/(app)/[username]/request/[id]/+page.svelte b/src/routes/(app)/[username]/request/[id]/+page.svelte index b8dedbfc..bdd14f4a 100644 --- a/src/routes/(app)/[username]/request/[id]/+page.svelte +++ b/src/routes/(app)/[username]/request/[id]/+page.svelte @@ -45,7 +45,7 @@ </div> </div> -<a href={$requestRedirect || `/${user.username}/dashboard`}> +<a href={$requestRedirect || `/${user.username}`}> <div class="opacity-0 w-screen h-screen fixed top-0 left-0 z-50" /> </a> diff --git a/src/routes/(app)/register/+page.server.js b/src/routes/(app)/register/+page.server.js index 1d98136f..7799d5ae 100644 --- a/src/routes/(app)/register/+page.server.js +++ b/src/routes/(app)/register/+page.server.js @@ -3,7 +3,7 @@ import { post, login } from '$lib/utils'; export const load = async ({ parent }) => { let { user } = await parent(); - if (user) throw redirect(307, `/dashboard/${user.username}`); + if (user) throw redirect(307, `/${user.username}`); }; export const actions = { @@ -29,6 +29,6 @@ export const actions = { } if (error) return fail(400, { error }); - throw redirect(307, loginRedirect || `/${user.username}/dashboard`); + throw redirect(307, loginRedirect || `/${user.username}`); } }; diff --git a/src/routes/(app)/support/+page.svelte b/src/routes/(app)/support/+page.svelte index 0d2c2e5b..d00cc069 100644 --- a/src/routes/(app)/support/+page.svelte +++ b/src/routes/(app)/support/+page.svelte @@ -30,7 +30,7 @@ <h1 class="text-center text-3xl md:text-4xl font-semibold mb-8">Thank you!</h1> <p class="text-center mb-8">Someone will be in touch shortly.</p> - <a href={user ? `/${user.username}/dashboard` : '/'}> + <a href={user ? `/${user.username}` : '/'}> <button class="rounded-full border py-2 px-5 font-bold hover:opacity-80 w-full mb-2" >Done</button > |