Merge pull request 'dev' (#27) from dev into main

Reviewed-on: #27

README.md

@@ -67,9 +67,25 @@ The project is **live and operational**, catering specifically to the investment
 	```bash
 	npm install pm2 -g
 	```
-2. Start the production server:  
+
+2. Build the application (if applicable):  
 	```bash
-	npm start
+	npm run build
+	```
+
+3. Serve the application using PM2:
+	```bash
+	pm2 serve ./dist <port_number> --spa --name=<application_name>
+	```
+	Replace:
+	- `./dist` with your build directory.
+	- `<port_number>` with the desired port (e.g., `3000`).
+	- `<application_name>` with the name of your application.
+
+4. Save the PM2 process list and enable startup on system reboot:
+	```bash
+	pm2 save
+	pm2 startup
 	```
 
 ---
@@ -84,17 +100,14 @@ Create a `.env` file in the root directory based on the structure of [`.env.exam
 
 | Script             | Description                                                 |
 |---------------------|-------------------------------------------------------------|
-| `npm start`         | Starts the app in production mode using PM2.                |
-| `npm run dev`       | Starts the app in development mode with `nodemon`.          |
-| `npm run test`      | Starts the app in test mode with `nodemon`.                 |
+| `npm run dev`       | Starts the app in development mode with `Vite` server.      |
+| `npm run build`     | Builds the app for production.                              |
 | `npm run lint`      | Runs ESLint to check for code quality issues.               |
-| `npm run lint:fix`  | Fixes fixable issues detected by ESLint.                    |
-| `npm run prettier`  | Checks code formatting using Prettier.                      |
-| `npm run prettier:fix` | Formats code files according to Prettier rules.          |
-| `npm run prepare`   | Prepares Husky for managing Git hooks.                      |
+| `npm run preview`   | Previews the production build locally.                      |
 
 ---
 
 ## **License**
 
-This project is licensed under the [MIT License](LICENSE).
+This project is licensed under the [MIT License](LICENSE).
+

src/Pages/ChangePassword.jsx

@@ -16,14 +16,13 @@ import {
   Stack,
   useToast,
 } from "@chakra-ui/react";
-import * as yup from "yup";
-import React, { useState, useContext } from "react";
-import { useForm } from "react-hook-form";
 import { yupResolver } from "@hookform/resolvers/yup";
+import React, { useState } from "react";
+import { useForm } from "react-hook-form";
+import * as yup from "yup";
 import CustomAlertDialog from "../Components/CustomAlertDialog";
 import ToastBox from "../Components/ToastBox";
 import { useUpdatePasswordMutation } from "../Services/change.password.service";
-import { all } from "axios";
 
 // Validation schema
 const passwordSchema = yup.object().shape({
@@ -53,12 +52,18 @@ const ChangePassword = ({
   actionId,
   setActionId,
 }) => {
+  const initialValue = {
+    oldPassword: "",
+    newPassword: "",
+    confirmNewPassword: "",
+  };
   const [isLoading, setIsLoading] = useState(false);
   const [alert, setAlert] = useState(false);
   const [showCurrentPassword, setShowCurrentPassword] = useState(false);
   const [showNewPassword, setShowNewPassword] = useState(false);
   const [showConfirmPassword, setShowConfirmPassword] = useState(false);
   const toast = useToast();
+  const [input, setInput] = useState(initialValue);
 
   const [updatePassword] = useUpdatePasswordMutation();
 
@@ -74,10 +79,10 @@ const ChangePassword = ({
   });
 
   // Form submit handler
-  const onSubmit = async (data) => {
+  const onSubmit = async () => {
     setIsLoading(true);
     try {
-      const res = await updatePassword(data); // Assuming API request works as expected
+      const res = await updatePassword(input); // Assuming API request works as expected
       if (res?.data?.statusCode === 200) {
         toast({
           render: () => <ToastBox message={res?.data?.message} />,
@@ -98,6 +103,11 @@ const ChangePassword = ({
     }
   };
 
+  const handleSubmitFrom = (data) => {
+    setAlert(true);
+    setInput(data);
+  };
+
   // Handle modal close
   const handleClose = () => {
     setAlert(false);
@@ -107,7 +117,7 @@ const ChangePassword = ({
 
   return (
     <>
-      <Modal isOpen={isOpen} onClose={onClose} initialFocusRef={firstField}>
+      <Modal isOpen={isOpen} onClose={handleClose} initialFocusRef={firstField}>
         <ModalOverlay />
         <ModalContent>
           <ModalHeader fontSize="md">Change Password</ModalHeader>
@@ -211,7 +221,8 @@ const ChangePassword = ({
               rounded={"sm"}
               colorScheme="forestGreen"
               size="sm"
-              onClick={() => setAlert(true)}
+              // onClick={() => setAlert(true)}
+              onClick={handleSubmit(handleSubmitFrom)}
               isLoading={isLoading}
             >
               Save
@@ -223,7 +234,7 @@ const ChangePassword = ({
       <CustomAlertDialog
         isOpen={alert}
         onClose={() => setAlert(false)}
-        alertHandler={handleSubmit(onSubmit)}
+        alertHandler={onSubmit}
         message={"Are you sure you want to change the password?"}
         isLoading={isLoading}
       />