From c167348afa3e754655ba46f91646ecc91309174b Mon Sep 17 00:00:00 2001 From: Adam Soltys Date: Wed, 3 May 2023 13:06:52 -0700 Subject: nfc wip --- src/lib/utils.js | 1 - .../(app)/[username]/card/[serial]/+page.server.js | 21 +++++++-- .../(app)/[username]/card/[serial]/+page.svelte | 38 ++++++++++++--- src/routes/(app)/pot/[name]/+page.svelte | 54 ++++++++++++++++------ 4 files changed, 90 insertions(+), 24 deletions(-) (limited to 'src') diff --git a/src/lib/utils.js b/src/lib/utils.js index be26ee45..a91ef639 100644 --- a/src/lib/utils.js +++ b/src/lib/utils.js @@ -26,7 +26,6 @@ export let g = (url, fetch, headers) => }); export let get = (url, headers = {}) => { - console.log("GETTING", browser, base, url); return fetch(base + url, { headers }) .then(async (r) => { if (r.ok) return r.text(); diff --git a/src/routes/(app)/[username]/card/[serial]/+page.server.js b/src/routes/(app)/[username]/card/[serial]/+page.server.js index 49d7504c..72ce96d5 100644 --- a/src/routes/(app)/[username]/card/[serial]/+page.server.js +++ b/src/routes/(app)/[username]/card/[serial]/+page.server.js @@ -1,3 +1,18 @@ -export let load = async ({ params }) => { - return params; -} +import { auth, get } from '$lib/utils'; +import { redirect } from "@sveltejs/kit" + +export let load = async ({ cookies, params }) => { + let { serial } = params; + let pot; + try { + pot = await get(`/pot/${serial}`, auth(cookies)); + } catch (e) { + console.log(e); + } + + console.log('POT', pot); + + if (pot) throw redirect(307, `/pot/${serial}`); + + return params; +}; diff --git a/src/routes/(app)/[username]/card/[serial]/+page.svelte b/src/routes/(app)/[username]/card/[serial]/+page.svelte index e40554f2..aee3be28 100644 --- a/src/routes/(app)/[username]/card/[serial]/+page.svelte +++ b/src/routes/(app)/[username]/card/[serial]/+page.svelte @@ -1,9 +1,35 @@ -Card {serial} - -Balance {balance} +
+
+

Card {serial}

+
+ +
diff --git a/src/routes/(app)/pot/[name]/+page.svelte b/src/routes/(app)/pot/[name]/+page.svelte index 7b3d890b..653166c7 100644 --- a/src/routes/(app)/pot/[name]/+page.svelte +++ b/src/routes/(app)/pot/[name]/+page.svelte @@ -20,6 +20,9 @@ $: amountFiat = parseFloat(((amount * rate) / sats).toFixed(2)); $loginRedirect = $page.url.pathname; + + let show; + let toggle = () => (show = !show);
@@ -31,12 +34,15 @@
-
+
-

Public Pot

+ +

Money Pot

Anyone who knows the URL to this pot can add or take out funds

- {name} + {#if show} + {name} + {/if}

@@ -47,17 +53,37 @@

-
- - - - - - + +
+ +
{#each payments as p} -- cgit v1.2.3