diff --git a/public/images/calendar.svg b/public/images/calendar.svg deleted file mode 100644 index cd5fcde..0000000 --- a/public/images/calendar.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/public/images/pombo-background.svg b/public/images/pombo-background.svg new file mode 100644 index 0000000..b0e603e --- /dev/null +++ b/public/images/pombo-background.svg @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/public/images/pombo-stripe.svg b/public/images/pombo-stripe.svg new file mode 100644 index 0000000..d252d07 --- /dev/null +++ b/public/images/pombo-stripe.svg @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/app/auth/forgot_password/[token]/page.tsx b/src/app/auth/forgot_password/[token]/page.tsx index c857372..d618767 100644 --- a/src/app/auth/forgot_password/[token]/page.tsx +++ b/src/app/auth/forgot_password/[token]/page.tsx @@ -47,98 +47,130 @@ export default function ResetPassword() { }); return ( -
-
- Pombo Logo -
+ <> + Pombo | Reset Password +
+
+
+ Pombo Logo +
+
-
-
-

Reset password

- Enter the new password below +
+ Pombo Logo
- {resetPassword.isSuccess ? ( - <> -
- - check_circle - -

- The password was successfully changed! -

-
- - Go back to sign in - - - ) : ( -
-
-
- - - - {errors.password?.message} + +
+ +
+ {resetPassword.isSuccess ? ( + <> +
+ + check_circle
-
- - - - {errors.password_confirmation?.message} +
+

{`It's done`}

+
+
+

+ The password was successfully changed! +

+
+ + Go back to sign in + + + ) : ( + <> +
+
+ + key + +
+

+ Reset password +

+ + Enter the new password below
-
-
- - {resetPassword.isError && - "Something went wrong, please try again."} - - -
- - )} +
+
+ + + + {errors.password?.message} + +
+
+ + + + {errors.password_confirmation?.message} + +
+
+
+ + {resetPassword.isError && + "Something went wrong, please try again."} + + +
+ + + )} +
-
+ ); } diff --git a/src/app/auth/forgot_password/page.tsx b/src/app/auth/forgot_password/page.tsx index f43edcb..a948967 100644 --- a/src/app/auth/forgot_password/page.tsx +++ b/src/app/auth/forgot_password/page.tsx @@ -30,77 +30,124 @@ export default function ResetPassword() { forgotPassword.mutate(data); return ( -
-
- Pombo Logo -
-
-
-

Forgot password

-
- - Did you forget your password? - - - Try entering your email here to reset your password - + <> + Pombo | Forgot Password +
+
+
+ Pombo Logo
- {forgotPassword.isSuccess ? ( - <> -
- - check_circle - -

- If your account exists, an email was sent to your inbox with the - link to reset your password. -

-
- - Go back to sign in - - - ) : ( -
-
- - - {errors.email?.message} -
-
- - {forgotPassword.isError && - "Something went wrong, please try again."} - -
+ +
+ +
+ {forgotPassword.isSuccess ? ( + <> +
+ + check_circle + +
+
+

+ Check your email +

+
+
+

+ If your account exists, an email was sent to your inbox with + the link to reset your password. +

+
+ + Go back to sign in + + + ) : ( + <> +
+ + arrow_back + Back + +
+ + key + +
+
+
+

+ Forgot password +

+
+ + Did you forget your password? + + + Try entering your email here to reset your password + +
+
+ - {forgotPassword.isPending ? "Loading..." : "Submit"} - -
-
- )} +
+ + + + {errors.email?.message} + +
+
+ + {forgotPassword.isError && + "Something went wrong, please try again."} + + +
+ + + )} +
-
+ ); } diff --git a/src/app/auth/sign_in/page.tsx b/src/app/auth/sign_in/page.tsx index 116f9c3..06c0048 100644 --- a/src/app/auth/sign_in/page.tsx +++ b/src/app/auth/sign_in/page.tsx @@ -37,82 +37,104 @@ export default function SignIn() { }; return ( -
-
- Pombo Logo -
-
-
-

- Welcome! Sign in to Pombo -

- - Acess your account to view all the info you need - + <> + Pombo | Sign In +
+
+
+ Pombo Logo +
+
+ +
+ Pombo Logo
-
-
-
- - - {errors.email?.message} + +
+ +
+
+

+ Welcome! Sign in to Pombo +

+ + Access your account to view all the info you need + +
+ +
+
+ + + + {errors.email?.message} + +
+
+ + + + + {errors.password?.message} + +
-
- - - - - {errors.password?.message} - + Click here +
-
-
- Did you forget your password? - - Click here - -
-
- {signIn.error && ( - - {signIn.error.message} - - )} - -
- +
+ {signIn.error && ( + + {signIn.error.message} + + )} + +
+ +
-
+ ); } diff --git a/src/components/auth-check.tsx b/src/components/auth-check.tsx index f91396a..5ea3eea 100644 --- a/src/components/auth-check.tsx +++ b/src/components/auth-check.tsx @@ -19,7 +19,7 @@ export const AuthCheck = ({ const token = useAuthStore((state) => state.token); const [isMounted, setIsMounted] = useState(false); const loadingState = ( -
+
); useEffect(() => {