From 8041f705373758940b9487ed5c4cd34bfb04ac16 Mon Sep 17 00:00:00 2001
From: Adam Soltys <asoltys@gmail.com>
Date: Wed, 8 Nov 2023 13:46:04 -0800
Subject: rename pot to fund

---
 src/routes/(app)/send/[...text]/+page.server.js    |  9 ++--
 src/routes/(app)/send/[...text]/+page.svelte       | 13 -----
 .../send/fund/[name]/[...amount]/+page.server.js   | 17 +++++++
 .../send/fund/[name]/[...amount]/+page.svelte      | 58 ++++++++++++++++++++++
 .../send/pot/[name]/[...amount]/+page.server.js    | 17 -------
 .../(app)/send/pot/[name]/[...amount]/+page.svelte | 58 ----------------------
 6 files changed, 79 insertions(+), 93 deletions(-)
 create mode 100644 src/routes/(app)/send/fund/[name]/[...amount]/+page.server.js
 create mode 100644 src/routes/(app)/send/fund/[name]/[...amount]/+page.svelte
 delete mode 100644 src/routes/(app)/send/pot/[name]/[...amount]/+page.server.js
 delete mode 100644 src/routes/(app)/send/pot/[name]/[...amount]/+page.svelte

(limited to 'src/routes/(app)/send')

diff --git a/src/routes/(app)/send/[...text]/+page.server.js b/src/routes/(app)/send/[...text]/+page.server.js
index cafce7c9..6b4b000e 100644
--- a/src/routes/(app)/send/[...text]/+page.server.js
+++ b/src/routes/(app)/send/[...text]/+page.server.js
@@ -30,7 +30,7 @@ let parse = async (t, host) => {
 		if (id) throw redirect(307, `/send/invoice/${id}`);
 	}
 
-	if (t.includes('/pot')) throw redirect(307, t.substring(t.indexOf('/pot')));
+	if (t.includes('/fund')) throw redirect(307, t.substring(t.indexOf('/fund')));
 
 	if (t.toLowerCase().startsWith('lnurl')) throw redirect(307, `/ln/${t}`);
 	if (t.includes(':')) t = t.split(':')[1];
@@ -66,13 +66,12 @@ let parse = async (t, host) => {
 
 	if (user) throw redirect(307, `/send/user/${t}`);
 
-	// pot
-	let pot;
+	let fund;
 	try {
-		pot = await get(`/pot/${t}`);
+		fund = await get(`/fund/${t}`);
 	} catch (e) {}
 
-	if (pot) throw redirect(307, `/send/pot/${t}`);
+	if (fund) throw redirect(307, `/send/fund/${t}`);
 
 	// invoice
 	let invoice;
diff --git a/src/routes/(app)/send/[...text]/+page.svelte b/src/routes/(app)/send/[...text]/+page.svelte
index 3abc5a1a..c246f811 100644
--- a/src/routes/(app)/send/[...text]/+page.svelte
+++ b/src/routes/(app)/send/[...text]/+page.svelte
@@ -35,19 +35,6 @@
 	</h1>
 
 	<form method="POST" use:enhance>
-		{#if form?.error}
-			<div class="mb-5">
-				<div class="text-secondary">
-					Could not find anything with that name. Would you like to create a new pot?
-				</div>
-				<div class="w-full flex justify-center">
-					<a href={`/send/pot/${text}`}
-						><button class="bg-black text-white border rounded-full px-6 py-2 font-bold">Yes</button
-						></a
-					>
-				</div>
-			</div>
-		{/if}
 		<div class="mb-2">
 			<input type="hidden" name="text" bind:value={text} />
 
diff --git a/src/routes/(app)/send/fund/[name]/[...amount]/+page.server.js b/src/routes/(app)/send/fund/[name]/[...amount]/+page.server.js
new file mode 100644
index 00000000..2cb3c4a9
--- /dev/null
+++ b/src/routes/(app)/send/fund/[name]/[...amount]/+page.server.js
@@ -0,0 +1,17 @@
+import { fail, redirect } from '@sveltejs/kit';
+import { auth, fd, post } from '$lib/utils';
+
+export const actions = {
+	default: async ({ cookies, request }) => {
+		let body = await fd(request);
+		let p;
+
+		try {
+			p = await post('/payments', body, auth(cookies));
+		} catch (e) {
+			return fail(400, { message: e.message });
+		}
+
+		if (p) throw redirect(307, `/fund/${body.name}`);
+	}
+};
diff --git a/src/routes/(app)/send/fund/[name]/[...amount]/+page.svelte b/src/routes/(app)/send/fund/[name]/[...amount]/+page.svelte
new file mode 100644
index 00000000..6aecf8f3
--- /dev/null
+++ b/src/routes/(app)/send/fund/[name]/[...amount]/+page.svelte
@@ -0,0 +1,58 @@
+<script>
+	import { t } from '$lib/translations';
+	import { enhance } from '$app/forms';
+	import { Icon, Numpad, Spinner } from '$comp';
+	import { page } from '$app/stores';
+	import { back } from '$lib/utils';
+	import { pin } from '$lib/store';
+
+	export let data;
+	export let form;
+
+	let { amount, name } = $page.params;
+	let { rates } = data;
+	let { currency } = data.user;
+	let loading;
+
+	$: rate = rates[currency];
+
+	let submit = () => (loading = true);
+	$: update(form);
+	let update = () => {
+		if (form?.message?.includes('pin')) $pin = undefined;
+		loading = false;
+	};
+</script>
+
+<button class="ml-5 md:ml-20 mt-5 md:mt-10 hover:opacity-80" on:click={back}>
+	<Icon icon="arrow-left" style="w-10" />
+</button>
+
+{#if form?.message}
+	<div class="text-red-600 text-center">
+		{form.message}
+	</div>
+{/if}
+
+<div class="container px-4 mt-20 max-w-xl mx-auto">
+	<Numpad bind:amount {currency} bind:rate />
+
+	<form method="POST" use:enhance on:submit={submit}>
+		<input name="name" value={name} type="hidden" />
+		<input name="amount" value={amount} type="hidden" />
+		<input name="pin" value={$pin} type="hidden" />
+
+		<div class="flex w-full">
+			<button
+				type="submit"
+				class="opacity-100 hover:opacity-80'} rounded-2xl border py-3 font-bold mx-auto mt-2 bg-black text-white px-4 w-24"
+			>
+				{#if loading}
+					<Spinner />
+				{:else}
+					{$t('payments.send')}
+				{/if}
+			</button>
+		</div>
+	</form>
+</div>
diff --git a/src/routes/(app)/send/pot/[name]/[...amount]/+page.server.js b/src/routes/(app)/send/pot/[name]/[...amount]/+page.server.js
deleted file mode 100644
index 3f819696..00000000
--- a/src/routes/(app)/send/pot/[name]/[...amount]/+page.server.js
+++ /dev/null
@@ -1,17 +0,0 @@
-import { fail, redirect } from '@sveltejs/kit';
-import { auth, fd, post } from '$lib/utils';
-
-export const actions = {
-	default: async ({ cookies, request }) => {
-		let body = await fd(request);
-		let p;
-
-		try {
-			p = await post('/payments', body, auth(cookies));
-		} catch (e) {
-			return fail(400, { message: e.message });
-		}
-
-		if (p) throw redirect(307, `/pot/${body.name}`);
-	}
-};
diff --git a/src/routes/(app)/send/pot/[name]/[...amount]/+page.svelte b/src/routes/(app)/send/pot/[name]/[...amount]/+page.svelte
deleted file mode 100644
index 6aecf8f3..00000000
--- a/src/routes/(app)/send/pot/[name]/[...amount]/+page.svelte
+++ /dev/null
@@ -1,58 +0,0 @@
-<script>
-	import { t } from '$lib/translations';
-	import { enhance } from '$app/forms';
-	import { Icon, Numpad, Spinner } from '$comp';
-	import { page } from '$app/stores';
-	import { back } from '$lib/utils';
-	import { pin } from '$lib/store';
-
-	export let data;
-	export let form;
-
-	let { amount, name } = $page.params;
-	let { rates } = data;
-	let { currency } = data.user;
-	let loading;
-
-	$: rate = rates[currency];
-
-	let submit = () => (loading = true);
-	$: update(form);
-	let update = () => {
-		if (form?.message?.includes('pin')) $pin = undefined;
-		loading = false;
-	};
-</script>
-
-<button class="ml-5 md:ml-20 mt-5 md:mt-10 hover:opacity-80" on:click={back}>
-	<Icon icon="arrow-left" style="w-10" />
-</button>
-
-{#if form?.message}
-	<div class="text-red-600 text-center">
-		{form.message}
-	</div>
-{/if}
-
-<div class="container px-4 mt-20 max-w-xl mx-auto">
-	<Numpad bind:amount {currency} bind:rate />
-
-	<form method="POST" use:enhance on:submit={submit}>
-		<input name="name" value={name} type="hidden" />
-		<input name="amount" value={amount} type="hidden" />
-		<input name="pin" value={$pin} type="hidden" />
-
-		<div class="flex w-full">
-			<button
-				type="submit"
-				class="opacity-100 hover:opacity-80'} rounded-2xl border py-3 font-bold mx-auto mt-2 bg-black text-white px-4 w-24"
-			>
-				{#if loading}
-					<Spinner />
-				{:else}
-					{$t('payments.send')}
-				{/if}
-			</button>
-		</div>
-	</form>
-</div>
-- 
cgit v1.2.3