From 5bf4891768f1ee359ee5795272c289b40745aed5 Mon Sep 17 00:00:00 2001 From: Adam Soltys Date: Sat, 30 Jul 2022 11:13:39 -0700 Subject: get invoice by uuid --- src/routes/[username].js | 3 - src/routes/[username].svelte | 27 --- src/routes/[username]/index.js | 3 + src/routes/[username]/index.svelte | 27 +++ src/routes/[username]/receive.svelte | 188 ++++++++++++++++++++ src/routes/__layout.svelte | 2 +- src/routes/invoice/[amount].js | 12 -- src/routes/invoice/[amount].svelte | 322 ----------------------------------- src/routes/invoice/[id].js | 11 ++ src/routes/invoice/[id].svelte | 322 +++++++++++++++++++++++++++++++++++ src/routes/invoice/index.js | 11 ++ src/routes/receive.svelte | 178 ------------------- 12 files changed, 563 insertions(+), 543 deletions(-) delete mode 100644 src/routes/[username].js delete mode 100644 src/routes/[username].svelte create mode 100644 src/routes/[username]/index.js create mode 100644 src/routes/[username]/index.svelte create mode 100644 src/routes/[username]/receive.svelte delete mode 100644 src/routes/invoice/[amount].js delete mode 100644 src/routes/invoice/[amount].svelte create mode 100644 src/routes/invoice/[id].js create mode 100644 src/routes/invoice/[id].svelte create mode 100644 src/routes/invoice/index.js delete mode 100644 src/routes/receive.svelte (limited to 'src/routes') diff --git a/src/routes/[username].js b/src/routes/[username].js deleted file mode 100644 index 39a216c2..00000000 --- a/src/routes/[username].js +++ /dev/null @@ -1,3 +0,0 @@ -export async function GET({ params }) { - return { body: params } -} diff --git a/src/routes/[username].svelte b/src/routes/[username].svelte deleted file mode 100644 index fe1f7754..00000000 --- a/src/routes/[username].svelte +++ /dev/null @@ -1,27 +0,0 @@ - - -{#if $user?.username === username} - -
-
-
- Signed in as {username} -
- -
- - - -
-
-
-{/if} diff --git a/src/routes/[username]/index.js b/src/routes/[username]/index.js new file mode 100644 index 00000000..39a216c2 --- /dev/null +++ b/src/routes/[username]/index.js @@ -0,0 +1,3 @@ +export async function GET({ params }) { + return { body: params } +} diff --git a/src/routes/[username]/index.svelte b/src/routes/[username]/index.svelte new file mode 100644 index 00000000..fe1f7754 --- /dev/null +++ b/src/routes/[username]/index.svelte @@ -0,0 +1,27 @@ + + +{#if $user?.username === username} + +
+
+
+ Signed in as {username} +
+ + +
+
+{/if} diff --git a/src/routes/[username]/receive.svelte b/src/routes/[username]/receive.svelte new file mode 100644 index 00000000..9ebc0401 --- /dev/null +++ b/src/routes/[username]/receive.svelte @@ -0,0 +1,188 @@ + + +{#if $user} + + +
+ {#if $rate} +
+ +
+
+ {useFiat ? `$${amountFiat}` : amountSatsFormatted}{useFiat ? 'USD' : 'SATS'} +
+ {useFiat ? `${amountSatsConverted} SATS` : `${amountFiatConverted} USD`} + +
+ + + {#if message} +
+ +

{message}

+
+ {/if} + + +
+ {#each numPad as value} + {#if value === '<'} + + {:else} + + {/if} + {/each} +
+ + +
+ + +
+
+ {:else} +
+ {/if} +
+{/if} diff --git a/src/routes/__layout.svelte b/src/routes/__layout.svelte index c01dc848..95b2e0c3 100644 --- a/src/routes/__layout.svelte +++ b/src/routes/__layout.svelte @@ -14,7 +14,7 @@ onMount(() => { if (protectedRoutes.find((p) => $page.url.pathname.match(p))) { if (!$token) goto('/login'); - user.subscribe((u) => (ready = true)); + user.subscribe((u) => (ready = true)); } else { ready = true; } diff --git a/src/routes/invoice/[amount].js b/src/routes/invoice/[amount].js deleted file mode 100644 index 9e9678a6..00000000 --- a/src/routes/invoice/[amount].js +++ /dev/null @@ -1,12 +0,0 @@ -import { post } from '$lib/utils'; - -const username = 'bob', - network = 'lightning'; - -export async function GET({ params }) { - let { amount } = params; - let { text } = await post('/lightning/invoice', { amount }); - await post('/invoice', { invoice: { text, network }, user: { username } }); - - return { body: { amount, text } }; -} diff --git a/src/routes/invoice/[amount].svelte b/src/routes/invoice/[amount].svelte deleted file mode 100644 index d1dea907..00000000 --- a/src/routes/invoice/[amount].svelte +++ /dev/null @@ -1,322 +0,0 @@ - - -{#if $user} -
- - -
-
- {#if $invoiceAmount && $invoiceAmountFiat && $rate && text} - -
-

Add a tip?

- -
- {tipAmountFormatted}{`(${tipAmountSats} SATS)`} - {tipPercent}% -
- - { - customTipAmount = ''; - tipPercent = e.target.value; - }} - /> - -
- {#each tipAmounts as amount} - - {/each} - -
- $ - handleCustomTipAmount(e)} - class="bg-primary rounded-2xl py-3 px-10 font-semibold mt-2 mr-1 w-full md:w-auto" - placeholder="Other" - /> - -
-
-
- -