From f3db5541f0dc8a140a38ccba0dc9ac38d36ab5fd Mon Sep 17 00:00:00 2001 From: Adam Soltys Date: Wed, 3 May 2023 10:15:06 -0700 Subject: redirect send to user urls --- src/routes/(app)/send/[...text]/+page.server.js | 2 +- src/routes/(app)/send/pot/[name]/[...amount]/+page.server.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src/routes/(app)/send') diff --git a/src/routes/(app)/send/[...text]/+page.server.js b/src/routes/(app)/send/[...text]/+page.server.js index 513fa11e..ff014315 100644 --- a/src/routes/(app)/send/[...text]/+page.server.js +++ b/src/routes/(app)/send/[...text]/+page.server.js @@ -62,7 +62,7 @@ let parse = async (t, host) => { // user try { - user = await get(`/users/${t}`); + user = await get(`/users/${t.split('/')[0]}`); if (user.anon) user = null; } catch (e) {} diff --git a/src/routes/(app)/send/pot/[name]/[...amount]/+page.server.js b/src/routes/(app)/send/pot/[name]/[...amount]/+page.server.js index 6c11811c..3f819696 100644 --- a/src/routes/(app)/send/pot/[name]/[...amount]/+page.server.js +++ b/src/routes/(app)/send/pot/[name]/[...amount]/+page.server.js @@ -1,5 +1,5 @@ import { fail, redirect } from '@sveltejs/kit'; -import { auth, post } from '$lib/utils'; +import { auth, fd, post } from '$lib/utils'; export const actions = { default: async ({ cookies, request }) => { -- cgit v1.2.3 From 43208081323a56f4603c6d94a0764be764516ec0 Mon Sep 17 00:00:00 2001 From: Adam Soltys Date: Fri, 5 May 2023 08:12:23 -0700 Subject: nfc wip --- src/lib/store.js | 1 + src/routes/(app)/+layout.svelte | 10 +-- .../(app)/[username]/(profile)/+layout.svelte | 12 +-- src/routes/(app)/[username]/(profile)/+page.svelte | 65 +++++++-------- .../(app)/[username]/card/[serial]/+page.server.js | 2 - .../(app)/[username]/invoice/[hash]/+page.svelte | 39 ++++++++- .../[username]/invoice/[hash]/paid/+page.svelte | 2 +- .../[username]/payments/[...page]/+page.svelte | 6 +- src/routes/(app)/pot/[name]/+page.svelte | 91 +++++++++++++-------- .../(app)/pot/[name]/withdraw/+page.server.js | 2 +- src/routes/(app)/pot/[name]/withdraw/+page.svelte | 5 +- src/routes/(app)/pot/[name]/withdraw/+server.js | 6 ++ src/routes/(app)/send/invoice/[id]/+page.svelte | 19 +++++ src/routes/(app)/withdraw/+server.js | 1 + static/icons/nfc.svg | 14 +++- static/images/moneypot.png | Bin 0 -> 278763 bytes 16 files changed, 188 insertions(+), 87 deletions(-) create mode 100644 src/routes/(app)/pot/[name]/withdraw/+server.js create mode 100644 static/images/moneypot.png (limited to 'src/routes/(app)/send') diff --git a/src/lib/store.js b/src/lib/store.js index 4e88c90c..923bda52 100644 --- a/src/lib/store.js +++ b/src/lib/store.js @@ -52,3 +52,4 @@ export const request = writable(); export const requestRedirect = writable(); export const token = persistSession('token'); export const user = writable(); +export const ndef = writable(); diff --git a/src/routes/(app)/+layout.svelte b/src/routes/(app)/+layout.svelte index a0c981c1..cd8919e4 100644 --- a/src/routes/(app)/+layout.svelte +++ b/src/routes/(app)/+layout.svelte @@ -2,7 +2,7 @@ import { SvelteToast } from '@zerodevx/svelte-toast'; import { onDestroy, onMount } from 'svelte'; import { close, connect, send } from '$lib/socket'; - import { last, invoice, request, passwordPrompt, pin } from '$lib/store'; + import { last, invoice, request, ndef, passwordPrompt, pin } from '$lib/store'; import { page } from '$app/stores'; import { browser } from '$app/environment'; import { goto } from '$app/navigation'; @@ -35,14 +35,14 @@ expirePin(); try { - const ndef = new NDEFReader(); - await ndef.scan(); + $ndef = new NDEFReader(); + await $ndef.scan(); - ndef.addEventListener('readingerror', (e) => { + $ndef.addEventListener('readingerror', (e) => { console.log('nfc error', e); }); - ndef.addEventListener('reading', ({ message, serialNumber }) => { + $ndef.addEventListener('reading', ({ message, serialNumber }) => { goto(`/${user.username}/card/${serialNumber.replace(/:/g, '-')}`); }); } catch (error) { diff --git a/src/routes/(app)/[username]/(profile)/+layout.svelte b/src/routes/(app)/[username]/(profile)/+layout.svelte index df9b9ad8..fe12a124 100644 --- a/src/routes/(app)/[username]/(profile)/+layout.svelte +++ b/src/routes/(app)/[username]/(profile)/+layout.svelte @@ -46,18 +46,20 @@ let toggleBio = () => (hideBio = false); -
+