From 7ece57fa408265cce89d26d6feb889a64f6f13b5 Mon Sep 17 00:00:00 2001 From: Daniel Cojocea Date: Tue, 16 Jul 2024 17:24:48 -0400 Subject: [PATCH] Removed redundant code and files --- Client/src/Features/Auth/authSlice.js | 7 +-- Client/src/Validation/validation.js | 76 +------------------------- Client/src/assets/Images/Logomark.png | Bin 5495 -> 0 bytes 3 files changed, 2 insertions(+), 81 deletions(-) delete mode 100644 Client/src/assets/Images/Logomark.png 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 9fe13ec9301da7604257a103e41664bec17d2a94..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5495 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