From 148af4e49951bcaf8df29a0f5d2dc7cc76fc2808 Mon Sep 17 00:00:00 2001
From: Mattias <mattias.rasmusson.1032@student.lu.se>
Date: Sat, 16 Mar 2024 02:46:58 +0100
Subject: [PATCH 01/18] Removed duplicate path

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

diff --git a/frontend/src/main.tsx b/frontend/src/main.tsx
index 29f168e..35dceea 100644
--- a/frontend/src/main.tsx
+++ b/frontend/src/main.tsx
@@ -57,10 +57,6 @@ const router = createBrowserRouter([
     path: "/register",
     element: <Register />,
   },
-  {
-    path: "/admin-menu",
-    element: <AdminMenuPage />,
-  },
   {
     path: "/project-page",
     element: <UserViewTimeReportsPage />,

From a67c44564fa85d71b57eaf3af39e718e079088c7 Mon Sep 17 00:00:00 2001
From: Mattias <mattias.rasmusson.1032@student.lu.se>
Date: Sat, 16 Mar 2024 02:47:17 +0100
Subject: [PATCH 02/18] Visual fixes

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

diff --git a/frontend/src/Components/Register.tsx b/frontend/src/Components/Register.tsx
index e4a3ba0..faa1a88 100644
--- a/frontend/src/Components/Register.tsx
+++ b/frontend/src/Components/Register.tsx
@@ -14,7 +14,7 @@ export default function Register(): JSX.Element {
   };
 
   return (
-    <div className="flex flex-col h-screen w-screen items-center justify-center">
+    <div className="flex flex-col h-fit w-screen items-center justify-center">
       <div className="border-4 border-black bg-white flex flex-col items-center justify-center h-fit w-fit rounded-3xl content-center pl-20 pr-20">
         <form
           className="bg-white rounded px-8 pt-6 pb-8 mb-4 items-center justify-center flex flex-col w-fit h-fit"
@@ -60,7 +60,7 @@ export default function Register(): JSX.Element {
               className="appearance-none border-2 border-black rounded-2xl w-full py-2 px-3 text-gray-700 leading-tight focus:outline-none focus:shadow-outline"
               id="password"
               type="password"
-              placeholder="Choose your password"
+              placeholder="Choose password"
               value={password}
               onChange={(e) => {
                 setPassword(e.target.value);

From d227ffc6ae323b84c248debbe60081a6c1ac13e9 Mon Sep 17 00:00:00 2001
From: Mattias <mattias.rasmusson.1032@student.lu.se>
Date: Sat, 16 Mar 2024 02:47:39 +0100
Subject: [PATCH 03/18] Added the register component to content

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

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

From 966f8540dfcbac5395ecb7733a5fe005f4c64879 Mon Sep 17 00:00:00 2001
From: Mattias <mattias.rasmusson.1032@student.lu.se>
Date: Sat, 16 Mar 2024 13:10:46 +0100
Subject: [PATCH 04/18] Created groundwork for the timereport

---
 frontend/src/Components/TimeReport.tsx | 244 ++++++++++++++++++++-----
 1 file changed, 194 insertions(+), 50 deletions(-)

diff --git a/frontend/src/Components/TimeReport.tsx b/frontend/src/Components/TimeReport.tsx
index c4ddc38..cb33ad9 100644
--- a/frontend/src/Components/TimeReport.tsx
+++ b/frontend/src/Components/TimeReport.tsx
@@ -1,59 +1,203 @@
-function NewTimeReport(): JSX.Element {
-  const activities = [
-    "Development",
-    "Meeting",
-    "Administration",
-    "Own Work",
-    "Studies",
-    "Testing",
-  ];
+import { useState } from "react";
+import { TimeReport } from "../Types/TimeReport";
+import { api } from "../API/API";
+import { useNavigate } from "react-router-dom";
+import Button from "./Button";
+
+export default function NewTimeReport(): JSX.Element {
+  const [week, setWeek] = useState("");
+  const [development, setDevelopment] = useState("0");
+  const [meeting, setMeeting] = useState("0");
+  const [administration, setAdministration] = useState("0");
+  const [ownwork, setOwnWork] = useState("0");
+  const [studies, setStudies] = useState("0");
+  const [testing, setTesting] = useState("0");
+
+  const handleNewTimeReport = async (): Promise<void> => {
+    const newTimeReport: TimeReport = {
+      week,
+      development,
+      meeting,
+      administration,
+      ownwork,
+      studies,
+      testing,
+    };
+    await Promise.resolve();
+    // await api.registerTimeReport(newTimeReport); This needs to be implemented!
+  };
+
+  const navigate = useNavigate();
 
   return (
     <>
       <div className="border-4 border-black bg-white flex flex-col justify-start min-h-[65vh] h-fit w-[50vw] rounded-3xl overflow-scroll space-y-[2vh] p-[30px] items-center">
-        <input
-          className="w-fill h-[5vh] font-sans text-[3vh] pl-[1vw] rounded-full text-center pt-[1vh] pb-[1vh] border-2 border-black"
-          type="week"
-          placeholder="Week"
-          onKeyDown={(event) => {
-            event.preventDefault();
+        <form
+          onSubmit={(e) => {
+            if (week === "") {
+              alert("Please enter a week number");
+              e.preventDefault();
+              return;
+            }
+            e.preventDefault();
+            void handleNewTimeReport();
+            navigate("/project");
           }}
-          onPaste={(event) => {
-            event.preventDefault();
-          }}
-        />
-        <table className="w-full text-center divide-y divide-x divide-white text-[30px]">
-          <thead>
-            <tr>
-              <th className="w-1/2 py-2 border-b-2 border-black">Activity</th>
-              <th className="w-1/2 py-2 border-b-2 border-black">
-                Total Time (min)
-              </th>
-            </tr>
-          </thead>
-          <tbody className="divide-y divide-black">
-            {activities.map((activity, index) => (
-              <tr key={index} className="h-[10vh]">
-                <td>{activity}</td>
-                <td>
-                  <input
-                    type="number"
-                    min="0"
-                    className="border-2 border-black rounded-md text-center w-1/2"
-                    onKeyDown={(event) => {
-                      const keyValue = event.key;
-                      if (!/\d/.test(keyValue) && keyValue !== "Backspace")
-                        event.preventDefault();
-                    }}
-                  />
-                </td>
-              </tr>
-            ))}
-          </tbody>
-        </table>
+        >
+          <div 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 = e.target.value.split("-W")[1];
+                setWeek(weekNumber);
+              }}
+              onKeyDown={(event) => {
+                event.preventDefault();
+              }}
+              onPaste={(event) => {
+                event.preventDefault();
+              }}
+            />
+            <table className="w-full text-center divide-y divide-x divide-white text-[30px]">
+              <thead>
+                <tr>
+                  <th className="w-1/2 py-2 border-b-2 border-black">
+                    Activity
+                  </th>
+                  <th className="w-1/2 py-2 border-b-2 border-black">
+                    Total Time (min)
+                  </th>
+                </tr>
+              </thead>
+              <tbody className="divide-y divide-black">
+                <tr className="h-[10vh]">
+                  <td>Development</td>
+                  <td>
+                    <input
+                      type="number"
+                      min="0"
+                      className="border-2 border-black rounded-md text-center w-1/2"
+                      value={development}
+                      onChange={(e) => {
+                        setDevelopment(e.target.value);
+                      }}
+                      onKeyDown={(event) => {
+                        const keyValue = event.key;
+                        if (!/\d/.test(keyValue) && keyValue !== "Backspace")
+                          event.preventDefault();
+                      }}
+                    />
+                  </td>
+                </tr>
+                <tr className="h-[10vh]">
+                  <td>Meeting</td>
+                  <td>
+                    <input
+                      type="number"
+                      min="0"
+                      className="border-2 border-black rounded-md text-center w-1/2"
+                      value={meeting}
+                      onChange={(e) => {
+                        setMeeting(e.target.value);
+                      }}
+                      onKeyDown={(event) => {
+                        const keyValue = event.key;
+                        if (!/\d/.test(keyValue) && keyValue !== "Backspace")
+                          event.preventDefault();
+                      }}
+                    />
+                  </td>
+                </tr>
+                <tr className="h-[10vh]">
+                  <td>Administration</td>
+                  <td>
+                    <input
+                      type="number"
+                      min="0"
+                      className="border-2 border-black rounded-md text-center w-1/2"
+                      value={administration}
+                      onChange={(e) => {
+                        setAdministration(e.target.value);
+                      }}
+                      onKeyDown={(event) => {
+                        const keyValue = event.key;
+                        if (!/\d/.test(keyValue) && keyValue !== "Backspace")
+                          event.preventDefault();
+                      }}
+                    />
+                  </td>
+                </tr>
+                <tr className="h-[10vh]">
+                  <td>Own Work</td>
+                  <td>
+                    <input
+                      type="number"
+                      min="0"
+                      className="border-2 border-black rounded-md text-center w-1/2"
+                      value={ownwork}
+                      onChange={(e) => {
+                        setOwnWork(e.target.value);
+                      }}
+                      onKeyDown={(event) => {
+                        const keyValue = event.key;
+                        if (!/\d/.test(keyValue) && keyValue !== "Backspace")
+                          event.preventDefault();
+                      }}
+                    />
+                  </td>
+                </tr>
+                <tr className="h-[10vh]">
+                  <td>Studies</td>
+                  <td>
+                    <input
+                      type="number"
+                      min="0"
+                      className="border-2 border-black rounded-md text-center w-1/2"
+                      value={studies}
+                      onChange={(e) => {
+                        setStudies(e.target.value);
+                      }}
+                      onKeyDown={(event) => {
+                        const keyValue = event.key;
+                        if (!/\d/.test(keyValue) && keyValue !== "Backspace")
+                          event.preventDefault();
+                      }}
+                    />
+                  </td>
+                </tr>
+                <tr className="h-[10vh]">
+                  <td>Testing</td>
+                  <td>
+                    <input
+                      type="number"
+                      min="0"
+                      className="border-2 border-black rounded-md text-center w-1/2"
+                      value={testing}
+                      onChange={(e) => {
+                        setTesting(e.target.value);
+                      }}
+                      onKeyDown={(event) => {
+                        const keyValue = event.key;
+                        if (!/\d/.test(keyValue) && keyValue !== "Backspace")
+                          event.preventDefault();
+                      }}
+                    />
+                  </td>
+                </tr>
+              </tbody>
+            </table>
+            <Button
+              text="Submit"
+              onClick={(): void => {
+                return;
+              }}
+              type="submit"
+            />
+          </div>
+        </form>
       </div>
     </>
   );
 }
-
-export default NewTimeReport;

From 87c044b5bfe2aadf44576bc0ae6991c52f4ffe0d Mon Sep 17 00:00:00 2001
From: Mattias <mattias.rasmusson.1032@student.lu.se>
Date: Sat, 16 Mar 2024 13:11:26 +0100
Subject: [PATCH 05/18] Submit-button has been moved to the timereport

---
 frontend/src/Pages/UserPages/UserNewTimeReportPage.tsx | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/frontend/src/Pages/UserPages/UserNewTimeReportPage.tsx b/frontend/src/Pages/UserPages/UserNewTimeReportPage.tsx
index c93527a..ca84770 100644
--- a/frontend/src/Pages/UserPages/UserNewTimeReportPage.tsx
+++ b/frontend/src/Pages/UserPages/UserNewTimeReportPage.tsx
@@ -13,13 +13,6 @@ function UserNewTimeReportPage(): JSX.Element {
 
   const buttons = (
     <>
-      <Button
-        text="Submit"
-        onClick={(): void => {
-          return;
-        }}
-        type="button"
-      />
       <Link to="/project">
         <Button
           text="Back"

From d71752ad6f97e71c7acce297ba5f8c8508ee2e2d Mon Sep 17 00:00:00 2001
From: Mattias <mattias.rasmusson.1032@student.lu.se>
Date: Sat, 16 Mar 2024 13:11:39 +0100
Subject: [PATCH 06/18] Created new type for timereport

---
 frontend/src/Types/TimeReport.ts | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 frontend/src/Types/TimeReport.ts

diff --git a/frontend/src/Types/TimeReport.ts b/frontend/src/Types/TimeReport.ts
new file mode 100644
index 0000000..9685964
--- /dev/null
+++ b/frontend/src/Types/TimeReport.ts
@@ -0,0 +1,9 @@
+export interface TimeReport {
+  week: string;
+  development: string;
+  meeting: string;
+  administration: string;
+  ownwork: string;
+  studies: string;
+  testing: string;
+}

From 7fb220f7680dd69d6b24f2283a41af2f0c2188a0 Mon Sep 17 00:00:00 2001
From: Davenludd <david.ludde01@gmail.com>
Date: Sat, 16 Mar 2024 15:14:03 +0100
Subject: [PATCH 07/18] Refactor Register component to use InputField component

---
 frontend/src/Components/Register.tsx | 78 +++++++++++++++-------------
 1 file changed, 42 insertions(+), 36 deletions(-)

diff --git a/frontend/src/Components/Register.tsx b/frontend/src/Components/Register.tsx
index faa1a88..0c0fcd0 100644
--- a/frontend/src/Components/Register.tsx
+++ b/frontend/src/Components/Register.tsx
@@ -4,6 +4,32 @@ import { api } from "../API/API";
 import Logo from "../assets/Logo.svg";
 import Button from "./Button";
 
+function InputField(props: {
+  label: string;
+  type: string;
+  value: string;
+  onChange: (e: React.ChangeEvent<HTMLInputElement>) => void;
+}): JSX.Element {
+  return (
+    <div className="mb-4">
+      <label
+        className="block text-gray-700 text-sm font-sans font-bold mb-2"
+        htmlFor={props.label}
+      >
+        {props.label}
+      </label>
+      <input
+        className="appearance-none border-2 border-black rounded-2xl w-full py-2 px-3 text-gray-700 leading-tight focus:outline-none focus:shadow-outline"
+        id={props.label}
+        type={props.type}
+        placeholder={props.label}
+        value={props.value}
+        onChange={props.onChange}
+      />
+    </div>
+  );
+}
+
 export default function Register(): JSX.Element {
   const [username, setUsername] = useState("");
   const [password, setPassword] = useState("");
@@ -31,42 +57,22 @@ export default function Register(): JSX.Element {
           <h3 className="pb-4 mb-2 text-center font-bold text-[18px]">
             Register New User
           </h3>
-          <div className="mb-4">
-            <label
-              className="block text-gray-700 text-sm font-sans font-bold mb-2"
-              htmlFor="username"
-            >
-              Username
-            </label>
-            <input
-              className="appearance-none border-2 border-black rounded-2xl w-full py-2 px-3 text-gray-700 leading-tight focus:outline-none focus:shadow-outline"
-              id="username"
-              type="text"
-              placeholder="Username"
-              value={username}
-              onChange={(e) => {
-                setUsername(e.target.value);
-              }}
-            />
-          </div>
-          <div className="mb-6">
-            <label
-              className="block text-gray-700 text-sm font-sans font-bold mb-2"
-              htmlFor="password"
-            >
-              Password
-            </label>
-            <input
-              className="appearance-none border-2 border-black rounded-2xl w-full py-2 px-3 text-gray-700 leading-tight focus:outline-none focus:shadow-outline"
-              id="password"
-              type="password"
-              placeholder="Choose password"
-              value={password}
-              onChange={(e) => {
-                setPassword(e.target.value);
-              }}
-            />
-          </div>
+          <InputField
+            label="Username"
+            type="text"
+            value={username}
+            onChange={(e) => {
+              setUsername(e.target.value);
+            }}
+          />
+          <InputField
+            label="Password"
+            type="password"
+            value={password}
+            onChange={(e) => {
+              setPassword(e.target.value);
+            }}
+          />
           <div className="flex items-center justify-between">
             <Button
               text="Register"

From 2ce480707a645f9565c7194b85a6a5da8cf9989b Mon Sep 17 00:00:00 2001
From: Mattias <mattias.rasmusson.1032@student.lu.se>
Date: Sat, 16 Mar 2024 02:46:58 +0100
Subject: [PATCH 08/18] Removed duplicate path

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

diff --git a/frontend/src/main.tsx b/frontend/src/main.tsx
index 29f168e..35dceea 100644
--- a/frontend/src/main.tsx
+++ b/frontend/src/main.tsx
@@ -57,10 +57,6 @@ const router = createBrowserRouter([
     path: "/register",
     element: <Register />,
   },
-  {
-    path: "/admin-menu",
-    element: <AdminMenuPage />,
-  },
   {
     path: "/project-page",
     element: <UserViewTimeReportsPage />,

From a225020f6fcc5b51bd8216e349e9b0d649b3ff2b Mon Sep 17 00:00:00 2001
From: Mattias <mattias.rasmusson.1032@student.lu.se>
Date: Sat, 16 Mar 2024 02:47:17 +0100
Subject: [PATCH 09/18] Visual fixes

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

diff --git a/frontend/src/Components/Register.tsx b/frontend/src/Components/Register.tsx
index e4a3ba0..faa1a88 100644
--- a/frontend/src/Components/Register.tsx
+++ b/frontend/src/Components/Register.tsx
@@ -14,7 +14,7 @@ export default function Register(): JSX.Element {
   };
 
   return (
-    <div className="flex flex-col h-screen w-screen items-center justify-center">
+    <div className="flex flex-col h-fit w-screen items-center justify-center">
       <div className="border-4 border-black bg-white flex flex-col items-center justify-center h-fit w-fit rounded-3xl content-center pl-20 pr-20">
         <form
           className="bg-white rounded px-8 pt-6 pb-8 mb-4 items-center justify-center flex flex-col w-fit h-fit"
@@ -60,7 +60,7 @@ export default function Register(): JSX.Element {
               className="appearance-none border-2 border-black rounded-2xl w-full py-2 px-3 text-gray-700 leading-tight focus:outline-none focus:shadow-outline"
               id="password"
               type="password"
-              placeholder="Choose your password"
+              placeholder="Choose password"
               value={password}
               onChange={(e) => {
                 setPassword(e.target.value);

From aae05acedba335693e371159b4e6996f8e7b7869 Mon Sep 17 00:00:00 2001
From: Mattias <mattias.rasmusson.1032@student.lu.se>
Date: Sat, 16 Mar 2024 02:47:39 +0100
Subject: [PATCH 10/18] Added the register component to content

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

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

From 3419898c664e3f9758f87e945ff34724e5e7ccf1 Mon Sep 17 00:00:00 2001
From: Mattias <mattias.rasmusson.1032@student.lu.se>
Date: Sat, 16 Mar 2024 13:10:46 +0100
Subject: [PATCH 11/18] Created groundwork for the timereport

---
 frontend/src/Components/TimeReport.tsx | 244 ++++++++++++++++++++-----
 1 file changed, 194 insertions(+), 50 deletions(-)

diff --git a/frontend/src/Components/TimeReport.tsx b/frontend/src/Components/TimeReport.tsx
index c4ddc38..cb33ad9 100644
--- a/frontend/src/Components/TimeReport.tsx
+++ b/frontend/src/Components/TimeReport.tsx
@@ -1,59 +1,203 @@
-function NewTimeReport(): JSX.Element {
-  const activities = [
-    "Development",
-    "Meeting",
-    "Administration",
-    "Own Work",
-    "Studies",
-    "Testing",
-  ];
+import { useState } from "react";
+import { TimeReport } from "../Types/TimeReport";
+import { api } from "../API/API";
+import { useNavigate } from "react-router-dom";
+import Button from "./Button";
+
+export default function NewTimeReport(): JSX.Element {
+  const [week, setWeek] = useState("");
+  const [development, setDevelopment] = useState("0");
+  const [meeting, setMeeting] = useState("0");
+  const [administration, setAdministration] = useState("0");
+  const [ownwork, setOwnWork] = useState("0");
+  const [studies, setStudies] = useState("0");
+  const [testing, setTesting] = useState("0");
+
+  const handleNewTimeReport = async (): Promise<void> => {
+    const newTimeReport: TimeReport = {
+      week,
+      development,
+      meeting,
+      administration,
+      ownwork,
+      studies,
+      testing,
+    };
+    await Promise.resolve();
+    // await api.registerTimeReport(newTimeReport); This needs to be implemented!
+  };
+
+  const navigate = useNavigate();
 
   return (
     <>
       <div className="border-4 border-black bg-white flex flex-col justify-start min-h-[65vh] h-fit w-[50vw] rounded-3xl overflow-scroll space-y-[2vh] p-[30px] items-center">
-        <input
-          className="w-fill h-[5vh] font-sans text-[3vh] pl-[1vw] rounded-full text-center pt-[1vh] pb-[1vh] border-2 border-black"
-          type="week"
-          placeholder="Week"
-          onKeyDown={(event) => {
-            event.preventDefault();
+        <form
+          onSubmit={(e) => {
+            if (week === "") {
+              alert("Please enter a week number");
+              e.preventDefault();
+              return;
+            }
+            e.preventDefault();
+            void handleNewTimeReport();
+            navigate("/project");
           }}
-          onPaste={(event) => {
-            event.preventDefault();
-          }}
-        />
-        <table className="w-full text-center divide-y divide-x divide-white text-[30px]">
-          <thead>
-            <tr>
-              <th className="w-1/2 py-2 border-b-2 border-black">Activity</th>
-              <th className="w-1/2 py-2 border-b-2 border-black">
-                Total Time (min)
-              </th>
-            </tr>
-          </thead>
-          <tbody className="divide-y divide-black">
-            {activities.map((activity, index) => (
-              <tr key={index} className="h-[10vh]">
-                <td>{activity}</td>
-                <td>
-                  <input
-                    type="number"
-                    min="0"
-                    className="border-2 border-black rounded-md text-center w-1/2"
-                    onKeyDown={(event) => {
-                      const keyValue = event.key;
-                      if (!/\d/.test(keyValue) && keyValue !== "Backspace")
-                        event.preventDefault();
-                    }}
-                  />
-                </td>
-              </tr>
-            ))}
-          </tbody>
-        </table>
+        >
+          <div 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 = e.target.value.split("-W")[1];
+                setWeek(weekNumber);
+              }}
+              onKeyDown={(event) => {
+                event.preventDefault();
+              }}
+              onPaste={(event) => {
+                event.preventDefault();
+              }}
+            />
+            <table className="w-full text-center divide-y divide-x divide-white text-[30px]">
+              <thead>
+                <tr>
+                  <th className="w-1/2 py-2 border-b-2 border-black">
+                    Activity
+                  </th>
+                  <th className="w-1/2 py-2 border-b-2 border-black">
+                    Total Time (min)
+                  </th>
+                </tr>
+              </thead>
+              <tbody className="divide-y divide-black">
+                <tr className="h-[10vh]">
+                  <td>Development</td>
+                  <td>
+                    <input
+                      type="number"
+                      min="0"
+                      className="border-2 border-black rounded-md text-center w-1/2"
+                      value={development}
+                      onChange={(e) => {
+                        setDevelopment(e.target.value);
+                      }}
+                      onKeyDown={(event) => {
+                        const keyValue = event.key;
+                        if (!/\d/.test(keyValue) && keyValue !== "Backspace")
+                          event.preventDefault();
+                      }}
+                    />
+                  </td>
+                </tr>
+                <tr className="h-[10vh]">
+                  <td>Meeting</td>
+                  <td>
+                    <input
+                      type="number"
+                      min="0"
+                      className="border-2 border-black rounded-md text-center w-1/2"
+                      value={meeting}
+                      onChange={(e) => {
+                        setMeeting(e.target.value);
+                      }}
+                      onKeyDown={(event) => {
+                        const keyValue = event.key;
+                        if (!/\d/.test(keyValue) && keyValue !== "Backspace")
+                          event.preventDefault();
+                      }}
+                    />
+                  </td>
+                </tr>
+                <tr className="h-[10vh]">
+                  <td>Administration</td>
+                  <td>
+                    <input
+                      type="number"
+                      min="0"
+                      className="border-2 border-black rounded-md text-center w-1/2"
+                      value={administration}
+                      onChange={(e) => {
+                        setAdministration(e.target.value);
+                      }}
+                      onKeyDown={(event) => {
+                        const keyValue = event.key;
+                        if (!/\d/.test(keyValue) && keyValue !== "Backspace")
+                          event.preventDefault();
+                      }}
+                    />
+                  </td>
+                </tr>
+                <tr className="h-[10vh]">
+                  <td>Own Work</td>
+                  <td>
+                    <input
+                      type="number"
+                      min="0"
+                      className="border-2 border-black rounded-md text-center w-1/2"
+                      value={ownwork}
+                      onChange={(e) => {
+                        setOwnWork(e.target.value);
+                      }}
+                      onKeyDown={(event) => {
+                        const keyValue = event.key;
+                        if (!/\d/.test(keyValue) && keyValue !== "Backspace")
+                          event.preventDefault();
+                      }}
+                    />
+                  </td>
+                </tr>
+                <tr className="h-[10vh]">
+                  <td>Studies</td>
+                  <td>
+                    <input
+                      type="number"
+                      min="0"
+                      className="border-2 border-black rounded-md text-center w-1/2"
+                      value={studies}
+                      onChange={(e) => {
+                        setStudies(e.target.value);
+                      }}
+                      onKeyDown={(event) => {
+                        const keyValue = event.key;
+                        if (!/\d/.test(keyValue) && keyValue !== "Backspace")
+                          event.preventDefault();
+                      }}
+                    />
+                  </td>
+                </tr>
+                <tr className="h-[10vh]">
+                  <td>Testing</td>
+                  <td>
+                    <input
+                      type="number"
+                      min="0"
+                      className="border-2 border-black rounded-md text-center w-1/2"
+                      value={testing}
+                      onChange={(e) => {
+                        setTesting(e.target.value);
+                      }}
+                      onKeyDown={(event) => {
+                        const keyValue = event.key;
+                        if (!/\d/.test(keyValue) && keyValue !== "Backspace")
+                          event.preventDefault();
+                      }}
+                    />
+                  </td>
+                </tr>
+              </tbody>
+            </table>
+            <Button
+              text="Submit"
+              onClick={(): void => {
+                return;
+              }}
+              type="submit"
+            />
+          </div>
+        </form>
       </div>
     </>
   );
 }
-
-export default NewTimeReport;

From f3c5ce57ebe139c091ab9236a2915ff891c7131d Mon Sep 17 00:00:00 2001
From: Mattias <mattias.rasmusson.1032@student.lu.se>
Date: Sat, 16 Mar 2024 13:11:26 +0100
Subject: [PATCH 12/18] Submit-button has been moved to the timereport

---
 frontend/src/Pages/UserPages/UserNewTimeReportPage.tsx | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/frontend/src/Pages/UserPages/UserNewTimeReportPage.tsx b/frontend/src/Pages/UserPages/UserNewTimeReportPage.tsx
index c93527a..ca84770 100644
--- a/frontend/src/Pages/UserPages/UserNewTimeReportPage.tsx
+++ b/frontend/src/Pages/UserPages/UserNewTimeReportPage.tsx
@@ -13,13 +13,6 @@ function UserNewTimeReportPage(): JSX.Element {
 
   const buttons = (
     <>
-      <Button
-        text="Submit"
-        onClick={(): void => {
-          return;
-        }}
-        type="button"
-      />
       <Link to="/project">
         <Button
           text="Back"

From 92a4808cdd3faf1c53d6f8a0d9bf5af0bb545879 Mon Sep 17 00:00:00 2001
From: Mattias <mattias.rasmusson.1032@student.lu.se>
Date: Sat, 16 Mar 2024 13:11:39 +0100
Subject: [PATCH 13/18] Created new type for timereport

---
 frontend/src/Types/TimeReport.ts | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 frontend/src/Types/TimeReport.ts

diff --git a/frontend/src/Types/TimeReport.ts b/frontend/src/Types/TimeReport.ts
new file mode 100644
index 0000000..9685964
--- /dev/null
+++ b/frontend/src/Types/TimeReport.ts
@@ -0,0 +1,9 @@
+export interface TimeReport {
+  week: string;
+  development: string;
+  meeting: string;
+  administration: string;
+  ownwork: string;
+  studies: string;
+  testing: string;
+}

From d58720cdbd401394e72b70d5360ddcc995494eef Mon Sep 17 00:00:00 2001
From: Davenludd <david.ludde01@gmail.com>
Date: Sat, 16 Mar 2024 15:14:03 +0100
Subject: [PATCH 14/18] Refactor Register component to use InputField component

---
 frontend/src/Components/Register.tsx | 78 +++++++++++++++-------------
 1 file changed, 42 insertions(+), 36 deletions(-)

diff --git a/frontend/src/Components/Register.tsx b/frontend/src/Components/Register.tsx
index faa1a88..0c0fcd0 100644
--- a/frontend/src/Components/Register.tsx
+++ b/frontend/src/Components/Register.tsx
@@ -4,6 +4,32 @@ import { api } from "../API/API";
 import Logo from "../assets/Logo.svg";
 import Button from "./Button";
 
+function InputField(props: {
+  label: string;
+  type: string;
+  value: string;
+  onChange: (e: React.ChangeEvent<HTMLInputElement>) => void;
+}): JSX.Element {
+  return (
+    <div className="mb-4">
+      <label
+        className="block text-gray-700 text-sm font-sans font-bold mb-2"
+        htmlFor={props.label}
+      >
+        {props.label}
+      </label>
+      <input
+        className="appearance-none border-2 border-black rounded-2xl w-full py-2 px-3 text-gray-700 leading-tight focus:outline-none focus:shadow-outline"
+        id={props.label}
+        type={props.type}
+        placeholder={props.label}
+        value={props.value}
+        onChange={props.onChange}
+      />
+    </div>
+  );
+}
+
 export default function Register(): JSX.Element {
   const [username, setUsername] = useState("");
   const [password, setPassword] = useState("");
@@ -31,42 +57,22 @@ export default function Register(): JSX.Element {
           <h3 className="pb-4 mb-2 text-center font-bold text-[18px]">
             Register New User
           </h3>
-          <div className="mb-4">
-            <label
-              className="block text-gray-700 text-sm font-sans font-bold mb-2"
-              htmlFor="username"
-            >
-              Username
-            </label>
-            <input
-              className="appearance-none border-2 border-black rounded-2xl w-full py-2 px-3 text-gray-700 leading-tight focus:outline-none focus:shadow-outline"
-              id="username"
-              type="text"
-              placeholder="Username"
-              value={username}
-              onChange={(e) => {
-                setUsername(e.target.value);
-              }}
-            />
-          </div>
-          <div className="mb-6">
-            <label
-              className="block text-gray-700 text-sm font-sans font-bold mb-2"
-              htmlFor="password"
-            >
-              Password
-            </label>
-            <input
-              className="appearance-none border-2 border-black rounded-2xl w-full py-2 px-3 text-gray-700 leading-tight focus:outline-none focus:shadow-outline"
-              id="password"
-              type="password"
-              placeholder="Choose password"
-              value={password}
-              onChange={(e) => {
-                setPassword(e.target.value);
-              }}
-            />
-          </div>
+          <InputField
+            label="Username"
+            type="text"
+            value={username}
+            onChange={(e) => {
+              setUsername(e.target.value);
+            }}
+          />
+          <InputField
+            label="Password"
+            type="password"
+            value={password}
+            onChange={(e) => {
+              setPassword(e.target.value);
+            }}
+          />
           <div className="flex items-center justify-between">
             <Button
               text="Register"

From 8d0da111ebd674e6395e04b2b999b968451e6c36 Mon Sep 17 00:00:00 2001
From: al8763be <al8763be-s@student.lu.se>
Date: Sun, 17 Mar 2024 12:35:53 +0100
Subject: [PATCH 15/18] API - SubmitWeeklyReport & getUserProjects added

---
 frontend/src/API/API.ts | 57 +++++++++++++++++++++++++++++++++++++++--
 1 file changed, 55 insertions(+), 2 deletions(-)

diff --git a/frontend/src/API/API.ts b/frontend/src/API/API.ts
index 248ad37..ed64f71 100644
--- a/frontend/src/API/API.ts
+++ b/frontend/src/API/API.ts
@@ -1,5 +1,6 @@
 import { NewProject, Project } from "../Types/Project";
 import { NewUser, User } from "../Types/Users";
+import { NewWeeklyReport } from "../Types/goTypes";
 
 // This type of pattern should be hard to misuse
 interface APIResponse<T> {
@@ -20,8 +21,13 @@ interface API {
     project: NewProject,
     token: string,
   ): Promise<APIResponse<Project>>;
+  /** Submit a weekly report */
+  submitWeeklyReport(project: NewWeeklyReport, token: string): Promise<APIResponse<Project>>;
   /** Renew the token */
   renewToken(token: string): Promise<APIResponse<string>>;
+  /** Gets all the projects of a user*/
+  getUserProjects(username: string, token: string): Promise<APIResponse<Project[]>>;
+  
 }
 
 // Export an instance of the API
@@ -49,7 +55,7 @@ export const api: API = {
 
   async removeUser(
     username: string,
-    token: string,
+    token: string
   ): Promise<APIResponse<User>> {
     try {
       const response = await fetch("/api/userdelete", {
@@ -74,7 +80,7 @@ export const api: API = {
 
   async createProject(
     project: NewProject,
-    token: string,
+    token: string
   ): Promise<APIResponse<Project>> {
     try {
       const response = await fetch("/api/project", {
@@ -117,4 +123,51 @@ export const api: API = {
       return { success: false, message: "Failed to renew token" };
     }
   },
+
+  async getUserProjects(token: string): Promise<APIResponse<Project[]>> {
+    try {
+      const response = await fetch("/api/getUserProjects", {
+        method: "GET",
+        headers: {
+          "Content-Type": "application/json",
+          Authorization: "Bearer " + token,
+        },
+      });
+
+      if (!response.ok) {
+        return Promise.resolve({ success: false, message: "Failed to get user projects" });
+      } else {
+        const data = (await response.json()) as Project[];
+        return Promise.resolve({ success: true, data });
+      }
+    }
+    catch (e) {
+      return Promise.resolve({ success: false, message: "Failed to get user projects" });
+    }
+  },
+  
+  submitWeeklyReport: function (project: NewWeeklyReport, token: string): Promise<APIResponse<Project>> {
+    try {
+      return fetch("/api/submitWeeklyReport", {
+        method: "POST",
+        headers: {
+          "Content-Type": "application/json",
+          Authorization: "Bearer " + token,
+        },
+        body: JSON.stringify(project),
+      })
+        .then((response) => {
+          if (!response.ok) {
+            return { success: false, message: "Failed to submit weekly report" };
+          } else {
+            return response.json();
+          }
+        })
+        .then((data) => {
+          return { success: true, data };
+        });
+    } catch (e) {
+      return Promise.resolve({ success: false, message: "Failed to submit weekly report" });
+    }
+  }
 };

From 2eecf17d42ab962d7c0f01cf49e4ee4fe2153e27 Mon Sep 17 00:00:00 2001
From: al8763be <al8763be-s@student.lu.se>
Date: Sun, 17 Mar 2024 14:43:09 +0100
Subject: [PATCH 16/18] Login feature API

---
 frontend/src/API/API.ts | 72 +++++++++++++++++++++++++++++++++--------
 1 file changed, 59 insertions(+), 13 deletions(-)

diff --git a/frontend/src/API/API.ts b/frontend/src/API/API.ts
index ed64f71..be041f1 100644
--- a/frontend/src/API/API.ts
+++ b/frontend/src/API/API.ts
@@ -22,12 +22,19 @@ interface API {
     token: string,
   ): Promise<APIResponse<Project>>;
   /** Submit a weekly report */
-  submitWeeklyReport(project: NewWeeklyReport, token: string): Promise<APIResponse<Project>>;
+  submitWeeklyReport(
+    project: NewWeeklyReport,
+    token: string,
+  ): Promise<APIResponse<Project>>;
   /** Renew the token */
   renewToken(token: string): Promise<APIResponse<string>>;
   /** Gets all the projects of a user*/
-  getUserProjects(username: string, token: string): Promise<APIResponse<Project[]>>;
-  
+  getUserProjects(
+    username: string,
+    token: string,
+  ): Promise<APIResponse<Project[]>>;
+  /** Login */
+  login(NewUser: NewUser): Promise<APIResponse<JSON>>;
 }
 
 // Export an instance of the API
@@ -55,7 +62,7 @@ export const api: API = {
 
   async removeUser(
     username: string,
-    token: string
+    token: string,
   ): Promise<APIResponse<User>> {
     try {
       const response = await fetch("/api/userdelete", {
@@ -80,7 +87,7 @@ export const api: API = {
 
   async createProject(
     project: NewProject,
-    token: string
+    token: string,
   ): Promise<APIResponse<Project>> {
     try {
       const response = await fetch("/api/project", {
@@ -135,18 +142,26 @@ export const api: API = {
       });
 
       if (!response.ok) {
-        return Promise.resolve({ success: false, message: "Failed to get user projects" });
+        return Promise.resolve({
+          success: false,
+          message: "Failed to get user projects",
+        });
       } else {
         const data = (await response.json()) as Project[];
         return Promise.resolve({ success: true, data });
       }
-    }
-    catch (e) {
-      return Promise.resolve({ success: false, message: "Failed to get user projects" });
+    } catch (e) {
+      return Promise.resolve({
+        success: false,
+        message: "Failed to get user projects",
+      });
     }
   },
-  
-  submitWeeklyReport: function (project: NewWeeklyReport, token: string): Promise<APIResponse<Project>> {
+
+  async submitWeeklyReport(
+    project: NewWeeklyReport,
+    token: string,
+  ): Promise<APIResponse<Project>> {
     try {
       return fetch("/api/submitWeeklyReport", {
         method: "POST",
@@ -158,7 +173,10 @@ export const api: API = {
       })
         .then((response) => {
           if (!response.ok) {
-            return { success: false, message: "Failed to submit weekly report" };
+            return {
+              success: false,
+              message: "Failed to submit weekly report",
+            };
           } else {
             return response.json();
           }
@@ -167,7 +185,35 @@ export const api: API = {
           return { success: true, data };
         });
     } catch (e) {
-      return Promise.resolve({ success: false, message: "Failed to submit weekly report" });
+      return Promise.resolve({
+        success: false,
+        message: "Failed to submit weekly report",
+      });
+    }
+  },
+
+  async login(NewUser: NewUser): Promise<APIResponse<JSON>> {
+    try {
+      const response = await fetch("/api/login", {
+        method: "POST",
+        headers: {
+          "Content-Type": "application/json",
+        },
+        body: JSON.stringify(NewUser),
+      });
+
+      if (response) {
+        if (!response.ok) {
+          return { success: false, message: "Failed to login" };
+        } else {
+          const data = await response.json();
+          return { success: true, data };
+        }
+      }
+
+      return { success: false, message: "Failed to login" }; // Add return statement
+    } catch (e) {
+      return Promise.resolve({ success: false, message: "Failed to login" });
     }
   }
 };

From cab7c3bdfd5281a5bd176e6a8d49a92b4445044e Mon Sep 17 00:00:00 2001
From: Imbus <>
Date: Sun, 17 Mar 2024 14:44:25 +0100
Subject: [PATCH 17/18] Formatting and typing to make linter happy

---
 frontend/src/API/API.ts | 49 ++++++++++++++++++++++++++++-------------
 1 file changed, 34 insertions(+), 15 deletions(-)

diff --git a/frontend/src/API/API.ts b/frontend/src/API/API.ts
index ed64f71..2769650 100644
--- a/frontend/src/API/API.ts
+++ b/frontend/src/API/API.ts
@@ -22,12 +22,17 @@ interface API {
     token: string,
   ): Promise<APIResponse<Project>>;
   /** Submit a weekly report */
-  submitWeeklyReport(project: NewWeeklyReport, token: string): Promise<APIResponse<Project>>;
+  submitWeeklyReport(
+    project: NewWeeklyReport,
+    token: string,
+  ): Promise<APIResponse<Project>>;
   /** Renew the token */
   renewToken(token: string): Promise<APIResponse<string>>;
   /** Gets all the projects of a user*/
-  getUserProjects(username: string, token: string): Promise<APIResponse<Project[]>>;
-  
+  getUserProjects(
+    username: string,
+    token: string,
+  ): Promise<APIResponse<Project[]>>;
 }
 
 // Export an instance of the API
@@ -55,7 +60,7 @@ export const api: API = {
 
   async removeUser(
     username: string,
-    token: string
+    token: string,
   ): Promise<APIResponse<User>> {
     try {
       const response = await fetch("/api/userdelete", {
@@ -80,7 +85,7 @@ export const api: API = {
 
   async createProject(
     project: NewProject,
-    token: string
+    token: string,
   ): Promise<APIResponse<Project>> {
     try {
       const response = await fetch("/api/project", {
@@ -135,18 +140,26 @@ export const api: API = {
       });
 
       if (!response.ok) {
-        return Promise.resolve({ success: false, message: "Failed to get user projects" });
+        return Promise.resolve({
+          success: false,
+          message: "Failed to get user projects",
+        });
       } else {
         const data = (await response.json()) as Project[];
         return Promise.resolve({ success: true, data });
       }
-    }
-    catch (e) {
-      return Promise.resolve({ success: false, message: "Failed to get user projects" });
+    } catch (e) {
+      return Promise.resolve({
+        success: false,
+        message: "Failed to get user projects",
+      });
     }
   },
-  
-  submitWeeklyReport: function (project: NewWeeklyReport, token: string): Promise<APIResponse<Project>> {
+
+  submitWeeklyReport: function (
+    project: NewWeeklyReport,
+    token: string,
+  ): Promise<APIResponse<Project>> {
     try {
       return fetch("/api/submitWeeklyReport", {
         method: "POST",
@@ -158,16 +171,22 @@ export const api: API = {
       })
         .then((response) => {
           if (!response.ok) {
-            return { success: false, message: "Failed to submit weekly report" };
+            return {
+              success: false,
+              message: "Failed to submit weekly report",
+            };
           } else {
             return response.json();
           }
         })
-        .then((data) => {
+        .then((data: Project) => {
           return { success: true, data };
         });
     } catch (e) {
-      return Promise.resolve({ success: false, message: "Failed to submit weekly report" });
+      return Promise.resolve({
+        success: false,
+        message: "Failed to submit weekly report",
+      });
     }
-  }
+  },
 };

From 5327ac7ad16300e9e77461d64d9418e77fec4e70 Mon Sep 17 00:00:00 2001
From: al8763be <al8763be-s@student.lu.se>
Date: Sun, 17 Mar 2024 15:03:34 +0100
Subject: [PATCH 18/18] lint + login function for API

---
 frontend/src/Types/Project.ts    | 13 -------------
 frontend/src/Types/TimeReport.ts |  9 ---------
 frontend/src/Types/Users.ts      | 11 -----------
 3 files changed, 33 deletions(-)
 delete mode 100644 frontend/src/Types/Project.ts
 delete mode 100644 frontend/src/Types/TimeReport.ts
 delete mode 100644 frontend/src/Types/Users.ts

diff --git a/frontend/src/Types/Project.ts b/frontend/src/Types/Project.ts
deleted file mode 100644
index bb4f8c7..0000000
--- a/frontend/src/Types/Project.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-export interface Project {
-  id: number;
-  name: string;
-  description: string;
-  owner: string;
-  created: string; // This is a date
-}
-
-export interface NewProject {
-  name: string;
-  description: string;
-  owner: string;
-}
diff --git a/frontend/src/Types/TimeReport.ts b/frontend/src/Types/TimeReport.ts
deleted file mode 100644
index 9685964..0000000
--- a/frontend/src/Types/TimeReport.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-export interface TimeReport {
-  week: string;
-  development: string;
-  meeting: string;
-  administration: string;
-  ownwork: string;
-  studies: string;
-  testing: string;
-}
diff --git a/frontend/src/Types/Users.ts b/frontend/src/Types/Users.ts
deleted file mode 100644
index 8323b2e..0000000
--- a/frontend/src/Types/Users.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-// This is how the API responds
-export interface User {
-  id: number;
-  userName: string;
-}
-
-// Used to create a new user
-export interface NewUser {
-  userName: string;
-  password: string;
-}