From aaa66ea658f7c5b8fac8ce4b3c02bd94bafdff8e Mon Sep 17 00:00:00 2001 From: Adam Soltys Date: Tue, 22 Nov 2022 12:09:44 -0800 Subject: clean up request flow, update translations and deps --- src/routes/(app)/[username]/+page.svelte | 14 ++++---- src/routes/(app)/[username]/dashboard/+page.svelte | 34 +++++++++--------- .../[username]/receive/[...param]/+page.svelte | 2 +- .../(app)/[username]/request/+page.server.js | 2 +- src/routes/(app)/[username]/request/+page.svelte | 7 ++-- .../(app)/[username]/request/[id]/+page.server.js | 9 +++-- .../(app)/[username]/request/[id]/+page.svelte | 5 +-- .../[username]/settings/[...tab]/_account.svelte | 4 +-- .../[username]/settings/[...tab]/_security.svelte | 7 ++-- .../[username]/transactions/[...page]/+page.svelte | 41 +++++++--------------- src/routes/(app)/invoice/[id]/+page.svelte | 2 +- src/routes/(app)/ln/[lnurl]/+page.svelte | 2 +- src/routes/(app)/send/[...text]/+page.server.js | 2 +- src/routes/(app)/send/[...text]/+page.svelte | 18 +++++----- src/routes/(app)/send/[uuid=uuid]/+page.svelte | 11 +++--- .../bitcoin/[address]/[...amount]/+page.svelte | 4 +-- .../(app)/send/lightning/[payreq]/+page.svelte | 2 +- 17 files changed, 79 insertions(+), 87 deletions(-) (limited to 'src/routes/(app)') diff --git a/src/routes/(app)/[username]/+page.svelte b/src/routes/(app)/[username]/+page.svelte index 35606958..932ec777 100644 --- a/src/routes/(app)/[username]/+page.svelte +++ b/src/routes/(app)/[username]/+page.svelte @@ -24,7 +24,7 @@ @@ -35,7 +35,7 @@ @@ -47,7 +47,7 @@ @@ -71,13 +71,13 @@ {#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. + rel="noreferrer">{$t("user.lightningAddress")} {$t("user.likeAnEmail")} +

{/if} diff --git a/src/routes/(app)/[username]/dashboard/+page.svelte b/src/routes/(app)/[username]/dashboard/+page.svelte index eb4b99ae..112162ad 100644 --- a/src/routes/(app)/[username]/dashboard/+page.svelte +++ b/src/routes/(app)/[username]/dashboard/+page.svelte @@ -71,7 +71,7 @@
{$t('user.dashboard.send')} @@ -110,7 +110,7 @@
-

Awaiting

+

{$t("transactions.awaiting")}

{requester.username}

@@ -131,26 +131,26 @@
{#each requests as { id, invoice, memo, requester: r }} - -
- diff --git a/src/routes/(app)/[username]/receive/[...param]/+page.svelte b/src/routes/(app)/[username]/receive/[...param]/+page.svelte index cb69b06a..9e9f4f66 100644 --- a/src/routes/(app)/[username]/receive/[...param]/+page.svelte +++ b/src/routes/(app)/[username]/receive/[...param]/+page.svelte @@ -43,7 +43,7 @@ class="bg-black text-white rounded-xl w-full h-[48px] flex justify-center items-center font-semibold opacity-100 hover:opacity-80" > - {amount ? 'Next' : "Sender's choice"} + {amount ? $t("transactions.next") : $t("transactions.sendersChoice")}
diff --git a/src/routes/(app)/[username]/request/+page.server.js b/src/routes/(app)/[username]/request/+page.server.js index 44c9d3a7..4515666f 100644 --- a/src/routes/(app)/[username]/request/+page.server.js +++ b/src/routes/(app)/[username]/request/+page.server.js @@ -2,7 +2,7 @@ import { redirect } from '@sveltejs/kit'; import { auth, post } from '$lib/utils'; export let load = ({ locals }) => { - console.log("YO") + console.log('YO'); if (!locals.user) throw redirect(307, '/login'); }; diff --git a/src/routes/(app)/[username]/request/+page.svelte b/src/routes/(app)/[username]/request/+page.svelte index 1e62ea00..bbbb514c 100644 --- a/src/routes/(app)/[username]/request/+page.svelte +++ b/src/routes/(app)/[username]/request/+page.svelte @@ -1,4 +1,5 @@