Added client side validation to registration page

This commit is contained in:
Alex Holliday committed 2024-06-07 11:19:32 -07:00
1 parent 9a07f30816
commit 7f93c8aee0
5 files changed
+673 -148

No files matched your search

+536 -73
View File
File diff suppressed because it is too large. Load diff
+1
View File
@@ -21,6 +21,7 @@
"@reduxjs/toolkit": "2.2.5", "@reduxjs/toolkit": "2.2.5",
"axios": "1.7.2", "axios": "1.7.2",
"dayjs": "1.11.11", "dayjs": "1.11.11",
"joi": "17.13.1",
"jwt-decode": "^4.0.0", "jwt-decode": "^4.0.0",
"react": "^18.2.0", "react": "^18.2.0",
"react-dom": "^18.2.0", "react-dom": "^18.2.0",
+108 -75
View File
@@ -1,4 +1,4 @@
import React, { useState } from "react"; import { useState, useEffect } from "react";
import { useNavigate } from "react-router-dom"; import { useNavigate } from "react-router-dom";
import axios from "axios"; import axios from "axios";
@@ -11,12 +11,14 @@ import StringTextField from "../../Components/TextFields/Text/TextField";
import Check from "../../Components/Check/Check"; import Check from "../../Components/Check/Check";
import Button from "../../Components/Button"; import Button from "../../Components/Button";
import Google from "../../assets/Images/Google.png"; import Google from "../../assets/Images/Google.png";
import { registerValidation } from "../../Validation/validation";
const BASE_URL = import.meta.env.VITE_APP_API_BASE_URL; const BASE_URL = import.meta.env.VITE_APP_API_BASE_URL;
const Register = () => { const Register = () => {
const navigate = useNavigate(); const navigate = useNavigate();
// TODO If possible, change the IDs of these fields to match the backend
const idMap = { const idMap = {
"register-firstname-input": "firstname", "register-firstname-input": "firstname",
"register-lastname-input": "lastname", "register-lastname-input": "lastname",
@@ -24,6 +26,8 @@ const Register = () => {
"register-password-input": "password", "register-password-input": "password",
}; };
const [errors, setErrors] = useState({});
const [form, setForm] = useState({ const [form, setForm] = useState({
firstname: "", firstname: "",
lastname: "", lastname: "",
@@ -31,99 +35,128 @@ const Register = () => {
password: "", password: "",
}); });
const handleInput = (e) => { useEffect(() => {
setForm({ const { error } = registerValidation.validate(form, {
...form, abortEarly: false,
[idMap[e.target.id]]: e.target.value,
}); });
if (error) {
// Creates an error object in the format { field: message }
const validationErrors = error.details.reduce((acc, err) => {
return { ...acc, [err.path[0]]: err.message };
}, {});
setErrors(validationErrors);
}
}, []);
const handleInput = (e) => {
const newForm = { ...form, [idMap[e.target.id]]: e.target.value };
setForm(newForm);
}; };
const handleSubmit = async () => { const handleSubmit = async () => {
//TODO input validation console.log("submitting");
try { try {
await registerValidation.validateAsync(form, { abortEarly: false });
const result = await axios.post(`${BASE_URL}/auth/register`, form); const result = await axios.post(`${BASE_URL}/auth/register`, form);
const token = result.data.data; const token = result.data.data;
localStorage.setItem("token", token); localStorage.setItem("token", token);
navigate("/"); // Redirect to home page navigate("/"); // Redirect to home page
} catch (error) { } catch (error) {
// TODO error handlign // TODO User friendly error display
alert(`Something went wrong: ${error.response.data.msg}`); if (error.name === "ValidationError") {
console.log(error);
alert("Invalid input");
} else if (error.response) {
console.log(error);
alert(error.response.data.msg);
} else {
console.log(error);
alert("Unknown error");
}
} }
}; };
return ( return (
<div className="register-page"> <div className="register-page">
<BackgroundPattern></BackgroundPattern> <BackgroundPattern></BackgroundPattern>
<div className="register-form"> <form>
<div className="register-form-header"> <div className="register-form">
<img <div className="register-form-header">
className="register-form-header-logo" <img
src={Logomark} className="register-form-header-logo"
alt="Logomark" src={Logomark}
/> alt="Logomark"
<div className="register-form-v-spacing-large" /> />
<div className="register-form-heading">Create an account</div> <div className="register-form-v-spacing-large" />
<div className="register-form-v-spacing-large"></div> <div className="register-form-heading">Create an account</div>
</div> <div className="register-form-v-spacing-large"></div>
<div className="register-form-v-spacing-40px" /> </div>
<div className="register-form-inputs"> <div className="register-form-v-spacing-40px" />
<StringTextField <div className="register-form-inputs">
onChange={handleInput} <StringTextField
error={false} onChange={handleInput}
label="First name*" error={errors.firstname ? true : false}
placeholder="Enter your first name" helperText={errors.firstname ? errors.firstname : ""}
id="register-firstname-input" label="First name*"
/> placeholder="Enter your first name"
id="register-firstname-input"
/>
<div className="login-form-v2-spacing" />
<StringTextField
onChange={handleInput}
error={errors.lastname ? true : false}
helperText={errors.lastname ? errors.lastname : ""}
label="Last name*"
placeholder="Enter your last name"
id="register-lastname-input"
/>
<div className="login-form-v2-spacing" />
<EmailTextField
onChange={handleInput}
label="Email*"
error={errors.email ? true : false}
helperText={errors.email ? errors.email : ""}
placeholder="Enter your email"
id="register-email-input"
/>
<div className="login-form-v2-spacing" />
<PasswordTextField
onChange={handleInput}
label="Password*"
error={errors.password ? true : false}
helperText={errors.password ? errors.password : ""}
placeholder="Create a password"
id="register-password-input"
/>
</div>
<div className="login-form-v2-spacing" /> <div className="login-form-v2-spacing" />
<StringTextField <div className="register-form-checks">
onChange={handleInput} <Check text="Must be at least 8 characters" />
error={false} <div className="register-form-v-spacing-small"></div>
label="Last name*" <Check text="Must contain one special character" />
placeholder="Enter your last name" </div>
id="register-lastname-input"
/>
<div className="login-form-v2-spacing" /> <div className="login-form-v2-spacing" />
<EmailTextField <div className="register-form-actions">
onChange={handleInput} <Button
label="Email*" onClick={handleSubmit}
error={false} level="primary"
placeholder="Enter your email" label="Get started"
id="register-email-input" sx={{ width: "100%" }}
/> />
<div className="login-form-v2-spacing" /> <div className="login-form-v-spacing" />
<PasswordTextField <Button
onChange={handleInput} disabled={true}
label="Password*" level="secondary"
error={false} label="Sign up with Google"
placeholder="Create a password" sx={{ width: "100%", color: "#344054", fontWeight: "700" }}
id="register-password-input" img={<img className="google-enter" src={Google} alt="Google" />}
/> />
</div>
</div> </div>
<div className="login-form-v2-spacing" /> <div className="register-bottom-spacing"></div>
<div className="register-form-checks"> </form>
<Check text="Must be at least 8 characters" />
<div className="register-form-v-spacing-small"></div>
<Check text="Must contain one special character" />
</div>
<div className="login-form-v2-spacing" />
<div className="register-form-actions">
<Button
onClick={handleSubmit}
level="primary"
label="Get started"
sx={{ width: "100%" }}
/>
<div className="login-form-v-spacing" />
<Button
disabled={true}
level="secondary"
label="Sign up with Google"
sx={{ width: "100%", color: "#344054", fontWeight: "700" }}
img={<img className="google-enter" src={Google} alt="Google" />}
/>
</div>
</div>
<div className="register-bottom-spacing"></div>
</div> </div>
); );
}; };
+27
View File
@@ -0,0 +1,27 @@
import joi from "joi";
const registerValidation = joi.object({
firstname: joi.string().required().messages({
"string.empty": "First name is required",
}),
lastname: joi.string().required().messages({
"string.empty": "Last name is required",
}),
email: joi
.string()
.email({ tlds: { allow: false } })
.required()
.messages({
"string.email": "Email must be a valid email",
"string.empty": "Email is required",
}),
password: joi.string().min(8).required().messages({
"string.min": "Password must be at least 8 characters",
"string.empty": "Password is required",
}),
});
export { registerValidation };
+1
View File
@@ -8,6 +8,7 @@ const loginValidation = joi.object({
email: joi.string().email().required(), email: joi.string().email().required(),
password: joi.string().min(8).required(), password: joi.string().min(8).required(),
}); });
const registerValidation = joi.object({ const registerValidation = joi.object({
firstname: joi.string().required(), firstname: joi.string().required(),
lastname: joi.string().required(), lastname: joi.string().required(),