From f7d9ec75ac19664fdfffd430ece29f288d6d4819 Mon Sep 17 00:00:00 2001
From: Adam Soltys <asoltys@gmail.com>
Date: Thu, 19 Jan 2023 16:00:17 -0800
Subject: rename network to type

---
 src/lib/invoice.js                                           |  2 +-
 src/routes/(app)/[username]/address/+page.server.js          |  9 +++------
 src/routes/(app)/[username]/dashboard/+page.svelte           |  3 ++-
 src/routes/(app)/[username]/payments/[...page]/+page.svelte  | 10 ++++++++--
 src/routes/(app)/[username]/receive/[...param]/+page.svelte  |  6 +++---
 src/routes/(app)/invoice/[hash]/+page.svelte                 |  4 ++--
 src/routes/(app)/invoice/[hash]/tip/+page.svelte             |  6 +++---
 src/routes/(app)/launch/purchase/+page.server.js             |  2 +-
 src/routes/(app)/login/+page.server.js                       |  2 ++
 src/routes/(app)/pot/[name]/+page.svelte                     |  3 ++-
 src/routes/(app)/pot/[name]/withdraw/+page.server.js         |  2 +-
 src/routes/(app)/register/+page.server.js                    |  2 +-
 src/routes/(app)/send/lightning/[payreq]/+page.server.js     |  2 +-
 src/routes/(app)/send/pot/[name]/[...amount]/+page.server.js |  2 +-
 src/routes/(app)/withdraw/+server.js                         |  2 +-
 15 files changed, 32 insertions(+), 25 deletions(-)

(limited to 'src')

diff --git a/src/lib/invoice.js b/src/lib/invoice.js
index fa29130e..f0c5aad5 100644
--- a/src/lib/invoice.js
+++ b/src/lib/invoice.js
@@ -11,7 +11,7 @@ export default async ({ cookies, request, url }) => {
 	let invoice = {
 		amount,
 		tip: parseInt(form.get('tip')),
-		network: form.get('network'),
+		type: form.get('type'),
 		prompt: form.get('prompt') === 'true',
 		rate: parseFloat(form.get('rate')) || rates[form.get('currency')],
 		request_id
diff --git a/src/routes/(app)/[username]/address/+page.server.js b/src/routes/(app)/[username]/address/+page.server.js
index 281f9e2d..5d7c3044 100644
--- a/src/routes/(app)/[username]/address/+page.server.js
+++ b/src/routes/(app)/[username]/address/+page.server.js
@@ -4,10 +4,7 @@ import { redirect } from '@sveltejs/kit';
 export async function load({ cookies, params, parent }) {
 	let user = (await parent()).subject;
 	let rates = await get('/rates');
-	let invoice = {
-		network: 'bitcoin',
-		rate: rates[user.currency]
-	};
-	let { id } = await post('/invoice', { invoice, user }, auth(cookies));
-	throw redirect(307, `/invoice/${id}`);
+	let invoice = { type: 'bitcoin' };
+	let { hash } = await post('/invoice', { invoice, user }, auth(cookies));
+	throw redirect(307, `/invoice/${hash}`);
 }
diff --git a/src/routes/(app)/[username]/dashboard/+page.svelte b/src/routes/(app)/[username]/dashboard/+page.svelte
index 314e3577..262a7348 100644
--- a/src/routes/(app)/[username]/dashboard/+page.svelte
+++ b/src/routes/(app)/[username]/dashboard/+page.svelte
@@ -7,6 +7,7 @@
 	import { goto } from '$app/navigation';
 	import { t } from '$lib/translations';
 	import { events } from '$lib/store';
+  import { v4 } from "uuid";
 
 	export let data;
 	$: ({ invoices, requests } = data);
@@ -85,7 +86,7 @@
 				>{$t('user.dashboard.deposit')}</button
 			>
 		</a>
-		<a href={`/send/voucher`}>
+        <a href={`/send/pot/${v4()}`}>
 			<button class="rounded-full border py-4 px-5 font-bold hover:opacity-80 w-full"
 				>{$t('user.dashboard.voucher')}</button
 			>
diff --git a/src/routes/(app)/[username]/payments/[...page]/+page.svelte b/src/routes/(app)/[username]/payments/[...page]/+page.svelte
index e37b3221..f6de4c27 100644
--- a/src/routes/(app)/[username]/payments/[...page]/+page.svelte
+++ b/src/routes/(app)/[username]/payments/[...page]/+page.svelte
@@ -152,10 +152,16 @@
 								</a>
 							{:else}
 								<div class="text-secondary flex">
-									<div class="text-3xl">⚡️</div>
+									{#if tx.type === 'lightning'}
+										<div class="text-3xl">⚡️</div>
+									{:else}
+										<div class="my-auto mr-1">
+											<img src="/images/bitcoin.svg" class="w-12 border-4 border-transparent" />
+										</div>
+									{/if}
 
 									<div class="my-auto">
-										{tx.amount > 0 ? 'Received' : 'Sent'}
+										{tx.amount > 0 ? (tx.confirmed ? 'Received' : 'Pending') : 'Sent'}
 									</div>
 								</div>
 							{/if}
diff --git a/src/routes/(app)/[username]/receive/[...param]/+page.svelte b/src/routes/(app)/[username]/receive/[...param]/+page.svelte
index 18d6b21e..47c507fa 100644
--- a/src/routes/(app)/[username]/receive/[...param]/+page.svelte
+++ b/src/routes/(app)/[username]/receive/[...param]/+page.svelte
@@ -9,9 +9,9 @@
 
 	export let data;
 	export let form;
-	let network = 'lightning';
+	let type = 'lightning';
 
-	if ($page.params.param === 'bitcoin') network = 'bitcoin';
+	if ($page.params.param === 'bitcoin') type = 'bitcoin';
 
 	let { request } = data;
 
@@ -25,7 +25,7 @@
 	<input type="hidden" name="amount" value={amount} />
 	<input type="hidden" name="currency" value={currency} />
 	<input type="hidden" name="username" value={username} />
-	<input type="hidden" name="network" value={network} />
+	<input type="hidden" name="type" value={type} />
 
 	{#if request}
 		<input type="hidden" name="request_id" value={request.id} />
diff --git a/src/routes/(app)/invoice/[hash]/+page.svelte b/src/routes/(app)/invoice/[hash]/+page.svelte
index 28ff27c0..059225ab 100644
--- a/src/routes/(app)/invoice/[hash]/+page.svelte
+++ b/src/routes/(app)/invoice/[hash]/+page.svelte
@@ -15,7 +15,7 @@
 	let {
 		address,
 		amount,
-		network,
+		type,
 		rate,
 		received,
 		prompt,
@@ -36,7 +36,7 @@
 		({
 			address,
 			amount,
-			network,
+			type,
 			rate,
 			received,
 			prompt,
diff --git a/src/routes/(app)/invoice/[hash]/tip/+page.svelte b/src/routes/(app)/invoice/[hash]/tip/+page.svelte
index 308720ab..d7df0a69 100644
--- a/src/routes/(app)/invoice/[hash]/tip/+page.svelte
+++ b/src/routes/(app)/invoice/[hash]/tip/+page.svelte
@@ -66,7 +66,7 @@
 	let { invoice, id, user } = data;
 	let {
 		amount,
-		network,
+		type,
 		rate,
 		received,
 		prompt,
@@ -86,7 +86,7 @@
 		({ invoice, id } = data);
 		({
 			amount,
-			network,
+			type,
 			rate,
 			received,
 			prompt,
@@ -120,7 +120,7 @@
 		<input type="hidden" name="username" value={username} />
 		<input type="hidden" name="rate" value={rate} />
 		<input type="hidden" name="prompt" value="false" />
-		<input type="hidden" name="network" value={network} />
+		<input type="hidden" name="type" value={type} />
 		<input type="hidden" name="request_id" value={invoice.request?.id} />
 
 		<h1 class="text-4xl font-semibold my-8">{$t('invoice.addTipq')}</h1>
diff --git a/src/routes/(app)/launch/purchase/+page.server.js b/src/routes/(app)/launch/purchase/+page.server.js
index 98ae51eb..63bad702 100644
--- a/src/routes/(app)/launch/purchase/+page.server.js
+++ b/src/routes/(app)/launch/purchase/+page.server.js
@@ -31,7 +31,7 @@ export const actions = {
 		let invoice = {
 			amount: 22000,
 			memo: 'launch',
-			network: 'lightning',
+			type: 'lightning',
 			prompt: false,
 			rate: rates[form.get('currency')]
 		};
diff --git a/src/routes/(app)/login/+page.server.js b/src/routes/(app)/login/+page.server.js
index 4c3c0897..824e7b09 100644
--- a/src/routes/(app)/login/+page.server.js
+++ b/src/routes/(app)/login/+page.server.js
@@ -12,6 +12,8 @@ export const actions = {
 		let { username, password, token, loginRedirect } = form;
 		let user = { username, password, token };
 
+    if (loginRedirect === 'undefined') loginRedirect = undefined;
+
 		try {
 			let r = await login(user, cookies);
 			console.log('R', r);
diff --git a/src/routes/(app)/pot/[name]/+page.svelte b/src/routes/(app)/pot/[name]/+page.svelte
index 48dc9b31..c936cf59 100644
--- a/src/routes/(app)/pot/[name]/+page.svelte
+++ b/src/routes/(app)/pot/[name]/+page.svelte
@@ -35,7 +35,8 @@
 				<!-- <p class="absolute right-0 top-1 underline"><Icon icon="settings" /></p> -->
 				<h1 class="text-2xl md:text-3xl font-semibold">Public Pot</h1>
 			</div>
-			<p class="text-secondary">Anyone who knows the URL for this pot can add or take out funds</p>
+			<p class="text-secondary">Anyone who knows the URL to this pot can add or take out funds</p>
+      <img src={src} class="mx-auto" />
 			<div class="flex justify-center gap-4">
 				<div class="my-auto">
 					<h2 class="text-2xl md:text-3xl font-semibold">
diff --git a/src/routes/(app)/pot/[name]/withdraw/+page.server.js b/src/routes/(app)/pot/[name]/withdraw/+page.server.js
index 6534e07b..7a486d58 100644
--- a/src/routes/(app)/pot/[name]/withdraw/+page.server.js
+++ b/src/routes/(app)/pot/[name]/withdraw/+page.server.js
@@ -11,7 +11,7 @@ export const actions = {
 		let body = Object.fromEntries(await request.formData());
 
 		try {
-			await post('/withdraw', body, auth(cookies));
+			await post('/take', body, auth(cookies));
 		} catch (e) {
 			return invalid(400, { message: e.message });
 		}
diff --git a/src/routes/(app)/register/+page.server.js b/src/routes/(app)/register/+page.server.js
index 58b62ba2..067a9ef6 100644
--- a/src/routes/(app)/register/+page.server.js
+++ b/src/routes/(app)/register/+page.server.js
@@ -13,7 +13,7 @@ export const actions = {
 		let user = { username, password, cipher, salt, pubkey };
 		let error;
 
-		console.log('LR', loginRedirect);
+    if (loginRedirect === 'undefined') loginRedirect = undefined;
 
 		try {
 			await post('/register', { user });
diff --git a/src/routes/(app)/send/lightning/[payreq]/+page.server.js b/src/routes/(app)/send/lightning/[payreq]/+page.server.js
index 42b91445..a29793bf 100644
--- a/src/routes/(app)/send/lightning/[payreq]/+page.server.js
+++ b/src/routes/(app)/send/lightning/[payreq]/+page.server.js
@@ -18,7 +18,7 @@ export const actions = {
 				return invalid(403, { amount, confirm: true });
 			}
 
-			await post('/lightning/send', body, auth(cookies));
+			await post('/payments', body, auth(cookies));
 		} catch (e) {
 			if (e.message.includes('unusable'))
 				e.message = 'Failed to route payment, try sending a lower amount';
diff --git a/src/routes/(app)/send/pot/[name]/[...amount]/+page.server.js b/src/routes/(app)/send/pot/[name]/[...amount]/+page.server.js
index f25fcb6d..eadaa22e 100644
--- a/src/routes/(app)/send/pot/[name]/[...amount]/+page.server.js
+++ b/src/routes/(app)/send/pot/[name]/[...amount]/+page.server.js
@@ -7,7 +7,7 @@ export const actions = {
 		let p;
 
 		try {
-			p = await post('/send', body, auth(cookies));
+			p = await post('/payments', body, auth(cookies));
 		} catch (e) {
 			return invalid(400, { message: e.message });
 		}
diff --git a/src/routes/(app)/withdraw/+server.js b/src/routes/(app)/withdraw/+server.js
index 718707d0..852e17d8 100644
--- a/src/routes/(app)/withdraw/+server.js
+++ b/src/routes/(app)/withdraw/+server.js
@@ -2,7 +2,7 @@ import { auth, post } from '$lib/utils';
 
 export async function POST({ cookies, request }) {
 	let body = await request.json();
-	await post('/lightning/send', body, auth(cookies));
+	await post('/payments', body, auth(cookies));
 
 	return new Response(JSON.stringify('ok'), { headers: { 'content-type': 'application/json' } });
 }
-- 
cgit v1.2.3