Merge branch 'dev' of http://git.wdipl.com/Siddhesh.More/tanami-admin-panel into dev

src/Layout/DefaultLayout.jsx

@@ -74,6 +74,9 @@ import SplashScreen from "../Pages/SplashScreen";
 import CutomBreadcrumb from "../Components/CutomBreadcrumb";
 import CustomBreadcrumb from "../Components/CutomBreadcrumb";
 import { getCountdownTimer } from "../Constants/Constants";
+import { useLogoutMutation } from "../Services/token.serivce";
+
+
 
 const DashboardLayout = ({ isOnline }) => {
   const navigate = useNavigate();
@@ -129,12 +132,20 @@ const DashboardLayout = ({ isOnline }) => {
     setOpenDrawerClick(!openDrawerClick);
   };
 
-  const logOutHandler = () => {
+  const [ logout ] = useLogoutMutation()
+
+
+  const logOutHandler = async () => {
     // dispach(loginUser(false));
     setIsAuthenticate(false);
     Cookies.remove("isAuthenticated");
-    localStorage.clear();
-    navigate("/login");
+    try {
+      await logout()
+      localStorage.clear();
+      navigate("/login");
+    } catch (error) {
+      
+    }
   };
 
   // // Function to get the title based on the route

src/Pages/Login.jsx

@@ -52,8 +52,9 @@ const Login = () => {
   const [login] = useLoginMutation()
 
   useEffect(() => {
+    
     if (isAuthenticate) {
-      navigate("/sponser");
+      navigate("/");
     }
   }, [navigate, isAuthenticate]);
 

src/Routes/Nav.js

@@ -103,30 +103,11 @@ export const nav = [
     title: "INVESTORS REQUEST",
     type: "title",
   },
-
-  localStorage.getItem("role") === "Maker"
-    ? {
+{
         title: "Fawateer Deposit",
         submenu: [
           {
-            title: "Create Request",
-            path: "/fawateer",
-            icon: RiMoneyDollarBoxLine,
-          },
-          {
-            title: "View History",
-            path: "/fawateer-history",
-            icon: RiExchangeBoxLine,
-          },
-        ],
-        type: "accordion",
-        Icon: HiOutlineBanknotes,
-      }
-    : {
-        title: "Fawateer Deposit",
-        submenu: [
-          {
-            title: "Pending Request",
+            title: localStorage.getItem("role") === "Maker"? "Create Request":"Aprover Request",
             path: "/fawateer",
             icon: RiMoneyDollarBoxLine,
           },

src/Routes/Routes.js

@@ -40,8 +40,7 @@ import UnbanInvestor from "../Pages/Admin/Investor/UnbanInvestor/UnbanInvestor";
 import FawateerRequest from "../Pages/Fawateer/FawateerRequest";
 import CreateRequest from "../Pages/Fawateer/CreateRequest";
 import ApproveRequest from "../Pages/FawateerChecker/ApproveRequest/ApproveRequest";
-import ApproveHistory from "../Pages/FawateerChecker/ApproveHistory/ApproveHistoryChecker";
-import ApproveHistoryMaker from "../Pages/FawateerChecker/ApproveHistory/ApproveHistoryMaker";
+import ApproveHistory from "../Pages/FawateerChecker/ApproveHistory/ApproveHistory";
 
 export const RouteLink = [
   // =============[ Tanami ]================
@@ -121,7 +120,7 @@ export const RouteLink = [
 
   // ===============[ fawateer ]===============
   { path: "/fawateer", Component: localStorage.getItem("role") === "Maker"? CreateRequest:ApproveRequest },
-  { path: "/fawateer-history", Component: localStorage.getItem("role") === "Maker"?ApproveHistoryMaker: ApproveHistory },
+  { path: "/fawateer-history", Component: localStorage.getItem("role") === "Maker"?ApproveRequest: ApproveHistory },
 
 
   // { path: "/fawateer-approver", Component: ApproveRequest },

src/Services/token.serivce.js

@@ -113,7 +113,18 @@ export const apiSlice = createApi({
         body: { refreshToken },
       }),
     }),
+
+
+    logout: builder.mutation({
+      query: () => ({
+        url: "/auth/admin/logout",
+        method: "POST",
+      }),
+    }),
+
+
+
   }),
 });
 
-export const { useLoginMutation, useRefreshTokenMutation } = apiSlice;
+export const { useLoginMutation, useRefreshTokenMutation, useLogoutMutation } = apiSlice;