diff --git a/Client/src/Features/Auth/authSlice.js b/Client/src/Features/Auth/authSlice.js index 7f2c316fe..942e1b0e4 100644 --- a/Client/src/Features/Auth/authSlice.js +++ b/Client/src/Features/Auth/authSlice.js @@ -182,11 +182,6 @@ const handleForgotRejected = (state, action) => { ? action.payload.msg : "Failed to send reset instructions."; }; -const handleNewPasswordFulfilled = (state, action) => { - state.isLoading = false; - state.success = action.payload.success; - state.msg = action.payload.msg; -}; const handleNewPasswordRejected = (state, action) => { state.isLoading = false; state.success = false; @@ -253,7 +248,7 @@ const authSlice = createSlice({ .addCase(setNewPassword.pending, (state) => { state.isLoading = true; }) - .addCase(setNewPassword.fulfilled, handleNewPasswordFulfilled) + .addCase(setNewPassword.fulfilled, handleAuthFulfilled) .addCase(setNewPassword.rejected, handleNewPasswordRejected); }, }); diff --git a/Client/src/Validation/validation.js b/Client/src/Validation/validation.js index 98651b643..26dd3d94a 100644 --- a/Client/src/Validation/validation.js +++ b/Client/src/Validation/validation.js @@ -73,72 +73,6 @@ const credentials = joi.object({ }), }); -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", - }), - role: joi.string().required().messages({ - "string.empty": "Role is required", - }), -}); - -const loginValidation = joi.object({ - 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", - }), -}); - -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", - }), -}); - const createMonitorValidation = joi.object({ url: joi .string() @@ -172,12 +106,4 @@ const imageValidation = joi.object({ }), }); -export { - credentials, - imageValidation, - createMonitorValidation, - registerValidation, - loginValidation, - recoveryValidation, - newPasswordValidation, -}; +export { credentials, imageValidation, createMonitorValidation }; diff --git a/Client/src/assets/Images/Logomark.png b/Client/src/assets/Images/Logomark.png deleted file mode 100644 index 9fe13ec93..000000000 Binary files a/Client/src/assets/Images/Logomark.png and /dev/null differ