diff --git a/frontend/src/pages/auth/EmailNotVerifiedPage/EmailNotVerifiedPage.tsx b/frontend/src/pages/auth/EmailNotVerifiedPage/EmailNotVerifiedPage.tsx index 92c485ed3..b163134eb 100644 --- a/frontend/src/pages/auth/EmailNotVerifiedPage/EmailNotVerifiedPage.tsx +++ b/frontend/src/pages/auth/EmailNotVerifiedPage/EmailNotVerifiedPage.tsx @@ -1,19 +1,33 @@ import { Helmet } from "react-helmet"; +import { Link } from "@tanstack/react-router"; export const EmailNotVerifiedPage = () => { return ( -
+
Request a New Invite -
-

Oops.

-

Your email was not verified.

-

Please try again.

-

- Note: If it still doesn't work, please reach out to us at support@infisical.com + +

+ Infisical Logo +
+ +
+

+ Your email was not verified +

+

+ Please try again.
Note: If it still doesn't work, please reach out to us at + support@infisical.com

+
+ + + Back to Login + + +
); diff --git a/frontend/src/pages/auth/PasswordResetPage/PasswordResetPage.tsx b/frontend/src/pages/auth/PasswordResetPage/PasswordResetPage.tsx index 8b6be6b9a..17c96e8a2 100644 --- a/frontend/src/pages/auth/PasswordResetPage/PasswordResetPage.tsx +++ b/frontend/src/pages/auth/PasswordResetPage/PasswordResetPage.tsx @@ -1,7 +1,7 @@ import { useState } from "react"; import { useForm } from "react-hook-form"; import { zodResolver } from "@hookform/resolvers/zod"; -import { useNavigate } from "@tanstack/react-router"; +import { Link, useNavigate } from "@tanstack/react-router"; import { z } from "zod"; import { UserEncryptionVersion } from "@app/hooks/api/auth/types"; @@ -36,7 +36,12 @@ export const PasswordResetPage = () => { const navigate = useNavigate(); return ( -
+
+ +
+ Infisical Logo +
+ {step === Steps.ConfirmEmail && ( { diff --git a/frontend/src/pages/auth/PasswordResetPage/components/ConfirmEmailStep.tsx b/frontend/src/pages/auth/PasswordResetPage/components/ConfirmEmailStep.tsx index 1f1a79490..bf7cfcdec 100644 --- a/frontend/src/pages/auth/PasswordResetPage/components/ConfirmEmailStep.tsx +++ b/frontend/src/pages/auth/PasswordResetPage/components/ConfirmEmailStep.tsx @@ -19,17 +19,21 @@ export const ConfirmEmailStep = ({ onComplete }: Props) => { isPending: isVerifyPasswordResetLoading } = useVerifyPasswordResetCode(); return ( -
-

+

+

Confirm your email +

+

+ Reset password for {email}.

- verify email -
+
diff --git a/frontend/src/pages/auth/PasswordResetPage/components/EnterPasswordStep.tsx b/frontend/src/pages/auth/PasswordResetPage/components/EnterPasswordStep.tsx index de7bcd3f3..4f021ec34 100644 --- a/frontend/src/pages/auth/PasswordResetPage/components/EnterPasswordStep.tsx +++ b/frontend/src/pages/auth/PasswordResetPage/components/EnterPasswordStep.tsx @@ -1,7 +1,7 @@ import crypto from "crypto"; import { Controller, useForm } from "react-hook-form"; -import { faCheck, faX } from "@fortawesome/free-solid-svg-icons"; +import { faCheck, faXmark } from "@fortawesome/free-solid-svg-icons"; import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"; import { zodResolver } from "@hookform/resolvers/zod"; import { useSearch } from "@tanstack/react-router"; @@ -169,17 +169,15 @@ export const EnterPasswordStep = ({ return (
-

+

Enter new password +

+

+ Make sure you save it somewhere safe.

-
-

- Make sure you save it somewhere safe. -

-
-
+
+
+ +
{passwordErrorTooShort || passwordErrorTooLong || passwordErrorNoLetterChar || @@ -210,33 +222,33 @@ export const EnterPasswordStep = ({ passwordErrorEscapeChar || passwordErrorLowEntropy || passwordErrorBreached ? ( -
-
Password should contain:
-
+
+
Password should contain:
+
{passwordErrorTooShort ? ( - + ) : ( - + )}
at least 14 characters
-
+
{passwordErrorTooLong ? ( - + ) : ( - + )}
at most 100 characters
-
+
{passwordErrorNoLetterChar ? ( - + ) : ( - + )}
-
+
{passwordErrorNoNumOrSpecialChar ? ( - + ) : ( - + )}
-
+
{passwordErrorRepeatedChar ? ( - + ) : ( - + )}
-
+
{passwordErrorEscapeChar ? ( - + ) : ( - + )}
-
+
{passwordErrorLowEntropy ? ( - + ) : ( - + )}
-
+
{passwordErrorBreached ? ( - + ) : ( - + )}
Password was found in a data breach.
- ) : ( -
- )} -
-
- -
-
+ ) : null} ); }; diff --git a/frontend/src/pages/auth/PasswordResetPage/components/InputBackupKeyStep.tsx b/frontend/src/pages/auth/PasswordResetPage/components/InputBackupKeyStep.tsx index 54a5d5e9d..8f84af3bd 100644 --- a/frontend/src/pages/auth/PasswordResetPage/components/InputBackupKeyStep.tsx +++ b/frontend/src/pages/auth/PasswordResetPage/components/InputBackupKeyStep.tsx @@ -43,18 +43,15 @@ export const InputBackupKeyStep = ({ verificationToken, onComplete }: Props) => return (
-

+

Enter your backup key +

+

+ You can find it in your emergency kit you downloaded during signup.

-
-

- You can find it in your emergency kit. You had to download the emergency kit during - signup. -

-
-
+
)} />
-
-
- -
+
+
); diff --git a/frontend/src/pages/auth/VerifyEmailPage/VerifyEmailPage.tsx b/frontend/src/pages/auth/VerifyEmailPage/VerifyEmailPage.tsx index 9777f564a..0f9da2991 100644 --- a/frontend/src/pages/auth/VerifyEmailPage/VerifyEmailPage.tsx +++ b/frontend/src/pages/auth/VerifyEmailPage/VerifyEmailPage.tsx @@ -2,8 +2,7 @@ import { FormEvent, useState } from "react"; import { Helmet } from "react-helmet"; import { Link } from "@tanstack/react-router"; -import InputField from "@app/components/basic/InputField"; -import { Button, EmailServiceSetupModal } from "@app/components/v2"; +import { Button, EmailServiceSetupModal, Input } from "@app/components/v2"; import { usePopUp } from "@app/hooks"; import { useSendPasswordResetEmail } from "@app/hooks/api"; import { useFetchServerStatus } from "@app/hooks/api/serverDetails"; @@ -44,9 +43,9 @@ export const VerifyEmailPage = () => { }; return ( -
+
- Login + Reset Password @@ -56,66 +55,80 @@ export const VerifyEmailPage = () => { /> -
+
long logo
{step === 1 && (
-

+

Forgot your password? +

+

+ Enter your email to start the password reset process.
You will receive an email + with instructions.

-
-

- Enter your email to start the password reset process. You will receive an email with - instructions. -

-
-
- + setEmail(e.target.value)} + type="email" + placeholder="Enter your email..." isRequired autoComplete="username" + className="h-10" />
-
-
- -
+
+ +
+
+ + + Back to Login + +
)} {step === 2 && ( -
-

- Look for an email in your inbox. +

+

+ Look for an email in your inbox +

+

+ If the email is in our system, you will receive an email at{" "} + {email} with instructions on how to reset your password.

-
-

- If the email is in our system, you will receive an email at{" "} - {email} with instructions on how to reset your - password. -

+
+ + + Back to Login + +
)} - handlePopUpToggle("setUpEmail", isOpen)}