From 00e88944abb529d07e189f1181de8a4804f8ae9c Mon Sep 17 00:00:00 2001 From: Adam Soltys Date: Thu, 7 Dec 2023 15:10:24 -0800 Subject: forgot password --- src/components/Calendar.svelte | 3 +- src/components/Card.svelte | 3 +- src/components/Footer.svelte | 3 +- src/components/Heart.svelte | 3 +- src/components/Invoice.svelte | 3 +- src/components/LandingHeader.svelte | 22 ++- src/components/LandingHero.svelte | 3 +- src/components/Left.svelte | 3 +- src/components/Lnurlp.svelte | 3 +- src/components/Lnurlw.svelte | 3 +- src/components/LocationsMap.svelte | 6 +- src/components/Lock.svelte | 3 +- src/components/Numpad.svelte | 3 +- src/components/Password.svelte | 9 +- src/components/Pin.svelte | 3 +- src/components/Pinpad.svelte | 6 +- src/components/RegisterOrLogin.svelte | 193 --------------------- src/components/Request.svelte | 3 +- src/components/Spinner.svelte | 3 +- src/components/index.js | 0 src/locales/en.json | 3 + src/routes/(app)/+error.svelte | 3 +- .../(app)/[username]/(profile)/+layout.svelte | 15 +- .../[username]/(profile)/request/+page.svelte | 3 +- .../(app)/[username]/card/[serial]/+page.svelte | 6 +- src/routes/(app)/[username]/funds/+page.svelte | 3 +- .../(app)/[username]/invoice/[id]/+page.svelte | 24 ++- .../[username]/invoice/[id]/paid/+page.svelte | 12 +- .../[username]/receive/[...param]/+page.svelte | 3 +- .../[username]/settings/[...tab]/+page.svelte | 4 +- .../(app)/[username]/settings/[...tab]/_pos.svelte | 6 +- .../[username]/settings/[...tab]/_security.svelte | 6 +- .../[username]/settings/[...tab]/_shopify.svelte | 4 +- src/routes/(app)/buy/+page.svelte | 11 +- src/routes/(app)/forgot/+page.server.js | 16 ++ src/routes/(app)/forgot/+page.svelte | 58 +++++++ src/routes/(app)/fund/[id]/+page.svelte | 12 +- src/routes/(app)/fund/[id]/withdraw/+page.svelte | 3 +- src/routes/(app)/launch/+page.svelte | 7 +- src/routes/(app)/launch/purchase/+page.svelte | 17 +- src/routes/(app)/launch/purchase/card/+page.svelte | 8 +- .../(app)/launch/thanks/[asset]/+page.svelte | 7 +- src/routes/(app)/launch/ticket/+page.svelte | 7 +- src/routes/(app)/login/+page.svelte | 175 ++++++++++++++++++- src/routes/(app)/payment/[id]/+page.svelte | 8 +- src/routes/(app)/register/+page.server.js | 11 +- src/routes/(app)/register/+page.svelte | 24 +-- src/routes/(app)/scan/+page.svelte | 5 +- src/routes/(app)/send/[...text]/+page.svelte | 12 +- .../bitcoin/[address]/[...amount]/+page.server.js | 12 +- .../bitcoin/[address]/[...amount]/+page.svelte | 3 +- .../send/fund/[name]/[...amount]/+page.svelte | 3 +- src/routes/(app)/send/invoice/[id]/+page.svelte | 6 +- .../(app)/send/lightning/[payreq]/+page.svelte | 10 +- .../send/user/[username]/[...amount]/+page.svelte | 8 +- src/routes/(app)/support/+page.svelte | 9 +- src/routes/(static)/docs/+page.svelte | 3 +- static/lottie/success.json | 17 +- 58 files changed, 411 insertions(+), 411 deletions(-) delete mode 100644 src/components/RegisterOrLogin.svelte delete mode 100644 src/components/index.js create mode 100644 src/routes/(app)/forgot/+page.server.js create mode 100644 src/routes/(app)/forgot/+page.svelte diff --git a/src/components/Calendar.svelte b/src/components/Calendar.svelte index b07c136c..7d7fa570 100644 --- a/src/components/Calendar.svelte +++ b/src/components/Calendar.svelte @@ -3,8 +3,7 @@ class="absolute bottom-0 left-0 -mb-0.5 transform translate-x-1/2 -translate-y-1/2 text-black peer-placeholder-shown:text-gray-300 h-6 w-6" fill="none" viewBox="0 0 24 24" - stroke="currentColor" -> + stroke="currentColor"> + stroke="currentColor"> diff --git a/src/components/Heart.svelte b/src/components/Heart.svelte index 9bae6500..4304545f 100644 --- a/src/components/Heart.svelte +++ b/src/components/Heart.svelte @@ -4,8 +4,7 @@ class="mr-1" viewBox="0 0 24 24" fill="none" - xmlns="http://www.w3.org/2000/svg" -> + xmlns="http://www.w3.org/2000/svg"> diff --git a/src/components/LandingHeader.svelte b/src/components/LandingHeader.svelte index d1094a1d..72dd8c71 100644 --- a/src/components/LandingHeader.svelte +++ b/src/components/LandingHeader.svelte @@ -52,11 +52,12 @@ class="border rounded-full px-6 py-2 font-bold" on:click={() => goto(`/${user.username}`)} >Home + + {:else} @@ -64,11 +65,12 @@ class="border rounded-full px-6 py-2 font-bold hover:opacity-80" on:click={() => goto("/register")} >{$t("nav.startInSeconds")} + + {/if} @@ -79,6 +81,8 @@ class="block md:hidden absolute top-[34.5px] right-10 z" on:click={() => (showMobileMenu = !showMobileMenu)} > + +
goto("/register")} >{$t("nav.startInSeconds")} + + {:else} @@ -113,11 +118,12 @@ class="border rounded-full px-6 py-2 font-bold block" on:click={() => goto(`/${user.username}`)} >{$t("nav.account")} + + {/if} diff --git a/src/components/LandingHero.svelte b/src/components/LandingHero.svelte index 43223499..14488cdd 100644 --- a/src/components/LandingHero.svelte +++ b/src/components/LandingHero.svelte @@ -29,8 +29,7 @@
diff --git a/src/components/Left.svelte b/src/components/Left.svelte index 1e236969..dd27a698 100644 --- a/src/components/Left.svelte +++ b/src/components/Left.svelte @@ -4,8 +4,7 @@ height="24" viewBox="0 0 24 24" fill="none" - xmlns="http://www.w3.org/2000/svg" -> + xmlns="http://www.w3.org/2000/svg">
diff --git a/src/components/Lock.svelte b/src/components/Lock.svelte index fce994a2..23ab0699 100644 --- a/src/components/Lock.svelte +++ b/src/components/Lock.svelte @@ -3,8 +3,7 @@ class="absolute bottom-0 left-0 -mb-0.5 transform translate-x-1/2 -translate-y-1/2 text-black peer-placeholder-shown:text-gray-300 h-6 w-6" fill="none" viewBox="0 0 24 24" - stroke="currentColor" -> + stroke="currentColor"> handleInput(value)} - > + on:click={() => handleInput(value)}> {:else} diff --git a/src/components/Password.svelte b/src/components/Password.svelte index da65d718..ab8b9449 100644 --- a/src/components/Password.svelte +++ b/src/components/Password.svelte @@ -57,8 +57,7 @@
@@ -67,14 +66,12 @@ type="button" class="border-2 border-black rounded-xl font-semibold mx-auto py-3 w-40 hover:opacity-80 mx-auto" on:click={cancel} - on:keydown={cancel} - > + on:keydown={cancel}>
Cancel
diff --git a/src/components/Pin.svelte b/src/components/Pin.svelte index 9938f9a1..50b0e463 100644 --- a/src/components/Pin.svelte +++ b/src/components/Pin.svelte @@ -53,8 +53,7 @@
diff --git a/src/components/Pinpad.svelte b/src/components/Pinpad.svelte index 641ddb2b..1a549654 100644 --- a/src/components/Pinpad.svelte +++ b/src/components/Pinpad.svelte @@ -60,8 +60,7 @@ @@ -72,8 +71,7 @@ {:else} diff --git a/src/components/RegisterOrLogin.svelte b/src/components/RegisterOrLogin.svelte deleted file mode 100644 index be7d4142..00000000 --- a/src/components/RegisterOrLogin.svelte +++ /dev/null @@ -1,193 +0,0 @@ - - -{#if need2fa} - -{/if} - -
-
- - - -
- -
-
-

{$t("login." + pageID)}

- - {#if form?.error} -
- {form.error} -
- {/if} - -
- - - -
- - -
- -
- - {#if revealPassword} - - {:else} - - {/if} - -
- - {#if pageID === "register"} -

- {$t("login.passwordRecommendation")} -

- {:else} - - - - - - - {/if} - - -
- -

- {pageID === "register" - ? $t("login.haveAccount") - : $t("login.noAccount")} - - {pageID === "register" ? $t("login.signIn") : $t("login.register")} - -

-
-
-
diff --git a/src/components/Request.svelte b/src/components/Request.svelte index c085f9e2..03364052 100644 --- a/src/components/Request.svelte +++ b/src/components/Request.svelte @@ -28,8 +28,7 @@
diff --git a/src/components/Spinner.svelte b/src/components/Spinner.svelte index e9c3348f..2e9243b9 100644 --- a/src/components/Spinner.svelte +++ b/src/components/Spinner.svelte @@ -2,8 +2,7 @@ class="mx-auto h-6 w-6 animate-spin text-white" xmlns="http://www.w3.org/2000/svg" fill="none" - viewBox="0 0 24 24" -> + viewBox="0 0 24 24"> diff --git a/src/routes/(app)/[username]/(profile)/+layout.svelte b/src/routes/(app)/[username]/(profile)/+layout.svelte index 71c282c4..e33c4b23 100644 --- a/src/routes/(app)/[username]/(profile)/+layout.svelte +++ b/src/routes/(app)/[username]/(profile)/+layout.svelte @@ -157,8 +157,7 @@ diff --git a/src/routes/(app)/[username]/card/[serial]/+page.svelte b/src/routes/(app)/[username]/card/[serial]/+page.svelte index 1d11ebee..1792b443 100644 --- a/src/routes/(app)/[username]/card/[serial]/+page.svelte +++ b/src/routes/(app)/[username]/card/[serial]/+page.svelte @@ -13,15 +13,13 @@
diff --git a/src/routes/(app)/[username]/invoice/[id]/+page.svelte b/src/routes/(app)/[username]/invoice/[id]/+page.svelte index 0ff1c21c..13c75fca 100644 --- a/src/routes/(app)/[username]/invoice/[id]/+page.svelte +++ b/src/routes/(app)/[username]/invoice/[id]/+page.svelte @@ -130,17 +130,13 @@ class="rounded-full border py-2 px-4 font-bold hover:opacity-80 w-full" class:bg-black={type === types.lightning} class:text-white={type === types.lightning} - on:click={toggleType} - > - ⚡️ Lightning - + on:click={toggleType}> ⚡️ Lightning @@ -217,16 +211,18 @@
diff --git a/src/routes/(app)/[username]/settings/[...tab]/+page.svelte b/src/routes/(app)/[username]/settings/[...tab]/+page.svelte index e77213c2..b4283e72 100644 --- a/src/routes/(app)/[username]/settings/[...tab]/+page.svelte +++ b/src/routes/(app)/[username]/settings/[...tab]/+page.svelte @@ -220,8 +220,7 @@ bind:this={submit} type="submit" class="border-2 border-black rounded-xl font-semibold mx-auto py-3 w-40 hover:opacity-80" - class:bg-black={loading} - > + class:bg-black={loading}> {#if loading} {:else} @@ -236,4 +235,3 @@ view-transition-name: settings; } - diff --git a/src/routes/(app)/[username]/settings/[...tab]/_pos.svelte b/src/routes/(app)/[username]/settings/[...tab]/_pos.svelte index 8193bc9c..e211b013 100644 --- a/src/routes/(app)/[username]/settings/[...tab]/_pos.svelte +++ b/src/routes/(app)/[username]/settings/[...tab]/_pos.svelte @@ -25,8 +25,7 @@ + value={parseInt(user.locktime)}> diff --git a/src/routes/(app)/[username]/settings/[...tab]/_shopify.svelte b/src/routes/(app)/[username]/settings/[...tab]/_shopify.svelte index 0266fa9c..870803fb 100644 --- a/src/routes/(app)/[username]/settings/[...tab]/_shopify.svelte +++ b/src/routes/(app)/[username]/settings/[...tab]/_shopify.svelte @@ -28,9 +28,7 @@
- admin.shopify.com/store/ -
+ >admin.shopify.com/store/
$$ @@ -93,8 +94,9 @@ CVC/CVV @@ -113,8 +115,7 @@
+ +
+ + diff --git a/src/routes/(app)/fund/[id]/+page.svelte b/src/routes/(app)/fund/[id]/+page.svelte index b81e2917..ebb1a517 100644 --- a/src/routes/(app)/fund/[id]/+page.svelte +++ b/src/routes/(app)/fund/[id]/+page.svelte @@ -62,8 +62,7 @@
@@ -72,8 +71,7 @@
@@ -83,15 +81,13 @@
diff --git a/src/routes/(app)/fund/[id]/withdraw/+page.svelte b/src/routes/(app)/fund/[id]/withdraw/+page.svelte index 7af07e38..e7c1d852 100644 --- a/src/routes/(app)/fund/[id]/withdraw/+page.svelte +++ b/src/routes/(app)/fund/[id]/withdraw/+page.svelte @@ -47,8 +47,7 @@
diff --git a/src/routes/(app)/launch/purchase/+page.svelte b/src/routes/(app)/launch/purchase/+page.svelte index 49a51973..3af3b186 100644 --- a/src/routes/(app)/launch/purchase/+page.svelte +++ b/src/routes/(app)/launch/purchase/+page.svelte @@ -21,9 +21,7 @@

- Purchase Ticket -

+ >Purchase Ticket
@@ -46,25 +43,21 @@ {:else}

- Payment Options -

+ >Payment Options
diff --git a/src/routes/(app)/launch/purchase/card/+page.svelte b/src/routes/(app)/launch/purchase/card/+page.svelte index 6d33c87f..d7ef830d 100644 --- a/src/routes/(app)/launch/purchase/card/+page.svelte +++ b/src/routes/(app)/launch/purchase/card/+page.svelte @@ -48,8 +48,9 @@ CVC/CVV @@ -67,8 +68,7 @@ diff --git a/src/routes/(app)/launch/ticket/+page.svelte b/src/routes/(app)/launch/ticket/+page.svelte index 6b16e804..a4888727 100644 --- a/src/routes/(app)/launch/ticket/+page.svelte +++ b/src/routes/(app)/launch/ticket/+page.svelte @@ -7,9 +7,7 @@

- Your Ticket -

+ >Your Ticket

We've minted your ticket as an diff --git a/src/routes/(app)/login/+page.svelte b/src/routes/(app)/login/+page.svelte index 647ef03c..61eea586 100644 --- a/src/routes/(app)/login/+page.svelte +++ b/src/routes/(app)/login/+page.svelte @@ -1,7 +1,18 @@ - +{#if need2fa} + +{/if} + +

+
+ + + +
+ +
+
+

{$t("login.signIn")}

+ + {#if form?.error} +
+ {form.error} +
+ {/if} + +
+ + + +
+ + +
+ +
+ + {#if revealPassword} + + {:else} + + {/if} + +
+ + + + +
+ +

+ {$t("login.haveAccount")} + + {$t("login.register")} + +

+
+
+
diff --git a/src/routes/(app)/payment/[id]/+page.svelte b/src/routes/(app)/payment/[id]/+page.svelte index fd5bbae0..a1c7bbed 100644 --- a/src/routes/(app)/payment/[id]/+page.svelte +++ b/src/routes/(app)/payment/[id]/+page.svelte @@ -140,6 +140,8 @@ class="flex font-bold hover:opacity-80 mb-auto my-auto" on:click={() => copy(id)} > + +
@@ -149,8 +151,7 @@
@@ -240,8 +236,7 @@ type="button" on:click={refresh} class="absolute right-0 top-4" - tabindex="5" - > + tabindex="5">
@@ -276,8 +271,7 @@ type="button" tabindex="4" on:click={() => (revealPassword = !revealPassword)} - class="absolute right-0 top-4" - > + class="absolute right-0 top-4">
@@ -291,8 +285,7 @@ type="submit" class="bg-black text-white w-full rounded-2xl p-4 font-semibold hover:opacity-80" disabled={loading} - bind:this={btn} - > + bind:this={btn}> {#if loading} {:else} @@ -305,8 +298,7 @@ {$t("login.haveAccount")} + class="block md:inline text-black underline underline-offset-4 hover:opacity-80"> {$t("login.signIn")}

diff --git a/src/routes/(app)/scan/+page.svelte b/src/routes/(app)/scan/+page.svelte index e23b9bb8..c02fc1c2 100644 --- a/src/routes/(app)/scan/+page.svelte +++ b/src/routes/(app)/scan/+page.svelte @@ -37,10 +37,7 @@
+ on:click={back}> Cancel