diff --git a/frontend/src/Components/EditWeeklyReport.tsx b/frontend/src/Components/EditWeeklyReport.tsx
new file mode 100644
index 0000000..9321d73
--- /dev/null
+++ b/frontend/src/Components/EditWeeklyReport.tsx
@@ -0,0 +1,247 @@
+import { useState, useEffect } from "react";
+import { NewWeeklyReport } from "../Types/goTypes";
+import { api } from "../API/API";
+import { useNavigate } from "react-router-dom";
+import Button from "./Button";
+
+export default function GetWeeklyReport(): JSX.Element {
+  const [projectName, setProjectName] = useState("");
+  const [week, setWeek] = useState(0);
+  const [developmentTime, setDevelopmentTime] = useState(0);
+  const [meetingTime, setMeetingTime] = useState(0);
+  const [adminTime, setAdminTime] = useState(0);
+  const [ownWorkTime, setOwnWorkTime] = useState(0);
+  const [studyTime, setStudyTime] = useState(0);
+  const [testingTime, setTestingTime] = useState(0);
+
+  const token = localStorage.getItem("accessToken") ?? "";
+  const username = localStorage.getItem("username") ?? "";
+
+  useEffect(() => {
+    const fetchWeeklyReport = async (): Promise<void> => {
+      const response = await api.getWeeklyReport(
+        username,
+        projectName,
+        week.toString(),
+        token,
+      );
+
+      if (response.success) {
+        const report: NewWeeklyReport = response.data ?? {
+          projectName: "",
+          week: 0,
+          developmentTime: 0,
+          meetingTime: 0,
+          adminTime: 0,
+          ownWorkTime: 0,
+          studyTime: 0,
+          testingTime: 0,
+        };
+        setProjectName(report.projectName);
+        setWeek(report.week);
+        setDevelopmentTime(report.developmentTime);
+        setMeetingTime(report.meetingTime);
+        setAdminTime(report.adminTime);
+        setOwnWorkTime(report.ownWorkTime);
+        setStudyTime(report.studyTime);
+        setTestingTime(report.testingTime);
+      } else {
+        console.error("Failed to fetch weekly report:", response.message);
+      }
+    };
+
+    fetchWeeklyReport();
+  }, []);
+
+  const handleNewWeeklyReport = async (): Promise<void> => {
+    const newWeeklyReport: NewWeeklyReport = {
+      projectName,
+      week,
+      developmentTime,
+      meetingTime,
+      adminTime,
+      ownWorkTime,
+      studyTime,
+      testingTime,
+    };
+
+    await api.submitWeeklyReport(newWeeklyReport, token);
+  };
+
+  const navigate = useNavigate();
+
+  return (
+    <>
+      <div className="border-4 border-black bg-white flex flex-col justify-start min-h-[65vh] h-fit w-[50vw] rounded-3xl overflow-scroll space-y-[2vh] p-[30px] items-center">
+        <form
+          onSubmit={(e) => {
+            if (week === 0) {
+              alert("Please enter a week number");
+              e.preventDefault();
+              return;
+            }
+            e.preventDefault();
+            void handleNewWeeklyReport();
+            navigate("/project");
+          }}
+        >
+          <div className="flex flex-col items-center">
+            <input
+              className="w-fill h-[5vh] font-sans text-[3vh] pl-[1vw] rounded-full text-center pt-[1vh] pb-[1vh] border-2 border-black"
+              type="week"
+              placeholder="Week"
+              value={
+                week === 0 ? "" : `2024-W${week.toString().padStart(2, "0")}`
+              }
+              onChange={(e) => {
+                const weekNumber = parseInt(e.target.value.split("-W")[1]);
+                setWeek(weekNumber);
+              }}
+              onKeyDown={(event) => {
+                event.preventDefault();
+              }}
+              onPaste={(event) => {
+                event.preventDefault();
+              }}
+            />
+            <table className="w-full text-center divide-y divide-x divide-white text-[30px]">
+              <thead>
+                <tr>
+                  <th className="w-1/2 py-2 border-b-2 border-black">
+                    Activity
+                  </th>
+                  <th className="w-1/2 py-2 border-b-2 border-black">
+                    Total Time (min)
+                  </th>
+                </tr>
+              </thead>
+              <tbody className="divide-y divide-black">
+                <tr className="h-[10vh]">
+                  <td>Development</td>
+                  <td>
+                    <input
+                      type="number"
+                      min="0"
+                      className="border-2 border-black rounded-md text-center w-1/2"
+                      value={developmentTime}
+                      onChange={(e) => {
+                        setDevelopmentTime(parseInt(e.target.value));
+                      }}
+                      onKeyDown={(event) => {
+                        const keyValue = event.key;
+                        if (!/\d/.test(keyValue) && keyValue !== "Backspace")
+                          event.preventDefault();
+                      }}
+                    />
+                  </td>
+                </tr>
+                <tr className="h-[10vh]">
+                  <td>Meeting</td>
+                  <td>
+                    <input
+                      type="number"
+                      min="0"
+                      className="border-2 border-black rounded-md text-center w-1/2"
+                      value={meetingTime}
+                      onChange={(e) => {
+                        setMeetingTime(parseInt(e.target.value));
+                      }}
+                      onKeyDown={(event) => {
+                        const keyValue = event.key;
+                        if (!/\d/.test(keyValue) && keyValue !== "Backspace")
+                          event.preventDefault();
+                      }}
+                    />
+                  </td>
+                </tr>
+                <tr className="h-[10vh]">
+                  <td>Administration</td>
+                  <td>
+                    <input
+                      type="number"
+                      min="0"
+                      className="border-2 border-black rounded-md text-center w-1/2"
+                      value={adminTime}
+                      onChange={(e) => {
+                        setAdminTime(parseInt(e.target.value));
+                      }}
+                      onKeyDown={(event) => {
+                        const keyValue = event.key;
+                        if (!/\d/.test(keyValue) && keyValue !== "Backspace")
+                          event.preventDefault();
+                      }}
+                    />
+                  </td>
+                </tr>
+                <tr className="h-[10vh]">
+                  <td>Own Work</td>
+                  <td>
+                    <input
+                      type="number"
+                      min="0"
+                      className="border-2 border-black rounded-md text-center w-1/2"
+                      value={ownWorkTime}
+                      onChange={(e) => {
+                        setOwnWorkTime(parseInt(e.target.value));
+                      }}
+                      onKeyDown={(event) => {
+                        const keyValue = event.key;
+                        if (!/\d/.test(keyValue) && keyValue !== "Backspace")
+                          event.preventDefault();
+                      }}
+                    />
+                  </td>
+                </tr>
+                <tr className="h-[10vh]">
+                  <td>Studies</td>
+                  <td>
+                    <input
+                      type="number"
+                      min="0"
+                      className="border-2 border-black rounded-md text-center w-1/2"
+                      value={studyTime}
+                      onChange={(e) => {
+                        setStudyTime(parseInt(e.target.value));
+                      }}
+                      onKeyDown={(event) => {
+                        const keyValue = event.key;
+                        if (!/\d/.test(keyValue) && keyValue !== "Backspace")
+                          event.preventDefault();
+                      }}
+                    />
+                  </td>
+                </tr>
+                <tr className="h-[10vh]">
+                  <td>Testing</td>
+                  <td>
+                    <input
+                      type="number"
+                      min="0"
+                      className="border-2 border-black rounded-md text-center w-1/2"
+                      value={testingTime}
+                      onChange={(e) => {
+                        setTestingTime(parseInt(e.target.value));
+                      }}
+                      onKeyDown={(event) => {
+                        const keyValue = event.key;
+                        if (!/\d/.test(keyValue) && keyValue !== "Backspace")
+                          event.preventDefault();
+                      }}
+                    />
+                  </td>
+                </tr>
+              </tbody>
+            </table>
+            <Button
+              text="Submit"
+              onClick={(): void => {
+                return;
+              }}
+              type="submit"
+            />
+          </div>
+        </form>
+      </div>
+    </>
+  );
+}
diff --git a/frontend/src/Components/Header.tsx b/frontend/src/Components/Header.tsx
index 7a1e8ba..819c5de 100644
--- a/frontend/src/Components/Header.tsx
+++ b/frontend/src/Components/Header.tsx
@@ -1,7 +1,7 @@
 import { useState } from "react";
 import { Link } from "react-router-dom";
 
-function Header({ username }: { username: string }): JSX.Element {
+function Header(): JSX.Element {
   const [isOpen, setIsOpen] = useState(false);
 
   const handleLogout = (): void => {
@@ -31,7 +31,7 @@ function Header({ username }: { username: string }): JSX.Element {
         }}
       >
         <button className="mr-4 underline font-bold text-white">
-          {username}
+          {localStorage.getItem("username")}
         </button>
 
         {isOpen && (
diff --git a/frontend/src/Components/LoginCheck.tsx b/frontend/src/Components/LoginCheck.tsx
index 786a96c..ce7d52c 100644
--- a/frontend/src/Components/LoginCheck.tsx
+++ b/frontend/src/Components/LoginCheck.tsx
@@ -25,6 +25,7 @@ function LoginCheck(props: {
         if (response.data !== undefined) {
           const token = response.data;
           localStorage.setItem("accessToken", token);
+          localStorage.setItem("username", props.username);
           //TODO: change so that it checks for user type (admin, user, pm) instead
           if (token !== "" && props.username === "admin") {
             props.setAuthority((prevAuth) => {
diff --git a/frontend/src/Components/TimeReport.tsx b/frontend/src/Components/NewWeeklyReport.tsx
similarity index 77%
rename from frontend/src/Components/TimeReport.tsx
rename to frontend/src/Components/NewWeeklyReport.tsx
index e7eb5b7..4f919aa 100644
--- a/frontend/src/Components/TimeReport.tsx
+++ b/frontend/src/Components/NewWeeklyReport.tsx
@@ -1,50 +1,51 @@
-import { useState } from "react";
+import { useState, useContext } from "react";
+import { NewWeeklyReport } from "../Types/goTypes";
 import { api } from "../API/API";
 import { useNavigate } from "react-router-dom";
 import Button from "./Button";
-import { NewWeeklyReport } from "../Types/goTypes";
+import { ProjectNameContext } from "../Pages/YourProjectsPage";
 
-export default function NewTimeReport(): JSX.Element {
-  const [projectName, setProjectName] = useState<string>("projectName"); // TODO: Get from backend
-  const [week, setWeek] = useState<number>(NaN);
-  const [development, setDevelopment] = useState<number>(NaN);
-  const [meeting, setMeeting] = useState<number>(NaN);
-  const [administration, setAdministration] = useState<number>(NaN);
-  const [ownwork, setOwnWork] = useState<number>(NaN);
-  const [studies, setStudies] = useState<number>(NaN);
-  const [testing, setTesting] = useState<number>(NaN);
+export default function NewWeeklyReport(): JSX.Element {
+  const [week, setWeek] = useState(0);
+  const [developmentTime, setDevelopmentTime] = useState(0);
+  const [meetingTime, setMeetingTime] = useState(0);
+  const [adminTime, setAdminTime] = useState(0);
+  const [ownWorkTime, setOwnWorkTime] = useState(0);
+  const [studyTime, setStudyTime] = useState(0);
+  const [testingTime, setTestingTime] = useState(0);
 
-  const handleNewTimeReport = async (): Promise<void> => {
-    const newTimeReport: NewWeeklyReport = {
+  const projectName = useContext(ProjectNameContext);
+  const token = localStorage.getItem("accessToken") ?? "";
+
+  const handleNewWeeklyReport = async (): Promise<void> => {
+    const newWeeklyReport: NewWeeklyReport = {
       projectName,
       week,
-      developmentTime: development,
-      meetingTime: meeting,
-      adminTime: administration,
-      ownWorkTime: ownwork,
-      studyTime: studies,
-      testingTime: testing,
+      developmentTime,
+      meetingTime,
+      adminTime,
+      ownWorkTime,
+      studyTime,
+      testingTime,
     };
-    await Promise.resolve();
-    await api.submitWeeklyReport(newTimeReport, "token");
+
+    await api.submitWeeklyReport(newWeeklyReport, token);
   };
 
   const navigate = useNavigate();
 
-  setProjectName("Something Reasonable"); // This should obviously not be used here
-
   return (
     <>
       <div className="border-4 border-black bg-white flex flex-col justify-start min-h-[65vh] h-fit w-[50vw] rounded-3xl overflow-scroll space-y-[2vh] p-[30px] items-center">
         <form
           onSubmit={(e) => {
-            if (!week) {
+            if (week === 0) {
               alert("Please enter a week number");
               e.preventDefault();
               return;
             }
             e.preventDefault();
-            void handleNewTimeReport();
+            void handleNewWeeklyReport();
             navigate("/project");
           }}
         >
@@ -83,9 +84,9 @@ export default function NewTimeReport(): JSX.Element {
                       type="number"
                       min="0"
                       className="border-2 border-black rounded-md text-center w-1/2"
-                      value={development}
+                      value={developmentTime}
                       onChange={(e) => {
-                        setDevelopment(parseInt(e.target.value));
+                        setDevelopmentTime(parseInt(e.target.value));
                       }}
                       onKeyDown={(event) => {
                         const keyValue = event.key;
@@ -102,9 +103,9 @@ export default function NewTimeReport(): JSX.Element {
                       type="number"
                       min="0"
                       className="border-2 border-black rounded-md text-center w-1/2"
-                      value={meeting}
+                      value={meetingTime}
                       onChange={(e) => {
-                        setMeeting(parseInt(e.target.value));
+                        setMeetingTime(parseInt(e.target.value));
                       }}
                       onKeyDown={(event) => {
                         const keyValue = event.key;
@@ -121,9 +122,9 @@ export default function NewTimeReport(): JSX.Element {
                       type="number"
                       min="0"
                       className="border-2 border-black rounded-md text-center w-1/2"
-                      value={administration}
+                      value={adminTime}
                       onChange={(e) => {
-                        setAdministration(parseInt(e.target.value));
+                        setAdminTime(parseInt(e.target.value));
                       }}
                       onKeyDown={(event) => {
                         const keyValue = event.key;
@@ -140,9 +141,9 @@ export default function NewTimeReport(): JSX.Element {
                       type="number"
                       min="0"
                       className="border-2 border-black rounded-md text-center w-1/2"
-                      value={ownwork}
+                      value={ownWorkTime}
                       onChange={(e) => {
-                        setOwnWork(parseInt(e.target.value));
+                        setOwnWorkTime(parseInt(e.target.value));
                       }}
                       onKeyDown={(event) => {
                         const keyValue = event.key;
@@ -159,9 +160,9 @@ export default function NewTimeReport(): JSX.Element {
                       type="number"
                       min="0"
                       className="border-2 border-black rounded-md text-center w-1/2"
-                      value={studies}
+                      value={studyTime}
                       onChange={(e) => {
-                        setStudies(parseInt(e.target.value));
+                        setStudyTime(parseInt(e.target.value));
                       }}
                       onKeyDown={(event) => {
                         const keyValue = event.key;
@@ -178,9 +179,9 @@ export default function NewTimeReport(): JSX.Element {
                       type="number"
                       min="0"
                       className="border-2 border-black rounded-md text-center w-1/2"
-                      value={testing}
+                      value={testingTime}
                       onChange={(e) => {
-                        setTesting(parseInt(e.target.value));
+                        setTestingTime(parseInt(e.target.value));
                       }}
                       onKeyDown={(event) => {
                         const keyValue = event.key;
diff --git a/frontend/src/Pages/App.tsx b/frontend/src/Pages/App.tsx
index 7ded3b6..4263815 100644
--- a/frontend/src/Pages/App.tsx
+++ b/frontend/src/Pages/App.tsx
@@ -1,4 +1,4 @@
-import { useState } from "react";
+import { useState, useEffect } from "react";
 
 import LoginPage from "./LoginPage";
 import { useNavigate } from "react-router-dom";
@@ -6,13 +6,16 @@ import { useNavigate } from "react-router-dom";
 function App(): JSX.Element {
   const navigate = useNavigate();
   const [authority, setAuthority] = useState(0);
-  if (authority === 1) {
-    navigate("/admin");
-  } else if (authority === 2) {
-    navigate("/pm");
-  } else if (authority === 3) {
-    navigate("/user");
-  }
+
+  useEffect(() => {
+    if (authority === 1) {
+      navigate("/admin");
+    } else if (authority === 2) {
+      navigate("/pm");
+    } else if (authority === 3) {
+      navigate("/user");
+    }
+  }, [authority, navigate]);
 
   return <LoginPage setAuthority={setAuthority} />;
 }
diff --git a/frontend/src/Pages/ProjectManagerPages/PMTotalTimeActivity.tsx b/frontend/src/Pages/ProjectManagerPages/PMTotalTimeActivity.tsx
index dd84fd7..35ed6ac 100644
--- a/frontend/src/Pages/ProjectManagerPages/PMTotalTimeActivity.tsx
+++ b/frontend/src/Pages/ProjectManagerPages/PMTotalTimeActivity.tsx
@@ -1,6 +1,6 @@
 import BasicWindow from "../../Components/BasicWindow";
-import TimeReport from "../../Components/TimeReport";
-import BackButton from "../../Components/BackButton";
+import Button from "../../Components/Button";
+import TimeReport from "../../Components/NewWeeklyReport";
 
 function PMTotalTimeActivity(): JSX.Element {
   const content = (
diff --git a/frontend/src/Pages/ProjectManagerPages/PMViewUnsignedReport.tsx b/frontend/src/Pages/ProjectManagerPages/PMViewUnsignedReport.tsx
index 4af61b7..9ca963c 100644
--- a/frontend/src/Pages/ProjectManagerPages/PMViewUnsignedReport.tsx
+++ b/frontend/src/Pages/ProjectManagerPages/PMViewUnsignedReport.tsx
@@ -1,7 +1,6 @@
 import BasicWindow from "../../Components/BasicWindow";
 import Button from "../../Components/Button";
-import TimeReport from "../../Components/TimeReport";
-import BackButton from "../../Components/BackButton";
+import TimeReport from "../../Components/NewWeeklyReport";
 
 function PMViewUnsignedReport(): JSX.Element {
   const content = (
diff --git a/frontend/src/Pages/UserPages/UserEditTimeReportPage.tsx b/frontend/src/Pages/UserPages/UserEditTimeReportPage.tsx
index 32b78a8..e1b1d66 100644
--- a/frontend/src/Pages/UserPages/UserEditTimeReportPage.tsx
+++ b/frontend/src/Pages/UserPages/UserEditTimeReportPage.tsx
@@ -1,25 +1,17 @@
 import BasicWindow from "../../Components/BasicWindow";
-import Button from "../../Components/Button";
-import NewTimeReport from "../../Components/TimeReport";
 import BackButton from "../../Components/BackButton";
+import EditWeeklyReport from "../../Components/EditWeeklyReport";
 
 function UserEditTimeReportPage(): JSX.Element {
   const content = (
     <>
       <h1 className="font-bold text-[30px] mb-[20px]">Edit Time Report</h1>
-      <NewTimeReport />
+      <EditWeeklyReport />
     </>
   );
 
   const buttons = (
     <>
-      <Button
-        text="Save"
-        onClick={(): void => {
-          return;
-        }}
-        type="button"
-      />
       <BackButton />
     </>
   );
diff --git a/frontend/src/Pages/UserPages/UserNewTimeReportPage.tsx b/frontend/src/Pages/UserPages/UserNewTimeReportPage.tsx
index ca84770..e54b207 100644
--- a/frontend/src/Pages/UserPages/UserNewTimeReportPage.tsx
+++ b/frontend/src/Pages/UserPages/UserNewTimeReportPage.tsx
@@ -1,13 +1,13 @@
 import BasicWindow from "../../Components/BasicWindow";
 import Button from "../../Components/Button";
-import NewTimeReport from "../../Components/TimeReport";
+import NewWeeklyReport from "../../Components/NewWeeklyReport";
 import { Link } from "react-router-dom";
 
 function UserNewTimeReportPage(): JSX.Element {
   const content = (
     <>
       <h1 className="font-bold text-[30px] mb-[20px]">New Time Report</h1>
-      <NewTimeReport />
+      <NewWeeklyReport />
     </>
   );
 
diff --git a/frontend/src/Pages/YourProjectsPage.tsx b/frontend/src/Pages/YourProjectsPage.tsx
index 2b3fd18..aabc606 100644
--- a/frontend/src/Pages/YourProjectsPage.tsx
+++ b/frontend/src/Pages/YourProjectsPage.tsx
@@ -1,31 +1,59 @@
+import React, { useState, createContext, useEffect } from "react";
+import { Project } from "../Types/goTypes";
+import { api } from "../API/API";
+import { Link } from "react-router-dom";
 import BasicWindow from "../Components/BasicWindow";
-import { ProjectListUser } from "../Components/ProjectListUser";
-import { Project } from "../Types/Project";
 
-function YourProjectsPage(): JSX.Element {
-  //TODO: Change so that it reads projects from database
-  const projects: Project[] = [];
-  for (let i = 1; i <= 20; i++) {
-    projects.push({
-      id: i,
-      name: "Example Project " + i,
-      description: "good",
-      created: "now",
-      owner: "me",
-    });
-  }
+export const ProjectNameContext = createContext("");
+
+function UserProjectPage(): JSX.Element {
+  const [projects, setProjects] = useState<Project[]>([]);
+  const [selectedProject, setSelectedProject] = useState("");
+
+  const getProjects = async (): Promise<void> => {
+    const username = localStorage.getItem("username") ?? ""; // replace with actual username
+    const token = localStorage.getItem("accessToken") ?? ""; // replace with actual token
+    const response = await api.getUserProjects(username, token);
+    console.log(response);
+    if (response.success) {
+      setProjects(response.data ?? []);
+    } else {
+      console.error(response.message);
+    }
+  };
+  // Call getProjects when the component mounts
+  useEffect(() => {
+    getProjects();
+  }, []);
+
+  const handleProjectClick = (projectName: string): void => {
+    setSelectedProject(projectName);
+  };
 
   const content = (
-    <>
+    <ProjectNameContext.Provider value={selectedProject}>
       <h1 className="font-bold text-[30px] mb-[20px]">Your Projects</h1>
-      <div className="border-4 border-black bg-white flex flex-col items-center h-[65vh] w-[50vw] rounded-3xl content-center overflow-scroll space-y-[10vh] p-[30px]">
-        <ProjectListUser projects={projects} />
+      <div className="border-4 border-black bg-white flex flex-col items-center justify-center min-h-[65vh] h-fit w-[50vw] rounded-3xl content-center overflow-scroll space-y-[10vh] p-[30px]">
+        {projects.map((project, index) => (
+          <Link
+            to={`/project/${project.id}`}
+            onClick={() => {
+              handleProjectClick(project.name);
+            }}
+            key={index}
+          >
+            <h1 className="font-bold underline text-[30px] cursor-pointer">
+              {project.name}
+            </h1>
+          </Link>
+        ))}
       </div>
-    </>
+    </ProjectNameContext.Provider>
   );
 
   const buttons = <></>;
 
   return <BasicWindow username="Admin" content={content} buttons={buttons} />;
 }
-export default YourProjectsPage;
+
+export default UserProjectPage;
diff --git a/frontend/src/main.tsx b/frontend/src/main.tsx
index f6bb13b..193b692 100644
--- a/frontend/src/main.tsx
+++ b/frontend/src/main.tsx
@@ -3,13 +3,32 @@ 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 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([
@@ -29,6 +48,86 @@ const router = createBrowserRouter([
     path: "/user",
     element: <YourProjectsPage />,
   },
+  {
+    path: "/yourProjects",
+    element: <YourProjectsPage />,
+  },
+  {
+    path: "/editTimeReport",
+    element: <UserEditTimeReportPage />,
+  },
+  {
+    path: "/newTimeReport",
+    element: <UserNewTimeReportPage />,
+  },
+  {
+    path: "/project",
+    element: <UserProjectPage />,
+  },
+  {
+    path: "/projectPage",
+    element: <UserViewTimeReportsPage />,
+  },
+  {
+    path: "/changeRole",
+    element: <PMChangeRole />,
+  },
+  {
+    path: "/otherUsersTimeReports",
+    element: <PMOtherUsersTR />,
+  },
+  {
+    path: "/projectMembers",
+    element: <PMProjectMembers />,
+  },
+  {
+    path: "/PMProjectPage",
+    element: <PMProjectPage />,
+  },
+  {
+    path: "/PMTimeActivity",
+    element: <PMTotalTimeActivity />,
+  },
+  {
+    path: "/PMTimeRole",
+    element: <PMTotalTimeRole />,
+  },
+  {
+    path: "/PMUnsignedReports",
+    element: <PMUnsignedReports />,
+  },
+  {
+    path: "/PMViewUnsignedReport",
+    element: <PMViewUnsignedReport />,
+  },
+  {
+    path: "/adminChangeUsername",
+    element: <AdminChangeUsername />,
+  },
+  {
+    path: "/adminProjectAddMember",
+    element: <AdminProjectAddMember />,
+  },
+  {
+    path: "/adminProjectChangeUserRole",
+    element: <AdminProjectChangeUserRole />,
+  },
+  {
+    path: "/adminProjectManageMembers",
+    element: <AdminProjectManageMembers />,
+  },
+  {
+    path: "/adminProjectPage",
+    element: <AdminProjectPage />,
+  },
+  {
+    path: "/adminProjectStatistics",
+    element: <AdminProjectStatistics />,
+  },
+  {
+    path: "/adminProjectViewMembers",
+    element: <AdminProjectViewMemberInfo />,
+  },
   {
     path: "/addProject",
     element: <AdminAddProject />,