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 +++- src/routes/(app)/register/+page.svelte | 245 +++++++++++++++++++++++++++++- 2 files changed, 269 insertions(+), 5 deletions(-) (limited to 'src/routes/(app)/register') 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; } diff --git a/src/routes/(app)/register/+page.svelte b/src/routes/(app)/register/+page.svelte index fd9e4417..37ff67c8 100644 --- a/src/routes/(app)/register/+page.svelte +++ b/src/routes/(app)/register/+page.svelte @@ -1,7 +1,33 @@ - +{#if need2fa} + +{/if} + +
+
+ + + +
+ +
+
+

{$t('login.register')}

+ + handleFile(e, 'profile')} + /> + +
+ +
+ + +
+ +
+ + {#if form?.error} +
+ {form.error} +
+ {/if} + +
+ + + +
+ + +
+ +
+ + {#if revealPassword} + + {:else} + + {/if} + +
+ +

+ {$t('login.passwordRecommendation')} +

+ + +
+ +

+ {$t('login.haveAccount')} + + {$t('login.signIn')} + +

+
+
+
-- cgit v1.2.3 From 96c67006bde6fa5a9d92edcb84e48744e0a36cf5 Mon Sep 17 00:00:00 2001 From: Adam Soltys Date: Thu, 16 Nov 2023 00:08:03 -0800 Subject: clear avatar on register --- src/routes/(app)/register/+page.svelte | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/routes/(app)/register') diff --git a/src/routes/(app)/register/+page.svelte b/src/routes/(app)/register/+page.svelte index 37ff67c8..82b40e9e 100644 --- a/src/routes/(app)/register/+page.svelte +++ b/src/routes/(app)/register/+page.svelte @@ -16,6 +16,8 @@ export let form; export let data; + $: data && ($avatar = undefined); + let cleared; let clear = () => { if (!cleared) { -- cgit v1.2.3 From 0581e2a0b080120a9f7445c3f97805ff6a0dc272 Mon Sep 17 00:00:00 2001 From: Adam Soltys Date: Thu, 16 Nov 2023 00:43:10 -0800 Subject: fix off by one error --- src/routes/(app)/register/+page.svelte | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/routes/(app)/register') diff --git a/src/routes/(app)/register/+page.svelte b/src/routes/(app)/register/+page.svelte index 82b40e9e..e7aa475f 100644 --- a/src/routes/(app)/register/+page.svelte +++ b/src/routes/(app)/register/+page.svelte @@ -99,8 +99,8 @@ let avatarInput; $: src = `/api/public/${punks[index]}.webp`; - let decr = () => (index = index <= 1 ? 64 : index - 1); - let incr = () => (index = index >= 64 ? 1 : index + 1); + let decr = () => (index = index <= 0 ? 63 : index - 1); + let incr = () => (index = index >= 63 ? 0 : index + 1); let selectAvatar = () => avatarInput.click(); let progress; -- cgit v1.2.3 From 46520607897855f02f03b53c5e4ab09c0de162d9 Mon Sep 17 00:00:00 2001 From: Adam Soltys Date: Thu, 16 Nov 2023 07:41:21 -0800 Subject: tighten up register page --- src/routes/(app)/register/+page.svelte | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) (limited to 'src/routes/(app)/register') diff --git a/src/routes/(app)/register/+page.svelte b/src/routes/(app)/register/+page.svelte index e7aa475f..215c93d6 100644 --- a/src/routes/(app)/register/+page.svelte +++ b/src/routes/(app)/register/+page.svelte @@ -125,18 +125,16 @@ {/if} -
-
+
+
-
-

{$t('login.register')}

- - +