fixes
This commit is contained in:
parent
3bcb7a89b8
commit
b962a856f4
1 changed files with 36 additions and 52 deletions
|
@ -33,10 +33,6 @@ import AdminProjectPage from "./Pages/AdminPages/AdminProjectPage.tsx";
|
||||||
|
|
||||||
// This is where the routes are mounted
|
// This is where the routes are mounted
|
||||||
const router = createBrowserRouter([
|
const router = createBrowserRouter([
|
||||||
{
|
|
||||||
path: "/",
|
|
||||||
element: <App />,
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
path: "/",
|
path: "/",
|
||||||
element: <App />,
|
element: <App />,
|
||||||
|
@ -54,15 +50,15 @@ const router = createBrowserRouter([
|
||||||
element: <YourProjectsPage />,
|
element: <YourProjectsPage />,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
path: "/your-projects",
|
path: "/yourProjects",
|
||||||
element: <YourProjectsPage />,
|
element: <YourProjectsPage />,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
path: "/edit-time-report",
|
path: "/editTimeReport",
|
||||||
element: <UserEditTimeReportPage />,
|
element: <UserEditTimeReportPage />,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
path: "/new-time-report",
|
path: "/newTimeReport",
|
||||||
element: <UserNewTimeReportPage />,
|
element: <UserNewTimeReportPage />,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
@ -70,101 +66,89 @@ const router = createBrowserRouter([
|
||||||
element: <UserProjectPage />,
|
element: <UserProjectPage />,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
path: "/register",
|
path: "/projectPage",
|
||||||
element: <Register />,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
path: "/admin-menu",
|
|
||||||
element: <AdminMenuPage />,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
path: "/project-page",
|
|
||||||
element: <UserViewTimeReportsPage />,
|
element: <UserViewTimeReportsPage />,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
path: "/change-role",
|
path: "/changeRole",
|
||||||
element: <PMChangeRole />,
|
element: <PMChangeRole />,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
path: "/other-users-time-reports",
|
path: "/otherUsersTimeReports",
|
||||||
element: <PMOtherUsersTR />,
|
element: <PMOtherUsersTR />,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
path: "/project-members",
|
path: "/projectMembers",
|
||||||
element: <PMProjectMembers />,
|
element: <PMProjectMembers />,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
path: "/PM-project-page",
|
path: "/PMProjectPage",
|
||||||
element: <PMProjectPage />,
|
element: <PMProjectPage />,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
path: "/PM-time-activity",
|
path: "/PMTimeActivity",
|
||||||
element: <PMTotalTimeActivity />,
|
element: <PMTotalTimeActivity />,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
path: "/PM-time-role",
|
path: "/PMTimeRole",
|
||||||
element: <PMTotalTimeRole />,
|
element: <PMTotalTimeRole />,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
path: "/PM-unsigned-reports",
|
path: "/PMUnsignedReports",
|
||||||
element: <PMUnsignedReports />,
|
element: <PMUnsignedReports />,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
path: "/PM-view-unsigned-report",
|
path: "/PMViewUnsignedReport",
|
||||||
element: <PMViewUnsignedReport />,
|
element: <PMViewUnsignedReport />,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
path: "/admin-add-project",
|
path: "/adminChangeUsername",
|
||||||
element: <AdminAddProject />,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
path: "/admin-add-user",
|
|
||||||
element: <AdminAddUser />,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
path: "/admin-change-username",
|
|
||||||
element: <AdminChangeUsername />,
|
element: <AdminChangeUsername />,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
path: "/admin-manage-projects",
|
path: "/adminProjectAddMember",
|
||||||
element: <AdminManageProjects />,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
path: "/admin-manage-users",
|
|
||||||
element: <AdminManageUsers />,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
path: "/admin-menu",
|
|
||||||
element: <AdminMenuPage />,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
path: "/admin-project-add-member",
|
|
||||||
element: <AdminProjectAddMember />,
|
element: <AdminProjectAddMember />,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
path: "/admin-project-change-user-role",
|
path: "/adminProjectChangeUserRole",
|
||||||
element: <AdminProjectChangeUserRole />,
|
element: <AdminProjectChangeUserRole />,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
path: "/admin-project-manage-members",
|
path: "/adminProjectManageMembers",
|
||||||
element: <AdminProjectManageMembers />,
|
element: <AdminProjectManageMembers />,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
path: "/admin-project-page",
|
path: "/adminProjectPage",
|
||||||
element: <AdminProjectPage />,
|
element: <AdminProjectPage />,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
path: "/admin-project-statistics",
|
path: "/adminProjectStatistics",
|
||||||
element: <AdminProjectStatistics />,
|
element: <AdminProjectStatistics />,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
path: "/admin-project-view-members",
|
path: "/adminProjectViewMembers",
|
||||||
element: <AdminProjectViewMemberInfo />,
|
element: <AdminProjectViewMemberInfo />,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
path: "/admin-view-user",
|
path: "/addProject",
|
||||||
|
element: <AdminAddProject />,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
path: "/adminAddUser",
|
||||||
|
element: <AdminAddUser />,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
path: "/adminUserInfo",
|
||||||
element: <AdminViewUserInfo />,
|
element: <AdminViewUserInfo />,
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
path: "/adminManageProject",
|
||||||
|
element: <AdminManageProjects />,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
path: "/adminManageUser",
|
||||||
|
element: <AdminManageUsers />,
|
||||||
|
},
|
||||||
]);
|
]);
|
||||||
|
|
||||||
// Semi-hacky way to get the root element
|
// Semi-hacky way to get the root element
|
||||||
|
|
Loading…
Add table
Reference in a new issue