discours.io/webapp
5
0
Fork 0
Code Issues Pull Requests Actions Projects Wiki Activity

tolowercase-fix

Browse Source
This commit is contained in:
Untone 2024-01-13 17:22:04 +03:00
parent daca3007bb
commit 9b6a6ecde5
4 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/components/Nav/AuthModal/EmailConfirm.tsx
View File

@ -6,20 +6,21 @@ import { useSession } from '../../../context/session'
import { useRouter } from '../../../stores/router' import { useRouter } from '../../../stores/router'
import { hideModal } from '../../../stores/ui' import { hideModal } from '../../../stores/ui'
import { setEmail, email } from './sharedLogic'
import styles from './AuthModal.module.scss' import styles from './AuthModal.module.scss'
export const EmailConfirm = () => { export const EmailConfirm = () => {
const { t } = useLocalize() const { t } = useLocalize()
const { changeSearchParams } = useRouter() const { changeSearchParams } = useRouter()
const { session, authError } = useSession() const { session, authError } = useSession()
const [email, setEmail] = createSignal('')
const [emailConfirmed, setEmailConfirmed] = createSignal(false) const [emailConfirmed, setEmailConfirmed] = createSignal(false)
createEffect(() => { createEffect(() => {
const e = session()?.user?.email const e = session()?.user?.email
const v = session()?.user?.email_verified const v = session()?.user?.email_verified
if (e) { if (e) {
setEmail(e) setEmail(e.toLowerCase())
if (v) setEmailConfirmed(v) if (v) setEmailConfirmed(v)
if (authError()) { if (authError()) {
changeSearchParams({}, true) changeSearchParams({}, true)
@ -41,7 +42,7 @@ export const EmailConfirm = () => {
<Show when={emailConfirmed()}> <Show when={emailConfirmed()}>
<div class={styles.title}>{t('Hooray! Welcome!')}</div> <div class={styles.title}>{t('Hooray! Welcome!')}</div>
<div class={styles.text}> <div class={styles.text}>
{t("You've confirmed email")} {email()} {t("You've confirmed email")} {email().toLowerCase()}
</div> </div>
<div> <div>
<button class={clsx('button', styles.submitButton)} onClick={() => hideModal()}> <button class={clsx('button', styles.submitButton)} onClick={() => hideModal()}>

2
src/components/Nav/AuthModal/ForgotPasswordForm.tsx
View File

@ -24,7 +24,7 @@ export const ForgotPasswordForm = () => {
const { t } = useLocalize() const { t } = useLocalize()
const handleEmailInput = (newEmail: string) => { const handleEmailInput = (newEmail: string) => {
setValidationErrors(({ email: _notNeeded, ...rest }) => rest) setValidationErrors(({ email: _notNeeded, ...rest }) => rest)
setEmail(newEmail) setEmail(newEmail.toLowerCase())
} }
const { const {
actions: { authorizer }, actions: { authorizer },

2
src/components/Nav/AuthModal/LoginForm.tsx
View File

@ -51,7 +51,7 @@ export const LoginForm = () => {
const handleEmailInput = (newEmail: string) => { const handleEmailInput = (newEmail: string) => {
setValidationErrors(({ email: _notNeeded, ...rest }) => rest) setValidationErrors(({ email: _notNeeded, ...rest }) => rest)
setEmail(newEmail) setEmail(newEmail.toLowerCase())
} }
const handlePasswordInput = (newPassword: string) => { const handlePasswordInput = (newPassword: string) => {

2
src/components/Nav/AuthModal/RegisterForm.tsx
View File

@ -28,7 +28,7 @@ type FormFields = {
type ValidationErrors = Partial<Record<keyof FormFields, string | JSX.Element>> type ValidationErrors = Partial<Record<keyof FormFields, string | JSX.Element>>
const handleEmailInput = (newEmail: string) => { const handleEmailInput = (newEmail: string) => {
setEmail(newEmail) setEmail(newEmail.toLowerCase())
} }
export const RegisterForm = () => { export const RegisterForm = () => {