Merge remote-tracking branch 'upstream/master' into feat/notifications

This commit is contained in:
M M committed 2024-06-12 12:09:04 -07:00
commit 134fe39bd4
8 files changed
+217 -26

No files matched your search

+57 -1
View File
@@ -5,8 +5,60 @@ import Logomark from "../../assets/Images/key-password.png";
import EmailTextField from "../../Components/TextFields/Email/EmailTextField";
import Button from "../../Components/Button";
import LeftArrow from "../../assets/Images/arrow-left.png";
import { useState, useEffect } from "react";
import { recoveryValidation } from "../../Validation/validation";
import axios from "axios";
import { useNavigate } from "react-router-dom";
const BASE_URL = import.meta.env.VITE_APP_API_BASE_URL;
const ForgotPassword = () => {
const navigate = useNavigate();
const [isLoading, setIsLoading] = useState(false); // Used to disable the button while loading so user doesn't submit multiple times
const [errors, setErrors] = useState({});
const [form, setForm] = useState({
email: "",
});
const idMap = {
"forgot-password-email-input": "email",
};
useEffect(() => {
const { error } = recoveryValidation.validate(form);
if (error === undefined) {
setErrors({});
} else {
const validationErrors = error.details.reduce((acc, err) => {
return { ...acc, [err.path[0]]: err.message };
}, {});
setErrors(validationErrors);
}
}, [form]);
const handleInput = (e) => {
const fieldName = idMap[e.target.id];
setForm({ ...form, [fieldName]: e.target.value });
};
const handleSubmit = async () => {
//TODO show loading spinner
setIsLoading(true);
try {
const { error } = recoveryValidation.validate(form);
if (error !== undefined) {
throw error;
}
await axios.post(`${BASE_URL}/auth/recovery/request`, form);
navigate("/check-email");
} catch (error) {
//TODO display error (Toast?)
alert(error);
} finally {
setIsLoading(false);
}
};
return (
<div className="forgot-password-page">
<BackgroundPattern></BackgroundPattern>
@@ -27,12 +79,16 @@ const ForgotPassword = () => {
<div className="forgot-password-v-gap-large"></div>
<div className="forgot-password-body">
<EmailTextField
error={false}
onChange={handleInput}
error={errors.email !== undefined ? true : false}
helperText={errors.email !== undefined ? errors.email : ""}
placeholder="Enter your email"
id="forgot-password-email-input"
/>
<div className="forgot-password-v-gap-medium"></div>
<Button
disabled={errors.email !== undefined || isLoading === true}
onClick={handleSubmit}
level="primary"
label="Reset password"
sx={{
-1
View File
@@ -1,7 +1,6 @@
import { useState, useEffect } from "react";
import { useNavigate } from "react-router-dom";
import axios from "axios";
import "./index.css";
import BackgroundPattern from "../../Components/BackgroundPattern/BackgroundPattern";
import Logomark from "../../assets/Images/Logomark.png";
+66 -5
View File
@@ -1,14 +1,69 @@
import BackgroundPattern from "../../Components/BackgroundPattern/BackgroundPattern";
import "./index.css";
import React from "react";
import LockIcon from "../../assets/Images/lock-icon.png";
import PasswordTextField from "../../Components/TextFields/Password/PasswordTextField";
import Check from "../../Components/Check/Check";
import Button from "../../Components/Button";
import LeftArrow from "../../assets/Images/arrow-left.png";
import { useParams } from "react-router-dom";
import { useState, useEffect } from "react";
import { newPasswordValidation } from "../../Validation/validation";
import axios from "axios";
const BASE_URL = import.meta.env.VITE_APP_API_BASE_URL;
import { useNavigate } from "react-router-dom";
const SetNewPassword = () => {
const navigate = useNavigate();
const [errors, setErrors] = useState({});
const [form, setForm] = useState({});
const [isLoading, setIsLoading] = useState(false);
const idMap = {
"register-password-input": "password",
"confirm-password-input": "confirm",
};
const handleInput = (e) => {
const fieldName = idMap[e.target.id];
setForm({ ...form, [fieldName]: e.target.value });
console.log(errors);
};
const handleSubmit = async () => {
// TODO show loading spinner
setIsLoading(true);
try {
await axios.post(`${BASE_URL}/auth/recovery/validate`, {
recoveryToken: token,
});
await axios.post(`${BASE_URL}/auth/recovery/reset`, {
...form,
recoveryToken: token,
});
navigate("/new-password-confirmed");
} catch (error) {
// TODO display error (Toast?)
alert(error.response.data.msg);
} finally {
setIsLoading(false);
}
};
useEffect(() => {
const { error } = newPasswordValidation.validate(form, {
abortEarly: false,
});
if (error) {
const validationErrors = error.details.reduce((acc, err) => {
return { ...acc, [err.path[0]]: err.message };
}, {});
setErrors(validationErrors);
} else {
setErrors({});
}
}, [form]);
const { token } = useParams();
return (
<div className="set-new-password-page">
@@ -31,16 +86,20 @@ const SetNewPassword = () => {
<div className="set-new-password-form-content">
<PasswordTextField
label="Password"
error={false}
onChange={handleInput}
error={errors.password !== undefined ? true : false}
helperText={errors.password !== undefined ? errors.password : ""}
placeholder="••••••••"
id="register-password-input"
/>
<div className="set-new-password-form-gap-medium"></div>
<PasswordTextField
label="Confirm password"
error={false}
onChange={handleInput}
error={errors.confirm !== undefined ? true : false}
helperText={errors.confirm !== undefined ? errors.confirm : ""}
placeholder="••••••••"
id="register-password-input"
id="confirm-password-input"
/>
<div className="set-new-password-form-gap-medium"></div>
<div className="set-new-password-form-checks">
@@ -50,8 +109,10 @@ const SetNewPassword = () => {
</div>
<div className="set-new-password-form-gap-medium"></div>
<Button
disabled={Object.keys(errors).length !== 0 || isLoading === true}
onClick={handleSubmit}
level="primary"
label="Reset passwprd"
label="Reset password"
sx={{
width: "100%",
fontSize: "13px",
+29 -1
View File
@@ -40,4 +40,32 @@ const loginValidation = joi.object({
}),
});
export { registerValidation, loginValidation };
const recoveryValidation = joi.object({
email: joi
.string()
.email({ tlds: { allow: false } })
.required()
.messages({
"string.email": "Email must be a valid email",
"string.empty": "Email is required",
}),
});
const newPasswordValidation = joi.object({
password: joi.string().min(8).required().messages({
"string.min": "Password must be at least 8 characters",
"string.empty": "Password is required",
}),
confirm: joi.string().valid(joi.ref("password")).min(8).required().messages({
"string.min": "Password must be at least 8 characters",
"string.empty": "Password is required",
"any.only": "Passwords do not match",
}),
});
export {
registerValidation,
loginValidation,
recoveryValidation,
newPasswordValidation,
};