From 73faabbbcc8e60bac38e3e903c87b02f63c20faf Mon Sep 17 00:00:00 2001 From: Adam Soltys Date: Thu, 10 Nov 2022 10:33:33 -0800 Subject: vouchers --- src/components/AppHeader.svelte | 2 +- src/routes/(app)/+layout.server.js | 3 +- src/routes/(app)/[username]/+page.server.js | 2 +- src/routes/(app)/[username]/+page.svelte | 27 +++++------ src/routes/(app)/[username]/dashboard/+page.svelte | 4 +- src/routes/(app)/dashboard/+server.js | 6 +++ src/routes/(app)/redeem/[redeemcode]/+server.js | 12 +++++ src/routes/(app)/register/+page.server.js | 6 +-- src/routes/(app)/send/[uuid=uuid]/+page.server.js | 1 + src/routes/(app)/send/voucher/+page.server.js | 16 +++++++ src/routes/(app)/send/voucher/+page.svelte | 53 ++++++++++++++++++++++ src/routes/(app)/voucher/[code]/+page.server.js | 8 ++++ src/routes/(app)/voucher/[code]/+page.svelte | 49 ++++++++++++++++++++ src/service-worker.js | 12 ++--- 14 files changed, 171 insertions(+), 30 deletions(-) create mode 100644 src/routes/(app)/dashboard/+server.js create mode 100644 src/routes/(app)/redeem/[redeemcode]/+server.js create mode 100644 src/routes/(app)/send/voucher/+page.server.js create mode 100644 src/routes/(app)/send/voucher/+page.svelte create mode 100644 src/routes/(app)/voucher/[code]/+page.server.js create mode 100644 src/routes/(app)/voucher/[code]/+page.svelte (limited to 'src') diff --git a/src/components/AppHeader.svelte b/src/components/AppHeader.svelte index a76b1146..91786a2a 100644 --- a/src/components/AppHeader.svelte +++ b/src/components/AppHeader.svelte @@ -30,7 +30,7 @@ ? `url(/api/public/${subject.username}-banner.webp)` : undefined; - $: $page && (showMenu = false); + $: $page && (showMenu = false);
- copy(text)} - alt="Lightning address" - /> + copy(text)} alt="Lightning address" />
{text}
@@ -58,14 +53,16 @@
- {#if user?.username === subject.username} -

- This lightning address is like an email for bitcoin. You can publish it on your website or business cards and use it multiple times. -

- {/if} + {#if user?.username === subject.username} +

+ This lightning address is like an email for bitcoin. You can publish it on your website or business cards and use + it multiple times. +

+ {/if}
- - diff --git a/src/routes/(app)/[username]/dashboard/+page.svelte b/src/routes/(app)/[username]/dashboard/+page.svelte index 1cbebfc1..a042ddcb 100644 --- a/src/routes/(app)/[username]/dashboard/+page.svelte +++ b/src/routes/(app)/[username]/dashboard/+page.svelte @@ -82,9 +82,9 @@ >Deposit - + Voucher diff --git a/src/routes/(app)/dashboard/+server.js b/src/routes/(app)/dashboard/+server.js new file mode 100644 index 00000000..da001738 --- /dev/null +++ b/src/routes/(app)/dashboard/+server.js @@ -0,0 +1,6 @@ +import { redirect } from '@sveltejs/kit'; +export async function GET({ locals }) { + let { user } = locals; + if (user) throw redirect(307, `/${user.username}/dashboard`); + throw redirect(307, '/login'); +} diff --git a/src/routes/(app)/redeem/[redeemcode]/+server.js b/src/routes/(app)/redeem/[redeemcode]/+server.js new file mode 100644 index 00000000..c1990112 --- /dev/null +++ b/src/routes/(app)/redeem/[redeemcode]/+server.js @@ -0,0 +1,12 @@ +import { redirect } from '@sveltejs/kit'; +import { auth, post } from "$lib/utils"; + +export async function GET({ cookies, locals, params }) { + let { user } = locals; + if (user) { + await post('/redeem', params, auth(cookies)); + throw redirect(307, `/${user.username}/dashboard`); + } + + throw redirect(307, '/login'); +} diff --git a/src/routes/(app)/register/+page.server.js b/src/routes/(app)/register/+page.server.js index 43fd5dbf..96fd3515 100644 --- a/src/routes/(app)/register/+page.server.js +++ b/src/routes/(app)/register/+page.server.js @@ -2,9 +2,9 @@ import { invalid, redirect } from '@sveltejs/kit'; import { post, login } from '$lib/utils'; export const load = async ({ parent }) => { - let { user } = await parent(); - if (user) throw redirect(307, '/dashboard'); -} + let { user } = await parent(); + if (user) throw redirect(307, '/dashboard'); +}; export const actions = { default: async ({ cookies, request }) => { diff --git a/src/routes/(app)/send/[uuid=uuid]/+page.server.js b/src/routes/(app)/send/[uuid=uuid]/+page.server.js index cdf06e5c..63192b7a 100644 --- a/src/routes/(app)/send/[uuid=uuid]/+page.server.js +++ b/src/routes/(app)/send/[uuid=uuid]/+page.server.js @@ -3,6 +3,7 @@ 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; diff --git a/src/routes/(app)/send/voucher/+page.server.js b/src/routes/(app)/send/voucher/+page.server.js new file mode 100644 index 00000000..078d889e --- /dev/null +++ b/src/routes/(app)/send/voucher/+page.server.js @@ -0,0 +1,16 @@ +import { invalid, redirect } from '@sveltejs/kit'; +import { auth, post } from '$lib/utils'; + +export const actions = { + default: async ({ cookies, request }) => { + let p; + try { + let body = Object.fromEntries(await request.formData()); + p = await post('/send', body, auth(cookies)); + } catch (e) { + return invalid(400, { message: e.message }); + } + + throw redirect(307, `/voucher/${p.redeemcode}`); + } +}; diff --git a/src/routes/(app)/send/voucher/+page.svelte b/src/routes/(app)/send/voucher/+page.svelte new file mode 100644 index 00000000..2c54c4a6 --- /dev/null +++ b/src/routes/(app)/send/voucher/+page.svelte @@ -0,0 +1,53 @@ + + + + +{#if form?.message} +
+ {form.message} +
+{/if} + +
+ + +
+ + + +
+ +
+
+
diff --git a/src/routes/(app)/voucher/[code]/+page.server.js b/src/routes/(app)/voucher/[code]/+page.server.js new file mode 100644 index 00000000..89ce69ac --- /dev/null +++ b/src/routes/(app)/voucher/[code]/+page.server.js @@ -0,0 +1,8 @@ +import { get } from '$lib/utils'; +import Qr from 'qrcode-base64'; +export let load = async ({ params: { code }, url }) => { + let payment = await get(`/payment/${code}`); + + let src = Qr.drawImg(url.hostname, { size: 300 }); + return { payment, src }; +}; diff --git a/src/routes/(app)/voucher/[code]/+page.svelte b/src/routes/(app)/voucher/[code]/+page.svelte new file mode 100644 index 00000000..442d32ae --- /dev/null +++ b/src/routes/(app)/voucher/[code]/+page.svelte @@ -0,0 +1,49 @@ + + +
+
+ + + +
+ +
+
+

Voucher

+ + copy(redeemcode)} alt="Redeem Code" /> +
+

+ {f(amountFiat, currency)} +

+

+ {sat(amount)} +

+
+
+ + + + + + +
+
+
+
diff --git a/src/service-worker.js b/src/service-worker.js index 7952231d..4fb470e9 100644 --- a/src/service-worker.js +++ b/src/service-worker.js @@ -1,7 +1,7 @@ -self.addEventListener('fetch', function(event) { - event.respondWith( - caches.match(event.request).then(function(response) { - return response || fetch(event.request); - }) - ); +self.addEventListener('fetch', function (event) { + event.respondWith( + caches.match(event.request).then(function (response) { + return response || fetch(event.request); + }) + ); }); -- cgit v1.2.3