From 63fd2e9b6f46aa1ca81ce358a4aed5cde5844648 Mon Sep 17 00:00:00 2001
From: Johanna <johannamalmborg@hotmail.com>
Date: Tue, 19 Mar 2024 21:47:16 +0100
Subject: [PATCH 01/76] //fix parse in NewWeeklyReport

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

diff --git a/frontend/src/Components/NewWeeklyReport.tsx b/frontend/src/Components/NewWeeklyReport.tsx
index ab9084d..1d029c3 100644
--- a/frontend/src/Components/NewWeeklyReport.tsx
+++ b/frontend/src/Components/NewWeeklyReport.tsx
@@ -54,8 +54,7 @@ export default function NewWeeklyReport(): JSX.Element {
               type="week"
               placeholder="Week"
               onChange={(e) => {
-                const weekNumber = parseInt(e.target.value.split("-W")[1]);
-                setWeek(weekNumber);
+              setWeek(parseInt(e.target.value));
               }}
               onKeyDown={(event) => {
                 const keyValue = event.key;

From 1974607fc705fc17165732ff6282bea955cd55b4 Mon Sep 17 00:00:00 2001
From: Johanna <johannamalmborg@hotmail.com>
Date: Tue, 19 Mar 2024 22:04:20 +0100
Subject: [PATCH 02/76] Formating

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

diff --git a/frontend/src/Components/NewWeeklyReport.tsx b/frontend/src/Components/NewWeeklyReport.tsx
index 1d029c3..4542855 100644
--- a/frontend/src/Components/NewWeeklyReport.tsx
+++ b/frontend/src/Components/NewWeeklyReport.tsx
@@ -54,7 +54,7 @@ export default function NewWeeklyReport(): JSX.Element {
               type="week"
               placeholder="Week"
               onChange={(e) => {
-              setWeek(parseInt(e.target.value));
+                setWeek(parseInt(e.target.value));
               }}
               onKeyDown={(event) => {
                 const keyValue = event.key;

From 54e42cd2a8939647cc1f9837c76ccc0433f0bb9f Mon Sep 17 00:00:00 2001
From: Davenludd <david.ludde01@gmail.com>
Date: Wed, 20 Mar 2024 15:19:09 +0100
Subject: [PATCH 03/76] Add support for week input in Chrome and Edge browsers

---
 frontend/src/Components/NewWeeklyReport.tsx | 58 +++++++++++++++------
 1 file changed, 42 insertions(+), 16 deletions(-)

diff --git a/frontend/src/Components/NewWeeklyReport.tsx b/frontend/src/Components/NewWeeklyReport.tsx
index 292ddf5..2593782 100644
--- a/frontend/src/Components/NewWeeklyReport.tsx
+++ b/frontend/src/Components/NewWeeklyReport.tsx
@@ -38,6 +38,7 @@ export default function NewWeeklyReport(): JSX.Element {
   };
 
   const navigate = useNavigate();
+  const isChromeOrEdge = /Chrome|Edg/.test(navigator.userAgent);
 
   return (
     <>
@@ -55,23 +56,48 @@ export default function NewWeeklyReport(): JSX.Element {
           }}
         >
           <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"
-              onChange={(e) => {
-                const weekNumber = parseInt(e.target.value.split("-W")[1]);
-                setWeek(weekNumber);
-              }}
-              onKeyDown={(event) => {
-                const keyValue = event.key;
-                if (!/\d/.test(keyValue) && keyValue !== "Backspace")
+            {isChromeOrEdge ? (
+              <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"
+                onChange={(e) => {
+                  const weekNumber = parseInt(e.target.value.split("-W")[1]);
+                  setWeek(weekNumber);
+                }}
+                onKeyDown={(event) => {
+                  const keyValue = event.key;
+                  if (!/\d/.test(keyValue) && keyValue !== "Backspace")
+                    event.preventDefault();
+                }}
+                onPaste={(event) => {
                   event.preventDefault();
-              }}
-              onPaste={(event) => {
-                event.preventDefault();
-              }}
-            />
+                }}
+              />
+            ) : (
+              <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="text"
+                placeholder="Week (Numbers Only)"
+                onChange={(e) => {
+                  const weekNumber = parseInt(e.target.value);
+                  if (isNaN(weekNumber) || weekNumber < 1 || weekNumber > 53) {
+                    setWeek(0);
+                    return;
+                  } else {
+                    setWeek(weekNumber);
+                  }
+                }}
+                onKeyDown={(event) => {
+                  const keyValue = event.key;
+                  if (!/\d/.test(keyValue) && keyValue !== "Backspace")
+                    event.preventDefault();
+                }}
+                onPaste={(event) => {
+                  event.preventDefault();
+                }}
+              />
+            )}
             <table className="w-full text-center divide-y divide-x divide-white text-[30px]">
               <thead>
                 <tr>

From caa793d036d24c29820ff23a345a6cd4114d57bd Mon Sep 17 00:00:00 2001
From: Davenludd <david.ludde01@gmail.com>
Date: Wed, 20 Mar 2024 15:32:14 +0100
Subject: [PATCH 04/76] Fix week validation in NewWeeklyReport component for
 safari and firefox

---
 frontend/src/Components/NewWeeklyReport.tsx | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/frontend/src/Components/NewWeeklyReport.tsx b/frontend/src/Components/NewWeeklyReport.tsx
index 2593782..f1ce3f8 100644
--- a/frontend/src/Components/NewWeeklyReport.tsx
+++ b/frontend/src/Components/NewWeeklyReport.tsx
@@ -45,8 +45,8 @@ export default function NewWeeklyReport(): JSX.Element {
       <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");
+            if (week === 0 || week > 53 || week < 1) {
+              alert("Please enter a valid week number");
               e.preventDefault();
               return;
             }
@@ -81,12 +81,7 @@ export default function NewWeeklyReport(): JSX.Element {
                 placeholder="Week (Numbers Only)"
                 onChange={(e) => {
                   const weekNumber = parseInt(e.target.value);
-                  if (isNaN(weekNumber) || weekNumber < 1 || weekNumber > 53) {
-                    setWeek(0);
-                    return;
-                  } else {
-                    setWeek(weekNumber);
-                  }
+                  setWeek(weekNumber);
                 }}
                 onKeyDown={(event) => {
                   const keyValue = event.key;

From 8084f722b50f3742fbb50abdf1cf732618a4b36e Mon Sep 17 00:00:00 2001
From: Davenludd <david.ludde01@gmail.com>
Date: Wed, 20 Mar 2024 15:32:30 +0100
Subject: [PATCH 05/76] Fixies in API and component code

---
 frontend/src/API/API.ts                           | 15 +++++++++------
 .../src/Components/AllTimeReportsInProject.tsx    |  2 +-
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/frontend/src/API/API.ts b/frontend/src/API/API.ts
index ad6ac02..f82be5a 100644
--- a/frontend/src/API/API.ts
+++ b/frontend/src/API/API.ts
@@ -282,13 +282,16 @@ export const api: API = {
     token: string,
   ): Promise<APIResponse<WeeklyReport[]>> {
     try {
-      const response = await fetch(`/api/getWeeklyReportsUser?username=${username}&projectName=${projectName}`, {
-        method: "GET",
-        headers: {
-          "Content-Type": "application/json",
-          Authorization: "Bearer " + token,
+      const response = await fetch(
+        `/api/getWeeklyReportsUser?username=${username}&projectName=${projectName}`,
+        {
+          method: "GET",
+          headers: {
+            "Content-Type": "application/json",
+            Authorization: "Bearer " + token,
+          },
         },
-      });
+      );
 
       if (!response.ok) {
         return {
diff --git a/frontend/src/Components/AllTimeReportsInProject.tsx b/frontend/src/Components/AllTimeReportsInProject.tsx
index 26f26cf..354c44b 100644
--- a/frontend/src/Components/AllTimeReportsInProject.tsx
+++ b/frontend/src/Components/AllTimeReportsInProject.tsx
@@ -15,7 +15,7 @@ function AllTimeReportsInProject(): JSX.Element {
 
   const getWeeklyReports = async (): Promise<void> => {
     const token = localStorage.getItem("accessToken") ?? "";
-    const response = await api.getWeeklyReportsForProject(
+    const response = await api.getWeeklyReportsForUser(
       localStorage.getItem("username") ?? "",
       projectName ?? "",
       token,

From 287e97fe6fd200ac758fb2d3bdcf4fe7172be046 Mon Sep 17 00:00:00 2001
From: Mattias <mattias.rasmusson.1032@student.lu.se>
Date: Wed, 20 Mar 2024 16:24:10 +0100
Subject: [PATCH 06/76] Updated path in main

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

diff --git a/frontend/src/main.tsx b/frontend/src/main.tsx
index bac2292..643eb62 100644
--- a/frontend/src/main.tsx
+++ b/frontend/src/main.tsx
@@ -84,7 +84,7 @@ const router = createBrowserRouter([
     element: <PMTotalTimeActivity />,
   },
   {
-    path: "/PMTimeRole",
+    path: "/PMTimeRole/:projectName",
     element: <PMTotalTimeRole />,
   },
   {

From dd02c2c5c667aa494380514340db3ed34c0e0053 Mon Sep 17 00:00:00 2001
From: Mattias <mattias.rasmusson.1032@student.lu.se>
Date: Wed, 20 Mar 2024 16:24:38 +0100
Subject: [PATCH 07/76] Brand new TimePerRole component deluxe edition

---
 frontend/src/Components/TimePerRole.tsx       | 141 ++++++++++++++++++
 .../ProjectManagerPages/PMTotalTimeRole.tsx   |   7 +-
 2 files changed, 147 insertions(+), 1 deletion(-)
 create mode 100644 frontend/src/Components/TimePerRole.tsx

diff --git a/frontend/src/Components/TimePerRole.tsx b/frontend/src/Components/TimePerRole.tsx
new file mode 100644
index 0000000..a43e732
--- /dev/null
+++ b/frontend/src/Components/TimePerRole.tsx
@@ -0,0 +1,141 @@
+import { useState, useEffect } from "react";
+import { useParams } from "react-router-dom";
+
+/**
+ * Renders the component for showing total time per role in a project.
+ * @returns JSX.Element
+ */
+export default function TimePerRole(): JSX.Element {
+  const [PManagerTime, setPManagerTime] = useState(0);
+  const [SManagerTime, setSManagerTime] = useState(0);
+  const [DeveloperTime, setDeveloperTime] = useState(0);
+  const [TesterTime, setTesterTime] = useState(0);
+
+  //   const token = localStorage.getItem("accessToken") ?? "";
+  //   const username = localStorage.getItem("username") ?? "";
+  const { projectName } = useParams();
+
+  //   const fetchTimePerRole = async (): Promise<void> => {
+  //     const response = await api.getTimePerRole(
+  //       username,
+  //       projectName ?? "",
+  //       token,
+  //     );
+  // {
+  //     if (response.success) {
+  //       const report: TimePerRole = response.data ?? {
+  //         PManagerTime: 0,
+  //         SManagerTime: 0,
+  //         DeveloperTime: 0,
+  //         TesterTime: 0,
+  //       };
+  //     } else {
+  //       console.error("Failed to fetch weekly report:", response.message);
+  //     }
+  //   }
+
+  interface TimePerRole {
+    PManager: number;
+    SManager: number;
+    Developer: number;
+    Tester: number;
+  }
+
+  const fetchWeeklyReport = async (): Promise<void> => {
+    // Use mock data
+    const report: TimePerRole = {
+      PManager: 120,
+      SManager: 80,
+      Developer: 200,
+      Tester: 150,
+    };
+
+    // Set the state with the mock data
+    setPManagerTime(report.PManager);
+    setSManagerTime(report.SManager);
+    setDeveloperTime(report.Developer);
+    setTesterTime(report.Tester);
+
+    await Promise.resolve();
+  };
+
+  useEffect(() => {
+    void fetchWeeklyReport();
+  });
+
+  return (
+    <>
+      <h1 className="font-bold text-[30px] mb-[20px]">
+        Total Time Per Role In: {projectName}{" "}
+      </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">
+        <div className="flex flex-col items-center">
+          <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">Role</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>Project Manager</td>
+                <td>
+                  <input
+                    type="string"
+                    className="border-2 border-black rounded-md text-center w-1/2"
+                    value={PManagerTime}
+                    onKeyDown={(event) => {
+                      event.preventDefault();
+                    }}
+                  />
+                </td>
+              </tr>
+              <tr className="h-[10vh]">
+                <td>System Manager</td>
+                <td>
+                  <input
+                    type="string"
+                    className="border-2 border-black rounded-md text-center w-1/2"
+                    value={SManagerTime}
+                    onKeyDown={(event) => {
+                      event.preventDefault();
+                    }}
+                  />
+                </td>
+              </tr>
+              <tr className="h-[10vh]">
+                <td>Administration</td>
+                <td>
+                  <input
+                    type="string"
+                    className="border-2 border-black rounded-md text-center w-1/2"
+                    value={DeveloperTime}
+                    onKeyDown={(event) => {
+                      event.preventDefault();
+                    }}
+                  />
+                </td>
+              </tr>
+              <tr className="h-[10vh]">
+                <td>Own Work</td>
+                <td>
+                  <input
+                    type="string"
+                    className="border-2 border-black rounded-md text-center w-1/2"
+                    value={TesterTime}
+                    onKeyDown={(event) => {
+                      event.preventDefault();
+                    }}
+                  />
+                </td>
+              </tr>
+            </tbody>
+          </table>
+        </div>
+      </div>
+    </>
+  );
+}
diff --git a/frontend/src/Pages/ProjectManagerPages/PMTotalTimeRole.tsx b/frontend/src/Pages/ProjectManagerPages/PMTotalTimeRole.tsx
index c0161f8..7caea04 100644
--- a/frontend/src/Pages/ProjectManagerPages/PMTotalTimeRole.tsx
+++ b/frontend/src/Pages/ProjectManagerPages/PMTotalTimeRole.tsx
@@ -1,8 +1,13 @@
 import BasicWindow from "../../Components/BasicWindow";
 import BackButton from "../../Components/BackButton";
+import TimePerRole from "../../Components/TimePerRole";
 
 function PMTotalTimeRole(): JSX.Element {
-  const content = <></>;
+  const content = (
+    <>
+      <TimePerRole />
+    </>
+  );
 
   const buttons = (
     <>

From 4030031ce9c1c936e31ac5b8a13f0764e3a33a22 Mon Sep 17 00:00:00 2001
From: Mattias <mattias.rasmusson.1032@student.lu.se>
Date: Wed, 20 Mar 2024 16:36:24 +0100
Subject: [PATCH 08/76] New comp TimePerActivity

---
 frontend/src/Components/TimePerActivity.tsx   | 175 ++++++++++++++++++
 .../PMTotalTimeActivity.tsx                   |   7 +-
 2 files changed, 177 insertions(+), 5 deletions(-)
 create mode 100644 frontend/src/Components/TimePerActivity.tsx

diff --git a/frontend/src/Components/TimePerActivity.tsx b/frontend/src/Components/TimePerActivity.tsx
new file mode 100644
index 0000000..3dc1a6b
--- /dev/null
+++ b/frontend/src/Components/TimePerActivity.tsx
@@ -0,0 +1,175 @@
+import { useState, useEffect } from "react";
+import { useParams } from "react-router-dom";
+
+/**
+ * Renders the component for showing total time per role in a project.
+ * @returns JSX.Element
+ */
+export default function TimePerRole(): JSX.Element {
+  const [developmentTime, setDevelopmentTime] = useState<number>();
+  const [meetingTime, setMeetingTime] = useState<number>();
+  const [adminTime, setAdminTime] = useState<number>();
+  const [ownWorkTime, setOwnWorkTime] = useState<number>();
+  const [studyTime, setStudyTime] = useState<number>();
+  const [testingTime, setTestingTime] = useState<number>();
+
+  //   const token = localStorage.getItem("accessToken") ?? "";
+  //   const username = localStorage.getItem("username") ?? "";
+  const { projectName } = useParams();
+
+  //   const fetchTimePerRole = async (): Promise<void> => {
+  //     const response = await api.getTimePerRole(
+  //       username,
+  //       projectName ?? "",
+  //       token,
+  //     );
+  // {
+  //     if (response.success) {
+  //       const report: TimePerRole = response.data ?? {
+  //         PManagerTime: 0,
+  //         SManagerTime: 0,
+  //         DeveloperTime: 0,
+  //         TesterTime: 0,
+  //       };
+  //     } else {
+  //       console.error("Failed to fetch weekly report:", response.message);
+  //     }
+  //   }
+
+  interface TimePerActivity {
+    developmentTime: number;
+    meetingTime: number;
+    adminTime: number;
+    ownWorkTime: number;
+    studyTime: number;
+    testingTime: number;
+  }
+
+  const fetchTimePerActivity = async (): Promise<void> => {
+    // Use mock data
+    const report: TimePerActivity = {
+      developmentTime: 100,
+      meetingTime: 200,
+      adminTime: 300,
+      ownWorkTime: 50,
+      studyTime: 75,
+      testingTime: 110,
+    };
+
+    // Set the state with the mock data
+    setDevelopmentTime(report.developmentTime);
+    setMeetingTime(report.meetingTime);
+    setAdminTime(report.adminTime);
+    setOwnWorkTime(report.ownWorkTime);
+    setStudyTime(report.studyTime);
+    setTestingTime(report.testingTime);
+
+    await Promise.resolve();
+  };
+
+  useEffect(() => {
+    void fetchTimePerActivity();
+  });
+
+  return (
+    <>
+      <h1 className="font-bold text-[30px] mb-[20px]">
+        Total Time Per Activity In: {projectName}{" "}
+      </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">
+        <div className="flex flex-col items-center">
+          <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="string"
+                    className="border-2 border-black rounded-md text-center w-1/2"
+                    value={developmentTime}
+                    onKeyDown={(event) => {
+                      event.preventDefault();
+                    }}
+                  />
+                </td>
+              </tr>
+              <tr className="h-[10vh]">
+                <td>Meeting</td>
+                <td>
+                  <input
+                    type="string"
+                    className="border-2 border-black rounded-md text-center w-1/2"
+                    value={meetingTime}
+                    onKeyDown={(event) => {
+                      event.preventDefault();
+                    }}
+                  />
+                </td>
+              </tr>
+              <tr className="h-[10vh]">
+                <td>Administration</td>
+                <td>
+                  <input
+                    type="string"
+                    className="border-2 border-black rounded-md text-center w-1/2"
+                    value={adminTime}
+                    onKeyDown={(event) => {
+                      event.preventDefault();
+                    }}
+                  />
+                </td>
+              </tr>
+              <tr className="h-[10vh]">
+                <td>Own Work</td>
+                <td>
+                  <input
+                    type="string"
+                    className="border-2 border-black rounded-md text-center w-1/2"
+                    value={ownWorkTime}
+                    onKeyDown={(event) => {
+                      event.preventDefault();
+                    }}
+                  />
+                </td>
+              </tr>
+              <tr className="h-[10vh]">
+                <td>Studies</td>
+                <td>
+                  <input
+                    type="string"
+                    className="border-2 border-black rounded-md text-center w-1/2"
+                    value={studyTime}
+                    onKeyDown={(event) => {
+                      event.preventDefault();
+                    }}
+                  />
+                </td>
+              </tr>
+              <tr className="h-[10vh]">
+                <td>Testing</td>
+                <td>
+                  <input
+                    type="string"
+                    className="border-2 border-black rounded-md text-center w-1/2"
+                    value={testingTime}
+                    onKeyDown={(event) => {
+                      event.preventDefault();
+                    }}
+                  />
+                </td>
+              </tr>
+            </tbody>
+          </table>
+        </div>
+      </div>
+    </>
+  );
+}
diff --git a/frontend/src/Pages/ProjectManagerPages/PMTotalTimeActivity.tsx b/frontend/src/Pages/ProjectManagerPages/PMTotalTimeActivity.tsx
index 676ea28..257a89c 100644
--- a/frontend/src/Pages/ProjectManagerPages/PMTotalTimeActivity.tsx
+++ b/frontend/src/Pages/ProjectManagerPages/PMTotalTimeActivity.tsx
@@ -1,14 +1,11 @@
 import BackButton from "../../Components/BackButton";
 import BasicWindow from "../../Components/BasicWindow";
-import TimeReport from "../../Components/NewWeeklyReport";
+import TimePerActivity from "../../Components/TimePerActivity";
 
 function PMTotalTimeActivity(): JSX.Element {
   const content = (
     <>
-      <h1 className="font-bold text-[30px] mb-[20px]">
-        Total Time Per Activity
-      </h1>
-      <TimeReport />
+      <TimePerActivity />
     </>
   );
 

From a3fc71f4bfc0b6131deef705312a45fb2355f912 Mon Sep 17 00:00:00 2001
From: Mattias <mattias.rasmusson.1032@student.lu.se>
Date: Wed, 20 Mar 2024 16:36:32 +0100
Subject: [PATCH 09/76] Changed path in main

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

diff --git a/frontend/src/main.tsx b/frontend/src/main.tsx
index 643eb62..c023660 100644
--- a/frontend/src/main.tsx
+++ b/frontend/src/main.tsx
@@ -80,7 +80,7 @@ const router = createBrowserRouter([
     element: <PMProjectPage />,
   },
   {
-    path: "/PMTimeActivity",
+    path: "/PMTimeActivity/:projectName",
     element: <PMTotalTimeActivity />,
   },
   {

From 0befc4c7d18ae4ff11fb080d8a60b1868da5cf10 Mon Sep 17 00:00:00 2001
From: Mattias <mattias.rasmusson.1032@student.lu.se>
Date: Wed, 20 Mar 2024 16:36:39 +0100
Subject: [PATCH 10/76] Minor fix

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

diff --git a/frontend/src/Components/TimePerRole.tsx b/frontend/src/Components/TimePerRole.tsx
index a43e732..f62d83a 100644
--- a/frontend/src/Components/TimePerRole.tsx
+++ b/frontend/src/Components/TimePerRole.tsx
@@ -41,7 +41,7 @@ export default function TimePerRole(): JSX.Element {
     Tester: number;
   }
 
-  const fetchWeeklyReport = async (): Promise<void> => {
+  const fetchTimePerRole = async (): Promise<void> => {
     // Use mock data
     const report: TimePerRole = {
       PManager: 120,
@@ -60,7 +60,7 @@ export default function TimePerRole(): JSX.Element {
   };
 
   useEffect(() => {
-    void fetchWeeklyReport();
+    void fetchTimePerRole();
   });
 
   return (

From b99de71c38fa7f030bc43b6678f18f4d24c4c98b Mon Sep 17 00:00:00 2001
From: Mattias <mattias.rasmusson.1032@student.lu.se>
Date: Wed, 20 Mar 2024 16:41:32 +0100
Subject: [PATCH 11/76] Update links in PMProjectMembers component

---
 frontend/src/Pages/ProjectManagerPages/PMProjectMembers.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/src/Pages/ProjectManagerPages/PMProjectMembers.tsx b/frontend/src/Pages/ProjectManagerPages/PMProjectMembers.tsx
index 11b8636..f7c902e 100644
--- a/frontend/src/Pages/ProjectManagerPages/PMProjectMembers.tsx
+++ b/frontend/src/Pages/ProjectManagerPages/PMProjectMembers.tsx
@@ -17,7 +17,7 @@ function PMProjectMembers(): JSX.Element {
 
   const buttons = (
     <>
-      <Link to="/PM-time-activity">
+      <Link to={`/PMtimeactivity/${projectName}`}>
         <Button
           text="Time / Activity"
           onClick={(): void => {
@@ -26,7 +26,7 @@ function PMProjectMembers(): JSX.Element {
           type={"button"}
         />
       </Link>
-      <Link to="/PM-time-role">
+      <Link to={`/PMtimerole/${projectName}`}>
         <Button
           text="Time / Role"
           onClick={(): void => {

From e4f5fbda443a70151ebd1b16df6b37e18826dfe3 Mon Sep 17 00:00:00 2001
From: Davenludd <david.ludde01@gmail.com>
Date: Wed, 20 Mar 2024 16:46:27 +0100
Subject: [PATCH 12/76] Fix useEffect dependency in AllTimeReportsInProject
 component

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

diff --git a/frontend/src/Components/AllTimeReportsInProject.tsx b/frontend/src/Components/AllTimeReportsInProject.tsx
index 354c44b..e8373a4 100644
--- a/frontend/src/Components/AllTimeReportsInProject.tsx
+++ b/frontend/src/Components/AllTimeReportsInProject.tsx
@@ -31,7 +31,7 @@ function AllTimeReportsInProject(): JSX.Element {
   // Call getProjects when the component mounts
   useEffect(() => {
     void getWeeklyReports();
-  });
+  }, []);
 
   return (
     <>

From bf59503517633dbad007d297f3e7f47790946794 Mon Sep 17 00:00:00 2001
From: Davenludd <david.ludde01@gmail.com>
Date: Wed, 20 Mar 2024 17:24:54 +0100
Subject: [PATCH 13/76] Update background images in LoginPage.css

---
 frontend/src/Pages/LoginPage.css | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/frontend/src/Pages/LoginPage.css b/frontend/src/Pages/LoginPage.css
index 0b2f5db..3d79e7e 100644
--- a/frontend/src/Pages/LoginPage.css
+++ b/frontend/src/Pages/LoginPage.css
@@ -4,23 +4,23 @@ body{
 
 @keyframes backgroundTransition {
     0% {
-        background-image: url('src/assets/1.jpg');
+        background-image: url('../assets/1.jpg');
         animation-timing-function: ease-out;
     }
     25% {
-        background-image: url('src/assets/2.jpg');
+        background-image: url('../assets/2.jpg');
         animation-timing-function: ease-in;
     }
     50% {
-        background-image: url('src/assets/3.jpg');
+        background-image: url('../assets/3.jpg');
         animation-timing-function: ease-out;
     }
     75% {
-        background-image: url('src/assets/4.jpg');
+        background-image: url('../assets/4.jpg');
         animation-timing-function: ease-in;
     }
     100% {
-        background-image: url('src/assets/1.jpg');
+        background-image: url('../assets/1.jpg');
         animation-timing-function: ease-out;
     }
 }
\ No newline at end of file

From 900797facc018a890a0193ce930513527ddde23a Mon Sep 17 00:00:00 2001
From: Davenludd <david.ludde01@gmail.com>
Date: Wed, 20 Mar 2024 21:53:27 +0100
Subject: [PATCH 14/76] Fix initial state values and handle empty input values
 in NewWeeklyReport component

---
 frontend/src/Components/NewWeeklyReport.tsx | 78 ++++++++++++++-------
 1 file changed, 54 insertions(+), 24 deletions(-)

diff --git a/frontend/src/Components/NewWeeklyReport.tsx b/frontend/src/Components/NewWeeklyReport.tsx
index f1ce3f8..b92dfe2 100644
--- a/frontend/src/Components/NewWeeklyReport.tsx
+++ b/frontend/src/Components/NewWeeklyReport.tsx
@@ -12,12 +12,12 @@ import Button from "./Button";
  */
 export default function NewWeeklyReport(): JSX.Element {
   const [week, setWeek] = useState<number>(0);
-  const [developmentTime, setDevelopmentTime] = useState<number>();
-  const [meetingTime, setMeetingTime] = useState<number>();
-  const [adminTime, setAdminTime] = useState<number>();
-  const [ownWorkTime, setOwnWorkTime] = useState<number>();
-  const [studyTime, setStudyTime] = useState<number>();
-  const [testingTime, setTestingTime] = useState<number>();
+  const [developmentTime, setDevelopmentTime] = useState<number>(0);
+  const [meetingTime, setMeetingTime] = useState<number>(0);
+  const [adminTime, setAdminTime] = useState<number>(0);
+  const [ownWorkTime, setOwnWorkTime] = useState<number>(0);
+  const [studyTime, setStudyTime] = useState<number>(0);
+  const [testingTime, setTestingTime] = useState<number>(0);
 
   const { projectName } = useParams();
   const token = localStorage.getItem("accessToken") ?? "";
@@ -26,12 +26,12 @@ export default function NewWeeklyReport(): JSX.Element {
     const newWeeklyReport: NewWeeklyReport = {
       projectName: projectName ?? "",
       week: week,
-      developmentTime: developmentTime ?? 0,
-      meetingTime: meetingTime ?? 0,
-      adminTime: adminTime ?? 0,
-      ownWorkTime: ownWorkTime ?? 0,
-      studyTime: studyTime ?? 0,
-      testingTime: testingTime ?? 0,
+      developmentTime: developmentTime,
+      meetingTime: meetingTime,
+      adminTime: adminTime,
+      ownWorkTime: ownWorkTime,
+      studyTime: studyTime,
+      testingTime: testingTime,
     };
 
     await api.submitWeeklyReport(newWeeklyReport, token);
@@ -112,9 +112,14 @@ export default function NewWeeklyReport(): JSX.Element {
                       type="number"
                       min="0"
                       className="border-2 border-black rounded-md text-center w-1/2"
-                      value={developmentTime}
+                      value={developmentTime === 0 ? "" : developmentTime}
                       onChange={(e) => {
-                        setDevelopmentTime(parseInt(e.target.value));
+                        if (e.target.value === "") {
+                          setDevelopmentTime(0);
+                          return;
+                        } else {
+                          setDevelopmentTime(parseInt(e.target.value));
+                        }
                       }}
                       onKeyDown={(event) => {
                         const keyValue = event.key;
@@ -131,9 +136,14 @@ export default function NewWeeklyReport(): JSX.Element {
                       type="number"
                       min="0"
                       className="border-2 border-black rounded-md text-center w-1/2"
-                      value={meetingTime}
+                      value={meetingTime === 0 ? "" : meetingTime}
                       onChange={(e) => {
-                        setMeetingTime(parseInt(e.target.value));
+                        if (e.target.value === "") {
+                          setMeetingTime(0);
+                          return;
+                        } else {
+                          setMeetingTime(parseInt(e.target.value));
+                        }
                       }}
                       onKeyDown={(event) => {
                         const keyValue = event.key;
@@ -150,9 +160,14 @@ export default function NewWeeklyReport(): JSX.Element {
                       type="number"
                       min="0"
                       className="border-2 border-black rounded-md text-center w-1/2"
-                      value={adminTime}
+                      value={adminTime === 0 ? "" : adminTime}
                       onChange={(e) => {
-                        setAdminTime(parseInt(e.target.value));
+                        if (e.target.value === "") {
+                          setAdminTime(0);
+                          return;
+                        } else {
+                          setAdminTime(parseInt(e.target.value));
+                        }
                       }}
                       onKeyDown={(event) => {
                         const keyValue = event.key;
@@ -169,9 +184,14 @@ export default function NewWeeklyReport(): JSX.Element {
                       type="number"
                       min="0"
                       className="border-2 border-black rounded-md text-center w-1/2"
-                      value={ownWorkTime}
+                      value={ownWorkTime === 0 ? "" : ownWorkTime}
                       onChange={(e) => {
-                        setOwnWorkTime(parseInt(e.target.value));
+                        if (e.target.value === "") {
+                          setOwnWorkTime(0);
+                          return;
+                        } else {
+                          setOwnWorkTime(parseInt(e.target.value));
+                        }
                       }}
                       onKeyDown={(event) => {
                         const keyValue = event.key;
@@ -188,9 +208,14 @@ export default function NewWeeklyReport(): JSX.Element {
                       type="number"
                       min="0"
                       className="border-2 border-black rounded-md text-center w-1/2"
-                      value={studyTime}
+                      value={studyTime === 0 ? "" : studyTime}
                       onChange={(e) => {
-                        setStudyTime(parseInt(e.target.value));
+                        if (e.target.value === "") {
+                          setStudyTime(0);
+                          return;
+                        } else {
+                          setStudyTime(parseInt(e.target.value));
+                        }
                       }}
                       onKeyDown={(event) => {
                         const keyValue = event.key;
@@ -207,9 +232,14 @@ export default function NewWeeklyReport(): JSX.Element {
                       type="number"
                       min="0"
                       className="border-2 border-black rounded-md text-center w-1/2"
-                      value={testingTime}
+                      value={testingTime === 0 ? "" : testingTime}
                       onChange={(e) => {
-                        setTestingTime(parseInt(e.target.value));
+                        if (e.target.value === "") {
+                          setTestingTime(0);
+                          return;
+                        } else {
+                          setTestingTime(parseInt(e.target.value));
+                        }
                       }}
                       onKeyDown={(event) => {
                         const keyValue = event.key;

From d0209094a96dad2bd150ee026b609212d13b8b79 Mon Sep 17 00:00:00 2001
From: Davenludd <david.ludde01@gmail.com>
Date: Wed, 20 Mar 2024 22:10:53 +0100
Subject: [PATCH 15/76] Remove unused variable in EditWeeklyReport component

---
 frontend/src/Components/EditWeeklyReport.tsx | 2 --
 1 file changed, 2 deletions(-)

diff --git a/frontend/src/Components/EditWeeklyReport.tsx b/frontend/src/Components/EditWeeklyReport.tsx
index 76c2b94..be96329 100644
--- a/frontend/src/Components/EditWeeklyReport.tsx
+++ b/frontend/src/Components/EditWeeklyReport.tsx
@@ -18,13 +18,11 @@ export default function GetWeeklyReport(): JSX.Element {
   const [testingTime, setTestingTime] = useState(0);
 
   const token = localStorage.getItem("accessToken") ?? "";
-  const username = localStorage.getItem("username") ?? "";
   const { projectName } = useParams();
   const { fetchedWeek } = useParams();
 
   const fetchWeeklyReport = async (): Promise<void> => {
     const response = await api.getWeeklyReport(
-      username,
       projectName ?? "",
       fetchedWeek?.toString() ?? "0",
       token,

From 1a87effc3a8a0d49dc4de834a0c9505393a83daa Mon Sep 17 00:00:00 2001
From: Mattias <mattias.rasmusson.1032@student.lu.se>
Date: Wed, 20 Mar 2024 22:49:54 +0100
Subject: [PATCH 16/76] Changes to EditWeeklyReport component

---
 frontend/src/Components/EditWeeklyReport.tsx | 22 ++++----------------
 1 file changed, 4 insertions(+), 18 deletions(-)

diff --git a/frontend/src/Components/EditWeeklyReport.tsx b/frontend/src/Components/EditWeeklyReport.tsx
index be96329..9dc3d8e 100644
--- a/frontend/src/Components/EditWeeklyReport.tsx
+++ b/frontend/src/Components/EditWeeklyReport.tsx
@@ -90,24 +90,10 @@ export default function GetWeeklyReport(): JSX.Element {
           }}
         >
           <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();
-              }}
-            />
+            <div className="flex flex-col w-1/2 border-b-2 border-black items-center justify-center">
+              <h1 className="font-bold text-[30px]"> Week: {week}</h1>
+            </div>
+
             <table className="w-full text-center divide-y divide-x divide-white text-[30px]">
               <thead>
                 <tr>

From ed88220a47cfcbc77c970f713984981c8057f556 Mon Sep 17 00:00:00 2001
From: Imbus <>
Date: Thu, 21 Mar 2024 01:24:17 +0100
Subject: [PATCH 17/76] Fix containerfile permission errors

---
 container/Containerfile | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/container/Containerfile b/container/Containerfile
index ecd2f84..f9cb39d 100644
--- a/container/Containerfile
+++ b/container/Containerfile
@@ -13,7 +13,6 @@ FROM docker.io/golang:alpine as go
 RUN apk add gcompat
 RUN apk add gcc
 RUN apk add musl-dev
-RUN apk add make
 RUN apk add sqlite
 WORKDIR /build
 ADD backend/go.mod backend/go.sum ./
@@ -24,9 +23,7 @@ RUN go mod download
 # Add the source code
 ADD backend .
 
-RUN make migrate
-
-# RUN go build -o server
+RUN go build -o server
 RUN CGO_ENABLED=1 GOOS=linux go build -a -installsuffix cgo -o ./server ./main.go
 
 # Strip the binary for a smaller image
@@ -37,6 +34,7 @@ FROM docker.io/alpine:latest as runner
 RUN adduser -D nonroot
 RUN addgroup nonroot nonroot
 WORKDIR /app
+RUN chown nonroot:nonroot /app
 
 # Copy the frontend SPA build into public
 COPY --from=client /build/dist static
@@ -44,9 +42,6 @@ COPY --from=client /build/dist static
 # Copy the server binary
 COPY --from=go /build/server server
 
-# Copy the database
-COPY --from=go /build/db.sqlite3 db.sqlite3
-
 # Expose port 8080
 EXPOSE 8080
 

From dea802bd91f3b3215eb6c440c8e2f21bfcf4688f Mon Sep 17 00:00:00 2001
From: al8763be <al8763be-s@student.lu.se>
Date: Thu, 21 Mar 2024 01:37:39 +0100
Subject: [PATCH 18/76] bummed handler

---
 backend/internal/database/db.go               | 46 +++++++++++++++++++
 backend/internal/database/db_test.go          | 31 +++++++++++++
 backend/internal/handlers/global_state.go     |  1 +
 .../handlers/handlers_report_related.go       | 36 +++++++++++++++
 backend/main.go                               |  1 +
 testing.py                                    | 43 +++++++++++++++++
 6 files changed, 158 insertions(+)

diff --git a/backend/internal/database/db.go b/backend/internal/database/db.go
index fd0a083..7410b16 100644
--- a/backend/internal/database/db.go
+++ b/backend/internal/database/db.go
@@ -36,6 +36,7 @@ type Database interface {
 	GetUserRole(username string, projectname string) (string, error)
 	GetWeeklyReport(username string, projectName string, week int) (types.WeeklyReport, error)
 	GetWeeklyReportsUser(username string, projectname string) ([]types.WeeklyReportList, error)
+	GetUnsignedWeeklyReports(projectName string) ([]types.WeeklyReport, error)
 	SignWeeklyReport(reportId int, projectManagerId int) error
 	IsSiteAdmin(username string) (bool, error)
 	IsProjectManager(username string, projectname string) (bool, error)
@@ -353,6 +354,51 @@ func (d *Db) SignWeeklyReport(reportId int, projectManagerId int) error {
 	return err
 }
 
+func (d *Db) GetUnsignedWeeklyReports(projectName string) ([]types.WeeklyReport, error) {
+	// Define the SQL query to fetch unsigned reports for a given user
+	query := `
+		SELECT
+			report_id,
+			user_id,
+			project_id,
+			week,
+			development_time,
+			meeting_time,
+			admin_time,
+			own_work_time,
+			study_time,
+			testing_time,
+			signed_by
+		FROM
+			weekly_reports
+		WHERE
+			signed_by IS NULL
+			AND project_id = (SELECT id FROM projects WHERE name = ?)
+	`
+
+	// Execute the query
+	rows, err := d.Queryx(query, projectName)
+	if err != nil {
+		return nil, err
+	}
+	defer rows.Close()
+
+	// Iterate over the rows and populate the result slice
+	var reports []types.WeeklyReport
+	for rows.Next() {
+		var report types.WeeklyReport
+		if err := rows.StructScan(&report); err != nil {
+			return nil, err
+		}
+		reports = append(reports, report)
+	}
+	if err := rows.Err(); err != nil {
+		return nil, err
+	}
+
+	return reports, nil
+}
+
 // IsSiteAdmin checks if a given username is a site admin
 func (d *Db) IsSiteAdmin(username string) (bool, error) {
 	// Define the SQL query to check if the user is a site admin
diff --git a/backend/internal/database/db_test.go b/backend/internal/database/db_test.go
index 139fba9..cff70a0 100644
--- a/backend/internal/database/db_test.go
+++ b/backend/internal/database/db_test.go
@@ -470,6 +470,37 @@ func TestGetWeeklyReport(t *testing.T) {
 	// Check other fields similarly
 }
 
+func TestGetUnsignedWeeklyReports(t *testing.T) {
+	db, err := setupAdvancedState()
+	if err != nil {
+		t.Error("setupState failed:", err)
+	}
+
+	err = db.AddUser("testuser", "password")
+	if err != nil {
+		t.Error("AddUser failed:", err)
+	}
+
+	err = db.AddProject("testproject", "description", "testuser")
+	if err != nil {
+		t.Error("AddProject failed:", err)
+	}
+
+	err = db.AddWeeklyReport("testproject", "testuser", 1, 1, 1, 1, 1, 1, 1)
+	if err != nil {
+		t.Error("AddWeeklyReport failed:", err)
+	}
+
+	reports, err := db.GetUnsignedWeeklyReports("testproject")
+	if err != nil {
+		t.Error("GetUnsignedWeeklyReports failed:", err)
+	}
+
+	if reports == nil {
+		t.Error("Expected non-nil reports, got nil")
+	}
+}
+
 // TestSignWeeklyReport tests SignWeeklyReport function of the database
 func TestSignWeeklyReport(t *testing.T) {
 	db, err := setupState()
diff --git a/backend/internal/handlers/global_state.go b/backend/internal/handlers/global_state.go
index b88bdcd..6b197bb 100644
--- a/backend/internal/handlers/global_state.go
+++ b/backend/internal/handlers/global_state.go
@@ -28,6 +28,7 @@ type GlobalState interface {
 	ProjectRoleChange(c *fiber.Ctx) error   // To change a users role in a project
 	ChangeUserName(c *fiber.Ctx) error      // WIP
 	GetAllUsersProject(c *fiber.Ctx) error  // WIP
+	GetUnsignedReports(c *fiber.Ctx) error  // 
 }
 
 // "Constructor"
diff --git a/backend/internal/handlers/handlers_report_related.go b/backend/internal/handlers/handlers_report_related.go
index fcba523..534050a 100644
--- a/backend/internal/handlers/handlers_report_related.go
+++ b/backend/internal/handlers/handlers_report_related.go
@@ -115,6 +115,42 @@ func (gs *GState) SignReport(c *fiber.Ctx) error {
 	return c.Status(200).SendString("Weekly report signed successfully")
 }
 
+func (gs *GState) GetUnsignedReports(c *fiber.Ctx) error {
+	// Extract the necessary parameters from the token
+	user := c.Locals("user").(*jwt.Token)
+	claims := user.Claims.(jwt.MapClaims)
+	projectManagerUsername := claims["name"].(string)
+
+	// Extract project name and week from query parameters
+	projectName := c.Query("projectName")
+
+	log.Info("Getting unsigned reports for")
+
+	if projectName == "" {
+		log.Info("Missing project name")
+		return c.Status(400).SendString("Missing project name")
+	}
+
+	// Get the project manager's ID
+	isProjectManager, err := gs.Db.IsProjectManager(projectManagerUsername, projectName)
+	if err != nil {
+		log.Info("Failed to get project manager ID")
+		return c.Status(500).SendString("Failed to get project manager ID")
+	}
+	log.Info("User is Project Manager: ", isProjectManager)
+
+	// Call the database function to get the unsigned weekly reports
+	reports, err := gs.Db.GetUnsignedWeeklyReports(projectName)
+	if err != nil {
+		log.Info("Error getting unsigned weekly reports:", err)
+		return c.Status(500).SendString(err.Error())
+	}
+
+	log.Info("Returning unsigned reports")
+	// Return the list of unsigned reports
+	return c.JSON(reports)
+}
+
 // GetWeeklyReportsUserHandler retrieves all weekly reports for a user in a specific project
 func (gs *GState) GetWeeklyReportsUserHandler(c *fiber.Ctx) error {
 	// Extract the necessary parameters from the token
diff --git a/backend/main.go b/backend/main.go
index ff6b94e..835524c 100644
--- a/backend/main.go
+++ b/backend/main.go
@@ -92,6 +92,7 @@ func main() {
 	server.Get("/api/project/:projectId", gs.GetProject)
 	server.Get("/api/project/getAllUsers", gs.GetAllUsersProject)
 	server.Get("/api/getWeeklyReport", gs.GetWeeklyReport)
+	server.Get("/api/getUnsignedReports", gs.GetUnsignedReports)
 	server.Post("/api/signReport", gs.SignReport)
 	server.Put("/api/addUserToProject", gs.AddUserToProjectHandler)
 	server.Put("/api/changeUserName", gs.ChangeUserName)
diff --git a/testing.py b/testing.py
index b8fbe43..3350497 100644
--- a/testing.py
+++ b/testing.py
@@ -41,6 +41,7 @@ getWeeklyReportsUserPath = base_url + "/api/getWeeklyReportsUser"
 checkIfProjectManagerPath = base_url + "/api/checkIfProjectManager"
 ProjectRoleChangePath = base_url + "/api/ProjectRoleChange"
 getUsersProjectPath = base_url + "/api/getUsersProject"
+getUsignedReportsPath = base_url + "/api/getUsignedReports"
 
 #ta bort auth i handlern för att få testet att gå igenom
 def test_ProjectRoleChange():
@@ -329,6 +330,47 @@ def test_get_weekly_reports_user():
     assert response.status_code == 200, "Get weekly reports for user failed"
     gprint("test_get_weekly_reports_user successful")
 
+def test_get_usigned_reports():
+    # Log in as the user
+
+    token = login(username, "always_same").json()["token"]
+    response = requests.post(
+        submitReportPath,
+        json={
+            "projectName": projectName,
+            "week": 3,
+            "developmentTime": 10,
+            "meetingTime": 5,
+            "adminTime": 5,
+            "ownWorkTime": 10,
+            "studyTime": 10,
+            "testingTime": 10,
+        },
+        headers={"Authorization": "Bearer " + token},
+    )
+    dprint(response.text)
+    assert response.status_code == 200, "Submit report failed"
+
+
+    # Get weekly reports for the user in the project
+    response = requests.get(
+        getWeeklyReportsUserPath + "/" + projectName,
+        headers={"Authorization": "Bearer " + token},
+    )
+
+    dprint(response.text)
+    assert response.status_code == 200, "Get weekly reports for user failed"
+
+    response = requests.get(
+        getUsignedReportsPath + "/" + projectName,
+        headers={"Authorization": "Bearer " + token},
+    )
+    dprint(response.text)
+    assert response.status_code == 200, "Get unsigned reports for user failed"
+    gprint("test_get_usigned_reports successful")
+
+
+
 # Test function to check if a user is a project manager
 def test_check_if_project_manager():
     # Log in as the user
@@ -369,6 +411,7 @@ def test_ensure_manager_of_created_project():
 
 
 if __name__ == "__main__":
+    test_get_usigned_reports()
     test_get_user_projects()
     test_create_user()
     test_login()

From b48434603125167faba7915c32ceae374dba512b Mon Sep 17 00:00:00 2001
From: Imbus <>
Date: Thu, 21 Mar 2024 02:26:30 +0100
Subject: [PATCH 19/76] Better integration test target

---
 Justfile         |  3 +++
 Makefile         |  3 +++
 backend/Makefile | 16 ++++++++++++++--
 3 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/Justfile b/Justfile
index cb905e4..90fabf6 100644
--- a/Justfile
+++ b/Justfile
@@ -23,10 +23,13 @@ load-release file:
 
 # Tests every part of the project
 testall:
+    cd frontend && npm install
     cd frontend && npm test
     cd frontend && npm run lint
+    cd frontend && npm run build
     cd backend && make test
     cd backend && make lint
+    cd backend && make itest
 
 # Cleans up everything related to the project
 clean: remove-podman-containers
diff --git a/Makefile b/Makefile
index 97db62e..51fb206 100644
--- a/Makefile
+++ b/Makefile
@@ -13,10 +13,13 @@ remove-podman-containers:
 
 # Tests every part of the project
 testall:
+	cd frontend && npm install
 	cd frontend && npm test
 	cd frontend && npm run lint
+	cd frontend && npm run build
 	cd backend && make test
 	cd backend && make lint
+	cd backend && make itest
 
 # Cleans up everything related to the project
 clean: remove-podman-containers
diff --git a/backend/Makefile b/backend/Makefile
index 331f8d5..3443e94 100644
--- a/backend/Makefile
+++ b/backend/Makefile
@@ -8,17 +8,19 @@ GOGET = $(GOCMD) get
 # SQLite database filename
 DB_FILE = db.sqlite3
 
+PROC_NAME = ttime_server
+
 # Directory containing migration SQL scripts
 MIGRATIONS_DIR = internal/database/migrations
 SAMPLE_DATA_DIR = internal/database/sample_data
 
 # Build target
 build:
-	$(GOBUILD) -o bin/server main.go
+	$(GOBUILD) -o bin/$(PROC_NAME) main.go
 
 # Run target
 run: build
-	./bin/server
+	./bin/$(PROC_NAME)
 
 watch: build
 	watchexec -c -w . -r make run
@@ -37,6 +39,16 @@ clean:
 test: db.sqlite3
 	$(GOTEST) ./... -count=1
 
+# Integration test target
+.PHONY: itest
+itest:
+	pgrep $(PROC_NAME) && echo "Server already running" && exit 1 || true
+	make build
+	./bin/$(PROC_NAME) >/dev/null 2>&1 &
+	sleep 1 # Adjust if needed
+	python ../testing.py
+	pkill $(PROC_NAME)
+
 # Get dependencies target
 deps:
 	$(GOGET) -v ./...

From 2d4ff7e087eb00f873f8a3a0f9821a6927ef3871 Mon Sep 17 00:00:00 2001
From: dDogge <douglasfjallrud@gmail.com>
Date: Thu, 21 Mar 2024 02:48:26 +0100
Subject: [PATCH 20/76] Fully implemented UpdateWeeklyReport for database,
 handler and corresponding tests

---
 backend/internal/database/db.go               |  59 ++++--
 backend/internal/database/db_test.go          | 187 +++++++++++-------
 backend/internal/handlers/global_state.go     |   1 +
 .../handlers/handlers_report_related.go       |  34 ++++
 backend/internal/types/WeeklyReport.go        |  21 ++
 backend/main.go                               |   1 +
 testing.py                                    |  30 +++
 7 files changed, 243 insertions(+), 90 deletions(-)

diff --git a/backend/internal/database/db.go b/backend/internal/database/db.go
index fd8297f..f871755 100644
--- a/backend/internal/database/db.go
+++ b/backend/internal/database/db.go
@@ -40,8 +40,7 @@ type Database interface {
 	IsSiteAdmin(username string) (bool, error)
 	IsProjectManager(username string, projectname string) (bool, error)
 	GetProjectTimes(projectName string) (map[string]int, error)
-	
-
+	UpdateWeeklyReport(projectName string, userName string, week int, developmentTime int, meetingTime int, adminTime int, ownWorkTime int, studyTime int, testingTime int) error
 }
 
 // This struct is a wrapper type that holds the database connection
@@ -454,6 +453,26 @@ func (d *Db) IsProjectManager(username string, projectname string) (bool, error)
 	return manager, err
 }
 
+func (d *Db) UpdateWeeklyReport(projectName string, userName string, week int, developmentTime int, meetingTime int, adminTime int, ownWorkTime int, studyTime int, testingTime int) error {
+	query := `
+		UPDATE weekly_reports
+		SET
+			development_time = ?,
+			meeting_time = ?,
+			admin_time = ?,
+			own_work_time = ?,
+			study_time = ?,
+			testing_time = ?
+		WHERE
+			user_id = (SELECT id FROM users WHERE username = ?)
+			AND project_id = (SELECT id FROM projects WHERE name = ?)
+			AND week = ?
+	`
+
+	_, err := d.Exec(query, developmentTime, meetingTime, adminTime, ownWorkTime, studyTime, testingTime, userName, projectName, week)
+	return err
+}
+
 // MigrateSampleData applies sample data to the database.
 func (d *Db) MigrateSampleData() error {
 	// Insert sample data
@@ -495,34 +514,34 @@ func (d *Db) MigrateSampleData() error {
 
 // GetProjectTimes retrieves a map with times per "Activity" for a given project
 func (d *Db) GetProjectTimes(projectName string) (map[string]int, error) {
-    query := `
+	query := `
         SELECT development_time, meeting_time, admin_time, own_work_time, study_time, testing_time
         FROM weekly_reports
         JOIN projects ON weekly_reports.project_id = projects.id
         WHERE projects.name = ?
     `
 
-    rows, err := d.DB.Query(query, projectName)
-    if err != nil {
-        return nil, err
-    }
-    defer rows.Close()
+	rows, err := d.DB.Query(query, projectName)
+	if err != nil {
+		return nil, err
+	}
+	defer rows.Close()
 
 	totalTime := make(map[string]int)
 
-    for rows.Next() {
-        var developmentTime, meetingTime, adminTime, ownWorkTime, studyTime, testingTime int
-        if err := rows.Scan(&developmentTime, &meetingTime, &adminTime, &ownWorkTime, &studyTime, &testingTime); err != nil {
-            return nil, err
-        }
+	for rows.Next() {
+		var developmentTime, meetingTime, adminTime, ownWorkTime, studyTime, testingTime int
+		if err := rows.Scan(&developmentTime, &meetingTime, &adminTime, &ownWorkTime, &studyTime, &testingTime); err != nil {
+			return nil, err
+		}
 
-        totalTime["development"] += developmentTime
-        totalTime["meeting"] += meetingTime
-        totalTime["admin"] += adminTime
-        totalTime["own_work"] += ownWorkTime
-        totalTime["study"] += studyTime
-        totalTime["testing"] += testingTime
-    }
+		totalTime["development"] += developmentTime
+		totalTime["meeting"] += meetingTime
+		totalTime["admin"] += adminTime
+		totalTime["own_work"] += ownWorkTime
+		totalTime["study"] += studyTime
+		totalTime["testing"] += testingTime
+	}
 
 	if err := rows.Err(); err != nil {
 		return nil, err
diff --git a/backend/internal/database/db_test.go b/backend/internal/database/db_test.go
index 442bf91..b68d446 100644
--- a/backend/internal/database/db_test.go
+++ b/backend/internal/database/db_test.go
@@ -729,90 +729,89 @@ func TestIsProjectManager(t *testing.T) {
 	}
 }
 
-
 func TestGetProjectTimes(t *testing.T) {
-    // Initialize
-    db, err := setupState()
-    if err != nil {
-        t.Error("setupState failed:", err)
-        return
-    }
+	// Initialize
+	db, err := setupState()
+	if err != nil {
+		t.Error("setupState failed:", err)
+		return
+	}
 
-    // Create a user
-    user := "TeaUser"
-    password := "Vanilla"
-    err = db.AddUser(user, password)
-    if err != nil {
-        t.Error("AddUser failed:", err)
-        return
-    }
+	// Create a user
+	user := "TeaUser"
+	password := "Vanilla"
+	err = db.AddUser(user, password)
+	if err != nil {
+		t.Error("AddUser failed:", err)
+		return
+	}
 
-    // Create a project
-    projectName := "ProjectVanilla"
-    projectDescription := "When tea tastes its best"
-    err = db.AddProject(projectName, projectDescription, user) // Fix the variable name here
-    if err != nil {
-        t.Error("AddProject failed:", err)
-        return
-    }
+	// Create a project
+	projectName := "ProjectVanilla"
+	projectDescription := "When tea tastes its best"
+	err = db.AddProject(projectName, projectDescription, user) // Fix the variable name here
+	if err != nil {
+		t.Error("AddProject failed:", err)
+		return
+	}
 
-    // Tests the func in db.go
-    totalTime, err := db.GetProjectTimes(projectName)
-    if err != nil {
-        t.Error("GetTotalTimePerActivity failed:", err)
-        return
-    }
+	// Tests the func in db.go
+	totalTime, err := db.GetProjectTimes(projectName)
+	if err != nil {
+		t.Error("GetTotalTimePerActivity failed:", err)
+		return
+	}
 
-    // Check if the totalTime map is not nil
-    if totalTime == nil {
-        t.Error("Expected non-nil totalTime map, got nil")
-        return
-    }
+	// Check if the totalTime map is not nil
+	if totalTime == nil {
+		t.Error("Expected non-nil totalTime map, got nil")
+		return
+	}
 
-    // Define the expected valeus
-    expectedTotalTime := map[string]int{
-        "development": 0,
-        "meeting": 0,
-        "admin": 0,
-        "own_work": 0,
-        "study": 0,
-        "testing": 0,
-    }
+	// Define the expected valeus
+	expectedTotalTime := map[string]int{
+		"development": 0,
+		"meeting":     0,
+		"admin":       0,
+		"own_work":    0,
+		"study":       0,
+		"testing":     0,
+	}
 
-    // Compare the expectedTotalTime with the totalTime retrieved from the database
-    for activity, expectedTime := range expectedTotalTime {
-        if totalTime[activity] != expectedTime {
-            t.Errorf("Expected %s time to be %d, got %d", activity, expectedTime, totalTime[activity])
-        }
-    }
+	// Compare the expectedTotalTime with the totalTime retrieved from the database
+	for activity, expectedTime := range expectedTotalTime {
+		if totalTime[activity] != expectedTime {
+			t.Errorf("Expected %s time to be %d, got %d", activity, expectedTime, totalTime[activity])
+		}
+	}
 
-	   // Insert some data into the database for different activities
-	   err = db.AddWeeklyReport(projectName, user, 1, 1, 3, 2, 1, 4, 5)
-	   if err != nil {
-		   t.Error("Failed to insert data into the database:", err)
-		   return
-	   }
+	// Insert some data into the database for different activities
+	err = db.AddWeeklyReport(projectName, user, 1, 1, 3, 2, 1, 4, 5)
+	if err != nil {
+		t.Error("Failed to insert data into the database:", err)
+		return
+	}
 
 	newTotalTime, err := db.GetProjectTimes(projectName)
-    if err != nil {
-        t.Error("GetTotalTimePerActivity failed:", err)
-        return
-    }
+	if err != nil {
+		t.Error("GetTotalTimePerActivity failed:", err)
+		return
+	}
 
 	newExpectedTotalTime := map[string]int{
-        "development": 1,
-        "meeting": 3,
-        "admin": 2,
-        "own_work": 1,
-        "study": 4,
-        "testing": 5,
-    }
+		"development": 1,
+		"meeting":     3,
+		"admin":       2,
+		"own_work":    1,
+		"study":       4,
+		"testing":     5,
+	}
 
 	for activity, newExpectedTime := range newExpectedTotalTime {
-        if newTotalTime[activity] != newExpectedTime {
-            t.Errorf("Expected %s time to be %d, got %d", activity, newExpectedTime, newTotalTime[activity])
-        }
-    }
+		if newTotalTime[activity] != newExpectedTime {
+			t.Errorf("Expected %s time to be %d, got %d", activity, newExpectedTime, newTotalTime[activity])
+		}
+	}
 }
 func TestEnsureManagerOfCreatedProject(t *testing.T) {
 	db, err := setupState()
@@ -847,3 +846,51 @@ func TestEnsureManagerOfCreatedProject(t *testing.T) {
 		t.Error("Expected testuser to be a project manager, but it's not.")
 	}
 }
+
+// TestUpdateWeeklyReport tests the UpdateWeeklyReport function of the database
+func TestUpdateWeeklyReport(t *testing.T) {
+	db, err := setupState()
+	if err != nil {
+		t.Error("setupState failed:", err)
+	}
+
+	// Add a user
+	err = db.AddUser("testuser", "password")
+	if err != nil {
+		t.Error("AddUser failed:", err)
+	}
+
+	// Add a project
+	err = db.AddProject("testproject", "description", "testuser")
+	if err != nil {
+		t.Error("AddProject failed:", err)
+	}
+
+	// Add a weekly report
+	err = db.AddWeeklyReport("testproject", "testuser", 1, 1, 1, 1, 1, 1, 1)
+	if err != nil {
+		t.Error("AddWeeklyReport failed:", err)
+	}
+
+	// Update the weekly report
+	err = db.UpdateWeeklyReport("testproject", "testuser", 1, 2, 2, 2, 2, 2, 2)
+	if err != nil {
+		t.Error("UpdateWeeklyReport failed:", err)
+	}
+
+	// Retrieve the updated report
+	updatedReport, err := db.GetWeeklyReport("testuser", "testproject", 1)
+	if err != nil {
+		t.Error("GetWeeklyReport failed:", err)
+	}
+
+	// Check if the report was updated correctly
+	if updatedReport.DevelopmentTime != 2 ||
+		updatedReport.MeetingTime != 2 ||
+		updatedReport.AdminTime != 2 ||
+		updatedReport.OwnWorkTime != 2 ||
+		updatedReport.StudyTime != 2 ||
+		updatedReport.TestingTime != 2 {
+		t.Error("UpdateWeeklyReport failed: report not updated correctly")
+	}
+}
diff --git a/backend/internal/handlers/global_state.go b/backend/internal/handlers/global_state.go
index b88bdcd..49c8c09 100644
--- a/backend/internal/handlers/global_state.go
+++ b/backend/internal/handlers/global_state.go
@@ -28,6 +28,7 @@ type GlobalState interface {
 	ProjectRoleChange(c *fiber.Ctx) error   // To change a users role in a project
 	ChangeUserName(c *fiber.Ctx) error      // WIP
 	GetAllUsersProject(c *fiber.Ctx) error  // WIP
+	UpdateWeeklyReport(c *fiber.Ctx) error
 }
 
 // "Constructor"
diff --git a/backend/internal/handlers/handlers_report_related.go b/backend/internal/handlers/handlers_report_related.go
index fcba523..0e72ead 100644
--- a/backend/internal/handlers/handlers_report_related.go
+++ b/backend/internal/handlers/handlers_report_related.go
@@ -141,3 +141,37 @@ func (gs *GState) GetWeeklyReportsUserHandler(c *fiber.Ctx) error {
 	// Return the list of reports as JSON
 	return c.JSON(reports)
 }
+
+func (gs *GState) UpdateWeeklyReport(c *fiber.Ctx) error {
+	// Extract the necessary parameters from the token
+	user := c.Locals("user").(*jwt.Token)
+	claims := user.Claims.(jwt.MapClaims)
+	username := claims["name"].(string)
+
+	// Parse the request body into an UpdateWeeklyReport struct
+	var updateReport types.UpdateWeeklyReport
+	if err := c.BodyParser(&updateReport); err != nil {
+		log.Info("Error parsing weekly report")
+		return c.Status(400).SendString(err.Error())
+	}
+
+	// Make sure all the fields of the report are valid
+	if updateReport.Week < 1 || updateReport.Week > 52 {
+		log.Info("Invalid week number")
+		return c.Status(400).SendString("Invalid week number")
+	}
+
+	if updateReport.DevelopmentTime < 0 || updateReport.MeetingTime < 0 || updateReport.AdminTime < 0 || updateReport.OwnWorkTime < 0 || updateReport.StudyTime < 0 || updateReport.TestingTime < 0 {
+		log.Info("Invalid time report")
+		return c.Status(400).SendString("Invalid time report")
+	}
+
+	// Update the weekly report in the database
+	if err := gs.Db.UpdateWeeklyReport(updateReport.ProjectName, username, updateReport.Week, updateReport.DevelopmentTime, updateReport.MeetingTime, updateReport.AdminTime, updateReport.OwnWorkTime, updateReport.StudyTime, updateReport.TestingTime); err != nil {
+		log.Info("Error updating weekly report in db:", err)
+		return c.Status(500).SendString(err.Error())
+	}
+
+	log.Info("Weekly report updated")
+	return c.Status(200).SendString("Weekly report updated")
+}
diff --git a/backend/internal/types/WeeklyReport.go b/backend/internal/types/WeeklyReport.go
index 8d22b6a..234781b 100644
--- a/backend/internal/types/WeeklyReport.go
+++ b/backend/internal/types/WeeklyReport.go
@@ -65,3 +65,24 @@ type WeeklyReport struct {
 	// The project manager who signed it
 	SignedBy *int `json:"signedBy" db:"signed_by"`
 }
+
+type UpdateWeeklyReport struct {
+	// The name of the project, as it appears in the database
+	ProjectName string `json:"projectName"`
+	// The name of the user
+	UserName string `json:"userName"`
+	// The week number
+	Week int `json:"week"`
+	// Total time spent on development
+	DevelopmentTime int `json:"developmentTime"`
+	// Total time spent in meetings
+	MeetingTime int `json:"meetingTime"`
+	// Total time spent on administrative tasks
+	AdminTime int `json:"adminTime"`
+	// Total time spent on personal projects
+	OwnWorkTime int `json:"ownWorkTime"`
+	// Total time spent on studying
+	StudyTime int `json:"studyTime"`
+	// Total time spent on testing
+	TestingTime int `json:"testingTime"`
+}
diff --git a/backend/main.go b/backend/main.go
index ff6b94e..b42bcab 100644
--- a/backend/main.go
+++ b/backend/main.go
@@ -101,6 +101,7 @@ func main() {
 	server.Get("/api/checkIfProjectManager/:projectName", gs.IsProjectManagerHandler)
 	server.Post("/api/ProjectRoleChange", gs.ProjectRoleChange)
 	server.Get("/api/getUsersProject/:projectName", gs.ListAllUsersProject)
+	server.Put("/api/updateWeeklyReport", gs.UpdateWeeklyReport)
 
 	// Announce the port we are listening on and start the server
 	err = server.Listen(fmt.Sprintf(":%d", conf.Port))
diff --git a/testing.py b/testing.py
index 6abd21d..3515720 100644
--- a/testing.py
+++ b/testing.py
@@ -42,6 +42,7 @@ checkIfProjectManagerPath = base_url + "/api/checkIfProjectManager"
 ProjectRoleChangePath = base_url + "/api/ProjectRoleChange"
 getUsersProjectPath = base_url + "/api/getUsersProject"
 getChangeUserNamePath = base_url + "/api/changeUserName"
+getUpdateWeeklyReportPath = base_url + "/api/updateWeeklyReport"
 
 #ta bort auth i handlern för att få testet att gå igenom
 def test_ProjectRoleChange():
@@ -433,6 +434,34 @@ def test_list_all_users_project():
     assert response.status_code == 200, "List all users project failed"
     gprint("test_list_all_users_project sucessful")
 
+def test_update_weekly_report():
+    # Log in as the user
+    token = login(username, "always_same").json()["token"]
+
+    # Prepare the JSON data for updating the weekly report
+    update_data = {
+        "projectName": projectName,
+        "userName": username,
+        "week": 1,
+        "developmentTime": 8,
+        "meetingTime": 6,
+        "adminTime": 4,
+        "ownWorkTime": 11,
+        "studyTime": 8,
+        "testingTime": 18,
+    }
+
+    # Send a request to update the weekly report
+    response = requests.put(
+        getUpdateWeeklyReportPath,
+        json=update_data,
+        headers={"Authorization": "Bearer " + token},
+    )
+
+    # Check if the update was successful
+    assert response.status_code == 200, "Update weekly report failed"
+    gprint("test_update_weekly_report successful")
+
 if __name__ == "__main__":
     test_get_user_projects()
     test_create_user()
@@ -449,3 +478,4 @@ if __name__ == "__main__":
     test_ensure_manager_of_created_project()
     test_list_all_users_project()
     test_change_user_name()
+    test_update_weekly_report()
\ No newline at end of file

From 01a6f9e61d8a223f40fe29026c4c071de7207d3d Mon Sep 17 00:00:00 2001
From: Davenludd <david.ludde01@gmail.com>
Date: Thu, 21 Mar 2024 08:57:56 +0100
Subject: [PATCH 21/76] Add comment NewWeeklyReport

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

diff --git a/frontend/src/Components/NewWeeklyReport.tsx b/frontend/src/Components/NewWeeklyReport.tsx
index b92dfe2..1204e11 100644
--- a/frontend/src/Components/NewWeeklyReport.tsx
+++ b/frontend/src/Components/NewWeeklyReport.tsx
@@ -38,6 +38,7 @@ export default function NewWeeklyReport(): JSX.Element {
   };
 
   const navigate = useNavigate();
+  // Check if the browser is Chrome or Edge
   const isChromeOrEdge = /Chrome|Edg/.test(navigator.userAgent);
 
   return (

From c41553990411e519d3ac331db5b3baac143f1a0d Mon Sep 17 00:00:00 2001
From: Mattias <mattias.rasmusson.1032@student.lu.se>
Date: Thu, 21 Mar 2024 09:36:08 +0100
Subject: [PATCH 22/76] Refactor ProjectMembers component to use API for
 fetching project members

---
 frontend/src/Components/ProjectMembers.tsx | 101 ++++++++++-----------
 1 file changed, 49 insertions(+), 52 deletions(-)

diff --git a/frontend/src/Components/ProjectMembers.tsx b/frontend/src/Components/ProjectMembers.tsx
index 73e29e5..469382a 100644
--- a/frontend/src/Components/ProjectMembers.tsx
+++ b/frontend/src/Components/ProjectMembers.tsx
@@ -1,60 +1,57 @@
 import { useEffect, useState } from "react";
 import { Link, useParams } from "react-router-dom";
+import { api } from "../API/API";
+import { UserProjectMember } from "../Types/goTypes";
 
 function ProjectMembers(): JSX.Element {
   const { projectName } = useParams();
-  const [projectMembers, setProjectMembers] = useState<ProjectMember[]>([]);
-
-  //   const getProjectMembers = async (): Promise<void> => {
-  //     const token = localStorage.getItem("accessToken") ?? "";
-  //     const response = await api.getProjectMembers(projectName ?? "", token);
-  //     console.log(response);
-  //     if (response.success) {
-  //       setProjectMembers(response.data ?? []);
-  //     } else {
-  //       console.error(response.message);
-  //     }
-  //   };
-
-  interface ProjectMember {
-    username: string;
-    role: string;
-  }
-
-  const mockProjectMembers = [
-    {
-      username: "username1",
-      role: "Project Manager",
-    },
-    {
-      username: "username2",
-      role: "System Manager",
-    },
-    {
-      username: "username3",
-      role: "Developer",
-    },
-    {
-      username: "username4",
-      role: "Tester",
-    },
-    {
-      username: "username5",
-      role: "Tester",
-    },
-    {
-      username: "username6",
-      role: "Tester",
-    },
-  ];
+  const [projectMembers, setProjectMembers] = useState<UserProjectMember[]>([]);
 
   const getProjectMembers = async (): Promise<void> => {
-    // Use the mock data
-    setProjectMembers(mockProjectMembers);
-
-    await Promise.resolve();
+    const token = localStorage.getItem("accessToken") ?? "";
+    const response = await api.getAllUsersProject(projectName ?? "", token);
+    console.log(response);
+    if (response.success) {
+      setProjectMembers(response.data ?? []);
+    } else {
+      console.error(response.message);
+    }
   };
 
+  // const mockProjectMembers = [
+  //   {
+  //     username: "username1",
+  //     role: "Project Manager",
+  //   },
+  //   {
+  //     username: "username2",
+  //     role: "System Manager",
+  //   },
+  //   {
+  //     username: "username3",
+  //     role: "Developer",
+  //   },
+  //   {
+  //     username: "username4",
+  //     role: "Tester",
+  //   },
+  //   {
+  //     username: "username5",
+  //     role: "Tester",
+  //   },
+  //   {
+  //     username: "username6",
+  //     role: "Tester",
+  //   },
+  // ];
+
+  // const getProjectMembers = async (): Promise<void> => {
+  //   // Use the mock data
+  //   setProjectMembers(mockProjectMembers);
+
+  //   await Promise.resolve();
+  // };
+
   useEffect(() => {
     void getProjectMembers();
   });
@@ -66,21 +63,21 @@ function ProjectMembers(): JSX.Element {
           <h1 key={index} className="border-b-2 border-black w-full">
             <div className="flex justify-between">
               <div className="flex">
-                <h1>{projectMember.username}</h1>
+                <h1>{projectMember.Username}</h1>
                 <span className="ml-6 mr-2 font-bold">Role:</span>
-                <h1>{projectMember.role}</h1>
+                <h1>{projectMember.UserRole}</h1>
               </div>
               <div className="flex">
                 <div className="ml-auto flex space-x-4">
                   <Link
-                    to={`/viewReports/${projectName}/${projectMember.username}`}
+                    to={`/viewReports/${projectName}/${projectMember.Username}`}
                   >
                     <h1 className="underline cursor-pointer font-bold">
                       View Reports
                     </h1>
                   </Link>
                   <Link
-                    to={`/changeRole/${projectName}/${projectMember.username}`}
+                    to={`/changeRole/${projectName}/${projectMember.Username}`}
                   >
                     <h1 className="underline cursor-pointer font-bold">
                       Change Role

From 14133a9f22bc6f6b6364adfb6a6b2c3da74fe962 Mon Sep 17 00:00:00 2001
From: Mattias <mattias.rasmusson.1032@student.lu.se>
Date: Thu, 21 Mar 2024 09:59:12 +0100
Subject: [PATCH 23/76] CleanUp, making lint happy

---
 frontend/src/Components/ProjectMembers.tsx | 44 ++++------------------
 1 file changed, 7 insertions(+), 37 deletions(-)

diff --git a/frontend/src/Components/ProjectMembers.tsx b/frontend/src/Components/ProjectMembers.tsx
index 469382a..be485c3 100644
--- a/frontend/src/Components/ProjectMembers.tsx
+++ b/frontend/src/Components/ProjectMembers.tsx
@@ -17,49 +17,19 @@ function ProjectMembers(): JSX.Element {
       console.error(response.message);
     }
   };
-
-  // const mockProjectMembers = [
-  //   {
-  //     username: "username1",
-  //     role: "Project Manager",
-  //   },
-  //   {
-  //     username: "username2",
-  //     role: "System Manager",
-  //   },
-  //   {
-  //     username: "username3",
-  //     role: "Developer",
-  //   },
-  //   {
-  //     username: "username4",
-  //     role: "Tester",
-  //   },
-  //   {
-  //     username: "username5",
-  //     role: "Tester",
-  //   },
-  //   {
-  //     username: "username6",
-  //     role: "Tester",
-  //   },
-  // ];
-
-  // const getProjectMembers = async (): Promise<void> => {
-  //   // Use the mock data
-  //   setProjectMembers(mockProjectMembers);
-
-  //   await Promise.resolve();
-  // };
-
   useEffect(() => {
     void getProjectMembers();
-  });
+  }, []);
+
+  interface ProjectMember {
+    Username: string;
+    UserRole: string;
+  }
 
   return (
     <>
       <div className="border-4 border-black bg-white flex flex-col items-center justify-center min-h-[65vh] h-fit w-[70vw] rounded-3xl content-center overflow-scroll space-y-[10vh] p-[30px] text-[20px]">
-        {projectMembers.map((projectMember, index) => (
+        {projectMembers.map((projectMember: ProjectMember, index: number) => (
           <h1 key={index} className="border-b-2 border-black w-full">
             <div className="flex justify-between">
               <div className="flex">

From ae0208ff2315be51f304e3fb87cf6872eaed1fd3 Mon Sep 17 00:00:00 2001
From: Davenludd <david.ludde01@gmail.com>
Date: Thu, 21 Mar 2024 10:02:48 +0100
Subject: [PATCH 24/76] Add project navigation based on user and pm role

---
 .../src/Components/DisplayUserProjects.tsx    | 32 ++++++++++++++++---
 1 file changed, 28 insertions(+), 4 deletions(-)

diff --git a/frontend/src/Components/DisplayUserProjects.tsx b/frontend/src/Components/DisplayUserProjects.tsx
index f4fd782..1d1ecfe 100644
--- a/frontend/src/Components/DisplayUserProjects.tsx
+++ b/frontend/src/Components/DisplayUserProjects.tsx
@@ -1,6 +1,6 @@
 import { useState, useEffect } from "react";
 import { Project } from "../Types/goTypes";
-import { Link } from "react-router-dom";
+import { Link, useNavigate } from "react-router-dom";
 import { api } from "../API/API";
 
 /**
@@ -9,6 +9,7 @@ import { api } from "../API/API";
  */
 function DisplayUserProject(): JSX.Element {
   const [projects, setProjects] = useState<Project[]>([]);
+  const navigate = useNavigate();
 
   const getProjects = async (): Promise<void> => {
     const token = localStorage.getItem("accessToken") ?? "";
@@ -21,6 +22,26 @@ function DisplayUserProject(): JSX.Element {
     }
   };
 
+  const handleProjectClick = async (projectName: string): Promise<void> => {
+    const username = localStorage.getItem("username") ?? "";
+    const token = localStorage.getItem("accessToken") ?? "";
+    const response = await api.checkIfProjectManager(
+      username,
+      projectName,
+      token,
+    );
+    if (response.success) {
+      if (response.data) {
+        navigate(`/PMProjectPage/${projectName}`);
+      } else {
+        navigate(`/project/${projectName}`);
+      }
+    } else {
+      // handle error
+      console.error(response.message);
+    }
+  };
+
   // Call getProjects when the component mounts
   useEffect(() => {
     void getProjects();
@@ -30,12 +51,15 @@ function DisplayUserProject(): JSX.Element {
     <>
       <h1 className="font-bold text-[30px] mb-[20px]">Your Projects</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]">
-        {projects.map((project, index) => (
-          <Link to={`/project/${project.name}`} key={index}>
+        {projects.map((project) => (
+          <div
+            onClick={() => void handleProjectClick(project.name)}
+            key={project.id}
+          >
             <h1 className="font-bold underline text-[30px] cursor-pointer">
               {project.name}
             </h1>
-          </Link>
+          </div>
         ))}
       </div>
     </>

From 85be4c79d68cc9a834791a85d05eb1019650dec7 Mon Sep 17 00:00:00 2001
From: Mattias <mattias.rasmusson.1032@student.lu.se>
Date: Thu, 21 Mar 2024 10:05:36 +0100
Subject: [PATCH 25/76] Refactor getProjectMembers function in ProjectMembers
 component

---
 frontend/src/Components/ProjectMembers.tsx | 23 +++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/frontend/src/Components/ProjectMembers.tsx b/frontend/src/Components/ProjectMembers.tsx
index be485c3..d7a975b 100644
--- a/frontend/src/Components/ProjectMembers.tsx
+++ b/frontend/src/Components/ProjectMembers.tsx
@@ -7,19 +7,20 @@ function ProjectMembers(): JSX.Element {
   const { projectName } = useParams();
   const [projectMembers, setProjectMembers] = useState<UserProjectMember[]>([]);
 
-  const getProjectMembers = async (): Promise<void> => {
-    const token = localStorage.getItem("accessToken") ?? "";
-    const response = await api.getAllUsersProject(projectName ?? "", token);
-    console.log(response);
-    if (response.success) {
-      setProjectMembers(response.data ?? []);
-    } else {
-      console.error(response.message);
-    }
-  };
   useEffect(() => {
+    const getProjectMembers = async (): Promise<void> => {
+      const token = localStorage.getItem("accessToken") ?? "";
+      const response = await api.getAllUsersProject(projectName ?? "", token);
+      console.log(response);
+      if (response.success) {
+        setProjectMembers(response.data ?? []);
+      } else {
+        console.error(response.message);
+      }
+    };
+
     void getProjectMembers();
-  }, []);
+  }, [projectName]);
 
   interface ProjectMember {
     Username: string;

From e2d23102755e268f6a50ef0c677ebaa8f6e26649 Mon Sep 17 00:00:00 2001
From: Mattias <mattias.rasmusson.1032@student.lu.se>
Date: Thu, 21 Mar 2024 10:31:24 +0100
Subject: [PATCH 26/76] Add ViewOtherTimeReport component to PMOtherUsersTR
 page

---
 .../src/Components/ViewOtherTimeReport.tsx    | 188 ++++++++++++++++++
 .../ProjectManagerPages/PMOtherUsersTR.tsx    |   7 +-
 frontend/src/main.tsx                         |   2 +-
 3 files changed, 195 insertions(+), 2 deletions(-)
 create mode 100644 frontend/src/Components/ViewOtherTimeReport.tsx

diff --git a/frontend/src/Components/ViewOtherTimeReport.tsx b/frontend/src/Components/ViewOtherTimeReport.tsx
new file mode 100644
index 0000000..38e3ed9
--- /dev/null
+++ b/frontend/src/Components/ViewOtherTimeReport.tsx
@@ -0,0 +1,188 @@
+import { useState, useEffect } from "react";
+import { WeeklyReport, NewWeeklyReport } from "../Types/goTypes";
+import { api } from "../API/API";
+import { useNavigate, useParams } from "react-router-dom";
+import Button from "./Button";
+
+/**
+ * Renders the component for editing a weekly report.
+ * @returns JSX.Element
+ */
+
+//This component does not yet work as intended. It is supposed to display the weekly report of a user in a project.
+export default function GetOtherUsersReport(): 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 token = localStorage.getItem("accessToken") ?? "";
+  const { projectName } = useParams();
+  const { username } = useParams();
+  const { fetchedWeek } = useParams();
+
+  useEffect(() => {
+    const fetchUsersWeeklyReport = async (): Promise<void> => {
+      const response = await api.getWeeklyReport(
+        projectName ?? "",
+        fetchedWeek?.toString() ?? "0",
+        token,
+      );
+
+      if (response.success) {
+        const report: WeeklyReport = response.data ?? {
+          reportId: 0,
+          userId: 0,
+          projectId: 0,
+          week: 0,
+          developmentTime: 0,
+          meetingTime: 0,
+          adminTime: 0,
+          ownWorkTime: 0,
+          studyTime: 0,
+          testingTime: 0,
+        };
+        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);
+      }
+    };
+
+    void fetchUsersWeeklyReport();
+  });
+
+  const handleSignWeeklyReport = async (): Promise<void> => {
+    const newWeeklyReport: NewWeeklyReport = {
+      projectName: projectName ?? "",
+      week,
+      developmentTime,
+      meetingTime,
+      adminTime,
+      ownWorkTime,
+      studyTime,
+      testingTime,
+    };
+
+    await api.submitWeeklyReport(newWeeklyReport, token);
+  };
+
+  const navigate = useNavigate();
+
+  return (
+    <>
+      <h1 className="text-[30px] font-bold">{username}&apos;s 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">
+        <form
+          onSubmit={(e) => {
+            e.preventDefault();
+            void handleSignWeeklyReport();
+            navigate(-1);
+          }}
+        >
+          <div className="flex flex-col items-center">
+            <div className="flex flex-col w-1/2 border-b-2 border-black items-center justify-center">
+              <h1 className="font-bold text-[30px]"> Week: {week}</h1>
+            </div>
+
+            <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 === 0 ? "" : developmentTime}
+                    />
+                  </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 === 0 ? "" : meetingTime}
+                    />
+                  </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 === 0 ? "" : adminTime}
+                    />
+                  </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 === 0 ? "" : ownWorkTime}
+                    />
+                  </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 === 0 ? "" : studyTime}
+                    />
+                  </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 === 0 ? "" : testingTime}
+                    />
+                  </td>
+                </tr>
+              </tbody>
+            </table>
+            <Button
+              text="Sign Report"
+              onClick={(): void => {
+                return;
+              }}
+              type="submit"
+            />
+          </div>
+        </form>
+      </div>
+    </>
+  );
+}
diff --git a/frontend/src/Pages/ProjectManagerPages/PMOtherUsersTR.tsx b/frontend/src/Pages/ProjectManagerPages/PMOtherUsersTR.tsx
index c76947b..f5c4bc7 100644
--- a/frontend/src/Pages/ProjectManagerPages/PMOtherUsersTR.tsx
+++ b/frontend/src/Pages/ProjectManagerPages/PMOtherUsersTR.tsx
@@ -1,8 +1,13 @@
 import BasicWindow from "../../Components/BasicWindow";
 import BackButton from "../../Components/BackButton";
+import ViewOtherTimeReport from "../../Components/ViewOtherTimeReport";
 
 function PMOtherUsersTR(): JSX.Element {
-  const content = <></>;
+  const content = (
+    <>
+      <ViewOtherTimeReport />
+    </>
+  );
 
   const buttons = (
     <>
diff --git a/frontend/src/main.tsx b/frontend/src/main.tsx
index c023660..66d808e 100644
--- a/frontend/src/main.tsx
+++ b/frontend/src/main.tsx
@@ -68,7 +68,7 @@ const router = createBrowserRouter([
     element: <PMChangeRole />,
   },
   {
-    path: "/otherUsersTimeReports",
+    path: "/otherUsersTimeReports/:projectName/:username",
     element: <PMOtherUsersTR />,
   },
   {

From ec362cfa3a0625949153c91cf8130aa14995b326 Mon Sep 17 00:00:00 2001
From: Melker <melker.jarl@gmail.com>
Date: Thu, 21 Mar 2024 10:51:47 +0100
Subject: [PATCH 27/76] GetProjectTimesHandler

---
 .../handlers/handlers_project_related.go      | 54 +++++++++++++++++++
 1 file changed, 54 insertions(+)

diff --git a/backend/internal/handlers/handlers_project_related.go b/backend/internal/handlers/handlers_project_related.go
index 603f4cd..f64d013 100644
--- a/backend/internal/handlers/handlers_project_related.go
+++ b/backend/internal/handlers/handlers_project_related.go
@@ -233,3 +233,57 @@ func (gs *GState) IsProjectManagerHandler(c *fiber.Ctx) error {
 	// Return the result as JSON
 	return c.JSON(fiber.Map{"isProjectManager": isManager})
 }
+
+func (gs *GState) GetProjectTimesHandler(c *fiber.Ctx) error {
+    // Get the username from the token
+    user := c.Locals("user").(*jwt.Token)
+    claims := user.Claims.(jwt.MapClaims)
+    username := claims["name"].(string)
+    
+    // Get project
+    projectName := c.Params("projectName")
+    if projectName == "" {
+        log.Info("No project name provided")
+        return c.Status(400).SendString("No project name provided")
+    }
+    
+    // Get all users in the project and roles
+    userProjects, err := gs.Db.GetAllUsersProject(projectName)
+    if err != nil {
+        log.Info("Error getting users in project:", err)
+        return c.Status(500).SendString(err.Error())
+    }
+    
+    // If the user is member
+    isMember := false
+    for _, userProject := range userProjects {
+        if userProject.Username == username {
+            isMember = true
+            break
+        }
+    }
+    
+    // If the user is admin
+    if !isMember {
+        isAdmin, err := gs.Db.IsSiteAdmin(username)
+        if err != nil {
+            log.Info("Error checking admin status:", err)
+            return c.Status(500).SendString(err.Error())
+        }
+        if !isAdmin {
+            log.Info("User is neither a project member nor a site admin:", username)
+            return c.Status(403).SendString("User is neither a project member nor a site admin")
+        }
+    }
+    
+    // Get project times 
+    projectTimes, err := gs.Db.GetProjectTimes(projectName)
+    if err != nil {
+        log.Info("Error getting project times:", err)
+        return c.Status(500).SendString(err.Error())
+    }
+    
+    // Return project times as JSON
+    log.Info("Returning project times for project:", projectName)
+    return c.JSON(projectTimes)
+}
\ No newline at end of file

From 856ae4090087d7b241ef206cee98e4d206434488 Mon Sep 17 00:00:00 2001
From: Davenludd <david.ludde01@gmail.com>
Date: Thu, 21 Mar 2024 10:25:27 +0100
Subject: [PATCH 28/76] Refactor input fields to handle empty values

---
 frontend/src/Components/EditWeeklyReport.tsx | 54 +++++++++++++++-----
 1 file changed, 42 insertions(+), 12 deletions(-)

diff --git a/frontend/src/Components/EditWeeklyReport.tsx b/frontend/src/Components/EditWeeklyReport.tsx
index 9dc3d8e..0d6f187 100644
--- a/frontend/src/Components/EditWeeklyReport.tsx
+++ b/frontend/src/Components/EditWeeklyReport.tsx
@@ -113,9 +113,14 @@ export default function GetWeeklyReport(): JSX.Element {
                       type="number"
                       min="0"
                       className="border-2 border-black rounded-md text-center w-1/2"
-                      value={developmentTime}
+                      value={developmentTime === 0 ? "" : developmentTime}
                       onChange={(e) => {
-                        setDevelopmentTime(parseInt(e.target.value));
+                        if (e.target.value === "") {
+                          setDevelopmentTime(0);
+                          return;
+                        } else {
+                          setDevelopmentTime(parseInt(e.target.value));
+                        }
                       }}
                       onKeyDown={(event) => {
                         const keyValue = event.key;
@@ -132,9 +137,14 @@ export default function GetWeeklyReport(): JSX.Element {
                       type="number"
                       min="0"
                       className="border-2 border-black rounded-md text-center w-1/2"
-                      value={meetingTime}
+                      value={meetingTime === 0 ? "" : meetingTime}
                       onChange={(e) => {
-                        setMeetingTime(parseInt(e.target.value));
+                        if (e.target.value === "") {
+                          setMeetingTime(0);
+                          return;
+                        } else {
+                          setMeetingTime(parseInt(e.target.value));
+                        }
                       }}
                       onKeyDown={(event) => {
                         const keyValue = event.key;
@@ -151,9 +161,14 @@ export default function GetWeeklyReport(): JSX.Element {
                       type="number"
                       min="0"
                       className="border-2 border-black rounded-md text-center w-1/2"
-                      value={adminTime}
+                      value={adminTime === 0 ? "" : adminTime}
                       onChange={(e) => {
-                        setAdminTime(parseInt(e.target.value));
+                        if (e.target.value === "") {
+                          setAdminTime(0);
+                          return;
+                        } else {
+                          setAdminTime(parseInt(e.target.value));
+                        }
                       }}
                       onKeyDown={(event) => {
                         const keyValue = event.key;
@@ -170,9 +185,14 @@ export default function GetWeeklyReport(): JSX.Element {
                       type="number"
                       min="0"
                       className="border-2 border-black rounded-md text-center w-1/2"
-                      value={ownWorkTime}
+                      value={ownWorkTime === 0 ? "" : ownWorkTime}
                       onChange={(e) => {
-                        setOwnWorkTime(parseInt(e.target.value));
+                        if (e.target.value === "") {
+                          setOwnWorkTime(0);
+                          return;
+                        } else {
+                          setOwnWorkTime(parseInt(e.target.value));
+                        }
                       }}
                       onKeyDown={(event) => {
                         const keyValue = event.key;
@@ -189,9 +209,14 @@ export default function GetWeeklyReport(): JSX.Element {
                       type="number"
                       min="0"
                       className="border-2 border-black rounded-md text-center w-1/2"
-                      value={studyTime}
+                      value={studyTime === 0 ? "" : studyTime}
                       onChange={(e) => {
-                        setStudyTime(parseInt(e.target.value));
+                        if (e.target.value === "") {
+                          setStudyTime(0);
+                          return;
+                        } else {
+                          setStudyTime(parseInt(e.target.value));
+                        }
                       }}
                       onKeyDown={(event) => {
                         const keyValue = event.key;
@@ -208,9 +233,14 @@ export default function GetWeeklyReport(): JSX.Element {
                       type="number"
                       min="0"
                       className="border-2 border-black rounded-md text-center w-1/2"
-                      value={testingTime}
+                      value={testingTime === 0 ? "" : testingTime}
                       onChange={(e) => {
-                        setTestingTime(parseInt(e.target.value));
+                        if (e.target.value === "") {
+                          setTestingTime(0);
+                          return;
+                        } else {
+                          setTestingTime(parseInt(e.target.value));
+                        }
                       }}
                       onKeyDown={(event) => {
                         const keyValue = event.key;

From 70e6cbf12e578c1570263da220fe1acd630d0557 Mon Sep 17 00:00:00 2001
From: Mattias <mattias.rasmusson.1032@student.lu.se>
Date: Thu, 21 Mar 2024 11:29:57 +0100
Subject: [PATCH 29/76] Update project members page layout and remove
 unnecessary links

---
 frontend/src/Components/ProjectMembers.tsx           | 10 +++-------
 .../Pages/ProjectManagerPages/PMProjectMembers.tsx   | 12 ------------
 2 files changed, 3 insertions(+), 19 deletions(-)

diff --git a/frontend/src/Components/ProjectMembers.tsx b/frontend/src/Components/ProjectMembers.tsx
index d7a975b..b7efa47 100644
--- a/frontend/src/Components/ProjectMembers.tsx
+++ b/frontend/src/Components/ProjectMembers.tsx
@@ -29,6 +29,9 @@ function ProjectMembers(): JSX.Element {
 
   return (
     <>
+      <h1 className="font-bold text-[30px] mb-[20px]">
+        All Members In: {projectName}{" "}
+      </h1>
       <div className="border-4 border-black bg-white flex flex-col items-center justify-center min-h-[65vh] h-fit w-[70vw] rounded-3xl content-center overflow-scroll space-y-[10vh] p-[30px] text-[20px]">
         {projectMembers.map((projectMember: ProjectMember, index: number) => (
           <h1 key={index} className="border-b-2 border-black w-full">
@@ -47,13 +50,6 @@ function ProjectMembers(): JSX.Element {
                       View Reports
                     </h1>
                   </Link>
-                  <Link
-                    to={`/changeRole/${projectName}/${projectMember.Username}`}
-                  >
-                    <h1 className="underline cursor-pointer font-bold">
-                      Change Role
-                    </h1>
-                  </Link>
                 </div>
               </div>
             </div>
diff --git a/frontend/src/Pages/ProjectManagerPages/PMProjectMembers.tsx b/frontend/src/Pages/ProjectManagerPages/PMProjectMembers.tsx
index f7c902e..7aa692d 100644
--- a/frontend/src/Pages/ProjectManagerPages/PMProjectMembers.tsx
+++ b/frontend/src/Pages/ProjectManagerPages/PMProjectMembers.tsx
@@ -8,9 +8,6 @@ function PMProjectMembers(): JSX.Element {
   const { projectName } = useParams();
   const content = (
     <>
-      <h1 className="font-bold text-[30px] mb-[20px]">
-        All Members In: {projectName}{" "}
-      </h1>
       <ProjectMembers />
     </>
   );
@@ -26,15 +23,6 @@ function PMProjectMembers(): JSX.Element {
           type={"button"}
         />
       </Link>
-      <Link to={`/PMtimerole/${projectName}`}>
-        <Button
-          text="Time / Role"
-          onClick={(): void => {
-            return;
-          }}
-          type={"button"}
-        />
-      </Link>
       <BackButton />
     </>
   );

From 4b6c93a2024ac60f1a24f468af9b04e94d7062f5 Mon Sep 17 00:00:00 2001
From: Mattias <mattias.rasmusson.1032@student.lu.se>
Date: Thu, 21 Mar 2024 12:10:43 +0100
Subject: [PATCH 30/76] Add DisplayUnsignedReports component and update route
 for otherUsersTimeReports

---
 .../src/Components/DisplayUnsignedReports.tsx | 129 ++++++++++++++++++
 frontend/src/main.tsx                         |   2 +-
 2 files changed, 130 insertions(+), 1 deletion(-)
 create mode 100644 frontend/src/Components/DisplayUnsignedReports.tsx

diff --git a/frontend/src/Components/DisplayUnsignedReports.tsx b/frontend/src/Components/DisplayUnsignedReports.tsx
new file mode 100644
index 0000000..9d6f74e
--- /dev/null
+++ b/frontend/src/Components/DisplayUnsignedReports.tsx
@@ -0,0 +1,129 @@
+import { useState, useEffect } from "react";
+import { Link, useParams } from "react-router-dom";
+
+interface UnsignedReports {
+  projectName: string;
+  username: string;
+  week: number;
+  signed: boolean;
+}
+
+/**
+ * Renders a component that displays the projects a user is a part of and links to the projects start-page.
+ * @returns The JSX element representing the component.
+ */
+function DisplayUserProject(): JSX.Element {
+  const { projectName } = useParams();
+  const [unsignedReports, setUnsignedReports] = useState<UnsignedReports[]>([]);
+  //const navigate = useNavigate();
+
+  //   const getUnsignedReports = async (): Promise<void> => {
+  //     const token = localStorage.getItem("accessToken") ?? "";
+  //     const response = await api.getUserProjects(token);
+  //     console.log(response);
+  //     if (response.success) {
+  //       setUnsignedReports(response.data ?? []);
+  //     } else {
+  //       console.error(response.message);
+  //     }
+  //   };
+
+  //   const handleReportClick = async (projectName: string): Promise<void> => {
+  //     const username = localStorage.getItem("username") ?? "";
+  //     const token = localStorage.getItem("accessToken") ?? "";
+  //     const response = await api.checkIfProjectManager(
+  //       username,
+  //       projectName,
+  //       token,
+  //     );
+  //     if (response.success) {
+  //       if (response.data) {
+  //         navigate(`/PMProjectPage/${projectName}`);
+  //       } else {
+  //         navigate(`/project/${projectName}`);
+  //       }
+  //     } else {
+  //       // handle error
+  //       console.error(response.message);
+  //     }
+  //   };
+
+  const getUnsignedReports = async (): Promise<void> => {
+    // Simulate a delay
+    await Promise.resolve();
+
+    // Use mock data
+    const reports: UnsignedReports[] = [
+      {
+        projectName: "projecttest",
+        username: "user1",
+        week: 2,
+        signed: false,
+      },
+      {
+        projectName: "projecttest",
+        username: "user2",
+        week: 2,
+        signed: false,
+      },
+      {
+        projectName: "projecttest",
+        username: "user3",
+        week: 2,
+        signed: false,
+      },
+      {
+        projectName: "projecttest",
+        username: "user4",
+        week: 2,
+        signed: false,
+      },
+    ];
+
+    // Set the state with the mock data
+    setUnsignedReports(reports);
+  };
+
+  // Call getProjects when the component mounts
+  useEffect(() => {
+    void getUnsignedReports();
+  }, []);
+
+  return (
+    <>
+      <h1 className="font-bold text-[30px] mb-[20px]">
+        All Unsigned Reports In: {projectName}{" "}
+      </h1>
+      <div className="border-4 border-black bg-white flex flex-col items-center justify-center min-h-[65vh] h-fit w-[70vw] rounded-3xl content-center overflow-scroll space-y-[10vh] p-[30px] text-[20px]">
+        {unsignedReports.map(
+          (unsignedReport: UnsignedReports, index: number) => (
+            <h1 key={index} className="border-b-2 border-black w-full">
+              <div className="flex justify-between">
+                <div className="flex">
+                  <h1>{unsignedReport.username}</h1>
+                  <span className="ml-6 mr-2 font-bold">Week:</span>
+                  <h1>{unsignedReport.week}</h1>
+                  <span className="ml-6 mr-2 font-bold">Signed:</span>
+                  <h1>NO</h1>
+                </div>
+                <div className="flex">
+                  <div className="ml-auto flex space-x-4">
+                    <Link
+                      to={`/otherUsersTimeReports/${projectName}/${unsignedReport.username}/${unsignedReport.week}`}
+                    >
+                      <h1 className="underline cursor-pointer font-bold">
+                        View Report
+                      </h1>
+                    </Link>
+                  </div>
+                </div>
+              </div>
+            </h1>
+          ),
+        )}
+      </div>
+    </>
+  );
+}
+
+export default DisplayUserProject;
diff --git a/frontend/src/main.tsx b/frontend/src/main.tsx
index 66d808e..a810738 100644
--- a/frontend/src/main.tsx
+++ b/frontend/src/main.tsx
@@ -68,7 +68,7 @@ const router = createBrowserRouter([
     element: <PMChangeRole />,
   },
   {
-    path: "/otherUsersTimeReports/:projectName/:username",
+    path: "/otherUsersTimeReports/:projectName/:username/:week",
     element: <PMOtherUsersTR />,
   },
   {

From 1b20173ece7bd19fe4962cf6ea1de604cbcfd0c2 Mon Sep 17 00:00:00 2001
From: Mattias <mattias.rasmusson.1032@student.lu.se>
Date: Thu, 21 Mar 2024 12:10:53 +0100
Subject: [PATCH 31/76] Remove unused import and add DisplayUnsignedReports
 component

---
 frontend/src/Components/DisplayUserProjects.tsx            | 2 +-
 .../src/Pages/ProjectManagerPages/PMUnsignedReports.tsx    | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/frontend/src/Components/DisplayUserProjects.tsx b/frontend/src/Components/DisplayUserProjects.tsx
index 1d1ecfe..426d266 100644
--- a/frontend/src/Components/DisplayUserProjects.tsx
+++ b/frontend/src/Components/DisplayUserProjects.tsx
@@ -1,6 +1,6 @@
 import { useState, useEffect } from "react";
 import { Project } from "../Types/goTypes";
-import { Link, useNavigate } from "react-router-dom";
+import { useNavigate } from "react-router-dom";
 import { api } from "../API/API";
 
 /**
diff --git a/frontend/src/Pages/ProjectManagerPages/PMUnsignedReports.tsx b/frontend/src/Pages/ProjectManagerPages/PMUnsignedReports.tsx
index 713efec..99d3522 100644
--- a/frontend/src/Pages/ProjectManagerPages/PMUnsignedReports.tsx
+++ b/frontend/src/Pages/ProjectManagerPages/PMUnsignedReports.tsx
@@ -1,8 +1,13 @@
 import BasicWindow from "../../Components/BasicWindow";
 import BackButton from "../../Components/BackButton";
+import DisplayUnsignedReports from "../../Components/DisplayUnsignedReports";
 
 function PMUnsignedReports(): JSX.Element {
-  const content = <></>;
+  const content = (
+    <>
+      <DisplayUnsignedReports />
+    </>
+  );
 
   const buttons = (
     <>

From d8a73329a14a5e54d95177c0e584814b9b3baa54 Mon Sep 17 00:00:00 2001
From: Davenludd <david.ludde01@gmail.com>
Date: Thu, 21 Mar 2024 12:30:46 +0100
Subject: [PATCH 32/76] Refactor error handling in SubmitWeeklyReport handler

---
 backend/internal/handlers/handlers_report_related.go | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/backend/internal/handlers/handlers_report_related.go b/backend/internal/handlers/handlers_report_related.go
index 0e72ead..dee0dc0 100644
--- a/backend/internal/handlers/handlers_report_related.go
+++ b/backend/internal/handlers/handlers_report_related.go
@@ -33,11 +33,13 @@ func (gs *GState) SubmitWeeklyReport(c *fiber.Ctx) error {
 
 	if err := gs.Db.AddWeeklyReport(report.ProjectName, username, report.Week, report.DevelopmentTime, report.MeetingTime, report.AdminTime, report.OwnWorkTime, report.StudyTime, report.TestingTime); err != nil {
 		log.Info("Error adding weekly report to db:", err)
-		return c.Status(500).SendString(err.Error())
+		//Previously:return c.Status(500).SendString(err.Error())
+		return c.Status(500).JSON(fiber.Map{"success": false, "message": err.Error()})
 	}
 
 	log.Info("Weekly report added")
-	return c.Status(200).SendString("Time report added")
+	//Previosly: return c.Status(200).SendString("Time report added")
+	return c.Status(200).JSON(fiber.Map{"success": true, "data": "Time report added"})
 }
 
 // Handler for retrieving weekly report

From ebc59e0c111dd2ef783be6537f3a1c04ef4b108c Mon Sep 17 00:00:00 2001
From: Davenludd <david.ludde01@gmail.com>
Date: Thu, 21 Mar 2024 12:31:05 +0100
Subject: [PATCH 33/76] Refactor handleNewWeeklyReport function to return a
 boolean indicating success or failure if week already has a report

---
 frontend/src/Components/NewWeeklyReport.tsx | 32 +++++++++++++++------
 1 file changed, 23 insertions(+), 9 deletions(-)

diff --git a/frontend/src/Components/NewWeeklyReport.tsx b/frontend/src/Components/NewWeeklyReport.tsx
index 1204e11..b0bccac 100644
--- a/frontend/src/Components/NewWeeklyReport.tsx
+++ b/frontend/src/Components/NewWeeklyReport.tsx
@@ -22,7 +22,7 @@ export default function NewWeeklyReport(): JSX.Element {
   const { projectName } = useParams();
   const token = localStorage.getItem("accessToken") ?? "";
 
-  const handleNewWeeklyReport = async (): Promise<void> => {
+  const handleNewWeeklyReport = async (): Promise<boolean> => {
     const newWeeklyReport: NewWeeklyReport = {
       projectName: projectName ?? "",
       week: week,
@@ -34,7 +34,13 @@ export default function NewWeeklyReport(): JSX.Element {
       testingTime: testingTime,
     };
 
-    await api.submitWeeklyReport(newWeeklyReport, token);
+    const response = await api.submitWeeklyReport(newWeeklyReport, token);
+    console.log(response);
+    if (response.success) {
+      return true;
+    } else {
+      return false;
+    }
   };
 
   const navigate = useNavigate();
@@ -46,14 +52,22 @@ export default function NewWeeklyReport(): JSX.Element {
       <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 || week > 53 || week < 1) {
-              alert("Please enter a valid week number");
-              e.preventDefault();
-              return;
-            }
             e.preventDefault();
-            void handleNewWeeklyReport();
-            navigate(-1);
+            void (async (): Promise<void> => {
+              if (week === 0 || week > 53 || week < 1) {
+                alert("Please enter a valid week number");
+                return;
+              }
+
+              const success = await handleNewWeeklyReport();
+              if (!success) {
+                alert(
+                  "A Time Report for this week already exists, please go to the edit page to edit it or change week number.",
+                );
+                return;
+              }
+              navigate(-1);
+            })();
           }}
         >
           <div className="flex flex-col items-center">

From a31a50965f50db7c60a796e1a77a7e883a5a432c Mon Sep 17 00:00:00 2001
From: Mattias <mattias.rasmusson.1032@student.lu.se>
Date: Thu, 21 Mar 2024 12:36:14 +0100
Subject: [PATCH 34/76] Update routes and components for PMViewUnsignedReport

---
 .../src/Components/DisplayUnsignedReports.tsx |  2 +-
 .../ProjectManagerPages/PMOtherUsersTR.tsx    |  7 +-----
 .../PMViewUnsignedReport.tsx                  | 22 ++-----------------
 frontend/src/main.tsx                         |  2 +-
 4 files changed, 5 insertions(+), 28 deletions(-)

diff --git a/frontend/src/Components/DisplayUnsignedReports.tsx b/frontend/src/Components/DisplayUnsignedReports.tsx
index 9d6f74e..780f20c 100644
--- a/frontend/src/Components/DisplayUnsignedReports.tsx
+++ b/frontend/src/Components/DisplayUnsignedReports.tsx
@@ -109,7 +109,7 @@ function DisplayUserProject(): JSX.Element {
                 <div className="flex">
                   <div className="ml-auto flex space-x-4">
                     <Link
-                      to={`/otherUsersTimeReports/${projectName}/${unsignedReport.username}/${unsignedReport.week}`}
+                      to={`/PMViewUnsignedReport/${projectName}/${unsignedReport.username}/${unsignedReport.week}`}
                     >
                       <h1 className="underline cursor-pointer font-bold">
                         View Report
diff --git a/frontend/src/Pages/ProjectManagerPages/PMOtherUsersTR.tsx b/frontend/src/Pages/ProjectManagerPages/PMOtherUsersTR.tsx
index f5c4bc7..c76947b 100644
--- a/frontend/src/Pages/ProjectManagerPages/PMOtherUsersTR.tsx
+++ b/frontend/src/Pages/ProjectManagerPages/PMOtherUsersTR.tsx
@@ -1,13 +1,8 @@
 import BasicWindow from "../../Components/BasicWindow";
 import BackButton from "../../Components/BackButton";
-import ViewOtherTimeReport from "../../Components/ViewOtherTimeReport";
 
 function PMOtherUsersTR(): JSX.Element {
-  const content = (
-    <>
-      <ViewOtherTimeReport />
-    </>
-  );
+  const content = <></>;
 
   const buttons = (
     <>
diff --git a/frontend/src/Pages/ProjectManagerPages/PMViewUnsignedReport.tsx b/frontend/src/Pages/ProjectManagerPages/PMViewUnsignedReport.tsx
index aea25fb..c41c2b8 100644
--- a/frontend/src/Pages/ProjectManagerPages/PMViewUnsignedReport.tsx
+++ b/frontend/src/Pages/ProjectManagerPages/PMViewUnsignedReport.tsx
@@ -1,34 +1,16 @@
 import BackButton from "../../Components/BackButton";
 import BasicWindow from "../../Components/BasicWindow";
-import Button from "../../Components/Button";
-import TimeReport from "../../Components/NewWeeklyReport";
+import ViewOtherTimeReport from "../../Components/ViewOtherTimeReport";
 
 function PMViewUnsignedReport(): JSX.Element {
   const content = (
     <>
-      <h1 className="font-bold text-[30px] mb-[20px]">
-        Username&apos;s Time Report
-      </h1>
-      <TimeReport />
+      <ViewOtherTimeReport />
     </>
   );
 
   const buttons = (
     <>
-      <Button
-        text="Sign"
-        onClick={(): void => {
-          return;
-        }}
-        type="button"
-      />
-      <Button
-        text="Save"
-        onClick={(): void => {
-          return;
-        }}
-        type="button"
-      />
       <BackButton />
     </>
   );
diff --git a/frontend/src/main.tsx b/frontend/src/main.tsx
index a810738..83de79e 100644
--- a/frontend/src/main.tsx
+++ b/frontend/src/main.tsx
@@ -92,7 +92,7 @@ const router = createBrowserRouter([
     element: <PMUnsignedReports />,
   },
   {
-    path: "/PMViewUnsignedReport",
+    path: "/PMViewUnsignedReport/:projectName/:username/:week",
     element: <PMViewUnsignedReport />,
   },
   {

From 9f931a26434bf1ef78b861a8e503b1256f8f5bb5 Mon Sep 17 00:00:00 2001
From: Mattias <mattias.rasmusson.1032@student.lu.se>
Date: Thu, 21 Mar 2024 12:37:44 +0100
Subject: [PATCH 35/76] Add heading to Edit Time Report page

---
 frontend/src/Components/EditWeeklyReport.tsx            | 1 +
 frontend/src/Pages/UserPages/UserEditTimeReportPage.tsx | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/Components/EditWeeklyReport.tsx b/frontend/src/Components/EditWeeklyReport.tsx
index 0d6f187..63bce48 100644
--- a/frontend/src/Components/EditWeeklyReport.tsx
+++ b/frontend/src/Components/EditWeeklyReport.tsx
@@ -76,6 +76,7 @@ export default function GetWeeklyReport(): JSX.Element {
 
   return (
     <>
+      <h1 className="font-bold text-[30px] mb-[20px]">Edit 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">
         <form
           onSubmit={(e) => {
diff --git a/frontend/src/Pages/UserPages/UserEditTimeReportPage.tsx b/frontend/src/Pages/UserPages/UserEditTimeReportPage.tsx
index 317cec8..0bf7e3e 100644
--- a/frontend/src/Pages/UserPages/UserEditTimeReportPage.tsx
+++ b/frontend/src/Pages/UserPages/UserEditTimeReportPage.tsx
@@ -5,7 +5,6 @@ import EditWeeklyReport from "../../Components/EditWeeklyReport";
 function UserEditTimeReportPage(): JSX.Element {
   const content = (
     <>
-      <h1 className="font-bold text-[30px] mb-[20px]">Edit Time Report</h1>
       <EditWeeklyReport />
     </>
   );

From b656204457e8f2c96ac3865a9839f0ce32762f16 Mon Sep 17 00:00:00 2001
From: Davenludd <david.ludde01@gmail.com>
Date: Thu, 21 Mar 2024 12:46:05 +0100
Subject: [PATCH 36/76] Added component for PM to view other users time reports

---
 .../AllTimeReportsInProjectOtherUser.tsx      | 71 +++++++++++++++++++
 1 file changed, 71 insertions(+)
 create mode 100644 frontend/src/Components/AllTimeReportsInProjectOtherUser.tsx

diff --git a/frontend/src/Components/AllTimeReportsInProjectOtherUser.tsx b/frontend/src/Components/AllTimeReportsInProjectOtherUser.tsx
new file mode 100644
index 0000000..4fa9ad8
--- /dev/null
+++ b/frontend/src/Components/AllTimeReportsInProjectOtherUser.tsx
@@ -0,0 +1,71 @@
+//Info: This component is used to display all the time reports for a project. It will display the week number,
+//total time spent, and if the report has been signed or not. The user can click on a report to edit it.
+import { useEffect, useState } from "react";
+import { WeeklyReport } from "../Types/goTypes";
+import { Link, useParams } from "react-router-dom";
+import { api } from "../API/API";
+
+/**
+ * Renders a component that displays all the time reports for a specific project.
+ * @returns {JSX.Element} representing the component.
+ */
+function AllTimeReportsInProject(): JSX.Element {
+  const { projectName } = useParams();
+  const [weeklyReports, setWeeklyReports] = useState<WeeklyReport[]>([]);
+
+  // Call getProjects when the component mounts
+  useEffect(() => {
+    const getWeeklyReports = async (): Promise<void> => {
+      const token = localStorage.getItem("accessToken") ?? "";
+      const response = await api.getWeeklyReportsForUser(
+        projectName ?? "",
+        token,
+      );
+      console.log(response);
+      if (response.success) {
+        setWeeklyReports(response.data ?? []);
+      } else {
+        console.error(response.message);
+      }
+    };
+
+    void getWeeklyReports();
+  }, [projectName]);
+
+  return (
+    <>
+      <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] text-[30px]">
+        {weeklyReports.map((newWeeklyReport, index) => (
+          <Link
+            to={`/editTimeReport/${projectName}/${newWeeklyReport.week}`}
+            key={index}
+            className="border-b-2 border-black w-full"
+          >
+            <div className="flex justify-between">
+              <h1>
+                <span className="font-bold">{"Week: "}</span>
+                {newWeeklyReport.week}
+              </h1>
+              <h1>
+                <span className="font-bold">{"Total Time: "}</span>
+                {newWeeklyReport.developmentTime +
+                  newWeeklyReport.meetingTime +
+                  newWeeklyReport.adminTime +
+                  newWeeklyReport.ownWorkTime +
+                  newWeeklyReport.studyTime +
+                  newWeeklyReport.testingTime}{" "}
+                min
+              </h1>
+              <h1>
+                <span className="font-bold">{"Signed: "}</span>
+                {newWeeklyReport.signedBy ? "YES" : "NO"}
+              </h1>
+            </div>
+          </Link>
+        ))}
+      </div>
+    </>
+  );
+}
+
+export default AllTimeReportsInProject;

From e47f12c6d7954d0eb272bf8bf5cd87fb886ebaac Mon Sep 17 00:00:00 2001
From: Davenludd <david.ludde01@gmail.com>
Date: Thu, 21 Mar 2024 13:58:45 +0100
Subject: [PATCH 37/76] Add new route for PM components

---
 frontend/src/main.tsx | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/frontend/src/main.tsx b/frontend/src/main.tsx
index 83de79e..9090dfe 100644
--- a/frontend/src/main.tsx
+++ b/frontend/src/main.tsx
@@ -31,6 +31,7 @@ import AdminProjectViewMemberInfo from "./Pages/AdminPages/AdminProjectViewMembe
 import AdminProjectPage from "./Pages/AdminPages/AdminProjectPage.tsx";
 import NotFoundPage from "./Pages/NotFoundPage.tsx";
 import UnauthorizedPage from "./Pages/UnauthorizedPage.tsx";
+import PMViewOtherUsersTR from "./Pages/ProjectManagerPages/PMViewOtherUsersTR.tsx";
 
 // This is where the routes are mounted
 const router = createBrowserRouter([
@@ -60,7 +61,7 @@ const router = createBrowserRouter([
     element: <UserViewTimeReportsPage />,
   },
   {
-    path: "/editTimeReport/:projectName/:weekNumber",
+    path: "/editTimeReport/:projectName/:fetchWeek",
     element: <UserEditTimeReportPage />,
   },
   {
@@ -68,9 +69,13 @@ const router = createBrowserRouter([
     element: <PMChangeRole />,
   },
   {
-    path: "/otherUsersTimeReports/:projectName/:username/:week",
+    path: "/otherUsersTimeReports/:projectName/:username",
     element: <PMOtherUsersTR />,
   },
+  {
+    path: "/editOthersTR/:projectName/:username/:fetchedWeek",
+    element: <PMViewOtherUsersTR />,
+  },
   {
     path: "/projectMembers/:projectName",
     element: <PMProjectMembers />,
@@ -92,7 +97,7 @@ const router = createBrowserRouter([
     element: <PMUnsignedReports />,
   },
   {
-    path: "/PMViewUnsignedReport/:projectName/:username/:week",
+    path: "/PMViewUnsignedReport/:projectName/:username/:fetchedWeek",
     element: <PMViewUnsignedReport />,
   },
   {

From deeff6c3c2b199e0f9b8966e5ca751972d035ffb Mon Sep 17 00:00:00 2001
From: Davenludd <david.ludde01@gmail.com>
Date: Thu, 21 Mar 2024 13:59:10 +0100
Subject: [PATCH 38/76] Added AllTimeReportsInProjectOtherUser component

---
 .../AllTimeReportsInProjectOtherUser.tsx      | 48 +++++++++++++++----
 1 file changed, 40 insertions(+), 8 deletions(-)

diff --git a/frontend/src/Components/AllTimeReportsInProjectOtherUser.tsx b/frontend/src/Components/AllTimeReportsInProjectOtherUser.tsx
index 4fa9ad8..09ca6dc 100644
--- a/frontend/src/Components/AllTimeReportsInProjectOtherUser.tsx
+++ b/frontend/src/Components/AllTimeReportsInProjectOtherUser.tsx
@@ -1,19 +1,19 @@
 //Info: This component is used to display all the time reports for a project. It will display the week number,
 //total time spent, and if the report has been signed or not. The user can click on a report to edit it.
 import { useEffect, useState } from "react";
-import { WeeklyReport } from "../Types/goTypes";
+import { NewWeeklyReport } from "../Types/goTypes";
 import { Link, useParams } from "react-router-dom";
-import { api } from "../API/API";
 
 /**
  * Renders a component that displays all the time reports for a specific project.
  * @returns {JSX.Element} representing the component.
  */
 function AllTimeReportsInProject(): JSX.Element {
+  const { username } = useParams();
   const { projectName } = useParams();
-  const [weeklyReports, setWeeklyReports] = useState<WeeklyReport[]>([]);
+  const [weeklyReports, setWeeklyReports] = useState<NewWeeklyReport[]>([]);
 
-  // Call getProjects when the component mounts
+  /*   // Call getProjects when the component mounts
   useEffect(() => {
     const getWeeklyReports = async (): Promise<void> => {
       const token = localStorage.getItem("accessToken") ?? "";
@@ -27,17 +27,49 @@ function AllTimeReportsInProject(): JSX.Element {
       } else {
         console.error(response.message);
       }
-    };
+    }; */
+  // Mock data
+  const getWeeklyReports = async (): Promise<void> => {
+    // Simulate a delay
+    await Promise.resolve();
+    const mockWeeklyReports: NewWeeklyReport[] = [
+      {
+        projectName: "Project 1",
+        week: 1,
+        developmentTime: 10,
+        meetingTime: 2,
+        adminTime: 1,
+        ownWorkTime: 3,
+        studyTime: 4,
+        testingTime: 5,
+      },
+      {
+        projectName: "Project 1",
+        week: 2,
+        developmentTime: 8,
+        meetingTime: 2,
+        adminTime: 1,
+        ownWorkTime: 3,
+        studyTime: 4,
+        testingTime: 5,
+      },
+      // Add more reports as needed
+    ];
 
+    // Use the mock data instead of the real data
+    setWeeklyReports(mockWeeklyReports);
+  };
+  useEffect(() => {
     void getWeeklyReports();
-  }, [projectName]);
+  }, []);
 
   return (
     <>
+      <h1 className="text-[30px] font-bold">{username}&apos;s Time Reports</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] text-[30px]">
         {weeklyReports.map((newWeeklyReport, index) => (
           <Link
-            to={`/editTimeReport/${projectName}/${newWeeklyReport.week}`}
+            to={`/editOthersTR/${projectName}/${username}/${newWeeklyReport.week}`}
             key={index}
             className="border-b-2 border-black w-full"
           >
@@ -58,7 +90,7 @@ function AllTimeReportsInProject(): JSX.Element {
               </h1>
               <h1>
                 <span className="font-bold">{"Signed: "}</span>
-                {newWeeklyReport.signedBy ? "YES" : "NO"}
+                NO
               </h1>
             </div>
           </Link>

From 4c22ba478d1d7c495a83a33cbc7325adaaa4af97 Mon Sep 17 00:00:00 2001
From: Davenludd <david.ludde01@gmail.com>
Date: Thu, 21 Mar 2024 13:59:24 +0100
Subject: [PATCH 39/76] Add OtherUsersTR component for displaying weekly report
 of a user in a project

---
 frontend/src/Components/OtherUsersTR.tsx | 153 +++++++++++++++++++++++
 1 file changed, 153 insertions(+)
 create mode 100644 frontend/src/Components/OtherUsersTR.tsx

diff --git a/frontend/src/Components/OtherUsersTR.tsx b/frontend/src/Components/OtherUsersTR.tsx
new file mode 100644
index 0000000..2b00e16
--- /dev/null
+++ b/frontend/src/Components/OtherUsersTR.tsx
@@ -0,0 +1,153 @@
+import { useState, useEffect } from "react";
+import { WeeklyReport } from "../Types/goTypes";
+import { api } from "../API/API";
+import { useParams } from "react-router-dom";
+
+/**
+ * Renders the component for editing a weekly report.
+ * @returns JSX.Element
+ */
+
+//This component does not yet work as intended. It is supposed to display the weekly report of a user in a project.
+export default function OtherUsersTR(): 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 token = localStorage.getItem("accessToken") ?? "";
+  const { projectName } = useParams();
+  const { username } = useParams();
+  const { fetchedWeek } = useParams();
+
+  useEffect(() => {
+    const fetchUsersWeeklyReport = async (): Promise<void> => {
+      const response = await api.getWeeklyReport(
+        projectName ?? "",
+        fetchedWeek?.toString() ?? "0",
+        token,
+      );
+
+      if (response.success) {
+        const report: WeeklyReport = response.data ?? {
+          reportId: 0,
+          userId: 0,
+          projectId: 0,
+          week: 0,
+          developmentTime: 0,
+          meetingTime: 0,
+          adminTime: 0,
+          ownWorkTime: 0,
+          studyTime: 0,
+          testingTime: 0,
+        };
+        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);
+      }
+    };
+
+    void fetchUsersWeeklyReport();
+  });
+
+  return (
+    <>
+      <h1 className="text-[30px] font-bold">{username}&apos;s 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">
+        <div className="flex flex-col items-center">
+          <div className="flex flex-col w-1/2 border-b-2 border-black items-center justify-center">
+            <h1 className="font-bold text-[30px]"> Week: {week}</h1>
+          </div>
+
+          <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="text"
+                    min="0"
+                    className="border-2 border-black rounded-md text-center w-1/2"
+                    value={developmentTime === 0 ? "" : developmentTime}
+                  />
+                </td>
+              </tr>
+              <tr className="h-[10vh]">
+                <td>Meeting</td>
+                <td>
+                  <input
+                    type="text"
+                    min="0"
+                    className="border-2 border-black rounded-md text-center w-1/2"
+                    value={meetingTime === 0 ? "" : meetingTime}
+                  />
+                </td>
+              </tr>
+              <tr className="h-[10vh]">
+                <td>Administration</td>
+                <td>
+                  <input
+                    type="text"
+                    min="0"
+                    className="border-2 border-black rounded-md text-center w-1/2"
+                    value={adminTime === 0 ? "" : adminTime}
+                  />
+                </td>
+              </tr>
+              <tr className="h-[10vh]">
+                <td>Own Work</td>
+                <td>
+                  <input
+                    type="text"
+                    min="0"
+                    className="border-2 border-black rounded-md text-center w-1/2"
+                    value={ownWorkTime === 0 ? "" : ownWorkTime}
+                  />
+                </td>
+              </tr>
+              <tr className="h-[10vh]">
+                <td>Studies</td>
+                <td>
+                  <input
+                    type="text"
+                    min="0"
+                    className="border-2 border-black rounded-md text-center w-1/2"
+                    value={studyTime === 0 ? "" : studyTime}
+                  />
+                </td>
+              </tr>
+              <tr className="h-[10vh]">
+                <td>Testing</td>
+                <td>
+                  <input
+                    type="text"
+                    min="0"
+                    className="border-2 border-black rounded-md text-center w-1/2"
+                    value={testingTime === 0 ? "" : testingTime}
+                  />
+                </td>
+              </tr>
+            </tbody>
+          </table>
+        </div>
+      </div>
+    </>
+  );
+}

From 589a135bb556aaafd4580f985a2013d81dd21f30 Mon Sep 17 00:00:00 2001
From: Davenludd <david.ludde01@gmail.com>
Date: Thu, 21 Mar 2024 13:59:57 +0100
Subject: [PATCH 40/76] New Page for PM

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

diff --git a/frontend/src/Pages/ProjectManagerPages/PMViewOtherUsersTR.tsx b/frontend/src/Pages/ProjectManagerPages/PMViewOtherUsersTR.tsx
new file mode 100644
index 0000000..ac73b46
--- /dev/null
+++ b/frontend/src/Pages/ProjectManagerPages/PMViewOtherUsersTR.tsx
@@ -0,0 +1,20 @@
+import BasicWindow from "../../Components/BasicWindow";
+import BackButton from "../../Components/BackButton";
+import OtherUsersTR from "../../Components/OtherUsersTR";
+
+function PMViewOtherUsersTR(): JSX.Element {
+  const content = (
+    <>
+      <OtherUsersTR />
+    </>
+  );
+
+  const buttons = (
+    <>
+      <BackButton />
+    </>
+  );
+
+  return <BasicWindow content={content} buttons={buttons} />;
+}
+export default PMViewOtherUsersTR;

From 1d054e660c26fee8aaadd784439dd8d41fc0ac75 Mon Sep 17 00:00:00 2001
From: Davenludd <david.ludde01@gmail.com>
Date: Thu, 21 Mar 2024 14:00:47 +0100
Subject: [PATCH 41/76] Fixes for PMOtherUsersTR

---
 frontend/src/Pages/ProjectManagerPages/PMOtherUsersTR.tsx | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/frontend/src/Pages/ProjectManagerPages/PMOtherUsersTR.tsx b/frontend/src/Pages/ProjectManagerPages/PMOtherUsersTR.tsx
index c76947b..cb558b0 100644
--- a/frontend/src/Pages/ProjectManagerPages/PMOtherUsersTR.tsx
+++ b/frontend/src/Pages/ProjectManagerPages/PMOtherUsersTR.tsx
@@ -1,8 +1,13 @@
 import BasicWindow from "../../Components/BasicWindow";
 import BackButton from "../../Components/BackButton";
+import AllTimeReportsInProjectOtherUser from "../../Components/AllTimeReportsInProjectOtherUser";
 
 function PMOtherUsersTR(): JSX.Element {
-  const content = <></>;
+  const content = (
+    <>
+      <AllTimeReportsInProjectOtherUser />
+    </>
+  );
 
   const buttons = (
     <>

From 689daf4e1f4111c793cf1fd697168195f7d46f1b Mon Sep 17 00:00:00 2001
From: Davenludd <david.ludde01@gmail.com>
Date: Thu, 21 Mar 2024 14:01:19 +0100
Subject: [PATCH 42/76] Updated Link in ProjectMembers component

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

diff --git a/frontend/src/Components/ProjectMembers.tsx b/frontend/src/Components/ProjectMembers.tsx
index b7efa47..60ffcd9 100644
--- a/frontend/src/Components/ProjectMembers.tsx
+++ b/frontend/src/Components/ProjectMembers.tsx
@@ -44,7 +44,7 @@ function ProjectMembers(): JSX.Element {
               <div className="flex">
                 <div className="ml-auto flex space-x-4">
                   <Link
-                    to={`/viewReports/${projectName}/${projectMember.Username}`}
+                    to={`/otherUsersTimeReports/${projectName}/${projectMember.Username}`}
                   >
                     <h1 className="underline cursor-pointer font-bold">
                       View Reports

From 8d739396a119b9876a45a6b3029fdf54bbf35230 Mon Sep 17 00:00:00 2001
From: Davenludd <david.ludde01@gmail.com>
Date: Thu, 21 Mar 2024 14:01:33 +0100
Subject: [PATCH 43/76] Change input types from number to text in
 ViewOtherTimeReport component

---
 frontend/src/Components/ViewOtherTimeReport.tsx | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/frontend/src/Components/ViewOtherTimeReport.tsx b/frontend/src/Components/ViewOtherTimeReport.tsx
index 38e3ed9..32e0716 100644
--- a/frontend/src/Components/ViewOtherTimeReport.tsx
+++ b/frontend/src/Components/ViewOtherTimeReport.tsx
@@ -109,7 +109,7 @@ export default function GetOtherUsersReport(): JSX.Element {
                   <td>Development</td>
                   <td>
                     <input
-                      type="number"
+                      type="text"
                       min="0"
                       className="border-2 border-black rounded-md text-center w-1/2"
                       value={developmentTime === 0 ? "" : developmentTime}
@@ -120,7 +120,7 @@ export default function GetOtherUsersReport(): JSX.Element {
                   <td>Meeting</td>
                   <td>
                     <input
-                      type="number"
+                      type="text"
                       min="0"
                       className="border-2 border-black rounded-md text-center w-1/2"
                       value={meetingTime === 0 ? "" : meetingTime}
@@ -131,7 +131,7 @@ export default function GetOtherUsersReport(): JSX.Element {
                   <td>Administration</td>
                   <td>
                     <input
-                      type="number"
+                      type="text"
                       min="0"
                       className="border-2 border-black rounded-md text-center w-1/2"
                       value={adminTime === 0 ? "" : adminTime}
@@ -142,7 +142,7 @@ export default function GetOtherUsersReport(): JSX.Element {
                   <td>Own Work</td>
                   <td>
                     <input
-                      type="number"
+                      type="text"
                       min="0"
                       className="border-2 border-black rounded-md text-center w-1/2"
                       value={ownWorkTime === 0 ? "" : ownWorkTime}
@@ -153,7 +153,7 @@ export default function GetOtherUsersReport(): JSX.Element {
                   <td>Studies</td>
                   <td>
                     <input
-                      type="number"
+                      type="text"
                       min="0"
                       className="border-2 border-black rounded-md text-center w-1/2"
                       value={studyTime === 0 ? "" : studyTime}
@@ -164,7 +164,7 @@ export default function GetOtherUsersReport(): JSX.Element {
                   <td>Testing</td>
                   <td>
                     <input
-                      type="number"
+                      type="text"
                       min="0"
                       className="border-2 border-black rounded-md text-center w-1/2"
                       value={testingTime === 0 ? "" : testingTime}

From dbbe4da4014cc0271a5c9428f5ce7b0d42f9322c Mon Sep 17 00:00:00 2001
From: Imbus <>
Date: Thu, 21 Mar 2024 18:05:41 +0100
Subject: [PATCH 44/76] Fix for submitWeeklyReport ts API

---
 frontend/src/API/API.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/frontend/src/API/API.ts b/frontend/src/API/API.ts
index 5c49a8d..c6cef66 100644
--- a/frontend/src/API/API.ts
+++ b/frontend/src/API/API.ts
@@ -85,7 +85,7 @@ interface API {
   submitWeeklyReport(
     weeklyReport: NewWeeklyReport,
     token: string,
-  ): Promise<APIResponse<NewWeeklyReport>>;
+  ): Promise<APIResponse<string>>;
 
   /** Gets a weekly report for a specific user, project and week
    * @param {string} projectName The name of the project.
@@ -294,7 +294,7 @@ export const api: API = {
   async submitWeeklyReport(
     weeklyReport: NewWeeklyReport,
     token: string,
-  ): Promise<APIResponse<NewWeeklyReport>> {
+  ): Promise<APIResponse<string>> {
     try {
       const response = await fetch("/api/submitWeeklyReport", {
         method: "POST",
@@ -312,8 +312,8 @@ export const api: API = {
         };
       }
 
-      const data = (await response.json()) as NewWeeklyReport;
-      return { success: true, data };
+      const data = await response.text();
+      return { success: true, message: data };
     } catch (e) {
       return {
         success: false,

From 6ed53fe94adaa9863ed61253b034a903bd90bd50 Mon Sep 17 00:00:00 2001
From: Davenludd <david.ludde01@gmail.com>
Date: Thu, 21 Mar 2024 18:07:56 +0100
Subject: [PATCH 45/76] retract changes made in error handling in
 SubmitWeeklyReport handler

---
 backend/internal/handlers/handlers_report_related.go | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/backend/internal/handlers/handlers_report_related.go b/backend/internal/handlers/handlers_report_related.go
index dee0dc0..0e72ead 100644
--- a/backend/internal/handlers/handlers_report_related.go
+++ b/backend/internal/handlers/handlers_report_related.go
@@ -33,13 +33,11 @@ func (gs *GState) SubmitWeeklyReport(c *fiber.Ctx) error {
 
 	if err := gs.Db.AddWeeklyReport(report.ProjectName, username, report.Week, report.DevelopmentTime, report.MeetingTime, report.AdminTime, report.OwnWorkTime, report.StudyTime, report.TestingTime); err != nil {
 		log.Info("Error adding weekly report to db:", err)
-		//Previously:return c.Status(500).SendString(err.Error())
-		return c.Status(500).JSON(fiber.Map{"success": false, "message": err.Error()})
+		return c.Status(500).SendString(err.Error())
 	}
 
 	log.Info("Weekly report added")
-	//Previosly: return c.Status(200).SendString("Time report added")
-	return c.Status(200).JSON(fiber.Map{"success": true, "data": "Time report added"})
+	return c.Status(200).SendString("Time report added")
 }
 
 // Handler for retrieving weekly report

From 42a2ad02e4015f25e03c5b7f59a4094996d0a0ac Mon Sep 17 00:00:00 2001
From: Alexander Ek <al1510sa-s@student.lu.se>
Date: Sat, 23 Mar 2024 15:22:58 +0100
Subject: [PATCH 46/76] Description comment in main.go file

---
 backend/main.go | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/backend/main.go b/backend/main.go
index ff6b94e..42c39b9 100644
--- a/backend/main.go
+++ b/backend/main.go
@@ -33,6 +33,12 @@ import (
 // @externalDocs.description	OpenAPI
 // @externalDocs.url			https://swagger.io/resources/open-api/
 
+/**
+Main function for starting the server and initializing configurations.
+Reads configuration from file, pretty prints it, connects to the database,
+migrates it, and sets up routes for the server.
+*/
+
 func main() {
 	conf, err := config.ReadConfigFromFile("config.toml")
 	if err != nil {

From 96238ceb2e0a07908e4075e185835e784c07455c Mon Sep 17 00:00:00 2001
From: Imbus <>
Date: Sat, 23 Mar 2024 20:29:08 +0100
Subject: [PATCH 47/76] Fix asset resolution at build time

---
 frontend/src/Pages/LoginPage.css | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/frontend/src/Pages/LoginPage.css b/frontend/src/Pages/LoginPage.css
index 0b2f5db..3d79e7e 100644
--- a/frontend/src/Pages/LoginPage.css
+++ b/frontend/src/Pages/LoginPage.css
@@ -4,23 +4,23 @@ body{
 
 @keyframes backgroundTransition {
     0% {
-        background-image: url('src/assets/1.jpg');
+        background-image: url('../assets/1.jpg');
         animation-timing-function: ease-out;
     }
     25% {
-        background-image: url('src/assets/2.jpg');
+        background-image: url('../assets/2.jpg');
         animation-timing-function: ease-in;
     }
     50% {
-        background-image: url('src/assets/3.jpg');
+        background-image: url('../assets/3.jpg');
         animation-timing-function: ease-out;
     }
     75% {
-        background-image: url('src/assets/4.jpg');
+        background-image: url('../assets/4.jpg');
         animation-timing-function: ease-in;
     }
     100% {
-        background-image: url('src/assets/1.jpg');
+        background-image: url('../assets/1.jpg');
         animation-timing-function: ease-out;
     }
 }
\ No newline at end of file

From 94f36d4e06c71cd7bd1130ed683730ab4fa858d8 Mon Sep 17 00:00:00 2001
From: Imbus <>
Date: Sat, 23 Mar 2024 20:32:00 +0100
Subject: [PATCH 48/76] Cleaning

---
 .gitignore        |  3 +++
 go.work.sum       | 28 ----------------------------
 package-lock.json |  6 ------
 3 files changed, 3 insertions(+), 34 deletions(-)
 delete mode 100644 go.work.sum
 delete mode 100644 package-lock.json

diff --git a/.gitignore b/.gitignore
index 05f913b..3b1c6d3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,6 +15,9 @@ backend/*.png
 backend/*.jpg
 backend/*.svg
 
+/go.work.sum
+/package-lock.json
+
 # Test binary, built with `go test -c`
 *.test
 
diff --git a/go.work.sum b/go.work.sum
deleted file mode 100644
index 087c85b..0000000
--- a/go.work.sum
+++ /dev/null
@@ -1,28 +0,0 @@
-github.com/PuerkitoBio/purell v1.1.1/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0=
-github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE=
-github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
-github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51/go.mod h1:CzGEWj7cYgsdH8dAjBGEr58BoE7ScuLd+fwFZ44+/x8=
-github.com/klauspost/cpuid/v2 v2.2.3/go.mod h1:RVVoqg1df56z8g3pUjL/3lE5UfnlrJX8tyFgg4nqhuY=
-github.com/philhofer/fwd v1.1.2/go.mod h1:qkPdfjR2SIEbspLqpe1tO4n5yICnr2DY7mqEx2tUTP0=
-github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
-github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
-github.com/tinylib/msgp v1.1.8/go.mod h1:qkpG+2ldGg4xRFmx+jfTvZPxfGFhi64BcnL9vkCm/Tw=
-github.com/urfave/cli/v2 v2.3.0/go.mod h1:LJmUH05zAU44vOAcrfzZQKsZbVcdbOG8rtL3/XcUArI=
-github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
-golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4=
-golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU=
-golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOMs=
-golang.org/x/exp v0.0.0-20231108232855-2478ac86f678/go.mod h1:zk2irFbV9DP96SEBUUAy67IdHUaZuSnrz1n472HUCLE=
-golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE=
-golang.org/x/net v0.22.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg=
-golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
-golang.org/x/telemetry v0.0.0-20240228155512-f48c80bd79b2/go.mod h1:TeRTkGYfJXctD9OcfyVLyj2J3IxLnKwHJR8f4D8a3YE=
-golang.org/x/term v0.18.0/go.mod h1:ILwASektA3OnRv7amZ1xhE/KTR+u50pbXfZ03+6Nx58=
-golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
-golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
-gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
-lukechampine.com/uint128 v1.2.0/go.mod h1:c4eWIwlEGaxC/+H1VguhU4PHXNWDCDMUlWdIWl2j1gk=
-modernc.org/cc/v3 v3.41.0/go.mod h1:Ni4zjJYJ04CDOhG7dn640WGfwBzfE0ecX8TyMB0Fv0Y=
-modernc.org/ccgo/v3 v3.16.15/go.mod h1:yT7B+/E2m43tmMOT51GMoM98/MtHIcQQSleGnddkUNI=
-modernc.org/opt v0.1.3/go.mod h1:WdSiB5evDcignE70guQKxYUl14mgWtbClRi5wmkkTX0=
-sigs.k8s.io/yaml v1.3.0/go.mod h1:GeOyir5tyXNByN85N/dRIT9es5UQNerPYEKK56eTBm8=
diff --git a/package-lock.json b/package-lock.json
deleted file mode 100644
index 5b28e18..0000000
--- a/package-lock.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "name": "TTime",
-  "lockfileVersion": 3,
-  "requires": true,
-  "packages": {}
-}

From 7c73a01d4c538f03442a30a8b757ead7c86a09e2 Mon Sep 17 00:00:00 2001
From: Davenludd <david.ludde01@gmail.com>
Date: Wed, 27 Mar 2024 20:47:24 +0100
Subject: [PATCH 49/76] Add success alert message after submitting weekly
 report

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

diff --git a/frontend/src/Components/NewWeeklyReport.tsx b/frontend/src/Components/NewWeeklyReport.tsx
index b0bccac..f684b0c 100644
--- a/frontend/src/Components/NewWeeklyReport.tsx
+++ b/frontend/src/Components/NewWeeklyReport.tsx
@@ -66,6 +66,7 @@ export default function NewWeeklyReport(): JSX.Element {
                 );
                 return;
               }
+              alert("Weekly report submitted successfully");
               navigate(-1);
             })();
           }}

From d4cc556366da340c4e19fc8a7700208bbc709613 Mon Sep 17 00:00:00 2001
From: Alexander Ek <al1510sa-s@student.lu.se>
Date: Wed, 27 Mar 2024 21:18:44 +0100
Subject: [PATCH 50/76] Co-authored-by: al8763be
 <al8763be@users.noreply.github.com>

---
 backend/internal/database/db.go               |  6 +++
 backend/internal/database/db_test.go          | 30 +++++++++++++
 backend/internal/handlers/global_state.go     |  1 +
 .../handlers/handlers_project_related.go      | 26 +++++++++++
 backend/main.go                               |  1 +
 frontend/src/API/API.ts                       | 35 +++++++++++++++
 .../src/Pages/AdminPages/AdminProjectPage.tsx | 16 +++++--
 testing.py                                    | 44 ++++++++++++++++++-
 8 files changed, 155 insertions(+), 4 deletions(-)

diff --git a/backend/internal/database/db.go b/backend/internal/database/db.go
index f871755..3aae28d 100644
--- a/backend/internal/database/db.go
+++ b/backend/internal/database/db.go
@@ -41,6 +41,7 @@ type Database interface {
 	IsProjectManager(username string, projectname string) (bool, error)
 	GetProjectTimes(projectName string) (map[string]int, error)
 	UpdateWeeklyReport(projectName string, userName string, week int, developmentTime int, meetingTime int, adminTime int, ownWorkTime int, studyTime int, testingTime int) error
+	RemoveProject(projectname string) error
 }
 
 // This struct is a wrapper type that holds the database connection
@@ -549,3 +550,8 @@ func (d *Db) GetProjectTimes(projectName string) (map[string]int, error) {
 
 	return totalTime, nil
 }
+
+func (d *Db) RemoveProject(projectname string) error {
+	_, err := d.Exec("DELETE FROM projects WHERE name = ?", projectname)
+	return err
+}
diff --git a/backend/internal/database/db_test.go b/backend/internal/database/db_test.go
index b68d446..90ef221 100644
--- a/backend/internal/database/db_test.go
+++ b/backend/internal/database/db_test.go
@@ -894,3 +894,33 @@ func TestUpdateWeeklyReport(t *testing.T) {
 		t.Error("UpdateWeeklyReport failed: report not updated correctly")
 	}
 }
+
+func TestRemoveProject(t *testing.T) {
+	db, err := setupAdvancedState()
+	if err != nil {
+		t.Error("setupState failed:", err)
+	}
+
+	// Promote user to Admin
+	err = db.PromoteToAdmin("demouser")
+	if err != nil {
+		t.Error("PromoteToAdmin failed:", err)
+	}
+
+	// Remove project
+	err = db.RemoveProject("projecttest")
+	if err != nil {
+		t.Error("RemoveProject failed:", err)
+	}
+
+	// Check if the project was removed
+	projects, err := db.GetAllProjects()
+	if err != nil {
+		t.Error("GetAllProjects failed:", err)
+	}
+	if len(projects) != 0 {
+		t.Error("RemoveProject failed: expected 0, got", len(projects))
+	}
+	
+}
+	
\ No newline at end of file
diff --git a/backend/internal/handlers/global_state.go b/backend/internal/handlers/global_state.go
index 49c8c09..b832f92 100644
--- a/backend/internal/handlers/global_state.go
+++ b/backend/internal/handlers/global_state.go
@@ -29,6 +29,7 @@ type GlobalState interface {
 	ChangeUserName(c *fiber.Ctx) error      // WIP
 	GetAllUsersProject(c *fiber.Ctx) error  // WIP
 	UpdateWeeklyReport(c *fiber.Ctx) error
+	RemoveProject(c *fiber.Ctx) error
 }
 
 // "Constructor"
diff --git a/backend/internal/handlers/handlers_project_related.go b/backend/internal/handlers/handlers_project_related.go
index f64d013..9c3ca67 100644
--- a/backend/internal/handlers/handlers_project_related.go
+++ b/backend/internal/handlers/handlers_project_related.go
@@ -286,4 +286,30 @@ func (gs *GState) GetProjectTimesHandler(c *fiber.Ctx) error {
     // Return project times as JSON
     log.Info("Returning project times for project:", projectName)
     return c.JSON(projectTimes)
+}
+
+func (gs *GState) RemoveProject(c *fiber.Ctx) error {
+	user := c.Locals("user").(*jwt.Token)
+    claims := user.Claims.(jwt.MapClaims)
+    username := claims["name"].(string)
+    
+	// Check if the user is a site admin
+	isAdmin, err := gs.Db.IsSiteAdmin(username)
+	if err != nil {
+		log.Info("Error checking admin status:", err)
+		return c.Status(500).SendString(err.Error())
+	}
+
+	if !isAdmin {
+		log.Info("User is not a site admin:", username)
+		return c.Status(403).SendString("User is not a site admin")
+	}
+
+	projectName := c.Params("projectName")
+
+	if err := gs.Db.RemoveProject(projectName); err != nil {
+		return c.Status(500).SendString((err.Error()))
+	}
+
+	return c.Status(200).SendString("Project deleted")
 }
\ No newline at end of file
diff --git a/backend/main.go b/backend/main.go
index 1967708..0ec638b 100644
--- a/backend/main.go
+++ b/backend/main.go
@@ -108,6 +108,7 @@ func main() {
 	server.Post("/api/ProjectRoleChange", gs.ProjectRoleChange)
 	server.Get("/api/getUsersProject/:projectName", gs.ListAllUsersProject)
 	server.Put("/api/updateWeeklyReport", gs.UpdateWeeklyReport)
+	server.Delete("/api/removeProject/:projectName", gs.RemoveProject)
 
 	// Announce the port we are listening on and start the server
 	err = server.Listen(fmt.Sprintf(":%d", conf.Port))
diff --git a/frontend/src/API/API.ts b/frontend/src/API/API.ts
index c6cef66..1e2e3e3 100644
--- a/frontend/src/API/API.ts
+++ b/frontend/src/API/API.ts
@@ -133,6 +133,11 @@ interface API {
     projectName: string,
     token: string,
   ): Promise<APIResponse<UserProjectMember[]>>;
+
+  removeProject(
+    projectName: string,
+    token: string,
+  ): Promise<APIResponse<string>>;
 }
 
 /** An instance of the API */
@@ -484,4 +489,34 @@ export const api: API = {
       });
     }
   },
+
+  async removeProject(
+    projectName: string,
+    token: string,
+  ): Promise<APIResponse<string>> {
+    try {
+      const response = await fetch(`/api/projectdelete/${projectName}`, {
+        method: "DELETE",
+        headers: {
+          "Content-Type": "application/json",
+          Authorization: "Bearer " + token,
+        },
+      });
+
+      if (!response.ok) {
+        return Promise.resolve({
+          success: false,
+          message: "Failed to remove project",
+        });
+      } else {
+        const data = await response.text();
+        return Promise.resolve({ success: true, message: data });
+      }
+    } catch (e) {
+      return Promise.resolve({
+        success: false,
+        message: "Failed to remove project",
+      });
+    }
+  },
 };
diff --git a/frontend/src/Pages/AdminPages/AdminProjectPage.tsx b/frontend/src/Pages/AdminPages/AdminProjectPage.tsx
index 0faae7e..db51319 100644
--- a/frontend/src/Pages/AdminPages/AdminProjectPage.tsx
+++ b/frontend/src/Pages/AdminPages/AdminProjectPage.tsx
@@ -1,17 +1,26 @@
+import { useParams } from "react-router-dom";
+import { api } from "../../API/API";
 import BackButton from "../../Components/BackButton";
 import BasicWindow from "../../Components/BasicWindow";
 import Button from "../../Components/Button";
 
+async function handleDeleteProject(
+  projectName: string,
+  token: string,
+): Promise<void> {
+  await api.removeProject(projectName, token);
+}
+
 function AdminProjectPage(): JSX.Element {
   const content = <></>;
+  const { projectName } = useParams();
+  const token = localStorage.getItem("accessToken");
 
   const buttons = (
     <>
       <Button
         text="Delete"
-        onClick={(): void => {
-          return;
-        }}
+        onClick={() => handleDeleteProject(projectName, token)}
         type="button"
       />
       <BackButton />
@@ -20,4 +29,5 @@ function AdminProjectPage(): JSX.Element {
 
   return <BasicWindow content={content} buttons={buttons} />;
 }
+
 export default AdminProjectPage;
diff --git a/testing.py b/testing.py
index 3515720..74ea949 100644
--- a/testing.py
+++ b/testing.py
@@ -43,6 +43,7 @@ ProjectRoleChangePath = base_url + "/api/ProjectRoleChange"
 getUsersProjectPath = base_url + "/api/getUsersProject"
 getChangeUserNamePath = base_url + "/api/changeUserName"
 getUpdateWeeklyReportPath = base_url + "/api/updateWeeklyReport"
+removeProjectPath = base_url + "/api/removeProject"
 
 #ta bort auth i handlern för att få testet att gå igenom
 def test_ProjectRoleChange():
@@ -462,7 +463,47 @@ def test_update_weekly_report():
     assert response.status_code == 200, "Update weekly report failed"
     gprint("test_update_weekly_report successful")
 
+
+def test_remove_project():
+    admin_username = randomString()
+    admin_password = "admin_password2"
+    dprint(
+        "Registering with username: ", admin_username, " and password: ", admin_password
+    )
+    response = requests.post(
+        registerPath, json={"username": admin_username, "password": admin_password}
+    )
+    dprint(response.text)
+
+    # Log in as the admin
+    admin_token = login(admin_username, admin_password).json()["token"]
+    response = requests.post(
+        promoteToAdminPath,
+        json={"username": admin_username},
+        headers={"Authorization": "Bearer " + admin_token},
+    )
+
+    # Create a new project
+    new_project = randomString()
+    response = requests.post(
+        addProjectPath,
+        json={"name": new_project, "description": "This is a project"},
+        headers={"Authorization": "Bearer " + admin_token},
+    )
+    assert response.status_code == 200, "Add project failed"
+
+    # Remove the project
+    response = requests.delete(
+        removeProjectPath + "/" + new_project,
+        headers={"Authorization": "Bearer " + admin_token},
+    )
+    assert response.status_code == 200, "Remove project failed"
+    gprint("test_remove_project successful")
+
+
+
 if __name__ == "__main__":
+    test_remove_project()
     test_get_user_projects()
     test_create_user()
     test_login()
@@ -478,4 +519,5 @@ if __name__ == "__main__":
     test_ensure_manager_of_created_project()
     test_list_all_users_project()
     test_change_user_name()
-    test_update_weekly_report()
\ No newline at end of file
+    test_update_weekly_report()
+    
\ No newline at end of file

From 7c467976345c18eaa215ed7e5cd5096673602c84 Mon Sep 17 00:00:00 2001
From: al8763be <al8763be-s@student.lu.se>
Date: Thu, 28 Mar 2024 12:06:59 +0100
Subject: [PATCH 51/76] ifPM fix

---
 frontend/src/API/API.ts | 48 ++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 47 insertions(+), 1 deletion(-)

diff --git a/frontend/src/API/API.ts b/frontend/src/API/API.ts
index 8fd66d3..37db463 100644
--- a/frontend/src/API/API.ts
+++ b/frontend/src/API/API.ts
@@ -20,7 +20,23 @@ interface API {
   registerUser(user: NewUser): Promise<APIResponse<User>>;
   /** Remove a user */
   removeUser(username: string, token: string): Promise<APIResponse<User>>;
-  /** Login */
+
+  /**
+   * Check if user is project manager.
+   * @param {string} username The username of the user.
+   * @param {string} projectName The name of the project.
+   * @param {string} token The authentication token.
+   * @returns {Promise<APIResponse<boolean>>} A promise containing the API response indicating if the user is a project manager.
+   */
+  checkIfProjectManager(
+    projectName: string,
+    token: string,
+  ): Promise<APIResponse<boolean>>;
+
+  /** Logs in a user with the provided credentials.
+   * @param {NewUser} NewUser The user object containing username and password.
+   * @returns {Promise<APIResponse<string>>} A promise resolving to an API response with a token.
+   */
   login(NewUser: NewUser): Promise<APIResponse<string>>;
   /** Renew the token */
   renewToken(token: string): Promise<APIResponse<string>>;
@@ -101,6 +117,36 @@ export const api: API = {
     }
   },
 
+  async checkIfProjectManager(
+    projectName: string,
+    token: string,
+  ): Promise<APIResponse<boolean>> {
+    try {
+      const response = await fetch(
+        `/api/checkIfProjectManager?projectName=${projectName}`,
+        {
+          method: "GET",
+          headers: {
+            "Content-Type": "application/json",
+            Authorization: "Bearer " + token,
+          },
+        },
+      );
+
+      if (!response.ok) {
+        return {
+          success: false,
+          message: "Failed to check if project manager",
+        };
+      } else {
+        const data = (await response.json()) as boolean;
+        return { success: true, data };
+      }
+    } catch (e) {
+      return { success: false, message: "Failed to check if project manager" };
+    }
+  },
+
   async createProject(
     project: NewProject,
     token: string,

From 48e4d1a8dffdbc672ac76270735a8b33a046b796 Mon Sep 17 00:00:00 2001
From: Davenludd <david.ludde01@gmail.com>
Date: Thu, 28 Mar 2024 12:09:09 +0100
Subject: [PATCH 52/76] Refactor fetchWeeklyReport in EditWeeklyReport
 component

---
 frontend/src/Components/EditWeeklyReport.tsx | 73 ++++++++++----------
 1 file changed, 38 insertions(+), 35 deletions(-)

diff --git a/frontend/src/Components/EditWeeklyReport.tsx b/frontend/src/Components/EditWeeklyReport.tsx
index 63bce48..384359e 100644
--- a/frontend/src/Components/EditWeeklyReport.tsx
+++ b/frontend/src/Components/EditWeeklyReport.tsx
@@ -18,44 +18,47 @@ export default function GetWeeklyReport(): JSX.Element {
   const [testingTime, setTestingTime] = useState(0);
 
   const token = localStorage.getItem("accessToken") ?? "";
-  const { projectName } = useParams();
-  const { fetchedWeek } = useParams();
-
-  const fetchWeeklyReport = async (): Promise<void> => {
-    const response = await api.getWeeklyReport(
-      projectName ?? "",
-      fetchedWeek?.toString() ?? "0",
-      token,
-    );
-
-    if (response.success) {
-      const report: WeeklyReport = response.data ?? {
-        reportId: 0,
-        userId: 0,
-        projectId: 0,
-        week: 0,
-        developmentTime: 0,
-        meetingTime: 0,
-        adminTime: 0,
-        ownWorkTime: 0,
-        studyTime: 0,
-        testingTime: 0,
-      };
-      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);
-    }
-  };
+  const { projectName, fetchedWeek } = useParams<{
+    projectName: string;
+    fetchedWeek: string;
+  }>();
+  console.log(projectName, fetchedWeek);
 
   useEffect(() => {
+    const fetchWeeklyReport = async (): Promise<void> => {
+      const response = await api.getWeeklyReport(
+        projectName ?? "",
+        fetchedWeek ?? "",
+        token,
+      );
+
+      if (response.success) {
+        const report: WeeklyReport = response.data ?? {
+          reportId: 0,
+          userId: 0,
+          projectId: 0,
+          week: 0,
+          developmentTime: 0,
+          meetingTime: 0,
+          adminTime: 0,
+          ownWorkTime: 0,
+          studyTime: 0,
+          testingTime: 0,
+        };
+        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);
+      }
+    };
+
     void fetchWeeklyReport();
-  });
+  }, [projectName, fetchedWeek, token]);
 
   const handleNewWeeklyReport = async (): Promise<void> => {
     const newWeeklyReport: NewWeeklyReport = {

From 37d06b10be88af2fb6154fe9c5cfd5f0c56c688e Mon Sep 17 00:00:00 2001
From: Davenludd <david.ludde01@gmail.com>
Date: Thu, 28 Mar 2024 12:09:16 +0100
Subject: [PATCH 53/76] Fix typo in route parameter name

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

diff --git a/frontend/src/main.tsx b/frontend/src/main.tsx
index 9090dfe..c26c033 100644
--- a/frontend/src/main.tsx
+++ b/frontend/src/main.tsx
@@ -61,7 +61,7 @@ const router = createBrowserRouter([
     element: <UserViewTimeReportsPage />,
   },
   {
-    path: "/editTimeReport/:projectName/:fetchWeek",
+    path: "/editTimeReport/:projectName/:fetchedWeek",
     element: <UserEditTimeReportPage />,
   },
   {

From cc186f8ad08bb81ad67995a1656868d952818499 Mon Sep 17 00:00:00 2001
From: Davenludd <david.ludde01@gmail.com>
Date: Thu, 28 Mar 2024 12:16:35 +0100
Subject: [PATCH 54/76] Refactor handleProjectClick function to remove unused
 username parameter

---
 frontend/src/Components/DisplayUserProjects.tsx | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/frontend/src/Components/DisplayUserProjects.tsx b/frontend/src/Components/DisplayUserProjects.tsx
index 426d266..29e4bcb 100644
--- a/frontend/src/Components/DisplayUserProjects.tsx
+++ b/frontend/src/Components/DisplayUserProjects.tsx
@@ -23,13 +23,8 @@ function DisplayUserProject(): JSX.Element {
   };
 
   const handleProjectClick = async (projectName: string): Promise<void> => {
-    const username = localStorage.getItem("username") ?? "";
     const token = localStorage.getItem("accessToken") ?? "";
-    const response = await api.checkIfProjectManager(
-      username,
-      projectName,
-      token,
-    );
+    const response = await api.checkIfProjectManager(projectName, token);
     if (response.success) {
       if (response.data) {
         navigate(`/PMProjectPage/${projectName}`);

From 6a7bb9ab26a4b188e3c562199ad2cd2496543043 Mon Sep 17 00:00:00 2001
From: al8763be <al8763be-s@student.lu.se>
Date: Thu, 28 Mar 2024 12:19:11 +0100
Subject: [PATCH 55/76] fix ifPM igen

---
 .../handlers/handlers_project_related.go      | 114 +++++++++---------
 1 file changed, 57 insertions(+), 57 deletions(-)

diff --git a/backend/internal/handlers/handlers_project_related.go b/backend/internal/handlers/handlers_project_related.go
index 9c3ca67..bdcabd7 100644
--- a/backend/internal/handlers/handlers_project_related.go
+++ b/backend/internal/handlers/handlers_project_related.go
@@ -219,7 +219,7 @@ func (gs *GState) IsProjectManagerHandler(c *fiber.Ctx) error {
 	username := claims["name"].(string)
 
 	// Extract necessary parameters from the request query string
-	projectName := c.Params("projectName")
+	projectName := c.Query("projectName")
 
 	log.Info("Checking if user ", username, " is a project manager for project ", projectName)
 
@@ -231,68 +231,68 @@ func (gs *GState) IsProjectManagerHandler(c *fiber.Ctx) error {
 	}
 
 	// Return the result as JSON
-	return c.JSON(fiber.Map{"isProjectManager": isManager})
+	return c.JSON(map[string]bool{"isProjectManager": isManager})
 }
 
 func (gs *GState) GetProjectTimesHandler(c *fiber.Ctx) error {
-    // Get the username from the token
-    user := c.Locals("user").(*jwt.Token)
-    claims := user.Claims.(jwt.MapClaims)
-    username := claims["name"].(string)
-    
-    // Get project
-    projectName := c.Params("projectName")
-    if projectName == "" {
-        log.Info("No project name provided")
-        return c.Status(400).SendString("No project name provided")
-    }
-    
-    // Get all users in the project and roles
-    userProjects, err := gs.Db.GetAllUsersProject(projectName)
-    if err != nil {
-        log.Info("Error getting users in project:", err)
-        return c.Status(500).SendString(err.Error())
-    }
-    
-    // If the user is member
-    isMember := false
-    for _, userProject := range userProjects {
-        if userProject.Username == username {
-            isMember = true
-            break
-        }
-    }
-    
-    // If the user is admin
-    if !isMember {
-        isAdmin, err := gs.Db.IsSiteAdmin(username)
-        if err != nil {
-            log.Info("Error checking admin status:", err)
-            return c.Status(500).SendString(err.Error())
-        }
-        if !isAdmin {
-            log.Info("User is neither a project member nor a site admin:", username)
-            return c.Status(403).SendString("User is neither a project member nor a site admin")
-        }
-    }
-    
-    // Get project times 
-    projectTimes, err := gs.Db.GetProjectTimes(projectName)
-    if err != nil {
-        log.Info("Error getting project times:", err)
-        return c.Status(500).SendString(err.Error())
-    }
-    
-    // Return project times as JSON
-    log.Info("Returning project times for project:", projectName)
-    return c.JSON(projectTimes)
+	// Get the username from the token
+	user := c.Locals("user").(*jwt.Token)
+	claims := user.Claims.(jwt.MapClaims)
+	username := claims["name"].(string)
+
+	// Get project
+	projectName := c.Params("projectName")
+	if projectName == "" {
+		log.Info("No project name provided")
+		return c.Status(400).SendString("No project name provided")
+	}
+
+	// Get all users in the project and roles
+	userProjects, err := gs.Db.GetAllUsersProject(projectName)
+	if err != nil {
+		log.Info("Error getting users in project:", err)
+		return c.Status(500).SendString(err.Error())
+	}
+
+	// If the user is member
+	isMember := false
+	for _, userProject := range userProjects {
+		if userProject.Username == username {
+			isMember = true
+			break
+		}
+	}
+
+	// If the user is admin
+	if !isMember {
+		isAdmin, err := gs.Db.IsSiteAdmin(username)
+		if err != nil {
+			log.Info("Error checking admin status:", err)
+			return c.Status(500).SendString(err.Error())
+		}
+		if !isAdmin {
+			log.Info("User is neither a project member nor a site admin:", username)
+			return c.Status(403).SendString("User is neither a project member nor a site admin")
+		}
+	}
+
+	// Get project times
+	projectTimes, err := gs.Db.GetProjectTimes(projectName)
+	if err != nil {
+		log.Info("Error getting project times:", err)
+		return c.Status(500).SendString(err.Error())
+	}
+
+	// Return project times as JSON
+	log.Info("Returning project times for project:", projectName)
+	return c.JSON(projectTimes)
 }
 
 func (gs *GState) RemoveProject(c *fiber.Ctx) error {
 	user := c.Locals("user").(*jwt.Token)
-    claims := user.Claims.(jwt.MapClaims)
-    username := claims["name"].(string)
-    
+	claims := user.Claims.(jwt.MapClaims)
+	username := claims["name"].(string)
+
 	// Check if the user is a site admin
 	isAdmin, err := gs.Db.IsSiteAdmin(username)
 	if err != nil {
@@ -312,4 +312,4 @@ func (gs *GState) RemoveProject(c *fiber.Ctx) error {
 	}
 
 	return c.Status(200).SendString("Project deleted")
-}
\ No newline at end of file
+}

From 4a71078f2add6fe0879365dd9559af2e41a0dbbc Mon Sep 17 00:00:00 2001
From: Davenludd <david.ludde01@gmail.com>
Date: Thu, 28 Mar 2024 12:25:24 +0100
Subject: [PATCH 56/76] Fix API endpoint for checking project manager

---
 frontend/src/API/API.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/API/API.ts b/frontend/src/API/API.ts
index e7aab0c..403ea33 100644
--- a/frontend/src/API/API.ts
+++ b/frontend/src/API/API.ts
@@ -199,7 +199,7 @@ export const api: API = {
   ): Promise<APIResponse<boolean>> {
     try {
       const response = await fetch(
-        `/api/checkIfProjectManager?projectName=${projectName}`,
+        `/api/checkIfProjectManager/${projectName}`,
         {
           method: "GET",
           headers: {

From f6dcdcc376e2e3276db34959d2f4951e00a4ff6d Mon Sep 17 00:00:00 2001
From: al8763be <al8763be-s@student.lu.se>
Date: Thu, 28 Mar 2024 16:40:55 +0100
Subject: [PATCH 57/76] GetUnsignedReports

---
 backend/internal/database/db_test.go          | 10 +++++
 .../handlers/handlers_report_related.go       |  2 +-
 backend/main.go                               |  2 +-
 testing.py                                    | 45 ++-----------------
 4 files changed, 15 insertions(+), 44 deletions(-)

diff --git a/backend/internal/database/db_test.go b/backend/internal/database/db_test.go
index cff70a0..fb394e0 100644
--- a/backend/internal/database/db_test.go
+++ b/backend/internal/database/db_test.go
@@ -481,6 +481,11 @@ func TestGetUnsignedWeeklyReports(t *testing.T) {
 		t.Error("AddUser failed:", err)
 	}
 
+	err = db.AddUser("testuser1", "password")
+	if err != nil {
+		t.Error("AddUser failed:", err)
+	}
+
 	err = db.AddProject("testproject", "description", "testuser")
 	if err != nil {
 		t.Error("AddProject failed:", err)
@@ -491,6 +496,11 @@ func TestGetUnsignedWeeklyReports(t *testing.T) {
 		t.Error("AddWeeklyReport failed:", err)
 	}
 
+	err = db.AddWeeklyReport("testproject", "testuser1", 1, 1, 1, 1, 1, 1, 1)
+	if err != nil {
+		t.Error("AddWeeklyReport failed:", err)
+	}
+
 	reports, err := db.GetUnsignedWeeklyReports("testproject")
 	if err != nil {
 		t.Error("GetUnsignedWeeklyReports failed:", err)
diff --git a/backend/internal/handlers/handlers_report_related.go b/backend/internal/handlers/handlers_report_related.go
index 534050a..5ac49b0 100644
--- a/backend/internal/handlers/handlers_report_related.go
+++ b/backend/internal/handlers/handlers_report_related.go
@@ -122,7 +122,7 @@ func (gs *GState) GetUnsignedReports(c *fiber.Ctx) error {
 	projectManagerUsername := claims["name"].(string)
 
 	// Extract project name and week from query parameters
-	projectName := c.Query("projectName")
+	projectName := c.Params("projectName")
 
 	log.Info("Getting unsigned reports for")
 
diff --git a/backend/main.go b/backend/main.go
index 835524c..dc5b86b 100644
--- a/backend/main.go
+++ b/backend/main.go
@@ -92,7 +92,7 @@ func main() {
 	server.Get("/api/project/:projectId", gs.GetProject)
 	server.Get("/api/project/getAllUsers", gs.GetAllUsersProject)
 	server.Get("/api/getWeeklyReport", gs.GetWeeklyReport)
-	server.Get("/api/getUnsignedReports", gs.GetUnsignedReports)
+	server.Get("/api/getUnsignedReports/:projectName", gs.GetUnsignedReports)
 	server.Post("/api/signReport", gs.SignReport)
 	server.Put("/api/addUserToProject", gs.AddUserToProjectHandler)
 	server.Put("/api/changeUserName", gs.ChangeUserName)
diff --git a/testing.py b/testing.py
index 3350497..ca23e78 100644
--- a/testing.py
+++ b/testing.py
@@ -2,7 +2,7 @@ import requests
 import string
 import random
 
-debug_output = False
+debug_output = True
 
 def gprint(*args, **kwargs):
     print("\033[92m", *args, "\033[00m", **kwargs)
@@ -41,7 +41,7 @@ getWeeklyReportsUserPath = base_url + "/api/getWeeklyReportsUser"
 checkIfProjectManagerPath = base_url + "/api/checkIfProjectManager"
 ProjectRoleChangePath = base_url + "/api/ProjectRoleChange"
 getUsersProjectPath = base_url + "/api/getUsersProject"
-getUsignedReportsPath = base_url + "/api/getUsignedReports"
+getUnsignedReportsPath = base_url + "/api/getUnsignedReports"
 
 #ta bort auth i handlern för att få testet att gå igenom
 def test_ProjectRoleChange():
@@ -330,45 +330,6 @@ def test_get_weekly_reports_user():
     assert response.status_code == 200, "Get weekly reports for user failed"
     gprint("test_get_weekly_reports_user successful")
 
-def test_get_usigned_reports():
-    # Log in as the user
-
-    token = login(username, "always_same").json()["token"]
-    response = requests.post(
-        submitReportPath,
-        json={
-            "projectName": projectName,
-            "week": 3,
-            "developmentTime": 10,
-            "meetingTime": 5,
-            "adminTime": 5,
-            "ownWorkTime": 10,
-            "studyTime": 10,
-            "testingTime": 10,
-        },
-        headers={"Authorization": "Bearer " + token},
-    )
-    dprint(response.text)
-    assert response.status_code == 200, "Submit report failed"
-
-
-    # Get weekly reports for the user in the project
-    response = requests.get(
-        getWeeklyReportsUserPath + "/" + projectName,
-        headers={"Authorization": "Bearer " + token},
-    )
-
-    dprint(response.text)
-    assert response.status_code == 200, "Get weekly reports for user failed"
-
-    response = requests.get(
-        getUsignedReportsPath + "/" + projectName,
-        headers={"Authorization": "Bearer " + token},
-    )
-    dprint(response.text)
-    assert response.status_code == 200, "Get unsigned reports for user failed"
-    gprint("test_get_usigned_reports successful")
-
 
 
 # Test function to check if a user is a project manager
@@ -411,7 +372,6 @@ def test_ensure_manager_of_created_project():
 
 
 if __name__ == "__main__":
-    test_get_usigned_reports()
     test_get_user_projects()
     test_create_user()
     test_login()
@@ -426,3 +386,4 @@ if __name__ == "__main__":
     test_ProjectRoleChange()
     #test_list_all_users_project()
     test_ensure_manager_of_created_project()
+    test_get_unsigned_reports()

From 9edcc74ee2fc5fe42a188ed20beff049b02dd346 Mon Sep 17 00:00:00 2001
From: Imbus <>
Date: Fri, 29 Mar 2024 12:41:51 +0100
Subject: [PATCH 58/76] Fix for IsProjectManagerHandler

---
 backend/internal/handlers/handlers_project_related.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/backend/internal/handlers/handlers_project_related.go b/backend/internal/handlers/handlers_project_related.go
index bdcabd7..d63d7eb 100644
--- a/backend/internal/handlers/handlers_project_related.go
+++ b/backend/internal/handlers/handlers_project_related.go
@@ -219,7 +219,7 @@ func (gs *GState) IsProjectManagerHandler(c *fiber.Ctx) error {
 	username := claims["name"].(string)
 
 	// Extract necessary parameters from the request query string
-	projectName := c.Query("projectName")
+	projectName := c.Params("projectName")
 
 	log.Info("Checking if user ", username, " is a project manager for project ", projectName)
 
@@ -231,7 +231,7 @@ func (gs *GState) IsProjectManagerHandler(c *fiber.Ctx) error {
 	}
 
 	// Return the result as JSON
-	return c.JSON(map[string]bool{"isProjectManager": isManager})
+	return c.JSON(fiber.Map{"isProjectManager": isManager})
 }
 
 func (gs *GState) GetProjectTimesHandler(c *fiber.Ctx) error {

From c466a98b15d389cad4e22d4f52c685a157b41862 Mon Sep 17 00:00:00 2001
From: al8763be <al8763be-s@student.lu.se>
Date: Fri, 29 Mar 2024 12:43:35 +0100
Subject: [PATCH 59/76] test for getUnsigned

---
 testing.py | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/testing.py b/testing.py
index 032e56c..5fb8ffe 100644
--- a/testing.py
+++ b/testing.py
@@ -503,6 +503,17 @@ def test_remove_project():
     assert response.status_code == 200, "Remove project failed"
     gprint("test_remove_project successful")
 
+def test_get_unsigned_reports():
+    # Log in as the user
+        token = login("user2", "123").json()["token"]
+
+        # Make a request to get all unsigned reports
+        response = requests.get(
+            getUnsignedReportsPath + "/" + projectName,
+            headers={"Authorization": "Bearer " + token},
+        )
+        assert response.status_code == 200, "Get unsigned reports failed"
+        gprint("test_get_unsigned_reports successful")
 
 
 if __name__ == "__main__":

From 13d3035e49a8cef39fba84d6db095855df83051a Mon Sep 17 00:00:00 2001
From: Imbus <>
Date: Fri, 29 Mar 2024 14:37:22 +0100
Subject: [PATCH 60/76] Major refactor, splitting user handlers into separate
 files and changes to how the database is accessed

---
 backend/internal/database/middleware.go       |  17 ++
 backend/internal/handlers/global_state.go     |  44 ---
 .../internal/handlers/global_state_test.go    |  15 -
 .../handlers/handlers_user_related.go         | 269 ------------------
 .../handlers_project_related.go               |  57 ++--
 .../{ => reports}/handlers_report_related.go  |  31 +-
 .../internal/handlers/users/ChangeUserName.go |  44 +++
 .../handlers/users/GetUsersProjects.go        |  22 ++
 .../internal/handlers/users/ListAllUsers.go   |  31 ++
 backend/internal/handlers/users/Login.go      |  65 +++++
 backend/internal/handlers/users/LoginRenew.go |  44 +++
 .../internal/handlers/users/PromoteToAdmin.go |  42 +++
 backend/internal/handlers/users/Register.go   |  38 +++
 backend/internal/handlers/users/UserDelete.go |  43 +++
 backend/main.go                               |  77 +++--
 15 files changed, 439 insertions(+), 400 deletions(-)
 create mode 100644 backend/internal/database/middleware.go
 delete mode 100644 backend/internal/handlers/global_state.go
 delete mode 100644 backend/internal/handlers/global_state_test.go
 delete mode 100644 backend/internal/handlers/handlers_user_related.go
 rename backend/internal/handlers/{ => projects}/handlers_project_related.go (83%)
 rename backend/internal/handlers/{ => reports}/handlers_report_related.go (83%)
 create mode 100644 backend/internal/handlers/users/ChangeUserName.go
 create mode 100644 backend/internal/handlers/users/GetUsersProjects.go
 create mode 100644 backend/internal/handlers/users/ListAllUsers.go
 create mode 100644 backend/internal/handlers/users/Login.go
 create mode 100644 backend/internal/handlers/users/LoginRenew.go
 create mode 100644 backend/internal/handlers/users/PromoteToAdmin.go
 create mode 100644 backend/internal/handlers/users/Register.go
 create mode 100644 backend/internal/handlers/users/UserDelete.go

diff --git a/backend/internal/database/middleware.go b/backend/internal/database/middleware.go
new file mode 100644
index 0000000..69fa3a2
--- /dev/null
+++ b/backend/internal/database/middleware.go
@@ -0,0 +1,17 @@
+package database
+
+import "github.com/gofiber/fiber/v2"
+
+// Simple middleware that provides a shared database pool as a local key "db"
+func DbMiddleware(db *Database) func(c *fiber.Ctx) error {
+	return func(c *fiber.Ctx) error {
+		c.Locals("db", db)
+		return c.Next()
+	}
+}
+
+// Helper function to get the database from the context, without fiddling with casts
+func GetDb(c *fiber.Ctx) Database {
+	// Dereference a pointer to a local, casted to a pointer to a Database
+	return *c.Locals("db").(*Database)
+}
diff --git a/backend/internal/handlers/global_state.go b/backend/internal/handlers/global_state.go
deleted file mode 100644
index 0db4340..0000000
--- a/backend/internal/handlers/global_state.go
+++ /dev/null
@@ -1,44 +0,0 @@
-package handlers
-
-import (
-	"ttime/internal/database"
-
-	"github.com/gofiber/fiber/v2"
-)
-
-// The actual interface that we will use
-type GlobalState interface {
-	Register(c *fiber.Ctx) error        // To register a new user
-	UserDelete(c *fiber.Ctx) error      // To delete a user
-	Login(c *fiber.Ctx) error           // To get the token
-	LoginRenew(c *fiber.Ctx) error      // To renew the token
-	CreateProject(c *fiber.Ctx) error   // To create a new project
-	GetUserProjects(c *fiber.Ctx) error // To get all projects
-	SubmitWeeklyReport(c *fiber.Ctx) error
-	GetWeeklyReport(c *fiber.Ctx) error
-	SignReport(c *fiber.Ctx) error
-	GetProject(c *fiber.Ctx) error
-	AddUserToProjectHandler(c *fiber.Ctx) error
-	PromoteToAdmin(c *fiber.Ctx) error
-	GetWeeklyReportsUserHandler(c *fiber.Ctx) error
-	IsProjectManagerHandler(c *fiber.Ctx) error
-	DeleteProject(c *fiber.Ctx) error       // To delete a project // WIP
-	ListAllUsers(c *fiber.Ctx) error        // To get a list of all users in the application database
-	ListAllUsersProject(c *fiber.Ctx) error // To get a list of all users for a specific project
-	ProjectRoleChange(c *fiber.Ctx) error   // To change a users role in a project
-	ChangeUserName(c *fiber.Ctx) error      // WIP
-	GetAllUsersProject(c *fiber.Ctx) error  // WIP
-	GetUnsignedReports(c *fiber.Ctx) error  // 
-	UpdateWeeklyReport(c *fiber.Ctx) error
-	RemoveProject(c *fiber.Ctx) error
-}
-
-// "Constructor"
-func NewGlobalState(db database.Database) GlobalState {
-	return &GState{Db: db}
-}
-
-// The global state, which implements all the handlers
-type GState struct {
-	Db database.Database
-}
diff --git a/backend/internal/handlers/global_state_test.go b/backend/internal/handlers/global_state_test.go
deleted file mode 100644
index c0b64f7..0000000
--- a/backend/internal/handlers/global_state_test.go
+++ /dev/null
@@ -1,15 +0,0 @@
-package handlers
-
-import (
-	"testing"
-	"ttime/internal/database"
-)
-
-// The actual interface that we will use
-func TestGlobalState(t *testing.T) {
-	db := database.DbConnect(":memory:")
-	gs := NewGlobalState(db)
-	if gs == nil {
-		t.Error("NewGlobalState returned nil")
-	}
-}
diff --git a/backend/internal/handlers/handlers_user_related.go b/backend/internal/handlers/handlers_user_related.go
deleted file mode 100644
index bc4ae2d..0000000
--- a/backend/internal/handlers/handlers_user_related.go
+++ /dev/null
@@ -1,269 +0,0 @@
-package handlers
-
-import (
-	"time"
-	"ttime/internal/types"
-
-	"github.com/gofiber/fiber/v2/log"
-
-	"github.com/gofiber/fiber/v2"
-	"github.com/golang-jwt/jwt/v5"
-)
-
-// Register is a simple handler that registers a new user
-//
-//	@Summary		Register
-//	@Description	Register a new user
-//	@Tags			User
-//	@Accept			json
-//	@Produce		plain
-//	@Param			NewUser	body		types.NewUser	true	"User to register"
-//	@Success		200		{string}	string			"User added"
-//	@Failure		400		{string}	string			"Bad request"
-//	@Failure		500		{string}	string			"Internal server error"
-//	@Router			/register [post]
-func (gs *GState) Register(c *fiber.Ctx) error {
-	u := new(types.NewUser)
-	if err := c.BodyParser(u); err != nil {
-		log.Warn("Error parsing body")
-		return c.Status(400).SendString(err.Error())
-	}
-
-	log.Info("Adding user:", u.Username)
-	if err := gs.Db.AddUser(u.Username, u.Password); err != nil {
-		log.Warn("Error adding user:", err)
-		return c.Status(500).SendString(err.Error())
-	}
-
-	log.Info("User added:", u.Username)
-	return c.Status(200).SendString("User added")
-}
-
-// This path should obviously be protected in the future
-// UserDelete deletes a user from the database
-//
-//	@Summary		UserDelete
-//	@Description	UserDelete deletes a user from the database
-//	@Tags			User
-//	@Accept			json
-//	@Produce		plain
-//	@Success		200	{string}	string	"User deleted"
-//	@Failure		403	{string}	string	"You can only delete yourself"
-//	@Failure		500	{string}	string	"Internal server error"
-//	@Failure		401	{string}	string	"Unauthorized"
-//	@Router			/userdelete/{username} [delete]
-func (gs *GState) UserDelete(c *fiber.Ctx) error {
-	// Read from path parameters
-	username := c.Params("username")
-
-	// Read username from Locals
-	auth_username := c.Locals("user").(*jwt.Token).Claims.(jwt.MapClaims)["name"].(string)
-
-	if username == auth_username {
-		log.Info("User tried to delete itself")
-		return c.Status(403).SendString("You can't delete yourself")
-	}
-
-	if err := gs.Db.RemoveUser(username); err != nil {
-		log.Warn("Error deleting user:", err)
-		return c.Status(500).SendString(err.Error())
-	}
-
-	log.Info("User deleted:", username)
-	return c.Status(200).SendString("User deleted")
-}
-
-// Login is a simple login handler that returns a JWT token
-//
-//	@Summary		login
-//	@Description	logs the user in and returns a jwt token
-//	@Tags			User
-//	@Accept			json
-//	@Param			NewUser	body	types.NewUser	true	"login info"
-//	@Produce		plain
-//	@Success		200	Token		types.Token	"Successfully signed token for user"
-//	@Failure		400	{string}	string		"Bad request"
-//	@Failure		401	{string}	string		"Unauthorized"
-//	@Failure		500	{string}	string		"Internal server error"
-//	@Router			/login [post]
-func (gs *GState) Login(c *fiber.Ctx) error {
-	// The body type is identical to a NewUser
-
-	u := new(types.NewUser)
-	if err := c.BodyParser(u); err != nil {
-		log.Warn("Error parsing body")
-		return c.Status(400).SendString(err.Error())
-	}
-
-	log.Info("Username logging in:", u.Username)
-	if !gs.Db.CheckUser(u.Username, u.Password) {
-		log.Info("User not found")
-		return c.SendStatus(fiber.StatusUnauthorized)
-	}
-
-	isAdmin, err := gs.Db.IsSiteAdmin(u.Username)
-	if err != nil {
-		log.Info("Error checking admin status:", err)
-		return c.Status(500).SendString(err.Error())
-	}
-	// Create the Claims
-	claims := jwt.MapClaims{
-		"name":  u.Username,
-		"admin": isAdmin,
-		"exp":   time.Now().Add(time.Hour * 72).Unix(),
-	}
-
-	// Create token
-	token := jwt.NewWithClaims(jwt.SigningMethodHS256, claims)
-	log.Info("Token created for user:", u.Username)
-
-	// Generate encoded token and send it as response.
-	t, err := token.SignedString([]byte("secret"))
-	if err != nil {
-		log.Warn("Error signing token")
-		return c.SendStatus(fiber.StatusInternalServerError)
-	}
-
-	println("Successfully signed token for user:", u.Username)
-	return c.JSON(types.Token{Token: t})
-}
-
-// LoginRenew is a simple handler that renews the token
-//
-//	@Summary		LoginRenews
-//	@Description	renews the users token
-//	@Security		bererToken
-//	@Tags			User
-//	@Accept			json
-//	@Produce		plain
-//	@Success		200	Token		types.Token	"Successfully signed token for user"
-//	@Failure		401	{string}	string		"Unauthorized"
-//	@Failure		500	{string}	string		"Internal server error"
-//	@Router			/loginerenew [post]
-func (gs *GState) LoginRenew(c *fiber.Ctx) error {
-	user := c.Locals("user").(*jwt.Token)
-
-	log.Info("Renewing token for user:", user.Claims.(jwt.MapClaims)["name"])
-
-	claims := user.Claims.(jwt.MapClaims)
-	claims["exp"] = time.Now().Add(time.Hour * 72).Unix()
-	renewed := jwt.MapClaims{
-		"name":  claims["name"],
-		"admin": claims["admin"],
-		"exp":   claims["exp"],
-	}
-	token := jwt.NewWithClaims(jwt.SigningMethodHS256, renewed)
-	t, err := token.SignedString([]byte("secret"))
-	if err != nil {
-		log.Warn("Error signing token")
-		return c.SendStatus(fiber.StatusInternalServerError)
-	}
-
-	log.Info("Successfully renewed token for user:", user.Claims.(jwt.MapClaims)["name"])
-	return c.JSON(types.Token{Token: t})
-}
-
-// ListAllUsers is a handler that returns a list of all users in the application database
-//
-//	@Summary		ListsAllUsers
-//	@Description	lists all users
-//	@Tags			User
-//	@Accept			json
-//	@Produce		plain
-//	@Success		200	{json}		json	"Successfully signed token for user"
-//	@Failure		401	{string}	string	"Unauthorized"
-//	@Failure		500	{string}	string	"Internal server error"
-//	@Router			/users/all [get]
-func (gs *GState) ListAllUsers(c *fiber.Ctx) error {
-	// Get all users from the database
-	users, err := gs.Db.GetAllUsersApplication()
-	if err != nil {
-		log.Info("Error getting users from db:", err) // Debug print
-		return c.Status(500).SendString(err.Error())
-	}
-
-	log.Info("Returning all users")
-	// Return the list of users as JSON
-	return c.JSON(users)
-}
-
-func (gs *GState) GetAllUsersProject(c *fiber.Ctx) error {
-	// Get all users from a project
-	projectName := c.Params("projectName")
-	users, err := gs.Db.GetAllUsersProject(projectName)
-	if err != nil {
-		log.Info("Error getting users from project:", err) // Debug print
-		return c.Status(500).SendString(err.Error())
-	}
-
-	log.Info("Returning all users")
-	// Return the list of users as JSON
-	return c.JSON(users)
-}
-
-// @Summary		PromoteToAdmin
-// @Description	promote chosen user to admin
-// @Tags			User
-// @Accept			json
-// @Produce		plain
-// @Param			NewUser	body		types.NewUser	true	"user info"
-// @Success		200		{json}		json			"Successfully promoted user"
-// @Failure		400		{string}	string			"Bad request"
-// @Failure		401		{string}	string			"Unauthorized"
-// @Failure		500		{string}	string			"Internal server error"
-// @Router			/promoteToAdmin [post]
-func (gs *GState) PromoteToAdmin(c *fiber.Ctx) error {
-	// Extract the username from the request body
-	var newUser types.NewUser
-	if err := c.BodyParser(&newUser); err != nil {
-		return c.Status(400).SendString("Bad request")
-	}
-	username := newUser.Username
-
-	log.Info("Promoting user to admin:", username) // Debug print
-
-	// Promote the user to a site admin in the database
-	if err := gs.Db.PromoteToAdmin(username); err != nil {
-		log.Info("Error promoting user to admin:", err) // Debug print
-		return c.Status(500).SendString(err.Error())
-	}
-
-	log.Info("User promoted to admin successfully:", username) // Debug print
-
-	// Return a success message
-	return c.SendStatus(fiber.StatusOK)
-}
-
-// ChangeUserName changes a user's username in the database
-func (gs *GState) ChangeUserName(c *fiber.Ctx) error {
-	// Check token and get username of current user
-	user := c.Locals("user").(*jwt.Token)
-	claims := user.Claims.(jwt.MapClaims)
-	adminUsername := claims["name"].(string)
-	log.Info(adminUsername)
-
-	// Extract the necessary parameters from the request
-	data := new(types.StrNameChange)
-	if err := c.BodyParser(data); err != nil {
-		log.Info("Error parsing username")
-		return c.Status(400).SendString(err.Error())
-	}
-
-	// Check if the current user is an admin
-	isAdmin, err := gs.Db.IsSiteAdmin(adminUsername)
-	if err != nil {
-		log.Warn("Error checking if admin:", err)
-		return c.Status(500).SendString(err.Error())
-	} else if !isAdmin {
-		log.Warn("Tried changing name when not admin")
-		return c.Status(401).SendString("You cannot change name unless you are an admin")
-	}
-
-	// Change the user's name in the database
-	if err := gs.Db.ChangeUserName(data.PrevName, data.NewName); err != nil {
-		return c.Status(500).SendString(err.Error())
-	}
-
-	// Return a success message
-	return c.SendStatus(fiber.StatusOK)
-}
diff --git a/backend/internal/handlers/handlers_project_related.go b/backend/internal/handlers/projects/handlers_project_related.go
similarity index 83%
rename from backend/internal/handlers/handlers_project_related.go
rename to backend/internal/handlers/projects/handlers_project_related.go
index d63d7eb..3429504 100644
--- a/backend/internal/handlers/handlers_project_related.go
+++ b/backend/internal/handlers/projects/handlers_project_related.go
@@ -1,7 +1,8 @@
-package handlers
+package projects
 
 import (
 	"strconv"
+	db "ttime/internal/database"
 	"ttime/internal/types"
 
 	"github.com/gofiber/fiber/v2"
@@ -10,7 +11,7 @@ import (
 )
 
 // CreateProject is a simple handler that creates a new project
-func (gs *GState) CreateProject(c *fiber.Ctx) error {
+func CreateProject(c *fiber.Ctx) error {
 	user := c.Locals("user").(*jwt.Token)
 
 	p := new(types.NewProject)
@@ -23,19 +24,19 @@ func (gs *GState) CreateProject(c *fiber.Ctx) error {
 	claims := user.Claims.(jwt.MapClaims)
 	owner := claims["name"].(string)
 
-	if err := gs.Db.AddProject(p.Name, p.Description, owner); err != nil {
+	if err := db.GetDb(c).AddProject(p.Name, p.Description, owner); err != nil {
 		return c.Status(500).SendString(err.Error())
 	}
 
 	return c.Status(200).SendString("Project added")
 }
 
-func (gs *GState) DeleteProject(c *fiber.Ctx) error {
+func DeleteProject(c *fiber.Ctx) error {
 
 	projectID := c.Params("projectID")
 	username := c.Params("username")
 
-	if err := gs.Db.DeleteProject(projectID, username); err != nil {
+	if err := db.GetDb(c).DeleteProject(projectID, username); err != nil {
 		return c.Status(500).SendString((err.Error()))
 	}
 
@@ -43,14 +44,14 @@ func (gs *GState) DeleteProject(c *fiber.Ctx) error {
 }
 
 // GetUserProjects returns all projects that the user is a member of
-func (gs *GState) GetUserProjects(c *fiber.Ctx) error {
+func GetUserProjects(c *fiber.Ctx) error {
 	// First we get the username from the token
 	user := c.Locals("user").(*jwt.Token)
 	claims := user.Claims.(jwt.MapClaims)
 	username := claims["name"].(string)
 
 	// Then dip into the database to get the projects
-	projects, err := gs.Db.GetProjectsForUser(username)
+	projects, err := db.GetDb(c).GetProjectsForUser(username)
 	if err != nil {
 		return c.Status(500).SendString(err.Error())
 	}
@@ -60,7 +61,7 @@ func (gs *GState) GetUserProjects(c *fiber.Ctx) error {
 }
 
 // ProjectRoleChange is a handler that changes a user's role within a project
-func (gs *GState) ProjectRoleChange(c *fiber.Ctx) error {
+func ProjectRoleChange(c *fiber.Ctx) error {
 
 	//check token and get username of current user
 	user := c.Locals("user").(*jwt.Token)
@@ -77,7 +78,7 @@ func (gs *GState) ProjectRoleChange(c *fiber.Ctx) error {
 	log.Info("Changing role for user: ", username, " in project: ", data.Projectname, " to: ", data.Role)
 
 	// Dubble diping and checcking if current user is
-	if ismanager, err := gs.Db.IsProjectManager(username, data.Projectname); err != nil {
+	if ismanager, err := db.GetDb(c).IsProjectManager(username, data.Projectname); err != nil {
 		log.Warn("Error checking if projectmanager:", err)
 		return c.Status(500).SendString(err.Error())
 	} else if !ismanager {
@@ -86,7 +87,7 @@ func (gs *GState) ProjectRoleChange(c *fiber.Ctx) error {
 	}
 
 	// Change the user's role within the project in the database
-	if err := gs.Db.ChangeUserRole(username, data.Projectname, data.Role); err != nil {
+	if err := db.GetDb(c).ChangeUserRole(username, data.Projectname, data.Role); err != nil {
 		return c.Status(500).SendString(err.Error())
 	}
 
@@ -95,7 +96,7 @@ func (gs *GState) ProjectRoleChange(c *fiber.Ctx) error {
 }
 
 // GetProject retrieves a specific project by its ID
-func (gs *GState) GetProject(c *fiber.Ctx) error {
+func GetProject(c *fiber.Ctx) error {
 	// Extract the project ID from the request parameters or body
 	projectID := c.Params("projectID")
 	if projectID == "" {
@@ -112,7 +113,7 @@ func (gs *GState) GetProject(c *fiber.Ctx) error {
 	}
 
 	// Get the project from the database by its ID
-	project, err := gs.Db.GetProject(projectIDInt)
+	project, err := db.GetDb(c).GetProject(projectIDInt)
 	if err != nil {
 		log.Info("Error getting project:", err)
 		return c.Status(500).SendString(err.Error())
@@ -123,7 +124,7 @@ func (gs *GState) GetProject(c *fiber.Ctx) error {
 	return c.JSON(project)
 }
 
-func (gs *GState) ListAllUsersProject(c *fiber.Ctx) error {
+func ListAllUsersProject(c *fiber.Ctx) error {
 	// Extract the project name from the request parameters or body
 	projectName := c.Params("projectName")
 	if projectName == "" {
@@ -137,7 +138,7 @@ func (gs *GState) ListAllUsersProject(c *fiber.Ctx) error {
 	username := claims["name"].(string)
 
 	// Check if the user is a project manager for the specified project
-	isManager, err := gs.Db.IsProjectManager(username, projectName)
+	isManager, err := db.GetDb(c).IsProjectManager(username, projectName)
 	if err != nil {
 		log.Info("Error checking project manager status:", err)
 		return c.Status(500).SendString(err.Error())
@@ -145,7 +146,7 @@ func (gs *GState) ListAllUsersProject(c *fiber.Ctx) error {
 
 	// If the user is not a project manager, check if the user is a site admin
 	if !isManager {
-		isAdmin, err := gs.Db.IsSiteAdmin(username)
+		isAdmin, err := db.GetDb(c).IsSiteAdmin(username)
 		if err != nil {
 			log.Info("Error checking admin status:", err)
 			return c.Status(500).SendString(err.Error())
@@ -157,7 +158,7 @@ func (gs *GState) ListAllUsersProject(c *fiber.Ctx) error {
 	}
 
 	// Get all users associated with the project from the database
-	users, err := gs.Db.GetAllUsersProject(projectName)
+	users, err := db.GetDb(c).GetAllUsersProject(projectName)
 	if err != nil {
 		log.Info("Error getting users for project:", err)
 		return c.Status(500).SendString(err.Error())
@@ -170,7 +171,7 @@ func (gs *GState) ListAllUsersProject(c *fiber.Ctx) error {
 }
 
 // AddUserToProjectHandler is a handler that adds a user to a project with a specified role
-func (gs *GState) AddUserToProjectHandler(c *fiber.Ctx) error {
+func AddUserToProjectHandler(c *fiber.Ctx) error {
 	// Extract necessary parameters from the request
 	var requestData struct {
 		Username    string `json:"username"`
@@ -188,7 +189,7 @@ func (gs *GState) AddUserToProjectHandler(c *fiber.Ctx) error {
 	adminUsername := claims["name"].(string)
 	log.Info("Admin username from claims:", adminUsername)
 
-	isAdmin, err := gs.Db.IsSiteAdmin(adminUsername)
+	isAdmin, err := db.GetDb(c).IsSiteAdmin(adminUsername)
 	if err != nil {
 		log.Info("Error checking admin status:", err)
 		return c.Status(500).SendString(err.Error())
@@ -200,7 +201,7 @@ func (gs *GState) AddUserToProjectHandler(c *fiber.Ctx) error {
 	}
 
 	// Add the user to the project with the specified role
-	err = gs.Db.AddUserToProject(requestData.Username, requestData.ProjectName, requestData.Role)
+	err = db.GetDb(c).AddUserToProject(requestData.Username, requestData.ProjectName, requestData.Role)
 	if err != nil {
 		log.Info("Error adding user to project:", err)
 		return c.Status(500).SendString(err.Error())
@@ -212,7 +213,7 @@ func (gs *GState) AddUserToProjectHandler(c *fiber.Ctx) error {
 }
 
 // IsProjectManagerHandler is a handler that checks if a user is a project manager for a given project
-func (gs *GState) IsProjectManagerHandler(c *fiber.Ctx) error {
+func IsProjectManagerHandler(c *fiber.Ctx) error {
 	// Get the username from the token
 	user := c.Locals("user").(*jwt.Token)
 	claims := user.Claims.(jwt.MapClaims)
@@ -224,7 +225,7 @@ func (gs *GState) IsProjectManagerHandler(c *fiber.Ctx) error {
 	log.Info("Checking if user ", username, " is a project manager for project ", projectName)
 
 	// Check if the user is a project manager for the specified project
-	isManager, err := gs.Db.IsProjectManager(username, projectName)
+	isManager, err := db.GetDb(c).IsProjectManager(username, projectName)
 	if err != nil {
 		log.Info("Error checking project manager status:", err)
 		return c.Status(500).SendString(err.Error())
@@ -234,7 +235,7 @@ func (gs *GState) IsProjectManagerHandler(c *fiber.Ctx) error {
 	return c.JSON(fiber.Map{"isProjectManager": isManager})
 }
 
-func (gs *GState) GetProjectTimesHandler(c *fiber.Ctx) error {
+func GetProjectTimesHandler(c *fiber.Ctx) error {
 	// Get the username from the token
 	user := c.Locals("user").(*jwt.Token)
 	claims := user.Claims.(jwt.MapClaims)
@@ -248,7 +249,7 @@ func (gs *GState) GetProjectTimesHandler(c *fiber.Ctx) error {
 	}
 
 	// Get all users in the project and roles
-	userProjects, err := gs.Db.GetAllUsersProject(projectName)
+	userProjects, err := db.GetDb(c).GetAllUsersProject(projectName)
 	if err != nil {
 		log.Info("Error getting users in project:", err)
 		return c.Status(500).SendString(err.Error())
@@ -265,7 +266,7 @@ func (gs *GState) GetProjectTimesHandler(c *fiber.Ctx) error {
 
 	// If the user is admin
 	if !isMember {
-		isAdmin, err := gs.Db.IsSiteAdmin(username)
+		isAdmin, err := db.GetDb(c).IsSiteAdmin(username)
 		if err != nil {
 			log.Info("Error checking admin status:", err)
 			return c.Status(500).SendString(err.Error())
@@ -277,7 +278,7 @@ func (gs *GState) GetProjectTimesHandler(c *fiber.Ctx) error {
 	}
 
 	// Get project times
-	projectTimes, err := gs.Db.GetProjectTimes(projectName)
+	projectTimes, err := db.GetDb(c).GetProjectTimes(projectName)
 	if err != nil {
 		log.Info("Error getting project times:", err)
 		return c.Status(500).SendString(err.Error())
@@ -288,13 +289,13 @@ func (gs *GState) GetProjectTimesHandler(c *fiber.Ctx) error {
 	return c.JSON(projectTimes)
 }
 
-func (gs *GState) RemoveProject(c *fiber.Ctx) error {
+func RemoveProject(c *fiber.Ctx) error {
 	user := c.Locals("user").(*jwt.Token)
 	claims := user.Claims.(jwt.MapClaims)
 	username := claims["name"].(string)
 
 	// Check if the user is a site admin
-	isAdmin, err := gs.Db.IsSiteAdmin(username)
+	isAdmin, err := db.GetDb(c).IsSiteAdmin(username)
 	if err != nil {
 		log.Info("Error checking admin status:", err)
 		return c.Status(500).SendString(err.Error())
@@ -307,7 +308,7 @@ func (gs *GState) RemoveProject(c *fiber.Ctx) error {
 
 	projectName := c.Params("projectName")
 
-	if err := gs.Db.RemoveProject(projectName); err != nil {
+	if err := db.GetDb(c).RemoveProject(projectName); err != nil {
 		return c.Status(500).SendString((err.Error()))
 	}
 
diff --git a/backend/internal/handlers/handlers_report_related.go b/backend/internal/handlers/reports/handlers_report_related.go
similarity index 83%
rename from backend/internal/handlers/handlers_report_related.go
rename to backend/internal/handlers/reports/handlers_report_related.go
index 52e1564..1c84d52 100644
--- a/backend/internal/handlers/handlers_report_related.go
+++ b/backend/internal/handlers/reports/handlers_report_related.go
@@ -1,7 +1,8 @@
-package handlers
+package reports
 
 import (
 	"strconv"
+	db "ttime/internal/database"
 	"ttime/internal/types"
 
 	"github.com/gofiber/fiber/v2"
@@ -9,7 +10,7 @@ import (
 	"github.com/golang-jwt/jwt/v5"
 )
 
-func (gs *GState) SubmitWeeklyReport(c *fiber.Ctx) error {
+func SubmitWeeklyReport(c *fiber.Ctx) error {
 	// Extract the necessary parameters from the token
 	user := c.Locals("user").(*jwt.Token)
 	claims := user.Claims.(jwt.MapClaims)
@@ -31,7 +32,7 @@ func (gs *GState) SubmitWeeklyReport(c *fiber.Ctx) error {
 		return c.Status(400).SendString("Invalid time report")
 	}
 
-	if err := gs.Db.AddWeeklyReport(report.ProjectName, username, report.Week, report.DevelopmentTime, report.MeetingTime, report.AdminTime, report.OwnWorkTime, report.StudyTime, report.TestingTime); err != nil {
+	if err := db.GetDb(c).AddWeeklyReport(report.ProjectName, username, report.Week, report.DevelopmentTime, report.MeetingTime, report.AdminTime, report.OwnWorkTime, report.StudyTime, report.TestingTime); err != nil {
 		log.Info("Error adding weekly report to db:", err)
 		return c.Status(500).SendString(err.Error())
 	}
@@ -41,7 +42,7 @@ func (gs *GState) SubmitWeeklyReport(c *fiber.Ctx) error {
 }
 
 // Handler for retrieving weekly report
-func (gs *GState) GetWeeklyReport(c *fiber.Ctx) error {
+func GetWeeklyReport(c *fiber.Ctx) error {
 	// Extract the necessary parameters from the request
 	user := c.Locals("user").(*jwt.Token)
 	claims := user.Claims.(jwt.MapClaims)
@@ -66,7 +67,7 @@ func (gs *GState) GetWeeklyReport(c *fiber.Ctx) error {
 	}
 
 	// Call the database function to get the weekly report
-	report, err := gs.Db.GetWeeklyReport(username, projectName, weekInt)
+	report, err := db.GetDb(c).GetWeeklyReport(username, projectName, weekInt)
 	if err != nil {
 		log.Info("Error getting weekly report from db:", err)
 		return c.Status(500).SendString(err.Error())
@@ -81,7 +82,7 @@ type ReportId struct {
 	ReportId int
 }
 
-func (gs *GState) SignReport(c *fiber.Ctx) error {
+func SignReport(c *fiber.Ctx) error {
 	// Extract the necessary parameters from the token
 	user := c.Locals("user").(*jwt.Token)
 	claims := user.Claims.(jwt.MapClaims)
@@ -98,7 +99,7 @@ func (gs *GState) SignReport(c *fiber.Ctx) error {
 	log.Info("Signing report for: ", rid.ReportId)
 
 	// Get the project manager's ID
-	projectManagerID, err := gs.Db.GetUserId(projectManagerUsername)
+	projectManagerID, err := db.GetDb(c).GetUserId(projectManagerUsername)
 	if err != nil {
 		log.Info("Failed to get project manager ID")
 		return c.Status(500).SendString("Failed to get project manager ID")
@@ -106,7 +107,7 @@ func (gs *GState) SignReport(c *fiber.Ctx) error {
 	log.Info("Project manager ID: ", projectManagerID)
 
 	// Call the database function to sign the weekly report
-	err = gs.Db.SignWeeklyReport(rid.ReportId, projectManagerID)
+	err = db.GetDb(c).SignWeeklyReport(rid.ReportId, projectManagerID)
 	if err != nil {
 		log.Info("Error signing weekly report:", err)
 		return c.Status(500).SendString(err.Error())
@@ -115,7 +116,7 @@ func (gs *GState) SignReport(c *fiber.Ctx) error {
 	return c.Status(200).SendString("Weekly report signed successfully")
 }
 
-func (gs *GState) GetUnsignedReports(c *fiber.Ctx) error {
+func GetUnsignedReports(c *fiber.Ctx) error {
 	// Extract the necessary parameters from the token
 	user := c.Locals("user").(*jwt.Token)
 	claims := user.Claims.(jwt.MapClaims)
@@ -132,7 +133,7 @@ func (gs *GState) GetUnsignedReports(c *fiber.Ctx) error {
 	}
 
 	// Get the project manager's ID
-	isProjectManager, err := gs.Db.IsProjectManager(projectManagerUsername, projectName)
+	isProjectManager, err := db.GetDb(c).IsProjectManager(projectManagerUsername, projectName)
 	if err != nil {
 		log.Info("Failed to get project manager ID")
 		return c.Status(500).SendString("Failed to get project manager ID")
@@ -140,7 +141,7 @@ func (gs *GState) GetUnsignedReports(c *fiber.Ctx) error {
 	log.Info("User is Project Manager: ", isProjectManager)
 
 	// Call the database function to get the unsigned weekly reports
-	reports, err := gs.Db.GetUnsignedWeeklyReports(projectName)
+	reports, err := db.GetDb(c).GetUnsignedWeeklyReports(projectName)
 	if err != nil {
 		log.Info("Error getting unsigned weekly reports:", err)
 		return c.Status(500).SendString(err.Error())
@@ -152,7 +153,7 @@ func (gs *GState) GetUnsignedReports(c *fiber.Ctx) error {
 }
 
 // GetWeeklyReportsUserHandler retrieves all weekly reports for a user in a specific project
-func (gs *GState) GetWeeklyReportsUserHandler(c *fiber.Ctx) error {
+func GetWeeklyReportsUserHandler(c *fiber.Ctx) error {
 	// Extract the necessary parameters from the token
 	user := c.Locals("user").(*jwt.Token)
 	claims := user.Claims.(jwt.MapClaims)
@@ -166,7 +167,7 @@ func (gs *GState) GetWeeklyReportsUserHandler(c *fiber.Ctx) error {
 	// the returned list of reports will (should) allways be empty.
 
 	// Retrieve weekly reports for the user in the project from the database
-	reports, err := gs.Db.GetWeeklyReportsUser(username, projectName)
+	reports, err := db.GetDb(c).GetWeeklyReportsUser(username, projectName)
 	if err != nil {
 		log.Error("Error getting weekly reports for user:", username, "in project:", projectName, ":", err)
 		return c.Status(500).SendString(err.Error())
@@ -178,7 +179,7 @@ func (gs *GState) GetWeeklyReportsUserHandler(c *fiber.Ctx) error {
 	return c.JSON(reports)
 }
 
-func (gs *GState) UpdateWeeklyReport(c *fiber.Ctx) error {
+func UpdateWeeklyReport(c *fiber.Ctx) error {
 	// Extract the necessary parameters from the token
 	user := c.Locals("user").(*jwt.Token)
 	claims := user.Claims.(jwt.MapClaims)
@@ -203,7 +204,7 @@ func (gs *GState) UpdateWeeklyReport(c *fiber.Ctx) error {
 	}
 
 	// Update the weekly report in the database
-	if err := gs.Db.UpdateWeeklyReport(updateReport.ProjectName, username, updateReport.Week, updateReport.DevelopmentTime, updateReport.MeetingTime, updateReport.AdminTime, updateReport.OwnWorkTime, updateReport.StudyTime, updateReport.TestingTime); err != nil {
+	if err := db.GetDb(c).UpdateWeeklyReport(updateReport.ProjectName, username, updateReport.Week, updateReport.DevelopmentTime, updateReport.MeetingTime, updateReport.AdminTime, updateReport.OwnWorkTime, updateReport.StudyTime, updateReport.TestingTime); err != nil {
 		log.Info("Error updating weekly report in db:", err)
 		return c.Status(500).SendString(err.Error())
 	}
diff --git a/backend/internal/handlers/users/ChangeUserName.go b/backend/internal/handlers/users/ChangeUserName.go
new file mode 100644
index 0000000..75032e4
--- /dev/null
+++ b/backend/internal/handlers/users/ChangeUserName.go
@@ -0,0 +1,44 @@
+package users
+
+import (
+	db "ttime/internal/database"
+	"ttime/internal/types"
+
+	"github.com/gofiber/fiber/v2"
+	"github.com/gofiber/fiber/v2/log"
+	"github.com/golang-jwt/jwt/v5"
+)
+
+// ChangeUserName changes a user's username in the database
+func ChangeUserName(c *fiber.Ctx) error {
+	// Check token and get username of current user
+	user := c.Locals("user").(*jwt.Token)
+	claims := user.Claims.(jwt.MapClaims)
+	adminUsername := claims["name"].(string)
+	log.Info(adminUsername)
+
+	// Extract the necessary parameters from the request
+	data := new(types.StrNameChange)
+	if err := c.BodyParser(data); err != nil {
+		log.Info("Error parsing username")
+		return c.Status(400).SendString(err.Error())
+	}
+
+	// Check if the current user is an admin
+	isAdmin, err := db.GetDb(c).IsSiteAdmin(adminUsername)
+	if err != nil {
+		log.Warn("Error checking if admin:", err)
+		return c.Status(500).SendString(err.Error())
+	} else if !isAdmin {
+		log.Warn("Tried changing name when not admin")
+		return c.Status(401).SendString("You cannot change name unless you are an admin")
+	}
+
+	// Change the user's name in the database
+	if err := db.GetDb(c).ChangeUserName(data.PrevName, data.NewName); err != nil {
+		return c.Status(500).SendString(err.Error())
+	}
+
+	// Return a success message
+	return c.SendStatus(fiber.StatusOK)
+}
diff --git a/backend/internal/handlers/users/GetUsersProjects.go b/backend/internal/handlers/users/GetUsersProjects.go
new file mode 100644
index 0000000..10a6ec6
--- /dev/null
+++ b/backend/internal/handlers/users/GetUsersProjects.go
@@ -0,0 +1,22 @@
+package users
+
+import (
+	db "ttime/internal/database"
+
+	"github.com/gofiber/fiber/v2"
+	"github.com/gofiber/fiber/v2/log"
+)
+
+func GetAllUsersProject(c *fiber.Ctx) error {
+	// Get all users from a project
+	projectName := c.Params("projectName")
+	users, err := db.GetDb(c).GetAllUsersProject(projectName)
+	if err != nil {
+		log.Info("Error getting users from project:", err) // Debug print
+		return c.Status(500).SendString(err.Error())
+	}
+
+	log.Info("Returning all users")
+	// Return the list of users as JSON
+	return c.JSON(users)
+}
diff --git a/backend/internal/handlers/users/ListAllUsers.go b/backend/internal/handlers/users/ListAllUsers.go
new file mode 100644
index 0000000..1cae76c
--- /dev/null
+++ b/backend/internal/handlers/users/ListAllUsers.go
@@ -0,0 +1,31 @@
+package users
+
+import (
+	db "ttime/internal/database"
+
+	"github.com/gofiber/fiber/v2"
+	"github.com/gofiber/fiber/v2/log"
+)
+
+// ListAllUsers is a handler that returns a list of all users in the application database
+// @Summary		ListsAllUsers
+// @Description	lists all users
+// @Tags			User
+// @Accept			json
+// @Produce		plain
+// @Success		200	{json}		json	"Successfully signed token for user"
+// @Failure		401	{string}	string	"Unauthorized"
+// @Failure		500	{string}	string	"Internal server error"
+// @Router			/users/all [get]
+func ListAllUsers(c *fiber.Ctx) error {
+	// Get all users from the database
+	users, err := db.GetDb(c).GetAllUsersApplication()
+	if err != nil {
+		log.Info("Error getting users from db:", err) // Debug print
+		return c.Status(500).SendString(err.Error())
+	}
+
+	log.Info("Returning all users")
+	// Return the list of users as JSON
+	return c.JSON(users)
+}
diff --git a/backend/internal/handlers/users/Login.go b/backend/internal/handlers/users/Login.go
new file mode 100644
index 0000000..c4d6c60
--- /dev/null
+++ b/backend/internal/handlers/users/Login.go
@@ -0,0 +1,65 @@
+package users
+
+import (
+	"time"
+	db "ttime/internal/database"
+	"ttime/internal/types"
+
+	"github.com/gofiber/fiber/v2"
+	"github.com/gofiber/fiber/v2/log"
+	"github.com/golang-jwt/jwt/v5"
+)
+
+// Login is a simple login handler that returns a JWT token
+// @Summary		login
+// @Description	logs the user in and returns a jwt token
+// @Tags			User
+// @Accept			json
+// @Param			NewUser	body	types.NewUser	true	"login info"
+// @Produce		plain
+// @Success		200	Token		types.Token	"Successfully signed token for user"
+// @Failure		400	{string}	string		"Bad request"
+// @Failure		401	{string}	string		"Unauthorized"
+// @Failure		500	{string}	string		"Internal server error"
+// @Router			/login [post]
+func Login(c *fiber.Ctx) error {
+	// The body type is identical to a NewUser
+
+	u := new(types.NewUser)
+	if err := c.BodyParser(u); err != nil {
+		log.Warn("Error parsing body")
+		return c.Status(400).SendString(err.Error())
+	}
+
+	log.Info("Username logging in:", u.Username)
+	if !db.GetDb(c).CheckUser(u.Username, u.Password) {
+		log.Info("User not found")
+		return c.SendStatus(fiber.StatusUnauthorized)
+	}
+
+	isAdmin, err := db.GetDb(c).IsSiteAdmin(u.Username)
+	if err != nil {
+		log.Info("Error checking admin status:", err)
+		return c.Status(500).SendString(err.Error())
+	}
+	// Create the Claims
+	claims := jwt.MapClaims{
+		"name":  u.Username,
+		"admin": isAdmin,
+		"exp":   time.Now().Add(time.Hour * 72).Unix(),
+	}
+
+	// Create token
+	token := jwt.NewWithClaims(jwt.SigningMethodHS256, claims)
+	log.Info("Token created for user:", u.Username)
+
+	// Generate encoded token and send it as response.
+	t, err := token.SignedString([]byte("secret"))
+	if err != nil {
+		log.Warn("Error signing token")
+		return c.SendStatus(fiber.StatusInternalServerError)
+	}
+
+	println("Successfully signed token for user:", u.Username)
+	return c.JSON(types.Token{Token: t})
+}
diff --git a/backend/internal/handlers/users/LoginRenew.go b/backend/internal/handlers/users/LoginRenew.go
new file mode 100644
index 0000000..78eadfd
--- /dev/null
+++ b/backend/internal/handlers/users/LoginRenew.go
@@ -0,0 +1,44 @@
+package users
+
+import (
+	"time"
+	"ttime/internal/types"
+
+	"github.com/gofiber/fiber/v2"
+	"github.com/gofiber/fiber/v2/log"
+	"github.com/golang-jwt/jwt/v5"
+)
+
+// LoginRenew is a simple handler that renews the token
+// @Summary		LoginRenews
+// @Description	renews the users token
+// @Security		bererToken
+// @Tags			User
+// @Accept			json
+// @Produce		plain
+// @Success		200	Token		types.Token	"Successfully signed token for user"
+// @Failure		401	{string}	string		"Unauthorized"
+// @Failure		500	{string}	string		"Internal server error"
+// @Router			/loginerenew [post]
+func LoginRenew(c *fiber.Ctx) error {
+	user := c.Locals("user").(*jwt.Token)
+
+	log.Info("Renewing token for user:", user.Claims.(jwt.MapClaims)["name"])
+
+	claims := user.Claims.(jwt.MapClaims)
+	claims["exp"] = time.Now().Add(time.Hour * 72).Unix()
+	renewed := jwt.MapClaims{
+		"name":  claims["name"],
+		"admin": claims["admin"],
+		"exp":   claims["exp"],
+	}
+	token := jwt.NewWithClaims(jwt.SigningMethodHS256, renewed)
+	t, err := token.SignedString([]byte("secret"))
+	if err != nil {
+		log.Warn("Error signing token")
+		return c.SendStatus(fiber.StatusInternalServerError)
+	}
+
+	log.Info("Successfully renewed token for user:", user.Claims.(jwt.MapClaims)["name"])
+	return c.JSON(types.Token{Token: t})
+}
diff --git a/backend/internal/handlers/users/PromoteToAdmin.go b/backend/internal/handlers/users/PromoteToAdmin.go
new file mode 100644
index 0000000..4a21758
--- /dev/null
+++ b/backend/internal/handlers/users/PromoteToAdmin.go
@@ -0,0 +1,42 @@
+package users
+
+import (
+	db "ttime/internal/database"
+	"ttime/internal/types"
+
+	"github.com/gofiber/fiber/v2"
+	"github.com/gofiber/fiber/v2/log"
+)
+
+// @Summary		PromoteToAdmin
+// @Description	promote chosen user to admin
+// @Tags			User
+// @Accept			json
+// @Produce		plain
+// @Param			NewUser	body		types.NewUser	true	"user info"
+// @Success		200		{json}		json			"Successfully promoted user"
+// @Failure		400		{string}	string			"Bad request"
+// @Failure		401		{string}	string			"Unauthorized"
+// @Failure		500		{string}	string			"Internal server error"
+// @Router			/promoteToAdmin [post]
+func PromoteToAdmin(c *fiber.Ctx) error {
+	// Extract the username from the request body
+	var newUser types.NewUser
+	if err := c.BodyParser(&newUser); err != nil {
+		return c.Status(400).SendString("Bad request")
+	}
+	username := newUser.Username
+
+	log.Info("Promoting user to admin:", username) // Debug print
+
+	// Promote the user to a site admin in the database
+	if err := db.GetDb(c).PromoteToAdmin(username); err != nil {
+		log.Info("Error promoting user to admin:", err) // Debug print
+		return c.Status(500).SendString(err.Error())
+	}
+
+	log.Info("User promoted to admin successfully:", username) // Debug print
+
+	// Return a success message
+	return c.SendStatus(fiber.StatusOK)
+}
diff --git a/backend/internal/handlers/users/Register.go b/backend/internal/handlers/users/Register.go
new file mode 100644
index 0000000..9977246
--- /dev/null
+++ b/backend/internal/handlers/users/Register.go
@@ -0,0 +1,38 @@
+package users
+
+import (
+	db "ttime/internal/database"
+	"ttime/internal/types"
+
+	"github.com/gofiber/fiber/v2"
+	"github.com/gofiber/fiber/v2/log"
+)
+
+// Register is a simple handler that registers a new user
+//
+//	@Summary		Register
+//	@Description	Register a new user
+//	@Tags			User
+//	@Accept			json
+//	@Produce		plain
+//	@Param			NewUser	body		types.NewUser	true	"User to register"
+//	@Success		200		{string}	string			"User added"
+//	@Failure		400		{string}	string			"Bad request"
+//	@Failure		500		{string}	string			"Internal server error"
+//	@Router			/register [post]
+func Register(c *fiber.Ctx) error {
+	u := new(types.NewUser)
+	if err := c.BodyParser(u); err != nil {
+		log.Warn("Error parsing body")
+		return c.Status(400).SendString(err.Error())
+	}
+
+	log.Info("Adding user:", u.Username)
+	if err := db.GetDb(c).AddUser(u.Username, u.Password); err != nil {
+		log.Warn("Error adding user:", err)
+		return c.Status(500).SendString(err.Error())
+	}
+
+	log.Info("User added:", u.Username)
+	return c.Status(200).SendString("User added")
+}
diff --git a/backend/internal/handlers/users/UserDelete.go b/backend/internal/handlers/users/UserDelete.go
new file mode 100644
index 0000000..5957c2d
--- /dev/null
+++ b/backend/internal/handlers/users/UserDelete.go
@@ -0,0 +1,43 @@
+package users
+
+import (
+	db "ttime/internal/database"
+
+	"github.com/gofiber/fiber/v2"
+	"github.com/gofiber/fiber/v2/log"
+	"github.com/golang-jwt/jwt/v5"
+)
+
+// This path should obviously be protected in the future
+// UserDelete deletes a user from the database
+//
+//	@Summary		UserDelete
+//	@Description	UserDelete deletes a user from the database
+//	@Tags			User
+//	@Accept			json
+//	@Produce		plain
+//	@Success		200	{string}	string	"User deleted"
+//	@Failure		403	{string}	string	"You can only delete yourself"
+//	@Failure		500	{string}	string	"Internal server error"
+//	@Failure		401	{string}	string	"Unauthorized"
+//	@Router			/userdelete/{username} [delete]
+func UserDelete(c *fiber.Ctx) error {
+	// Read from path parameters
+	username := c.Params("username")
+
+	// Read username from Locals
+	auth_username := c.Locals("user").(*jwt.Token).Claims.(jwt.MapClaims)["name"].(string)
+
+	if username == auth_username {
+		log.Info("User tried to delete itself")
+		return c.Status(403).SendString("You can't delete yourself")
+	}
+
+	if err := db.GetDb(c).RemoveUser(username); err != nil {
+		log.Warn("Error deleting user:", err)
+		return c.Status(500).SendString(err.Error())
+	}
+
+	log.Info("User deleted:", username)
+	return c.Status(200).SendString("User deleted")
+}
diff --git a/backend/main.go b/backend/main.go
index 669bbc7..ebe5660 100644
--- a/backend/main.go
+++ b/backend/main.go
@@ -6,7 +6,9 @@ import (
 	_ "ttime/docs"
 	"ttime/internal/config"
 	"ttime/internal/database"
-	"ttime/internal/handlers"
+	"ttime/internal/handlers/projects"
+	"ttime/internal/handlers/reports"
+	"ttime/internal/handlers/users"
 
 	"github.com/BurntSushi/toml"
 	"github.com/gofiber/fiber/v2"
@@ -54,24 +56,28 @@ func main() {
 
 	// Connect to the database
 	db := database.DbConnect(conf.DbPath)
+
 	// Migrate the database
 	if err = db.Migrate(); err != nil {
 		fmt.Println("Error migrating database: ", err)
 		os.Exit(1)
 	}
 
+	// Migrate sample data, should not be used in production
 	if err = db.MigrateSampleData(); err != nil {
 		fmt.Println("Error migrating sample data: ", err)
 		os.Exit(1)
 	}
 
-	// Get our global state
-	gs := handlers.NewGlobalState(db)
 	// Create the server
 	server := fiber.New()
 
+	// We want some logs
 	server.Use(logger.New())
 
+	// Sets up db middleware, accessed as Local "db" key
+	server.Use(database.DbMiddleware(&db))
+
 	// Mounts the swagger documentation, this is available at /swagger/index.html
 	server.Get("/swagger/*", swagger.HandlerDefault)
 
@@ -79,37 +85,50 @@ func main() {
 	// This will likely be replaced by an embedded filesystem in the future
 	server.Static("/", "./static")
 
-	// Register our unprotected routes
-	server.Post("/api/register", gs.Register)
-	server.Post("/api/login", gs.Login)
+	// Create a group for our API
+	api := server.Group("/api")
 
-	// Every route from here on will require a valid JWT
+	// Register our unprotected routes
+	api.Post("/register", users.Register)
+	api.Post("/login", users.Login)
+
+	// Every route from here on will require a valid
+	// JWT bearer token authentication in the header
 	server.Use(jwtware.New(jwtware.Config{
 		SigningKey: jwtware.SigningKey{Key: []byte("secret")},
 	}))
 
-	// Protected routes (require a valid JWT bearer token authentication header)
-	server.Post("/api/submitWeeklyReport", gs.SubmitWeeklyReport)
-	server.Get("/api/getUserProjects", gs.GetUserProjects)
-	server.Post("/api/loginrenew", gs.LoginRenew)
-	server.Delete("/api/userdelete/:username", gs.UserDelete) // Perhaps just use POST to avoid headaches
-	server.Delete("api/project/:projectID", gs.DeleteProject) // WIP
-	server.Post("/api/project", gs.CreateProject)             // WIP
-	server.Get("/api/project/:projectId", gs.GetProject)
-	server.Get("/api/project/getAllUsers", gs.GetAllUsersProject)
-	server.Get("/api/getWeeklyReport", gs.GetWeeklyReport)
-	server.Get("/api/getUnsignedReports/:projectName", gs.GetUnsignedReports)
-	server.Post("/api/signReport", gs.SignReport)
-	server.Put("/api/addUserToProject", gs.AddUserToProjectHandler)
-	server.Put("/api/changeUserName", gs.ChangeUserName)
-	server.Post("/api/promoteToAdmin", gs.PromoteToAdmin)
-	server.Get("/api/users/all", gs.ListAllUsers)
-	server.Get("/api/getWeeklyReportsUser/:projectName", gs.GetWeeklyReportsUserHandler)
-	server.Get("/api/checkIfProjectManager/:projectName", gs.IsProjectManagerHandler)
-	server.Post("/api/ProjectRoleChange", gs.ProjectRoleChange)
-	server.Get("/api/getUsersProject/:projectName", gs.ListAllUsersProject)
-	server.Put("/api/updateWeeklyReport", gs.UpdateWeeklyReport)
-	server.Delete("/api/removeProject/:projectName", gs.RemoveProject)
+	// All user related routes
+	// userGroup := api.Group("/user") // Not currently in use
+	api.Post("/login", users.Login)
+	api.Post("/register", users.Register)
+	api.Post("/loginrenew", users.LoginRenew)
+	api.Delete("/userdelete/:username", users.UserDelete) // Perhaps just use POST to avoid headaches
+	api.Put("/changeUserName", users.ChangeUserName)
+	api.Get("/users/all", users.ListAllUsers)
+	api.Post("/promoteToAdmin", users.PromoteToAdmin)
+	api.Get("/project/getAllUsers", users.GetAllUsersProject)
+
+	// All project related routes
+	// projectGroup := api.Group("/project") // Not currently in use
+	api.Get("/getUserProjects", projects.GetUserProjects)
+	api.Delete("/project/:projectID", projects.DeleteProject)
+	api.Post("/project", projects.CreateProject)
+	api.Get("/project/:projectId", projects.GetProject)
+	api.Get("/checkIfProjectManager/:projectName", projects.IsProjectManagerHandler)
+	api.Post("/ProjectRoleChange", projects.ProjectRoleChange)
+	api.Get("/getUsersProject/:projectName", projects.ListAllUsersProject)
+	api.Delete("/removeProject/:projectName", projects.RemoveProject)
+
+	// All report related routes
+	// reportGroup := api.Group("/report") // Not currently in use
+	api.Get("/getWeeklyReport", reports.GetWeeklyReport)
+	api.Post("/submitWeeklyReport", reports.SubmitWeeklyReport)
+	api.Get("/getUnsignedReports/:projectName", reports.GetUnsignedReports)
+	api.Post("/signReport", reports.SignReport)
+	api.Put("/addUserToProject", projects.AddUserToProjectHandler)
+	api.Get("/getWeeklyReportsUser/:projectName", reports.GetWeeklyReportsUserHandler)
+	api.Put("/updateWeeklyReport", reports.UpdateWeeklyReport)
 
 	// Announce the port we are listening on and start the server
 	err = server.Listen(fmt.Sprintf(":%d", conf.Port))

From 1d5fcd61b6e11712731561a7344df550e00e18b2 Mon Sep 17 00:00:00 2001
From: Imbus <>
Date: Fri, 29 Mar 2024 14:50:56 +0100
Subject: [PATCH 61/76] Refactor, report related endpoints now reside in
 individual files

---
 .../handlers/reports/GetUnsignedReports.go    |  45 ++++
 .../handlers/reports/GetWeeklyReport.go       |  47 ++++
 .../reports/GetWeeklyReportsUserHandler.go    |  36 +++
 .../internal/handlers/reports/SignReport.go   |  48 ++++
 .../handlers/reports/SubmitWeeklyReport.go    |  41 ++++
 .../handlers/reports/UpdateWeeklyReport.go    |  44 ++++
 .../reports/handlers_report_related.go        | 214 ------------------
 7 files changed, 261 insertions(+), 214 deletions(-)
 create mode 100644 backend/internal/handlers/reports/GetUnsignedReports.go
 create mode 100644 backend/internal/handlers/reports/GetWeeklyReport.go
 create mode 100644 backend/internal/handlers/reports/GetWeeklyReportsUserHandler.go
 create mode 100644 backend/internal/handlers/reports/SignReport.go
 create mode 100644 backend/internal/handlers/reports/SubmitWeeklyReport.go
 create mode 100644 backend/internal/handlers/reports/UpdateWeeklyReport.go
 delete mode 100644 backend/internal/handlers/reports/handlers_report_related.go

diff --git a/backend/internal/handlers/reports/GetUnsignedReports.go b/backend/internal/handlers/reports/GetUnsignedReports.go
new file mode 100644
index 0000000..9525f55
--- /dev/null
+++ b/backend/internal/handlers/reports/GetUnsignedReports.go
@@ -0,0 +1,45 @@
+package reports
+
+import (
+	db "ttime/internal/database"
+
+	"github.com/gofiber/fiber/v2"
+	"github.com/gofiber/fiber/v2/log"
+	"github.com/golang-jwt/jwt/v5"
+)
+
+func GetUnsignedReports(c *fiber.Ctx) error {
+	// Extract the necessary parameters from the token
+	user := c.Locals("user").(*jwt.Token)
+	claims := user.Claims.(jwt.MapClaims)
+	projectManagerUsername := claims["name"].(string)
+
+	// Extract project name and week from query parameters
+	projectName := c.Params("projectName")
+
+	log.Info("Getting unsigned reports for")
+
+	if projectName == "" {
+		log.Info("Missing project name")
+		return c.Status(400).SendString("Missing project name")
+	}
+
+	// Get the project manager's ID
+	isProjectManager, err := db.GetDb(c).IsProjectManager(projectManagerUsername, projectName)
+	if err != nil {
+		log.Info("Failed to get project manager ID")
+		return c.Status(500).SendString("Failed to get project manager ID")
+	}
+	log.Info("User is Project Manager: ", isProjectManager)
+
+	// Call the database function to get the unsigned weekly reports
+	reports, err := db.GetDb(c).GetUnsignedWeeklyReports(projectName)
+	if err != nil {
+		log.Info("Error getting unsigned weekly reports:", err)
+		return c.Status(500).SendString(err.Error())
+	}
+
+	log.Info("Returning unsigned reports")
+	// Return the list of unsigned reports
+	return c.JSON(reports)
+}
diff --git a/backend/internal/handlers/reports/GetWeeklyReport.go b/backend/internal/handlers/reports/GetWeeklyReport.go
new file mode 100644
index 0000000..422bc0b
--- /dev/null
+++ b/backend/internal/handlers/reports/GetWeeklyReport.go
@@ -0,0 +1,47 @@
+package reports
+
+import (
+	"strconv"
+	db "ttime/internal/database"
+
+	"github.com/gofiber/fiber/v2"
+	"github.com/gofiber/fiber/v2/log"
+	"github.com/golang-jwt/jwt/v5"
+)
+
+// Handler for retrieving weekly report
+func GetWeeklyReport(c *fiber.Ctx) error {
+	// Extract the necessary parameters from the request
+	user := c.Locals("user").(*jwt.Token)
+	claims := user.Claims.(jwt.MapClaims)
+	username := claims["name"].(string)
+
+	log.Info("Getting weekly report for: ", username)
+
+	// Extract project name and week from query parameters
+	projectName := c.Query("projectName")
+	week := c.Query("week")
+
+	if projectName == "" || week == "" {
+		log.Info("Missing project name or week number")
+		return c.Status(400).SendString("Missing project name or week number")
+	}
+
+	// Convert week to integer
+	weekInt, err := strconv.Atoi(week)
+	if err != nil {
+		log.Info("Invalid week number")
+		return c.Status(400).SendString("Invalid week number")
+	}
+
+	// Call the database function to get the weekly report
+	report, err := db.GetDb(c).GetWeeklyReport(username, projectName, weekInt)
+	if err != nil {
+		log.Info("Error getting weekly report from db:", err)
+		return c.Status(500).SendString(err.Error())
+	}
+
+	log.Info("Returning weekly report")
+	// Return the retrieved weekly report
+	return c.JSON(report)
+}
diff --git a/backend/internal/handlers/reports/GetWeeklyReportsUserHandler.go b/backend/internal/handlers/reports/GetWeeklyReportsUserHandler.go
new file mode 100644
index 0000000..da8a90b
--- /dev/null
+++ b/backend/internal/handlers/reports/GetWeeklyReportsUserHandler.go
@@ -0,0 +1,36 @@
+package reports
+
+import (
+	db "ttime/internal/database"
+
+	"github.com/gofiber/fiber/v2"
+	"github.com/gofiber/fiber/v2/log"
+	"github.com/golang-jwt/jwt/v5"
+)
+
+// GetWeeklyReportsUserHandler retrieves all weekly reports for a user in a specific project
+func GetWeeklyReportsUserHandler(c *fiber.Ctx) error {
+	// Extract the necessary parameters from the token
+	user := c.Locals("user").(*jwt.Token)
+	claims := user.Claims.(jwt.MapClaims)
+	username := claims["name"].(string)
+
+	// Extract necessary (path) parameters from the request
+	projectName := c.Params("projectName")
+
+	// TODO: Here we need to check whether the user is a member of the project
+	// If not, we should return an error. On the other hand, if the user not a member,
+	// the returned list of reports will (should) allways be empty.
+
+	// Retrieve weekly reports for the user in the project from the database
+	reports, err := db.GetDb(c).GetWeeklyReportsUser(username, projectName)
+	if err != nil {
+		log.Error("Error getting weekly reports for user:", username, "in project:", projectName, ":", err)
+		return c.Status(500).SendString(err.Error())
+	}
+
+	log.Info("Returning weekly reports for user:", username, "in project:", projectName)
+
+	// Return the list of reports as JSON
+	return c.JSON(reports)
+}
diff --git a/backend/internal/handlers/reports/SignReport.go b/backend/internal/handlers/reports/SignReport.go
new file mode 100644
index 0000000..5769caf
--- /dev/null
+++ b/backend/internal/handlers/reports/SignReport.go
@@ -0,0 +1,48 @@
+package reports
+
+import (
+	db "ttime/internal/database"
+
+	"github.com/gofiber/fiber/v2"
+	"github.com/gofiber/fiber/v2/log"
+	"github.com/golang-jwt/jwt/v5"
+)
+
+// TODO: This information should be extracted from path parameters
+type ReportId struct {
+	ReportId int
+}
+
+func SignReport(c *fiber.Ctx) error {
+	// Extract the necessary parameters from the token
+	user := c.Locals("user").(*jwt.Token)
+	claims := user.Claims.(jwt.MapClaims)
+	projectManagerUsername := claims["name"].(string)
+
+	log.Info("Signing report for: ", projectManagerUsername)
+
+	// Extract report ID from the request query parameters
+	// reportID := c.Query("reportId")
+	rid := new(ReportId)
+	if err := c.BodyParser(rid); err != nil {
+		return err
+	}
+	log.Info("Signing report for: ", rid.ReportId)
+
+	// Get the project manager's ID
+	projectManagerID, err := db.GetDb(c).GetUserId(projectManagerUsername)
+	if err != nil {
+		log.Info("Failed to get project manager ID")
+		return c.Status(500).SendString("Failed to get project manager ID")
+	}
+	log.Info("Project manager ID: ", projectManagerID)
+
+	// Call the database function to sign the weekly report
+	err = db.GetDb(c).SignWeeklyReport(rid.ReportId, projectManagerID)
+	if err != nil {
+		log.Info("Error signing weekly report:", err)
+		return c.Status(500).SendString(err.Error())
+	}
+
+	return c.Status(200).SendString("Weekly report signed successfully")
+}
diff --git a/backend/internal/handlers/reports/SubmitWeeklyReport.go b/backend/internal/handlers/reports/SubmitWeeklyReport.go
new file mode 100644
index 0000000..900aa03
--- /dev/null
+++ b/backend/internal/handlers/reports/SubmitWeeklyReport.go
@@ -0,0 +1,41 @@
+package reports
+
+import (
+	db "ttime/internal/database"
+	"ttime/internal/types"
+
+	"github.com/gofiber/fiber/v2"
+	"github.com/gofiber/fiber/v2/log"
+	"github.com/golang-jwt/jwt/v5"
+)
+
+func SubmitWeeklyReport(c *fiber.Ctx) error {
+	// Extract the necessary parameters from the token
+	user := c.Locals("user").(*jwt.Token)
+	claims := user.Claims.(jwt.MapClaims)
+	username := claims["name"].(string)
+
+	report := new(types.NewWeeklyReport)
+	if err := c.BodyParser(report); err != nil {
+		log.Info("Error parsing weekly report")
+		return c.Status(400).SendString(err.Error())
+	}
+
+	// Make sure all the fields of the report are valid
+	if report.Week < 1 || report.Week > 52 {
+		log.Info("Invalid week number")
+		return c.Status(400).SendString("Invalid week number")
+	}
+	if report.DevelopmentTime < 0 || report.MeetingTime < 0 || report.AdminTime < 0 || report.OwnWorkTime < 0 || report.StudyTime < 0 || report.TestingTime < 0 {
+		log.Info("Invalid time report")
+		return c.Status(400).SendString("Invalid time report")
+	}
+
+	if err := db.GetDb(c).AddWeeklyReport(report.ProjectName, username, report.Week, report.DevelopmentTime, report.MeetingTime, report.AdminTime, report.OwnWorkTime, report.StudyTime, report.TestingTime); err != nil {
+		log.Info("Error adding weekly report to db:", err)
+		return c.Status(500).SendString(err.Error())
+	}
+
+	log.Info("Weekly report added")
+	return c.Status(200).SendString("Time report added")
+}
diff --git a/backend/internal/handlers/reports/UpdateWeeklyReport.go b/backend/internal/handlers/reports/UpdateWeeklyReport.go
new file mode 100644
index 0000000..3ab835d
--- /dev/null
+++ b/backend/internal/handlers/reports/UpdateWeeklyReport.go
@@ -0,0 +1,44 @@
+package reports
+
+import (
+	db "ttime/internal/database"
+	"ttime/internal/types"
+
+	"github.com/gofiber/fiber/v2"
+	"github.com/gofiber/fiber/v2/log"
+	"github.com/golang-jwt/jwt/v5"
+)
+
+func UpdateWeeklyReport(c *fiber.Ctx) error {
+	// Extract the necessary parameters from the token
+	user := c.Locals("user").(*jwt.Token)
+	claims := user.Claims.(jwt.MapClaims)
+	username := claims["name"].(string)
+
+	// Parse the request body into an UpdateWeeklyReport struct
+	var updateReport types.UpdateWeeklyReport
+	if err := c.BodyParser(&updateReport); err != nil {
+		log.Info("Error parsing weekly report")
+		return c.Status(400).SendString(err.Error())
+	}
+
+	// Make sure all the fields of the report are valid
+	if updateReport.Week < 1 || updateReport.Week > 52 {
+		log.Info("Invalid week number")
+		return c.Status(400).SendString("Invalid week number")
+	}
+
+	if updateReport.DevelopmentTime < 0 || updateReport.MeetingTime < 0 || updateReport.AdminTime < 0 || updateReport.OwnWorkTime < 0 || updateReport.StudyTime < 0 || updateReport.TestingTime < 0 {
+		log.Info("Invalid time report")
+		return c.Status(400).SendString("Invalid time report")
+	}
+
+	// Update the weekly report in the database
+	if err := db.GetDb(c).UpdateWeeklyReport(updateReport.ProjectName, username, updateReport.Week, updateReport.DevelopmentTime, updateReport.MeetingTime, updateReport.AdminTime, updateReport.OwnWorkTime, updateReport.StudyTime, updateReport.TestingTime); err != nil {
+		log.Info("Error updating weekly report in db:", err)
+		return c.Status(500).SendString(err.Error())
+	}
+
+	log.Info("Weekly report updated")
+	return c.Status(200).SendString("Weekly report updated")
+}
diff --git a/backend/internal/handlers/reports/handlers_report_related.go b/backend/internal/handlers/reports/handlers_report_related.go
deleted file mode 100644
index 1c84d52..0000000
--- a/backend/internal/handlers/reports/handlers_report_related.go
+++ /dev/null
@@ -1,214 +0,0 @@
-package reports
-
-import (
-	"strconv"
-	db "ttime/internal/database"
-	"ttime/internal/types"
-
-	"github.com/gofiber/fiber/v2"
-	"github.com/gofiber/fiber/v2/log"
-	"github.com/golang-jwt/jwt/v5"
-)
-
-func SubmitWeeklyReport(c *fiber.Ctx) error {
-	// Extract the necessary parameters from the token
-	user := c.Locals("user").(*jwt.Token)
-	claims := user.Claims.(jwt.MapClaims)
-	username := claims["name"].(string)
-
-	report := new(types.NewWeeklyReport)
-	if err := c.BodyParser(report); err != nil {
-		log.Info("Error parsing weekly report")
-		return c.Status(400).SendString(err.Error())
-	}
-
-	// Make sure all the fields of the report are valid
-	if report.Week < 1 || report.Week > 52 {
-		log.Info("Invalid week number")
-		return c.Status(400).SendString("Invalid week number")
-	}
-	if report.DevelopmentTime < 0 || report.MeetingTime < 0 || report.AdminTime < 0 || report.OwnWorkTime < 0 || report.StudyTime < 0 || report.TestingTime < 0 {
-		log.Info("Invalid time report")
-		return c.Status(400).SendString("Invalid time report")
-	}
-
-	if err := db.GetDb(c).AddWeeklyReport(report.ProjectName, username, report.Week, report.DevelopmentTime, report.MeetingTime, report.AdminTime, report.OwnWorkTime, report.StudyTime, report.TestingTime); err != nil {
-		log.Info("Error adding weekly report to db:", err)
-		return c.Status(500).SendString(err.Error())
-	}
-
-	log.Info("Weekly report added")
-	return c.Status(200).SendString("Time report added")
-}
-
-// Handler for retrieving weekly report
-func GetWeeklyReport(c *fiber.Ctx) error {
-	// Extract the necessary parameters from the request
-	user := c.Locals("user").(*jwt.Token)
-	claims := user.Claims.(jwt.MapClaims)
-	username := claims["name"].(string)
-
-	log.Info("Getting weekly report for: ", username)
-
-	// Extract project name and week from query parameters
-	projectName := c.Query("projectName")
-	week := c.Query("week")
-
-	if projectName == "" || week == "" {
-		log.Info("Missing project name or week number")
-		return c.Status(400).SendString("Missing project name or week number")
-	}
-
-	// Convert week to integer
-	weekInt, err := strconv.Atoi(week)
-	if err != nil {
-		log.Info("Invalid week number")
-		return c.Status(400).SendString("Invalid week number")
-	}
-
-	// Call the database function to get the weekly report
-	report, err := db.GetDb(c).GetWeeklyReport(username, projectName, weekInt)
-	if err != nil {
-		log.Info("Error getting weekly report from db:", err)
-		return c.Status(500).SendString(err.Error())
-	}
-
-	log.Info("Returning weekly report")
-	// Return the retrieved weekly report
-	return c.JSON(report)
-}
-
-type ReportId struct {
-	ReportId int
-}
-
-func SignReport(c *fiber.Ctx) error {
-	// Extract the necessary parameters from the token
-	user := c.Locals("user").(*jwt.Token)
-	claims := user.Claims.(jwt.MapClaims)
-	projectManagerUsername := claims["name"].(string)
-
-	log.Info("Signing report for: ", projectManagerUsername)
-
-	// Extract report ID from the request query parameters
-	// reportID := c.Query("reportId")
-	rid := new(ReportId)
-	if err := c.BodyParser(rid); err != nil {
-		return err
-	}
-	log.Info("Signing report for: ", rid.ReportId)
-
-	// Get the project manager's ID
-	projectManagerID, err := db.GetDb(c).GetUserId(projectManagerUsername)
-	if err != nil {
-		log.Info("Failed to get project manager ID")
-		return c.Status(500).SendString("Failed to get project manager ID")
-	}
-	log.Info("Project manager ID: ", projectManagerID)
-
-	// Call the database function to sign the weekly report
-	err = db.GetDb(c).SignWeeklyReport(rid.ReportId, projectManagerID)
-	if err != nil {
-		log.Info("Error signing weekly report:", err)
-		return c.Status(500).SendString(err.Error())
-	}
-
-	return c.Status(200).SendString("Weekly report signed successfully")
-}
-
-func GetUnsignedReports(c *fiber.Ctx) error {
-	// Extract the necessary parameters from the token
-	user := c.Locals("user").(*jwt.Token)
-	claims := user.Claims.(jwt.MapClaims)
-	projectManagerUsername := claims["name"].(string)
-
-	// Extract project name and week from query parameters
-	projectName := c.Params("projectName")
-
-	log.Info("Getting unsigned reports for")
-
-	if projectName == "" {
-		log.Info("Missing project name")
-		return c.Status(400).SendString("Missing project name")
-	}
-
-	// Get the project manager's ID
-	isProjectManager, err := db.GetDb(c).IsProjectManager(projectManagerUsername, projectName)
-	if err != nil {
-		log.Info("Failed to get project manager ID")
-		return c.Status(500).SendString("Failed to get project manager ID")
-	}
-	log.Info("User is Project Manager: ", isProjectManager)
-
-	// Call the database function to get the unsigned weekly reports
-	reports, err := db.GetDb(c).GetUnsignedWeeklyReports(projectName)
-	if err != nil {
-		log.Info("Error getting unsigned weekly reports:", err)
-		return c.Status(500).SendString(err.Error())
-	}
-
-	log.Info("Returning unsigned reports")
-	// Return the list of unsigned reports
-	return c.JSON(reports)
-}
-
-// GetWeeklyReportsUserHandler retrieves all weekly reports for a user in a specific project
-func GetWeeklyReportsUserHandler(c *fiber.Ctx) error {
-	// Extract the necessary parameters from the token
-	user := c.Locals("user").(*jwt.Token)
-	claims := user.Claims.(jwt.MapClaims)
-	username := claims["name"].(string)
-
-	// Extract necessary (path) parameters from the request
-	projectName := c.Params("projectName")
-
-	// TODO: Here we need to check whether the user is a member of the project
-	// If not, we should return an error. On the other hand, if the user not a member,
-	// the returned list of reports will (should) allways be empty.
-
-	// Retrieve weekly reports for the user in the project from the database
-	reports, err := db.GetDb(c).GetWeeklyReportsUser(username, projectName)
-	if err != nil {
-		log.Error("Error getting weekly reports for user:", username, "in project:", projectName, ":", err)
-		return c.Status(500).SendString(err.Error())
-	}
-
-	log.Info("Returning weekly reports for user:", username, "in project:", projectName)
-
-	// Return the list of reports as JSON
-	return c.JSON(reports)
-}
-
-func UpdateWeeklyReport(c *fiber.Ctx) error {
-	// Extract the necessary parameters from the token
-	user := c.Locals("user").(*jwt.Token)
-	claims := user.Claims.(jwt.MapClaims)
-	username := claims["name"].(string)
-
-	// Parse the request body into an UpdateWeeklyReport struct
-	var updateReport types.UpdateWeeklyReport
-	if err := c.BodyParser(&updateReport); err != nil {
-		log.Info("Error parsing weekly report")
-		return c.Status(400).SendString(err.Error())
-	}
-
-	// Make sure all the fields of the report are valid
-	if updateReport.Week < 1 || updateReport.Week > 52 {
-		log.Info("Invalid week number")
-		return c.Status(400).SendString("Invalid week number")
-	}
-
-	if updateReport.DevelopmentTime < 0 || updateReport.MeetingTime < 0 || updateReport.AdminTime < 0 || updateReport.OwnWorkTime < 0 || updateReport.StudyTime < 0 || updateReport.TestingTime < 0 {
-		log.Info("Invalid time report")
-		return c.Status(400).SendString("Invalid time report")
-	}
-
-	// Update the weekly report in the database
-	if err := db.GetDb(c).UpdateWeeklyReport(updateReport.ProjectName, username, updateReport.Week, updateReport.DevelopmentTime, updateReport.MeetingTime, updateReport.AdminTime, updateReport.OwnWorkTime, updateReport.StudyTime, updateReport.TestingTime); err != nil {
-		log.Info("Error updating weekly report in db:", err)
-		return c.Status(500).SendString(err.Error())
-	}
-
-	log.Info("Weekly report updated")
-	return c.Status(200).SendString("Weekly report updated")
-}

From b927fb80fb7aa08b68bcccb8c1ca4fe474a7e905 Mon Sep 17 00:00:00 2001
From: Imbus <>
Date: Fri, 29 Mar 2024 15:00:29 +0100
Subject: [PATCH 62/76] Refactor again, splitting project related handlers

---
 .../handlers/projects/AddUserToProject.go     |  51 +++
 .../handlers/projects/CreateProject.go        |  30 ++
 .../handlers/projects/DeleteProject.go        |  19 ++
 .../internal/handlers/projects/GetProject.go  |  38 +++
 .../handlers/projects/GetProjectTimes.go      |  63 ++++
 .../handlers/projects/GetUserProject.go       |  25 ++
 .../handlers/projects/IsProjectManager.go     |  32 ++
 .../handlers/projects/ListAllUserProjects.go  |  55 +++
 .../handlers/projects/ProjectRoleChange.go    |  45 +++
 .../handlers/projects/RemoveProject.go        |  35 ++
 .../projects/handlers_project_related.go      | 316 ------------------
 11 files changed, 393 insertions(+), 316 deletions(-)
 create mode 100644 backend/internal/handlers/projects/AddUserToProject.go
 create mode 100644 backend/internal/handlers/projects/CreateProject.go
 create mode 100644 backend/internal/handlers/projects/DeleteProject.go
 create mode 100644 backend/internal/handlers/projects/GetProject.go
 create mode 100644 backend/internal/handlers/projects/GetProjectTimes.go
 create mode 100644 backend/internal/handlers/projects/GetUserProject.go
 create mode 100644 backend/internal/handlers/projects/IsProjectManager.go
 create mode 100644 backend/internal/handlers/projects/ListAllUserProjects.go
 create mode 100644 backend/internal/handlers/projects/ProjectRoleChange.go
 create mode 100644 backend/internal/handlers/projects/RemoveProject.go
 delete mode 100644 backend/internal/handlers/projects/handlers_project_related.go

diff --git a/backend/internal/handlers/projects/AddUserToProject.go b/backend/internal/handlers/projects/AddUserToProject.go
new file mode 100644
index 0000000..702b7dd
--- /dev/null
+++ b/backend/internal/handlers/projects/AddUserToProject.go
@@ -0,0 +1,51 @@
+package projects
+
+import (
+	db "ttime/internal/database"
+
+	"github.com/gofiber/fiber/v2"
+	"github.com/gofiber/fiber/v2/log"
+	"github.com/golang-jwt/jwt/v5"
+)
+
+// AddUserToProjectHandler is a handler that adds a user to a project with a specified role
+func AddUserToProjectHandler(c *fiber.Ctx) error {
+	// Extract necessary parameters from the request
+	var requestData struct {
+		Username    string `json:"username"`
+		ProjectName string `json:"projectName"`
+		Role        string `json:"role"`
+	}
+	if err := c.BodyParser(&requestData); err != nil {
+		log.Info("Error parsing request body:", err)
+		return c.Status(400).SendString("Bad request")
+	}
+
+	// Check if the user adding another user to the project is a site admin
+	user := c.Locals("user").(*jwt.Token)
+	claims := user.Claims.(jwt.MapClaims)
+	adminUsername := claims["name"].(string)
+	log.Info("Admin username from claims:", adminUsername)
+
+	isAdmin, err := db.GetDb(c).IsSiteAdmin(adminUsername)
+	if err != nil {
+		log.Info("Error checking admin status:", err)
+		return c.Status(500).SendString(err.Error())
+	}
+
+	if !isAdmin {
+		log.Info("User is not a site admin:", adminUsername)
+		return c.Status(403).SendString("User is not a site admin")
+	}
+
+	// Add the user to the project with the specified role
+	err = db.GetDb(c).AddUserToProject(requestData.Username, requestData.ProjectName, requestData.Role)
+	if err != nil {
+		log.Info("Error adding user to project:", err)
+		return c.Status(500).SendString(err.Error())
+	}
+
+	// Return success message
+	log.Info("User added to project successfully:", requestData.Username)
+	return c.SendStatus(fiber.StatusOK)
+}
diff --git a/backend/internal/handlers/projects/CreateProject.go b/backend/internal/handlers/projects/CreateProject.go
new file mode 100644
index 0000000..cef2f2b
--- /dev/null
+++ b/backend/internal/handlers/projects/CreateProject.go
@@ -0,0 +1,30 @@
+package projects
+
+import (
+	db "ttime/internal/database"
+	"ttime/internal/types"
+
+	"github.com/gofiber/fiber/v2"
+	"github.com/golang-jwt/jwt/v5"
+)
+
+// CreateProject is a simple handler that creates a new project
+func CreateProject(c *fiber.Ctx) error {
+	user := c.Locals("user").(*jwt.Token)
+
+	p := new(types.NewProject)
+	if err := c.BodyParser(p); err != nil {
+		return c.Status(400).SendString(err.Error())
+	}
+
+	// Get the username from the token and set it as the owner of the project
+	// This is ugly but
+	claims := user.Claims.(jwt.MapClaims)
+	owner := claims["name"].(string)
+
+	if err := db.GetDb(c).AddProject(p.Name, p.Description, owner); err != nil {
+		return c.Status(500).SendString(err.Error())
+	}
+
+	return c.Status(200).SendString("Project added")
+}
diff --git a/backend/internal/handlers/projects/DeleteProject.go b/backend/internal/handlers/projects/DeleteProject.go
new file mode 100644
index 0000000..415424a
--- /dev/null
+++ b/backend/internal/handlers/projects/DeleteProject.go
@@ -0,0 +1,19 @@
+package projects
+
+import (
+	db "ttime/internal/database"
+
+	"github.com/gofiber/fiber/v2"
+)
+
+func DeleteProject(c *fiber.Ctx) error {
+
+	projectID := c.Params("projectID")
+	username := c.Params("username")
+
+	if err := db.GetDb(c).DeleteProject(projectID, username); err != nil {
+		return c.Status(500).SendString((err.Error()))
+	}
+
+	return c.Status(200).SendString("Project deleted")
+}
diff --git a/backend/internal/handlers/projects/GetProject.go b/backend/internal/handlers/projects/GetProject.go
new file mode 100644
index 0000000..03333ce
--- /dev/null
+++ b/backend/internal/handlers/projects/GetProject.go
@@ -0,0 +1,38 @@
+package projects
+
+import (
+	"strconv"
+	db "ttime/internal/database"
+
+	"github.com/gofiber/fiber/v2"
+	"github.com/gofiber/fiber/v2/log"
+)
+
+// GetProject retrieves a specific project by its ID
+func GetProject(c *fiber.Ctx) error {
+	// Extract the project ID from the request parameters or body
+	projectID := c.Params("projectID")
+	if projectID == "" {
+		log.Info("No project ID provided")
+		return c.Status(400).SendString("No project ID provided")
+	}
+	log.Info("Getting project with ID: ", projectID)
+
+	// Parse the project ID into an integer
+	projectIDInt, err := strconv.Atoi(projectID)
+	if err != nil {
+		log.Info("Invalid project ID")
+		return c.Status(400).SendString("Invalid project ID")
+	}
+
+	// Get the project from the database by its ID
+	project, err := db.GetDb(c).GetProject(projectIDInt)
+	if err != nil {
+		log.Info("Error getting project:", err)
+		return c.Status(500).SendString(err.Error())
+	}
+
+	// Return the project as JSON
+	log.Info("Returning project: ", project.Name)
+	return c.JSON(project)
+}
diff --git a/backend/internal/handlers/projects/GetProjectTimes.go b/backend/internal/handlers/projects/GetProjectTimes.go
new file mode 100644
index 0000000..573a95e
--- /dev/null
+++ b/backend/internal/handlers/projects/GetProjectTimes.go
@@ -0,0 +1,63 @@
+package projects
+
+import (
+	db "ttime/internal/database"
+
+	"github.com/gofiber/fiber/v2"
+	"github.com/gofiber/fiber/v2/log"
+	"github.com/golang-jwt/jwt/v5"
+)
+
+func GetProjectTimesHandler(c *fiber.Ctx) error {
+	// Get the username from the token
+	user := c.Locals("user").(*jwt.Token)
+	claims := user.Claims.(jwt.MapClaims)
+	username := claims["name"].(string)
+
+	// Get project
+	projectName := c.Params("projectName")
+	if projectName == "" {
+		log.Info("No project name provided")
+		return c.Status(400).SendString("No project name provided")
+	}
+
+	// Get all users in the project and roles
+	userProjects, err := db.GetDb(c).GetAllUsersProject(projectName)
+	if err != nil {
+		log.Info("Error getting users in project:", err)
+		return c.Status(500).SendString(err.Error())
+	}
+
+	// If the user is member
+	isMember := false
+	for _, userProject := range userProjects {
+		if userProject.Username == username {
+			isMember = true
+			break
+		}
+	}
+
+	// If the user is admin
+	if !isMember {
+		isAdmin, err := db.GetDb(c).IsSiteAdmin(username)
+		if err != nil {
+			log.Info("Error checking admin status:", err)
+			return c.Status(500).SendString(err.Error())
+		}
+		if !isAdmin {
+			log.Info("User is neither a project member nor a site admin:", username)
+			return c.Status(403).SendString("User is neither a project member nor a site admin")
+		}
+	}
+
+	// Get project times
+	projectTimes, err := db.GetDb(c).GetProjectTimes(projectName)
+	if err != nil {
+		log.Info("Error getting project times:", err)
+		return c.Status(500).SendString(err.Error())
+	}
+
+	// Return project times as JSON
+	log.Info("Returning project times for project:", projectName)
+	return c.JSON(projectTimes)
+}
diff --git a/backend/internal/handlers/projects/GetUserProject.go b/backend/internal/handlers/projects/GetUserProject.go
new file mode 100644
index 0000000..99ed63b
--- /dev/null
+++ b/backend/internal/handlers/projects/GetUserProject.go
@@ -0,0 +1,25 @@
+package projects
+
+import (
+	db "ttime/internal/database"
+
+	"github.com/gofiber/fiber/v2"
+	"github.com/golang-jwt/jwt/v5"
+)
+
+// GetUserProjects returns all projects that the user is a member of
+func GetUserProjects(c *fiber.Ctx) error {
+	// First we get the username from the token
+	user := c.Locals("user").(*jwt.Token)
+	claims := user.Claims.(jwt.MapClaims)
+	username := claims["name"].(string)
+
+	// Then dip into the database to get the projects
+	projects, err := db.GetDb(c).GetProjectsForUser(username)
+	if err != nil {
+		return c.Status(500).SendString(err.Error())
+	}
+
+	// Return a json serialized list of projects
+	return c.JSON(projects)
+}
diff --git a/backend/internal/handlers/projects/IsProjectManager.go b/backend/internal/handlers/projects/IsProjectManager.go
new file mode 100644
index 0000000..678fad5
--- /dev/null
+++ b/backend/internal/handlers/projects/IsProjectManager.go
@@ -0,0 +1,32 @@
+package projects
+
+import (
+	db "ttime/internal/database"
+
+	"github.com/gofiber/fiber/v2"
+	"github.com/gofiber/fiber/v2/log"
+	"github.com/golang-jwt/jwt/v5"
+)
+
+// IsProjectManagerHandler is a handler that checks if a user is a project manager for a given project
+func IsProjectManagerHandler(c *fiber.Ctx) error {
+	// Get the username from the token
+	user := c.Locals("user").(*jwt.Token)
+	claims := user.Claims.(jwt.MapClaims)
+	username := claims["name"].(string)
+
+	// Extract necessary parameters from the request query string
+	projectName := c.Params("projectName")
+
+	log.Info("Checking if user ", username, " is a project manager for project ", projectName)
+
+	// Check if the user is a project manager for the specified project
+	isManager, err := db.GetDb(c).IsProjectManager(username, projectName)
+	if err != nil {
+		log.Info("Error checking project manager status:", err)
+		return c.Status(500).SendString(err.Error())
+	}
+
+	// Return the result as JSON
+	return c.JSON(fiber.Map{"isProjectManager": isManager})
+}
diff --git a/backend/internal/handlers/projects/ListAllUserProjects.go b/backend/internal/handlers/projects/ListAllUserProjects.go
new file mode 100644
index 0000000..e0bcaf5
--- /dev/null
+++ b/backend/internal/handlers/projects/ListAllUserProjects.go
@@ -0,0 +1,55 @@
+package projects
+
+import (
+	db "ttime/internal/database"
+
+	"github.com/gofiber/fiber/v2"
+	"github.com/gofiber/fiber/v2/log"
+	"github.com/golang-jwt/jwt/v5"
+)
+
+func ListAllUsersProject(c *fiber.Ctx) error {
+	// Extract the project name from the request parameters or body
+	projectName := c.Params("projectName")
+	if projectName == "" {
+		log.Info("No project name provided")
+		return c.Status(400).SendString("No project name provided")
+	}
+
+	// Get the user token
+	userToken := c.Locals("user").(*jwt.Token)
+	claims := userToken.Claims.(jwt.MapClaims)
+	username := claims["name"].(string)
+
+	// Check if the user is a project manager for the specified project
+	isManager, err := db.GetDb(c).IsProjectManager(username, projectName)
+	if err != nil {
+		log.Info("Error checking project manager status:", err)
+		return c.Status(500).SendString(err.Error())
+	}
+
+	// If the user is not a project manager, check if the user is a site admin
+	if !isManager {
+		isAdmin, err := db.GetDb(c).IsSiteAdmin(username)
+		if err != nil {
+			log.Info("Error checking admin status:", err)
+			return c.Status(500).SendString(err.Error())
+		}
+		if !isAdmin {
+			log.Info("User is neither a project manager nor a site admin:", username)
+			return c.Status(403).SendString("User is neither a project manager nor a site admin")
+		}
+	}
+
+	// Get all users associated with the project from the database
+	users, err := db.GetDb(c).GetAllUsersProject(projectName)
+	if err != nil {
+		log.Info("Error getting users for project:", err)
+		return c.Status(500).SendString(err.Error())
+	}
+
+	log.Info("Returning users for project: ", projectName)
+
+	// Return the list of users as JSON
+	return c.JSON(users)
+}
diff --git a/backend/internal/handlers/projects/ProjectRoleChange.go b/backend/internal/handlers/projects/ProjectRoleChange.go
new file mode 100644
index 0000000..266127d
--- /dev/null
+++ b/backend/internal/handlers/projects/ProjectRoleChange.go
@@ -0,0 +1,45 @@
+package projects
+
+import (
+	db "ttime/internal/database"
+	"ttime/internal/types"
+
+	"github.com/gofiber/fiber/v2"
+	"github.com/gofiber/fiber/v2/log"
+	"github.com/golang-jwt/jwt/v5"
+)
+
+// ProjectRoleChange is a handler that changes a user's role within a project
+func ProjectRoleChange(c *fiber.Ctx) error {
+
+	//check token and get username of current user
+	user := c.Locals("user").(*jwt.Token)
+	claims := user.Claims.(jwt.MapClaims)
+	username := claims["name"].(string)
+
+	// Extract the necessary parameters from the request
+	data := new(types.RoleChange)
+	if err := c.BodyParser(data); err != nil {
+		log.Info("error parsing username, project or role")
+		return c.Status(400).SendString(err.Error())
+	}
+
+	log.Info("Changing role for user: ", username, " in project: ", data.Projectname, " to: ", data.Role)
+
+	// Dubble diping and checcking if current user is
+	if ismanager, err := db.GetDb(c).IsProjectManager(username, data.Projectname); err != nil {
+		log.Warn("Error checking if projectmanager:", err)
+		return c.Status(500).SendString(err.Error())
+	} else if !ismanager {
+		log.Warn("User is not projectmanager")
+		return c.Status(401).SendString("User is not projectmanager")
+	}
+
+	// Change the user's role within the project in the database
+	if err := db.GetDb(c).ChangeUserRole(username, data.Projectname, data.Role); err != nil {
+		return c.Status(500).SendString(err.Error())
+	}
+
+	// Return a success message
+	return c.SendStatus(fiber.StatusOK)
+}
diff --git a/backend/internal/handlers/projects/RemoveProject.go b/backend/internal/handlers/projects/RemoveProject.go
new file mode 100644
index 0000000..7b140dd
--- /dev/null
+++ b/backend/internal/handlers/projects/RemoveProject.go
@@ -0,0 +1,35 @@
+package projects
+
+import (
+	db "ttime/internal/database"
+
+	"github.com/gofiber/fiber/v2"
+	"github.com/gofiber/fiber/v2/log"
+	"github.com/golang-jwt/jwt/v5"
+)
+
+func RemoveProject(c *fiber.Ctx) error {
+	user := c.Locals("user").(*jwt.Token)
+	claims := user.Claims.(jwt.MapClaims)
+	username := claims["name"].(string)
+
+	// Check if the user is a site admin
+	isAdmin, err := db.GetDb(c).IsSiteAdmin(username)
+	if err != nil {
+		log.Info("Error checking admin status:", err)
+		return c.Status(500).SendString(err.Error())
+	}
+
+	if !isAdmin {
+		log.Info("User is not a site admin:", username)
+		return c.Status(403).SendString("User is not a site admin")
+	}
+
+	projectName := c.Params("projectName")
+
+	if err := db.GetDb(c).RemoveProject(projectName); err != nil {
+		return c.Status(500).SendString((err.Error()))
+	}
+
+	return c.Status(200).SendString("Project deleted")
+}
diff --git a/backend/internal/handlers/projects/handlers_project_related.go b/backend/internal/handlers/projects/handlers_project_related.go
deleted file mode 100644
index 3429504..0000000
--- a/backend/internal/handlers/projects/handlers_project_related.go
+++ /dev/null
@@ -1,316 +0,0 @@
-package projects
-
-import (
-	"strconv"
-	db "ttime/internal/database"
-	"ttime/internal/types"
-
-	"github.com/gofiber/fiber/v2"
-	"github.com/gofiber/fiber/v2/log"
-	"github.com/golang-jwt/jwt/v5"
-)
-
-// CreateProject is a simple handler that creates a new project
-func CreateProject(c *fiber.Ctx) error {
-	user := c.Locals("user").(*jwt.Token)
-
-	p := new(types.NewProject)
-	if err := c.BodyParser(p); err != nil {
-		return c.Status(400).SendString(err.Error())
-	}
-
-	// Get the username from the token and set it as the owner of the project
-	// This is ugly but
-	claims := user.Claims.(jwt.MapClaims)
-	owner := claims["name"].(string)
-
-	if err := db.GetDb(c).AddProject(p.Name, p.Description, owner); err != nil {
-		return c.Status(500).SendString(err.Error())
-	}
-
-	return c.Status(200).SendString("Project added")
-}
-
-func DeleteProject(c *fiber.Ctx) error {
-
-	projectID := c.Params("projectID")
-	username := c.Params("username")
-
-	if err := db.GetDb(c).DeleteProject(projectID, username); err != nil {
-		return c.Status(500).SendString((err.Error()))
-	}
-
-	return c.Status(200).SendString("Project deleted")
-}
-
-// GetUserProjects returns all projects that the user is a member of
-func GetUserProjects(c *fiber.Ctx) error {
-	// First we get the username from the token
-	user := c.Locals("user").(*jwt.Token)
-	claims := user.Claims.(jwt.MapClaims)
-	username := claims["name"].(string)
-
-	// Then dip into the database to get the projects
-	projects, err := db.GetDb(c).GetProjectsForUser(username)
-	if err != nil {
-		return c.Status(500).SendString(err.Error())
-	}
-
-	// Return a json serialized list of projects
-	return c.JSON(projects)
-}
-
-// ProjectRoleChange is a handler that changes a user's role within a project
-func ProjectRoleChange(c *fiber.Ctx) error {
-
-	//check token and get username of current user
-	user := c.Locals("user").(*jwt.Token)
-	claims := user.Claims.(jwt.MapClaims)
-	username := claims["name"].(string)
-
-	// Extract the necessary parameters from the request
-	data := new(types.RoleChange)
-	if err := c.BodyParser(data); err != nil {
-		log.Info("error parsing username, project or role")
-		return c.Status(400).SendString(err.Error())
-	}
-
-	log.Info("Changing role for user: ", username, " in project: ", data.Projectname, " to: ", data.Role)
-
-	// Dubble diping and checcking if current user is
-	if ismanager, err := db.GetDb(c).IsProjectManager(username, data.Projectname); err != nil {
-		log.Warn("Error checking if projectmanager:", err)
-		return c.Status(500).SendString(err.Error())
-	} else if !ismanager {
-		log.Warn("User is not projectmanager")
-		return c.Status(401).SendString("User is not projectmanager")
-	}
-
-	// Change the user's role within the project in the database
-	if err := db.GetDb(c).ChangeUserRole(username, data.Projectname, data.Role); err != nil {
-		return c.Status(500).SendString(err.Error())
-	}
-
-	// Return a success message
-	return c.SendStatus(fiber.StatusOK)
-}
-
-// GetProject retrieves a specific project by its ID
-func GetProject(c *fiber.Ctx) error {
-	// Extract the project ID from the request parameters or body
-	projectID := c.Params("projectID")
-	if projectID == "" {
-		log.Info("No project ID provided")
-		return c.Status(400).SendString("No project ID provided")
-	}
-	log.Info("Getting project with ID: ", projectID)
-
-	// Parse the project ID into an integer
-	projectIDInt, err := strconv.Atoi(projectID)
-	if err != nil {
-		log.Info("Invalid project ID")
-		return c.Status(400).SendString("Invalid project ID")
-	}
-
-	// Get the project from the database by its ID
-	project, err := db.GetDb(c).GetProject(projectIDInt)
-	if err != nil {
-		log.Info("Error getting project:", err)
-		return c.Status(500).SendString(err.Error())
-	}
-
-	// Return the project as JSON
-	log.Info("Returning project: ", project.Name)
-	return c.JSON(project)
-}
-
-func ListAllUsersProject(c *fiber.Ctx) error {
-	// Extract the project name from the request parameters or body
-	projectName := c.Params("projectName")
-	if projectName == "" {
-		log.Info("No project name provided")
-		return c.Status(400).SendString("No project name provided")
-	}
-
-	// Get the user token
-	userToken := c.Locals("user").(*jwt.Token)
-	claims := userToken.Claims.(jwt.MapClaims)
-	username := claims["name"].(string)
-
-	// Check if the user is a project manager for the specified project
-	isManager, err := db.GetDb(c).IsProjectManager(username, projectName)
-	if err != nil {
-		log.Info("Error checking project manager status:", err)
-		return c.Status(500).SendString(err.Error())
-	}
-
-	// If the user is not a project manager, check if the user is a site admin
-	if !isManager {
-		isAdmin, err := db.GetDb(c).IsSiteAdmin(username)
-		if err != nil {
-			log.Info("Error checking admin status:", err)
-			return c.Status(500).SendString(err.Error())
-		}
-		if !isAdmin {
-			log.Info("User is neither a project manager nor a site admin:", username)
-			return c.Status(403).SendString("User is neither a project manager nor a site admin")
-		}
-	}
-
-	// Get all users associated with the project from the database
-	users, err := db.GetDb(c).GetAllUsersProject(projectName)
-	if err != nil {
-		log.Info("Error getting users for project:", err)
-		return c.Status(500).SendString(err.Error())
-	}
-
-	log.Info("Returning users for project: ", projectName)
-
-	// Return the list of users as JSON
-	return c.JSON(users)
-}
-
-// AddUserToProjectHandler is a handler that adds a user to a project with a specified role
-func AddUserToProjectHandler(c *fiber.Ctx) error {
-	// Extract necessary parameters from the request
-	var requestData struct {
-		Username    string `json:"username"`
-		ProjectName string `json:"projectName"`
-		Role        string `json:"role"`
-	}
-	if err := c.BodyParser(&requestData); err != nil {
-		log.Info("Error parsing request body:", err)
-		return c.Status(400).SendString("Bad request")
-	}
-
-	// Check if the user adding another user to the project is a site admin
-	user := c.Locals("user").(*jwt.Token)
-	claims := user.Claims.(jwt.MapClaims)
-	adminUsername := claims["name"].(string)
-	log.Info("Admin username from claims:", adminUsername)
-
-	isAdmin, err := db.GetDb(c).IsSiteAdmin(adminUsername)
-	if err != nil {
-		log.Info("Error checking admin status:", err)
-		return c.Status(500).SendString(err.Error())
-	}
-
-	if !isAdmin {
-		log.Info("User is not a site admin:", adminUsername)
-		return c.Status(403).SendString("User is not a site admin")
-	}
-
-	// Add the user to the project with the specified role
-	err = db.GetDb(c).AddUserToProject(requestData.Username, requestData.ProjectName, requestData.Role)
-	if err != nil {
-		log.Info("Error adding user to project:", err)
-		return c.Status(500).SendString(err.Error())
-	}
-
-	// Return success message
-	log.Info("User added to project successfully:", requestData.Username)
-	return c.SendStatus(fiber.StatusOK)
-}
-
-// IsProjectManagerHandler is a handler that checks if a user is a project manager for a given project
-func IsProjectManagerHandler(c *fiber.Ctx) error {
-	// Get the username from the token
-	user := c.Locals("user").(*jwt.Token)
-	claims := user.Claims.(jwt.MapClaims)
-	username := claims["name"].(string)
-
-	// Extract necessary parameters from the request query string
-	projectName := c.Params("projectName")
-
-	log.Info("Checking if user ", username, " is a project manager for project ", projectName)
-
-	// Check if the user is a project manager for the specified project
-	isManager, err := db.GetDb(c).IsProjectManager(username, projectName)
-	if err != nil {
-		log.Info("Error checking project manager status:", err)
-		return c.Status(500).SendString(err.Error())
-	}
-
-	// Return the result as JSON
-	return c.JSON(fiber.Map{"isProjectManager": isManager})
-}
-
-func GetProjectTimesHandler(c *fiber.Ctx) error {
-	// Get the username from the token
-	user := c.Locals("user").(*jwt.Token)
-	claims := user.Claims.(jwt.MapClaims)
-	username := claims["name"].(string)
-
-	// Get project
-	projectName := c.Params("projectName")
-	if projectName == "" {
-		log.Info("No project name provided")
-		return c.Status(400).SendString("No project name provided")
-	}
-
-	// Get all users in the project and roles
-	userProjects, err := db.GetDb(c).GetAllUsersProject(projectName)
-	if err != nil {
-		log.Info("Error getting users in project:", err)
-		return c.Status(500).SendString(err.Error())
-	}
-
-	// If the user is member
-	isMember := false
-	for _, userProject := range userProjects {
-		if userProject.Username == username {
-			isMember = true
-			break
-		}
-	}
-
-	// If the user is admin
-	if !isMember {
-		isAdmin, err := db.GetDb(c).IsSiteAdmin(username)
-		if err != nil {
-			log.Info("Error checking admin status:", err)
-			return c.Status(500).SendString(err.Error())
-		}
-		if !isAdmin {
-			log.Info("User is neither a project member nor a site admin:", username)
-			return c.Status(403).SendString("User is neither a project member nor a site admin")
-		}
-	}
-
-	// Get project times
-	projectTimes, err := db.GetDb(c).GetProjectTimes(projectName)
-	if err != nil {
-		log.Info("Error getting project times:", err)
-		return c.Status(500).SendString(err.Error())
-	}
-
-	// Return project times as JSON
-	log.Info("Returning project times for project:", projectName)
-	return c.JSON(projectTimes)
-}
-
-func RemoveProject(c *fiber.Ctx) error {
-	user := c.Locals("user").(*jwt.Token)
-	claims := user.Claims.(jwt.MapClaims)
-	username := claims["name"].(string)
-
-	// Check if the user is a site admin
-	isAdmin, err := db.GetDb(c).IsSiteAdmin(username)
-	if err != nil {
-		log.Info("Error checking admin status:", err)
-		return c.Status(500).SendString(err.Error())
-	}
-
-	if !isAdmin {
-		log.Info("User is not a site admin:", username)
-		return c.Status(403).SendString("User is not a site admin")
-	}
-
-	projectName := c.Params("projectName")
-
-	if err := db.GetDb(c).RemoveProject(projectName); err != nil {
-		return c.Status(500).SendString((err.Error()))
-	}
-
-	return c.Status(200).SendString("Project deleted")
-}

From 4538a3b1938b6df923d3f96907301870ffafcba0 Mon Sep 17 00:00:00 2001
From: Imbus <>
Date: Fri, 29 Mar 2024 15:33:20 +0100
Subject: [PATCH 63/76] SignReport handler changes along with tests and TS
 interface

---
 .../internal/handlers/reports/SignReport.go   | 25 +++++--------
 backend/main.go                               |  2 +-
 frontend/src/API/API.ts                       | 35 +++++++++++++++++++
 testing.py                                    |  5 ++-
 4 files changed, 47 insertions(+), 20 deletions(-)

diff --git a/backend/internal/handlers/reports/SignReport.go b/backend/internal/handlers/reports/SignReport.go
index 5769caf..a486ecc 100644
--- a/backend/internal/handlers/reports/SignReport.go
+++ b/backend/internal/handlers/reports/SignReport.go
@@ -1,6 +1,7 @@
 package reports
 
 import (
+	"strconv"
 	db "ttime/internal/database"
 
 	"github.com/gofiber/fiber/v2"
@@ -8,41 +9,33 @@ import (
 	"github.com/golang-jwt/jwt/v5"
 )
 
-// TODO: This information should be extracted from path parameters
-type ReportId struct {
-	ReportId int
-}
-
 func SignReport(c *fiber.Ctx) error {
 	// Extract the necessary parameters from the token
 	user := c.Locals("user").(*jwt.Token)
 	claims := user.Claims.(jwt.MapClaims)
 	projectManagerUsername := claims["name"].(string)
 
-	log.Info("Signing report for: ", projectManagerUsername)
-
-	// Extract report ID from the request query parameters
-	// reportID := c.Query("reportId")
-	rid := new(ReportId)
-	if err := c.BodyParser(rid); err != nil {
-		return err
+	// Extract report ID from the path
+	reportId, err := strconv.Atoi(c.Params("reportId"))
+	if err != nil {
+		log.Info("Invalid report ID")
+		return c.Status(400).SendString("Invalid report ID")
 	}
-	log.Info("Signing report for: ", rid.ReportId)
 
 	// Get the project manager's ID
 	projectManagerID, err := db.GetDb(c).GetUserId(projectManagerUsername)
 	if err != nil {
-		log.Info("Failed to get project manager ID")
+		log.Info("Failed to get project manager ID for user: ", projectManagerUsername)
 		return c.Status(500).SendString("Failed to get project manager ID")
 	}
-	log.Info("Project manager ID: ", projectManagerID)
 
 	// Call the database function to sign the weekly report
-	err = db.GetDb(c).SignWeeklyReport(rid.ReportId, projectManagerID)
+	err = db.GetDb(c).SignWeeklyReport(reportId, projectManagerID)
 	if err != nil {
 		log.Info("Error signing weekly report:", err)
 		return c.Status(500).SendString(err.Error())
 	}
 
+	log.Info("Project manager ID: ", projectManagerID, " signed report ID: ", reportId)
 	return c.Status(200).SendString("Weekly report signed successfully")
 }
diff --git a/backend/main.go b/backend/main.go
index ebe5660..cae088f 100644
--- a/backend/main.go
+++ b/backend/main.go
@@ -125,7 +125,7 @@ func main() {
 	api.Get("/getWeeklyReport", reports.GetWeeklyReport)
 	api.Post("/submitWeeklyReport", reports.SubmitWeeklyReport)
 	api.Get("/getUnsignedReports/:projectName", reports.GetUnsignedReports)
-	api.Post("/signReport", reports.SignReport)
+	api.Put("/signReport/:reportId", reports.SignReport)
 	api.Put("/addUserToProject", projects.AddUserToProjectHandler)
 	api.Get("/getWeeklyReportsUser/:projectName", reports.GetWeeklyReportsUserHandler)
 	api.Put("/updateWeeklyReport", reports.UpdateWeeklyReport)
diff --git a/frontend/src/API/API.ts b/frontend/src/API/API.ts
index 0160e15..886c957 100644
--- a/frontend/src/API/API.ts
+++ b/frontend/src/API/API.ts
@@ -153,6 +153,18 @@ interface API {
     projectName: string,
     token: string,
   ): Promise<APIResponse<string>>;
+
+  /**
+   * Signs a report. Keep in mind that the user which the token belongs to must be
+   * the project manager of the project the report belongs to.
+   *
+   * @param {number} reportId The id of the report to sign
+   * @param {string} token The authentication token
+   */
+  signReport(
+    reportId: number,
+    token: string,
+  ): Promise<APIResponse<string>>;
 }
 
 /** An instance of the API */
@@ -581,4 +593,27 @@ export const api: API = {
       });
     }
   },
+
+  async signReport(
+    reportId: number,
+    token: string,
+  ): Promise<APIResponse<string>> {
+    try {
+      const response = await fetch(`/api/signReport/${reportId}`, {
+        method: "PUT",
+        headers: {
+          "Content-Type": "application/json",
+          Authorization: "Bearer " + token,
+        },
+      });
+
+      if (!response.ok) {
+        return { success: false, message: "Failed to sign report" };
+      } else {
+        return { success: true, message: "Report signed" };
+      }
+    } catch (e) {
+      return { success: false, message: "Failed to sign report" };
+    }
+  }
 };
diff --git a/testing.py b/testing.py
index 5fb8ffe..d4594d1 100644
--- a/testing.py
+++ b/testing.py
@@ -301,9 +301,8 @@ def test_sign_report():
     report_id = response.json()["reportId"]
 
     # Sign the report as the project manager
-    response = requests.post(
-        signReportPath,
-        json={"reportId": report_id},
+    response = requests.put(
+        signReportPath + "/" + str(report_id),
         headers={"Authorization": "Bearer " + project_manager_token},
     )
     assert response.status_code == 200, "Sign report failed"

From 0cd0c8d8326a131aec98c95e84a3b47b794bdf7f Mon Sep 17 00:00:00 2001
From: Imbus <>
Date: Fri, 29 Mar 2024 15:36:42 +0100
Subject: [PATCH 64/76] Handler re-order to satisfy human OCD

---
 backend/main.go | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/backend/main.go b/backend/main.go
index cae088f..4c2056e 100644
--- a/backend/main.go
+++ b/backend/main.go
@@ -100,34 +100,34 @@ func main() {
 
 	// All user related routes
 	// userGroup := api.Group("/user") // Not currently in use
+	api.Get("/users/all", users.ListAllUsers)
+	api.Get("/project/getAllUsers", users.GetAllUsersProject)
 	api.Post("/login", users.Login)
 	api.Post("/register", users.Register)
 	api.Post("/loginrenew", users.LoginRenew)
-	api.Delete("/userdelete/:username", users.UserDelete) // Perhaps just use POST to avoid headaches
-	api.Put("/changeUserName", users.ChangeUserName)
-	api.Get("/users/all", users.ListAllUsers)
 	api.Post("/promoteToAdmin", users.PromoteToAdmin)
-	api.Get("/project/getAllUsers", users.GetAllUsersProject)
+	api.Put("/changeUserName", users.ChangeUserName)
+	api.Delete("/userdelete/:username", users.UserDelete) // Perhaps just use POST to avoid headaches
 
 	// All project related routes
 	// projectGroup := api.Group("/project") // Not currently in use
 	api.Get("/getUserProjects", projects.GetUserProjects)
-	api.Delete("/project/:projectID", projects.DeleteProject)
-	api.Post("/project", projects.CreateProject)
 	api.Get("/project/:projectId", projects.GetProject)
 	api.Get("/checkIfProjectManager/:projectName", projects.IsProjectManagerHandler)
-	api.Post("/ProjectRoleChange", projects.ProjectRoleChange)
 	api.Get("/getUsersProject/:projectName", projects.ListAllUsersProject)
+	api.Post("/project", projects.CreateProject)
+	api.Post("/ProjectRoleChange", projects.ProjectRoleChange)
 	api.Delete("/removeProject/:projectName", projects.RemoveProject)
+	api.Delete("/project/:projectID", projects.DeleteProject)
 
 	// All report related routes
 	// reportGroup := api.Group("/report") // Not currently in use
 	api.Get("/getWeeklyReport", reports.GetWeeklyReport)
-	api.Post("/submitWeeklyReport", reports.SubmitWeeklyReport)
 	api.Get("/getUnsignedReports/:projectName", reports.GetUnsignedReports)
+	api.Get("/getWeeklyReportsUser/:projectName", reports.GetWeeklyReportsUserHandler)
+	api.Post("/submitWeeklyReport", reports.SubmitWeeklyReport)
 	api.Put("/signReport/:reportId", reports.SignReport)
 	api.Put("/addUserToProject", projects.AddUserToProjectHandler)
-	api.Get("/getWeeklyReportsUser/:projectName", reports.GetWeeklyReportsUserHandler)
 	api.Put("/updateWeeklyReport", reports.UpdateWeeklyReport)
 
 	// Announce the port we are listening on and start the server

From 1db1b84e8f9ee514f4c8e30fe35ac942e380d75e Mon Sep 17 00:00:00 2001
From: Imbus <>
Date: Fri, 29 Mar 2024 15:58:36 +0100
Subject: [PATCH 65/76] Initial demo of swagger-typescript-api interface
 generation

---
 .gitignore       | 1 +
 backend/Makefile | 6 ++++++
 2 files changed, 7 insertions(+)

diff --git a/.gitignore b/.gitignore
index 3b1c6d3..281e866 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,6 +17,7 @@ backend/*.svg
 
 /go.work.sum
 /package-lock.json
+/backend/docs/swagger.json
 
 # Test binary, built with `go test -c`
 *.test
diff --git a/backend/Makefile b/backend/Makefile
index 3443e94..4e6e20e 100644
--- a/backend/Makefile
+++ b/backend/Makefile
@@ -104,6 +104,12 @@ default: build
 docs:
 	swag init -outputTypes go
 
+api: ./docs/swagger.json
+	npx swagger-typescript-api --path ./docs/swagger.json --output ../frontend/src/API --name GAPI.ts
+
+./docs/swagger.json:
+	swag init -outputTypes json
+
 .PHONY: docfmt
 docfmt:
 	swag fmt

From 45e891ed2ccef542dceac43fa1d9bd3eafb594c1 Mon Sep 17 00:00:00 2001
From: Imbus <>
Date: Fri, 29 Mar 2024 15:59:36 +0100
Subject: [PATCH 66/76] Regenerated swagger docs

---
 backend/docs/docs.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/backend/docs/docs.go b/backend/docs/docs.go
index 322c812..0009c17 100644
--- a/backend/docs/docs.go
+++ b/backend/docs/docs.go
@@ -137,13 +137,13 @@ const docTemplate = `{
                 ],
                 "responses": {
                     "200": {
-                        "description": "Successfully prometed user",
+                        "description": "Successfully promoted user",
                         "schema": {
                             "type": "json"
                         }
                     },
                     "400": {
-                        "description": "bad request",
+                        "description": "Bad request",
                         "schema": {
                             "type": "string"
                         }

From 0792c6b8a3160f9096468438ce867389dac9cf37 Mon Sep 17 00:00:00 2001
From: Imbus <>
Date: Fri, 29 Mar 2024 16:36:47 +0100
Subject: [PATCH 67/76] More sane swagger-typescript-api generator parameters

---
 backend/Makefile | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/backend/Makefile b/backend/Makefile
index 4e6e20e..039340c 100644
--- a/backend/Makefile
+++ b/backend/Makefile
@@ -105,7 +105,11 @@ docs:
 	swag init -outputTypes go
 
 api: ./docs/swagger.json
-	npx swagger-typescript-api --path ./docs/swagger.json --output ../frontend/src/API --name GAPI.ts
+	npx swagger-typescript-api \
+		--api-class-name GenApi \
+		--path ./docs/swagger.json \
+		--output ../frontend/src/API \
+		--name GenApi.ts \
 
 ./docs/swagger.json:
 	swag init -outputTypes json

From 374e357820f2bc02069b4d2917b1c4dd7cd68247 Mon Sep 17 00:00:00 2001
From: Imbus <>
Date: Fri, 29 Mar 2024 16:41:55 +0100
Subject: [PATCH 68/76] Add database.txt to clean target

---
 backend/Makefile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/backend/Makefile b/backend/Makefile
index 039340c..41fe1a3 100644
--- a/backend/Makefile
+++ b/backend/Makefile
@@ -34,6 +34,7 @@ clean:
 	rm -f plantuml.jar
 	rm -f erd.png
 	rm -f config.toml
+	rm -f database.txt
 
 # Test target
 test: db.sqlite3

From 1385011769b1e36bed8a352b6508f34b2841df4e Mon Sep 17 00:00:00 2001
From: Imbus <>
Date: Fri, 29 Mar 2024 18:41:20 +0100
Subject: [PATCH 69/76] Make swagger-typescript-api makefile target wipe the
 previous version

---
 backend/Makefile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/backend/Makefile b/backend/Makefile
index 41fe1a3..0ffc557 100644
--- a/backend/Makefile
+++ b/backend/Makefile
@@ -106,6 +106,7 @@ docs:
 	swag init -outputTypes go
 
 api: ./docs/swagger.json
+	rm ../frontend/src/API/GenApi.ts
 	npx swagger-typescript-api \
 		--api-class-name GenApi \
 		--path ./docs/swagger.json \

From c2fa9aa0c1bf62e9fb1418072610b63558642d9c Mon Sep 17 00:00:00 2001
From: Imbus <>
Date: Fri, 29 Mar 2024 18:42:12 +0100
Subject: [PATCH 70/76] Lots of fiddling with swagger annotations in user
 related handlers

---
 .../internal/handlers/users/ListAllUsers.go   | 21 +++++------
 backend/internal/handlers/users/Login.go      | 25 ++++++-------
 backend/internal/handlers/users/LoginRenew.go | 36 +++++++++++--------
 .../internal/handlers/users/PromoteToAdmin.go | 25 +++++++------
 backend/internal/handlers/users/Register.go   |  6 ++--
 backend/internal/handlers/users/UserDelete.go |  6 ++--
 backend/internal/types/users.go               |  4 +--
 7 files changed, 67 insertions(+), 56 deletions(-)

diff --git a/backend/internal/handlers/users/ListAllUsers.go b/backend/internal/handlers/users/ListAllUsers.go
index 1cae76c..5ac5df0 100644
--- a/backend/internal/handlers/users/ListAllUsers.go
+++ b/backend/internal/handlers/users/ListAllUsers.go
@@ -7,16 +7,17 @@ import (
 	"github.com/gofiber/fiber/v2/log"
 )
 
-// ListAllUsers is a handler that returns a list of all users in the application database
-// @Summary		ListsAllUsers
-// @Description	lists all users
-// @Tags			User
-// @Accept			json
-// @Produce		plain
-// @Success		200	{json}		json	"Successfully signed token for user"
-// @Failure		401	{string}	string	"Unauthorized"
-// @Failure		500	{string}	string	"Internal server error"
-// @Router			/users/all [get]
+//	@Summary		ListsAllUsers
+//	@Description	lists all users
+//	@Tags			User
+//	@Produce		json
+//	@Security		JWT
+//	@Success		200	{array}		string	"Successfully returned all users"
+//	@Failure		401	{string}	string	"Unauthorized"
+//	@Failure		500	{string}	string	"Internal server error"
+//	@Router			/users/all [get]
+//
+// ListAllUsers returns a list of all users in the application database
 func ListAllUsers(c *fiber.Ctx) error {
 	// Get all users from the database
 	users, err := db.GetDb(c).GetAllUsersApplication()
diff --git a/backend/internal/handlers/users/Login.go b/backend/internal/handlers/users/Login.go
index c4d6c60..42c52a5 100644
--- a/backend/internal/handlers/users/Login.go
+++ b/backend/internal/handlers/users/Login.go
@@ -10,18 +10,19 @@ import (
 	"github.com/golang-jwt/jwt/v5"
 )
 
-// Login is a simple login handler that returns a JWT token
-// @Summary		login
-// @Description	logs the user in and returns a jwt token
-// @Tags			User
-// @Accept			json
-// @Param			NewUser	body	types.NewUser	true	"login info"
-// @Produce		plain
-// @Success		200	Token		types.Token	"Successfully signed token for user"
-// @Failure		400	{string}	string		"Bad request"
-// @Failure		401	{string}	string		"Unauthorized"
-// @Failure		500	{string}	string		"Internal server error"
-// @Router			/login [post]
+//	@Summary		Login
+//	@Description	Logs in a user and returns a JWT token
+//	@Tags			Auth
+//	@Accept			json
+//	@Produce		json
+//	@Param			body	body		types.NewUser	true	"User credentials"
+//	@Success		200		{object}	types.Token		"JWT token"
+//	@Failure		400		{string}	string			"Bad request"
+//	@Failure		401		{string}	string			"Unauthorized"
+//	@Failure		500		{string}	string			"Internal server error"
+//	@Router			/login [post]
+//
+// Login logs in a user and returns a JWT token
 func Login(c *fiber.Ctx) error {
 	// The body type is identical to a NewUser
 
diff --git a/backend/internal/handlers/users/LoginRenew.go b/backend/internal/handlers/users/LoginRenew.go
index 78eadfd..3926ce4 100644
--- a/backend/internal/handlers/users/LoginRenew.go
+++ b/backend/internal/handlers/users/LoginRenew.go
@@ -9,34 +9,40 @@ import (
 	"github.com/golang-jwt/jwt/v5"
 )
 
-// LoginRenew is a simple handler that renews the token
-// @Summary		LoginRenews
-// @Description	renews the users token
-// @Security		bererToken
-// @Tags			User
-// @Accept			json
-// @Produce		plain
-// @Success		200	Token		types.Token	"Successfully signed token for user"
-// @Failure		401	{string}	string		"Unauthorized"
-// @Failure		500	{string}	string		"Internal server error"
-// @Router			/loginerenew [post]
+//	@Summary		LoginRenews
+//	@Description	Renews the users token.
+//	@Tags			Auth
+//	@Produce		json
+//	@Security		JWT
+//	@Success		200	{object}	types.Token	"Successfully signed token for user"
+//	@Failure		401	{string}	string		"Unauthorized"
+//	@Failure		500	{string}	string		"Internal server error"
+//	@Router			/loginrenew [post]
+//
+// LoginRenew renews the users token
 func LoginRenew(c *fiber.Ctx) error {
 	user := c.Locals("user").(*jwt.Token)
 
 	log.Info("Renewing token for user:", user.Claims.(jwt.MapClaims)["name"])
 
+	// Renewing the token means we trust whatever is already in the token
 	claims := user.Claims.(jwt.MapClaims)
+
+	// 72 hour expiration time
 	claims["exp"] = time.Now().Add(time.Hour * 72).Unix()
-	renewed := jwt.MapClaims{
+
+	// Create token with old claims, but new expiration time
+	token := jwt.NewWithClaims(jwt.SigningMethodHS256, jwt.MapClaims{
 		"name":  claims["name"],
 		"admin": claims["admin"],
 		"exp":   claims["exp"],
-	}
-	token := jwt.NewWithClaims(jwt.SigningMethodHS256, renewed)
+	})
+
+	// Sign it with top secret key
 	t, err := token.SignedString([]byte("secret"))
 	if err != nil {
 		log.Warn("Error signing token")
-		return c.SendStatus(fiber.StatusInternalServerError)
+		return c.SendStatus(fiber.StatusInternalServerError) // 500
 	}
 
 	log.Info("Successfully renewed token for user:", user.Claims.(jwt.MapClaims)["name"])
diff --git a/backend/internal/handlers/users/PromoteToAdmin.go b/backend/internal/handlers/users/PromoteToAdmin.go
index 4a21758..3f0a6d3 100644
--- a/backend/internal/handlers/users/PromoteToAdmin.go
+++ b/backend/internal/handlers/users/PromoteToAdmin.go
@@ -8,17 +8,20 @@ import (
 	"github.com/gofiber/fiber/v2/log"
 )
 
-// @Summary		PromoteToAdmin
-// @Description	promote chosen user to admin
-// @Tags			User
-// @Accept			json
-// @Produce		plain
-// @Param			NewUser	body		types.NewUser	true	"user info"
-// @Success		200		{json}		json			"Successfully promoted user"
-// @Failure		400		{string}	string			"Bad request"
-// @Failure		401		{string}	string			"Unauthorized"
-// @Failure		500		{string}	string			"Internal server error"
-// @Router			/promoteToAdmin [post]
+//	@Summary		PromoteToAdmin
+//	@Description	Promote chosen user to site admin
+//	@Tags			User
+//	@Accept			json
+//	@Produce		plain
+//	@Security		JWT
+//	@Param			NewUser	body		types.NewUser	true	"user info"
+//	@Success		200		{object}	types.Token		"Successfully promoted user"
+//	@Failure		400		{string}	string			"Bad request"
+//	@Failure		401		{string}	string			"Unauthorized"
+//	@Failure		500		{string}	string			"Internal server error"
+//	@Router			/promoteToAdmin [post]
+//
+// PromoteToAdmin promotes a user to a site admin
 func PromoteToAdmin(c *fiber.Ctx) error {
 	// Extract the username from the request body
 	var newUser types.NewUser
diff --git a/backend/internal/handlers/users/Register.go b/backend/internal/handlers/users/Register.go
index 9977246..b9e0c78 100644
--- a/backend/internal/handlers/users/Register.go
+++ b/backend/internal/handlers/users/Register.go
@@ -8,11 +8,9 @@ import (
 	"github.com/gofiber/fiber/v2/log"
 )
 
-// Register is a simple handler that registers a new user
-//
 //	@Summary		Register
 //	@Description	Register a new user
-//	@Tags			User
+//	@Tags			Auth
 //	@Accept			json
 //	@Produce		plain
 //	@Param			NewUser	body		types.NewUser	true	"User to register"
@@ -20,6 +18,8 @@ import (
 //	@Failure		400		{string}	string			"Bad request"
 //	@Failure		500		{string}	string			"Internal server error"
 //	@Router			/register [post]
+//
+// Register is a simple handler that registers a new user
 func Register(c *fiber.Ctx) error {
 	u := new(types.NewUser)
 	if err := c.BodyParser(u); err != nil {
diff --git a/backend/internal/handlers/users/UserDelete.go b/backend/internal/handlers/users/UserDelete.go
index 5957c2d..491a1b3 100644
--- a/backend/internal/handlers/users/UserDelete.go
+++ b/backend/internal/handlers/users/UserDelete.go
@@ -8,19 +8,19 @@ import (
 	"github.com/golang-jwt/jwt/v5"
 )
 
-// This path should obviously be protected in the future
-// UserDelete deletes a user from the database
-//
 //	@Summary		UserDelete
 //	@Description	UserDelete deletes a user from the database
 //	@Tags			User
 //	@Accept			json
 //	@Produce		plain
+//	@Security		JWT
 //	@Success		200	{string}	string	"User deleted"
 //	@Failure		403	{string}	string	"You can only delete yourself"
 //	@Failure		500	{string}	string	"Internal server error"
 //	@Failure		401	{string}	string	"Unauthorized"
 //	@Router			/userdelete/{username} [delete]
+//
+// UserDelete deletes a user from the database
 func UserDelete(c *fiber.Ctx) error {
 	// Read from path parameters
 	username := c.Params("username")
diff --git a/backend/internal/types/users.go b/backend/internal/types/users.go
index 88b4f06..37cc8c2 100644
--- a/backend/internal/types/users.go
+++ b/backend/internal/types/users.go
@@ -18,8 +18,8 @@ func (u *User) ToPublicUser() (*PublicUser, error) {
 
 // Should be used when registering, for example
 type NewUser struct {
-	Username string `json:"username"`
-	Password string `json:"password"`
+	Username string `json:"username" example:"username123"`
+	Password string `json:"password" example:"password123"`
 }
 
 // PublicUser represents a user that is safe to send over the API (no password)

From 87a19bfd4e50cc9e19fe2a232a554ee0e3b70685 Mon Sep 17 00:00:00 2001
From: Imbus <>
Date: Fri, 29 Mar 2024 18:42:53 +0100
Subject: [PATCH 71/76] Swagger annotations for JWT key

---
 backend/main.go | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/backend/main.go b/backend/main.go
index 4c2056e..cf58280 100644
--- a/backend/main.go
+++ b/backend/main.go
@@ -25,15 +25,16 @@ import (
 //	@license.name	AGPL
 //	@license.url	https://www.gnu.org/licenses/agpl-3.0.html
 
-//@securityDefinitions.apikey bererToken
-//@in header
-//@name Authorization
+//	@securityDefinitions.apikey	JWT
+//	@in							header
+//	@name						Authorization
+//	@description				Use the JWT token provided by the login endpoint to authenticate requests.  **Prefix the token with "Bearer ".**
 
 //	@host		localhost:8080
 //	@BasePath	/api
 
-// @externalDocs.description	OpenAPI
-// @externalDocs.url			https://swagger.io/resources/open-api/
+//	@externalDocs.description	OpenAPI
+//	@externalDocs.url			https://swagger.io/resources/open-api/
 
 /**
 Main function for starting the server and initializing configurations.

From f1e15137d687b4c4b47e64d5bf01db7dfcd7d83c Mon Sep 17 00:00:00 2001
From: Imbus <>
Date: Fri, 29 Mar 2024 18:43:26 +0100
Subject: [PATCH 72/76] Freshly generated swagger docs

---
 backend/docs/docs.go | 79 ++++++++++++++++++++++++++++----------------
 1 file changed, 51 insertions(+), 28 deletions(-)

diff --git a/backend/docs/docs.go b/backend/docs/docs.go
index 0009c17..7a08b0e 100644
--- a/backend/docs/docs.go
+++ b/backend/docs/docs.go
@@ -21,21 +21,21 @@ const docTemplate = `{
     "paths": {
         "/login": {
             "post": {
-                "description": "logs the user in and returns a jwt token",
+                "description": "Logs in a user and returns a JWT token",
                 "consumes": [
                     "application/json"
                 ],
                 "produces": [
-                    "text/plain"
+                    "application/json"
                 ],
                 "tags": [
-                    "User"
+                    "Auth"
                 ],
-                "summary": "login",
+                "summary": "Login",
                 "parameters": [
                     {
-                        "description": "login info",
-                        "name": "NewUser",
+                        "description": "User credentials",
+                        "name": "body",
                         "in": "body",
                         "required": true,
                         "schema": {
@@ -45,9 +45,9 @@ const docTemplate = `{
                 ],
                 "responses": {
                     "200": {
-                        "description": "Successfully signed token for user",
+                        "description": "JWT token",
                         "schema": {
-                            "type": "Token"
+                            "$ref": "#/definitions/types.Token"
                         }
                     },
                     "400": {
@@ -71,29 +71,26 @@ const docTemplate = `{
                 }
             }
         },
-        "/loginerenew": {
+        "/loginrenew": {
             "post": {
                 "security": [
                     {
-                        "bererToken": []
+                        "JWT": []
                     }
                 ],
-                "description": "renews the users token",
-                "consumes": [
+                "description": "Renews the users token.",
+                "produces": [
                     "application/json"
                 ],
-                "produces": [
-                    "text/plain"
-                ],
                 "tags": [
-                    "User"
+                    "Auth"
                 ],
                 "summary": "LoginRenews",
                 "responses": {
                     "200": {
                         "description": "Successfully signed token for user",
                         "schema": {
-                            "type": "Token"
+                            "$ref": "#/definitions/types.Token"
                         }
                     },
                     "401": {
@@ -113,7 +110,12 @@ const docTemplate = `{
         },
         "/promoteToAdmin": {
             "post": {
-                "description": "promote chosen user to admin",
+                "security": [
+                    {
+                        "JWT": []
+                    }
+                ],
+                "description": "Promote chosen user to site admin",
                 "consumes": [
                     "application/json"
                 ],
@@ -139,7 +141,7 @@ const docTemplate = `{
                     "200": {
                         "description": "Successfully promoted user",
                         "schema": {
-                            "type": "json"
+                            "$ref": "#/definitions/types.Token"
                         }
                     },
                     "400": {
@@ -173,7 +175,7 @@ const docTemplate = `{
                     "text/plain"
                 ],
                 "tags": [
-                    "User"
+                    "Auth"
                 ],
                 "summary": "Register",
                 "parameters": [
@@ -211,6 +213,11 @@ const docTemplate = `{
         },
         "/userdelete/{username}": {
             "delete": {
+                "security": [
+                    {
+                        "JWT": []
+                    }
+                ],
                 "description": "UserDelete deletes a user from the database",
                 "consumes": [
                     "application/json"
@@ -252,12 +259,14 @@ const docTemplate = `{
         },
         "/users/all": {
             "get": {
-                "description": "lists all users",
-                "consumes": [
-                    "application/json"
+                "security": [
+                    {
+                        "JWT": []
+                    }
                 ],
+                "description": "lists all users",
                 "produces": [
-                    "text/plain"
+                    "application/json"
                 ],
                 "tags": [
                     "User"
@@ -265,9 +274,12 @@ const docTemplate = `{
                 "summary": "ListsAllUsers",
                 "responses": {
                     "200": {
-                        "description": "Successfully signed token for user",
+                        "description": "Successfully returned all users",
                         "schema": {
-                            "type": "json"
+                            "type": "array",
+                            "items": {
+                                "type": "string"
+                            }
                         }
                     },
                     "401": {
@@ -291,16 +303,27 @@ const docTemplate = `{
             "type": "object",
             "properties": {
                 "password": {
-                    "type": "string"
+                    "type": "string",
+                    "example": "password123"
                 },
                 "username": {
+                    "type": "string",
+                    "example": "username123"
+                }
+            }
+        },
+        "types.Token": {
+            "type": "object",
+            "properties": {
+                "token": {
                     "type": "string"
                 }
             }
         }
     },
     "securityDefinitions": {
-        "bererToken": {
+        "JWT": {
+            "description": "Use the JWT token provided by the login endpoint to authenticate requests.  **Prefix the token with \"Bearer \".**",
             "type": "apiKey",
             "name": "Authorization",
             "in": "header"

From 77f028fd39e220f0b16950fc736135d6aaa456ec Mon Sep 17 00:00:00 2001
From: Imbus <>
Date: Fri, 29 Mar 2024 19:23:35 +0100
Subject: [PATCH 73/76] Prettierignore for generated files

---
 frontend/.prettierignore | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 frontend/.prettierignore

diff --git a/frontend/.prettierignore b/frontend/.prettierignore
new file mode 100644
index 0000000..c49d006
--- /dev/null
+++ b/frontend/.prettierignore
@@ -0,0 +1,2 @@
+goTypes.ts
+GenApi.ts
\ No newline at end of file

From 8d5329146d682a8a4cad817d587f3c2a74c53781 Mon Sep 17 00:00:00 2001
From: Imbus <>
Date: Fri, 29 Mar 2024 19:36:06 +0100
Subject: [PATCH 74/76] New tygo generated goTypes

---
 frontend/src/Types/goTypes.ts | 52 ++++++++++++++++++++++++++---------
 1 file changed, 39 insertions(+), 13 deletions(-)

diff --git a/frontend/src/Types/goTypes.ts b/frontend/src/Types/goTypes.ts
index c519aac..7a15741 100644
--- a/frontend/src/Types/goTypes.ts
+++ b/frontend/src/Types/goTypes.ts
@@ -124,6 +124,44 @@ export interface WeeklyReport {
    */
   signedBy?: number /* int */;
 }
+export interface UpdateWeeklyReport {
+  /**
+   * The name of the project, as it appears in the database
+   */
+  projectName: string;
+  /**
+   * The name of the user
+   */
+  userName: string;
+  /**
+   * The week number
+   */
+  week: number /* int */;
+  /**
+   * Total time spent on development
+   */
+  developmentTime: number /* int */;
+  /**
+   * Total time spent in meetings
+   */
+  meetingTime: number /* int */;
+  /**
+   * Total time spent on administrative tasks
+   */
+  adminTime: number /* int */;
+  /**
+   * Total time spent on personal projects
+   */
+  ownWorkTime: number /* int */;
+  /**
+   * Total time spent on studying
+   */
+  studyTime: number /* int */;
+  /**
+   * Total time spent on testing
+   */
+  testingTime: number /* int */;
+}
 
 //////////
 // source: project.go
@@ -151,16 +189,9 @@ export interface NewProject {
  */
 export interface RoleChange {
   username: string;
-  role: "project_manager" | "user";
+  role: 'project_manager' | 'user';
   projectname: string;
 }
-
-export interface NewProjMember {
-  username: string;
-  projectname: string;
-  role: string;
-}
-
 export interface NameChange {
   id: number /* int */;
   name: string;
@@ -191,11 +222,6 @@ export interface PublicUser {
   userId: string;
   username: string;
 }
-
-export interface UserProjectMember {
-  Username: string;
-  UserRole: string;
-}
 /**
  * wrapper type for token
  */

From d2b4bf2a892db4d1c2d63205ef58036409dd41b0 Mon Sep 17 00:00:00 2001
From: Imbus <>
Date: Fri, 29 Mar 2024 19:36:47 +0100
Subject: [PATCH 75/76] Brand new typescript API interface generated from
 swagger

---
 frontend/src/API/GenApi.ts | 358 +++++++++++++++++++++++++++++++++++++
 1 file changed, 358 insertions(+)
 create mode 100644 frontend/src/API/GenApi.ts

diff --git a/frontend/src/API/GenApi.ts b/frontend/src/API/GenApi.ts
new file mode 100644
index 0000000..8ca851b
--- /dev/null
+++ b/frontend/src/API/GenApi.ts
@@ -0,0 +1,358 @@
+/* eslint-disable */
+/* tslint:disable */
+/*
+ * ---------------------------------------------------------------
+ * ## THIS FILE WAS GENERATED VIA SWAGGER-TYPESCRIPT-API        ##
+ * ##                                                           ##
+ * ## AUTHOR: acacode                                           ##
+ * ## SOURCE: https://github.com/acacode/swagger-typescript-api ##
+ * ---------------------------------------------------------------
+ */
+
+export interface TypesNewUser {
+  /** @example "password123" */
+  password?: string;
+  /** @example "username123" */
+  username?: string;
+}
+
+export interface TypesToken {
+  token?: string;
+}
+
+export type QueryParamsType = Record<string | number, any>;
+export type ResponseFormat = keyof Omit<Body, "body" | "bodyUsed">;
+
+export interface FullRequestParams extends Omit<RequestInit, "body"> {
+  /** set parameter to `true` for call `securityWorker` for this request */
+  secure?: boolean;
+  /** request path */
+  path: string;
+  /** content type of request body */
+  type?: ContentType;
+  /** query params */
+  query?: QueryParamsType;
+  /** format of response (i.e. response.json() -> format: "json") */
+  format?: ResponseFormat;
+  /** request body */
+  body?: unknown;
+  /** base url */
+  baseUrl?: string;
+  /** request cancellation token */
+  cancelToken?: CancelToken;
+}
+
+export type RequestParams = Omit<FullRequestParams, "body" | "method" | "query" | "path">;
+
+export interface ApiConfig<SecurityDataType = unknown> {
+  baseUrl?: string;
+  baseApiParams?: Omit<RequestParams, "baseUrl" | "cancelToken" | "signal">;
+  securityWorker?: (securityData: SecurityDataType | null) => Promise<RequestParams | void> | RequestParams | void;
+  customFetch?: typeof fetch;
+}
+
+export interface HttpResponse<D extends unknown, E extends unknown = unknown> extends Response {
+  data: D;
+  error: E;
+}
+
+type CancelToken = Symbol | string | number;
+
+export enum ContentType {
+  Json = "application/json",
+  FormData = "multipart/form-data",
+  UrlEncoded = "application/x-www-form-urlencoded",
+  Text = "text/plain",
+}
+
+export class HttpClient<SecurityDataType = unknown> {
+  public baseUrl: string = "//localhost:8080/api";
+  private securityData: SecurityDataType | null = null;
+  private securityWorker?: ApiConfig<SecurityDataType>["securityWorker"];
+  private abortControllers = new Map<CancelToken, AbortController>();
+  private customFetch = (...fetchParams: Parameters<typeof fetch>) => fetch(...fetchParams);
+
+  private baseApiParams: RequestParams = {
+    credentials: "same-origin",
+    headers: {},
+    redirect: "follow",
+    referrerPolicy: "no-referrer",
+  };
+
+  constructor(apiConfig: ApiConfig<SecurityDataType> = {}) {
+    Object.assign(this, apiConfig);
+  }
+
+  public setSecurityData = (data: SecurityDataType | null) => {
+    this.securityData = data;
+  };
+
+  protected encodeQueryParam(key: string, value: any) {
+    const encodedKey = encodeURIComponent(key);
+    return `${encodedKey}=${encodeURIComponent(typeof value === "number" ? value : `${value}`)}`;
+  }
+
+  protected addQueryParam(query: QueryParamsType, key: string) {
+    return this.encodeQueryParam(key, query[key]);
+  }
+
+  protected addArrayQueryParam(query: QueryParamsType, key: string) {
+    const value = query[key];
+    return value.map((v: any) => this.encodeQueryParam(key, v)).join("&");
+  }
+
+  protected toQueryString(rawQuery?: QueryParamsType): string {
+    const query = rawQuery || {};
+    const keys = Object.keys(query).filter((key) => "undefined" !== typeof query[key]);
+    return keys
+      .map((key) => (Array.isArray(query[key]) ? this.addArrayQueryParam(query, key) : this.addQueryParam(query, key)))
+      .join("&");
+  }
+
+  protected addQueryParams(rawQuery?: QueryParamsType): string {
+    const queryString = this.toQueryString(rawQuery);
+    return queryString ? `?${queryString}` : "";
+  }
+
+  private contentFormatters: Record<ContentType, (input: any) => any> = {
+    [ContentType.Json]: (input: any) =>
+      input !== null && (typeof input === "object" || typeof input === "string") ? JSON.stringify(input) : input,
+    [ContentType.Text]: (input: any) => (input !== null && typeof input !== "string" ? JSON.stringify(input) : input),
+    [ContentType.FormData]: (input: any) =>
+      Object.keys(input || {}).reduce((formData, key) => {
+        const property = input[key];
+        formData.append(
+          key,
+          property instanceof Blob
+            ? property
+            : typeof property === "object" && property !== null
+            ? JSON.stringify(property)
+            : `${property}`,
+        );
+        return formData;
+      }, new FormData()),
+    [ContentType.UrlEncoded]: (input: any) => this.toQueryString(input),
+  };
+
+  protected mergeRequestParams(params1: RequestParams, params2?: RequestParams): RequestParams {
+    return {
+      ...this.baseApiParams,
+      ...params1,
+      ...(params2 || {}),
+      headers: {
+        ...(this.baseApiParams.headers || {}),
+        ...(params1.headers || {}),
+        ...((params2 && params2.headers) || {}),
+      },
+    };
+  }
+
+  protected createAbortSignal = (cancelToken: CancelToken): AbortSignal | undefined => {
+    if (this.abortControllers.has(cancelToken)) {
+      const abortController = this.abortControllers.get(cancelToken);
+      if (abortController) {
+        return abortController.signal;
+      }
+      return void 0;
+    }
+
+    const abortController = new AbortController();
+    this.abortControllers.set(cancelToken, abortController);
+    return abortController.signal;
+  };
+
+  public abortRequest = (cancelToken: CancelToken) => {
+    const abortController = this.abortControllers.get(cancelToken);
+
+    if (abortController) {
+      abortController.abort();
+      this.abortControllers.delete(cancelToken);
+    }
+  };
+
+  public request = async <T = any, E = any>({
+    body,
+    secure,
+    path,
+    type,
+    query,
+    format,
+    baseUrl,
+    cancelToken,
+    ...params
+  }: FullRequestParams): Promise<HttpResponse<T, E>> => {
+    const secureParams =
+      ((typeof secure === "boolean" ? secure : this.baseApiParams.secure) &&
+        this.securityWorker &&
+        (await this.securityWorker(this.securityData))) ||
+      {};
+    const requestParams = this.mergeRequestParams(params, secureParams);
+    const queryString = query && this.toQueryString(query);
+    const payloadFormatter = this.contentFormatters[type || ContentType.Json];
+    const responseFormat = format || requestParams.format;
+
+    return this.customFetch(`${baseUrl || this.baseUrl || ""}${path}${queryString ? `?${queryString}` : ""}`, {
+      ...requestParams,
+      headers: {
+        ...(requestParams.headers || {}),
+        ...(type && type !== ContentType.FormData ? { "Content-Type": type } : {}),
+      },
+      signal: (cancelToken ? this.createAbortSignal(cancelToken) : requestParams.signal) || null,
+      body: typeof body === "undefined" || body === null ? null : payloadFormatter(body),
+    }).then(async (response) => {
+      const r = response as HttpResponse<T, E>;
+      r.data = null as unknown as T;
+      r.error = null as unknown as E;
+
+      const data = !responseFormat
+        ? r
+        : await response[responseFormat]()
+            .then((data) => {
+              if (r.ok) {
+                r.data = data;
+              } else {
+                r.error = data;
+              }
+              return r;
+            })
+            .catch((e) => {
+              r.error = e;
+              return r;
+            });
+
+      if (cancelToken) {
+        this.abortControllers.delete(cancelToken);
+      }
+
+      if (!response.ok) throw data;
+      return data;
+    });
+  };
+}
+
+/**
+ * @title TTime API
+ * @version 0.0.1
+ * @license AGPL (https://www.gnu.org/licenses/agpl-3.0.html)
+ * @baseUrl //localhost:8080/api
+ * @externalDocs https://swagger.io/resources/open-api/
+ * @contact
+ *
+ * This is the API for TTime, a time tracking application.
+ */
+export class GenApi<SecurityDataType extends unknown> extends HttpClient<SecurityDataType> {
+  login = {
+    /**
+     * @description Logs in a user and returns a JWT token
+     *
+     * @tags Auth
+     * @name LoginCreate
+     * @summary Login
+     * @request POST:/login
+     */
+    loginCreate: (body: TypesNewUser, params: RequestParams = {}) =>
+      this.request<TypesToken, string>({
+        path: `/login`,
+        method: "POST",
+        body: body,
+        type: ContentType.Json,
+        format: "json",
+        ...params,
+      }),
+  };
+  loginrenew = {
+    /**
+     * @description Renews the users token.
+     *
+     * @tags Auth
+     * @name LoginrenewCreate
+     * @summary LoginRenews
+     * @request POST:/loginrenew
+     * @secure
+     */
+    loginrenewCreate: (params: RequestParams = {}) =>
+      this.request<TypesToken, string>({
+        path: `/loginrenew`,
+        method: "POST",
+        secure: true,
+        format: "json",
+        ...params,
+      }),
+  };
+  promoteToAdmin = {
+    /**
+     * @description Promote chosen user to site admin
+     *
+     * @tags User
+     * @name PromoteToAdminCreate
+     * @summary PromoteToAdmin
+     * @request POST:/promoteToAdmin
+     * @secure
+     */
+    promoteToAdminCreate: (NewUser: TypesNewUser, params: RequestParams = {}) =>
+      this.request<TypesToken, string>({
+        path: `/promoteToAdmin`,
+        method: "POST",
+        body: NewUser,
+        secure: true,
+        type: ContentType.Json,
+        ...params,
+      }),
+  };
+  register = {
+    /**
+     * @description Register a new user
+     *
+     * @tags Auth
+     * @name RegisterCreate
+     * @summary Register
+     * @request POST:/register
+     */
+    registerCreate: (NewUser: TypesNewUser, params: RequestParams = {}) =>
+      this.request<string, string>({
+        path: `/register`,
+        method: "POST",
+        body: NewUser,
+        type: ContentType.Json,
+        ...params,
+      }),
+  };
+  userdelete = {
+    /**
+     * @description UserDelete deletes a user from the database
+     *
+     * @tags User
+     * @name UserdeleteDelete
+     * @summary UserDelete
+     * @request DELETE:/userdelete/{username}
+     * @secure
+     */
+    userdeleteDelete: (username: string, params: RequestParams = {}) =>
+      this.request<string, string>({
+        path: `/userdelete/${username}`,
+        method: "DELETE",
+        secure: true,
+        type: ContentType.Json,
+        ...params,
+      }),
+  };
+  users = {
+    /**
+     * @description lists all users
+     *
+     * @tags User
+     * @name GetUsers
+     * @summary ListsAllUsers
+     * @request GET:/users/all
+     * @secure
+     */
+    getUsers: (params: RequestParams = {}) =>
+      this.request<string[], string>({
+        path: `/users/all`,
+        method: "GET",
+        secure: true,
+        format: "json",
+        ...params,
+      }),
+  };
+}

From bc9b01d85a943a49f62b794031a576aa3ee28340 Mon Sep 17 00:00:00 2001
From: Imbus <>
Date: Fri, 29 Mar 2024 19:37:21 +0100
Subject: [PATCH 76/76] Example component GenApiDemo on how to use the new API

---
 frontend/src/Containers/GenApiDemo.tsx | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 frontend/src/Containers/GenApiDemo.tsx

diff --git a/frontend/src/Containers/GenApiDemo.tsx b/frontend/src/Containers/GenApiDemo.tsx
new file mode 100644
index 0000000..27092d8
--- /dev/null
+++ b/frontend/src/Containers/GenApiDemo.tsx
@@ -0,0 +1,23 @@
+import { useEffect } from "react";
+import { GenApi } from "../API/GenApi";
+
+// Instantiation of the API
+const api = new GenApi();
+
+export function GenApiDemo(): JSX.Element {
+  // Sync wrapper around the loginCreate method
+  const register = async (): Promise<void> => {
+    const response = await api.login.loginCreate({
+      username: "admin",
+      password: "admin",
+    });
+    console.log(response.data); // This should be the inner type of the response
+  };
+
+  // Call the wrapper
+  useEffect(() => {
+    void register();
+  });
+
+  return <></>;
+}