From d0f3c2eb91ba99bc17a9f42d37ddf173f5700084 Mon Sep 17 00:00:00 2001 From: Jackson Harper Date: Tue, 27 Aug 2024 14:13:30 +0800 Subject: [PATCH 1/2] Layout improvements for auth pages --- packages/web/components/elements/StyledText.tsx | 2 +- .../web/components/templates/auth/EmailForgotPassword.tsx | 7 +++---- packages/web/components/templates/auth/EmailLogin.tsx | 7 +++---- packages/web/components/templates/auth/EmailSignup.tsx | 2 +- 4 files changed, 8 insertions(+), 10 deletions(-) diff --git a/packages/web/components/elements/StyledText.tsx b/packages/web/components/elements/StyledText.tsx index 6c2fd86cb..057b785a4 100644 --- a/packages/web/components/elements/StyledText.tsx +++ b/packages/web/components/elements/StyledText.tsx @@ -4,7 +4,7 @@ const textVariants = { style: { body: { fontSize: '$2', - lineHeight: '1.25', + lineHeight: '1.50', }, logoTitle: { fontFamily: 'Inter', diff --git a/packages/web/components/templates/auth/EmailForgotPassword.tsx b/packages/web/components/templates/auth/EmailForgotPassword.tsx index 760c43c43..6de0ed443 100644 --- a/packages/web/components/templates/auth/EmailForgotPassword.tsx +++ b/packages/web/components/templates/auth/EmailForgotPassword.tsx @@ -40,9 +40,8 @@ const ForgotPasswordForm = (): JSX.Element => { export function EmailForgotPassword(): JSX.Element { const router = useRouter() const [email, setEmail] = useState('') - const [errorMessage, setErrorMessage] = useState( - undefined - ) + const [errorMessage, setErrorMessage] = + useState(undefined) const recaptchaTokenRef = useRef(null) useEffect(() => { @@ -59,7 +58,7 @@ export function EmailForgotPassword(): JSX.Element { { export function EmailLogin(): JSX.Element { const router = useRouter() - const [errorMessage, setErrorMessage] = useState( - undefined - ) + const [errorMessage, setErrorMessage] = + useState(undefined) const recaptchaTokenRef = useRef(null) useEffect(() => { @@ -71,7 +70,7 @@ export function EmailLogin(): JSX.Element { Date: Tue, 27 Aug 2024 14:14:30 +0800 Subject: [PATCH 2/2] Add page for handling verification token errors --- packages/web/pages/auth/confirm-email.tsx | 65 +++++++++++++++++++++++ 1 file changed, 65 insertions(+) create mode 100644 packages/web/pages/auth/confirm-email.tsx diff --git a/packages/web/pages/auth/confirm-email.tsx b/packages/web/pages/auth/confirm-email.tsx new file mode 100644 index 000000000..a785cca6c --- /dev/null +++ b/packages/web/pages/auth/confirm-email.tsx @@ -0,0 +1,65 @@ +import { useRouter } from 'next/router' +import { HStack, VStack } from '../../components/elements/LayoutPrimitives' +import { PageMetaData } from '../../components/patterns/PageMetaData' +import { useEffect, useState } from 'react' +import { parseErrorCodes } from '../../lib/queryParamParser' +import { StyledText } from '../../components/elements/StyledText' +import { Button } from '../../components/elements/Button' +import { AuthLayout } from '../../components/templates/AuthLayout' + +export default function ConfirmEmailPage(): JSX.Element { + const router = useRouter() + + return ( + + + + + Verification error + + + + The verification code supplied is invalid or has expired. Please login + with your email and password again to generate a new verification + email. Verifications can only be used once, and expire after five + minutes. + + + + + + + + ) +}