From 43f13dc53439861188ebc43e26d61fd7de035ad0 Mon Sep 17 00:00:00 2001 From: Mattias <mattias.rasmusson.1032@student.lu.se> Date: Mon, 18 Mar 2024 15:33:19 +0100 Subject: [PATCH] Old paths in main are back --- frontend/src/main.tsx | 136 ++++++++++++++++++++++++++++++++++++------ 1 file changed, 118 insertions(+), 18 deletions(-) diff --git a/frontend/src/main.tsx b/frontend/src/main.tsx index f6bb13b..573ec3d 100644 --- a/frontend/src/main.tsx +++ b/frontend/src/main.tsx @@ -3,13 +3,33 @@ import ReactDOM from "react-dom/client"; import "./index.css"; import { createBrowserRouter, RouterProvider } from "react-router-dom"; import App from "./Pages/App"; -import AdminMenuPage from "./Pages/AdminPages/AdminMenuPage"; -import YourProjectsPage from "./Pages/YourProjectsPage"; -import AdminAddProject from "./Pages/AdminPages/AdminAddProject"; -import AdminManageProjects from "./Pages/AdminPages/AdminManageProjects"; -import AdminManageUsers from "./Pages/AdminPages/AdminManageUsers"; -import AdminAddUser from "./Pages/AdminPages/AdminAddUser"; -import AdminViewUserInfo from "./Pages/AdminPages/AdminViewUserInfo"; +import YourProjectsPage from "./Pages/YourProjectsPage.tsx"; +import UserProjectPage from "./Pages/UserPages/UserProjectPage.tsx"; +import Register from "./Components/Register.tsx"; +import AdminMenuPage from "./Pages/AdminPages/AdminMenuPage.tsx"; +import UserEditTimeReportPage from "./Pages/UserPages/UserEditTimeReportPage.tsx"; +import UserNewTimeReportPage from "./Pages/UserPages/UserNewTimeReportPage.tsx"; +import UserViewTimeReportsPage from "./Pages/UserPages/UserViewTimeReportsPage.tsx"; +import PMChangeRole from "./Pages/ProjectManagerPages/PMChangeRole.tsx"; +import PMOtherUsersTR from "./Pages/ProjectManagerPages/PMOtherUsersTR.tsx"; +import PMProjectMembers from "./Pages/ProjectManagerPages/PMProjectMembers.tsx"; +import PMProjectPage from "./Pages/ProjectManagerPages/PMProjectPage.tsx"; +import PMTotalTimeActivity from "./Pages/ProjectManagerPages/PMTotalTimeActivity.tsx"; +import PMTotalTimeRole from "./Pages/ProjectManagerPages/PMTotalTimeRole.tsx"; +import PMUnsignedReports from "./Pages/ProjectManagerPages/PMUnsignedReports.tsx"; +import PMViewUnsignedReport from "./Pages/ProjectManagerPages/PMViewUnsignedReport.tsx"; +import AdminManageUsers from "./Pages/AdminPages/AdminManageUsers.tsx"; +import AdminViewUserInfo from "./Pages/AdminPages/AdminViewUserInfo.tsx"; +import AdminManageProjects from "./Pages/AdminPages/AdminManageProjects.tsx"; +import AdminAddProject from "./Pages/AdminPages/AdminAddProject.tsx"; +import AdminAddUser from "./Pages/AdminPages/AdminAddUser.tsx"; +import AdminChangeUsername from "./Pages/AdminPages/AdminChangeUsername.tsx"; +import AdminProjectAddMember from "./Pages/AdminPages/AdminProjectAddMember.tsx"; +import AdminProjectChangeUserRole from "./Pages/AdminPages/AdminProjectChangeUserRole.tsx"; +import AdminProjectManageMembers from "./Pages/AdminPages/AdminProjectManageMembers.tsx"; +import AdminProjectStatistics from "./Pages/AdminPages/AdminProjectStatistics.tsx"; +import AdminProjectViewMemberInfo from "./Pages/AdminPages/AdminProjectViewMemberInfo.tsx"; +import AdminProjectPage from "./Pages/AdminPages/AdminProjectPage.tsx"; // This is where the routes are mounted const router = createBrowserRouter([ @@ -18,37 +38,117 @@ const router = createBrowserRouter([ element: <App />, }, { - path: "/admin", + path: "/your-projects", + element: <YourProjectsPage />, + }, + { + path: "/edit-time-report", + element: <UserEditTimeReportPage />, + }, + { + path: "/new-time-report", + element: <UserNewTimeReportPage />, + }, + { + path: "/project", + element: <UserProjectPage />, + }, + { + path: "/register", + element: <Register />, + }, + { + path: "/admin-menu", element: <AdminMenuPage />, }, { - path: "/pm", - element: <YourProjectsPage />, + path: "/project-page", + element: <UserViewTimeReportsPage />, }, { - path: "/user", - element: <YourProjectsPage />, + path: "/change-role", + element: <PMChangeRole />, }, { - path: "/addProject", + path: "/other-users-time-reports", + element: <PMOtherUsersTR />, + }, + { + path: "/project-members", + element: <PMProjectMembers />, + }, + { + path: "/PM-project-page", + element: <PMProjectPage />, + }, + { + path: "/PM-time-activity", + element: <PMTotalTimeActivity />, + }, + { + path: "/PM-time-role", + element: <PMTotalTimeRole />, + }, + { + path: "/PM-unsigned-reports", + element: <PMUnsignedReports />, + }, + { + path: "/PM-view-unsigned-report", + element: <PMViewUnsignedReport />, + }, + { + path: "/admin-add-project", element: <AdminAddProject />, }, { - path: "/adminAddUser", + path: "/admin-add-user", element: <AdminAddUser />, }, { - path: "/adminUserInfo", - element: <AdminViewUserInfo />, + path: "/admin-change-username", + element: <AdminChangeUsername />, }, { - path: "/adminManageProject", + path: "/admin-manage-projects", element: <AdminManageProjects />, }, { - path: "/adminManageUser", + path: "/admin-manage-users", element: <AdminManageUsers />, }, + { + path: "/admin-menu", + element: <AdminMenuPage />, + }, + { + path: "/admin-project-add-member", + element: <AdminProjectAddMember />, + }, + { + path: "/admin-project-change-user-role", + element: <AdminProjectChangeUserRole />, + }, + { + path: "/admin-project-manage-members", + element: <AdminProjectManageMembers />, + }, + { + path: "/admin-project-page", + element: <AdminProjectPage />, + }, + { + path: "/admin-project-statistics", + element: <AdminProjectStatistics />, + }, + { + path: "/admin-project-view-members", + element: <AdminProjectViewMemberInfo />, + }, + { + path: "/admin-view-user", + element: <AdminViewUserInfo />, + }, ]); // Semi-hacky way to get the root element