From 4373f870ad528811a9e0bb1a6749b01d5a7ec051 Mon Sep 17 00:00:00 2001 From: Adam Soltys Date: Tue, 24 Sep 2024 15:57:04 -0700 Subject: stylin --- src/components/Account.svelte | 40 +++++++++------ src/components/WalletPass.svelte | 8 ++- src/locales/en.json | 2 +- src/routes/(app)/[username]/(profile)/+page.svelte | 4 +- src/routes/(app)/account/[id]/+page.svelte | 20 ++++---- src/routes/(app)/account/pass/+page.svelte | 4 +- src/routes/(app)/account/seed/+page.svelte | 4 +- src/routes/(app)/invoice/+page.server.ts | 1 - .../(app)/pay/[username]/[...amount]/+page.svelte | 2 +- src/routes/(app)/payment/[id]/+page.svelte | 44 ---------------- src/routes/(app)/payments/[...page]/+page.svelte | 59 ++++++++++------------ src/routes/(app)/scan/+page.svelte | 4 -- .../(app)/send/bitcoin/[address]/+layout.server.ts | 19 +++++-- src/routes/(app)/sent/[id]/+page.svelte | 2 +- 14 files changed, 90 insertions(+), 123 deletions(-) (limited to 'src') diff --git a/src/components/Account.svelte b/src/components/Account.svelte index 8f72119e..d4a89556 100644 --- a/src/components/Account.svelte +++ b/src/components/Account.svelte @@ -10,42 +10,52 @@ $: refresh(account); let refresh = (a) => ({ seed, balance, id } = a); - let setAccount = () => - (document.cookie = `aid=${id}; path=/; max-age=86400`); + let setAccount = () => (document.cookie = `aid=${id}; path=/; max-age=86400`); -
+
+ {#if seed} - + {/if}
-
- +
+ - + + + + + diff --git a/src/components/WalletPass.svelte b/src/components/WalletPass.svelte index 69b95107..75c94f34 100644 --- a/src/components/WalletPass.svelte +++ b/src/components/WalletPass.svelte @@ -22,7 +22,6 @@ name="password" type="text" required - class="bg-primary" bind:value={password} autocapitalize="none" use:focus @@ -32,7 +31,6 @@ name="password" type="password" required - class="bg-primary" bind:value={password} autocapitalize="none" use:focus @@ -41,7 +39,7 @@ @@ -49,7 +47,7 @@
diff --git a/src/locales/en.json b/src/locales/en.json index f65841d3..1d875536 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -323,7 +323,7 @@ } }, "payments": { - "enterWalletPass": "Please enter your wallet password", + "enterWalletPass": "Wallet password", "legacyVersion": "Legacy version", "newVersion": "New version", "income": "Income", diff --git a/src/routes/(app)/[username]/(profile)/+page.svelte b/src/routes/(app)/[username]/(profile)/+page.svelte index 0d85fc56..399a33e9 100644 --- a/src/routes/(app)/[username]/(profile)/+page.svelte +++ b/src/routes/(app)/[username]/(profile)/+page.svelte @@ -35,10 +35,10 @@
+ + + + + {#if mnemonic} diff --git a/src/routes/(app)/account/pass/+page.svelte b/src/routes/(app)/account/pass/+page.svelte index 36992a98..77298cc4 100644 --- a/src/routes/(app)/account/pass/+page.svelte +++ b/src/routes/(app)/account/pass/+page.svelte @@ -133,14 +133,14 @@ diff --git a/src/routes/(app)/account/seed/+page.svelte b/src/routes/(app)/account/seed/+page.svelte index 4e55534b..ec5ab1cf 100644 --- a/src/routes/(app)/account/seed/+page.svelte +++ b/src/routes/(app)/account/seed/+page.svelte @@ -58,7 +58,7 @@ @@ -66,7 +66,7 @@ diff --git a/src/routes/(app)/invoice/+page.server.ts b/src/routes/(app)/invoice/+page.server.ts index 45389f8c..b8a2fe06 100644 --- a/src/routes/(app)/invoice/+page.server.ts +++ b/src/routes/(app)/invoice/+page.server.ts @@ -4,7 +4,6 @@ import type { Invoice } from "$lib/types"; export let load = async ({ cookies, parent }) => { let aid = cookies.get("aid"); - console.log("AID", aid) let { subject, user, rates } = await parent(); let invoice: Invoice = { diff --git a/src/routes/(app)/pay/[username]/[...amount]/+page.svelte b/src/routes/(app)/pay/[username]/[...amount]/+page.svelte index f45218ea..8e3abab4 100644 --- a/src/routes/(app)/pay/[username]/[...amount]/+page.svelte +++ b/src/routes/(app)/pay/[username]/[...amount]/+page.svelte @@ -61,7 +61,7 @@
{/if} -
+
- - - -

{$t(amount < 0 ? "payments.sent" : "payments.received")} @@ -241,41 +234,4 @@

{/if} - -
- {#if user.admin} - - {/if} - - {#if user.hasprinter} - - {:else} - - - - {/if} -
diff --git a/src/routes/(app)/payments/[...page]/+page.svelte b/src/routes/(app)/payments/[...page]/+page.svelte index 2ffed537..bfd30f55 100644 --- a/src/routes/(app)/payments/[...page]/+page.svelte +++ b/src/routes/(app)/payments/[...page]/+page.svelte @@ -78,7 +78,9 @@ platform_fee: p.ourfee, amount_fiat: f((p.amount * p.rate) / sats, p.currency), fee_fiat: p.fee ? f((p.fee * p.rate) / sats, p.currency) : null, - platform_fee_fiat: p.ourfee ? f((p.ourfee * p.rate) / sats, p.currency) : null, + platform_fee_fiat: p.ourfee + ? f((p.ourfee * p.rate) / sats, p.currency) + : null, tip_fiat: p.tip ? f((p.tip * p.rate) / sats, p.currency) : null, total_fiat: f(((p.amount + (p.tip || 0)) * p.rate) / sats, p.currency), })); @@ -127,30 +129,28 @@ }; -
-

+
+

{$t("payments.header")}

-
-
-
- {#each presets as { start, end, title }, i} - +
+ {#each presets as { start, end, title }, i} + + - - {/each} -
+
{title}
+ + + {/each}
-
+
{#if pages.length > 1} {#each pages as _, i} {#each Object.keys(incoming) as c} - + {#if tipsIn || tipsOut}{$t("payments.tips")}{/if} - {$t("payments.total")} + {$t("payments.total")} {@const totalIn = incoming[c]?.fiat || 0} {@const tipsIn = incoming[c]?.fiatTips || 0} @@ -295,15 +293,14 @@ {totalOut ? f(totalOut, c) : "-"} {/each}
- -
+