From 243f2b2f0f2da9735885978a6773b77a7bd139eb Mon Sep 17 00:00:00 2001 From: Adam Soltys Date: Fri, 23 Aug 2024 23:53:29 -0700 Subject: rename ecash routes --- .../(app)/[username]/invoice/[id]/+page.svelte | 2 +- .../[username]/payments/[...page]/+page.server.js | 2 +- src/routes/(app)/ecash/[id]/+layout.server.js | 10 ++ src/routes/(app)/ecash/[id]/+layout.svelte | 53 ++++++++++ src/routes/(app)/ecash/[id]/+page.server.js | 25 +++-- src/routes/(app)/ecash/[id]/+page.svelte | 113 ++++++++------------- src/routes/(app)/ecash/[id]/swap/+page.server.ts | 3 + src/routes/(app)/ecash/[id]/swap/+page.svelte | 5 + .../(app)/pay/[username]/[...amount]/+page.svelte | 2 + .../(app)/receive/[...token]/+page.server.js | 17 ++++ src/routes/(app)/receive/[...token]/+page.svelte | 92 +++++++++++++++++ .../(app)/redeem/[redeemcode]/+page.server.js | 17 ---- src/routes/(app)/redeem/[redeemcode]/+page.svelte | 4 - src/routes/(app)/send/[...text]/+page.server.js | 8 +- src/routes/(app)/send/ecash/+page.server.js | 4 +- .../(app)/voucher/[...token]/+page.server.js | 32 ------ src/routes/(app)/voucher/[...token]/+page.svelte | 92 ----------------- 17 files changed, 247 insertions(+), 234 deletions(-) create mode 100644 src/routes/(app)/ecash/[id]/+layout.server.js create mode 100644 src/routes/(app)/ecash/[id]/+layout.svelte create mode 100644 src/routes/(app)/ecash/[id]/swap/+page.server.ts create mode 100644 src/routes/(app)/ecash/[id]/swap/+page.svelte create mode 100644 src/routes/(app)/receive/[...token]/+page.server.js create mode 100644 src/routes/(app)/receive/[...token]/+page.svelte delete mode 100644 src/routes/(app)/redeem/[redeemcode]/+page.server.js delete mode 100644 src/routes/(app)/redeem/[redeemcode]/+page.svelte delete mode 100644 src/routes/(app)/voucher/[...token]/+page.server.js delete mode 100644 src/routes/(app)/voucher/[...token]/+page.svelte (limited to 'src/routes/(app)') diff --git a/src/routes/(app)/[username]/invoice/[id]/+page.svelte b/src/routes/(app)/[username]/invoice/[id]/+page.svelte index cdffd199..423fc719 100644 --- a/src/routes/(app)/[username]/invoice/[id]/+page.svelte +++ b/src/routes/(app)/[username]/invoice/[id]/+page.svelte @@ -292,7 +292,7 @@ {/if} {#if user?.id === invoice?.user?.id} - + + +{/if} - - - - - - - - - - +
+ - {#if spent < total} - + {#if spent < total} + {#if external} + + {:else} +
+ + +
{/if} + {/if} - -
+ diff --git a/src/routes/(app)/ecash/[id]/swap/+page.server.ts b/src/routes/(app)/ecash/[id]/swap/+page.server.ts new file mode 100644 index 00000000..c8806bf0 --- /dev/null +++ b/src/routes/(app)/ecash/[id]/swap/+page.server.ts @@ -0,0 +1,3 @@ + export async function load() { + return { test: 123 }; +} diff --git a/src/routes/(app)/ecash/[id]/swap/+page.svelte b/src/routes/(app)/ecash/[id]/swap/+page.svelte new file mode 100644 index 00000000..3df9504d --- /dev/null +++ b/src/routes/(app)/ecash/[id]/swap/+page.svelte @@ -0,0 +1,5 @@ + + +
Support for swapping in cash from other mints is coming soon
diff --git a/src/routes/(app)/pay/[username]/[...amount]/+page.svelte b/src/routes/(app)/pay/[username]/[...amount]/+page.svelte index 1652952a..ffe6eac3 100644 --- a/src/routes/(app)/pay/[username]/[...amount]/+page.svelte +++ b/src/routes/(app)/pay/[username]/[...amount]/+page.svelte @@ -64,6 +64,8 @@ {/if} +{rate} +
{ + let { text } = await fd(request); + let msg = await parse(text, url.host, cookies); + return fail(400, { error: msg || "default" }); + }, +}; diff --git a/src/routes/(app)/receive/[...token]/+page.svelte b/src/routes/(app)/receive/[...token]/+page.svelte new file mode 100644 index 00000000..2fd4b879 --- /dev/null +++ b/src/routes/(app)/receive/[...token]/+page.svelte @@ -0,0 +1,92 @@ + + + + + +
+

+ {$t("payments.voucher")} +

+ +
+ {#if form?.error} +
+
+ {form.error === "default" + ? $t("error.unrecognizedInput") + : form.error} +
+
+ {/if} + +
+