This commit is contained in:
Untone 2024-02-15 20:49:12 +03:00
parent fc96c32a40
commit 005fb5066f
2 changed files with 38 additions and 21 deletions

View File

@ -137,11 +137,16 @@ export const RegisterForm = () => {
case 'verified': case 'verified':
setValidationErrors((prev) => ({ setValidationErrors((prev) => ({
email: (<>{t('This email is verified')}. {t('You can')}</>), email: (
<>
{t('This email is verified')}. {t('You can')}
</>
),
})) }))
break break
case 'registered': case 'registered':
setValidationErrors((prev) => ({ ...prev, setValidationErrors((prev) => ({
...prev,
email: ( email: (
<> <>
{t('This email is registered')}. {t('You can')}{' '} {t('This email is registered')}. {t('You can')}{' '}
@ -216,33 +221,44 @@ export const RegisterForm = () => {
</div> </div>
</div> </div>
<Show when={emailStatus() !== 'registered'} fallback={ <Show
<button class={clsx('button', styles.submitButton)} onClick={() => changeSearchParams({ mode: 'login' })}> when={emailStatus() !== 'registered'}
fallback={
<button
class={clsx('button', styles.submitButton)}
onClick={() => changeSearchParams({ mode: 'login' })}
>
{emailStatus() === 'verified' ? t('Login') : t('')} {emailStatus() === 'verified' ? t('Login') : t('')}
</button>}> </button>
<PasswordField }
disableAutocomplete={true} >
disabled={Boolean(emailStatus())} <PasswordField
errorMessage={(err) => setPasswordError(err)} disableAutocomplete={true}
onInput={(value) => setPassword(value)} disabled={Boolean(emailStatus())}
/> errorMessage={(err) => setPasswordError(err)}
onInput={(value) => setPassword(value)}
/>
</Show> </Show>
<div> <div>
<Show when={emailStatus() !== 'registered'} fallback={ <Show
<button when={emailStatus() !== 'registered'}
class={clsx('button', styles.submitButton)} fallback={
onClick={() => changeSearchParams({ mode: 'send-reset-link' })
}>
{t('Set the new password')}
</button>}>
<button <button
class={clsx('button', styles.submitButton)} class={clsx('button', styles.submitButton)}
disabled={isSubmitting() || Boolean(emailStatus())} onClick={() => changeSearchParams({ mode: 'send-reset-link' })}
type="submit"
> >
{isSubmitting() ? '...' : t('Join')} {t('Set the new password')}
</button> </button>
}
>
<button
class={clsx('button', styles.submitButton)}
disabled={isSubmitting() || Boolean(emailStatus())}
type="submit"
>
{isSubmitting() ? '...' : t('Join')}
</button>
</Show> </Show>
</div> </div>
</div> </div>

View File

@ -8,6 +8,7 @@
flex-direction: row; flex-direction: row;
margin-bottom: .8rem; margin-bottom: .8rem;
} }
.basicInfo { .basicInfo {
display: flex; display: flex;
flex-flow: row nowrap; flex-flow: row nowrap;