From b466b3d39c3b9ec792ef924c7f4750fb70b6a016 Mon Sep 17 00:00:00 2001 From: Adam Soltys Date: Wed, 15 Nov 2023 23:02:29 -0800 Subject: prefill register page --- src/routes/(app)/register/+page.server.js | 29 ++++++++++++++++++++++++++--- 1 file changed, 26 insertions(+), 3 deletions(-) (limited to 'src/routes/(app)/register/+page.server.js') diff --git a/src/routes/(app)/register/+page.server.js b/src/routes/(app)/register/+page.server.js index c90d4ee3..f2b49e3f 100644 --- a/src/routes/(app)/register/+page.server.js +++ b/src/routes/(app)/register/+page.server.js @@ -1,9 +1,32 @@ +import { + NumberDictionary, + uniqueNamesGenerator, + colors, + adjectives, + animals +} from 'unique-names-generator'; import { fail, redirect } from '@sveltejs/kit'; import { fd, post, login } from '$lib/utils'; export const load = async ({ parent }) => { let { user } = await parent(); if (user) throw redirect(307, `/${user.username}`); + + let username = uniqueNamesGenerator({ + dictionaries: [animals, NumberDictionary.generate({ min: 10, max: 99 })], + length: 2, + separator: '' + }); + + let password = uniqueNamesGenerator({ + dictionaries: [colors, NumberDictionary.generate({ min: 100, max: 999 })], + length: 2, + separator: '' + }); + + let index = Math.floor(Math.random() * 64) + 1; + + return { index, username, password }; }; export const actions = { @@ -11,8 +34,8 @@ export const actions = { let ip = request.headers.get('cf-connecting-ip'); let form = await fd(request); - let { username, password, cipher, salt, pubkey, loginRedirect } = form; - let user = { username, password, cipher, salt, pubkey }; + let { profile, username, password, cipher, salt, pubkey, loginRedirect } = form; + let user = { profile, username, password, cipher, salt, pubkey }; let error; if (loginRedirect === 'undefined') loginRedirect = undefined; @@ -20,7 +43,7 @@ export const actions = { try { await post('/register', { user }, { 'cf-connecting-ip': ip }); } catch (e) { - console.log(e) + console.log(e); if (e.message.includes('taken')) error = e.message; } -- cgit v1.2.3 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 +- src/routes/(app)/register/+page.server.js | 21 +--------------- src/routes/(app)/register/+page.svelte | 41 ++++++++++++++++++++++--------- static/icons/random.svg | 6 +++++ 4 files changed, 38 insertions(+), 32 deletions(-) create mode 100644 static/icons/random.svg (limited to 'src/routes/(app)/register/+page.server.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(); diff --git a/src/routes/(app)/register/+page.server.js b/src/routes/(app)/register/+page.server.js index f2b49e3f..45344907 100644 --- a/src/routes/(app)/register/+page.server.js +++ b/src/routes/(app)/register/+page.server.js @@ -1,10 +1,3 @@ -import { - NumberDictionary, - uniqueNamesGenerator, - colors, - adjectives, - animals -} from 'unique-names-generator'; import { fail, redirect } from '@sveltejs/kit'; import { fd, post, login } from '$lib/utils'; @@ -12,21 +5,9 @@ export const load = async ({ parent }) => { let { user } = await parent(); if (user) throw redirect(307, `/${user.username}`); - let username = uniqueNamesGenerator({ - dictionaries: [animals, NumberDictionary.generate({ min: 10, max: 99 })], - length: 2, - separator: '' - }); - - let password = uniqueNamesGenerator({ - dictionaries: [colors, NumberDictionary.generate({ min: 100, max: 999 })], - length: 2, - separator: '' - }); - let index = Math.floor(Math.random() * 64) + 1; - return { index, username, password }; + return { index }; }; export const actions = { diff --git a/src/routes/(app)/register/+page.svelte b/src/routes/(app)/register/+page.svelte index 573de4d0..a9f9d047 100644 --- a/src/routes/(app)/register/+page.svelte +++ b/src/routes/(app)/register/+page.svelte @@ -12,11 +12,20 @@ import { t } from '$lib/translations'; import { page } from '$app/stores'; import { generate } from '$lib/nostr'; + import { + NumberDictionary, + uniqueNamesGenerator, + colors, + adjectives, + animals + } from 'unique-names-generator'; export let form; export let data; $: data && ($avatar = undefined); + let username; + let { index } = data; let cleared; let clear = () => { @@ -29,16 +38,20 @@ }; let refresh = async () => { - await invalidateAll(); - await tick(); - username = data.username; - $password = data.password; - }; + username = uniqueNamesGenerator({ + dictionaries: [animals, NumberDictionary.generate({ min: 10, max: 99 })], + length: 2, + separator: '' + }); - let username = data.username; - $password = data.password; + $password = uniqueNamesGenerator({ + dictionaries: [colors, NumberDictionary.generate({ min: 100, max: 999 })], + length: 2, + separator: '' + }); - let { index } = data; + revealPassword = true; + }; afterNavigate(async () => { try { @@ -63,7 +76,7 @@ $: token && token?.length === 6 && tick().then(() => btn.click()); - let revealPassword = true; + let revealPassword; let loading; async function handleSubmit(e) { @@ -192,6 +205,8 @@
-
@@ -209,6 +224,7 @@ {#if revealPassword} {:else} (revealPassword = !revealPassword)} class="absolute right-0 top-4" > @@ -241,6 +259,7 @@

- - - - - - - - - - -
- (showMenu = false)}> - +
+ -
- -
-
+
+ +
+ Coinos +
+
+
+ {:else} + + + + {/if} + +
+ +
+ {/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 @@ -