Merge pull request '[fixed] - token service' (#28) from dev into main

Reviewed-on: #28

README.md

@@ -1,10 +1,113 @@
-# React + Vite
+# **Tanami Capital**
 
-This template provides a minimal setup to get React working in Vite with HMR and some ESLint rules.
+**Tanami** is a cutting-edge fintech platform designed to streamline investment opportunities for users in the Gulf region. It features two main components:
 
-Currently, two official plugins are available:
+- **Admin Panel:** A web-based dashboard for managing users, monitoring transactions, and overseeing investments efficiently.  
+- **Mobile Application:** A user-friendly app that empowers individuals to invest in diverse asset classes, including real estate, private equity, and other financial instruments located in Gulf countries.  
+
+---
+
+## **Key Features**
+- **Regional Focus:** Exclusively operational in Gulf countries, offering investment opportunities tailored to the region.  
+- **Diverse Investment Options:** Enables users to invest in financial instruments like real estate and private equity with ease and transparency.  
+- **Comprehensive Admin Tools:** The admin panel offers robust tools for tracking and managing platform activity.
+
+---
+
+## **Current Status**
+The project is **live and operational**, catering specifically to the investment needs of users in the Gulf region.
+
+---
+
+## **Table of Contents**
+- [Installation](#installation)
+- [Usage](#usage)
+- [Environment Variables](#environment-variables)
+- [Scripts](#scripts)
+- [License](#license)
+
+---
+
+## **Installation**
+
+### **Prerequisites**
+- [Node.js](https://nodejs.org/) (version 14 or higher recommended)  
+- [npm](https://www.npmjs.com/) (bundled with Node.js)  
+
+### **Steps**
+1. Clone the repository:  
+	```bash
+	git clone http://git.wdipl.com/Siddhesh.More/tanami-admin-panel.git
+	```
+2. Navigate to the project directory:  
+	```bash
+	cd tanami-admin-panel
+	```
+3. Install dependencies:  
+	```bash
+	npm install
+	```
+
+---
+
+## **Usage**
+
+### **Development Mode**
+1. Start the development server:  
+	```bash
+	npm run dev
+	```
+2. Open your browser and navigate to:  
+	```
+	http://localhost:5173/
+	```
+
+### **Production Mode**
+1. Install [PM2](https://pm2.keymetrics.io/) globally for process management:  
+	```bash
+	npm install pm2 -g
+	```
+
+2. Build the application (if applicable):  
+	```bash
+	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
+	```
+
+---
+
+## **Environment Variables**
+
+Create a `.env` file in the root directory based on the structure of [`.env.example`](.env.example). 
+
+---
+
+## **Scripts**
+
+| Script             | Description                                                 |
+|---------------------|-------------------------------------------------------------|
+| `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 preview`   | Previews the production build locally.                      |
+
+---
+
+## **License**
+
+This project is licensed under the [MIT License](LICENSE).
 
-- [@vitejs/plugin-react](https://github.com/vitejs/vite-plugin-react/blob/main/packages/plugin-react/README.md) uses [Babel](https://babeljs.io/) for Fast Refresh
-- [@vitejs/plugin-react-swc](https://github.com/vitejs/vite-plugin-react-swc) uses [SWC](https://swc.rs/) for Fast Refresh
-# rubix-admin-panel
-# tanami-admin-panel

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}
       />

src/Services/token.serivce.js

@@ -7,7 +7,7 @@ export const baseQuery = async (args, api, extraOptions) => {
 		baseUrl: import.meta.env.VITE_BAS_URL,
 		credentials: 'include',
 		prepareHeaders: (headers) => {
-			headers.set('Content-Type', 'application/json');
+			// headers.set('Content-Type', 'application/json');
 			return headers;
 		},
 	});