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

View File

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