rename fund name to id

8 files changed, 27 insertions, 27 deletions

diff --git a/src/routes/(app)/fund/[name]/+page.server.js b/src/routes/(app)/fund/[id]/+page.server.js
index ad20c7d9..4194deed 100644
--- a/src/routes/(app)/fund/[name]/+page.server.js
+++ b/src/routes/(app)/fund/[id]/+page.server.js
@@ -2,8 +2,8 @@ import { error, redirect } from '@sveltejs/kit';
 import { auth, get, post } from '$lib/utils';
 import Qr from 'qrcode-base64';
 
-export let load = async ({ params: { name }, url }) => {
-	let { amount, payments } = await get(`/fund/${name}`);
+export let load = async ({ params: { id }, url }) => {
+	let { amount, payments } = await get(`/fund/${id}`);
 
 	let src = Qr.drawImg(url.href, { size: 300 });
 	return { amount, payments, src };
diff --git a/src/routes/(app)/fund/[name]/+page.svelte b/src/routes/(app)/fund/[id]/+page.svelte
index 0ac10c24..d2d3079c 100644
--- a/src/routes/(app)/fund/[name]/+page.svelte
+++ b/src/routes/(app)/fund/[id]/+page.svelte
@@ -11,7 +11,7 @@
 	export let data;
 
 	let { amount, src, payments, rates, user } = data;
-	let { name } = $page.params;
+	let { id } = $page.params;
 
 	toast.pop(0);
 
@@ -30,18 +30,18 @@
 		<div class="md:shadow-xl rounded-3xl md:px-10 pt-5 pb-10 space-y-5 w-full md:mx-5">
 			<div class="relative flex justify-center gap-2">
 				<!-- <p class="absolute right-0 top-1 underline"><Icon icon="settings" /></p> -->
-				{#if name.split('-').length === 4}
-					<h1 class="text-2xl md:text-3xl font-semibold my-auto">Card {name}</h1>
+				{#if id.split('-').length === 4}
+					<h1 class="text-2xl md:text-3xl font-semibold my-auto">Card {id}</h1>
 				{:else}
 					<img src="/images/moneypot.jpg" class="w-24" alt="Fund" />
 					<div class="my-auto">
 						<h1 class="text-2xl font-semibold my-auto">{$t('payments.fund')}</h1>
-						<h1 class="text-secondary my-auto">{name}</h1>
+						<h1 class="text-secondary my-auto">{id}</h1>
 					</div>
 				{/if}
 			</div>
 			{#if show}
-				<img {src} class="mx-auto" alt={name} />
+				<img {src} class="mx-auto" alt={id} />
 			{/if}
 			<div class="flex justify-center gap-4">
 				<div class="my-auto">
@@ -55,7 +55,7 @@
 			</div>
 			<div class="flex gap-2" data-sveltekit-prefetch="off">
 				<div class="grow">
-					<a href={`/send/fund/${name}`}>
+					<a href={`/send/fund/${id}`}>
 						<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={`/fund/${name}/withdraw`}>
+					<a href={`/fund/${id}/withdraw`}>
 						<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)/fund/[id]/sweep/+page.server.js b/src/routes/(app)/fund/[id]/sweep/+page.server.js
new file mode 100644
index 00000000..9fd244a3
--- /dev/null
+++ b/src/routes/(app)/fund/[id]/sweep/+page.server.js
@@ -0,0 +1,14 @@
+import { get, auth, post } from '$lib/utils';
+import { redirect } from '@sveltejs/kit';
+
+export async function load({ cookies, params, parent }) {
+	let { user } = await parent();
+	let { id } = params;
+	let { amount } = await get(`/fund/${id}`);
+
+
+  if (!amount) throw redirect(307, `/fund/${id}`);
+	if (!user) throw redirect(307, `/register?redirect=/fund/${id}/sweep`);
+	await post('/take', { amount, id }, auth(cookies));
+	return { amount, id };
+}
diff --git a/src/routes/(app)/fund/[name]/sweep/+page.svelte b/src/routes/(app)/fund/[id]/sweep/+page.svelte
index 9b473af3..64bed4dd 100644
--- a/src/routes/(app)/fund/[name]/sweep/+page.svelte
+++ b/src/routes/(app)/fund/[id]/sweep/+page.svelte
@@ -6,7 +6,7 @@
 
 	export let data;
 
-	let { amount, name, user, rates } = data;
+	let { amount, id, user, rates } = data;
 	let { currency } = user;
 	$: rate = rates[currency];
 </script>
diff --git a/src/routes/(app)/fund/[name]/withdraw/+page.server.js b/src/routes/(app)/fund/[id]/withdraw/+page.server.js
index 4d590890..476149f2 100644
--- a/src/routes/(app)/fund/[name]/withdraw/+page.server.js
+++ b/src/routes/(app)/fund/[id]/withdraw/+page.server.js
@@ -15,6 +15,6 @@ export const actions = {
 			return fail(400, { message: e.message });
 		}
 
-		throw redirect(307, `/fund/${body.name}`);
+		throw redirect(307, `/fund/${body.id}`);
 	}
 };
diff --git a/src/routes/(app)/fund/[name]/withdraw/+page.svelte b/src/routes/(app)/fund/[id]/withdraw/+page.svelte
index 7be643a9..9cad945a 100644
--- a/src/routes/(app)/fund/[name]/withdraw/+page.svelte
+++ b/src/routes/(app)/fund/[id]/withdraw/+page.svelte
@@ -10,7 +10,7 @@
 	export let form;
 
 	let { rates } = data;
-	let { amount, name } = $page.params;
+	let { amount, id } = $page.params;
 	let { currency } = data.user;
 	let loading;
 
@@ -38,7 +38,7 @@
 	<Numpad bind:amount bind:currency bind:rate {submit} />
 
 	<form method="POST" use:enhance on:submit={submit}>
-		<input name="name" value={name} type="hidden" />
+		<input name="id" value={id} type="hidden" />
 		<input name="amount" value={amount} type="hidden" />
 		<input name="pin" value={$pin} type="hidden" />
 
diff --git a/src/routes/(app)/fund/[name]/withdraw/+server.js b/src/routes/(app)/fund/[id]/withdraw/+server.js
index 0f9a23f3..0f9a23f3 100644
--- a/src/routes/(app)/fund/[name]/withdraw/+server.js
+++ b/src/routes/(app)/fund/[id]/withdraw/+server.js
diff --git a/src/routes/(app)/fund/[name]/sweep/+page.server.js b/src/routes/(app)/fund/[name]/sweep/+page.server.js
deleted file mode 100644
index 929348ef..00000000
--- a/src/routes/(app)/fund/[name]/sweep/+page.server.js
+++ /dev/null
@@ -1,14 +0,0 @@
-import { get, auth, post } from '$lib/utils';
-import { redirect } from '@sveltejs/kit';
-
-export async function load({ cookies, params, parent }) {
-	let { user } = await parent();
-	let { name } = params;
-	let { amount } = await get(`/fund/${name}`);
-
-
-  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 };
-}