voucher redirect

4 files changed, 4 insertions, 3 deletions

diff --git a/src/components/RegisterOrLogin.svelte b/src/components/RegisterOrLogin.svelte
index d7ae891a..84d0dd16 100644
--- a/src/components/RegisterOrLogin.svelte
+++ b/src/components/RegisterOrLogin.svelte
@@ -13,7 +13,7 @@
 	let code = [];
 	let redirect;
 
-	$: $page && (redirect = $loginRedirect) && ($loginRedirect = undefined);
+  $: $loginRedirect && (redirect = $loginRedirect, $loginRedirect = undefined);
 
 	$: need2fa = form?.message === '2fa';
 	$: if (need2fa) tokenInput && tick().then(tokenInput.focusFirstInput);
diff --git a/src/routes/(app)/redeem/[redeemcode]/+server.js b/src/routes/(app)/redeem/[redeemcode]/+page.server.js
index b99d9abe..74e701cd 100644
--- a/src/routes/(app)/redeem/[redeemcode]/+server.js
+++ b/src/routes/(app)/redeem/[redeemcode]/+page.server.js
@@ -1,7 +1,7 @@
 import { error, redirect } from '@sveltejs/kit';
 import { auth, post } from '$lib/utils';
 
-export async function GET({ cookies, locals, params }) {
+export async function load({ cookies, locals, params }) {
 	let { user } = locals;
 
 	if (user) {
diff --git a/src/routes/(app)/redeem/[redeemcode]/+page.svelte b/src/routes/(app)/redeem/[redeemcode]/+page.svelte
new file mode 100644
index 00000000..45b983be
--- /dev/null
+++ b/src/routes/(app)/redeem/[redeemcode]/+page.svelte
@@ -0,0 +1 @@
+hi
diff --git a/src/routes/(app)/voucher/[code]/+page.svelte b/src/routes/(app)/voucher/[code]/+page.svelte
index 2596cc18..d2e07acc 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 = $page.url.pathname));
+  onMount(() => ($loginRedirect = `/redeem/${redeemcode}`));
 
 	toast.pop(0);