From ec4b27f824ad218d75a5ba68addb7315f85ec92b Mon Sep 17 00:00:00 2001 From: Adam Soltys Date: Thu, 10 Nov 2022 18:27:12 -0800 Subject: fix redirect --- src/components/LandingHero.svelte | 19 ++++++++++--------- src/routes/(app)/redeem/[redeemcode]/+page.server.js | 6 +++--- src/routes/(app)/register/+page.server.js | 2 +- src/routes/(app)/voucher/[code]/+page.svelte | 2 +- src/routes/+page.svelte | 16 +++++++--------- 5 files changed, 22 insertions(+), 23 deletions(-) (limited to 'src') diff --git a/src/components/LandingHero.svelte b/src/components/LandingHero.svelte index 48e868ed..213138a2 100644 --- a/src/components/LandingHero.svelte +++ b/src/components/LandingHero.svelte @@ -23,15 +23,16 @@ > {$t('landing.subheader')} -
- - - -
+ +
+ + + +
diff --git a/src/routes/(app)/redeem/[redeemcode]/+page.server.js b/src/routes/(app)/redeem/[redeemcode]/+page.server.js index 74e701cd..15d96436 100644 --- a/src/routes/(app)/redeem/[redeemcode]/+page.server.js +++ b/src/routes/(app)/redeem/[redeemcode]/+page.server.js @@ -5,9 +5,9 @@ export async function load({ cookies, locals, params }) { let { user } = locals; if (user) { - await post('/redeem', params, auth(cookies)); - throw redirect(307, `/${user.username}/transactions`); - } + await post('/redeem', params, auth(cookies)); + throw redirect(307, `/${user.username}/transactions`); + } throw redirect(307, '/login'); } diff --git a/src/routes/(app)/register/+page.server.js b/src/routes/(app)/register/+page.server.js index 96fd3515..9ff5a2fc 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'); + if (user) throw redirect(307, `/dashboard/${user.username}`); }; export const actions = { diff --git a/src/routes/(app)/voucher/[code]/+page.svelte b/src/routes/(app)/voucher/[code]/+page.svelte index d2e07acc..d4c1167c 100644 --- a/src/routes/(app)/voucher/[code]/+page.svelte +++ b/src/routes/(app)/voucher/[code]/+page.svelte @@ -10,7 +10,7 @@ export let data; let { src } = data; $: ({ amount, currency, rate, redeemed, redeemcode, user } = data.payment); - onMount(() => ($loginRedirect = `/redeem/${redeemcode}`)); + onMount(() => ($loginRedirect = `/redeem/${redeemcode}`)); toast.pop(0); diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte index ba811e8a..42c6265f 100644 --- a/src/routes/+page.svelte +++ b/src/routes/+page.svelte @@ -96,15 +96,13 @@ {/if} - +