Merge branch 'gruppPP' into BumBranch

frontend/src/Components/BasicWindow.tsx

@@ -2,17 +2,15 @@ import Header from "./Header";
 import Footer from "./Footer";
 
 function BasicWindow({
-  username,
   content,
   buttons,
 }: {
-  username: string;
   content: React.ReactNode;
   buttons: React.ReactNode;
 }): 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>

frontend/src/Components/UserProjectListAdmin.tsx

@@ -0,0 +1,43 @@
+import React, { useEffect, useState } from "react";
+import { api } from "../API/API";
+import { Project } from "../Types/goTypes";
+
+const UserProjectListAdmin: React.FC = () => {
+  const [projects, setProjects] = useState<Project[]>([]);
+
+  useEffect(() => {
+    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(username, token);
+        if (response.success) {
+          setProjects(response.data ?? []);
+        } else {
+          console.error("Failed to fetch projects:", response.message);
+        }
+      } catch (error) {
+        console.error("Error fetching projects:", error);
+      }
+    };
+
+    void fetchProjects();
+  }, []);
+
+  return (
+    <div>
+      <h2>User Projects</h2>
+      <ul>
+        {projects.map((project) => (
+          <li key={project.id}>
+            <span>{project.name}</span>
+            {/* Add any additional project details you want to display */}
+          </li>
+        ))}
+      </ul>
+    </div>
+  );
+};
+
+export default UserProjectListAdmin;

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;

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,16 +11,10 @@ function AdminAddUser(): JSX.Element {
 
   const buttons = (
     <>
-      <Button
+      <BackButton />
-        text="Back"
-        onClick={(): void => {
-          return;
-        }}
-        type="button"
-      />
     </>
   );
 
-  return <BasicWindow username="Admin" content={content} buttons={buttons} />;
+  return <BasicWindow content={content} buttons={buttons} />;
 }
 export default AdminAddUser;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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>
+      <UserProjectListAdmin />
-      <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>
     </>
   );
 
@@ -26,6 +23,6 @@ function AdminViewUserInfo(): JSX.Element {
     </>
   );
 
-  return <BasicWindow username="Admin" content={content} buttons={buttons} />;
+  return <BasicWindow content={content} buttons={buttons} />;
 }
 export default AdminViewUserInfo;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;