#103 Navigation fixed

atlp-rwanda · Sep 11, 2024 · 1379c95 · 1379c95
1 parent 2f0727f
commit 1379c95
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 30 deletions.
diff --git a/src/components/sidebar/sidebar.tsx b/src/components/sidebar/sidebar.tsx
@@ -75,13 +75,13 @@ const sidebar = () => {
                   key={index}
                   className=" align-items-center  dark:text-white text-[#173B3F] text-base"
                 >
-                  <a
-                    href={items.path}
+                  <Link
+                    to={items.path}
                     className="p-1 flex align-items-center leading-3 cursor-pointer font-semibold hover:font-bold"
                   >
                     <label className="mr-3 p-1">{items.icon}</label>
                     <label className="p-1">{items.title} </label>
-                  </a>
+                </Link>
                 </li>
               );
             })}
@@ -95,12 +95,12 @@ const sidebar = () => {
                   key={index}
                   className=" justify-content-center mb-1 align-items-center  dark:text-white text-[#173B3F] text-lg ml-2"
                 >
-                  <a
-                    href={items.path}
+                  <Link
+                    to={items.path}
                     className="p-1 flex align-items-center leading-5 cursor-pointer"
                   >
                     <label className="mr-3 p-1">{items.icon}</label>
-                  </a>
+                  </Link>
                 </li>
               );
             })}

diff --git a/src/components/sidebar/sidebarItems.tsx b/src/components/sidebar/sidebarItems.tsx
@@ -3,7 +3,7 @@ import { Icon } from '@iconify/react';
 
 export const sidebarItems1 = [
   {
-    path: '/dashboard',
+    path: '/',
     icon: <Icon icon="fontisto:pie-chart-1"></Icon>,
     title: 'Dashboard',
   },

diff --git a/src/pages/Dashboard.tsx b/src/pages/Dashboard.tsx
@@ -0,0 +1,21 @@
+import React from 'react'
+import NavBar from '../components/sidebar/navHeader'
+
+const Dashboard = () => {
+    return (
+        <>
+            <NavBar />
+            <div className='h-screen mt-[-6%] bg-[#374151]'>
+                <div className='block mt-20'>
+                    <h1>
+                        <center>
+                            Dashboard Page
+                        </center>
+                    </h1>
+                </div>
+            </div>
+        </>
+    )
+}
+
+export default Dashboard
diff --git a/src/routes/routes.tsx b/src/routes/routes.tsx
@@ -38,6 +38,7 @@ import SubmitApplication from '../pages/SubmitApplication';
 import GradingSystemPage from "../pages/GradingSystemPage";
 import ListApplications from './../pages/Applications/AdminViewApplications';
 import ApplicationDetails from '../pages/Applications/ViewSingleApplication';
+import Dashboard from '../pages/Dashboard';
 
 function Navigation() {
   const roleName = localStorage.getItem('roleName');
@@ -52,7 +53,7 @@ function Navigation() {
           </PrivateRoute>
         }
       />
-            <Route
+      <Route
         path="/application-details/:appId"
         element={
           <PrivateRoute>
@@ -142,17 +143,10 @@ function Navigation() {
       />
       <Route
         path="/"
-        element={roleName === 'applicant' ?
-          (
-            <PrivateRoute>
-              <Applications />
-            </PrivateRoute>
-          ) : (
-            <PrivateRoute>
-              <Trainee />
-            </PrivateRoute>
-          )
-
+        element={
+          <PrivateRoute>
+            <Dashboard />
+          </PrivateRoute>
         }
       />
       <Route
@@ -212,14 +206,6 @@ function Navigation() {
           </PrivateRoute>
         }
       />
-      <Route
-        path="/program/:id"
-        element={
-          <PrivateRoute>
-            <SingleProgramDetails />
-          </PrivateRoute>
-        }
-      />
       <Route
         path="/programs"
         element={
@@ -321,12 +307,12 @@ function Navigation() {
       />
       <Route
         element={
-           <PrivateRoute>
+          <PrivateRoute>
             <ListApplications />
-           </PrivateRoute>
+          </PrivateRoute>
         }
         path='/view-applications'
-       />
+      />
 
     </Routes>