rename pot to fund

16 files changed, 23 insertions, 37 deletions

diff --git a/src/lib/utils.js b/src/lib/utils.js
index 52494c88..9e1066e2 100644
--- a/src/lib/utils.js
+++ b/src/lib/utils.js
@@ -251,7 +251,7 @@ export let types = {
 	bitcoin: 'bitcoin',
 	lightning: 'lightning',
 	internal: 'internal',
-	pot: 'pot',
+	fund: 'fund',
 	classic: 'classic'
 };
 
diff --git a/src/locales/en.json b/src/locales/en.json
index a1d0c0aa..d3e294d4 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -263,7 +263,7 @@
 		}
 	},
 	"payments": {
-    "moneyPot": "Money Pot",
+    "fund": "Fund",
     "addFunds": "Add Funds",
     "takeFunds": "Take Funds",
     "show": "Show",
diff --git a/src/routes/(app)/[username]/card/[serial]/+page.server.js b/src/routes/(app)/[username]/card/[serial]/+page.server.js
index e2569536..40e375aa 100644
--- a/src/routes/(app)/[username]/card/[serial]/+page.server.js
+++ b/src/routes/(app)/[username]/card/[serial]/+page.server.js
@@ -3,14 +3,14 @@ import { redirect } from "@sveltejs/kit"
 
 export let load = async ({ cookies, params }) => {
 	let { serial } = params;
-	let pot;
+	let fund;
 	try {
-		pot = await get(`/pot/${serial}`, auth(cookies));
+		fund = await get(`/fund/${serial}`, auth(cookies));
 	} catch (e) {
 		console.log(e);
 	}
 
-	if (pot) throw redirect(307, `/pot/${serial}`);
+	if (fund) throw redirect(307, `/fund/${serial}`);
 
 	return params;
 };
diff --git a/src/routes/(app)/[username]/invoice/[id]/+page.svelte b/src/routes/(app)/[username]/invoice/[id]/+page.svelte
index 2d204255..a0894dd1 100644
--- a/src/routes/(app)/[username]/invoice/[id]/+page.svelte
+++ b/src/routes/(app)/[username]/invoice/[id]/+page.svelte
@@ -15,7 +15,7 @@
 
 	let reading = async ({ message, serialNumber }) => {
 		let name = serialNumber.replace(/:/g, '-');
-		let result = await post(`/pot/${name}/withdraw`, { amount, hash, name });
+		let result = await post(`/fund/${name}/withdraw`, { amount, hash, name });
 	};
 
 	let readingerror = (e) => console.log('nfc error', e);
diff --git a/src/routes/(app)/pot/[name]/+page.server.js b/src/routes/(app)/fund/[name]/+page.server.js
index 8f8b9d8f..ad20c7d9 100644
--- a/src/routes/(app)/pot/[name]/+page.server.js
+++ b/src/routes/(app)/fund/[name]/+page.server.js
@@ -3,7 +3,7 @@ import { auth, get, post } from '$lib/utils';
 import Qr from 'qrcode-base64';
 
 export let load = async ({ params: { name }, url }) => {
-	let { amount, payments } = await get(`/pot/${name}`);
+	let { amount, payments } = await get(`/fund/${name}`);
 
 	let src = Qr.drawImg(url.href, { size: 300 });
 	return { amount, payments, src };
diff --git a/src/routes/(app)/pot/[name]/+page.svelte b/src/routes/(app)/fund/[name]/+page.svelte
index ea1e45f2..0ac10c24 100644
--- a/src/routes/(app)/pot/[name]/+page.svelte
+++ b/src/routes/(app)/fund/[name]/+page.svelte
@@ -33,9 +33,9 @@
 				{#if name.split('-').length === 4}
 					<h1 class="text-2xl md:text-3xl font-semibold my-auto">Card {name}</h1>
 				{:else}
-					<img src="/images/moneypot.jpg" class="w-24" alt="Pot" />
+					<img src="/images/moneypot.jpg" class="w-24" alt="Fund" />
 					<div class="my-auto">
-						<h1 class="text-2xl font-semibold my-auto">{$t('payments.moneyPot')}</h1>
+						<h1 class="text-2xl font-semibold my-auto">{$t('payments.fund')}</h1>
 						<h1 class="text-secondary my-auto">{name}</h1>
 					</div>
 				{/if}
@@ -55,7 +55,7 @@
 			</div>
 			<div class="flex gap-2" data-sveltekit-prefetch="off">
 				<div class="grow">
-					<a href={`/send/pot/${name}`}>
+					<a href={`/send/fund/${name}`}>
 						<button
 							class="rounded-full border py-3 px-2 font-bold hover:opacity-80 flex gap-1 w-full justify-center"
 						>
@@ -65,7 +65,7 @@
 					</a>
 				</div>
 				<div class="grow">
-					<a href={`/pot/${name}/withdraw`}>
+					<a href={`/fund/${name}/withdraw`}>
 						<button
 							class="rounded-full border py-3 px-2 font-bold hover:opacity-80 flex gap-1 w-full justify-center"
 						>
@@ -81,7 +81,7 @@
 					on:click={toggle}
 				>
 					<Icon icon="qr" style="invert" />
-					{show ? $t('payments.show') : $t('payments.hide')} QR
+					{show ? $t('payments.hide') : $t('payments.show')} QR
 				</button>
 				<button
 					class="rounded-full border py-3 px-2 font-bold hover:opacity-80 flex gap-1 w-full justify-center"
diff --git a/src/routes/(app)/pot/[name]/sweep/+page.server.js b/src/routes/(app)/fund/[name]/sweep/+page.server.js
index c2c8051d..929348ef 100644
--- a/src/routes/(app)/pot/[name]/sweep/+page.server.js
+++ b/src/routes/(app)/fund/[name]/sweep/+page.server.js
@@ -4,11 +4,11 @@ import { redirect } from '@sveltejs/kit';
 export async function load({ cookies, params, parent }) {
 	let { user } = await parent();
 	let { name } = params;
-	let { amount } = await get(`/pot/${name}`);
+	let { amount } = await get(`/fund/${name}`);
 
 
-  if (!amount) throw redirect(307, `/pot/${name}`);
-	if (!user) throw redirect(307, `/register?redirect=/pot/${name}/sweep`);
+  if (!amount) throw redirect(307, `/fund/${name}`);
+	if (!user) throw redirect(307, `/register?redirect=/fund/${name}/sweep`);
 	await post('/take', { amount, name }, auth(cookies));
 	return { amount, name };
 }
diff --git a/src/routes/(app)/pot/[name]/sweep/+page.svelte b/src/routes/(app)/fund/[name]/sweep/+page.svelte
index 9b473af3..9b473af3 100644
--- a/src/routes/(app)/pot/[name]/sweep/+page.svelte
+++ b/src/routes/(app)/fund/[name]/sweep/+page.svelte
diff --git a/src/routes/(app)/pot/[name]/withdraw/+page.server.js b/src/routes/(app)/fund/[name]/withdraw/+page.server.js
index e7ea29f1..4d590890 100644
--- a/src/routes/(app)/pot/[name]/withdraw/+page.server.js
+++ b/src/routes/(app)/fund/[name]/withdraw/+page.server.js
@@ -15,6 +15,6 @@ export const actions = {
 			return fail(400, { message: e.message });
 		}
 
-		throw redirect(307, `/pot/${body.name}`);
+		throw redirect(307, `/fund/${body.name}`);
 	}
 };
diff --git a/src/routes/(app)/pot/[name]/withdraw/+page.svelte b/src/routes/(app)/fund/[name]/withdraw/+page.svelte
index 7be643a9..7be643a9 100644
--- a/src/routes/(app)/pot/[name]/withdraw/+page.svelte
+++ b/src/routes/(app)/fund/[name]/withdraw/+page.svelte
diff --git a/src/routes/(app)/pot/[name]/withdraw/+server.js b/src/routes/(app)/fund/[name]/withdraw/+server.js
index 0f9a23f3..0f9a23f3 100644
--- a/src/routes/(app)/pot/[name]/withdraw/+server.js
+++ b/src/routes/(app)/fund/[name]/withdraw/+server.js
diff --git a/src/routes/(app)/payment/[id]/+page.svelte b/src/routes/(app)/payment/[id]/+page.svelte
index 38b91658..98c5a68b 100644
--- a/src/routes/(app)/payment/[id]/+page.svelte
+++ b/src/routes/(app)/payment/[id]/+page.svelte
@@ -47,10 +47,10 @@
 			</a>
 		</div>
 	{/if}
-	{#if p.type === types.pot}
+	{#if p.type === types.fund}
 		<div>
 			<span class="text-lg text-secondary my-auto mr-2">{direction}</span>
-			<a href={`/pot/${p.memo}`}>
+			<a href={`/fund/${p.memo}`}>
 				<div class="flex">
 					<div class="my-auto">
 						<img src="/images/moneypot.png" class="w-12" alt="Pot" />
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/pot/[name]/[...amount]/+page.server.js b/src/routes/(app)/send/fund/[name]/[...amount]/+page.server.js
index 3f819696..2cb3c4a9 100644
--- a/src/routes/(app)/send/pot/[name]/[...amount]/+page.server.js
+++ b/src/routes/(app)/send/fund/[name]/[...amount]/+page.server.js
@@ -12,6 +12,6 @@ export const actions = {
 			return fail(400, { message: e.message });
 		}
 
-		if (p) throw redirect(307, `/pot/${body.name}`);
+		if (p) throw redirect(307, `/fund/${body.name}`);
 	}
 };
diff --git a/src/routes/(app)/send/pot/[name]/[...amount]/+page.svelte b/src/routes/(app)/send/fund/[name]/[...amount]/+page.svelte
index 6aecf8f3..6aecf8f3 100644
--- a/src/routes/(app)/send/pot/[name]/[...amount]/+page.svelte
+++ b/src/routes/(app)/send/fund/[name]/[...amount]/+page.svelte