From c0f86ea4c2f60ccdabc9076de91d8cabb987b8a3 Mon Sep 17 00:00:00 2001 From: Adam Soltys Date: Mon, 21 Nov 2022 16:46:32 -0800 Subject: wip --- src/routes/(app)/[username]/dashboard/+page.svelte | 9 ++++++++- src/routes/(app)/[username]/request/+page.server.js | 1 + src/routes/(app)/[username]/request/[id]/+page.server.js | 1 + src/routes/(app)/invoice/[id]/+page.svelte | 2 +- 4 files changed, 11 insertions(+), 2 deletions(-) (limited to 'src/routes/(app)') diff --git a/src/routes/(app)/[username]/dashboard/+page.svelte b/src/routes/(app)/[username]/dashboard/+page.svelte index 238780d7..eb4b99ae 100644 --- a/src/routes/(app)/[username]/dashboard/+page.svelte +++ b/src/routes/(app)/[username]/dashboard/+page.svelte @@ -110,7 +110,7 @@
-

You invoiced

+

Awaiting

{requester.username}

@@ -131,6 +131,7 @@
{#each requests as { id, invoice, memo, requester: r }} +
@@ -142,8 +143,14 @@
+
+ +
+ {/each} diff --git a/src/routes/(app)/[username]/request/+page.server.js b/src/routes/(app)/[username]/request/+page.server.js index 039d4235..44c9d3a7 100644 --- a/src/routes/(app)/[username]/request/+page.server.js +++ b/src/routes/(app)/[username]/request/+page.server.js @@ -2,6 +2,7 @@ import { redirect } from '@sveltejs/kit'; import { auth, post } from '$lib/utils'; export let load = ({ locals }) => { + console.log("YO") if (!locals.user) throw redirect(307, '/login'); }; diff --git a/src/routes/(app)/[username]/request/[id]/+page.server.js b/src/routes/(app)/[username]/request/[id]/+page.server.js index 99f2e8e2..8245bef6 100644 --- a/src/routes/(app)/[username]/request/[id]/+page.server.js +++ b/src/routes/(app)/[username]/request/[id]/+page.server.js @@ -7,6 +7,7 @@ export let load = async ({ cookies, depends, locals: { user }, params }) => { let { request } = await get(`/request/${params.id}`, auth(cookies)); let { invoice } = request; + if (invoice) { let { amount, received, uuid } = invoice; if ((received && !amount) || received >= amount) throw redirect(307, `/send/${uuid}`); diff --git a/src/routes/(app)/invoice/[id]/+page.svelte b/src/routes/(app)/invoice/[id]/+page.svelte index 5efcb176..b0ec9a6a 100644 --- a/src/routes/(app)/invoice/[id]/+page.svelte +++ b/src/routes/(app)/invoice/[id]/+page.svelte @@ -73,7 +73,7 @@ }; - -- cgit v1.2.3