From 03f350f303637ecc0d5ce05f1d3af8d2cd21cf22 Mon Sep 17 00:00:00 2001
From: Davenludd <david.ludde01@gmail.com>
Date: Thu, 14 Mar 2024 13:21:19 +0100
Subject: [PATCH 01/19] Made a new component for time reporting

---
 frontend/src/Components/NewTImeReport.tsx     | 60 +++++++++++++++++++
 .../Pages/UserPages/UserNewTimeReportPage.tsx |  7 ++-
 2 files changed, 66 insertions(+), 1 deletion(-)
 create mode 100644 frontend/src/Components/NewTImeReport.tsx

diff --git a/frontend/src/Components/NewTImeReport.tsx b/frontend/src/Components/NewTImeReport.tsx
new file mode 100644
index 0000000..3c0e49d
--- /dev/null
+++ b/frontend/src/Components/NewTImeReport.tsx
@@ -0,0 +1,60 @@
+function NewTimeReport(): JSX.Element {
+  const activities = [
+    "Development",
+    "Meeting",
+    "Administration",
+    "Own Work",
+    "Studies",
+    "Testing",
+  ];
+
+  return (
+    <>
+      <h1 className="font-bold text-[30px] mb-[20px]">New Time Report</h1>
+      <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">
+        <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"
+          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">
+            {activities.map((activity, index) => (
+              <tr key={index} className="h-[10vh]">
+                <td>{activity}</td>
+                <td>
+                  <input
+                    type="number"
+                    min="0"
+                    className="border-2 border-black rounded-md text-center w-1/2"
+                    onKeyDown={(event) => {
+                      const keyValue = event.key;
+                      if (!/\d/.test(keyValue) && keyValue !== "Backspace")
+                        event.preventDefault();
+                    }}
+                  />
+                </td>
+              </tr>
+            ))}
+          </tbody>
+        </table>
+      </div>
+    </>
+  );
+}
+
+export default NewTimeReport;
diff --git a/frontend/src/Pages/UserPages/UserNewTimeReportPage.tsx b/frontend/src/Pages/UserPages/UserNewTimeReportPage.tsx
index b4e8436..d432817 100644
--- a/frontend/src/Pages/UserPages/UserNewTimeReportPage.tsx
+++ b/frontend/src/Pages/UserPages/UserNewTimeReportPage.tsx
@@ -1,8 +1,13 @@
 import BasicWindow from "../../Components/BasicWindow";
 import Button from "../../Components/Button";
+import NewTimeReport from "../../Components/NewTImeReport";
 
 function UserNewTimeReportPage(): JSX.Element {
-  const content = <></>;
+  const content = (
+    <>
+      <NewTimeReport />
+    </>
+  );
 
   const buttons = (
     <>

From c5d5c389dd70a15889ca4f521d54e475b7c86fe0 Mon Sep 17 00:00:00 2001
From: Mattias <mattias.rasmusson.1032@student.lu.se>
Date: Thu, 14 Mar 2024 14:29:10 +0100
Subject: [PATCH 02/19] Added new paths in main

---
 frontend/src/main.tsx | 28 ++++++++++++++++++++++++----
 1 file changed, 24 insertions(+), 4 deletions(-)

diff --git a/frontend/src/main.tsx b/frontend/src/main.tsx
index 996e78d..f377260 100644
--- a/frontend/src/main.tsx
+++ b/frontend/src/main.tsx
@@ -13,6 +13,10 @@ 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";
 
 // This is where the routes are mounted
 const router = createBrowserRouter([
@@ -20,10 +24,6 @@ const router = createBrowserRouter([
     path: "/",
     element: <LoginPage />,
   },
-  {
-    path: "/admin-menu",
-    element: <AdminMenuPage />,
-  },
   {
     path: "/your-projects",
     element: <YourProjectsPage />,
@@ -60,6 +60,26 @@ const router = createBrowserRouter([
     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-menu",
+    element: <AdminMenuPage />,
+  },
 ]);
 
 // Semi-hacky way to get the root element

From 434879c26ce26096fa838d3bb14b408f88da47be Mon Sep 17 00:00:00 2001
From: Davenludd <david.ludde01@gmail.com>
Date: Thu, 14 Mar 2024 14:27:54 +0100
Subject: [PATCH 03/19] Add AdminManageUsers page & buttons

---
 .../src/Pages/AdminPages/AdminManageUsers.tsx | 26 +++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 frontend/src/Pages/AdminPages/AdminManageUsers.tsx

diff --git a/frontend/src/Pages/AdminPages/AdminManageUsers.tsx b/frontend/src/Pages/AdminPages/AdminManageUsers.tsx
new file mode 100644
index 0000000..b25b120
--- /dev/null
+++ b/frontend/src/Pages/AdminPages/AdminManageUsers.tsx
@@ -0,0 +1,26 @@
+import BasicWindow from "../../Components/BasicWindow";
+import Button from "../../Components/Button";
+
+function AdminManageUsers(): JSX.Element {
+  const content = <></>;
+
+  const buttons = (
+    <>
+      <Button
+        text="Add User"
+        onClick={(): void => {
+          return;
+        }}
+      />
+      <Button
+        text="Back"
+        onClick={(): void => {
+          return;
+        }}
+      />
+    </>
+  );
+
+  return <BasicWindow username="Admin" content={content} buttons={buttons} />;
+}
+export default AdminManageUsers;

From 69df212fde05b9c71aec976ab1dae9dba295f955 Mon Sep 17 00:00:00 2001
From: Davenludd <david.ludde01@gmail.com>
Date: Thu, 14 Mar 2024 14:30:19 +0100
Subject: [PATCH 04/19] Add AdminAddUser page & buttons

---
 .../src/Pages/AdminPages/AdminAddUser.tsx     | 26 +++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 frontend/src/Pages/AdminPages/AdminAddUser.tsx

diff --git a/frontend/src/Pages/AdminPages/AdminAddUser.tsx b/frontend/src/Pages/AdminPages/AdminAddUser.tsx
new file mode 100644
index 0000000..a1337df
--- /dev/null
+++ b/frontend/src/Pages/AdminPages/AdminAddUser.tsx
@@ -0,0 +1,26 @@
+import BasicWindow from "../../Components/BasicWindow";
+import Button from "../../Components/Button";
+
+function AdminAddUser(): JSX.Element {
+  const content = <></>;
+
+  const buttons = (
+    <>
+      <Button
+        text="Finish"
+        onClick={(): void => {
+          return;
+        }}
+      />
+      <Button
+        text="Back"
+        onClick={(): void => {
+          return;
+        }}
+      />
+    </>
+  );
+
+  return <BasicWindow username="Admin" content={content} buttons={buttons} />;
+}
+export default AdminAddUser;

From 1b3660eb83b793d924ca97f0b04f4697ed70c06f Mon Sep 17 00:00:00 2001
From: Mattias <mattias.rasmusson.1032@student.lu.se>
Date: Thu, 14 Mar 2024 14:33:43 +0100
Subject: [PATCH 05/19] Added more paths in main

---
 frontend/src/main.tsx | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/frontend/src/main.tsx b/frontend/src/main.tsx
index f377260..24675f8 100644
--- a/frontend/src/main.tsx
+++ b/frontend/src/main.tsx
@@ -17,6 +17,7 @@ import PMTotalTimeActivity from "./Pages/ProjectManagerPages/PMTotalTimeActivity
 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";
 
 // This is where the routes are mounted
 const router = createBrowserRouter([
@@ -80,6 +81,18 @@ const router = createBrowserRouter([
     path: "/admin-menu",
     element: <AdminMenuPage />,
   },
+  {
+    path: "/admin-menu",
+    element: <AdminMenuPage />,
+  },
+  {
+    path: "/admin-manage-users",
+    element: <AdminManageUsers />,
+  },
+  {
+    path: "/admin-menu",
+    element: <AdminMenuPage />,
+  },
 ]);
 
 // Semi-hacky way to get the root element

From 5a6fe1c47264510b93984b7b661836a8b9b9ecb1 Mon Sep 17 00:00:00 2001
From: Davenludd <david.ludde01@gmail.com>
Date: Thu, 14 Mar 2024 14:34:31 +0100
Subject: [PATCH 06/19] Add AdminViewUserInfo page & buttons

---
 .../Pages/AdminPages/AdminViewUserInfo.tsx    | 26 +++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 frontend/src/Pages/AdminPages/AdminViewUserInfo.tsx

diff --git a/frontend/src/Pages/AdminPages/AdminViewUserInfo.tsx b/frontend/src/Pages/AdminPages/AdminViewUserInfo.tsx
new file mode 100644
index 0000000..da17ca0
--- /dev/null
+++ b/frontend/src/Pages/AdminPages/AdminViewUserInfo.tsx
@@ -0,0 +1,26 @@
+import BasicWindow from "../../Components/BasicWindow";
+import Button from "../../Components/Button";
+
+function AdminViewUserInfo(): JSX.Element {
+  const content = <></>;
+
+  const buttons = (
+    <>
+      <Button
+        text="Delete"
+        onClick={(): void => {
+          return;
+        }}
+      />
+      <Button
+        text="Back"
+        onClick={(): void => {
+          return;
+        }}
+      />
+    </>
+  );
+
+  return <BasicWindow username="Admin" content={content} buttons={buttons} />;
+}
+export default AdminViewUserInfo;

From 2d5de569aeac3a9e67b21bee6e5bec0bbf3468c2 Mon Sep 17 00:00:00 2001
From: Davenludd <david.ludde01@gmail.com>
Date: Thu, 14 Mar 2024 14:35:47 +0100
Subject: [PATCH 07/19] Add AdminChangeUsername page & buttons

---
 .../Pages/AdminPages/AdminChangeUsername.tsx  | 26 +++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 frontend/src/Pages/AdminPages/AdminChangeUsername.tsx

diff --git a/frontend/src/Pages/AdminPages/AdminChangeUsername.tsx b/frontend/src/Pages/AdminPages/AdminChangeUsername.tsx
new file mode 100644
index 0000000..b8711cb
--- /dev/null
+++ b/frontend/src/Pages/AdminPages/AdminChangeUsername.tsx
@@ -0,0 +1,26 @@
+import BasicWindow from "../../Components/BasicWindow";
+import Button from "../../Components/Button";
+
+function AdminChangeUsername(): JSX.Element {
+  const content = <></>;
+
+  const buttons = (
+    <>
+      <Button
+        text="Finish"
+        onClick={(): void => {
+          return;
+        }}
+      />
+      <Button
+        text="Back"
+        onClick={(): void => {
+          return;
+        }}
+      />
+    </>
+  );
+
+  return <BasicWindow username="Admin" content={content} buttons={buttons} />;
+}
+export default AdminChangeUsername;

From 3047db28f68e25d174b50d30a7f600d457e2e657 Mon Sep 17 00:00:00 2001
From: Davenludd <david.ludde01@gmail.com>
Date: Thu, 14 Mar 2024 14:37:51 +0100
Subject: [PATCH 08/19] Add AdminManageProjects page & buttons

---
 .../Pages/AdminPages/AdminManageProjects.tsx  | 26 +++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 frontend/src/Pages/AdminPages/AdminManageProjects.tsx

diff --git a/frontend/src/Pages/AdminPages/AdminManageProjects.tsx b/frontend/src/Pages/AdminPages/AdminManageProjects.tsx
new file mode 100644
index 0000000..cfa0808
--- /dev/null
+++ b/frontend/src/Pages/AdminPages/AdminManageProjects.tsx
@@ -0,0 +1,26 @@
+import BasicWindow from "../../Components/BasicWindow";
+import Button from "../../Components/Button";
+
+function AdminManageProjects(): JSX.Element {
+  const content = <></>;
+
+  const buttons = (
+    <>
+      <Button
+        text="Add Project"
+        onClick={(): void => {
+          return;
+        }}
+      />
+      <Button
+        text="Back"
+        onClick={(): void => {
+          return;
+        }}
+      />
+    </>
+  );
+
+  return <BasicWindow username="Admin" content={content} buttons={buttons} />;
+}
+export default AdminManageProjects;

From 6a68ad1c3f71525c91f4c68038a7d546027b0c85 Mon Sep 17 00:00:00 2001
From: Davenludd <david.ludde01@gmail.com>
Date: Thu, 14 Mar 2024 14:39:22 +0100
Subject: [PATCH 09/19] Add AdminAddProject page & buttons

---
 .../src/Pages/AdminPages/AdminAddProject.tsx  | 26 +++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 frontend/src/Pages/AdminPages/AdminAddProject.tsx

diff --git a/frontend/src/Pages/AdminPages/AdminAddProject.tsx b/frontend/src/Pages/AdminPages/AdminAddProject.tsx
new file mode 100644
index 0000000..9fd8bed
--- /dev/null
+++ b/frontend/src/Pages/AdminPages/AdminAddProject.tsx
@@ -0,0 +1,26 @@
+import BasicWindow from "../../Components/BasicWindow";
+import Button from "../../Components/Button";
+
+function AdminAddProject(): JSX.Element {
+  const content = <></>;
+
+  const buttons = (
+    <>
+      <Button
+        text="Finish"
+        onClick={(): void => {
+          return;
+        }}
+      />
+      <Button
+        text="Back"
+        onClick={(): void => {
+          return;
+        }}
+      />
+    </>
+  );
+
+  return <BasicWindow username="Admin" content={content} buttons={buttons} />;
+}
+export default AdminAddProject;

From 19e3567c78279fb0f5cdaff677928705f268a2ab Mon Sep 17 00:00:00 2001
From: Mattias <mattias.rasmusson.1032@student.lu.se>
Date: Thu, 14 Mar 2024 14:42:26 +0100
Subject: [PATCH 10/19] More paths in main

---
 frontend/src/main.tsx | 25 +++++++++++++++++++++----
 1 file changed, 21 insertions(+), 4 deletions(-)

diff --git a/frontend/src/main.tsx b/frontend/src/main.tsx
index 24675f8..9b6ad94 100644
--- a/frontend/src/main.tsx
+++ b/frontend/src/main.tsx
@@ -18,6 +18,11 @@ 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";
 
 // This is where the routes are mounted
 const router = createBrowserRouter([
@@ -78,12 +83,20 @@ const router = createBrowserRouter([
     element: <PMViewUnsignedReport />,
   },
   {
-    path: "/admin-menu",
-    element: <AdminMenuPage />,
+    path: "/admin-add-project",
+    element: <AdminAddProject />,
   },
   {
-    path: "/admin-menu",
-    element: <AdminMenuPage />,
+    path: "/admin-add-user",
+    element: <AdminAddUser />,
+  },
+  {
+    path: "/admin-change-username",
+    element: <AdminChangeUsername />,
+  },
+  {
+    path: "/admin-manage-projects",
+    element: <AdminManageProjects />,
   },
   {
     path: "/admin-manage-users",
@@ -93,6 +106,10 @@ const router = createBrowserRouter([
     path: "/admin-menu",
     element: <AdminMenuPage />,
   },
+  {
+    path: "/admin-view-user",
+    element: <AdminViewUserInfo />,
+  },
 ]);
 
 // Semi-hacky way to get the root element

From ca7e4c6189d2265ad49d84e397dd67b52691f9b6 Mon Sep 17 00:00:00 2001
From: Davenludd <david.ludde01@gmail.com>
Date: Thu, 14 Mar 2024 14:42:39 +0100
Subject: [PATCH 11/19] Add AdminProjectPage page & buttons

---
 .../src/Pages/AdminPages/AdminProjectPage.tsx | 26 +++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 frontend/src/Pages/AdminPages/AdminProjectPage.tsx

diff --git a/frontend/src/Pages/AdminPages/AdminProjectPage.tsx b/frontend/src/Pages/AdminPages/AdminProjectPage.tsx
new file mode 100644
index 0000000..022dee3
--- /dev/null
+++ b/frontend/src/Pages/AdminPages/AdminProjectPage.tsx
@@ -0,0 +1,26 @@
+import BasicWindow from "../../Components/BasicWindow";
+import Button from "../../Components/Button";
+
+function AdminProjectPage(): JSX.Element {
+  const content = <></>;
+
+  const buttons = (
+    <>
+      <Button
+        text="Delete"
+        onClick={(): void => {
+          return;
+        }}
+      />
+      <Button
+        text="Back"
+        onClick={(): void => {
+          return;
+        }}
+      />
+    </>
+  );
+
+  return <BasicWindow username="Admin" content={content} buttons={buttons} />;
+}
+export default AdminProjectPage;

From dd370d86e3739d2db51c10679ee708883056953d Mon Sep 17 00:00:00 2001
From: Davenludd <david.ludde01@gmail.com>
Date: Thu, 14 Mar 2024 14:44:04 +0100
Subject: [PATCH 12/19] Add AdminProjectStatistics page & buttons

---
 .../AdminPages/AdminProjectStatistics.tsx     | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 frontend/src/Pages/AdminPages/AdminProjectStatistics.tsx

diff --git a/frontend/src/Pages/AdminPages/AdminProjectStatistics.tsx b/frontend/src/Pages/AdminPages/AdminProjectStatistics.tsx
new file mode 100644
index 0000000..1d21530
--- /dev/null
+++ b/frontend/src/Pages/AdminPages/AdminProjectStatistics.tsx
@@ -0,0 +1,20 @@
+import BasicWindow from "../../Components/BasicWindow";
+import Button from "../../Components/Button";
+
+function AdminProjectStatistics(): JSX.Element {
+  const content = <></>;
+
+  const buttons = (
+    <>
+      <Button
+        text="Back"
+        onClick={(): void => {
+          return;
+        }}
+      />
+    </>
+  );
+
+  return <BasicWindow username="Admin" content={content} buttons={buttons} />;
+}
+export default AdminProjectStatistics;

From da730a2d189392fc23b0572c07951b2537727c6a Mon Sep 17 00:00:00 2001
From: Davenludd <david.ludde01@gmail.com>
Date: Thu, 14 Mar 2024 14:45:54 +0100
Subject: [PATCH 13/19] Add AdminProjectManageMembers page & buttons

---
 .../AdminPages/AdminProjectManageMembers.tsx  | 26 +++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 frontend/src/Pages/AdminPages/AdminProjectManageMembers.tsx

diff --git a/frontend/src/Pages/AdminPages/AdminProjectManageMembers.tsx b/frontend/src/Pages/AdminPages/AdminProjectManageMembers.tsx
new file mode 100644
index 0000000..330cbe8
--- /dev/null
+++ b/frontend/src/Pages/AdminPages/AdminProjectManageMembers.tsx
@@ -0,0 +1,26 @@
+import BasicWindow from "../../Components/BasicWindow";
+import Button from "../../Components/Button";
+
+function AdminProjectManageMembers(): JSX.Element {
+  const content = <></>;
+
+  const buttons = (
+    <>
+      <Button
+        text="Add Member"
+        onClick={(): void => {
+          return;
+        }}
+      />
+      <Button
+        text="Back"
+        onClick={(): void => {
+          return;
+        }}
+      />
+    </>
+  );
+
+  return <BasicWindow username="Admin" content={content} buttons={buttons} />;
+}
+export default AdminProjectManageMembers;

From 027bce6dfc38e651b0d60d13f4e2f7f7c1342288 Mon Sep 17 00:00:00 2001
From: Davenludd <david.ludde01@gmail.com>
Date: Thu, 14 Mar 2024 14:48:51 +0100
Subject: [PATCH 14/19] Add AdminProjectAddMember page & buttons

---
 .../AdminPages/AdminProjectAddMember.tsx      | 26 +++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 frontend/src/Pages/AdminPages/AdminProjectAddMember.tsx

diff --git a/frontend/src/Pages/AdminPages/AdminProjectAddMember.tsx b/frontend/src/Pages/AdminPages/AdminProjectAddMember.tsx
new file mode 100644
index 0000000..97f570c
--- /dev/null
+++ b/frontend/src/Pages/AdminPages/AdminProjectAddMember.tsx
@@ -0,0 +1,26 @@
+import BasicWindow from "../../Components/BasicWindow";
+import Button from "../../Components/Button";
+
+function AdminProjectAddMember(): JSX.Element {
+  const content = <></>;
+
+  const buttons = (
+    <>
+      <Button
+        text="Add"
+        onClick={(): void => {
+          return;
+        }}
+      />
+      <Button
+        text="Back"
+        onClick={(): void => {
+          return;
+        }}
+      />
+    </>
+  );
+
+  return <BasicWindow username="Admin" content={content} buttons={buttons} />;
+}
+export default AdminProjectAddMember;

From 39edc419df5246dd59f4c7cbf9548319708ab42c Mon Sep 17 00:00:00 2001
From: Davenludd <david.ludde01@gmail.com>
Date: Thu, 14 Mar 2024 14:51:28 +0100
Subject: [PATCH 15/19] Add AdminProjectViewMemberInfo page & buttons

---
 .../AdminPages/AdminProjectViewMemberInfo.tsx | 26 +++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 frontend/src/Pages/AdminPages/AdminProjectViewMemberInfo.tsx

diff --git a/frontend/src/Pages/AdminPages/AdminProjectViewMemberInfo.tsx b/frontend/src/Pages/AdminPages/AdminProjectViewMemberInfo.tsx
new file mode 100644
index 0000000..125282f
--- /dev/null
+++ b/frontend/src/Pages/AdminPages/AdminProjectViewMemberInfo.tsx
@@ -0,0 +1,26 @@
+import BasicWindow from "../../Components/BasicWindow";
+import Button from "../../Components/Button";
+
+function AdminProjectViewMemberInfo(): JSX.Element {
+  const content = <></>;
+
+  const buttons = (
+    <>
+      <Button
+        text="Remove"
+        onClick={(): void => {
+          return;
+        }}
+      />
+      <Button
+        text="Back"
+        onClick={(): void => {
+          return;
+        }}
+      />
+    </>
+  );
+
+  return <BasicWindow username="Admin" content={content} buttons={buttons} />;
+}
+export default AdminProjectViewMemberInfo;

From 03e2be0a46116961a8d627e64c6f820672e316ae Mon Sep 17 00:00:00 2001
From: Davenludd <david.ludde01@gmail.com>
Date: Thu, 14 Mar 2024 14:53:39 +0100
Subject: [PATCH 16/19] Add AdminProjectChangeUserRole page & buttons

---
 .../AdminPages/AdminProjectChangeUserRole.tsx | 26 +++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 frontend/src/Pages/AdminPages/AdminProjectChangeUserRole.tsx

diff --git a/frontend/src/Pages/AdminPages/AdminProjectChangeUserRole.tsx b/frontend/src/Pages/AdminPages/AdminProjectChangeUserRole.tsx
new file mode 100644
index 0000000..88df69c
--- /dev/null
+++ b/frontend/src/Pages/AdminPages/AdminProjectChangeUserRole.tsx
@@ -0,0 +1,26 @@
+import BasicWindow from "../../Components/BasicWindow";
+import Button from "../../Components/Button";
+
+function AdminProjectChangeUserRole(): JSX.Element {
+  const content = <></>;
+
+  const buttons = (
+    <>
+      <Button
+        text="Change"
+        onClick={(): void => {
+          return;
+        }}
+      />
+      <Button
+        text="Back"
+        onClick={(): void => {
+          return;
+        }}
+      />
+    </>
+  );
+
+  return <BasicWindow username="Admin" content={content} buttons={buttons} />;
+}
+export default AdminProjectChangeUserRole;

From 46c4a5dc928776b43300d3d94f9b02dbd746d228 Mon Sep 17 00:00:00 2001
From: Mattias <mattias.rasmusson.1032@student.lu.se>
Date: Thu, 14 Mar 2024 14:59:57 +0100
Subject: [PATCH 17/19] Added more paths in main

---
 frontend/src/main.tsx | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/frontend/src/main.tsx b/frontend/src/main.tsx
index 9b6ad94..40f6c8f 100644
--- a/frontend/src/main.tsx
+++ b/frontend/src/main.tsx
@@ -23,6 +23,12 @@ 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([
@@ -106,6 +112,30 @@ const router = createBrowserRouter([
     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 />,

From 41e1c32ee0a460b1c89c4969b8f9a499218e75b6 Mon Sep 17 00:00:00 2001
From: Davenludd <david.ludde01@gmail.com>
Date: Thu, 14 Mar 2024 15:17:15 +0100
Subject: [PATCH 18/19] Added time report component to various pages

---
 .../Components/{NewTImeReport.tsx => TimeReport.tsx}   |  1 -
 .../Pages/ProjectManagerPages/PMTotalTimeActivity.tsx  | 10 +++++++++-
 .../Pages/ProjectManagerPages/PMViewUnsignedReport.tsx | 10 +++++++++-
 .../src/Pages/UserPages/UserEditTimeReportPage.tsx     |  8 +++++++-
 frontend/src/Pages/UserPages/UserNewTimeReportPage.tsx |  3 ++-
 5 files changed, 27 insertions(+), 5 deletions(-)
 rename frontend/src/Components/{NewTImeReport.tsx => TimeReport.tsx} (96%)

diff --git a/frontend/src/Components/NewTImeReport.tsx b/frontend/src/Components/TimeReport.tsx
similarity index 96%
rename from frontend/src/Components/NewTImeReport.tsx
rename to frontend/src/Components/TimeReport.tsx
index 3c0e49d..c4ddc38 100644
--- a/frontend/src/Components/NewTImeReport.tsx
+++ b/frontend/src/Components/TimeReport.tsx
@@ -10,7 +10,6 @@ function NewTimeReport(): JSX.Element {
 
   return (
     <>
-      <h1 className="font-bold text-[30px] mb-[20px]">New Time Report</h1>
       <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">
         <input
           className="w-fill h-[5vh] font-sans text-[3vh] pl-[1vw] rounded-full text-center pt-[1vh] pb-[1vh] border-2 border-black"
diff --git a/frontend/src/Pages/ProjectManagerPages/PMTotalTimeActivity.tsx b/frontend/src/Pages/ProjectManagerPages/PMTotalTimeActivity.tsx
index efbf742..c36d2df 100644
--- a/frontend/src/Pages/ProjectManagerPages/PMTotalTimeActivity.tsx
+++ b/frontend/src/Pages/ProjectManagerPages/PMTotalTimeActivity.tsx
@@ -1,8 +1,16 @@
 import BasicWindow from "../../Components/BasicWindow";
 import Button from "../../Components/Button";
+import TimeReport from "../../Components/TimeReport";
 
 function PMTotalTimeActivity(): JSX.Element {
-  const content = <></>;
+  const content = (
+    <>
+      <h1 className="font-bold text-[30px] mb-[20px]">
+        Total Time Per Activity
+      </h1>
+      <TimeReport />
+    </>
+  );
 
   const buttons = (
     <>
diff --git a/frontend/src/Pages/ProjectManagerPages/PMViewUnsignedReport.tsx b/frontend/src/Pages/ProjectManagerPages/PMViewUnsignedReport.tsx
index cbd3b53..923548f 100644
--- a/frontend/src/Pages/ProjectManagerPages/PMViewUnsignedReport.tsx
+++ b/frontend/src/Pages/ProjectManagerPages/PMViewUnsignedReport.tsx
@@ -1,8 +1,16 @@
 import BasicWindow from "../../Components/BasicWindow";
 import Button from "../../Components/Button";
+import TimeReport from "../../Components/TimeReport";
 
 function PMViewUnsignedReport(): JSX.Element {
-  const content = <></>;
+  const content = (
+    <>
+      <h1 className="font-bold text-[30px] mb-[20px]">
+        Username&apos;s Time Report
+      </h1>
+      <TimeReport />
+    </>
+  );
 
   const buttons = (
     <>
diff --git a/frontend/src/Pages/UserPages/UserEditTimeReportPage.tsx b/frontend/src/Pages/UserPages/UserEditTimeReportPage.tsx
index a8cca94..de1699b 100644
--- a/frontend/src/Pages/UserPages/UserEditTimeReportPage.tsx
+++ b/frontend/src/Pages/UserPages/UserEditTimeReportPage.tsx
@@ -1,8 +1,14 @@
 import BasicWindow from "../../Components/BasicWindow";
 import Button from "../../Components/Button";
+import NewTimeReport from "../../Components/TimeReport";
 
 function UserEditTimeReportPage(): JSX.Element {
-  const content = <></>;
+  const content = (
+    <>
+      <h1 className="font-bold text-[30px] mb-[20px]">Edit Time Report</h1>
+      <NewTimeReport />
+    </>
+  );
 
   const buttons = (
     <>
diff --git a/frontend/src/Pages/UserPages/UserNewTimeReportPage.tsx b/frontend/src/Pages/UserPages/UserNewTimeReportPage.tsx
index d432817..bbd767a 100644
--- a/frontend/src/Pages/UserPages/UserNewTimeReportPage.tsx
+++ b/frontend/src/Pages/UserPages/UserNewTimeReportPage.tsx
@@ -1,10 +1,11 @@
 import BasicWindow from "../../Components/BasicWindow";
 import Button from "../../Components/Button";
-import NewTimeReport from "../../Components/NewTImeReport";
+import NewTimeReport from "../../Components/TimeReport";
 
 function UserNewTimeReportPage(): JSX.Element {
   const content = (
     <>
+      <h1 className="font-bold text-[30px] mb-[20px]">New Time Report</h1>
       <NewTimeReport />
     </>
   );

From 8690e381c8b913e5651813da4bb44276f452e3ad Mon Sep 17 00:00:00 2001
From: Davenludd <david.ludde01@gmail.com>
Date: Thu, 14 Mar 2024 15:49:13 +0100
Subject: [PATCH 19/19] Add links to navigate between pages projectPage &
 NewTimeReport

---
 .../src/Pages/UserPages/UserNewTimeReportPage.tsx | 15 +++++++++------
 frontend/src/Pages/UserPages/UserProjectPage.tsx  | 12 ++++++------
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/frontend/src/Pages/UserPages/UserNewTimeReportPage.tsx b/frontend/src/Pages/UserPages/UserNewTimeReportPage.tsx
index bbd767a..8f96c4a 100644
--- a/frontend/src/Pages/UserPages/UserNewTimeReportPage.tsx
+++ b/frontend/src/Pages/UserPages/UserNewTimeReportPage.tsx
@@ -1,6 +1,7 @@
 import BasicWindow from "../../Components/BasicWindow";
 import Button from "../../Components/Button";
 import NewTimeReport from "../../Components/TimeReport";
+import { Link } from "react-router-dom";
 
 function UserNewTimeReportPage(): JSX.Element {
   const content = (
@@ -18,12 +19,14 @@ function UserNewTimeReportPage(): JSX.Element {
           return;
         }}
       />
-      <Button
-        text="Back"
-        onClick={(): void => {
-          return;
-        }}
-      />
+      <Link to="/project">
+        <Button
+          text="Back"
+          onClick={(): void => {
+            return;
+          }}
+        />
+      </Link>
     </>
   );
 
diff --git a/frontend/src/Pages/UserPages/UserProjectPage.tsx b/frontend/src/Pages/UserPages/UserProjectPage.tsx
index 52c34ed..cfb4a06 100644
--- a/frontend/src/Pages/UserPages/UserProjectPage.tsx
+++ b/frontend/src/Pages/UserPages/UserProjectPage.tsx
@@ -5,16 +5,16 @@ import Button from "../../Components/Button";
 function UserProjectPage(): JSX.Element {
   const content = (
     <>
-      <Link to="/settingsPage">
-        <h1 className="font-bold text-[30px] mb-[20px]">ProjectNameExample</h1>
-      </Link>
+      <h1 className="font-bold text-[30px] mb-[20px]">ProjectNameExample</h1>
       <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]">
         <h1 className="font-bold underline text-[30px] cursor-pointer">
           Your Time Reports
         </h1>
-        <h1 className="font-bold underline text-[30px] cursor-pointer">
-          New Time Report
-        </h1>
+        <Link to="/new-time-report">
+          <h1 className="font-bold underline text-[30px] cursor-pointer">
+            New Time Report
+          </h1>
+        </Link>
       </div>
     </>
   );