diff --git a/.env b/.env
index b24b765..78f19ee 100644
--- a/.env
+++ b/.env
@@ -1,5 +1,5 @@
 VITE_API_URL='https://ssa.betadelivery.com/apia/v1'
 # VITE_API_URL='http://192.16.50.44/seo-backend/apia/v1'
 VITE_USER_NAME="Admin"
-VITE_PASSWORD="71%@L%es^bUX94`J9XT*%4&^%tUU^%Q^ffgt"
+VITE_PASSWORD="71%@L%es^bUX94`J9XT*@bh,._WWM{$%^^&&"
 VITE_APP_NAME=MyViteApp
\ No newline at end of file
diff --git a/dev-dist/sw.js b/dev-dist/sw.js
index acea9fc..a44d858 100644
--- a/dev-dist/sw.js
+++ b/dev-dist/sw.js
@@ -82,7 +82,7 @@ define(['./workbox-54d0af47'], (function (workbox) { 'use strict';
     "revision": "3ca0b8505b4bec776b69afdba2768812"
   }, {
     "url": "index.html",
-    "revision": "0.i87c5gdh6n"
+    "revision": "0.g82l9bbo3ro"
   }], {});
   workbox.cleanupOutdatedCaches();
   workbox.registerRoute(new workbox.NavigationRoute(workbox.createHandlerBoundToURL("index.html"), {
diff --git a/src/App.tsx b/src/App.tsx
index 2b7873a..5109343 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -1,24 +1,44 @@
-import { Route, BrowserRouter as Router, Routes } from "react-router-dom";
-import DefaultLayout from './Layouts/DefaultLayout';
-import Login from './Pages/Login';
-import { RouteLink } from './Routes/Routes';
+import { useEffect, useState } from "react";
+import { Route, BrowserRouter as Router, Routes, Navigate } from "react-router-dom";
+import DefaultLayout from "./Layouts/DefaultLayout";
+import Login from "./Pages/Login";
+import { RouteLink } from "./Routes/Routes";
 import Cookies from "js-cookie";
 
-function App() { 
-  // const context = useContext(GlobalStateContext); 
-  // if (!context) throw new Error('App must be used within a GlobalStateProvider'); 
-  // const { isAuthenticate } = context; 
-  const token = Cookies.get("token") 
+function App() {
+  const [token, setToken] = useState<string | null>(null);
 
-  return ( 
-    <Router> 
-      <Routes> 
-        <Route path="/login" element={<Login />} /> 
-        <Route path="/*" element={token ? (<DefaultLayout><Routes>{RouteLink.map(({ path, Component }, index) => (<Route key={index} path={path} element={<Component />} />))}</Routes></DefaultLayout>) : (<Login />)} /> 
-        <Route path="*" element={<Login />} /> 
-      </Routes> 
-    </Router> 
-  ); 
-} 
+  useEffect(() => {
+    const savedToken = Cookies.get("token");
+    console.log("Token from Cookies:", savedToken);
+    setToken(savedToken || null);
+  }, []);
+
+  return (
+    <Router>
+      <Routes>
+        <Route path="/login" element={<Login />} />
+        <Route
+          path="/*"
+          element={
+            token ? (
+              <DefaultLayout>
+                <Routes>
+                  {RouteLink.map(({ path, Component }, index) => (
+                    <Route key={index} path={path} element={<Component />} />
+                  ))}
+                  <Route path="/" element={<Navigate to="/dashboard" />} /> 
+                </Routes>
+              </DefaultLayout>
+            ) : (
+              <Navigate to="/login" replace />
+            )
+          }
+        />
+        <Route path="*" element={<Navigate to={token ? "/dashboard" : "/login"} replace />} />
+      </Routes>
+    </Router>
+  );
+}
 
 export default App;