feat: update route

TrackER-Corporation · May 4, 2023 · 6ffe670 · 6ffe670
1 parent cba4e44
commit 6ffe670
Showing 1 changed file with 22 additions and 14 deletions.
diff --git a/src/App.tsx b/src/App.tsx
@@ -13,15 +13,15 @@ import { connect } from 'react-redux';
 import { useEffect, useState } from 'react';
 import Service from "./Service/index.tsx";
 import Login from "./Login/Login.tsx";
-
+import DashboardRoutes from "./Consumer/DashboardRoutes.tsx";
 
 interface MapProps {
   user: any;
   logged: boolean
   type: string
 }
 
-const App = () => {
+const App = ({ logged }: { logged?: boolean }) => {
   const [show, setShow] = useState(false);
 
   useEffect(() => {
@@ -34,17 +34,23 @@ const App = () => {
 
   return (
     <div>
-      <BrowserRouter>
-        <Nav key="Nav3_0" dataSource={Nav30DataSource} isMobile={isMobile} />
-        <Routes>
-          <Route path="/" element={<Home />} />
-          <Route path="*" element={<Home />} />
-          <Route path="/Home" element={<Home />} />
-          <Route path="/Service" element={<Service />} />
-          <Route path="/Access" element={<Login />} />
-        </Routes>
-        <Footer key="Footer1_0" dataSource={Footer10DataSource} isMobile={isMobile} />
-      </BrowserRouter>
+      {show && logged ?
+        <BrowserRouter>
+          <DashboardRoutes />
+        </BrowserRouter>
+        :
+        <BrowserRouter>
+          <Nav key="Nav3_0" dataSource={Nav30DataSource} isMobile={isMobile} />
+          <Routes>
+            <Route path="/" element={<Home />} />
+            <Route path="*" element={<Home />} />
+            <Route path="/Home" element={<Home />} />
+            <Route path="/Service" element={<Service />} />
+            <Route path="/Access" element={<Login />} />
+          </Routes>
+          <Footer key="Footer1_0" dataSource={Footer10DataSource} isMobile={isMobile} />
+        </BrowserRouter>
+      }
     </div>
   );
 };
@@ -57,4 +63,6 @@ const mapStateToProps = (state: MapProps) => {
 
 const connector = connect(mapStateToProps);
 
-export default connector(App);
+const ReturnApp = connector(App)
+
+export default ReturnApp;