From 32fcc461cd43c8907df5e306d520bb671307eab1 Mon Sep 17 00:00:00 2001 From: Adam Soltys Date: Thu, 7 Nov 2024 21:16:25 -0800 Subject: svelte 5 --- src/routes/(app)/+error.svelte | 2 +- src/routes/(app)/+layout.svelte | 20 +++-- .../(app)/[username]/(profile)/+layout.svelte | 80 +++++++++-------- src/routes/(app)/[username]/(profile)/+page.svelte | 24 +++--- .../[username]/(profile)/event/[id]/+page.svelte | 2 +- .../[username]/(profile)/followers/+page.svelte | 50 +++++------ .../[username]/(profile)/follows/+page.svelte | 54 ++++++------ src/routes/(app)/[username]/+layout.svelte | 6 +- src/routes/(app)/[username]/receive/+page.svelte | 28 +++--- src/routes/(app)/account/[id]/+page.svelte | 36 ++++---- src/routes/(app)/account/import/+page.svelte | 12 ++- src/routes/(app)/account/pass/+page.svelte | 14 +-- src/routes/(app)/account/savings/+page.svelte | 4 +- src/routes/(app)/account/seed/+page.svelte | 6 +- src/routes/(app)/admin/+layout.svelte | 4 +- src/routes/(app)/admin/+page.svelte | 6 +- .../(app)/ecash/[id]/[...version]/+layout.svelte | 8 +- .../(app)/ecash/[id]/[...version]/+page.svelte | 19 ++--- .../ecash/[id]/[...version]/swap/+page.svelte | 2 +- src/routes/(app)/forgot/+page.svelte | 4 +- src/routes/(app)/fund/[id]/+page.svelte | 10 +-- src/routes/(app)/fund/[id]/sweep/+page.svelte | 6 +- src/routes/(app)/fund/[id]/withdraw/+page.svelte | 24 ++++-- src/routes/(app)/generate/+page.svelte | 12 ++- src/routes/(app)/invoice/[id]/+layout@.svelte | 20 +++-- src/routes/(app)/invoice/[id]/+page.svelte | 99 ++++++++++++---------- src/routes/(app)/invoice/[id]/memo/+page.svelte | 14 +-- src/routes/(app)/invoice/[id]/paid/+page.svelte | 12 ++- src/routes/(app)/invoice/[id]/tip/+page.svelte | 58 +++++++------ src/routes/(app)/items/[id]/+page.svelte | 9 +- src/routes/(app)/items/create/+page.svelte | 9 +- src/routes/(app)/ln/[lnurl]/+page.svelte | 2 +- src/routes/(app)/ln/withdrawal/sent/+page.svelte | 4 +- src/routes/(app)/messages/+page.svelte | 16 ++-- src/routes/(app)/messages/[recipient]/+page.svelte | 22 +++-- .../(app)/pay/[username]/[...amount]/+page.svelte | 39 +++++---- src/routes/(app)/payment/[id]/+page.svelte | 20 +++-- src/routes/(app)/payment/[id]/plain/+page.svelte | 4 +- src/routes/(app)/payments/[...page]/+page.svelte | 62 ++++++++------ src/routes/(app)/qr/[text]/+page.svelte | 6 +- src/routes/(app)/qr/create/+page.svelte | 18 ++-- src/routes/(app)/receive/[...token]/+page.svelte | 23 ++--- src/routes/(app)/reset/[code]/+page.svelte | 6 +- src/routes/(app)/scan/+layout@.svelte | 10 ++- src/routes/(app)/scan/+page.svelte | 8 +- src/routes/(app)/send/+layout.svelte | 4 +- src/routes/(app)/send/[...text]/+page.svelte | 25 +++--- .../(app)/send/bitcoin/[address]/+page.svelte | 16 ++-- .../[address]/[amount]/[...feeRate]/+page.svelte | 27 +++--- src/routes/(app)/send/ecash/+page.svelte | 18 ++-- .../send/fund/[name]/[...amount]/+page.svelte | 22 +++-- src/routes/(app)/send/invoice/[id]/+page.svelte | 38 +++++---- .../(app)/send/lightning/[payreq]/+page.svelte | 32 ++++--- src/routes/(app)/sent/[id]/+page.svelte | 6 +- src/routes/(app)/settings/[...tab]/+page.svelte | 53 +++++++----- src/routes/(app)/settings/[...tab]/_account.svelte | 50 +++++------ src/routes/(app)/settings/[...tab]/_pos.svelte | 41 +++++---- .../(app)/settings/[...tab]/_security.svelte | 87 ++++++++++--------- src/routes/(app)/settings/[...tab]/_shopify.svelte | 20 ++--- src/routes/(app)/verify/[code]/+page.svelte | 4 +- src/routes/(static)/+layout.svelte | 14 +-- src/routes/(static)/docs/+page.svelte | 6 +- src/routes/(static)/login/+page.svelte | 35 +++++--- src/routes/(static)/register/+page.svelte | 73 +++++++++------- src/routes/(static)/support/+page.svelte | 22 +++-- src/routes/+error.svelte | 2 +- src/routes/+layout.svelte | 12 ++- src/routes/+page.svelte | 26 +++--- src/routes/map/+page.svelte | 2 +- 69 files changed, 887 insertions(+), 642 deletions(-) (limited to 'src/routes') diff --git a/src/routes/(app)/+error.svelte b/src/routes/(app)/+error.svelte index 6ce7979c..b950608b 100644 --- a/src/routes/(app)/+error.svelte +++ b/src/routes/(app)/+error.svelte @@ -3,7 +3,7 @@ import Icon from "$comp/Icon.svelte"; import { page } from "$app/stores"; - export let data; + let { data } = $props(); let { user } = data; let link = user ? `/${user.username}` : "/"; diff --git a/src/routes/(app)/+layout.svelte b/src/routes/(app)/+layout.svelte index 095e597d..c09fc309 100644 --- a/src/routes/(app)/+layout.svelte +++ b/src/routes/(app)/+layout.svelte @@ -1,4 +1,6 @@ {#if browser && user && $passwordPrompt} @@ -119,7 +127,7 @@
{#if !$loading} - + {@render children?.()} {/if}
diff --git a/src/routes/(app)/[username]/(profile)/+layout.svelte b/src/routes/(app)/[username]/(profile)/+layout.svelte index 03cad4ff..65911eee 100644 --- a/src/routes/(app)/[username]/(profile)/+layout.svelte +++ b/src/routes/(app)/[username]/(profile)/+layout.svelte @@ -1,4 +1,6 @@
- @@ -215,11 +221,11 @@ {npub}
- copy(npub)} + > - +
@@ -230,13 +236,13 @@
{#if user && user.username !== subject.username && subject.pubkey} {#if following} - {:else} - {/if} @@ -256,14 +262,14 @@ {#if user?.admin && user.username !== subject.username} -
+
@@ -275,7 +281,7 @@
- + {@render children?.()}
diff --git a/src/routes/(app)/[username]/(profile)/+page.svelte b/src/routes/(app)/[username]/(profile)/+page.svelte index d14f2f58..e956aab7 100644 --- a/src/routes/(app)/[username]/(profile)/+page.svelte +++ b/src/routes/(app)/[username]/(profile)/+page.svelte @@ -1,4 +1,6 @@ diff --git a/src/routes/(app)/[username]/(profile)/followers/+page.svelte b/src/routes/(app)/[username]/(profile)/followers/+page.svelte index c0080990..b7ad4948 100644 --- a/src/routes/(app)/[username]/(profile)/followers/+page.svelte +++ b/src/routes/(app)/[username]/(profile)/followers/+page.svelte @@ -4,7 +4,7 @@ import { browser } from "$app/environment"; import VirtualScroll from "svelte-virtual-scroll-list"; - export let data; + let { data } = $props(); let { followers } = data; @@ -17,34 +17,36 @@
Loading followers...
{:then followers} {#if followers.length} - - -
+ {#snippet children({ data })} + -
-
- +
+
+
+ +
+
- -
-
-
-
{data.display_name || ""}
-
@{data.name}
+
+
+
{data.display_name || ""}
+
@{data.name}
+
-
- - + + {/snippet} + {:else}
No followers
{/if} diff --git a/src/routes/(app)/[username]/(profile)/follows/+page.svelte b/src/routes/(app)/[username]/(profile)/follows/+page.svelte index 9b2f70d1..ad416500 100644 --- a/src/routes/(app)/[username]/(profile)/follows/+page.svelte +++ b/src/routes/(app)/[username]/(profile)/follows/+page.svelte @@ -1,4 +1,6 @@
@@ -22,31 +26,33 @@ {:then follows} {#if follows.length} {#if browser} - - -
-
-
- -
- -
+
diff --git a/src/routes/(app)/account/import/+page.svelte b/src/routes/(app)/account/import/+page.svelte index a1d6549b..b94cc839 100644 --- a/src/routes/(app)/account/import/+page.svelte +++ b/src/routes/(app)/account/import/+page.svelte @@ -1,4 +1,6 @@

{$t("accounts.import")}

-
+

@@ -100,7 +102,7 @@ reset(username)}>Reset

diff --git a/src/routes/(app)/ecash/[id]/[...version]/+layout.svelte b/src/routes/(app)/ecash/[id]/[...version]/+layout.svelte index f9c80329..d0d06046 100644 --- a/src/routes/(app)/ecash/[id]/[...version]/+layout.svelte +++ b/src/routes/(app)/ecash/[id]/[...version]/+layout.svelte @@ -3,7 +3,7 @@ import { t } from "$lib/translations"; import Icon from "$comp/Icon.svelte"; - export let data; + let { data, children } = $props(); let { id, rates, user, token, total, spent, external, mint } = data; let currency = user?.currency || "USD"; @@ -11,8 +11,8 @@ let amount = total - spent; - $: amountFiat = parseFloat(((amount * rate) / sats).toFixed(2)); - $: spentFiat = parseFloat(((spent * rate) / sats).toFixed(2)); + let amountFiat = $derived(parseFloat(((amount * rate) / sats).toFixed(2))); + let spentFiat = $derived(parseFloat(((spent * rate) / sats).toFixed(2)));
@@ -52,5 +52,5 @@
{/if} - + {@render children?.()}
diff --git a/src/routes/(app)/ecash/[id]/[...version]/+page.svelte b/src/routes/(app)/ecash/[id]/[...version]/+page.svelte index b350b124..47126c78 100644 --- a/src/routes/(app)/ecash/[id]/[...version]/+page.svelte +++ b/src/routes/(app)/ecash/[id]/[...version]/+page.svelte @@ -4,11 +4,10 @@ import { t } from "$lib/translations"; import { page } from "$app/stores"; - export let data; - export let form; + let { data, form } = $props(); let link = $page.url.href; - let { id, total, version, token, external, spent } = data; + let { id, total, version, token, external, spent } = $state(data); {#if form?.error} @@ -20,8 +19,8 @@ {/if}
- @@ -33,7 +32,7 @@ icon="ph:hand-coins-bold" width="32" flip="horizontal" - /> +>
{$t("payments.swap")}
 @@ -45,7 +44,7 @@ icon="ph:hand-coins-bold" width="32" flip="horizontal" - /> +>
{$t("payments.redeem")}
@@ -54,7 +53,7 @@ @@ -62,14 +61,14 @@ {#if version === 4} {:else} diff --git a/src/routes/(app)/ecash/[id]/[...version]/swap/+page.svelte b/src/routes/(app)/ecash/[id]/[...version]/swap/+page.svelte index ee22cea2..c434c9b4 100644 --- a/src/routes/(app)/ecash/[id]/[...version]/swap/+page.svelte +++ b/src/routes/(app)/ecash/[id]/[...version]/swap/+page.svelte @@ -1,5 +1,5 @@
diff --git a/src/routes/(app)/forgot/+page.svelte b/src/routes/(app)/forgot/+page.svelte index 378262cc..eb981734 100644 --- a/src/routes/(app)/forgot/+page.svelte +++ b/src/routes/(app)/forgot/+page.svelte @@ -6,8 +6,8 @@ import Spinner from "$comp/Spinner.svelte"; import { fly } from "svelte/transition"; - export let form; - let email; + let { form } = $props(); + let email = $state(); let loading; diff --git a/src/routes/(app)/fund/[id]/+page.svelte b/src/routes/(app)/fund/[id]/+page.svelte index b81e2917..0931075a 100644 --- a/src/routes/(app)/fund/[id]/+page.svelte +++ b/src/routes/(app)/fund/[id]/+page.svelte @@ -9,7 +9,7 @@ import { types, copy, f, s, sat, sats } from "$lib/utils"; import { loginRedirect } from "$lib/store"; - export let data; + let { data } = $props(); let { amount, src, payments, rates, user } = data; let { id } = $page.params; @@ -19,10 +19,10 @@ let currency = user ? user.currency : "CAD"; let rate = rates[currency]; - $: amountFiat = parseFloat(((amount * rate) / sats).toFixed(2)); + let amountFiat = $derived(parseFloat(((amount * rate) / sats).toFixed(2))); $loginRedirect = $page.url.pathname; - let show; + let show = $state(); let toggle = () => (show = !show); @@ -83,14 +83,14 @@
@@ -39,7 +45,7 @@
-
+ diff --git a/src/routes/(app)/generate/+page.svelte b/src/routes/(app)/generate/+page.svelte index 49d75dc6..72ca2485 100644 --- a/src/routes/(app)/generate/+page.svelte +++ b/src/routes/(app)/generate/+page.svelte @@ -1,4 +1,6 @@ {#if loaded && user?.haspin && $pin?.length !== 6} diff --git a/src/routes/(app)/invoice/[id]/+layout@.svelte b/src/routes/(app)/invoice/[id]/+layout@.svelte index 62c05db1..05fd603f 100644 --- a/src/routes/(app)/invoice/[id]/+layout@.svelte +++ b/src/routes/(app)/invoice/[id]/+layout@.svelte @@ -1,4 +1,6 @@ {#if browser && user && $passwordPrompt} @@ -110,7 +118,7 @@
{#if !$loading} - + {@render children?.()} {/if}
diff --git a/src/routes/(app)/invoice/[id]/+page.svelte b/src/routes/(app)/invoice/[id]/+page.svelte index ae208779..fef43e4d 100644 --- a/src/routes/(app)/invoice/[id]/+page.svelte +++ b/src/routes/(app)/invoice/[id]/+page.svelte @@ -1,4 +1,6 @@
@@ -153,14 +164,14 @@
diff --git a/src/routes/(app)/invoice/[id]/memo/+page.svelte b/src/routes/(app)/invoice/[id]/memo/+page.svelte index 4d23ff19..02f4a5d9 100644 --- a/src/routes/(app)/invoice/[id]/memo/+page.svelte +++ b/src/routes/(app)/invoice/[id]/memo/+page.svelte @@ -1,4 +1,6 @@ + import { run } from 'svelte/legacy'; + import { scale } from "svelte/transition"; import Icon from "$comp/Icon.svelte"; import { toast } from "@zerodevx/svelte-toast"; @@ -6,15 +8,17 @@ import { t } from "$lib/translations"; import { fiat, f, s, sat, sats } from "$lib/utils"; - export let data; - let amount, currency, rate, received, pending, tip, user, id; - $: update(data); + let { data } = $props(); + let amount, currency = $state(), rate = $state(), received = $state(), pending = $state(), tip = $state(), user = $state(), id; let update = (data) => { ({ amount, currency, rate, received, pending, tip, user, id } = data.invoice); }; toast.pop(0); + run(() => { + update(data); + });
@@ -77,7 +81,7 @@
-
+
diff --git a/src/routes/(app)/invoice/[id]/tip/+page.svelte b/src/routes/(app)/invoice/[id]/tip/+page.svelte index ff3da46e..53f0eb4b 100644 --- a/src/routes/(app)/invoice/[id]/tip/+page.svelte +++ b/src/routes/(app)/invoice/[id]/tip/+page.svelte @@ -1,4 +1,6 @@
@@ -154,10 +164,10 @@
{#if tip} - - {:else} @@ -168,14 +178,14 @@ type="button" class="btn" class:active={active(amount, tipPercent)} - on:click={() => handleTipButtonClick(amount)}>{amount} handleTipButtonClick(amount)}>{amount} {:else} handleTipButtonClick(amount)}>{amount} {/if} {/each} @@ -186,21 +196,21 @@ (showCustomAmount = true)}>Custom
{/if} - {#if showCustomAmount} -
+ handleCustomTipAmount(e)} + oninput={(e) => handleCustomTipAmount(e)} placeholder={$t("payments.amount")} use:focus /> diff --git a/src/routes/(app)/items/[id]/+page.svelte b/src/routes/(app)/items/[id]/+page.svelte index 65720350..9629f311 100644 --- a/src/routes/(app)/items/[id]/+page.svelte +++ b/src/routes/(app)/items/[id]/+page.svelte @@ -1,12 +1,15 @@ diff --git a/src/routes/(app)/items/create/+page.svelte b/src/routes/(app)/items/create/+page.svelte index b82889c9..b756e73e 100644 --- a/src/routes/(app)/items/create/+page.svelte +++ b/src/routes/(app)/items/create/+page.svelte @@ -1,12 +1,15 @@ diff --git a/src/routes/(app)/ln/[lnurl]/+page.svelte b/src/routes/(app)/ln/[lnurl]/+page.svelte index 236a2a25..386df9d2 100644 --- a/src/routes/(app)/ln/[lnurl]/+page.svelte +++ b/src/routes/(app)/ln/[lnurl]/+page.svelte @@ -1,7 +1,7 @@ diff --git a/src/routes/(app)/ln/withdrawal/sent/+page.svelte b/src/routes/(app)/ln/withdrawal/sent/+page.svelte index 143a92f4..e06e3c2c 100644 --- a/src/routes/(app)/ln/withdrawal/sent/+page.svelte +++ b/src/routes/(app)/ln/withdrawal/sent/+page.svelte @@ -4,7 +4,7 @@ import { toast } from "@zerodevx/svelte-toast"; import { t } from "$lib/translations"; - export let data; + let { data } = $props(); let { user } = data; toast.pop(0); @@ -20,7 +20,7 @@
-
+
diff --git a/src/routes/(app)/messages/+page.svelte b/src/routes/(app)/messages/+page.svelte index 61464770..269a5de3 100644 --- a/src/routes/(app)/messages/+page.svelte +++ b/src/routes/(app)/messages/+page.svelte @@ -1,20 +1,21 @@
diff --git a/src/routes/(app)/messages/[recipient]/+page.svelte b/src/routes/(app)/messages/[recipient]/+page.svelte index 9b9f6f47..bc1a6383 100644 --- a/src/routes/(app)/messages/[recipient]/+page.svelte +++ b/src/routes/(app)/messages/[recipient]/+page.svelte @@ -1,4 +1,6 @@
@@ -116,7 +120,7 @@ type="button" class="hover:opacity-80" data-sveltekit-preload-data="false" - on:click={back} + onclick={back} > @@ -162,7 +166,7 @@ @@ -172,8 +176,8 @@ contenteditable class="grow break-all py-4 outline-none mt-0 pl-4" bind:innerHTML={message} - on:keydown={keydown} - /> + onkeydown={keydown} +>
diff --git a/src/routes/(app)/pay/[username]/[...amount]/+page.svelte b/src/routes/(app)/pay/[username]/[...amount]/+page.svelte index bf2e877e..4fbd0b64 100644 --- a/src/routes/(app)/pay/[username]/[...amount]/+page.svelte +++ b/src/routes/(app)/pay/[username]/[...amount]/+page.svelte @@ -1,4 +1,6 @@ {#if form?.message} @@ -72,10 +77,10 @@ {currency} bind:fiat bind:rate={r} - bind:submit={next} + submit={next} /> - + @@ -98,8 +103,8 @@ type="button" bind:this={next} class="btn btn-accent" - on:click={setAmount} - on:keydown={setAmount} + onclick={setAmount} + onkeydown={setAmount} > {$t("payments.next")} diff --git a/src/routes/(app)/payment/[id]/+page.svelte b/src/routes/(app)/payment/[id]/+page.svelte index 150c2bc4..fd5ea95f 100644 --- a/src/routes/(app)/payment/[id]/+page.svelte +++ b/src/routes/(app)/payment/[id]/+page.svelte @@ -1,4 +1,6 @@
@@ -222,7 +226,7 @@
@@ -237,7 +241,7 @@
{path}
diff --git a/src/routes/(app)/payment/[id]/plain/+page.svelte b/src/routes/(app)/payment/[id]/plain/+page.svelte index c63a9d7f..7d5c09aa 100644 --- a/src/routes/(app)/payment/[id]/plain/+page.svelte +++ b/src/routes/(app)/payment/[id]/plain/+page.svelte @@ -19,7 +19,7 @@ import { format } from "date-fns"; import { PUBLIC_EXPLORER as expl } from "$env/static/public"; - export let data; + let { data } = $props(); let { user, payment: p } = data; let { username } = user; @@ -84,5 +84,5 @@
-
+
diff --git a/src/routes/(app)/payments/[...page]/+page.svelte b/src/routes/(app)/payments/[...page]/+page.svelte index ba2e4992..2735491c 100644 --- a/src/routes/(app)/payments/[...page]/+page.svelte +++ b/src/routes/(app)/payments/[...page]/+page.svelte @@ -1,4 +1,6 @@
@@ -241,7 +249,7 @@ {:else if p.type === types.ecash} {:else if p.type === types.reconcile} - + {:else if p.type === types.bitcoin}
{#each Object.keys(incoming) as c} - + @@ -323,8 +331,8 @@
-
diff --git a/src/routes/(app)/qr/[text]/+page.svelte b/src/routes/(app)/qr/[text]/+page.svelte index e1aae854..02a5b718 100644 --- a/src/routes/(app)/qr/[text]/+page.svelte +++ b/src/routes/(app)/qr/[text]/+page.svelte @@ -2,7 +2,7 @@ import Icon from "$comp/Icon.svelte"; import Qr from "$comp/Qr.svelte"; import { back, copy } from "$lib/utils"; - export let data; + let { data } = $props(); let { src, text } = data; @@ -12,9 +12,9 @@
diff --git a/src/routes/(app)/qr/create/+page.svelte b/src/routes/(app)/qr/create/+page.svelte index fd99a54b..74316ba9 100644 --- a/src/routes/(app)/qr/create/+page.svelte +++ b/src/routes/(app)/qr/create/+page.svelte @@ -1,9 +1,11 @@
@@ -23,25 +27,25 @@ Create QR - +
-
diff --git a/src/routes/(app)/reset/[code]/+page.svelte b/src/routes/(app)/reset/[code]/+page.svelte index d93e8bdf..144c73a9 100644 --- a/src/routes/(app)/reset/[code]/+page.svelte +++ b/src/routes/(app)/reset/[code]/+page.svelte @@ -5,10 +5,10 @@ import { fly } from "svelte/transition"; import { password } from "$lib/store"; - export let form; + let { form } = $props(); let email; let loading; - let revealPassword; + let revealPassword = $state();
@@ -56,7 +56,7 @@ {/if} +