From f5f66a19257680f049e7bc352eac67fcfadde7e8 Mon Sep 17 00:00:00 2001
From: Adam Soltys <asoltys@gmail.com>
Date: Thu, 6 Oct 2022 01:00:01 -0700
Subject: pass amount to send route

---
 src/routes/send/[...text]/+page.server.js          |  6 +-
 src/routes/send/user/[username]/+page.server.js    | 23 ------
 src/routes/send/user/[username]/+page.svelte       | 84 ---------------------
 .../user/[username]/[...amount]/+page.server.js    | 24 ++++++
 .../send/user/[username]/[...amount]/+page.svelte  | 86 ++++++++++++++++++++++
 5 files changed, 114 insertions(+), 109 deletions(-)
 delete mode 100644 src/routes/send/user/[username]/+page.server.js
 delete mode 100644 src/routes/send/user/[username]/+page.svelte
 create mode 100644 src/routes/send/user/[username]/[...amount]/+page.server.js
 create mode 100644 src/routes/send/user/[username]/[...amount]/+page.svelte

(limited to 'src')

diff --git a/src/routes/send/[...text]/+page.server.js b/src/routes/send/[...text]/+page.server.js
index 6e1fd188..58a0b9f1 100644
--- a/src/routes/send/[...text]/+page.server.js
+++ b/src/routes/send/[...text]/+page.server.js
@@ -11,12 +11,14 @@ let parse = async (t) => {
 	if (t.startsWith('ln')) {
 		try {
 			({ user } = await get(`/invoice/${t}`));
-      console.log("USER", user.username);
 		} catch (e) {
 			throw redirect(303, `/send/lightning/${t}`);
 		}
 
-		if (user) throw redirect(303, `/send/user/${user.username}`);
+		if (user) {
+			let { amount } = await post('/lightning/parse', params);
+			throw redirect(303, `/send/user/${user.username}/amount`);
+		}
 	}
 
 	// bitcoin
diff --git a/src/routes/send/user/[username]/+page.server.js b/src/routes/send/user/[username]/+page.server.js
deleted file mode 100644
index 37a8d594..00000000
--- a/src/routes/send/user/[username]/+page.server.js
+++ /dev/null
@@ -1,23 +0,0 @@
-import { error, invalid, redirect } from '@sveltejs/kit';
-import { btc as asset, auth, get, post } from '$lib/utils';
-
-export async function load({ params, parent }) {
-	let { user } = await parent();
-	let recipient = await get(`/users/${params.username}`);
-	if (recipient.username === user.username) throw error(500, { message: 'Cannot send to self' });
-	return { recipient };
-}
-
-export const actions = {
-	default: async ({ cookies, request }) => {
-		let body = Object.fromEntries(await request.formData());
-		let { amount, confirmed } = body;
-
-		if (!confirmed) {
-			return invalid(403, { amount, confirm: true });
-		}
-
-		await post('/send', body, auth(cookies));
-		throw redirect(307, '/sent');
-	}
-};
diff --git a/src/routes/send/user/[username]/+page.svelte b/src/routes/send/user/[username]/+page.svelte
deleted file mode 100644
index ed6a9f17..00000000
--- a/src/routes/send/user/[username]/+page.svelte
+++ /dev/null
@@ -1,84 +0,0 @@
-<script>
-	import { selectedRate } from '$lib/store';
-	import { enhance } from '$app/forms';
-	import { Icon, Numpad, Spinner } from '$comp';
-	import { page } from '$app/stores';
-	import { back, f, s, sats } from '$lib/utils';
-	export let data;
-	export let form;
-
-	let { recipient, user } = data;
-	let { currency } = user;
-
-	let amount = form?.amount || data.amount;
-	let a,
-		af,
-		amountFiat,
-		fiat = true;
-
-	let setAmount = () => {
-		console.log('setting', a, af);
-		amount = a;
-		amountFiat = af;
-	};
-
-	let handleBack = () => {
-		if (amount) amount = undefined;
-		else back();
-	};
-
-	let loading;
-	let submit = () => (loading = true);
-</script>
-
-<button class="ml-5 md:ml-20 mt-5 md:mt-10 hover:opacity-80" on:click={handleBack}>
-	<Icon icon="arrow-left" style="w-10" />
-</button>
-
-<div class="container px-4 mt-20 max-w-xl mx-auto">
-	{#if amount}
-		<div class="text-center mb-8">
-			<h1 class="text-xl md:text-2xl text-secondary mb-2">Send</h1>
-			<p class="text-6xl break-words mb-4">
-				{fiat ? f(amountFiat, currency) : s(a)}
-				{#if !fiat}
-					<span class="text-xl md:text-2xl text-secondary">sats</span>
-				{/if}
-			</p>
-
-			<h1 class="text-xl md:text-2xl text-secondary mb-2">to</h1>
-			<p class="text-6xl break-words">{recipient.username}</p>
-		</div>
-	{:else}
-		<Numpad bind:amount={a} bind:amountFiat={af} {currency} bind:fiat />
-	{/if}
-
-	<form method="POST" use:enhance on:submit={submit}>
-		<input name="amount" value={amount} type="hidden" />
-		<input name="username" value={recipient.username} type="hidden" />
-		<input name="confirmed" value={form?.confirm} type="hidden" />
-
-		<div class="flex w-full">
-			{#if amount}
-				<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}
-						Send
-					{/if}
-				</button>
-			{:else}
-				<button
-					type="button"
-					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"
-					on:click={setAmount}
-				>
-					Next
-				</button>
-			{/if}
-		</div>
-	</form>
-</div>
diff --git a/src/routes/send/user/[username]/[...amount]/+page.server.js b/src/routes/send/user/[username]/[...amount]/+page.server.js
new file mode 100644
index 00000000..d878fe2f
--- /dev/null
+++ b/src/routes/send/user/[username]/[...amount]/+page.server.js
@@ -0,0 +1,24 @@
+import { error, invalid, redirect } from '@sveltejs/kit';
+import { btc as asset, auth, get, post } from '$lib/utils';
+
+export async function load({ params, parent }) {
+	let { user } = await parent();
+  let { amount } = params;
+	let recipient = await get(`/users/${params.username}`);
+	if (recipient.username === user.username) throw error(500, { message: 'Cannot send to self' });
+	return { amount, recipient };
+}
+
+export const actions = {
+	default: async ({ cookies, request }) => {
+		let body = Object.fromEntries(await request.formData());
+		let { amount, confirmed } = body;
+
+		if (!confirmed) {
+			return invalid(403, { amount, confirm: true });
+		}
+
+		await post('/send', body, auth(cookies));
+		throw redirect(307, '/sent');
+	}
+};
diff --git a/src/routes/send/user/[username]/[...amount]/+page.svelte b/src/routes/send/user/[username]/[...amount]/+page.svelte
new file mode 100644
index 00000000..21460342
--- /dev/null
+++ b/src/routes/send/user/[username]/[...amount]/+page.svelte
@@ -0,0 +1,86 @@
+<script>
+  import { goto } from "$app/navigation";
+	import { selectedRate } from '$lib/store';
+	import { enhance } from '$app/forms';
+	import { Icon, Numpad, Spinner } from '$comp';
+	import { page } from '$app/stores';
+	import { back, f, s, sats } from '$lib/utils';
+	export let data;
+	export let form;
+
+	let { recipient, user } = data;
+	let { currency } = user;
+
+	let amount = form?.amount || data.amount;
+	let a,
+		af,
+		amountFiat = amount * ($selectedRate / sats),
+		fiat = !amount;
+
+	let setAmount = () => {
+		amount = a;
+		amountFiat = af;
+	};
+
+	let handleBack = () => {
+		if (amount) {
+			amount = undefined;
+			goto(`/send/user/${recipient.username}`);
+		} else back();
+	};
+
+	let loading;
+	let submit = () => (loading = true);
+</script>
+
+<button class="ml-5 md:ml-20 mt-5 md:mt-10 hover:opacity-80" on:click={handleBack}>
+	<Icon icon="arrow-left" style="w-10" />
+</button>
+
+<div class="container px-4 mt-20 max-w-xl mx-auto">
+	{#if amount}
+		<div class="text-center mb-8">
+			<h1 class="text-xl md:text-2xl text-secondary mb-2">Send</h1>
+			<p class="text-6xl break-words mb-4">
+				{fiat ? f(amountFiat, currency) : s(amount)}
+				{#if !fiat}
+					<span class="text-xl md:text-2xl text-secondary">sats</span>
+				{/if}
+			</p>
+
+			<h1 class="text-xl md:text-2xl text-secondary mb-2">to</h1>
+			<p class="text-6xl break-words">{recipient.username}</p>
+		</div>
+	{:else}
+		<Numpad bind:amount={a} bind:amountFiat={af} {currency} bind:fiat />
+	{/if}
+
+	<form method="POST" use:enhance on:submit={submit}>
+		<input name="amount" value={amount} type="hidden" />
+		<input name="username" value={recipient.username} type="hidden" />
+		<input name="confirmed" value={form?.confirm} type="hidden" />
+
+		<div class="flex w-full">
+			{#if amount}
+				<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}
+						Send
+					{/if}
+				</button>
+			{:else}
+				<button
+					type="button"
+					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"
+					on:click={setAmount}
+				>
+					Next
+				</button>
+			{/if}
+		</div>
+	</form>
+</div>
-- 
cgit v1.2.3