From f4a66ec14e12b357227ebd06f7ce698bf50a08f1 Mon Sep 17 00:00:00 2001
From: Adam Soltys <asoltys@gmail.com>
Date: Tue, 7 Feb 2023 22:33:06 -0800
Subject: restoring requests

---
 .../(app)/[username]/(profile)/+layout.svelte      | 36 ++++---------------
 .../(app)/[username]/(profile)/+page.server.js     |  8 +++--
 src/routes/(app)/[username]/(profile)/+page.svelte | 30 ++++++++++++++--
 .../[username]/(profile)/request/+page.server.js   | 15 ++++++++
 .../[username]/(profile)/request/+page.svelte      | 35 +++++++++++++++++++
 .../[username]/(profile)/request/sent/+page.svelte | 18 ++++++++++
 .../[username]/receive/[...param]/+page.server.js  |  2 +-
 .../(app)/[username]/request/+page.server.js       | 15 --------
 src/routes/(app)/[username]/request/+page.svelte   | 40 ----------------------
 .../(app)/[username]/request/[id]/+page.server.js  |  5 ++-
 .../(app)/[username]/request/[id]/+page.svelte     | 20 +++++------
 .../(app)/[username]/request/sent/+page.svelte     | 18 ----------
 src/routes/(app)/login/+page.server.js             |  4 +--
 .../(app)/send/lightning/[payreq]/+page.server.js  |  2 --
 14 files changed, 124 insertions(+), 124 deletions(-)
 create mode 100644 src/routes/(app)/[username]/(profile)/request/+page.server.js
 create mode 100644 src/routes/(app)/[username]/(profile)/request/+page.svelte
 create mode 100644 src/routes/(app)/[username]/(profile)/request/sent/+page.svelte
 delete mode 100644 src/routes/(app)/[username]/request/+page.server.js
 delete mode 100644 src/routes/(app)/[username]/request/+page.svelte
 delete mode 100644 src/routes/(app)/[username]/request/sent/+page.svelte

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

diff --git a/src/routes/(app)/[username]/(profile)/+layout.svelte b/src/routes/(app)/[username]/(profile)/+layout.svelte
index 6dacf2ce..f3488e4b 100644
--- a/src/routes/(app)/[username]/(profile)/+layout.svelte
+++ b/src/routes/(app)/[username]/(profile)/+layout.svelte
@@ -120,51 +120,29 @@
 						</button>
 					</a>
 				</div>
-			{/if}
-			{#if !subject.anon && subject.username !== user?.username}
+
 				<div class="w-full flex">
-					<a href={user ? `/send/${subject.username}` : `/${subject.username}/receive`} class="mx-auto">
+					<a href={`/${subject.username}/request`} class="mx-auto">
 						<button class="rounded-full border py-3 px-6 font-bold hover:opacity-80 flex w-60">
 							<div class="mx-auto flex">
-								<Icon icon="send" style="mr-2" />
-								<div class="mt-1">{$t('user.pay')}</div>
+								<Icon icon="numpad" style="mr-2 my-auto" />
+								<div class="mt-1 my-auto">{$t('payments.requestAnInvoice')}</div>
 							</div>
 						</button>
 					</a>
 				</div>
 			{/if}
-
-			{#if user?.id === subject.id}
+			{#if !subject.anon && subject.username !== user?.username}
 				<div class="w-full flex">
-					<a href={`/send`} class="mx-auto">
+					<a href={user ? `/send/${subject.username}` : `/${subject.username}/receive`} class="mx-auto">
 						<button class="rounded-full border py-3 px-6 font-bold hover:opacity-80 flex w-60">
 							<div class="mx-auto flex">
 								<Icon icon="send" style="mr-2" />
-								<div class="mt-1">{$t('user.dashboard.send')}</div>
-							</div>
-						</button>
-					</a>
-				</div>
-				<div class="w-full flex">
-					<a href={`/${subject.username}/receive`} class="mx-auto">
-						<button class="rounded-full border py-3 px-6 font-bold hover:opacity-80 flex w-60">
-							<div class="mx-auto flex">
-								<Icon icon="numpad" style="mr-2" />
-								<div class="mt-1">{$t('user.dashboard.receive')}</div>
+								<div class="mt-1">{$t('user.pay')}</div>
 							</div>
 						</button>
 					</a>
 				</div>
-				<!-- <div class="w-full flex"> -->
-				<!-- 	<a href={`/${subject.username}/receive`} class="mx-auto"> -->
-				<!-- 		<button class="rounded-full border py-3 px-6 font-bold hover:opacity-80 flex w-60"> -->
-				<!-- 			<div class="mx-auto flex"> -->
-				<!-- 				<Icon icon="support" style="mr-2" /> -->
-				<!-- 				<div class="mt-1">{$t('user.messages')}</div> -->
-				<!-- 			</div> -->
-				<!-- 		</button> -->
-				<!-- 	</a> -->
-				<!-- </div> -->
 			{/if}
 		</div>
 	</div>
diff --git a/src/routes/(app)/[username]/(profile)/+page.server.js b/src/routes/(app)/[username]/(profile)/+page.server.js
index c29ed7df..553e2559 100644
--- a/src/routes/(app)/[username]/(profile)/+page.server.js
+++ b/src/routes/(app)/[username]/(profile)/+page.server.js
@@ -1,6 +1,6 @@
-import { get } from '$lib/utils';
+import { auth, get } from '$lib/utils';
 
-export async function load({ params, parent, url }) {
+export async function load({ cookies, params, parent, url }) {
 	let { subject } = await parent();
 	let { pubkey } = subject;
 
@@ -16,5 +16,7 @@ export async function load({ params, parent, url }) {
 		e.seen = e.created_at;
 	});
 
-	return { events };
+  let { requests } = await get('/requests', auth(cookies));
+
+	return { events, requests };
 }
diff --git a/src/routes/(app)/[username]/(profile)/+page.svelte b/src/routes/(app)/[username]/(profile)/+page.svelte
index 1cf525a0..ae8add63 100644
--- a/src/routes/(app)/[username]/(profile)/+page.svelte
+++ b/src/routes/(app)/[username]/(profile)/+page.svelte
@@ -1,10 +1,9 @@
 <script>
-	import { Balance, Feed } from '$comp';
+	import { Avatar, Balance, Feed } from '$comp';
 	import { t } from '$lib/translations';
 
 	export let data;
-	let { events, subject, user } = data;
-	let v;
+	let { events, requests, subject, user } = data;
 </script>
 
 <div class="flex justify-center lg:justify-start">
@@ -12,3 +11,28 @@
 		<Balance {user} />
 	{/if}
 </div>
+
+<div>
+	{#each requests as { id, invoice, memo, requester: r }}
+		<a href={`/${user.username}/receive/${id}`}>
+			<div class="border-b p-2 last:border-b-0 hover:bg-gray-100">
+				<div class="flex">
+					<div>
+						<div class="flex">
+							<Avatar user={r} size={20} />
+							<div class="my-auto text-left">
+								<p class="ml-1 text-lg break-words">{r.username}</p>
+								<p class="ml-1 text-secondary">{memo}</p>
+							</div>
+						</div>
+					</div>
+					<div class="whitespace-nowrap my-auto ml-auto flex gap-2">
+						<button class="rounded-full border py-2 px-4 font-bold hover:opacity-80 w-full"
+							>Invoice</button
+						>
+					</div>
+				</div>
+			</div>
+		</a>
+	{/each}
+</div>
diff --git a/src/routes/(app)/[username]/(profile)/request/+page.server.js b/src/routes/(app)/[username]/(profile)/request/+page.server.js
new file mode 100644
index 00000000..2c1d6bde
--- /dev/null
+++ b/src/routes/(app)/[username]/(profile)/request/+page.server.js
@@ -0,0 +1,15 @@
+import { redirect } from '@sveltejs/kit';
+import { auth, post } from '$lib/utils';
+
+export const actions = {
+	create: async ({ cookies, params, request, url }) => {
+		let form = Object.fromEntries(await request.formData());
+		let { id, requester } = await post('/requests', form, auth(cookies));
+		throw redirect(307, `/${params.username}/request/${id}`);
+	},
+
+	delete: async ({ cookies, request }) => {
+		let form = Object.fromEntries(await request.formData());
+		let r = await post('/requests/delete', form, auth(cookies));
+	}
+};
diff --git a/src/routes/(app)/[username]/(profile)/request/+page.svelte b/src/routes/(app)/[username]/(profile)/request/+page.svelte
new file mode 100644
index 00000000..75117ff4
--- /dev/null
+++ b/src/routes/(app)/[username]/(profile)/request/+page.svelte
@@ -0,0 +1,35 @@
+<script>
+	import { t } from '$lib/translations';
+	import { enhance } from '$app/forms';
+	import { Icon } from '$comp';
+
+	export let data;
+
+	let { subject, user } = data;
+</script>
+
+<div class="container max-w-lg px-4 mx-auto mt-10 space-y-5">
+	<h1 class="px-3 md:px-0 text-center text-3xl md:text-4xl font-semibold">
+		{$t('payments.requestAnInvoice')}
+	</h1>
+
+	<form action="?/create" method="POST" use:enhance class="space-y-5">
+		<input type="hidden" name="requester_id" value={user.id} />
+		<input type="hidden" name="recipient" value={subject.username} />
+
+		<textarea
+			name="memo"
+			placeholder={$t('payments.describeOrder')}
+			class="w-full p-4 border rounded-xl h-48"
+		/>
+
+		<div class="w-full flex">
+			<button
+				type="submit"
+				class="bg-black text-white border rounded-full px-6 py-2 font-bold mx-auto"
+			>
+				{$t('payments.submit')}
+			</button>
+		</div>
+	</form>
+</div>
diff --git a/src/routes/(app)/[username]/(profile)/request/sent/+page.svelte b/src/routes/(app)/[username]/(profile)/request/sent/+page.svelte
new file mode 100644
index 00000000..4995bfb2
--- /dev/null
+++ b/src/routes/(app)/[username]/(profile)/request/sent/+page.svelte
@@ -0,0 +1,18 @@
+<script>
+	import { scale } from 'svelte/transition';
+	import { Icon } from '$comp';
+
+	export let data;
+	let { subject } = data;
+</script>
+
+<div class="container px-4 text-center mx-auto">
+	<div class="flex w-full py-20 max-w-[200px] mx-auto" in:scale={{ start: 0.5 }}>
+		<Icon icon="check" style="mx-auto" />
+	</div>
+	<h1 class="text-3xl md:text-4xl font-bold mb-6">Request sent</h1>
+</div>
+
+<a href={`/${subject.username}`}>
+	<div class="opacity-0 w-screen h-screen fixed top-24 left-0 z-50" />
+</a>
diff --git a/src/routes/(app)/[username]/receive/[...param]/+page.server.js b/src/routes/(app)/[username]/receive/[...param]/+page.server.js
index 1e57aa67..cdd89c8b 100644
--- a/src/routes/(app)/[username]/receive/[...param]/+page.server.js
+++ b/src/routes/(app)/[username]/receive/[...param]/+page.server.js
@@ -2,7 +2,7 @@ import { auth, get } from '$lib/utils';
 import invoice from '$lib/invoice';
 
 export let load = async ({ cookies, params }) => {
-	let id = parseInt(params.param);
+	let id = params.param;
 
 	let request;
 	if (id) ({ request } = await get(`/request/${id}`, auth(cookies)));
diff --git a/src/routes/(app)/[username]/request/+page.server.js b/src/routes/(app)/[username]/request/+page.server.js
deleted file mode 100644
index b4a1e941..00000000
--- a/src/routes/(app)/[username]/request/+page.server.js
+++ /dev/null
@@ -1,15 +0,0 @@
-import { redirect } from '@sveltejs/kit';
-import { auth, post } from '$lib/utils';
-
-export const actions = {
-	create: async ({ cookies, request, url }) => {
-		let form = Object.fromEntries(await request.formData());
-		let { id, requester } = await post('/requests', form, auth(cookies));
-		throw redirect(307, `/${requester.username}/request/${id}`);
-	},
-
-	delete: async ({ cookies, request }) => {
-		let form = Object.fromEntries(await request.formData());
-		let r = await post('/requests/delete', form, auth(cookies));
-	}
-};
diff --git a/src/routes/(app)/[username]/request/+page.svelte b/src/routes/(app)/[username]/request/+page.svelte
deleted file mode 100644
index 173c2c05..00000000
--- a/src/routes/(app)/[username]/request/+page.svelte
+++ /dev/null
@@ -1,40 +0,0 @@
-<script>
-	import { t } from '$lib/translations';
-	import { enhance } from '$app/forms';
-	import { Icon } from '$comp';
-	import { back } from '$lib/utils';
-
-	export let data;
-
-	let { subject, user } = data;
-</script>
-
-<button class="ml-5 md:ml-20 mt-10 hover:opacity-80" on:click={back}>
-	<Icon icon="arrow-left" style="w-10" />
-</button>
-
-<div class="container max-w-lg px-4 mx-auto mt-10 space-y-5">
-	<h1 class="px-3 md:px-0 text-center text-3xl md:text-4xl font-semibold">
-		{$t('payments.requestAnInvoice')}
-	</h1>
-
-	<form action="?/create" method="POST" use:enhance class="space-y-5">
-		<input type="hidden" name="requester_id" value={user.id} />
-		<input type="hidden" name="recipient" value={subject.username} />
-
-		<textarea
-			name="memo"
-			placeholder={$t('payments.describeOrder')}
-			class="w-full p-4 border rounded-xl h-48"
-		/>
-
-		<div class="w-full flex">
-			<button
-				type="submit"
-				class="bg-black text-white border rounded-full px-6 py-2 font-bold mx-auto"
-			>
-				{$t('payments.submit')}
-			</button>
-		</div>
-	</form>
-</div>
diff --git a/src/routes/(app)/[username]/request/[id]/+page.server.js b/src/routes/(app)/[username]/request/[id]/+page.server.js
index 542a3ccb..5fb90bf3 100644
--- a/src/routes/(app)/[username]/request/[id]/+page.server.js
+++ b/src/routes/(app)/[username]/request/[id]/+page.server.js
@@ -1,8 +1,10 @@
 import { auth, get } from '$lib/utils';
 import { redirect } from '@sveltejs/kit';
 
-export let load = async ({ cookies, depends, locals: { user }, params }) => {
+export let load = async ({ cookies, depends, params, parent }) => {
 	depends('app:invoice');
+
+  let { user } = await parent();
 	if (!user) throw redirect(307, '/login');
 
 	let { request } = await get(`/request/${params.id}`, auth(cookies));
@@ -19,5 +21,6 @@ export let load = async ({ cookies, depends, locals: { user }, params }) => {
 		if (request.requester.username === user.username) throw redirect(307, `/send/${id}`);
 	}
 
+
 	return { request };
 };
diff --git a/src/routes/(app)/[username]/request/[id]/+page.svelte b/src/routes/(app)/[username]/request/[id]/+page.svelte
index b061886e..b8dedbfc 100644
--- a/src/routes/(app)/[username]/request/[id]/+page.svelte
+++ b/src/routes/(app)/[username]/request/[id]/+page.svelte
@@ -1,6 +1,7 @@
 <script>
+	import { scale } from 'svelte/transition';
 	import { t } from '$lib/translations';
-	import { Avatar } from '$comp';
+	import { Avatar, Icon } from '$comp';
 	import { f, sat, sats } from '$lib/utils';
 	import { request as req, requestRedirect } from '$lib/store';
 	import { onMount } from 'svelte';
@@ -17,10 +18,10 @@
 	onMount(() => req.set());
 </script>
 
-<div class="container px-4 mt-20 max-w-xl mx-auto space-y-8">
+<div class="container px-4 max-w-xl mx-auto space-y-8">
 	<div class="text-center mb-8 space-y-5">
 		{#if request.recipient_id === user.id}
-			<p class="text-5xl break-words">
+			<p class="text-4xl break-words">
 				<span class="text-xl md:text-2xl">{$t('payments.sentInvoiceTo')}</span>
 			</p>
 			<div class="flex p-1 gap-2 justify-center">
@@ -34,13 +35,12 @@
 				<h3 class="text-secondary md:text-lg mb-6 mt-1">{sat(amount)}</h3>
 			</div>
 		{:else}
-			<p class="text-5xl break-words">
-				<span class="text-xl md:text-2xl">{$t('payments.sentRequestTo')}</span>
-			</p>
-			<div class="flex p-1 gap-2 justify-center">
-				<Avatar user={request.recipient} size={20} />
-				<p class="text-4xl break-words my-auto">{request.recipient.username}</p>
+			<div class="flex w-full max-w-[200px] mx-auto py-20" in:scale={{ start: 0.5 }}>
+				<Icon icon="check" style="mx-auto" />
 			</div>
+			<p class="text-3xl">
+				{$t('payments.sentRequestTo')}
+			</p>
 		{/if}
 	</div>
 </div>
@@ -49,4 +49,4 @@
 	<div class="opacity-0 w-screen h-screen fixed top-0 left-0 z-50" />
 </a>
 
-<div class="fixed bottom-10 w-full text-center">{$t('payments.tapAnywhere')}</div>
+<div class="fixed bottom-10 left-0 text-center w-full">{$t('payments.tapAnywhere')}</div>
diff --git a/src/routes/(app)/[username]/request/sent/+page.svelte b/src/routes/(app)/[username]/request/sent/+page.svelte
deleted file mode 100644
index 4995bfb2..00000000
--- a/src/routes/(app)/[username]/request/sent/+page.svelte
+++ /dev/null
@@ -1,18 +0,0 @@
-<script>
-	import { scale } from 'svelte/transition';
-	import { Icon } from '$comp';
-
-	export let data;
-	let { subject } = data;
-</script>
-
-<div class="container px-4 text-center mx-auto">
-	<div class="flex w-full py-20 max-w-[200px] mx-auto" in:scale={{ start: 0.5 }}>
-		<Icon icon="check" style="mx-auto" />
-	</div>
-	<h1 class="text-3xl md:text-4xl font-bold mb-6">Request sent</h1>
-</div>
-
-<a href={`/${subject.username}`}>
-	<div class="opacity-0 w-screen h-screen fixed top-24 left-0 z-50" />
-</a>
diff --git a/src/routes/(app)/login/+page.server.js b/src/routes/(app)/login/+page.server.js
index 27607ff1..a6a7120a 100644
--- a/src/routes/(app)/login/+page.server.js
+++ b/src/routes/(app)/login/+page.server.js
@@ -3,7 +3,7 @@ import { login } from '$lib/utils';
 
 export const load = async ({ parent }) => {
 	let { user } = await parent();
-	if (user?.pubkey) throw redirect(307, `/${user.username}/dashboard`);
+	if (user?.pubkey) throw redirect(307, `/${user.username}`);
 };
 
 export const actions = {
@@ -20,6 +20,6 @@ export const actions = {
 			return fail(400, { error: 'Login failed', message: e.message, ...form });
 		}
 
-		throw redirect(303, loginRedirect || `/${user.username}/dashboard`);
+		throw redirect(303, loginRedirect || `/${user.username}`);
 	}
 };
diff --git a/src/routes/(app)/send/lightning/[payreq]/+page.server.js b/src/routes/(app)/send/lightning/[payreq]/+page.server.js
index 21bc9c71..90e6c0cc 100644
--- a/src/routes/(app)/send/lightning/[payreq]/+page.server.js
+++ b/src/routes/(app)/send/lightning/[payreq]/+page.server.js
@@ -15,8 +15,6 @@ export const actions = {
 			let body = Object.fromEntries(await request.formData());
 			let { amount, confirmed } = body;
 
-			console.log('AMOUNT', amount);
-
 			if (!confirmed) {
 				return fail(400, { amount, confirm: true });
 			}
-- 
cgit v1.2.3