From 92cf36d1786a783445884aaee80211ab8cc24526 Mon Sep 17 00:00:00 2001
From: pavel Hamawand <pavelhamawand@gmail.com>
Date: Fri, 15 Mar 2024 01:42:43 +0100
Subject: [PATCH 01/41] increased responsiveness - outer div

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

diff --git a/frontend/src/Pages/LoginPage.tsx b/frontend/src/Pages/LoginPage.tsx
index 7dabfbe..6ccf8fa 100644
--- a/frontend/src/Pages/LoginPage.tsx
+++ b/frontend/src/Pages/LoginPage.tsx
@@ -30,7 +30,7 @@ function LoginPage(): JSX.Element {
     <>
       <PreloadBackgroundAnimation />
       <div
-        className="flex flex-col h-screen w-screen items-center justify-center"
+        className="flex flex-col h-screen items-center justify-center bg-cover bg-fixed"
         style={{
           animation: "backgroundTransition 30s infinite",
           backgroundSize: "cover",

From ef28e1743eae06df54f7937703f7cfbbd040e690 Mon Sep 17 00:00:00 2001
From: pavel Hamawand <pavelhamawand@gmail.com>
Date: Fri, 15 Mar 2024 02:03:22 +0100
Subject: [PATCH 02/41] links to all projects

---
 frontend/src/Pages/YourProjectsPage.tsx | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/frontend/src/Pages/YourProjectsPage.tsx b/frontend/src/Pages/YourProjectsPage.tsx
index d6f5743..7ec147d 100644
--- a/frontend/src/Pages/YourProjectsPage.tsx
+++ b/frontend/src/Pages/YourProjectsPage.tsx
@@ -11,15 +11,21 @@ function YourProjectsPage(): JSX.Element {
             ProjectNameExample
           </h1>
         </Link>
-        <h1 className="underline text-[24px] cursor-pointer font-bold">
-          ProjectNameExample2
-        </h1>
-        <h1 className="underline text-[24px] cursor-pointer font-bold">
-          ProjectNameExample3
-        </h1>
-        <h1 className="underline text-[24px] cursor-pointer font-bold">
-          ProjectNameExample4
-        </h1>
+        <Link to="/project">
+          <h1 className="underline text-[24px] cursor-pointer font-bold">
+            ProjectNameExample2
+          </h1>
+        </Link>
+        <Link to="/project">
+          <h1 className="underline text-[24px] cursor-pointer font-bold">
+            ProjectNameExample3
+          </h1>
+        </Link>
+        <Link to="/project">
+          <h1 className="underline text-[24px] cursor-pointer font-bold">
+            ProjectNameExample4
+          </h1>
+        </Link>
       </div>
     </>
   );

From 2ad7146588bc6a0ab3b45c0416fd45b54a810538 Mon Sep 17 00:00:00 2001
From: Peter KW <peter.k.w.96@gmail.com>
Date: Fri, 15 Mar 2024 02:28:28 +0100
Subject: [PATCH 03/41] Added some functionality to login page. Checks username
 + password and compares with "fake" users to determine which page to get

---
 frontend/src/Pages/LoginPage.tsx | 68 +++++++++++++++++++++++++-------
 1 file changed, 54 insertions(+), 14 deletions(-)

diff --git a/frontend/src/Pages/LoginPage.tsx b/frontend/src/Pages/LoginPage.tsx
index 6ccf8fa..9b4290d 100644
--- a/frontend/src/Pages/LoginPage.tsx
+++ b/frontend/src/Pages/LoginPage.tsx
@@ -1,8 +1,9 @@
 import Button from "../Components/Button";
 import Logo from "/src/assets/Logo.svg";
 import "./LoginPage.css";
-import { useEffect } from "react";
-import { Link } from "react-router-dom";
+import { FormEvent, useEffect, useState } from "react";
+import { NewUser } from "../Types/Users";
+import { useNavigate } from "react-router-dom";
 
 const PreloadBackgroundAnimation = (): JSX.Element => {
   useEffect(() => {
@@ -26,6 +27,39 @@ const PreloadBackgroundAnimation = (): JSX.Element => {
 };
 
 function LoginPage(): JSX.Element {
+  //Example users for testing without backend, remove when using backend
+  const admin: NewUser = {
+    name: "admin",
+    password: "123",
+  };
+  const pmanager: NewUser = {
+    name: "pmanager",
+    password: "123",
+  };
+  const user: NewUser = {
+    name: "user",
+    password: "123",
+  };
+
+  const navigate = useNavigate();
+
+  /* On submit (enter or button click) check if username and password match any user
+   and if so, redirect to correct page */
+  function handleSubmit(event: FormEvent<HTMLFormElement>): void {
+    event.preventDefault();
+    //TODO: Compare with db instead when finished
+    if (username === admin.name && password === admin.password) {
+      navigate("/admin-menu");
+    } else if (username === pmanager.name && password === pmanager.password) {
+      navigate("/PM-project-page");
+    } else if (username === user.name && password === user.password) {
+      navigate("/your-projects");
+    }
+  }
+
+  const [username, setUsername] = useState("");
+  const [password, setPassword] = useState("");
+
   return (
     <>
       <PreloadBackgroundAnimation />
@@ -51,24 +85,30 @@ function LoginPage(): JSX.Element {
             {" "}
             Please log in to continue{" "}
           </h2>
-          <input
-            className="border-2 border-black mb-3 rounded-lg w-[20vw] p-1"
-            type="text"
-            placeholder="Username"
-          />
-          <input
-            className="border-2 border-black mb-3 rounded-lg w-[20vw] p-1"
-            type="password"
-            placeholder="Password"
-          />
-          <Link to="/your-projects">
+          <form className="flex flex-col items-center" onSubmit={handleSubmit}>
+            <input
+              className="border-2 border-black mb-3 rounded-lg w-[20vw] p-1"
+              type="text"
+              placeholder="Username"
+              onChange={(e) => {
+                setUsername(e.target.value);
+              }}
+            />
+            <input
+              className="border-2 border-black mb-3 rounded-lg w-[20vw] p-1"
+              type="password"
+              placeholder="Password"
+              onChange={(e) => {
+                setPassword(e.target.value);
+              }}
+            />
             <Button
               text="Login"
               onClick={(): void => {
                 return;
               }}
             />
-          </Link>
+          </form>
         </div>
       </div>
     </>

From cd1dbb494c2976c20ec84dcd3b3b7e4ed50c4e7b Mon Sep 17 00:00:00 2001
From: Peter KW <peter.k.w.96@gmail.com>
Date: Fri, 15 Mar 2024 02:29:25 +0100
Subject: [PATCH 04/41] Small fix to links in admin-menu page

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

diff --git a/frontend/src/Pages/AdminPages/AdminMenuPage.tsx b/frontend/src/Pages/AdminPages/AdminMenuPage.tsx
index 1b32ed4..4f060c7 100644
--- a/frontend/src/Pages/AdminPages/AdminMenuPage.tsx
+++ b/frontend/src/Pages/AdminPages/AdminMenuPage.tsx
@@ -6,12 +6,12 @@ function AdminMenuPage(): JSX.Element {
     <>
       <h1 className="font-bold text-[30px] mb-[20px]">Administrator Menu</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]">
-        <Link to="/admin-users-page">
+        <Link to="/admin-manage-users">
           <h1 className="font-bold underline text-[30px] cursor-pointer">
             Manage Users
           </h1>
         </Link>
-        <Link to="/admin-projects-page">
+        <Link to="/admin-manage-projects">
           <h1 className="font-bold underline text-[30px] cursor-pointer">
             Manage Projects
           </h1>

From 901bcd39c5478a6a9de65efae06517006a80d351 Mon Sep 17 00:00:00 2001
From: pavel Hamawand <pavelhamawand@gmail.com>
Date: Fri, 15 Mar 2024 03:34:38 +0100
Subject: [PATCH 05/41] link to viewTimeReport

---
 frontend/src/Pages/UserPages/UserProjectPage.tsx         | 8 +++++---
 frontend/src/Pages/UserPages/UserViewTimeReportsPage.tsx | 7 ++++++-
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/frontend/src/Pages/UserPages/UserProjectPage.tsx b/frontend/src/Pages/UserPages/UserProjectPage.tsx
index cfb4a06..d91ef0d 100644
--- a/frontend/src/Pages/UserPages/UserProjectPage.tsx
+++ b/frontend/src/Pages/UserPages/UserProjectPage.tsx
@@ -7,9 +7,11 @@ function UserProjectPage(): JSX.Element {
     <>
       <h1 className="font-bold text-[30px] mb-[20px]">ProjectNameExample</h1>
       <div className="border-4 border-black bg-white flex flex-col items-center justify-center min-h-[65vh] h-fit w-[50vw] rounded-3xl content-center overflow-scroll space-y-[10vh] p-[30px]">
-        <h1 className="font-bold underline text-[30px] cursor-pointer">
-          Your Time Reports
-        </h1>
+        <Link to="/project-page">
+          <h1 className="font-bold underline text-[30px] cursor-pointer">
+            Your Time Reports
+          </h1>
+        </Link>
         <Link to="/new-time-report">
           <h1 className="font-bold underline text-[30px] cursor-pointer">
             New Time Report
diff --git a/frontend/src/Pages/UserPages/UserViewTimeReportsPage.tsx b/frontend/src/Pages/UserPages/UserViewTimeReportsPage.tsx
index b4fb365..e17b3e2 100644
--- a/frontend/src/Pages/UserPages/UserViewTimeReportsPage.tsx
+++ b/frontend/src/Pages/UserPages/UserViewTimeReportsPage.tsx
@@ -2,7 +2,12 @@ import BasicWindow from "../../Components/BasicWindow";
 import Button from "../../Components/Button";
 
 function UserViewTimeReportsPage(): JSX.Element {
-  const content = <></>;
+  const content = (
+    <>
+      <h1 className="font-bold text-[30px] mb-[20px]">Your Time Reports</h1>
+      {/* Här kan du inkludera logiken för att visa användarens tidrapporter */}
+    </>
+  );
 
   const buttons = (
     <>

From dc902855f4358a59d4bd77709b324f3f2a287ce3 Mon Sep 17 00:00:00 2001
From: pavel Hamawand <pavelhamawand@gmail.com>
Date: Fri, 15 Mar 2024 03:41:00 +0100
Subject: [PATCH 06/41] add edit button to viewTimeReport

---
 .../UserPages/UserViewTimeReportsPage.tsx     | 23 ++++++++++++++-----
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/frontend/src/Pages/UserPages/UserViewTimeReportsPage.tsx b/frontend/src/Pages/UserPages/UserViewTimeReportsPage.tsx
index e17b3e2..9eb2e52 100644
--- a/frontend/src/Pages/UserPages/UserViewTimeReportsPage.tsx
+++ b/frontend/src/Pages/UserPages/UserViewTimeReportsPage.tsx
@@ -1,3 +1,4 @@
+import { Link } from "react-router-dom";
 import BasicWindow from "../../Components/BasicWindow";
 import Button from "../../Components/Button";
 
@@ -11,12 +12,22 @@ function UserViewTimeReportsPage(): JSX.Element {
 
   const buttons = (
     <>
-      <Button
-        text="Back"
-        onClick={(): void => {
-          return;
-        }}
-      />
+      <Link to="/edit-time-report">
+        <Button
+          text="Edit"
+          onClick={function (): void {
+            throw new Error("Function not implemented.");
+          }}
+        />
+      </Link>
+      <Link to="/user-project-page">
+        <Button
+          text="Back"
+          onClick={function (): void {
+            throw new Error("Function not implemented.");
+          }}
+        />
+      </Link>
     </>
   );
 

From 69b0318eb095ee7e0108c0b9d253c1441e1d182b Mon Sep 17 00:00:00 2001
From: pavel Hamawand <pavelhamawand@gmail.com>
Date: Fri, 15 Mar 2024 14:48:40 +0100
Subject: [PATCH 07/41] remove edit button and fix back button

---
 .../Pages/UserPages/UserViewTimeReportsPage.tsx    | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/frontend/src/Pages/UserPages/UserViewTimeReportsPage.tsx b/frontend/src/Pages/UserPages/UserViewTimeReportsPage.tsx
index 9eb2e52..992b8db 100644
--- a/frontend/src/Pages/UserPages/UserViewTimeReportsPage.tsx
+++ b/frontend/src/Pages/UserPages/UserViewTimeReportsPage.tsx
@@ -12,19 +12,11 @@ function UserViewTimeReportsPage(): JSX.Element {
 
   const buttons = (
     <>
-      <Link to="/edit-time-report">
-        <Button
-          text="Edit"
-          onClick={function (): void {
-            throw new Error("Function not implemented.");
-          }}
-        />
-      </Link>
-      <Link to="/user-project-page">
+      <Link to="/project">
         <Button
           text="Back"
-          onClick={function (): void {
-            throw new Error("Function not implemented.");
+          onClick={(): void => {
+            return;
           }}
         />
       </Link>

From 44aea9b765bf848f935bcdd411675dcd826f1668 Mon Sep 17 00:00:00 2001
From: Peter KW <peter.k.w.96@gmail.com>
Date: Fri, 15 Mar 2024 14:51:46 +0100
Subject: [PATCH 08/41] Made a back button component since we will have one on
 almost every page

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

diff --git a/frontend/src/Components/BackButton.tsx b/frontend/src/Components/BackButton.tsx
new file mode 100644
index 0000000..7a1ac81
--- /dev/null
+++ b/frontend/src/Components/BackButton.tsx
@@ -0,0 +1,18 @@
+import { useNavigate } from "react-router-dom";
+
+function BackButton(): JSX.Element {
+  const navigate = useNavigate();
+  const goBack = (): void => {
+    navigate(-1);
+  };
+  return (
+    <button
+      onClick={goBack}
+      className="inline-block py-1 px-8 font-bold bg-orange-500 text-white border-2 border-black rounded-full cursor-pointer mt-5 mb-5 transition-colors duration-10 hover:bg-orange-600 hover:text-gray-300 font-family: 'Segoe UI', Tahoma, Geneva, Verdana, sans-serif; font-size: 4vh;"
+    >
+      Back
+    </button>
+  );
+}
+
+export default BackButton;

From 6789cc97cea5fac14116639143fb8ff0a65228f2 Mon Sep 17 00:00:00 2001
From: Peter KW <peter.k.w.96@gmail.com>
Date: Fri, 15 Mar 2024 14:57:49 +0100
Subject: [PATCH 09/41] Added back button to page

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

diff --git a/frontend/src/Pages/AdminPages/AdminManageUsers.tsx b/frontend/src/Pages/AdminPages/AdminManageUsers.tsx
index b25b120..610e8d2 100644
--- a/frontend/src/Pages/AdminPages/AdminManageUsers.tsx
+++ b/frontend/src/Pages/AdminPages/AdminManageUsers.tsx
@@ -1,5 +1,6 @@
 import BasicWindow from "../../Components/BasicWindow";
 import Button from "../../Components/Button";
+import BackButton from "../../Components/BackButton";
 
 function AdminManageUsers(): JSX.Element {
   const content = <></>;
@@ -12,12 +13,7 @@ function AdminManageUsers(): JSX.Element {
           return;
         }}
       />
-      <Button
-        text="Back"
-        onClick={(): void => {
-          return;
-        }}
-      />
+      <BackButton />
     </>
   );
 

From a26499bde96a7ae4aced579a58db4a509fec2260 Mon Sep 17 00:00:00 2001
From: pavel Hamawand <pavelhamawand@gmail.com>
Date: Fri, 15 Mar 2024 15:22:55 +0100
Subject: [PATCH 10/41] change backbutton UserEditTimeReport and
 UserNewTimeReport

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

diff --git a/frontend/src/Pages/UserPages/UserEditTimeReportPage.tsx b/frontend/src/Pages/UserPages/UserEditTimeReportPage.tsx
index de1699b..8028863 100644
--- a/frontend/src/Pages/UserPages/UserEditTimeReportPage.tsx
+++ b/frontend/src/Pages/UserPages/UserEditTimeReportPage.tsx
@@ -1,6 +1,7 @@
 import BasicWindow from "../../Components/BasicWindow";
 import Button from "../../Components/Button";
 import NewTimeReport from "../../Components/TimeReport";
+import BackButton from "../../Components/BackButton";
 
 function UserEditTimeReportPage(): JSX.Element {
   const content = (
@@ -18,12 +19,7 @@ function UserEditTimeReportPage(): JSX.Element {
           return;
         }}
       />
-      <Button
-        text="Back"
-        onClick={(): void => {
-          return;
-        }}
-      />
+      <BackButton />
     </>
   );
 
diff --git a/frontend/src/Pages/UserPages/UserNewTimeReportPage.tsx b/frontend/src/Pages/UserPages/UserNewTimeReportPage.tsx
index 8f96c4a..3843291 100644
--- a/frontend/src/Pages/UserPages/UserNewTimeReportPage.tsx
+++ b/frontend/src/Pages/UserPages/UserNewTimeReportPage.tsx
@@ -1,7 +1,8 @@
 import BasicWindow from "../../Components/BasicWindow";
 import Button from "../../Components/Button";
 import NewTimeReport from "../../Components/TimeReport";
-import { Link } from "react-router-dom";
+//import { Link } from "react-router-dom";
+import BackButton from "../../Components/BackButton";
 
 function UserNewTimeReportPage(): JSX.Element {
   const content = (
@@ -19,14 +20,7 @@ function UserNewTimeReportPage(): JSX.Element {
           return;
         }}
       />
-      <Link to="/project">
-        <Button
-          text="Back"
-          onClick={(): void => {
-            return;
-          }}
-        />
-      </Link>
+      <BackButton />
     </>
   );
 

From 8430d88a072a0354fde149f59d93d19e42e396b3 Mon Sep 17 00:00:00 2001
From: pavel Hamawand <pavelhamawand@gmail.com>
Date: Fri, 15 Mar 2024 15:28:35 +0100
Subject: [PATCH 11/41] change back button UserProjectPage

---
 frontend/src/Pages/UserPages/UserProjectPage.tsx | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/frontend/src/Pages/UserPages/UserProjectPage.tsx b/frontend/src/Pages/UserPages/UserProjectPage.tsx
index d91ef0d..1bd4314 100644
--- a/frontend/src/Pages/UserPages/UserProjectPage.tsx
+++ b/frontend/src/Pages/UserPages/UserProjectPage.tsx
@@ -1,6 +1,6 @@
 import { Link } from "react-router-dom";
 import BasicWindow from "../../Components/BasicWindow";
-import Button from "../../Components/Button";
+import BackButton from "../../Components/BackButton";
 
 function UserProjectPage(): JSX.Element {
   const content = (
@@ -23,14 +23,7 @@ function UserProjectPage(): JSX.Element {
 
   const buttons = (
     <>
-      <Link to="/your-projects">
-        <Button
-          text="Back"
-          onClick={(): void => {
-            return;
-          }}
-        />
-      </Link>
+      <BackButton />
     </>
   );
 

From 2da40e1f54df8edbf085e8b0f117213a3013d894 Mon Sep 17 00:00:00 2001
From: pavel Hamawand <pavelhamawand@gmail.com>
Date: Fri, 15 Mar 2024 15:32:06 +0100
Subject: [PATCH 12/41] change back button UserViewTimeReportsPage

---
 .../src/Pages/UserPages/UserViewTimeReportsPage.tsx  | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/frontend/src/Pages/UserPages/UserViewTimeReportsPage.tsx b/frontend/src/Pages/UserPages/UserViewTimeReportsPage.tsx
index 992b8db..1d2c3f4 100644
--- a/frontend/src/Pages/UserPages/UserViewTimeReportsPage.tsx
+++ b/frontend/src/Pages/UserPages/UserViewTimeReportsPage.tsx
@@ -1,6 +1,5 @@
-import { Link } from "react-router-dom";
 import BasicWindow from "../../Components/BasicWindow";
-import Button from "../../Components/Button";
+import BackButton from "../../Components/BackButton";
 
 function UserViewTimeReportsPage(): JSX.Element {
   const content = (
@@ -12,14 +11,7 @@ function UserViewTimeReportsPage(): JSX.Element {
 
   const buttons = (
     <>
-      <Link to="/project">
-        <Button
-          text="Back"
-          onClick={(): void => {
-            return;
-          }}
-        />
-      </Link>
+      <BackButton />
     </>
   );
 

From f963ca6ae579ca1b9f899a25b977575d71487752 Mon Sep 17 00:00:00 2001
From: Peter KW <peter.k.w.96@gmail.com>
Date: Sat, 16 Mar 2024 02:15:39 +0100
Subject: [PATCH 13/41] A component for listing an array of projects where
 every project gets a link, made for YourProjectsPage.tsx

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

diff --git a/frontend/src/Components/ProjectListUser.tsx b/frontend/src/Components/ProjectListUser.tsx
new file mode 100644
index 0000000..0502159
--- /dev/null
+++ b/frontend/src/Components/ProjectListUser.tsx
@@ -0,0 +1,35 @@
+import { Link } from "react-router-dom";
+import { Project } from "../Types/Project";
+
+/**
+ * The props for the ProjectsProps component
+ */
+interface ProjectProps {
+  projects: Project[];
+}
+
+/**
+ * A list of projects for users, that links the user to the right project page
+ * thanks to the state property
+ * @param props - The projects to display
+ * @returns {JSX.Element} The project list
+ * @example
+ * const projects = [{ id: 1, name: "Random name" }];
+ * return <ProjectList projects={projects} />;
+ */
+
+export function ProjectListUser(props: ProjectProps): JSX.Element {
+  return (
+    <div>
+      <ul className="font-bold underline text-[30px] cursor-pointer">
+        {props.projects.map((project) => (
+          <Link to="/project" key={project.id} state={project.name}>
+            <li className="pt-5" key={project.id}>
+              {project.name}
+            </li>
+          </Link>
+        ))}
+      </ul>
+    </div>
+  );
+}

From 466c25a7c21b0a62199896c83bc747e50842b5e5 Mon Sep 17 00:00:00 2001
From: Peter KW <peter.k.w.96@gmail.com>
Date: Sat, 16 Mar 2024 02:16:06 +0100
Subject: [PATCH 14/41] A component for listing an array of users where every
 user gets a link, made for AdminManageUsers.tsx

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

diff --git a/frontend/src/Components/UserListAdmin.tsx b/frontend/src/Components/UserListAdmin.tsx
new file mode 100644
index 0000000..42fb094
--- /dev/null
+++ b/frontend/src/Components/UserListAdmin.tsx
@@ -0,0 +1,35 @@
+import { Link } from "react-router-dom";
+import { User } from "../Types/Users";
+
+/**
+ * The props for the UserProps component
+ */
+interface UserProps {
+  users: User[];
+}
+
+/**
+ * A list of users for admin manage users page, that links admin to the right user page
+ * thanks to the state property
+ * @param props - The users to display
+ * @returns {JSX.Element} The user list
+ * @example
+ * const users = [{ id: 1, userName: "Random name" }];
+ * return <UserList users={users} />;
+ */
+
+export function UserListAdmin(props: UserProps): JSX.Element {
+  return (
+    <div>
+      <ul className="font-bold underline text-[30px] cursor-pointer padding">
+        {props.users.map((user) => (
+          <Link to="/admin-view-user" key={user.id} state={user.userName}>
+            <li className="pt-5" key={user.id}>
+              {user.userName}
+            </li>
+          </Link>
+        ))}
+      </ul>
+    </div>
+  );
+}

From 8fdd6c0b1f5087f331048226ea76339cea29a374 Mon Sep 17 00:00:00 2001
From: Peter KW <peter.k.w.96@gmail.com>
Date: Sat, 16 Mar 2024 02:18:28 +0100
Subject: [PATCH 15/41] Finished basic view for this page

---
 .../src/Pages/AdminPages/AdminViewUserInfo.tsx | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/frontend/src/Pages/AdminPages/AdminViewUserInfo.tsx b/frontend/src/Pages/AdminPages/AdminViewUserInfo.tsx
index da17ca0..b88ce67 100644
--- a/frontend/src/Pages/AdminPages/AdminViewUserInfo.tsx
+++ b/frontend/src/Pages/AdminPages/AdminViewUserInfo.tsx
@@ -1,8 +1,17 @@
+import { useLocation } from "react-router-dom";
 import BasicWindow from "../../Components/BasicWindow";
 import Button from "../../Components/Button";
+import BackButton from "../../Components/BackButton";
 
 function AdminViewUserInfo(): JSX.Element {
-  const content = <></>;
+  const content = (
+    <>
+      <h1 className="font-bold text-[30px] mb-[20px]">{useLocation().state}</h1>
+      <div className="border-4 border-black bg-white flex flex-col items-center h-[65vh] w-[50vw] rounded-3xl content-center overflow-scroll space-y-[10vh] p-[30px]">
+        <p>Put relevant info on user from database here</p>
+      </div>
+    </>
+  );
 
   const buttons = (
     <>
@@ -12,12 +21,7 @@ function AdminViewUserInfo(): JSX.Element {
           return;
         }}
       />
-      <Button
-        text="Back"
-        onClick={(): void => {
-          return;
-        }}
-      />
+      <BackButton />
     </>
   );
 

From 4a864e1ab5f7055d88a477aabac3b47c30fa2c42 Mon Sep 17 00:00:00 2001
From: Peter KW <peter.k.w.96@gmail.com>
Date: Sat, 16 Mar 2024 02:20:36 +0100
Subject: [PATCH 16/41] Finished design and added fake users for testing

---
 .../src/Pages/AdminPages/AdminManageUsers.tsx | 22 +++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/frontend/src/Pages/AdminPages/AdminManageUsers.tsx b/frontend/src/Pages/AdminPages/AdminManageUsers.tsx
index 610e8d2..867edd8 100644
--- a/frontend/src/Pages/AdminPages/AdminManageUsers.tsx
+++ b/frontend/src/Pages/AdminPages/AdminManageUsers.tsx
@@ -1,16 +1,34 @@
 import BasicWindow from "../../Components/BasicWindow";
 import Button from "../../Components/Button";
 import BackButton from "../../Components/BackButton";
+import { UserListAdmin } from "../../Components/UserListAdmin";
+import { User } from "../../Types/Users";
+import { useNavigate } from "react-router-dom";
 
 function AdminManageUsers(): JSX.Element {
-  const content = <></>;
+  //TODO: Change so that it reads users from database
+  const users: User[] = [];
+  for (let i = 1; i <= 20; i++) {
+    users.push({ id: i, userName: "Example User " + i });
+  }
+
+  const navigate = useNavigate();
+
+  const content = (
+    <>
+      <h1 className="font-bold text-[30px] mb-[20px]">Manage Users</h1>
+      <div className="border-4 border-black bg-white flex flex-col items-center h-[65vh] w-[50vw] rounded-3xl content-center overflow-scroll space-y-[10vh] p-[30px]">
+        <UserListAdmin users={users} />
+      </div>
+    </>
+  );
 
   const buttons = (
     <>
       <Button
         text="Add User"
         onClick={(): void => {
-          return;
+          navigate("/admin-add-user");
         }}
       />
       <BackButton />

From edf503776aeb02bb985e17148fc213d7164cd77c Mon Sep 17 00:00:00 2001
From: Peter KW <peter.k.w.96@gmail.com>
Date: Sat, 16 Mar 2024 02:23:52 +0100
Subject: [PATCH 17/41] Changed design a little so that it uses the projectlist
 component, added some fake projects

---
 frontend/src/Pages/YourProjectsPage.tsx | 38 +++++++++++--------------
 1 file changed, 16 insertions(+), 22 deletions(-)

diff --git a/frontend/src/Pages/YourProjectsPage.tsx b/frontend/src/Pages/YourProjectsPage.tsx
index 7ec147d..2b3fd18 100644
--- a/frontend/src/Pages/YourProjectsPage.tsx
+++ b/frontend/src/Pages/YourProjectsPage.tsx
@@ -1,31 +1,25 @@
-import { Link } from "react-router-dom";
 import BasicWindow from "../Components/BasicWindow";
+import { ProjectListUser } from "../Components/ProjectListUser";
+import { Project } from "../Types/Project";
 
 function YourProjectsPage(): JSX.Element {
+  //TODO: Change so that it reads projects from database
+  const projects: Project[] = [];
+  for (let i = 1; i <= 20; i++) {
+    projects.push({
+      id: i,
+      name: "Example Project " + i,
+      description: "good",
+      created: "now",
+      owner: "me",
+    });
+  }
+
   const content = (
     <>
       <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-between min-h-[65vh] h-fit w-[50vw] rounded-3xl content-center overflow-scroll space-y-[10px] p-[30px]">
-        <Link to="/project">
-          <h1 className="underline text-[24px] cursor-pointer font-bold">
-            ProjectNameExample
-          </h1>
-        </Link>
-        <Link to="/project">
-          <h1 className="underline text-[24px] cursor-pointer font-bold">
-            ProjectNameExample2
-          </h1>
-        </Link>
-        <Link to="/project">
-          <h1 className="underline text-[24px] cursor-pointer font-bold">
-            ProjectNameExample3
-          </h1>
-        </Link>
-        <Link to="/project">
-          <h1 className="underline text-[24px] cursor-pointer font-bold">
-            ProjectNameExample4
-          </h1>
-        </Link>
+      <div className="border-4 border-black bg-white flex flex-col items-center h-[65vh] w-[50vw] rounded-3xl content-center overflow-scroll space-y-[10vh] p-[30px]">
+        <ProjectListUser projects={projects} />
       </div>
     </>
   );

From 9ff3e9314c4fbc9a426a58ff33998b7a61b6898d Mon Sep 17 00:00:00 2001
From: Peter KW <peter.k.w.96@gmail.com>
Date: Sat, 16 Mar 2024 02:27:33 +0100
Subject: [PATCH 18/41] Small change to header; uses useLocation() to get
 correct name

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

diff --git a/frontend/src/Pages/UserPages/UserProjectPage.tsx b/frontend/src/Pages/UserPages/UserProjectPage.tsx
index 1bd4314..4760217 100644
--- a/frontend/src/Pages/UserPages/UserProjectPage.tsx
+++ b/frontend/src/Pages/UserPages/UserProjectPage.tsx
@@ -1,11 +1,11 @@
-import { Link } from "react-router-dom";
+import { Link, useLocation } from "react-router-dom";
 import BasicWindow from "../../Components/BasicWindow";
 import BackButton from "../../Components/BackButton";
 
 function UserProjectPage(): JSX.Element {
   const content = (
     <>
-      <h1 className="font-bold text-[30px] mb-[20px]">ProjectNameExample</h1>
+      <h1 className="font-bold text-[30px] mb-[20px]">{useLocation().state}</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]">
         <Link to="/project-page">
           <h1 className="font-bold underline text-[30px] cursor-pointer">

From 554cf9b12e5e24829273638351b796970cc307df Mon Sep 17 00:00:00 2001
From: pavel Hamawand <pavelhamawand@gmail.com>
Date: Sat, 16 Mar 2024 17:20:14 +0100
Subject: [PATCH 19/41] remove backbutton

---
 .../Pages/ProjectManagerPages/PMProjectPage.tsx    | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/frontend/src/Pages/ProjectManagerPages/PMProjectPage.tsx b/frontend/src/Pages/ProjectManagerPages/PMProjectPage.tsx
index 009a5bd..f1a3a50 100644
--- a/frontend/src/Pages/ProjectManagerPages/PMProjectPage.tsx
+++ b/frontend/src/Pages/ProjectManagerPages/PMProjectPage.tsx
@@ -1,5 +1,4 @@
 import BasicWindow from "../../Components/BasicWindow";
-import Button from "../../Components/Button";
 
 function PMProjectPage(): JSX.Element {
   const content = (
@@ -22,17 +21,6 @@ function PMProjectPage(): JSX.Element {
     </>
   );
 
-  const buttons = (
-    <>
-      <Button
-        text="Back"
-        onClick={(): void => {
-          return;
-        }}
-      />
-    </>
-  );
-
-  return <BasicWindow username="Admin" content={content} buttons={buttons} />;
+  return <BasicWindow username="Admin" content={content} buttons={undefined} />;
 }
 export default PMProjectPage;

From dc84bc997e8596c2928080b9f0e4f169b0943714 Mon Sep 17 00:00:00 2001
From: pavel Hamawand <pavelhamawand@gmail.com>
Date: Sat, 16 Mar 2024 17:25:43 +0100
Subject: [PATCH 20/41] link to unsigned reports

---
 .../src/Pages/ProjectManagerPages/PMProjectPage.tsx    | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/frontend/src/Pages/ProjectManagerPages/PMProjectPage.tsx b/frontend/src/Pages/ProjectManagerPages/PMProjectPage.tsx
index f1a3a50..594a28b 100644
--- a/frontend/src/Pages/ProjectManagerPages/PMProjectPage.tsx
+++ b/frontend/src/Pages/ProjectManagerPages/PMProjectPage.tsx
@@ -1,4 +1,6 @@
+import { Link } from "react-router-dom";
 import BasicWindow from "../../Components/BasicWindow";
+import { JSX } from "react/jsx-runtime";
 
 function PMProjectPage(): JSX.Element {
   const content = (
@@ -14,9 +16,11 @@ function PMProjectPage(): JSX.Element {
         <h1 className="font-bold underline text-[30px] cursor-pointer">
           Statistics
         </h1>
-        <h1 className="font-bold underline text-[30px] cursor-pointer">
-          Unsigned Time Reports
-        </h1>
+        <Link to="/PM-unsigned-reports">
+          <h1 className="font-bold underline text-[30px] cursor-pointer">
+            Unsigned Time Reports
+          </h1>
+        </Link>
       </div>
     </>
   );

From a6846ad7a4a6e47b7a56ef66438ae544904666ec Mon Sep 17 00:00:00 2001
From: pavel Hamawand <pavelhamawand@gmail.com>
Date: Sat, 16 Mar 2024 17:28:45 +0100
Subject: [PATCH 21/41] fix backbutton

---
 .../src/Pages/ProjectManagerPages/PMUnsignedReports.tsx  | 9 ++-------
 frontend/src/Pages/UserPages/UserNewTimeReportPage.tsx   | 1 -
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/frontend/src/Pages/ProjectManagerPages/PMUnsignedReports.tsx b/frontend/src/Pages/ProjectManagerPages/PMUnsignedReports.tsx
index 1f4937f..fae3842 100644
--- a/frontend/src/Pages/ProjectManagerPages/PMUnsignedReports.tsx
+++ b/frontend/src/Pages/ProjectManagerPages/PMUnsignedReports.tsx
@@ -1,17 +1,12 @@
 import BasicWindow from "../../Components/BasicWindow";
-import Button from "../../Components/Button";
+import BackButton from "../../Components/BackButton";
 
 function PMUnsignedReports(): JSX.Element {
   const content = <></>;
 
   const buttons = (
     <>
-      <Button
-        text="Back"
-        onClick={(): void => {
-          return;
-        }}
-      />
+      <BackButton />
     </>
   );
 
diff --git a/frontend/src/Pages/UserPages/UserNewTimeReportPage.tsx b/frontend/src/Pages/UserPages/UserNewTimeReportPage.tsx
index 3843291..d836f75 100644
--- a/frontend/src/Pages/UserPages/UserNewTimeReportPage.tsx
+++ b/frontend/src/Pages/UserPages/UserNewTimeReportPage.tsx
@@ -1,7 +1,6 @@
 import BasicWindow from "../../Components/BasicWindow";
 import Button from "../../Components/Button";
 import NewTimeReport from "../../Components/TimeReport";
-//import { Link } from "react-router-dom";
 import BackButton from "../../Components/BackButton";
 
 function UserNewTimeReportPage(): JSX.Element {

From e837f6e746114047b3a7e2aa0ab6c4c467646b93 Mon Sep 17 00:00:00 2001
From: pavel Hamawand <pavelhamawand@gmail.com>
Date: Sat, 16 Mar 2024 17:37:09 +0100
Subject: [PATCH 22/41] link to your time Reports

---
 frontend/src/Pages/ProjectManagerPages/PMProjectPage.tsx | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/frontend/src/Pages/ProjectManagerPages/PMProjectPage.tsx b/frontend/src/Pages/ProjectManagerPages/PMProjectPage.tsx
index 594a28b..4cf993d 100644
--- a/frontend/src/Pages/ProjectManagerPages/PMProjectPage.tsx
+++ b/frontend/src/Pages/ProjectManagerPages/PMProjectPage.tsx
@@ -7,9 +7,11 @@ function PMProjectPage(): JSX.Element {
     <>
       <h1 className="font-bold text-[30px] mb-[20px]">ProjectNameExample</h1>
       <div className="border-4 border-black bg-white flex flex-col items-center justify-center min-h-[65vh] h-fit w-[50vw] rounded-3xl content-center overflow-scroll space-y-[5vh] p-[30px]">
-        <h1 className="font-bold underline text-[30px] cursor-pointer">
-          Your Time Reports
-        </h1>
+        <Link to="/project-page">
+          <h1 className="font-bold underline text-[30px] cursor-pointer">
+            Your Time Reports
+          </h1>
+        </Link>
         <h1 className="font-bold underline text-[30px] cursor-pointer">
           New Time Report
         </h1>

From 49305d507f6e174205312aa90d19ffeec85bf435 Mon Sep 17 00:00:00 2001
From: pavel Hamawand <pavelhamawand@gmail.com>
Date: Sat, 16 Mar 2024 17:48:23 +0100
Subject: [PATCH 23/41] link to projectMembers

---
 .../Pages/ProjectManagerPages/PMProjectPage.tsx  | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/frontend/src/Pages/ProjectManagerPages/PMProjectPage.tsx b/frontend/src/Pages/ProjectManagerPages/PMProjectPage.tsx
index 4cf993d..8e724f3 100644
--- a/frontend/src/Pages/ProjectManagerPages/PMProjectPage.tsx
+++ b/frontend/src/Pages/ProjectManagerPages/PMProjectPage.tsx
@@ -12,12 +12,16 @@ function PMProjectPage(): JSX.Element {
             Your Time Reports
           </h1>
         </Link>
-        <h1 className="font-bold underline text-[30px] cursor-pointer">
-          New Time Report
-        </h1>
-        <h1 className="font-bold underline text-[30px] cursor-pointer">
-          Statistics
-        </h1>
+        <Link to="/new-time-report">
+          <h1 className="font-bold underline text-[30px] cursor-pointer">
+            New Time Report
+          </h1>
+        </Link>
+        <Link to="/project-members">
+          <h1 className="font-bold underline text-[30px] cursor-pointer">
+            Statistics
+          </h1>
+        </Link>
         <Link to="/PM-unsigned-reports">
           <h1 className="font-bold underline text-[30px] cursor-pointer">
             Unsigned Time Reports

From 8164ba9040fe74a7b49890f5b8b0673c49d6c9fd Mon Sep 17 00:00:00 2001
From: pavel Hamawand <pavelhamawand@gmail.com>
Date: Sat, 16 Mar 2024 17:50:15 +0100
Subject: [PATCH 24/41] fix back button

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

diff --git a/frontend/src/Pages/ProjectManagerPages/PMProjectMembers.tsx b/frontend/src/Pages/ProjectManagerPages/PMProjectMembers.tsx
index a198b8e..131429d 100644
--- a/frontend/src/Pages/ProjectManagerPages/PMProjectMembers.tsx
+++ b/frontend/src/Pages/ProjectManagerPages/PMProjectMembers.tsx
@@ -1,5 +1,6 @@
 import BasicWindow from "../../Components/BasicWindow";
 import Button from "../../Components/Button";
+import BackButton from "../../Components/BackButton";
 
 function PMProjectMembers(): JSX.Element {
   const content = <></>;
@@ -18,12 +19,7 @@ function PMProjectMembers(): JSX.Element {
           return;
         }}
       />
-      <Button
-        text="Back"
-        onClick={(): void => {
-          return;
-        }}
-      />
+      <BackButton />
     </>
   );
 

From 9aa50878711aca44264db4c8ba8bb41b68ecca02 Mon Sep 17 00:00:00 2001
From: pavel Hamawand <pavelhamawand@gmail.com>
Date: Sat, 16 Mar 2024 17:54:34 +0100
Subject: [PATCH 25/41] time / activity link

---
 .../ProjectManagerPages/PMProjectMembers.tsx      | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/frontend/src/Pages/ProjectManagerPages/PMProjectMembers.tsx b/frontend/src/Pages/ProjectManagerPages/PMProjectMembers.tsx
index 131429d..f2a6b94 100644
--- a/frontend/src/Pages/ProjectManagerPages/PMProjectMembers.tsx
+++ b/frontend/src/Pages/ProjectManagerPages/PMProjectMembers.tsx
@@ -1,18 +1,21 @@
 import BasicWindow from "../../Components/BasicWindow";
 import Button from "../../Components/Button";
 import BackButton from "../../Components/BackButton";
+import { Link } from "react-router-dom";
 
 function PMProjectMembers(): JSX.Element {
   const content = <></>;
 
   const buttons = (
     <>
-      <Button
-        text="Time / Activity"
-        onClick={(): void => {
-          return;
-        }}
-      />
+      <Link to="/PM-time-activity">
+        <Button
+          text="Time / Activity"
+          onClick={(): void => {
+            return;
+          }}
+        />
+      </Link>
       <Button
         text="Time / Role"
         onClick={(): void => {

From bdd6f684702df89f463cbf3afcd69381c482959d Mon Sep 17 00:00:00 2001
From: pavel Hamawand <pavelhamawand@gmail.com>
Date: Sat, 16 Mar 2024 17:56:59 +0100
Subject: [PATCH 26/41] Time / role link

---
 .../Pages/ProjectManagerPages/PMProjectMembers.tsx | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/frontend/src/Pages/ProjectManagerPages/PMProjectMembers.tsx b/frontend/src/Pages/ProjectManagerPages/PMProjectMembers.tsx
index f2a6b94..2af1145 100644
--- a/frontend/src/Pages/ProjectManagerPages/PMProjectMembers.tsx
+++ b/frontend/src/Pages/ProjectManagerPages/PMProjectMembers.tsx
@@ -16,12 +16,14 @@ function PMProjectMembers(): JSX.Element {
           }}
         />
       </Link>
-      <Button
-        text="Time / Role"
-        onClick={(): void => {
-          return;
-        }}
-      />
+      <Link to="/PM-time-role">
+        <Button
+          text="Time / Role"
+          onClick={(): void => {
+            return;
+          }}
+        />
+      </Link>
       <BackButton />
     </>
   );

From 17e9fa9d0ae2057cb6d1a8c8cee2b614c6d233d3 Mon Sep 17 00:00:00 2001
From: pavel Hamawand <pavelhamawand@gmail.com>
Date: Sat, 16 Mar 2024 17:57:51 +0100
Subject: [PATCH 27/41] backbutton

---
 frontend/src/Pages/ProjectManagerPages/PMChangeRole.tsx | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/frontend/src/Pages/ProjectManagerPages/PMChangeRole.tsx b/frontend/src/Pages/ProjectManagerPages/PMChangeRole.tsx
index 6d87b90..8f7bf9b 100644
--- a/frontend/src/Pages/ProjectManagerPages/PMChangeRole.tsx
+++ b/frontend/src/Pages/ProjectManagerPages/PMChangeRole.tsx
@@ -1,5 +1,6 @@
 import BasicWindow from "../../Components/BasicWindow";
 import Button from "../../Components/Button";
+import BackButton from "../../Components/BackButton";
 
 function ChangeRole(): JSX.Element {
   const content = <></>;
@@ -12,12 +13,7 @@ function ChangeRole(): JSX.Element {
           return;
         }}
       />
-      <Button
-        text="Back"
-        onClick={(): void => {
-          return;
-        }}
-      />
+      <BackButton />
     </>
   );
 

From 92336ff4fdb8b928cdad7d9d4eb724367eaed2c5 Mon Sep 17 00:00:00 2001
From: pavel Hamawand <pavelhamawand@gmail.com>
Date: Sat, 16 Mar 2024 17:58:27 +0100
Subject: [PATCH 28/41] backbutton

---
 .../src/Pages/ProjectManagerPages/PMOtherUsersTR.tsx     | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/frontend/src/Pages/ProjectManagerPages/PMOtherUsersTR.tsx b/frontend/src/Pages/ProjectManagerPages/PMOtherUsersTR.tsx
index 06d405b..19ebbd9 100644
--- a/frontend/src/Pages/ProjectManagerPages/PMOtherUsersTR.tsx
+++ b/frontend/src/Pages/ProjectManagerPages/PMOtherUsersTR.tsx
@@ -1,17 +1,12 @@
 import BasicWindow from "../../Components/BasicWindow";
-import Button from "../../Components/Button";
+import BackButton from "../../Components/BackButton";
 
 function PMOtherUsersTR(): JSX.Element {
   const content = <></>;
 
   const buttons = (
     <>
-      <Button
-        text="Back"
-        onClick={(): void => {
-          return;
-        }}
-      />
+      <BackButton />
     </>
   );
 

From 38378c7a10b61abee9a7bc2462aeec8feebc8d01 Mon Sep 17 00:00:00 2001
From: pavel Hamawand <pavelhamawand@gmail.com>
Date: Sat, 16 Mar 2024 17:59:25 +0100
Subject: [PATCH 29/41] babkbutton

---
 .../Pages/ProjectManagerPages/PMTotalTimeActivity.tsx    | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/frontend/src/Pages/ProjectManagerPages/PMTotalTimeActivity.tsx b/frontend/src/Pages/ProjectManagerPages/PMTotalTimeActivity.tsx
index c36d2df..dd84fd7 100644
--- a/frontend/src/Pages/ProjectManagerPages/PMTotalTimeActivity.tsx
+++ b/frontend/src/Pages/ProjectManagerPages/PMTotalTimeActivity.tsx
@@ -1,6 +1,6 @@
 import BasicWindow from "../../Components/BasicWindow";
-import Button from "../../Components/Button";
 import TimeReport from "../../Components/TimeReport";
+import BackButton from "../../Components/BackButton";
 
 function PMTotalTimeActivity(): JSX.Element {
   const content = (
@@ -14,12 +14,7 @@ function PMTotalTimeActivity(): JSX.Element {
 
   const buttons = (
     <>
-      <Button
-        text="Back"
-        onClick={(): void => {
-          return;
-        }}
-      />
+      <BackButton />
     </>
   );
 

From 31e3b99448bd90d24b369436db568291c3be7578 Mon Sep 17 00:00:00 2001
From: pavel Hamawand <pavelhamawand@gmail.com>
Date: Sat, 16 Mar 2024 18:00:10 +0100
Subject: [PATCH 30/41] backbutton

---
 .../src/Pages/ProjectManagerPages/PMTotalTimeRole.tsx    | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/frontend/src/Pages/ProjectManagerPages/PMTotalTimeRole.tsx b/frontend/src/Pages/ProjectManagerPages/PMTotalTimeRole.tsx
index f3b3c5a..05d902f 100644
--- a/frontend/src/Pages/ProjectManagerPages/PMTotalTimeRole.tsx
+++ b/frontend/src/Pages/ProjectManagerPages/PMTotalTimeRole.tsx
@@ -1,17 +1,12 @@
 import BasicWindow from "../../Components/BasicWindow";
-import Button from "../../Components/Button";
+import BackButton from "../../Components/BackButton";
 
 function PMTotalTimeRole(): JSX.Element {
   const content = <></>;
 
   const buttons = (
     <>
-      <Button
-        text="Back"
-        onClick={(): void => {
-          return;
-        }}
-      />
+      <BackButton />
     </>
   );
 

From 17edf6b911dab609c34de74af85613936d78c8bb Mon Sep 17 00:00:00 2001
From: pavel Hamawand <pavelhamawand@gmail.com>
Date: Sat, 16 Mar 2024 18:01:14 +0100
Subject: [PATCH 31/41] backButton

---
 .../Pages/ProjectManagerPages/PMViewUnsignedReport.tsx    | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/frontend/src/Pages/ProjectManagerPages/PMViewUnsignedReport.tsx b/frontend/src/Pages/ProjectManagerPages/PMViewUnsignedReport.tsx
index 923548f..3bbf3ee 100644
--- a/frontend/src/Pages/ProjectManagerPages/PMViewUnsignedReport.tsx
+++ b/frontend/src/Pages/ProjectManagerPages/PMViewUnsignedReport.tsx
@@ -1,6 +1,7 @@
 import BasicWindow from "../../Components/BasicWindow";
 import Button from "../../Components/Button";
 import TimeReport from "../../Components/TimeReport";
+import BackButton from "../../Components/BackButton";
 
 function PMViewUnsignedReport(): JSX.Element {
   const content = (
@@ -26,12 +27,7 @@ function PMViewUnsignedReport(): JSX.Element {
           return;
         }}
       />
-      <Button
-        text="Back"
-        onClick={(): void => {
-          return;
-        }}
-      />
+      <BackButton />
     </>
   );
 

From c12e19770ebe6a39cb8c97980944b64a0fca43bb Mon Sep 17 00:00:00 2001
From: Peter KW <peter.k.w.96@gmail.com>
Date: Sun, 17 Mar 2024 10:33:37 +0100
Subject: [PATCH 32/41] Restructuring, less paths

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

diff --git a/frontend/src/main.tsx b/frontend/src/main.tsx
index 29f168e..92e0a70 100644
--- a/frontend/src/main.tsx
+++ b/frontend/src/main.tsx
@@ -2,152 +2,27 @@ import React from "react";
 import ReactDOM from "react-dom/client";
 import "./index.css";
 import { createBrowserRouter, RouterProvider } from "react-router-dom";
-import LoginPage from "./Pages/LoginPage.tsx";
-import YourProjectsPage from "./Pages/YourProjectsPage.tsx";
-import UserProjectPage from "./Pages/UserPages/UserProjectPage.tsx";
-import Register from "./Components/Register.tsx";
-import AdminMenuPage from "./Pages/AdminPages/AdminMenuPage.tsx";
-import UserEditTimeReportPage from "./Pages/UserPages/UserEditTimeReportPage.tsx";
-import UserNewTimeReportPage from "./Pages/UserPages/UserNewTimeReportPage.tsx";
-import UserViewTimeReportsPage from "./Pages/UserPages/UserViewTimeReportsPage.tsx";
-import PMChangeRole from "./Pages/ProjectManagerPages/PMChangeRole.tsx";
-import PMOtherUsersTR from "./Pages/ProjectManagerPages/PMOtherUsersTR.tsx";
-import PMProjectMembers from "./Pages/ProjectManagerPages/PMProjectMembers.tsx";
-import PMProjectPage from "./Pages/ProjectManagerPages/PMProjectPage.tsx";
-import PMTotalTimeActivity from "./Pages/ProjectManagerPages/PMTotalTimeActivity.tsx";
-import PMTotalTimeRole from "./Pages/ProjectManagerPages/PMTotalTimeRole.tsx";
-import PMUnsignedReports from "./Pages/ProjectManagerPages/PMUnsignedReports.tsx";
-import PMViewUnsignedReport from "./Pages/ProjectManagerPages/PMViewUnsignedReport.tsx";
-import AdminManageUsers from "./Pages/AdminPages/AdminManageUsers.tsx";
-import AdminViewUserInfo from "./Pages/AdminPages/AdminViewUserInfo.tsx";
-import AdminManageProjects from "./Pages/AdminPages/AdminManageProjects.tsx";
-import AdminAddProject from "./Pages/AdminPages/AdminAddProject.tsx";
-import AdminAddUser from "./Pages/AdminPages/AdminAddUser.tsx";
-import AdminChangeUsername from "./Pages/AdminPages/AdminChangeUsername.tsx";
-import AdminProjectAddMember from "./Pages/AdminPages/AdminProjectAddMember.tsx";
-import AdminProjectChangeUserRole from "./Pages/AdminPages/AdminProjectChangeUserRole.tsx";
-import AdminProjectManageMembers from "./Pages/AdminPages/AdminProjectManageMembers.tsx";
-import AdminProjectStatistics from "./Pages/AdminPages/AdminProjectStatistics.tsx";
-import AdminProjectViewMemberInfo from "./Pages/AdminPages/AdminProjectViewMemberInfo.tsx";
-import AdminProjectPage from "./Pages/AdminPages/AdminProjectPage.tsx";
+import App from "./Pages/App";
+import AdminMenuPage from "./Pages/AdminPages/AdminMenuPage";
+import YourProjectsPage from "./Pages/YourProjectsPage";
 
 // This is where the routes are mounted
 const router = createBrowserRouter([
   {
     path: "/",
-    element: <LoginPage />,
+    element: <App />,
   },
   {
-    path: "/your-projects",
+    path: "/admin",
+    element: <AdminMenuPage />,
+  },
+  {
+    path: "/pm",
     element: <YourProjectsPage />,
   },
   {
-    path: "/edit-time-report",
-    element: <UserEditTimeReportPage />,
-  },
-  {
-    path: "/new-time-report",
-    element: <UserNewTimeReportPage />,
-  },
-  {
-    path: "/project",
-    element: <UserProjectPage />,
-  },
-  {
-    path: "/register",
-    element: <Register />,
-  },
-  {
-    path: "/admin-menu",
-    element: <AdminMenuPage />,
-  },
-  {
-    path: "/project-page",
-    element: <UserViewTimeReportsPage />,
-  },
-  {
-    path: "/change-role",
-    element: <PMChangeRole />,
-  },
-  {
-    path: "/other-users-time-reports",
-    element: <PMOtherUsersTR />,
-  },
-  {
-    path: "/project-members",
-    element: <PMProjectMembers />,
-  },
-  {
-    path: "/PM-project-page",
-    element: <PMProjectPage />,
-  },
-  {
-    path: "/PM-time-activity",
-    element: <PMTotalTimeActivity />,
-  },
-  {
-    path: "/PM-time-role",
-    element: <PMTotalTimeRole />,
-  },
-  {
-    path: "/PM-unsigned-reports",
-    element: <PMUnsignedReports />,
-  },
-  {
-    path: "/PM-view-unsigned-report",
-    element: <PMViewUnsignedReport />,
-  },
-  {
-    path: "/admin-add-project",
-    element: <AdminAddProject />,
-  },
-  {
-    path: "/admin-add-user",
-    element: <AdminAddUser />,
-  },
-  {
-    path: "/admin-change-username",
-    element: <AdminChangeUsername />,
-  },
-  {
-    path: "/admin-manage-projects",
-    element: <AdminManageProjects />,
-  },
-  {
-    path: "/admin-manage-users",
-    element: <AdminManageUsers />,
-  },
-  {
-    path: "/admin-menu",
-    element: <AdminMenuPage />,
-  },
-  {
-    path: "/admin-project-add-member",
-    element: <AdminProjectAddMember />,
-  },
-  {
-    path: "/admin-project-change-user-role",
-    element: <AdminProjectChangeUserRole />,
-  },
-  {
-    path: "/admin-project-manage-members",
-    element: <AdminProjectManageMembers />,
-  },
-  {
-    path: "/admin-project-page",
-    element: <AdminProjectPage />,
-  },
-  {
-    path: "/admin-project-statistics",
-    element: <AdminProjectStatistics />,
-  },
-  {
-    path: "/admin-project-view-members",
-    element: <AdminProjectViewMemberInfo />,
-  },
-  {
-    path: "/admin-view-user",
-    element: <AdminViewUserInfo />,
+    path: "/user",
+    element: <YourProjectsPage />,
   },
 ]);
 

From 2921458d82b9dbadf99751297dc2ca05516651ab Mon Sep 17 00:00:00 2001
From: Peter KW <peter.k.w.96@gmail.com>
Date: Sun, 17 Mar 2024 10:34:15 +0100
Subject: [PATCH 33/41] Made backround animation on login page to its own
 component

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

diff --git a/frontend/src/Components/BackgroundAnimation.tsx b/frontend/src/Components/BackgroundAnimation.tsx
new file mode 100644
index 0000000..5f402c0
--- /dev/null
+++ b/frontend/src/Components/BackgroundAnimation.tsx
@@ -0,0 +1,24 @@
+import { useEffect } from "react";
+
+const BackgroundAnimation = (): JSX.Element => {
+  useEffect(() => {
+    const images = [
+      "src/assets/1.jpg",
+      "src/assets/2.jpg",
+      "src/assets/3.jpg",
+      "src/assets/4.jpg",
+    ];
+
+    // Pre-load images
+    for (const i of images) {
+      console.log(i);
+    }
+
+    // Start animation
+    document.body.style.animation = "backgroundTransition 30s infinite";
+  }, []);
+
+  return <></>;
+};
+
+export default BackgroundAnimation;

From 217b7b4a228c21441ba90b8cff81a381c9577af8 Mon Sep 17 00:00:00 2001
From: Peter KW <peter.k.w.96@gmail.com>
Date: Sun, 17 Mar 2024 10:34:47 +0100
Subject: [PATCH 34/41] Input field component

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

diff --git a/frontend/src/Components/InputField.tsx b/frontend/src/Components/InputField.tsx
new file mode 100644
index 0000000..639b4ca
--- /dev/null
+++ b/frontend/src/Components/InputField.tsx
@@ -0,0 +1,41 @@
+/**
+ * A customizable input field
+ * @param props - Settings for the field
+ * @returns {JSX.Element} The input field
+ * @example
+ * <InputField
+ *   type="text"
+ *   label="Example"
+ *   onChange={(e) => {
+ *     setExample(e.target.value);
+ *   }}
+ *   value={example}
+ * />
+ */
+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 InputField;

From 94f5d3f85b287d8c3a4c2e9203ad216d1d3b4a1a Mon Sep 17 00:00:00 2001
From: Peter KW <peter.k.w.96@gmail.com>
Date: Sun, 17 Mar 2024 10:35:48 +0100
Subject: [PATCH 35/41] Component for checking login, to be replaced with
 proper fetching

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

diff --git a/frontend/src/Components/LoginCheck.tsx b/frontend/src/Components/LoginCheck.tsx
new file mode 100644
index 0000000..ccf761d
--- /dev/null
+++ b/frontend/src/Components/LoginCheck.tsx
@@ -0,0 +1,35 @@
+import { NewUser } from "../Types/Users";
+
+function LoginCheck(props: { username: string; password: string }): number {
+  //Example users for testing without backend, remove when using backend
+  const admin: NewUser = {
+    userName: "admin",
+    password: "123",
+  };
+  const pmanager: NewUser = {
+    userName: "pmanager",
+    password: "123",
+  };
+  const user: NewUser = {
+    userName: "user",
+    password: "123",
+  };
+
+  //TODO: Compare with db instead when finished
+  if (props.username === admin.userName && props.password === admin.password) {
+    return 1;
+  } else if (
+    props.username === pmanager.userName &&
+    props.password === pmanager.password
+  ) {
+    return 2;
+  } else if (
+    props.username === user.userName &&
+    props.password === user.password
+  ) {
+    return 3;
+  }
+  return 0;
+}
+
+export default LoginCheck;

From 02332c284b2d2721837ed5b100136fb1df916672 Mon Sep 17 00:00:00 2001
From: Peter KW <peter.k.w.96@gmail.com>
Date: Sun, 17 Mar 2024 10:36:29 +0100
Subject: [PATCH 36/41] Login field component

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

diff --git a/frontend/src/Components/LoginField.tsx b/frontend/src/Components/LoginField.tsx
new file mode 100644
index 0000000..7f43ec2
--- /dev/null
+++ b/frontend/src/Components/LoginField.tsx
@@ -0,0 +1,54 @@
+import { Dispatch, FormEventHandler, SetStateAction } from "react";
+import Button from "./Button";
+import InputField from "./InputField";
+
+/**
+ * A login field complete with input fields
+ * and a button for submitting the information
+ * @param props - Settings
+ * @returns {JSX.Element} A login component
+ * @example
+ * <Login
+ *   handleSubmit={handleSubmit}
+ *   setUsername={setUsername}
+ *   setPassword={setPassword}
+ *   username={username}
+ *   password={password}
+ * />
+ */
+function Login(props: {
+  handleSubmit: FormEventHandler<HTMLFormElement>;
+  setUsername: Dispatch<SetStateAction<string>>;
+  setPassword: Dispatch<SetStateAction<string>>;
+  username: string;
+  password: string;
+}): JSX.Element {
+  return (
+    <form className="flex flex-col items-center" onSubmit={props.handleSubmit}>
+      <InputField
+        type="text"
+        label="Username"
+        onChange={(e) => {
+          props.setUsername(e.target.value);
+        }}
+        value={props.username}
+      />
+      <InputField
+        type="password"
+        label="Password"
+        onChange={(e) => {
+          props.setPassword(e.target.value);
+        }}
+        value={props.password}
+      />
+      <Button
+        text="Login"
+        onClick={(): void => {
+          return;
+        }}
+      />
+    </form>
+  );
+}
+
+export default Login;

From 15ec2108d3ba132e8a077e594c687a3c40b88de4 Mon Sep 17 00:00:00 2001
From: Peter KW <peter.k.w.96@gmail.com>
Date: Sun, 17 Mar 2024 10:38:25 +0100
Subject: [PATCH 37/41] Everything run from this file

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

diff --git a/frontend/src/Pages/App.tsx b/frontend/src/Pages/App.tsx
new file mode 100644
index 0000000..7ded3b6
--- /dev/null
+++ b/frontend/src/Pages/App.tsx
@@ -0,0 +1,20 @@
+import { useState } from "react";
+
+import LoginPage from "./LoginPage";
+import { useNavigate } from "react-router-dom";
+
+function App(): JSX.Element {
+  const navigate = useNavigate();
+  const [authority, setAuthority] = useState(0);
+  if (authority === 1) {
+    navigate("/admin");
+  } else if (authority === 2) {
+    navigate("/pm");
+  } else if (authority === 3) {
+    navigate("/user");
+  }
+
+  return <LoginPage setAuthority={setAuthority} />;
+}
+
+export default App;

From 8cf873a98bd8db52700eff69496803993527deb5 Mon Sep 17 00:00:00 2001
From: Peter KW <peter.k.w.96@gmail.com>
Date: Sun, 17 Mar 2024 10:39:57 +0100
Subject: [PATCH 38/41] Changed so that most functionality was moved to
 separate components

---
 frontend/src/Pages/LoginPage.tsx | 101 +++++++------------------------
 1 file changed, 21 insertions(+), 80 deletions(-)

diff --git a/frontend/src/Pages/LoginPage.tsx b/frontend/src/Pages/LoginPage.tsx
index e6d14bc..f58f3e0 100644
--- a/frontend/src/Pages/LoginPage.tsx
+++ b/frontend/src/Pages/LoginPage.tsx
@@ -1,71 +1,29 @@
-import Button from "../Components/Button";
 import Logo from "/src/assets/Logo.svg";
 import "./LoginPage.css";
-import { FormEvent, useEffect, useState } from "react";
-import { NewUser } from "../Types/Users";
-import { useNavigate } from "react-router-dom";
+import { Dispatch, FormEvent, SetStateAction, useState } from "react";
+import BackgroundAnimation from "../Components/BackgroundAnimation";
+import LoginField from "../Components/LoginField";
+import LoginCheck from "../Components/LoginCheck";
 
-const PreloadBackgroundAnimation = (): JSX.Element => {
-  useEffect(() => {
-    const images = [
-      "src/assets/1.jpg",
-      "src/assets/2.jpg",
-      "src/assets/3.jpg",
-      "src/assets/4.jpg",
-    ];
-
-    // Pre-load images
-    for (const i of images) {
-      console.log(i);
-    }
-
-    // Start animation
-    document.body.style.animation = "backgroundTransition 30s infinite";
-  }, []);
-
-  return <></>;
-};
-
-function LoginPage(): JSX.Element {
-  //Example users for testing without backend, remove when using backend
-  const admin: NewUser = {
-    userName: "admin",
-    password: "123",
-  };
-  const pmanager: NewUser = {
-    userName: "pmanager",
-    password: "123",
-  };
-  const user: NewUser = {
-    userName: "user",
-    password: "123",
-  };
-
-  const navigate = useNavigate();
+function LoginPage(props: {
+  setAuthority: Dispatch<SetStateAction<number>>;
+}): JSX.Element {
+  const [username, setUsername] = useState("");
+  const [password, setPassword] = useState("");
 
   /* On submit (enter or button click) check if username and password match any user
    and if so, redirect to correct page */
   function handleSubmit(event: FormEvent<HTMLFormElement>): void {
     event.preventDefault();
-    //TODO: Compare with db instead when finished
-    if (username === admin.userName && password === admin.password) {
-      navigate("/admin-menu");
-    } else if (
-      username === pmanager.userName &&
-      password === pmanager.password
-    ) {
-      navigate("/PM-project-page");
-    } else if (username === user.userName && password === user.password) {
-      navigate("/your-projects");
-    }
+    props.setAuthority((prevAuth) => {
+      prevAuth = LoginCheck({ username: username, password: password });
+      return prevAuth;
+    });
   }
 
-  const [username, setUsername] = useState("");
-  const [password, setPassword] = useState("");
-
   return (
     <>
-      <PreloadBackgroundAnimation />
+      <BackgroundAnimation />
       <div
         className="flex flex-col h-screen items-center justify-center bg-cover bg-fixed"
         style={{
@@ -88,30 +46,13 @@ function LoginPage(): JSX.Element {
             {" "}
             Please log in to continue{" "}
           </h2>
-          <form className="flex flex-col items-center" onSubmit={handleSubmit}>
-            <input
-              className="border-2 border-black mb-3 rounded-lg w-[20vw] p-1"
-              type="text"
-              placeholder="Username"
-              onChange={(e) => {
-                setUsername(e.target.value);
-              }}
-            />
-            <input
-              className="border-2 border-black mb-3 rounded-lg w-[20vw] p-1"
-              type="password"
-              placeholder="Password"
-              onChange={(e) => {
-                setPassword(e.target.value);
-              }}
-            />
-            <Button
-              text="Login"
-              onClick={(): void => {
-                return;
-              }}
-            />
-          </form>
+          <LoginField
+            handleSubmit={handleSubmit}
+            setUsername={setUsername}
+            setPassword={setPassword}
+            username={username}
+            password={password}
+          />
         </div>
       </div>
     </>

From b6535c883d9410c3e9684c5630b7037095ca0ac5 Mon Sep 17 00:00:00 2001
From: Peter KW <peter.k.w.96@gmail.com>
Date: Sun, 17 Mar 2024 11:34:39 +0100
Subject: [PATCH 39/41] Small fix

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

diff --git a/frontend/src/Components/LoginField.tsx b/frontend/src/Components/LoginField.tsx
index 7f43ec2..ec5aaaa 100644
--- a/frontend/src/Components/LoginField.tsx
+++ b/frontend/src/Components/LoginField.tsx
@@ -46,6 +46,7 @@ function Login(props: {
         onClick={(): void => {
           return;
         }}
+        type={"button"}
       />
     </form>
   );

From 9bab627255dfe5b5b81fbfc2aa8922013299d77e Mon Sep 17 00:00:00 2001
From: Peter KW <peter.k.w.96@gmail.com>
Date: Sun, 17 Mar 2024 12:57:18 +0100
Subject: [PATCH 40/41] Change typ on button to submit

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

diff --git a/frontend/src/Components/LoginField.tsx b/frontend/src/Components/LoginField.tsx
index ec5aaaa..d7768c0 100644
--- a/frontend/src/Components/LoginField.tsx
+++ b/frontend/src/Components/LoginField.tsx
@@ -46,7 +46,7 @@ function Login(props: {
         onClick={(): void => {
           return;
         }}
-        type={"button"}
+        type={"submit"}
       />
     </form>
   );

From 7c216773108a4f2faca8c0f942af0048524de4ef Mon Sep 17 00:00:00 2001
From: Imbus <>
Date: Sun, 17 Mar 2024 14:38:20 +0100
Subject: [PATCH 41/41] Migrations fix in go

---
 backend/internal/database/db.go      | 13 ++++++++-----
 backend/internal/database/db_test.go |  2 +-
 backend/main.go                      |  5 +++++
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/backend/internal/database/db.go b/backend/internal/database/db.go
index ef365cd..320327a 100644
--- a/backend/internal/database/db.go
+++ b/backend/internal/database/db.go
@@ -2,7 +2,6 @@ package database
 
 import (
 	"embed"
-	"os"
 	"path/filepath"
 	"ttime/internal/types"
 
@@ -19,7 +18,7 @@ type Database interface {
 	PromoteToAdmin(username string) error
 	GetUserId(username string) (int, error)
 	AddProject(name string, description string, username string) error
-	Migrate(dirname string) error
+	Migrate() error
 	GetProjectId(projectname string) (int, error)
 	AddWeeklyReport(projectName string, userName string, week int, developmentTime int, meetingTime int, adminTime int, ownWorkTime int, studyTime int, testingTime int) error
 	AddUserToProject(username string, projectname string, role string) error
@@ -259,13 +258,18 @@ func (d *Db) GetAllUsersApplication() ([]string, error) {
 
 // Reads a directory of migration files and applies them to the database.
 // This will eventually be used on an embedded directory
-func (d *Db) Migrate(dirname string) error {
+func (d *Db) Migrate() error {
 	// Read the embedded scripts directory
 	files, err := scripts.ReadDir("migrations")
 	if err != nil {
 		return err
 	}
 
+	if len(files) == 0 {
+		println("No migration files found")
+		return nil
+	}
+
 	tr := d.MustBegin()
 
 	// Iterate over each SQL file and execute it
@@ -275,8 +279,7 @@ func (d *Db) Migrate(dirname string) error {
 		}
 
 		// This is perhaps not the most elegant way to do this
-		sqlFile := filepath.Join("migrations", file.Name())
-		sqlBytes, err := os.ReadFile(sqlFile)
+		sqlBytes, err := scripts.ReadFile("migrations/" + file.Name())
 		if err != nil {
 			return err
 		}
diff --git a/backend/internal/database/db_test.go b/backend/internal/database/db_test.go
index 5438d66..9124c45 100644
--- a/backend/internal/database/db_test.go
+++ b/backend/internal/database/db_test.go
@@ -8,7 +8,7 @@ import (
 
 func setupState() (Database, error) {
 	db := DbConnect(":memory:")
-	err := db.Migrate("../../migrations")
+	err := db.Migrate()
 	if err != nil {
 		return nil, err
 	}
diff --git a/backend/main.go b/backend/main.go
index 9ba2556..7f0f81e 100644
--- a/backend/main.go
+++ b/backend/main.go
@@ -43,6 +43,11 @@ 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)
+	}
+
 	// Get our global state
 	gs := handlers.NewGlobalState(db)
 	// Create the server