#103 Navigation fixed

atlp-rwanda · Sep 13, 2024 · 618ad59 · 618ad59
1 parent 2f0727f
commit 618ad59
Show file tree

Hide file tree

Showing 4 changed files with 74 additions and 66 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,19 @@
+import React from "react";
+import NavBar from "../components/sidebar/navHeader";
+
+const Dashboard = () => {
+  return (
+    <>
+      <NavBar />
+      <div className="h-screen bg-[#374151] grid">
+        <div className="pt-16 w-10/12 justify-self-end">
+          <div className="mt-4">
+            <h1 className="text-center text-2xl font-medium text-white">Dashboard Page</h1>
+          </div>
+        </div>
+      </div>
+    </>
+  );
+};
+
+export default Dashboard;
diff --git a/src/routes/routes.tsx b/src/routes/routes.tsx
@@ -1,46 +1,47 @@
-import React from 'react';
-import { HashRouter as Router, Routes, Route, Link } from 'react-router-dom';
-import TestTailwind from './../components/TestTailwind';
-import TrainneeDetails from './../pages/TrainneeDetails';
-import TrainneeDetailsB from './../pages/TrainneDetailsB';
-import './../index.css';
-import Sidebar from './../components/sidebar/sidebar';
-import NavBar from './../components/sidebar/navHeader';
-import Trainee from './../pages/TraineApplicant/Trainee';
-import FilterTrainee from './../pages/FilterTeainee/FilterTrainee';
-import Table from './../pages/Table';
-import UpdateTraine from './../pages/updateTrainee/traineUpdate';
-import CreateScoreType from './../pages/FilterTeainee/createScoreType';
-import ScoreTypesActions from './../pages/FilterTeainee/ScoreTypesActions';
-import ImportTraineeDetailsFromGoogleSheet from './../pages/importAndSaveManyTraineesFromGoogleSheet/importAndSaveManyTraineesFromGoogleSheet';
+import React from "react";
+import { HashRouter as Router, Routes, Route, Link } from "react-router-dom";
+import TestTailwind from "./../components/TestTailwind";
+import TrainneeDetails from "./../pages/TrainneeDetails";
+import TrainneeDetailsB from "./../pages/TrainneDetailsB";
+import "./../index.css";
+import Sidebar from "./../components/sidebar/sidebar";
+import NavBar from "./../components/sidebar/navHeader";
+import Trainee from "./../pages/TraineApplicant/Trainee";
+import FilterTrainee from "./../pages/FilterTeainee/FilterTrainee";
+import Table from "./../pages/Table";
+import UpdateTraine from "./../pages/updateTrainee/traineUpdate";
+import CreateScoreType from "./../pages/FilterTeainee/createScoreType";
+import ScoreTypesActions from "./../pages/FilterTeainee/ScoreTypesActions";
+import ImportTraineeDetailsFromGoogleSheet from "./../pages/importAndSaveManyTraineesFromGoogleSheet/importAndSaveManyTraineesFromGoogleSheet";
 
-const Counter = React.lazy(() => import('./../components/Counter/Counter'));
-import Trash from './../pages/Trash/Trash';
-import ApplicationCycle from './../pages/ApplicationCycle/ApplicationCycle';
-import LoginPage from './../pages/LoginPage';
-import PrivateRoute from './../pages/PrivateRoute';
-import PageNotFound from './../pages/PageNotFound';
-import ListAllUsersPage from './../pages/roles&permissions/ListAllUsersPage';
-import SignupForm from './../components/form/RegisterForm';
-import Programs from '../pages/programs/Programs';
-import SingleProgramDetails from '../pages/programs/SingleProgramDetails';
-import RolePermission from '../pages/roles&permissions/RolePermission';
-import CreateFormPage from './../pages/ApplicationForms/CreateApplicantForm';
-import UpdateSavedFormPage from './../pages/ApplicationForms/UpdateSavedForm';
-import ViewApplicationForms from './../pages/ApplicationForms/ViewApplicationForms';
-import UpdateProgram from '../pages/programs/UpdateProgram';
-import Jobs from '../pages/JobPost/job';
-import SingleJobPostDetails from '../pages/JobPost/viewSingleJob';
-import SharedPosts from '../pages/sharedPosts';
-import Applications from '../pages/Applications';
-import ScheduleInterview from '../pages/ScheduleInterview';
-import SubmitApplication from '../pages/SubmitApplication';
+const Counter = React.lazy(() => import("./../components/Counter/Counter"));
+import Trash from "./../pages/Trash/Trash";
+import ApplicationCycle from "./../pages/ApplicationCycle/ApplicationCycle";
+import LoginPage from "./../pages/LoginPage";
+import PrivateRoute from "./../pages/PrivateRoute";
+import PageNotFound from "./../pages/PageNotFound";
+import ListAllUsersPage from "./../pages/roles&permissions/ListAllUsersPage";
+import SignupForm from "./../components/form/RegisterForm";
+import Programs from "../pages/programs/Programs";
+import SingleProgramDetails from "../pages/programs/SingleProgramDetails";
+import RolePermission from "../pages/roles&permissions/RolePermission";
+import CreateFormPage from "./../pages/ApplicationForms/CreateApplicantForm";
+import UpdateSavedFormPage from "./../pages/ApplicationForms/UpdateSavedForm";
+import ViewApplicationForms from "./../pages/ApplicationForms/ViewApplicationForms";
+import UpdateProgram from "../pages/programs/UpdateProgram";
+import Jobs from "../pages/JobPost/job";
+import SingleJobPostDetails from "../pages/JobPost/viewSingleJob";
+import SharedPosts from "../pages/sharedPosts";
+import Applications from "../pages/Applications";
+import ScheduleInterview from "../pages/ScheduleInterview";
+import SubmitApplication from "../pages/SubmitApplication";
 import GradingSystemPage from "../pages/GradingSystemPage";
-import ListApplications from './../pages/Applications/AdminViewApplications';
-import ApplicationDetails from '../pages/Applications/ViewSingleApplication';
+import ListApplications from "./../pages/Applications/AdminViewApplications";
+import ApplicationDetails from "../pages/Applications/ViewSingleApplication";
+import Dashboard from "../pages/Dashboard";
 
 function Navigation() {
-  const roleName = localStorage.getItem('roleName');
+  const roleName = localStorage.getItem("roleName");
   return (
     <Routes>
       <Route path="/test_tailwind" element={<TestTailwind />} />
@@ -52,7 +53,7 @@ function Navigation() {
           </PrivateRoute>
         }
       />
-            <Route
+      <Route
         path="/application-details/:appId"
         element={
           <PrivateRoute>
@@ -142,17 +143,16 @@ function Navigation() {
       />
       <Route
         path="/"
-        element={roleName === 'applicant' ?
-          (
+        element={
+          roleName === "applicant" ? (
             <PrivateRoute>
               <Applications />
             </PrivateRoute>
           ) : (
             <PrivateRoute>
-              <Trainee />
+              <Dashboard />
             </PrivateRoute>
           )
-
         }
       />
       <Route
@@ -212,14 +212,6 @@ function Navigation() {
           </PrivateRoute>
         }
       />
-      <Route
-        path="/program/:id"
-        element={
-          <PrivateRoute>
-            <SingleProgramDetails />
-          </PrivateRoute>
-        }
-      />
       <Route
         path="/programs"
         element={
@@ -251,7 +243,6 @@ function Navigation() {
             <SubmitApplication />
           </PrivateRoute>
         }
-
       />
       <Route
         path="*"
@@ -321,15 +312,13 @@ function Navigation() {
       />
       <Route
         element={
-           <PrivateRoute>
+          <PrivateRoute>
             <ListApplications />
-           </PrivateRoute>
+          </PrivateRoute>
         }
-        path='/view-applications'
-       />
-
+        path="/view-applications"
+      />
     </Routes>
-
   );
 }