From 3b7e5e3492684b3d08f37cb078d6eec3fa4da0b2 Mon Sep 17 00:00:00 2001 From: Adam Soltys Date: Wed, 8 Feb 2023 10:13:03 -0800 Subject: rm uuid route --- .../(app)/[username]/(profile)/+page.server.js | 4 +- src/routes/(app)/[username]/(profile)/+page.svelte | 27 +++++- src/routes/(app)/send/[...text]/+page.server.js | 1 + src/routes/(app)/send/[uuid=uuid]/+page.server.js | 30 ------- src/routes/(app)/send/[uuid=uuid]/+page.svelte | 98 ---------------------- src/routes/(app)/send/invoice/[id]/+page.server.js | 30 +++++++ src/routes/(app)/send/invoice/[id]/+page.svelte | 98 ++++++++++++++++++++++ src/routes/(static)/+layout.svelte | 8 +- src/routes/(static)/bounties/+page.svelte | 1 + 9 files changed, 164 insertions(+), 133 deletions(-) delete mode 100644 src/routes/(app)/send/[uuid=uuid]/+page.server.js delete mode 100644 src/routes/(app)/send/[uuid=uuid]/+page.svelte create mode 100644 src/routes/(app)/send/invoice/[id]/+page.server.js create mode 100644 src/routes/(app)/send/invoice/[id]/+page.svelte create mode 100644 src/routes/(static)/bounties/+page.svelte (limited to 'src/routes') diff --git a/src/routes/(app)/[username]/(profile)/+page.server.js b/src/routes/(app)/[username]/(profile)/+page.server.js index 553e2559..c68cfecc 100644 --- a/src/routes/(app)/[username]/(profile)/+page.server.js +++ b/src/routes/(app)/[username]/(profile)/+page.server.js @@ -16,7 +16,7 @@ export async function load({ cookies, params, parent, url }) { e.seen = e.created_at; }); - let { requests } = await get('/requests', auth(cookies)); + let { invoices, sent, received } = await get('/requests', auth(cookies)); - return { events, requests }; + return { invoices, events, sent, received }; } diff --git a/src/routes/(app)/[username]/(profile)/+page.svelte b/src/routes/(app)/[username]/(profile)/+page.svelte index ae8add63..557ac9b4 100644 --- a/src/routes/(app)/[username]/(profile)/+page.svelte +++ b/src/routes/(app)/[username]/(profile)/+page.svelte @@ -3,7 +3,7 @@ import { t } from '$lib/translations'; export let data; - let { events, requests, subject, user } = data; + let { events, invoices, sent, received, subject, user } = data;
@@ -13,7 +13,30 @@
- {#each requests as { id, invoice, memo, requester: r }} + {#each invoice} + +
+
+
+
+ +
+

{r.username}

+

{memo}

+
+
+
+
+ +
+
+
+ + {/each} + + {#each received as { id, invoice, memo, requester: r }}
diff --git a/src/routes/(app)/send/[...text]/+page.server.js b/src/routes/(app)/send/[...text]/+page.server.js index c64361ff..096c60e9 100644 --- a/src/routes/(app)/send/[...text]/+page.server.js +++ b/src/routes/(app)/send/[...text]/+page.server.js @@ -58,6 +58,7 @@ let parse = async (t, host) => { // user try { user = await get(`/users/${t}`); + if (user.anon) user = null; } catch (e) {} if (user) throw redirect(307, `/send/user/${t}`); diff --git a/src/routes/(app)/send/[uuid=uuid]/+page.server.js b/src/routes/(app)/send/[uuid=uuid]/+page.server.js deleted file mode 100644 index a59853d3..00000000 --- a/src/routes/(app)/send/[uuid=uuid]/+page.server.js +++ /dev/null @@ -1,30 +0,0 @@ -import { error, fail, 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, address, tip, text, user: recipient } = await get(`/invoice/${params.uuid}`); - if (recipient.username === user.username) throw error(500, { message: 'Cannot send to self' }); - if (tip) amount += tip; - return { amount, address, payreq: text, recipient }; -} - -export const actions = { - default: async ({ cookies, params, request }) => { - try { - let body = Object.fromEntries(await request.formData()); - let { confirmed } = body; - - if (!confirmed) { - return fail(400, { amount, confirm: true }); - } - - await post('/payments', body, auth(cookies)); - } catch (e) { - return fail(400, { message: e.message }); - } - - throw redirect(307, '/sent'); - } -}; diff --git a/src/routes/(app)/send/[uuid=uuid]/+page.svelte b/src/routes/(app)/send/[uuid=uuid]/+page.svelte deleted file mode 100644 index 27837bca..00000000 --- a/src/routes/(app)/send/[uuid=uuid]/+page.svelte +++ /dev/null @@ -1,98 +0,0 @@ - - - - -{#if form?.message} -
- {form.message} -
-{/if} - -
- {#if amount} -
-

- {$t('payments.send')} -

-

- {fiat ? f(amountFiat, currency) : '⚡️' + s(amount)} -

- -

{$t('payments.to')}

- -
- -

{recipient.username}

-
-
- {:else} - - {/if} - -
- - - - - - - -
- {#if amount} - - {:else} - - {/if} -
-
-
diff --git a/src/routes/(app)/send/invoice/[id]/+page.server.js b/src/routes/(app)/send/invoice/[id]/+page.server.js new file mode 100644 index 00000000..6b7823ce --- /dev/null +++ b/src/routes/(app)/send/invoice/[id]/+page.server.js @@ -0,0 +1,30 @@ +import { error, fail, redirect } from '@sveltejs/kit'; +import { btc as asset, auth, get, post } from '$lib/utils'; + +export async function load({ params: { id }, parent }) { + let { user } = await parent(); + + let { amount, address, tip, text, user: recipient } = await get(`/invoice/${id}`); + if (recipient.username === user.username) throw error(500, { message: 'Cannot send to self' }); + if (tip) amount += tip; + return { amount, address, payreq: text, recipient }; +} + +export const actions = { + default: async ({ cookies, request }) => { + try { + let body = Object.fromEntries(await request.formData()); + let { confirmed } = body; + + if (!confirmed) { + return fail(400, { amount, confirm: true }); + } + + await post('/payments', body, auth(cookies)); + } catch (e) { + return fail(400, { message: e.message }); + } + + throw redirect(307, '/sent'); + } +}; diff --git a/src/routes/(app)/send/invoice/[id]/+page.svelte b/src/routes/(app)/send/invoice/[id]/+page.svelte new file mode 100644 index 00000000..27837bca --- /dev/null +++ b/src/routes/(app)/send/invoice/[id]/+page.svelte @@ -0,0 +1,98 @@ + + + + +{#if form?.message} +
+ {form.message} +
+{/if} + +
+ {#if amount} +
+

+ {$t('payments.send')} +

+

+ {fiat ? f(amountFiat, currency) : '⚡️' + s(amount)} +

+ +

{$t('payments.to')}

+ +
+ +

{recipient.username}

+
+
+ {:else} + + {/if} + +
+ + + + + + + +
+ {#if amount} + + {:else} + + {/if} +
+
+
diff --git a/src/routes/(static)/+layout.svelte b/src/routes/(static)/+layout.svelte index a7a1ab22..dde9fd11 100644 --- a/src/routes/(static)/+layout.svelte +++ b/src/routes/(static)/+layout.svelte @@ -1,3 +1,9 @@ -
+ + + +
+