From 537401d4f3e7d3a90f5ff7a55feb9c05d4ac9f5e Mon Sep 17 00:00:00 2001 From: Adam Soltys Date: Thu, 23 Nov 2023 22:59:29 -0800 Subject: don't prefill registration form --- src/lib/store.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/lib/store.js') diff --git a/src/lib/store.js b/src/lib/store.js index 64cf015e..3d8e687d 100644 --- a/src/lib/store.js +++ b/src/lib/store.js @@ -43,7 +43,7 @@ export const last = writable(); export const loginRedirect = writable(); export const decrypted = persistLocal('decrypted', {}); export const newPayment = persistLocal('newPayment'); -export const password = persistLocal('password'); +export const password = writable(); export const passwordPrompt = writable(); export const pin = writable(); export const rate = writable(); -- cgit v1.2.3 From 4972b423fe4f88bcef1b790b2287e2db3517b529 Mon Sep 17 00:00:00 2001 From: Adam Soltys Date: Thu, 30 Nov 2023 12:57:57 -0800 Subject: pin fixes --- src/components/AppHeader.svelte | 2 +- src/lib/store.js | 6 ++- src/locales/en.json | 9 +++-- src/routes/(app)/+layout.svelte | 4 +- src/routes/(app)/[username]/+layout.server.js | 1 - .../[username]/settings/[...tab]/+page.svelte | 45 +++++++++++++--------- .../(app)/[username]/settings/[...tab]/_pos.svelte | 11 +++++- .../[username]/settings/[...tab]/_security.svelte | 31 ++++++++------- 8 files changed, 66 insertions(+), 43 deletions(-) (limited to 'src/lib/store.js') diff --git a/src/components/AppHeader.svelte b/src/components/AppHeader.svelte index 123606e1..ae162e1f 100644 --- a/src/components/AppHeader.svelte +++ b/src/components/AppHeader.svelte @@ -13,7 +13,7 @@ let update = (data) => ({ subject, user } = data); let menuButtons; - if (user) + $: if (user) menuButtons = [ { key: 'nav.settings', icon: 'settings', href: `/${user.username}/settings` }, { key: 'nav.support', icon: 'support', href: `/support` }, diff --git a/src/lib/store.js b/src/lib/store.js index 3d8e687d..403ee816 100644 --- a/src/lib/store.js +++ b/src/lib/store.js @@ -8,7 +8,9 @@ const persistSession = (key, defaultValue) => { : defaultValue ); - s.subscribe((v) => browser && sessionStorage.setItem(key, JSON.stringify(v))); + s.subscribe((v) => { + browser && sessionStorage.setItem(key, JSON.stringify(v)); + }); return s; }; @@ -45,7 +47,7 @@ export const decrypted = persistLocal('decrypted', {}); export const newPayment = persistLocal('newPayment'); export const password = writable(); export const passwordPrompt = writable(); -export const pin = writable(); +export const pin = persistSession('pin'); export const rate = writable(); export const request = writable(); export const requestRedirect = writable(); diff --git a/src/locales/en.json b/src/locales/en.json index 608668a9..c0efade3 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -240,8 +240,8 @@ "securityPIN": "Security PIN", "securityPINDescription": "Set a security pin that will be used to unlock your settings and to send outgoing payments.", "setPIN": "Set PIN", - "autoLock": "Auto-Lock Timer", - "autoLockDescription": "Your account will go into a secure mode, requiring you to re-enter your credentials after a specified time:", + "autoLock": "Timeout", + "autoLockDescription": "Time after which your PIN needs to be re-entered:", "twofa": "2-Factor Authentication", "twofaDescription": "Add an extra level of security to your device by enabling 2-factor authentication.", "twofaSetup": "Set up 2FA", @@ -249,7 +249,10 @@ "select": "Select", "verifyPIN": "Verify PIN", "enablePIN": "Enable PIN", - "disablePIN": "Disable PIN" + "disablePIN": "Disable PIN", + "publishNip5": "Publish nostr identity", + "nip5a": "Use", + "nip5b": "as your publicly verified nostr address" }, "support": { "header": "Support", diff --git a/src/routes/(app)/+layout.svelte b/src/routes/(app)/+layout.svelte index 012dd957..7f4e3c7b 100644 --- a/src/routes/(app)/+layout.svelte +++ b/src/routes/(app)/+layout.svelte @@ -32,7 +32,7 @@ if (browser) { let log = console.log; checkSocket(); - expirePin(); + expireTimer = setTimeout(expirePin, user.locktime * 1000 || 300000); // if (window.NDEFReader) { // try { @@ -74,7 +74,7 @@ let expirePin = () => { $pin = null; - expireTimer = setTimeout(expirePin, 300000); + expireTimer = setTimeout(expirePin, user.locktime * 1000 || 300000); }; onDestroy(() => { diff --git a/src/routes/(app)/[username]/+layout.server.js b/src/routes/(app)/[username]/+layout.server.js index 27502386..8df75f0f 100644 --- a/src/routes/(app)/[username]/+layout.server.js +++ b/src/routes/(app)/[username]/+layout.server.js @@ -8,7 +8,6 @@ export let load = async ({ depends, params: { username } }) => { let subject = await get(`/users/${username}`); return { subject }; } catch (e) { - console.log(e); throw error(500, 'Unable to retrieve user account data'); } }; diff --git a/src/routes/(app)/[username]/settings/[...tab]/+page.svelte b/src/routes/(app)/[username]/settings/[...tab]/+page.svelte index 087c9450..a3afce62 100644 --- a/src/routes/(app)/[username]/settings/[...tab]/+page.svelte +++ b/src/routes/(app)/[username]/settings/[...tab]/+page.svelte @@ -1,5 +1,6 @@
-
- - - +
+ + + - + -

{$t('404.404')}

-

{$t('404.pageNotFound')}

-
+

{$t("404.404")}

+

{$t("404.pageNotFound")}

+
diff --git a/src/components/About.svelte b/src/components/About.svelte index 1dbd8038..6e0cdcb5 100644 --- a/src/components/About.svelte +++ b/src/components/About.svelte @@ -1,7 +1,7 @@
-
-

- {$t('about.team.header')} -

-
- {#each team as member} -
-
-
- +
+

+ {$t("about.team.header")} +

+
+ {#each team as member} +
+
+
+ -
- {$t(`about.team.${member.name}.name`)} - {$t(`about.team.${member.name}.position`)} -
+
+ {$t(`about.team.${member.name}.name`)} + {$t(`about.team.${member.name}.position`)} +
-
- {#each member.socials as social} - - {/each} -
-
-
- {$t(`about.team.${member.name}.bio`)} -
-
-
- {/each} -
-
+
+ {#each member.socials as social} + + {/each} +
+
+
+ {$t(`about.team.${member.name}.bio`)} +
+
+
+ {/each} +
+
{#if locations?.length} -
-

{$t('about.locations.header')}

-

- {@html $t('about.locations.description')} -

- -
+
+

+ {$t("about.locations.header")} +

+

+ {@html $t("about.locations.description")} +

+ +
{/if} diff --git a/src/components/AppHeader.svelte b/src/components/AppHeader.svelte index 53b31de4..2f088eec 100644 --- a/src/components/AppHeader.svelte +++ b/src/components/AppHeader.svelte @@ -1,149 +1,159 @@ {#if !$loading} -
- +
+ +
+
{/if} diff --git a/src/components/Avatar.svelte b/src/components/Avatar.svelte index b258a0e8..3955a42f 100644 --- a/src/components/Avatar.svelte +++ b/src/components/Avatar.svelte @@ -1,29 +1,31 @@ -
- {user.username} -
+
+ {user.username} +
diff --git a/src/components/Balance.svelte b/src/components/Balance.svelte index 0e4f2ec2..92714f98 100644 --- a/src/components/Balance.svelte +++ b/src/components/Balance.svelte @@ -1,34 +1,34 @@ {#if show && user.haspin && $pin?.length !== 6} - (show = false)} /> + (show = false)} /> {/if}
- {#if user.haspin && !$pin} - - {:else} -
- {#if isNaN($animatedRate)} -
—
- {:else} - {f((user.balance * $animatedRate) / sats, user.currency)} - {/if} -
+ {#if user.haspin && !$pin} + + {:else} +
+ {#if isNaN($animatedRate)} +
—
+ {:else} + {f((user.balance * $animatedRate) / sats, user.currency)} + {/if} +
-
- ⚡️{s(user.balance)} -
- {/if} +
+ ⚡️{s(user.balance)} +
+ {/if}
diff --git a/src/components/Calendar.svelte b/src/components/Calendar.svelte index 7504f48e..b07c136c 100644 --- a/src/components/Calendar.svelte +++ b/src/components/Calendar.svelte @@ -1,14 +1,14 @@ - + diff --git a/src/components/Card.svelte b/src/components/Card.svelte index 44ab635f..864465c0 100644 --- a/src/components/Card.svelte +++ b/src/components/Card.svelte @@ -1,14 +1,14 @@ - + diff --git a/src/components/Check.svelte b/src/components/Check.svelte index 4c9f504b..222c4dea 100644 --- a/src/components/Check.svelte +++ b/src/components/Check.svelte @@ -1,11 +1,11 @@ diff --git a/src/components/Code.svelte b/src/components/Code.svelte index ffca98a4..6c1048cf 100644 --- a/src/components/Code.svelte +++ b/src/components/Code.svelte @@ -1,27 +1,31 @@ -
-
-
{samples[sample]}
-
- +
+
+
{samples[sample]}
+
+
diff --git a/src/components/Event.svelte b/src/components/Event.svelte index 68f44589..2312f44e 100644 --- a/src/components/Event.svelte +++ b/src/components/Event.svelte @@ -1,84 +1,87 @@ -
- -
-
- -
- -
- +
+ +
+
+ +
+ +
+ -
-
-
- {user.display_name || ''} - @{user.username} -
-
 {distance(seen)}
-
-
- {content} -
+
+
+
+ {user.display_name || ""} + @{user.username} +
+
 {distance(seen)}
+
+
+ {content} +
-
-
- -
444
-
-
- -
1072
-
-
- -
26
-
-
- -
4
-
-
-
+
+
+ +
444
+
+
+ +
1072
+
+
+ +
26
+
+
+ +
4
+
+
+
diff --git a/src/components/FaqCard.svelte b/src/components/FaqCard.svelte index 918e03d6..ae1ad077 100644 --- a/src/components/FaqCard.svelte +++ b/src/components/FaqCard.svelte @@ -1,15 +1,15 @@
-

{$t('faq.' + questionID + '.question')}

-

- {$t('faq.' + questionID + '.answer')} -

+

{$t("faq." + questionID + ".question")}

+

+ {$t("faq." + questionID + ".answer")} +

diff --git a/src/components/Feed.svelte b/src/components/Feed.svelte index 7de087a7..0c9c96d1 100644 --- a/src/components/Feed.svelte +++ b/src/components/Feed.svelte @@ -1,72 +1,84 @@ {#if user} -
-
- -
- -
+
+
+ +
+ +
{/if} {#if browser} - {#if sorted.length} - - - - - - {:else} -
-
{$t('user.noNotes')}
-
- {/if} + {#if sorted.length} + + + + + + {:else} +
+
{$t("user.noNotes")}
+
+ {/if} {/if} diff --git a/src/components/Footer.svelte b/src/components/Footer.svelte index eda26526..c1ac79cf 100644 --- a/src/components/Footer.svelte +++ b/src/components/Footer.svelte @@ -1,65 +1,74 @@ -