diff options
| author | Adam Soltys <[email protected]> | 2022-11-05 11:53:08 -0700 |
|---|---|---|
| committer | Adam Soltys <[email protected]> | 2022-11-05 11:53:27 -0700 |
| commit | d76060a5dc4f9f3da6d9cea517dff48995fd5818 (patch) | |
| tree | dbeef979157bdbb104526ab16e925176871df1b2 /src/routes/(app) | |
| parent | 2a2b3d7074e8a784e5673699af2143fdcb01e728 (diff) | |
| download | coinos-ui-invoice-requests.tar.gz coinos-ui-invoice-requests.zip | |
handle lnurl pay requestsinvoice-requests
Diffstat (limited to 'src/routes/(app)')
| -rw-r--r-- | src/routes/(app)/+layout.svelte | 1 | ||||
| -rw-r--r-- | src/routes/(app)/[username]/+page.svelte | 12 | ||||
| -rw-r--r-- | src/routes/(app)/lnurl/[lnurl]/+page.server.js | 19 | ||||
| -rw-r--r-- | src/routes/(app)/lnurl/[lnurl]/+page.svelte | 46 | ||||
| -rw-r--r-- | src/routes/(app)/send/[...text]/+page.server.js | 21 |
5 files changed, 85 insertions, 14 deletions
diff --git a/src/routes/(app)/+layout.svelte b/src/routes/(app)/+layout.svelte index 9f29e9a2..5bfe7712 100644 --- a/src/routes/(app)/+layout.svelte +++ b/src/routes/(app)/+layout.svelte @@ -1,5 +1,4 @@ <script> - import { fly } from 'svelte/transition'; import { SvelteToast } from '@zerodevx/svelte-toast'; import { onDestroy, onMount } from 'svelte'; import { close, connect, send } from '$lib/socket'; diff --git a/src/routes/(app)/[username]/+page.svelte b/src/routes/(app)/[username]/+page.svelte index a5b627df..b9deeb5f 100644 --- a/src/routes/(app)/[username]/+page.svelte +++ b/src/routes/(app)/[username]/+page.svelte @@ -52,11 +52,11 @@ </button> </a> - <a href={`/${subject.username}/request`}> - <button class="rounded-full border py-2 px-5 font-bold hover:opacity-80 w-full mb-2" - >Request an invoice</button - > - </a> + <!-- <a href={`/${subject.username}/request`}> --> + <!-- <button class="rounded-full border py-2 px-5 font-bold hover:opacity-80 w-full mb-2" --> + <!-- >Request an invoice</button --> + <!-- > --> + <!-- </a> --> </div> {/if} </div> @@ -65,7 +65,7 @@ <p class="text-secondary mb-1"> This <a href="https://lightningaddress.com" class="underline" target="_blank" rel="noreferrer" >lightning address</a - > can be used repeatedly so you can publish it on websites, business cards, posters, etc. + > is like an email for bitcoin. Publish it on your website, business cards, posters, etc. </p> <div diff --git a/src/routes/(app)/lnurl/[lnurl]/+page.server.js b/src/routes/(app)/lnurl/[lnurl]/+page.server.js new file mode 100644 index 00000000..7b4a527a --- /dev/null +++ b/src/routes/(app)/lnurl/[lnurl]/+page.server.js @@ -0,0 +1,19 @@ +import { auth, get, post } from '$lib/utils'; +import { error, redirect } from '@sveltejs/kit'; + +export async function load({ locals, params }) { + if (!locals.user) redirect(307, '/login'); + let { lnurl } = params; + lnurl = await get(`/decode?text=${lnurl}`); + if (lnurl.tag !== 'payRequest') throw error(500, 'We can only handle lnurl pay requests'); + + return lnurl; +} + +export const actions = { + default: async ({ cookies, request }) => { + let { callback, ...form } = Object.fromEntries(await request.formData()); + form.params = { callback }; + await post('/pay', form, auth(cookies)); + } +}; diff --git a/src/routes/(app)/lnurl/[lnurl]/+page.svelte b/src/routes/(app)/lnurl/[lnurl]/+page.svelte new file mode 100644 index 00000000..92eca3e0 --- /dev/null +++ b/src/routes/(app)/lnurl/[lnurl]/+page.svelte @@ -0,0 +1,46 @@ +<script> + import { enhance } from '$app/forms'; + import { Numpad, Spinner } from '$comp'; + import { pin } from '$lib/store'; + + export let data; + let { currency } = data.user; + let { minSendable, maxSendable, callback, metadata } = data; + let amount, loading; + let submit = () => (loading = true); +</script> + +<div class="container px-4 mt-20 max-w-xl mx-auto"> + <div class="text-center mb-8"> + {#each JSON.parse(metadata) as m} + <div> + {#if m[0] === 'text/plain'} + <h1 class="text-3xl md:text-4xl font-semibold mb-2">{m[1]}</h1> + {/if} + {#if m[0].includes('image')} + <img src={`data:image/png;base64,${m[1]}`} alt="Recipient" /> + {/if} + </div> + {/each} + </div> + <Numpad bind:amount {currency} /> + + <form method="POST" use:enhance on:submit={submit}> + <input name="amount" value={amount} type="hidden" /> + <input name="callback" value={callback} type="hidden" /> + <input name="pin" value={$pin} type="hidden" /> + + <div class="flex w-full"> + <button + type="submit" + class="opacity-100 hover:opacity-80'} rounded-2xl border py-3 font-bold mx-auto mt-2 bg-black text-white px-4 w-24" + > + {#if loading} + <Spinner /> + {:else} + Send + {/if} + </button> + </div> + </form> +</div> diff --git a/src/routes/(app)/send/[...text]/+page.server.js b/src/routes/(app)/send/[...text]/+page.server.js index b909ab4d..4668cb4f 100644 --- a/src/routes/(app)/send/[...text]/+page.server.js +++ b/src/routes/(app)/send/[...text]/+page.server.js @@ -3,8 +3,10 @@ import bip21 from 'bip21'; import { get, post } from '$lib/utils'; import { invalid, redirect } from '@sveltejs/kit'; -let parse = async (t) => { +let parse = async (t, r) => { if (!t) return; + if (t.includes(':')) t = t.split(':')[1]; + let user, uuid; // lightning @@ -32,11 +34,16 @@ let parse = async (t) => { // ln address if (t.includes('@') && t.includes('.')) { let [name, domain] = t.split('@'); - try { - let lnurl = await get(`/encode?domain=${domain}&name=${name}`); - } catch (e) {} + if (domain === r.host) t = name; + else { + try { + t = await get(`/encode?domain=${domain}&name=${name}`); + } catch (e) {} + } } + if (t.toLowerCase().startsWith('lnurl')) throw redirect(307, `/lnurl/${t}`); + // user try { user = await get(`/users/${t}`); @@ -45,15 +52,15 @@ let parse = async (t) => { if (user) throw redirect(303, `/send/user/${t}`); }; -export async function load({ params }) { +export async function load({ params, request }) { let { text } = params; - await parse(text); + await parse(text, request); } export const actions = { default: async ({ request }) => { const form = await request.formData(); - await parse(form.get('text')); + await parse(form.get('text'), request); return invalid(403, { error: 'Does not compute, try again' }); } |
