From a8cb53b7422d133edb06cb89aa2048a7e06ea417 Mon Sep 17 00:00:00 2001
From: Adam Soltys <asoltys@gmail.com>
Date: Thu, 10 Nov 2022 17:28:25 -0800
Subject: voucher redirect

---
 src/components/RegisterOrLogin.svelte                |  2 +-
 src/routes/(app)/redeem/[redeemcode]/+page.server.js | 13 +++++++++++++
 src/routes/(app)/redeem/[redeemcode]/+page.svelte    |  1 +
 src/routes/(app)/redeem/[redeemcode]/+server.js      | 13 -------------
 src/routes/(app)/voucher/[code]/+page.svelte         |  2 +-
 5 files changed, 16 insertions(+), 15 deletions(-)
 create mode 100644 src/routes/(app)/redeem/[redeemcode]/+page.server.js
 create mode 100644 src/routes/(app)/redeem/[redeemcode]/+page.svelte
 delete mode 100644 src/routes/(app)/redeem/[redeemcode]/+server.js

(limited to 'src')

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]/+page.server.js b/src/routes/(app)/redeem/[redeemcode]/+page.server.js
new file mode 100644
index 00000000..74e701cd
--- /dev/null
+++ b/src/routes/(app)/redeem/[redeemcode]/+page.server.js
@@ -0,0 +1,13 @@
+import { error, redirect } from '@sveltejs/kit';
+import { auth, post } from '$lib/utils';
+
+export async function load({ cookies, locals, params }) {
+	let { user } = locals;
+
+	if (user) {
+    await post('/redeem', params, auth(cookies));
+    throw redirect(307, `/${user.username}/transactions`);
+  } 
+
+	throw redirect(307, '/login');
+}
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)/redeem/[redeemcode]/+server.js b/src/routes/(app)/redeem/[redeemcode]/+server.js
deleted file mode 100644
index b99d9abe..00000000
--- a/src/routes/(app)/redeem/[redeemcode]/+server.js
+++ /dev/null
@@ -1,13 +0,0 @@
-import { error, redirect } from '@sveltejs/kit';
-import { auth, post } from '$lib/utils';
-
-export async function GET({ cookies, locals, params }) {
-	let { user } = locals;
-
-	if (user) {
-    await post('/redeem', params, auth(cookies));
-    throw redirect(307, `/${user.username}/transactions`);
-  } 
-
-	throw redirect(307, '/login');
-}
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);
 
-- 
cgit v1.2.3