From 54600e38ff6c9e9b762bea09928dc3d290b33498 Mon Sep 17 00:00:00 2001
From: Adam Soltys <asoltys@gmail.com>
Date: Mon, 14 Nov 2022 02:44:55 -0600
Subject: fix voucher redemption

---
 src/routes/(app)/voucher/[code]/+page.server.js    |  8 ---
 src/routes/(app)/voucher/[code]/+page.svelte       | 59 --------------------
 .../(app)/voucher/[redeemcode]/+page.server.js     | 23 ++++++++
 src/routes/(app)/voucher/[redeemcode]/+page.svelte | 62 ++++++++++++++++++++++
 4 files changed, 85 insertions(+), 67 deletions(-)
 delete mode 100644 src/routes/(app)/voucher/[code]/+page.server.js
 delete mode 100644 src/routes/(app)/voucher/[code]/+page.svelte
 create mode 100644 src/routes/(app)/voucher/[redeemcode]/+page.server.js
 create mode 100644 src/routes/(app)/voucher/[redeemcode]/+page.svelte

diff --git a/src/routes/(app)/voucher/[code]/+page.server.js b/src/routes/(app)/voucher/[code]/+page.server.js
deleted file mode 100644
index 62270af4..00000000
--- a/src/routes/(app)/voucher/[code]/+page.server.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import { get } from '$lib/utils';
-import Qr from 'qrcode-base64';
-export let load = async ({ params: { code }, url }) => {
-	let payment = await get(`/payment/${code}`);
-
-	let src = Qr.drawImg(url.href, { size: 300 });
-	return { payment, src };
-};
diff --git a/src/routes/(app)/voucher/[code]/+page.svelte b/src/routes/(app)/voucher/[code]/+page.svelte
deleted file mode 100644
index b25c6c49..00000000
--- a/src/routes/(app)/voucher/[code]/+page.svelte
+++ /dev/null
@@ -1,59 +0,0 @@
-<script>
-	import { page } from '$app/stores';
-	import { Icon } from '$comp';
-	import { toast } from '@zerodevx/svelte-toast';
-	import { t } from '$lib/translations';
-	import { copy, f, s, sat, sats } from '$lib/utils';
-	import { loginRedirect, selectedRate } from '$lib/store';
-
-	export let data;
-	let { src } = data;
-	$: ({ amount, currency, rate, redeemed, redeemcode, user } = data.payment);
-
-	toast.pop(0);
-
-	$: amountFiat = parseFloat(((-amount * rate) / sats).toFixed(2));
-</script>
-
-<div class="container px-4 max-w-lg mx-auto mt-10 space-y-5">
-	<div class="w-full flex">
-		<a href="/" class="mx-auto">
-			<Icon icon="logo" />
-		</a>
-	</div>
-
-	<div class="flex justify-center items-center text-center">
-		<div class="shadow-xl rounded-3xl px-10 pt-5 pb-10 space-y-5 w-full mx-5">
-			<h1 class="text-3xl md:text-4xl font-bold">Voucher</h1>
-
-			<img
-				{src}
-				class="w-[300px] mx-auto cursor-pointer"
-				on:click={() => copy(redeemcode)}
-				alt="Redeem Code"
-			/>
-			<div>
-				<h2 class="text-2xl md:text-3xl font-semibold">
-					{f(amountFiat, currency)}
-				</h2>
-				<h3 class="text-secondary md:text-lg mb-6 mt-1">
-					{sat(amount)}
-				</h3>
-			</div>
-			<div class="mx-auto my-auto flex gap-2 justify-center" data-sveltekit-prefetch="off">
-				<a
-					href={`/redeem/${redeemcode}`}
-					on:click={() => ($loginRedirect = `/redeem/${redeemcode}`)}
-				>
-					<button
-						class="text-lg rounded-full border py-3 px-7 font-bold hover:opacity-80"
-						class:bg-gray-200={redeemed}
-						disabled={redeemed}
-					>
-						{redeemed ? 'Redeemed' : 'Redeem'}
-					</button>
-				</a>
-			</div>
-		</div>
-	</div>
-</div>
diff --git a/src/routes/(app)/voucher/[redeemcode]/+page.server.js b/src/routes/(app)/voucher/[redeemcode]/+page.server.js
new file mode 100644
index 00000000..22959e4d
--- /dev/null
+++ b/src/routes/(app)/voucher/[redeemcode]/+page.server.js
@@ -0,0 +1,23 @@
+import { error, redirect } from '@sveltejs/kit';
+import { auth, get, post } from '$lib/utils';
+import Qr from 'qrcode-base64';
+
+export let load = async ({ params: { redeemcode }, url }) => {
+	let payment = await get(`/payment/${redeemcode}`);
+
+	let src = Qr.drawImg(url.href, { size: 300 });
+	return { payment, src };
+};
+
+export const actions = {
+	default: async ({ cookies, locals, params, request }) => {
+		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/[redeemcode]/+page.svelte b/src/routes/(app)/voucher/[redeemcode]/+page.svelte
new file mode 100644
index 00000000..cfc6c8a8
--- /dev/null
+++ b/src/routes/(app)/voucher/[redeemcode]/+page.svelte
@@ -0,0 +1,62 @@
+<script>
+	import { enhance } from '$app/forms';
+	import { page } from '$app/stores';
+	import { Icon } from '$comp';
+	import { toast } from '@zerodevx/svelte-toast';
+	import { t } from '$lib/translations';
+	import { copy, f, s, sat, sats } from '$lib/utils';
+	import { loginRedirect, selectedRate } from '$lib/store';
+
+	export let data;
+	let { src } = data;
+	$: ({ amount, currency, rate, redeemed, redeemcode, user } = data.payment);
+
+	toast.pop(0);
+
+	$: amountFiat = parseFloat(((-amount * rate) / sats).toFixed(2));
+</script>
+
+<div class="container px-4 max-w-lg mx-auto mt-10 space-y-5">
+	<div class="w-full flex">
+		<a href="/" class="mx-auto">
+			<Icon icon="logo" />
+		</a>
+	</div>
+
+	<div class="flex justify-center items-center text-center">
+		<div class="shadow-xl rounded-3xl px-10 pt-5 pb-10 space-y-5 w-full mx-5">
+			<h1 class="text-3xl md:text-4xl font-bold">Voucher</h1>
+
+			<img
+				{src}
+				class="w-[300px] mx-auto cursor-pointer"
+				on:click={() => copy(redeemcode)}
+				alt="Redeem Code"
+			/>
+			<div>
+				<h2 class="text-2xl md:text-3xl font-semibold">
+					{f(amountFiat, currency)}
+				</h2>
+				<h3 class="text-secondary md:text-lg mb-6 mt-1">
+					{sat(amount)}
+				</h3>
+			</div>
+			<div class="mx-auto my-auto flex gap-2 justify-center" data-sveltekit-prefetch="off">
+				<form
+					method="POST"
+					use:enhance
+					on:submit={() => ($loginRedirect = `/redeem/${redeemcode}`)}
+				>
+					<button
+						type="submit"
+						class="text-lg rounded-full border py-3 px-7 font-bold hover:opacity-80"
+						class:bg-gray-200={redeemed}
+						disabled={redeemed || $loginRedirect}
+					>
+						{redeemed ? 'Redeemed' : 'Redeem'}
+					</button>
+				</form>
+			</div>
+		</div>
+	</div>
+</div>
-- 
cgit v1.2.3