From 7bfd57b8b249fcf8ab87b52c8a4416d62f3cd1f6 Mon Sep 17 00:00:00 2001 From: Adam Soltys Date: Sat, 24 Sep 2022 13:34:37 -0700 Subject: wip --- src/routes/[username]/receive/+page.svelte | 2 +- .../receive/[network]/[amount]/+page.server.js | 0 .../receive/[network]/[amount]/+page.svelte | 1 + src/routes/invoice/+server.js | 20 ++++-- src/routes/launch-party/+page.svelte | 1 - src/routes/launch/+page.svelte | 42 ++++++++++++ src/routes/launch/purchase/+page.svelte | 79 ++++++++++++++++++++++ src/routes/register/+page.server.js | 7 +- 8 files changed, 140 insertions(+), 12 deletions(-) create mode 100644 src/routes/[username]/receive/[network]/[amount]/+page.server.js create mode 100644 src/routes/[username]/receive/[network]/[amount]/+page.svelte delete mode 100644 src/routes/launch-party/+page.svelte create mode 100644 src/routes/launch/+page.svelte create mode 100644 src/routes/launch/purchase/+page.svelte (limited to 'src/routes') diff --git a/src/routes/[username]/receive/+page.svelte b/src/routes/[username]/receive/+page.svelte index ba443ff2..f10e0426 100644 --- a/src/routes/[username]/receive/+page.svelte +++ b/src/routes/[username]/receive/+page.svelte @@ -75,7 +75,7 @@ let submit = async () => { loading = true; - let id = await post('/invoice', { + let { id } = await post('/invoice', { amount, rate: $selectedRate, username: $page.params.username diff --git a/src/routes/[username]/receive/[network]/[amount]/+page.server.js b/src/routes/[username]/receive/[network]/[amount]/+page.server.js new file mode 100644 index 00000000..e69de29b diff --git a/src/routes/[username]/receive/[network]/[amount]/+page.svelte b/src/routes/[username]/receive/[network]/[amount]/+page.svelte new file mode 100644 index 00000000..45b983be --- /dev/null +++ b/src/routes/[username]/receive/[network]/[amount]/+page.svelte @@ -0,0 +1 @@ +hi diff --git a/src/routes/invoice/+server.js b/src/routes/invoice/+server.js index 225f6bb1..d4c4c303 100644 --- a/src/routes/invoice/+server.js +++ b/src/routes/invoice/+server.js @@ -1,11 +1,17 @@ import { auth, get, post } from '$lib/utils'; -export async function POST({ request }) { - let network = 'lightning'; - let { amount, currency, rate, tip, text, username } = await request.json(); - ({ text } = await post('/lightning/invoice', { amount }, auth(request))); - let invoice = { amount, currency, network, rate, tip, text }; - let { uuid } = await post('/invoice', { invoice, user: { username } }, auth(request)); +export async function POST({ request, parent }) { + let { amount, currency, network = 'lightning', rate, tip, username } = await request.json(); + let invoice = { amount, currency, network, rate, tip }; - return new Response(JSON.stringify(uuid), { headers: { 'content-type': 'application/json' } }); + if (network === 'lightning') { + invoice.text = await post('/lightning/invoice', { amount }, auth(request)); + } else { + invoice.address = (await parent()).user.address; + } + + return new Response( + JSON.stringify(await post('/invoice', { invoice, user: { username } }, auth(request))), + { headers: { 'content-type': 'application/json' } } + ); } diff --git a/src/routes/launch-party/+page.svelte b/src/routes/launch-party/+page.svelte deleted file mode 100644 index 5c6e643a..00000000 --- a/src/routes/launch-party/+page.svelte +++ /dev/null @@ -1 +0,0 @@ -Launch party! diff --git a/src/routes/launch/+page.svelte b/src/routes/launch/+page.svelte new file mode 100644 index 00000000..98d9dba6 --- /dev/null +++ b/src/routes/launch/+page.svelte @@ -0,0 +1,42 @@ + +
+
+ +
+
+
Oct
+
5
+
6 pm
+
+
+

+ Coinos Launch Party Ticket +

+

+ Come join us at our launch party celebrating 10 years in business! We'll be introducing + our newly designed payments interface and afterwards we'll network and enjoy tasty food + and drinks from The Loft! +

+ + +
+
+
+
diff --git a/src/routes/launch/purchase/+page.svelte b/src/routes/launch/purchase/+page.svelte new file mode 100644 index 00000000..c6777349 --- /dev/null +++ b/src/routes/launch/purchase/+page.svelte @@ -0,0 +1,79 @@ + + +
+
+
+ {#if balance > amount} +

+ Buy Your Launch Party Ticket? +

+ +
{amount} sats
+ +
+ +
+ {:else} +

+ Ticket Price +

+
{amount} sats
+ +

+ Your Balance +

+ +
{balance} sats
+ +

+ Funding Options +

+ + + + + {/if} +
+
+
diff --git a/src/routes/register/+page.server.js b/src/routes/register/+page.server.js index abafe2de..2ff4af67 100644 --- a/src/routes/register/+page.server.js +++ b/src/routes/register/+page.server.js @@ -1,9 +1,10 @@ import { post, login } from '$lib/utils'; export async function POST({ request, setHeaders }) { - let user = Object.fromEntries(await request.formData()); - await post('/register', { user }); + let form = Object.fromEntries(await request.formData()); + let { username, password, redirect } = form; + await post('/register', { user: { username, password }}); await login(user, setHeaders); - return { location: `/${user.username}/dashboard` }; + return { location: redirect || `/${user.username}/dashboard` }; } -- cgit v1.2.3