From 409d973d8acc9402d5f539155eb6d177bccbfa1c Mon Sep 17 00:00:00 2001
From: pavel Hamawand <pavelhamawand@gmail.com>
Date: Mon, 18 Mar 2024 14:35:56 +0100
Subject: [PATCH 01/16] minor fix

---
 frontend/src/Pages/YourProjectsPage.tsx | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/frontend/src/Pages/YourProjectsPage.tsx b/frontend/src/Pages/YourProjectsPage.tsx
index 2b3fd18..6de09ef 100644
--- a/frontend/src/Pages/YourProjectsPage.tsx
+++ b/frontend/src/Pages/YourProjectsPage.tsx
@@ -1,6 +1,6 @@
 import BasicWindow from "../Components/BasicWindow";
 import { ProjectListUser } from "../Components/ProjectListUser";
-import { Project } from "../Types/Project";
+import { Project } from "../Types/goTypes";
 
 function YourProjectsPage(): JSX.Element {
   //TODO: Change so that it reads projects from database
@@ -10,7 +10,6 @@ function YourProjectsPage(): JSX.Element {
       id: i,
       name: "Example Project " + i,
       description: "good",
-      created: "now",
       owner: "me",
     });
   }

From 576a137038a7ec2bd41bb6bb10eeacaecdf3ee4b Mon Sep 17 00:00:00 2001
From: pavel Hamawand <pavelhamawand@gmail.com>
Date: Mon, 18 Mar 2024 16:00:08 +0100
Subject: [PATCH 02/16] new component

---
 frontend/src/Components/AdminUserList.tsx | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 frontend/src/Components/AdminUserList.tsx

diff --git a/frontend/src/Components/AdminUserList.tsx b/frontend/src/Components/AdminUserList.tsx
new file mode 100644
index 0000000..e69de29

From 8291f4caf30725bd83c12269e3ba7f2da19ef170 Mon Sep 17 00:00:00 2001
From: pavel Hamawand <pavelhamawand@gmail.com>
Date: Mon, 18 Mar 2024 16:11:24 +0100
Subject: [PATCH 03/16] delete component

---
 frontend/src/Components/AdminUserList.tsx | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 frontend/src/Components/AdminUserList.tsx

diff --git a/frontend/src/Components/AdminUserList.tsx b/frontend/src/Components/AdminUserList.tsx
deleted file mode 100644
index e69de29..0000000

From 22b9580f5149fc9eb3d083427ca16f41c17b76e6 Mon Sep 17 00:00:00 2001
From: pavel Hamawand <pavelhamawand@gmail.com>
Date: Mon, 18 Mar 2024 16:13:47 +0100
Subject: [PATCH 04/16] fix backbutton

---
 frontend/src/Pages/AdminPages/AdminAddUser.tsx | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/frontend/src/Pages/AdminPages/AdminAddUser.tsx b/frontend/src/Pages/AdminPages/AdminAddUser.tsx
index c0f9492..c736e4d 100644
--- a/frontend/src/Pages/AdminPages/AdminAddUser.tsx
+++ b/frontend/src/Pages/AdminPages/AdminAddUser.tsx
@@ -1,5 +1,5 @@
+import BackButton from "../../Components/BackButton";
 import BasicWindow from "../../Components/BasicWindow";
-import Button from "../../Components/Button";
 import Register from "../../Components/Register";
 
 function AdminAddUser(): JSX.Element {
@@ -11,13 +11,7 @@ function AdminAddUser(): JSX.Element {
 
   const buttons = (
     <>
-      <Button
-        text="Back"
-        onClick={(): void => {
-          return;
-        }}
-        type="button"
-      />
+      <BackButton />
     </>
   );
 

From b8f669e454f7927e58fb12d1ce38edf485d6cba9 Mon Sep 17 00:00:00 2001
From: pavel Hamawand <pavelhamawand@gmail.com>
Date: Mon, 18 Mar 2024 16:46:02 +0100
Subject: [PATCH 05/16] new component UserProjectListAdmin

---
 frontend/src/Components/UserProjectListAdmin.tsx | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 frontend/src/Components/UserProjectListAdmin.tsx

diff --git a/frontend/src/Components/UserProjectListAdmin.tsx b/frontend/src/Components/UserProjectListAdmin.tsx
new file mode 100644
index 0000000..e69de29

From 4173003d322830ad79998c6ea3716ffcde0426b4 Mon Sep 17 00:00:00 2001
From: pavel Hamawand <pavelhamawand@gmail.com>
Date: Mon, 18 Mar 2024 16:53:13 +0100
Subject: [PATCH 06/16] initial component Setup

---
 frontend/src/Components/UserProjectListAdmin.tsx | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/frontend/src/Components/UserProjectListAdmin.tsx b/frontend/src/Components/UserProjectListAdmin.tsx
index e69de29..62f921a 100644
--- a/frontend/src/Components/UserProjectListAdmin.tsx
+++ b/frontend/src/Components/UserProjectListAdmin.tsx
@@ -0,0 +1,16 @@
+import React from "react";
+import { useEffect, useState } from "react"; // Importing useEffect and useState from React
+import { api } from "../API/API"; // Importing the api object
+import { Project } from "../Types/goTypes"; // Importing the Project type
+
+const UserProjectListAdmin: React.FC = () => {
+  // Define the functional component UserProjectListAdmin
+  return (
+    <div>
+      <h2>User Projects</h2>
+      {/* Placeholder for project list */}
+    </div>
+  );
+};
+
+export default UserProjectListAdmin;

From 90afe80408c2655deb156ada71d0e766b5830d09 Mon Sep 17 00:00:00 2001
From: pavel Hamawand <pavelhamawand@gmail.com>
Date: Mon, 18 Mar 2024 16:54:16 +0100
Subject: [PATCH 07/16] Implement State management

---
 frontend/src/Components/UserProjectListAdmin.tsx | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/frontend/src/Components/UserProjectListAdmin.tsx b/frontend/src/Components/UserProjectListAdmin.tsx
index 62f921a..9d6cc6e 100644
--- a/frontend/src/Components/UserProjectListAdmin.tsx
+++ b/frontend/src/Components/UserProjectListAdmin.tsx
@@ -5,6 +5,8 @@ import { Project } from "../Types/goTypes"; // Importing the Project type
 
 const UserProjectListAdmin: React.FC = () => {
   // Define the functional component UserProjectListAdmin
+  const [projects, setProjects] = useState<Project[]>([]); // State management for projects
+
   return (
     <div>
       <h2>User Projects</h2>

From f61ef87d5e27626d5c650d28dbcc5151f4ee2e85 Mon Sep 17 00:00:00 2001
From: pavel Hamawand <pavelhamawand@gmail.com>
Date: Mon, 18 Mar 2024 16:58:46 +0100
Subject: [PATCH 08/16] Fetch Projects from API - needs fixing

---
 .../src/Components/UserProjectListAdmin.tsx   | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/frontend/src/Components/UserProjectListAdmin.tsx b/frontend/src/Components/UserProjectListAdmin.tsx
index 9d6cc6e..eaebcba 100644
--- a/frontend/src/Components/UserProjectListAdmin.tsx
+++ b/frontend/src/Components/UserProjectListAdmin.tsx
@@ -7,6 +7,27 @@ const UserProjectListAdmin: React.FC = () => {
   // Define the functional component UserProjectListAdmin
   const [projects, setProjects] = useState<Project[]>([]); // State management for projects
 
+  useEffect(() => {
+    const fetchProjects = async (): Promise<void> => {
+      // Define the fetchProjects async function
+      try {
+        const token = localStorage.getItem("accessToken") ?? "";
+        const username = getUsernameFromContext(); // Assuming you have a function to get the username from your context
+
+        const response = await api.getUserProjects(username, token); // Fetch projects from API
+        if (response.success) {
+          setProjects(response.data ?? []); // Update projects state with fetched data
+        } else {
+          console.error("Failed to fetch projects:", response.message);
+        }
+      } catch (error) {
+        console.error("Error fetching projects:", error);
+      }
+    };
+
+    void fetchProjects(); // Call fetchProjects when the component mounts
+  }, []); // Empty dependency array to run effect only once
+
   return (
     <div>
       <h2>User Projects</h2>

From 39983c7f6f75efdb7f77e0bafea97cb3914b5e08 Mon Sep 17 00:00:00 2001
From: pavel Hamawand <pavelhamawand@gmail.com>
Date: Mon, 18 Mar 2024 17:01:11 +0100
Subject: [PATCH 09/16] Render Project List

---
 .../src/Components/UserProjectListAdmin.tsx   | 28 +++++++++++--------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/frontend/src/Components/UserProjectListAdmin.tsx b/frontend/src/Components/UserProjectListAdmin.tsx
index eaebcba..423e793 100644
--- a/frontend/src/Components/UserProjectListAdmin.tsx
+++ b/frontend/src/Components/UserProjectListAdmin.tsx
@@ -1,22 +1,19 @@
-import React from "react";
-import { useEffect, useState } from "react"; // Importing useEffect and useState from React
-import { api } from "../API/API"; // Importing the api object
-import { Project } from "../Types/goTypes"; // Importing the Project type
+import React, { useEffect, useState } from "react";
+import { api } from "../API/API";
+import { Project } from "../Types/goTypes";
 
 const UserProjectListAdmin: React.FC = () => {
-  // Define the functional component UserProjectListAdmin
-  const [projects, setProjects] = useState<Project[]>([]); // State management for projects
+  const [projects, setProjects] = useState<Project[]>([]);
 
   useEffect(() => {
     const fetchProjects = async (): Promise<void> => {
-      // Define the fetchProjects async function
       try {
         const token = localStorage.getItem("accessToken") ?? "";
         const username = getUsernameFromContext(); // Assuming you have a function to get the username from your context
 
-        const response = await api.getUserProjects(username, token); // Fetch projects from API
+        const response = await api.getUserProjects(username, token);
         if (response.success) {
-          setProjects(response.data ?? []); // Update projects state with fetched data
+          setProjects(response.data ?? []);
         } else {
           console.error("Failed to fetch projects:", response.message);
         }
@@ -25,13 +22,20 @@ const UserProjectListAdmin: React.FC = () => {
       }
     };
 
-    void fetchProjects(); // Call fetchProjects when the component mounts
-  }, []); // Empty dependency array to run effect only once
+    void fetchProjects();
+  }, []);
 
   return (
     <div>
       <h2>User Projects</h2>
-      {/* Placeholder for project list */}
+      <ul>
+        {projects.map((project) => (
+          <li key={project.id}>
+            <span>{project.name}</span>
+            {/* Add any additional project details you want to display */}
+          </li>
+        ))}
+      </ul>
     </div>
   );
 };

From e47b251c14a16cc2b366cb7bcd3af93d4edff7cf Mon Sep 17 00:00:00 2001
From: pavel Hamawand <pavelhamawand@gmail.com>
Date: Mon, 18 Mar 2024 17:03:02 +0100
Subject: [PATCH 10/16] implement component

---
 frontend/src/Pages/AdminPages/AdminViewUserInfo.tsx | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/frontend/src/Pages/AdminPages/AdminViewUserInfo.tsx b/frontend/src/Pages/AdminPages/AdminViewUserInfo.tsx
index 44cd2fa..a5c3b2b 100644
--- a/frontend/src/Pages/AdminPages/AdminViewUserInfo.tsx
+++ b/frontend/src/Pages/AdminPages/AdminViewUserInfo.tsx
@@ -1,15 +1,12 @@
-import { useLocation } from "react-router-dom";
 import BasicWindow from "../../Components/BasicWindow";
 import Button from "../../Components/Button";
 import BackButton from "../../Components/BackButton";
+import UserProjectListAdmin from "../../Components/UserProjectListAdmin";
 
 function AdminViewUserInfo(): JSX.Element {
   const content = (
     <>
-      <h1 className="font-bold text-[30px] mb-[20px]">{useLocation().state}</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]">
-        <p>Put relevant info on user from database here</p>
-      </div>
+      <UserProjectListAdmin />
     </>
   );
 

From 3ec0d168eb4891a4f54f3bbab0ab0cb7dfaafa88 Mon Sep 17 00:00:00 2001
From: pavel Hamawand <pavelhamawand@gmail.com>
Date: Mon, 18 Mar 2024 17:05:37 +0100
Subject: [PATCH 11/16] minor fix

---
 frontend/src/Components/UserProjectListAdmin.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/Components/UserProjectListAdmin.tsx b/frontend/src/Components/UserProjectListAdmin.tsx
index 423e793..5da234d 100644
--- a/frontend/src/Components/UserProjectListAdmin.tsx
+++ b/frontend/src/Components/UserProjectListAdmin.tsx
@@ -11,7 +11,7 @@ const UserProjectListAdmin: React.FC = () => {
         const token = localStorage.getItem("accessToken") ?? "";
         const username = getUsernameFromContext(); // Assuming you have a function to get the username from your context
 
-        const response = await api.getUserProjects(username, token);
+        const response = await api.getUserProjects("", token);
         if (response.success) {
           setProjects(response.data ?? []);
         } else {

From 0f7f866cde95c7bc213e23e662b5a9be28e70840 Mon Sep 17 00:00:00 2001
From: pavel Hamawand <pavelhamawand@gmail.com>
Date: Mon, 18 Mar 2024 17:06:05 +0100
Subject: [PATCH 12/16] minor fix

---
 frontend/src/Components/UserProjectListAdmin.tsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/frontend/src/Components/UserProjectListAdmin.tsx b/frontend/src/Components/UserProjectListAdmin.tsx
index 5da234d..60e9ab7 100644
--- a/frontend/src/Components/UserProjectListAdmin.tsx
+++ b/frontend/src/Components/UserProjectListAdmin.tsx
@@ -9,7 +9,6 @@ const UserProjectListAdmin: React.FC = () => {
     const fetchProjects = async (): Promise<void> => {
       try {
         const token = localStorage.getItem("accessToken") ?? "";
-        const username = getUsernameFromContext(); // Assuming you have a function to get the username from your context
 
         const response = await api.getUserProjects("", token);
         if (response.success) {

From b93ef4850052454c667ded14631bf4f5a337c76f Mon Sep 17 00:00:00 2001
From: pavel Hamawand <pavelhamawand@gmail.com>
Date: Mon, 18 Mar 2024 17:07:48 +0100
Subject: [PATCH 13/16] minor fix

---
 frontend/src/Components/UserProjectListAdmin.tsx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/frontend/src/Components/UserProjectListAdmin.tsx b/frontend/src/Components/UserProjectListAdmin.tsx
index 60e9ab7..423e793 100644
--- a/frontend/src/Components/UserProjectListAdmin.tsx
+++ b/frontend/src/Components/UserProjectListAdmin.tsx
@@ -9,8 +9,9 @@ const UserProjectListAdmin: React.FC = () => {
     const fetchProjects = async (): Promise<void> => {
       try {
         const token = localStorage.getItem("accessToken") ?? "";
+        const username = getUsernameFromContext(); // Assuming you have a function to get the username from your context
 
-        const response = await api.getUserProjects("", token);
+        const response = await api.getUserProjects(username, token);
         if (response.success) {
           setProjects(response.data ?? []);
         } else {

From 2493932f77603e3fbdf0ea854d011d6288df83ec Mon Sep 17 00:00:00 2001
From: Peter KW <peter.k.w.96@gmail.com>
Date: Mon, 18 Mar 2024 17:20:29 +0100
Subject: [PATCH 14/16] Removed username prop, no longer used

---
 frontend/src/Components/BasicWindow.tsx | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/frontend/src/Components/BasicWindow.tsx b/frontend/src/Components/BasicWindow.tsx
index 1835d6a..ea37bb8 100644
--- a/frontend/src/Components/BasicWindow.tsx
+++ b/frontend/src/Components/BasicWindow.tsx
@@ -2,7 +2,6 @@ import Header from "./Header";
 import Footer from "./Footer";
 
 function BasicWindow({
-  username,
   content,
   buttons,
 }: {
@@ -12,7 +11,7 @@ function BasicWindow({
 }): JSX.Element {
   return (
     <div className="font-sans flex flex-col h-screen bg-white border-2 border-black overflow-auto pt-[110px]">
-      <Header username={username} />
+      <Header />
       <div className="flex flex-col items-center flex-grow">{content}</div>
       <Footer>{buttons}</Footer>
     </div>

From 388a430613c107e3c851e14d7ab69aa1e7c1be9b Mon Sep 17 00:00:00 2001
From: Peter KW <peter.k.w.96@gmail.com>
Date: Mon, 18 Mar 2024 17:22:40 +0100
Subject: [PATCH 15/16] Tiny fix

---
 frontend/src/Components/BasicWindow.tsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/frontend/src/Components/BasicWindow.tsx b/frontend/src/Components/BasicWindow.tsx
index ea37bb8..d5fd3b6 100644
--- a/frontend/src/Components/BasicWindow.tsx
+++ b/frontend/src/Components/BasicWindow.tsx
@@ -5,7 +5,6 @@ function BasicWindow({
   content,
   buttons,
 }: {
-  username: string;
   content: React.ReactNode;
   buttons: React.ReactNode;
 }): JSX.Element {

From d692165f99616667ac2c8f2b661b669ecb9b4dff Mon Sep 17 00:00:00 2001
From: Peter KW <peter.k.w.96@gmail.com>
Date: Mon, 18 Mar 2024 17:27:32 +0100
Subject: [PATCH 16/16] Removed username prop from basicwindow in all pages

---
 frontend/src/Pages/AdminPages/AdminAddProject.tsx             | 2 +-
 frontend/src/Pages/AdminPages/AdminAddUser.tsx                | 2 +-
 frontend/src/Pages/AdminPages/AdminChangeUsername.tsx         | 2 +-
 frontend/src/Pages/AdminPages/AdminManageProjects.tsx         | 2 +-
 frontend/src/Pages/AdminPages/AdminManageUsers.tsx            | 2 +-
 frontend/src/Pages/AdminPages/AdminMenuPage.tsx               | 2 +-
 frontend/src/Pages/AdminPages/AdminProjectAddMember.tsx       | 2 +-
 frontend/src/Pages/AdminPages/AdminProjectChangeUserRole.tsx  | 2 +-
 frontend/src/Pages/AdminPages/AdminProjectManageMembers.tsx   | 2 +-
 frontend/src/Pages/AdminPages/AdminProjectPage.tsx            | 2 +-
 frontend/src/Pages/AdminPages/AdminProjectStatistics.tsx      | 2 +-
 frontend/src/Pages/AdminPages/AdminProjectViewMemberInfo.tsx  | 2 +-
 frontend/src/Pages/AdminPages/AdminViewUserInfo.tsx           | 2 +-
 frontend/src/Pages/ProjectManagerPages/PMChangeRole.tsx       | 2 +-
 frontend/src/Pages/ProjectManagerPages/PMOtherUsersTR.tsx     | 2 +-
 frontend/src/Pages/ProjectManagerPages/PMProjectMembers.tsx   | 2 +-
 frontend/src/Pages/ProjectManagerPages/PMProjectPage.tsx      | 2 +-
 .../src/Pages/ProjectManagerPages/PMTotalTimeActivity.tsx     | 4 ++--
 frontend/src/Pages/ProjectManagerPages/PMTotalTimeRole.tsx    | 2 +-
 frontend/src/Pages/ProjectManagerPages/PMUnsignedReports.tsx  | 2 +-
 .../src/Pages/ProjectManagerPages/PMViewUnsignedReport.tsx    | 3 ++-
 frontend/src/Pages/UserPages/UserEditTimeReportPage.tsx       | 2 +-
 frontend/src/Pages/UserPages/UserNewTimeReportPage.tsx        | 2 +-
 frontend/src/Pages/UserPages/UserProjectPage.tsx              | 2 +-
 frontend/src/Pages/UserPages/UserViewTimeReportsPage.tsx      | 2 +-
 25 files changed, 27 insertions(+), 26 deletions(-)

diff --git a/frontend/src/Pages/AdminPages/AdminAddProject.tsx b/frontend/src/Pages/AdminPages/AdminAddProject.tsx
index 6df8851..aedbd3f 100644
--- a/frontend/src/Pages/AdminPages/AdminAddProject.tsx
+++ b/frontend/src/Pages/AdminPages/AdminAddProject.tsx
@@ -11,6 +11,6 @@ function AdminAddProject(): JSX.Element {
     </>
   );
 
-  return <BasicWindow username="Admin" content={content} buttons={buttons} />;
+  return <BasicWindow content={content} buttons={buttons} />;
 }
 export default AdminAddProject;
diff --git a/frontend/src/Pages/AdminPages/AdminAddUser.tsx b/frontend/src/Pages/AdminPages/AdminAddUser.tsx
index c736e4d..4af2eb7 100644
--- a/frontend/src/Pages/AdminPages/AdminAddUser.tsx
+++ b/frontend/src/Pages/AdminPages/AdminAddUser.tsx
@@ -15,6 +15,6 @@ function AdminAddUser(): JSX.Element {
     </>
   );
 
-  return <BasicWindow username="Admin" content={content} buttons={buttons} />;
+  return <BasicWindow content={content} buttons={buttons} />;
 }
 export default AdminAddUser;
diff --git a/frontend/src/Pages/AdminPages/AdminChangeUsername.tsx b/frontend/src/Pages/AdminPages/AdminChangeUsername.tsx
index 2e03a8c..1756433 100644
--- a/frontend/src/Pages/AdminPages/AdminChangeUsername.tsx
+++ b/frontend/src/Pages/AdminPages/AdminChangeUsername.tsx
@@ -23,6 +23,6 @@ function AdminChangeUsername(): JSX.Element {
     </>
   );
 
-  return <BasicWindow username="Admin" content={content} buttons={buttons} />;
+  return <BasicWindow content={content} buttons={buttons} />;
 }
 export default AdminChangeUsername;
diff --git a/frontend/src/Pages/AdminPages/AdminManageProjects.tsx b/frontend/src/Pages/AdminPages/AdminManageProjects.tsx
index c5cba2e..177f55b 100644
--- a/frontend/src/Pages/AdminPages/AdminManageProjects.tsx
+++ b/frontend/src/Pages/AdminPages/AdminManageProjects.tsx
@@ -21,6 +21,6 @@ function AdminManageProjects(): JSX.Element {
     </>
   );
 
-  return <BasicWindow username="Admin" content={content} buttons={buttons} />;
+  return <BasicWindow content={content} buttons={buttons} />;
 }
 export default AdminManageProjects;
diff --git a/frontend/src/Pages/AdminPages/AdminManageUsers.tsx b/frontend/src/Pages/AdminPages/AdminManageUsers.tsx
index e62a54c..0939d77 100644
--- a/frontend/src/Pages/AdminPages/AdminManageUsers.tsx
+++ b/frontend/src/Pages/AdminPages/AdminManageUsers.tsx
@@ -36,6 +36,6 @@ function AdminManageUsers(): JSX.Element {
     </>
   );
 
-  return <BasicWindow username="Admin" content={content} buttons={buttons} />;
+  return <BasicWindow content={content} buttons={buttons} />;
 }
 export default AdminManageUsers;
diff --git a/frontend/src/Pages/AdminPages/AdminMenuPage.tsx b/frontend/src/Pages/AdminPages/AdminMenuPage.tsx
index a8da80e..ed2118d 100644
--- a/frontend/src/Pages/AdminPages/AdminMenuPage.tsx
+++ b/frontend/src/Pages/AdminPages/AdminMenuPage.tsx
@@ -22,6 +22,6 @@ function AdminMenuPage(): JSX.Element {
 
   const buttons = <></>;
 
-  return <BasicWindow username="Admin" content={content} buttons={buttons} />;
+  return <BasicWindow content={content} buttons={buttons} />;
 }
 export default AdminMenuPage;
diff --git a/frontend/src/Pages/AdminPages/AdminProjectAddMember.tsx b/frontend/src/Pages/AdminPages/AdminProjectAddMember.tsx
index 63fdb4b..96167cb 100644
--- a/frontend/src/Pages/AdminPages/AdminProjectAddMember.tsx
+++ b/frontend/src/Pages/AdminPages/AdminProjectAddMember.tsx
@@ -23,6 +23,6 @@ function AdminProjectAddMember(): JSX.Element {
     </>
   );
 
-  return <BasicWindow username="Admin" content={content} buttons={buttons} />;
+  return <BasicWindow content={content} buttons={buttons} />;
 }
 export default AdminProjectAddMember;
diff --git a/frontend/src/Pages/AdminPages/AdminProjectChangeUserRole.tsx b/frontend/src/Pages/AdminPages/AdminProjectChangeUserRole.tsx
index dd80fa9..dd355e8 100644
--- a/frontend/src/Pages/AdminPages/AdminProjectChangeUserRole.tsx
+++ b/frontend/src/Pages/AdminPages/AdminProjectChangeUserRole.tsx
@@ -23,6 +23,6 @@ function AdminProjectChangeUserRole(): JSX.Element {
     </>
   );
 
-  return <BasicWindow username="Admin" content={content} buttons={buttons} />;
+  return <BasicWindow content={content} buttons={buttons} />;
 }
 export default AdminProjectChangeUserRole;
diff --git a/frontend/src/Pages/AdminPages/AdminProjectManageMembers.tsx b/frontend/src/Pages/AdminPages/AdminProjectManageMembers.tsx
index 717e8c5..c89e4c4 100644
--- a/frontend/src/Pages/AdminPages/AdminProjectManageMembers.tsx
+++ b/frontend/src/Pages/AdminPages/AdminProjectManageMembers.tsx
@@ -23,6 +23,6 @@ function AdminProjectManageMembers(): JSX.Element {
     </>
   );
 
-  return <BasicWindow username="Admin" content={content} buttons={buttons} />;
+  return <BasicWindow content={content} buttons={buttons} />;
 }
 export default AdminProjectManageMembers;
diff --git a/frontend/src/Pages/AdminPages/AdminProjectPage.tsx b/frontend/src/Pages/AdminPages/AdminProjectPage.tsx
index 0b15aeb..a1266ad 100644
--- a/frontend/src/Pages/AdminPages/AdminProjectPage.tsx
+++ b/frontend/src/Pages/AdminPages/AdminProjectPage.tsx
@@ -23,6 +23,6 @@ function AdminProjectPage(): JSX.Element {
     </>
   );
 
-  return <BasicWindow username="Admin" content={content} buttons={buttons} />;
+  return <BasicWindow content={content} buttons={buttons} />;
 }
 export default AdminProjectPage;
diff --git a/frontend/src/Pages/AdminPages/AdminProjectStatistics.tsx b/frontend/src/Pages/AdminPages/AdminProjectStatistics.tsx
index a5d9f95..dbf3428 100644
--- a/frontend/src/Pages/AdminPages/AdminProjectStatistics.tsx
+++ b/frontend/src/Pages/AdminPages/AdminProjectStatistics.tsx
@@ -16,6 +16,6 @@ function AdminProjectStatistics(): JSX.Element {
     </>
   );
 
-  return <BasicWindow username="Admin" content={content} buttons={buttons} />;
+  return <BasicWindow content={content} buttons={buttons} />;
 }
 export default AdminProjectStatistics;
diff --git a/frontend/src/Pages/AdminPages/AdminProjectViewMemberInfo.tsx b/frontend/src/Pages/AdminPages/AdminProjectViewMemberInfo.tsx
index e15ef35..1c9f28c 100644
--- a/frontend/src/Pages/AdminPages/AdminProjectViewMemberInfo.tsx
+++ b/frontend/src/Pages/AdminPages/AdminProjectViewMemberInfo.tsx
@@ -23,6 +23,6 @@ function AdminProjectViewMemberInfo(): JSX.Element {
     </>
   );
 
-  return <BasicWindow username="Admin" content={content} buttons={buttons} />;
+  return <BasicWindow content={content} buttons={buttons} />;
 }
 export default AdminProjectViewMemberInfo;
diff --git a/frontend/src/Pages/AdminPages/AdminViewUserInfo.tsx b/frontend/src/Pages/AdminPages/AdminViewUserInfo.tsx
index a5c3b2b..fc678e2 100644
--- a/frontend/src/Pages/AdminPages/AdminViewUserInfo.tsx
+++ b/frontend/src/Pages/AdminPages/AdminViewUserInfo.tsx
@@ -23,6 +23,6 @@ function AdminViewUserInfo(): JSX.Element {
     </>
   );
 
-  return <BasicWindow username="Admin" content={content} buttons={buttons} />;
+  return <BasicWindow content={content} buttons={buttons} />;
 }
 export default AdminViewUserInfo;
diff --git a/frontend/src/Pages/ProjectManagerPages/PMChangeRole.tsx b/frontend/src/Pages/ProjectManagerPages/PMChangeRole.tsx
index 606e474..9f233a1 100644
--- a/frontend/src/Pages/ProjectManagerPages/PMChangeRole.tsx
+++ b/frontend/src/Pages/ProjectManagerPages/PMChangeRole.tsx
@@ -18,6 +18,6 @@ function ChangeRole(): JSX.Element {
     </>
   );
 
-  return <BasicWindow username="Admin" content={content} buttons={buttons} />;
+  return <BasicWindow content={content} buttons={buttons} />;
 }
 export default ChangeRole;
diff --git a/frontend/src/Pages/ProjectManagerPages/PMOtherUsersTR.tsx b/frontend/src/Pages/ProjectManagerPages/PMOtherUsersTR.tsx
index 19ebbd9..c76947b 100644
--- a/frontend/src/Pages/ProjectManagerPages/PMOtherUsersTR.tsx
+++ b/frontend/src/Pages/ProjectManagerPages/PMOtherUsersTR.tsx
@@ -10,6 +10,6 @@ function PMOtherUsersTR(): JSX.Element {
     </>
   );
 
-  return <BasicWindow username="Admin" content={content} buttons={buttons} />;
+  return <BasicWindow content={content} buttons={buttons} />;
 }
 export default PMOtherUsersTR;
diff --git a/frontend/src/Pages/ProjectManagerPages/PMProjectMembers.tsx b/frontend/src/Pages/ProjectManagerPages/PMProjectMembers.tsx
index bbafd6a..9fe96cf 100644
--- a/frontend/src/Pages/ProjectManagerPages/PMProjectMembers.tsx
+++ b/frontend/src/Pages/ProjectManagerPages/PMProjectMembers.tsx
@@ -30,6 +30,6 @@ function PMProjectMembers(): JSX.Element {
     </>
   );
 
-  return <BasicWindow username="Admin" content={content} buttons={buttons} />;
+  return <BasicWindow content={content} buttons={buttons} />;
 }
 export default PMProjectMembers;
diff --git a/frontend/src/Pages/ProjectManagerPages/PMProjectPage.tsx b/frontend/src/Pages/ProjectManagerPages/PMProjectPage.tsx
index 8e724f3..bd4e6ef 100644
--- a/frontend/src/Pages/ProjectManagerPages/PMProjectPage.tsx
+++ b/frontend/src/Pages/ProjectManagerPages/PMProjectPage.tsx
@@ -31,6 +31,6 @@ function PMProjectPage(): JSX.Element {
     </>
   );
 
-  return <BasicWindow username="Admin" content={content} buttons={undefined} />;
+  return <BasicWindow content={content} buttons={undefined} />;
 }
 export default PMProjectPage;
diff --git a/frontend/src/Pages/ProjectManagerPages/PMTotalTimeActivity.tsx b/frontend/src/Pages/ProjectManagerPages/PMTotalTimeActivity.tsx
index 35ed6ac..676ea28 100644
--- a/frontend/src/Pages/ProjectManagerPages/PMTotalTimeActivity.tsx
+++ b/frontend/src/Pages/ProjectManagerPages/PMTotalTimeActivity.tsx
@@ -1,5 +1,5 @@
+import BackButton from "../../Components/BackButton";
 import BasicWindow from "../../Components/BasicWindow";
-import Button from "../../Components/Button";
 import TimeReport from "../../Components/NewWeeklyReport";
 
 function PMTotalTimeActivity(): JSX.Element {
@@ -18,6 +18,6 @@ function PMTotalTimeActivity(): JSX.Element {
     </>
   );
 
-  return <BasicWindow username="Admin" content={content} buttons={buttons} />;
+  return <BasicWindow content={content} buttons={buttons} />;
 }
 export default PMTotalTimeActivity;
diff --git a/frontend/src/Pages/ProjectManagerPages/PMTotalTimeRole.tsx b/frontend/src/Pages/ProjectManagerPages/PMTotalTimeRole.tsx
index 05d902f..c0161f8 100644
--- a/frontend/src/Pages/ProjectManagerPages/PMTotalTimeRole.tsx
+++ b/frontend/src/Pages/ProjectManagerPages/PMTotalTimeRole.tsx
@@ -10,6 +10,6 @@ function PMTotalTimeRole(): JSX.Element {
     </>
   );
 
-  return <BasicWindow username="Admin" content={content} buttons={buttons} />;
+  return <BasicWindow content={content} buttons={buttons} />;
 }
 export default PMTotalTimeRole;
diff --git a/frontend/src/Pages/ProjectManagerPages/PMUnsignedReports.tsx b/frontend/src/Pages/ProjectManagerPages/PMUnsignedReports.tsx
index fae3842..713efec 100644
--- a/frontend/src/Pages/ProjectManagerPages/PMUnsignedReports.tsx
+++ b/frontend/src/Pages/ProjectManagerPages/PMUnsignedReports.tsx
@@ -10,6 +10,6 @@ function PMUnsignedReports(): JSX.Element {
     </>
   );
 
-  return <BasicWindow username="Admin" content={content} buttons={buttons} />;
+  return <BasicWindow content={content} buttons={buttons} />;
 }
 export default PMUnsignedReports;
diff --git a/frontend/src/Pages/ProjectManagerPages/PMViewUnsignedReport.tsx b/frontend/src/Pages/ProjectManagerPages/PMViewUnsignedReport.tsx
index 9ca963c..aea25fb 100644
--- a/frontend/src/Pages/ProjectManagerPages/PMViewUnsignedReport.tsx
+++ b/frontend/src/Pages/ProjectManagerPages/PMViewUnsignedReport.tsx
@@ -1,3 +1,4 @@
+import BackButton from "../../Components/BackButton";
 import BasicWindow from "../../Components/BasicWindow";
 import Button from "../../Components/Button";
 import TimeReport from "../../Components/NewWeeklyReport";
@@ -32,6 +33,6 @@ function PMViewUnsignedReport(): JSX.Element {
     </>
   );
 
-  return <BasicWindow username="Admin" content={content} buttons={buttons} />;
+  return <BasicWindow content={content} buttons={buttons} />;
 }
 export default PMViewUnsignedReport;
diff --git a/frontend/src/Pages/UserPages/UserEditTimeReportPage.tsx b/frontend/src/Pages/UserPages/UserEditTimeReportPage.tsx
index e1b1d66..317cec8 100644
--- a/frontend/src/Pages/UserPages/UserEditTimeReportPage.tsx
+++ b/frontend/src/Pages/UserPages/UserEditTimeReportPage.tsx
@@ -16,6 +16,6 @@ function UserEditTimeReportPage(): JSX.Element {
     </>
   );
 
-  return <BasicWindow username="Admin" content={content} buttons={buttons} />;
+  return <BasicWindow content={content} buttons={buttons} />;
 }
 export default UserEditTimeReportPage;
diff --git a/frontend/src/Pages/UserPages/UserNewTimeReportPage.tsx b/frontend/src/Pages/UserPages/UserNewTimeReportPage.tsx
index e54b207..2cdeb15 100644
--- a/frontend/src/Pages/UserPages/UserNewTimeReportPage.tsx
+++ b/frontend/src/Pages/UserPages/UserNewTimeReportPage.tsx
@@ -25,6 +25,6 @@ function UserNewTimeReportPage(): JSX.Element {
     </>
   );
 
-  return <BasicWindow username="Admin" content={content} buttons={buttons} />;
+  return <BasicWindow content={content} buttons={buttons} />;
 }
 export default UserNewTimeReportPage;
diff --git a/frontend/src/Pages/UserPages/UserProjectPage.tsx b/frontend/src/Pages/UserPages/UserProjectPage.tsx
index 4760217..20fe6d7 100644
--- a/frontend/src/Pages/UserPages/UserProjectPage.tsx
+++ b/frontend/src/Pages/UserPages/UserProjectPage.tsx
@@ -27,6 +27,6 @@ function UserProjectPage(): JSX.Element {
     </>
   );
 
-  return <BasicWindow username="Admin" content={content} buttons={buttons} />;
+  return <BasicWindow content={content} buttons={buttons} />;
 }
 export default UserProjectPage;
diff --git a/frontend/src/Pages/UserPages/UserViewTimeReportsPage.tsx b/frontend/src/Pages/UserPages/UserViewTimeReportsPage.tsx
index 1d2c3f4..ca326a0 100644
--- a/frontend/src/Pages/UserPages/UserViewTimeReportsPage.tsx
+++ b/frontend/src/Pages/UserPages/UserViewTimeReportsPage.tsx
@@ -15,6 +15,6 @@ function UserViewTimeReportsPage(): JSX.Element {
     </>
   );
 
-  return <BasicWindow username="Admin" content={content} buttons={buttons} />;
+  return <BasicWindow content={content} buttons={buttons} />;
 }
 export default UserViewTimeReportsPage;