From 674de46a6a9f1b793313b5c027a34d396217ed84 Mon Sep 17 00:00:00 2001 From: Adam Soltys Date: Tue, 5 Nov 2024 00:10:30 -0800 Subject: dark styles --- src/routes/(app)/+layout.svelte | 2 +- .../(app)/[username]/(profile)/+layout.svelte | 42 +++---- src/routes/(app)/[username]/receive/+page.svelte | 107 +++++------------ src/routes/(app)/fund/[id]/sweep/+page.svelte | 2 +- src/routes/(app)/invoice/[id]/+layout@.svelte | 2 +- src/routes/(app)/invoice/[id]/+page.svelte | 128 +++++---------------- src/routes/(app)/invoice/[id]/paid/+page.svelte | 2 +- src/routes/(app)/ln/withdrawal/sent/+page.svelte | 2 +- .../(app)/pay/[username]/[...amount]/+page.svelte | 2 +- src/routes/(app)/payments/[...page]/+page.svelte | 9 +- src/routes/(app)/send/invoice/[id]/+page.svelte | 12 +- .../(app)/send/lightning/[payreq]/+page.svelte | 56 ++++----- src/routes/(app)/sent/[id]/+page.svelte | 2 +- src/routes/(app)/verify/[code]/+page.svelte | 2 +- 14 files changed, 113 insertions(+), 257 deletions(-) (limited to 'src/routes/(app)') diff --git a/src/routes/(app)/+layout.svelte b/src/routes/(app)/+layout.svelte index 4316c2bb..491dfc8c 100644 --- a/src/routes/(app)/+layout.svelte +++ b/src/routes/(app)/+layout.svelte @@ -113,7 +113,7 @@ -
+
{#if !$loading} diff --git a/src/routes/(app)/[username]/(profile)/+layout.svelte b/src/routes/(app)/[username]/(profile)/+layout.svelte index 5ad30f46..bb3c0d15 100644 --- a/src/routes/(app)/[username]/(profile)/+layout.svelte +++ b/src/routes/(app)/[username]/(profile)/+layout.svelte @@ -3,7 +3,6 @@ import { browser } from "$app/environment"; import { hexToUint8Array } from "uint8array-extras"; import { copy, f, get, post, s, sats, success, fail, si } from "$lib/utils"; - import Icon from "$comp/Icon.svelte"; import { t } from "$lib/translations"; import { sign, send } from "$lib/nostr"; import { bech32m } from "@scure/base"; @@ -127,7 +126,7 @@ class="flex text-3xl font-bold text-center mx-auto justify-center gap-2" >
{display || username}
- + {#if subject.address || subject.about} @@ -179,13 +178,10 @@
- +
@@ -199,7 +195,7 @@
- +
@@ -220,10 +216,10 @@
- +
@@ -234,24 +230,14 @@
{#if user && user.username !== subject.username && subject.pubkey} {#if following} - {:else} - {/if} {/if} @@ -277,7 +263,7 @@ class="rounded-2xl border py-5 px-6 font-bold hover:opacity-80 flex w-60" >
- +
diff --git a/src/routes/(app)/[username]/receive/+page.svelte b/src/routes/(app)/[username]/receive/+page.svelte index 446003e2..e9e5ca43 100644 --- a/src/routes/(app)/[username]/receive/+page.svelte +++ b/src/routes/(app)/[username]/receive/+page.svelte @@ -5,6 +5,8 @@ import { browser } from "$app/environment"; import { last, showQr, amountPrompt } from "$lib/store"; import Avatar from "$comp/Avatar.svelte"; + import InvoiceData from "$comp/InvoiceData.svelte"; + import InvoiceActions from "$comp/InvoiceActions.svelte"; import InvoiceTypes from "$comp/InvoiceTypes.svelte"; import SetAmount from "$comp/SetAmount.svelte"; import { t } from "$lib/translations"; @@ -80,87 +82,32 @@
- {#if $showQr} -
- - {txt} - -
- {/if} - -
+ - - {#each invoice.items as i} -
-
{i.quantity}
-
- {i.name} -
-
- {f(i.price * i.quantity, currency)} -
-
- {sat(btc(i.price * i.quantity, rate))} -
-
- {/each} - - {#if amount > 0} -
-
- {f(amountFiat, currency)} - - {#if tip} - - +{f(tip * (rate / sats), currency)} - - {/if} -
-
- ⚡️{`${s(amount)}`} - - {#if tip} - - +⚡️{s(tip)} - - {/if} -
-
- {/if} - -
- - - {#if user?.id === invoice?.user?.id} - - {:else} - - - - {/if} -
+ {invoice} + {amount} + {amountFiat} + {currency} + {tip} + {rate} + showQr={$showQr} + /> + +
diff --git a/src/routes/(app)/fund/[id]/sweep/+page.svelte b/src/routes/(app)/fund/[id]/sweep/+page.svelte index e142f00d..927c59d3 100644 --- a/src/routes/(app)/fund/[id]/sweep/+page.svelte +++ b/src/routes/(app)/fund/[id]/sweep/+page.svelte @@ -36,6 +36,6 @@
-
+
{$t("payments.tapAnywhere")}
diff --git a/src/routes/(app)/invoice/[id]/+layout@.svelte b/src/routes/(app)/invoice/[id]/+layout@.svelte index 74c3fd64..da801750 100644 --- a/src/routes/(app)/invoice/[id]/+layout@.svelte +++ b/src/routes/(app)/invoice/[id]/+layout@.svelte @@ -104,7 +104,7 @@ -
+
{#if !$loading} diff --git a/src/routes/(app)/invoice/[id]/+page.svelte b/src/routes/(app)/invoice/[id]/+page.svelte index 66503f95..1b4ef5c8 100644 --- a/src/routes/(app)/invoice/[id]/+page.svelte +++ b/src/routes/(app)/invoice/[id]/+page.svelte @@ -6,6 +6,8 @@ import { browser } from "$app/environment"; import { last, showQr, amountPrompt } from "$lib/store"; import Avatar from "$comp/Avatar.svelte"; + import InvoiceData from "$comp/InvoiceData.svelte"; + import InvoiceActions from "$comp/InvoiceActions.svelte"; import InvoiceTypes from "$comp/InvoiceTypes.svelte"; import SetAmount from "$comp/SetAmount.svelte"; import { t } from "$lib/translations"; @@ -120,106 +122,32 @@
- {#if $showQr} -
- - {txt} - -
- {/if} - - {#if type !== types.lightning || !$showQr} -
-
{txt}
-
- {/if} - - {#each invoice.items as i} -
-
{i.quantity}
-
- {i.name} -
-
- {f(i.price * i.quantity, currency)} -
-
- {sat(btc(i.price * i.quantity, rate))} -
-
- {/each} - - {#if amount > 0} -
-
- {f(amountFiat, currency)} - - {#if tip} - - +{f(tip * (rate / sats), currency)} - - {/if} -
-
- ⚡️{`${s(amount)}`} - - {#if tip} - - +⚡️{s(tip)} - - {/if} -
-
- {/if} - -
- - - {#if user?.id === invoice?.user?.id} - - {:else} - - - - {/if} - - {#if type === types.lightning} -
- -
- {/if} -
+ + +
diff --git a/src/routes/(app)/invoice/[id]/paid/+page.svelte b/src/routes/(app)/invoice/[id]/paid/+page.svelte index e4279e48..b3b6e71a 100644 --- a/src/routes/(app)/invoice/[id]/paid/+page.svelte +++ b/src/routes/(app)/invoice/[id]/paid/+page.svelte @@ -80,6 +80,6 @@
-
+
{$t("payments.tapAnywhere")}
diff --git a/src/routes/(app)/ln/withdrawal/sent/+page.svelte b/src/routes/(app)/ln/withdrawal/sent/+page.svelte index 90814960..143a92f4 100644 --- a/src/routes/(app)/ln/withdrawal/sent/+page.svelte +++ b/src/routes/(app)/ln/withdrawal/sent/+page.svelte @@ -23,6 +23,6 @@
-
+
{$t("payments.tapAnywhere")}
diff --git a/src/routes/(app)/pay/[username]/[...amount]/+page.svelte b/src/routes/(app)/pay/[username]/[...amount]/+page.svelte index 5089e78c..75e66a10 100644 --- a/src/routes/(app)/pay/[username]/[...amount]/+page.svelte +++ b/src/routes/(app)/pay/[username]/[...amount]/+page.svelte @@ -97,7 +97,7 @@
diff --git a/src/routes/(app)/sent/[id]/+page.svelte b/src/routes/(app)/sent/[id]/+page.svelte index a71a5360..b4f6ab68 100644 --- a/src/routes/(app)/sent/[id]/+page.svelte +++ b/src/routes/(app)/sent/[id]/+page.svelte @@ -41,6 +41,6 @@
-
+
{$t("payments.tapAnywhere")}
diff --git a/src/routes/(app)/verify/[code]/+page.svelte b/src/routes/(app)/verify/[code]/+page.svelte index 1e099dae..de5212e5 100644 --- a/src/routes/(app)/verify/[code]/+page.svelte +++ b/src/routes/(app)/verify/[code]/+page.svelte @@ -30,6 +30,6 @@
-
+
{$t("payments.tapAnywhere")}
-- cgit v1.2.3