Justfile

@@ -15,7 +15,7 @@ remove-podman-containers:
 
 # Saves the release container to a tarball, pigz is just gzip but multithreaded
 save-release: build-container-release
-    podman save --format=oci-archive ttime-server | pigz -9 > ttime-server_`date -I`_`git rev-parse --short HEAD`.tar.gz
+    podman save --format=oci-archive ttime-server | pigz -9 > ttime-server.tar.gz
 
 # Loads the release container from a tarball
 load-release file:

backend/internal/database/db.go

@@ -204,22 +204,15 @@ func (d *Db) AddProject(name string, description string, username string) error
 	tx := d.MustBegin()
 	_, err := tx.Exec(projectInsert, name, description, username)
 	if err != nil {
-		if err := tx.Rollback(); err != nil {
+		tx.Rollback()
-			return err
-		}
 		return err
 	}
 	_, err = tx.Exec(changeUserRole, "project_manager", username, name)
 	if err != nil {
-		if err := tx.Rollback(); err != nil {
+		tx.Rollback()
-			return err
-		}
 		return err
 	}
-	if err := tx.Commit(); err != nil {
+	tx.Commit()
-		return err
-	}
-
 	return err
 }
 

frontend/src/API/API.ts

@@ -42,7 +42,10 @@ interface API {
     token: string,
   ): Promise<APIResponse<NewWeeklyReport>>;
   /** Gets all the projects of a user*/
-  getUserProjects(token: string): Promise<APIResponse<Project[]>>;
+  getUserProjects(
+    username: string,
+    token: string,
+  ): Promise<APIResponse<Project[]>>;
   /** Gets a project from id*/
   getProject(id: number): Promise<APIResponse<Project>>;
 }
@@ -147,7 +150,10 @@ export const api: API = {
     }
   },
 
-  async getUserProjects(token: string): Promise<APIResponse<Project[]>> {
+  async getUserProjects(
+    username: string,
+    token: string,
+  ): Promise<APIResponse<Project[]>> {
     try {
       const response = await fetch("/api/getUserProjects", {
         method: "GET",
@@ -155,6 +161,7 @@ export const api: API = {
           "Content-Type": "application/json",
           Authorization: "Bearer " + token,
         },
+        body: JSON.stringify({ username }),
       });
 
       if (!response.ok) {
@@ -169,7 +176,7 @@ export const api: API = {
     } catch (e) {
       return Promise.resolve({
         success: false,
-        message: "API fucked",
+        message: "Failed to get user projects",
       });
     }
   },

frontend/src/Components/DeleteUser.tsx

@@ -1,34 +0,0 @@
-import { User } from "../Types/goTypes";
-import { api, APIResponse } from "../API/API";
-
-/**
- * Use to remove a user from the system
- * @param props - The username of user to remove
- * @returns {boolean} True if removed, false if not
- * @example
- * const exampleUsername = "user";
- * DeleteUser({ usernameToDelete: exampleUsername });
- */
-
-function DeleteUser(props: { usernameToDelete: string }): boolean {
-  //console.log(props.usernameToDelete); FOR DEBUG
-  let removed = false;
-  api
-    .removeUser(
-      props.usernameToDelete,
-      localStorage.getItem("accessToken") ?? "",
-    )
-    .then((response: APIResponse<User>) => {
-      if (response.success) {
-        removed = true;
-      } else {
-        console.error(response.message);
-      }
-    })
-    .catch((error) => {
-      console.error("An error occurred during creation:", error);
-    });
-  return removed;
-}
-
-export default DeleteUser;

frontend/src/Components/Header.tsx

@@ -1,6 +1,5 @@
 import { useState } from "react";
 import { Link } from "react-router-dom";
-import backgroundImage from "../assets/1.jpg";
 
 function Header(): JSX.Element {
   const [isOpen, setIsOpen] = useState(false);
@@ -12,7 +11,7 @@ function Header(): JSX.Element {
   return (
     <header
       className="fixed top-0 left-0 right-0 border-[1.75px] border-black text-black p-3 pl-5 flex items-center justify-between bg-cover"
-      style={{ backgroundImage: `url(${backgroundImage})` }}
+      style={{ backgroundImage: `url('src/assets/1.jpg')` }}
     >
       <Link to="/your-projects">
         <img

frontend/src/Components/NewWeeklyReport.tsx

@@ -1,31 +1,32 @@
-import { useState } from "react";
+import { useState, useContext } from "react";
 import type { NewWeeklyReport } from "../Types/goTypes";
 import { api } from "../API/API";
-import { useNavigate, useParams } from "react-router-dom";
+import { useNavigate } from "react-router-dom";
 import Button from "./Button";
+import { ProjectNameContext } from "../Pages/YourProjectsPage";
 
 export default function NewWeeklyReport(): JSX.Element {
-  const [week, setWeek] = useState<number>();
+  const [week, setWeek] = useState(0);
-  const [developmentTime, setDevelopmentTime] = useState<number>();
+  const [developmentTime, setDevelopmentTime] = useState(0);
-  const [meetingTime, setMeetingTime] = useState<number>();
+  const [meetingTime, setMeetingTime] = useState(0);
-  const [adminTime, setAdminTime] = useState<number>();
+  const [adminTime, setAdminTime] = useState(0);
-  const [ownWorkTime, setOwnWorkTime] = useState<number>();
+  const [ownWorkTime, setOwnWorkTime] = useState(0);
-  const [studyTime, setStudyTime] = useState<number>();
+  const [studyTime, setStudyTime] = useState(0);
-  const [testingTime, setTestingTime] = useState<number>();
+  const [testingTime, setTestingTime] = useState(0);
 
-  const { projectName } = useParams();
+  const projectName = useContext(ProjectNameContext);
   const token = localStorage.getItem("accessToken") ?? "";
 
   const handleNewWeeklyReport = async (): Promise<void> => {
     const newWeeklyReport: NewWeeklyReport = {
-      projectName: projectName ?? "",
+      projectName,
-      week: week ?? 0,
+      week,
-      developmentTime: developmentTime ?? 0,
+      developmentTime,
-      meetingTime: meetingTime ?? 0,
+      meetingTime,
-      adminTime: adminTime ?? 0,
+      adminTime,
-      ownWorkTime: ownWorkTime ?? 0,
+      ownWorkTime,
-      studyTime: studyTime ?? 0,
+      studyTime,
-      testingTime: testingTime ?? 0,
+      testingTime,
     };
 
     await api.submitWeeklyReport(newWeeklyReport, token);
@@ -58,9 +59,7 @@ export default function NewWeeklyReport(): JSX.Element {
                 setWeek(weekNumber);
               }}
               onKeyDown={(event) => {
-                const keyValue = event.key;
+                event.preventDefault();
-                if (!/\d/.test(keyValue) && keyValue !== "Backspace")
-                  event.preventDefault();
               }}
               onPaste={(event) => {
                 event.preventDefault();

frontend/src/Components/UserInfoModal.tsx

@@ -1,54 +0,0 @@
-import { Link } from "react-router-dom";
-import Button from "./Button";
-import DeleteUser from "./DeleteUser";
-import UserProjectListAdmin from "./UserProjectListAdmin";
-
-function UserInfoModal(props: {
-  isVisible: boolean;
-  username: string;
-  onClose: () => void;
-}): JSX.Element {
-  if (!props.isVisible) return <></>;
-
-  return (
-    <div
-      className="fixed inset-0 bg-black bg-opacity-30 backdrop-blur-sm 
-      flex justify-center items-center"
-    >
-      <div className="border-4 border-black bg-white p-2 rounded-lg text-center">
-        <p className="font-bold text-[30px]">{props.username}</p>
-        <Link to="/AdminChangeUserName">
-          <p className="mb-[20px] hover:font-bold hover:cursor-pointer underline">
-            (Change Username)
-          </p>
-        </Link>
-        <div>
-          <h2 className="font-bold text-[22px] mb-[20px]">
-            Member of these projects:
-          </h2>
-          <div className="pr-6 pl-6">
-            <UserProjectListAdmin />
-          </div>
-        </div>
-        <div className="items-center space-x-6 pr-6 pl-6">
-          <Button
-            text={"Delete"}
-            onClick={function (): void {
-              DeleteUser({ usernameToDelete: props.username });
-            }}
-            type="button"
-          />
-          <Button
-            text={"Close"}
-            onClick={function (): void {
-              props.onClose();
-            }}
-            type="button"
-          />
-        </div>
-      </div>
-    </div>
-  );
-}
-
-export default UserInfoModal;

frontend/src/Components/UserListAdmin.tsx

@@ -1,6 +1,5 @@
-import { useState } from "react";
+import { Link } from "react-router-dom";
 import { PublicUser } from "../Types/goTypes";
-import UserInfoModal from "./UserInfoModal";
 
 /**
  * The props for the UserProps component
@@ -10,52 +9,27 @@ interface UserProps {
 }
 
 /**
- * A list of users for admin manage users page, that sets an onClick
+ * A list of users for admin manage users page, that links admin to the right user page
- * function for eact user <li> element, which displays a modul with
+ * thanks to the state property
- * user info.
+ * @param props - The users to display
- * @param props - An array of users users to display
  * @returns {JSX.Element} The user list
  * @example
- * const users = [{ id: 1, userName: "ExampleName" }];
+ * const users = [{ id: 1, userName: "Random name" }];
  * return <UserList users={users} />;
  */
 
 export function UserListAdmin(props: UserProps): JSX.Element {
-  const [modalVisible, setModalVisible] = useState(false);
-  const [username, setUsername] = useState("");
-
-  const handleClick = (username: string): void => {
-    setUsername(username);
-    setModalVisible(true);
-  };
-
-  const handleClose = (): void => {
-    setUsername("");
-    setModalVisible(false);
-  };
-
   return (
-    <>
+    <div>
-      <UserInfoModal
+      <ul className="font-bold underline text-[30px] cursor-pointer padding">
-        onClose={handleClose}
+        {props.users.map((user) => (
-        isVisible={modalVisible}
+          <Link to="/adminUserInfo" key={user.userId} state={user.username}>
-        username={username}
+            <li className="pt-5" key={user.userId}>
-      />
-      <div>
-        <ul className="font-bold underline text-[30px] cursor-pointer padding">
-          {props.users.map((user) => (
-            <li
-              className="pt-5"
-              key={user.userId}
-              onClick={() => {
-                handleClick(user.username);
-              }}
-            >
               {user.username}
             </li>
-          ))}
+          </Link>
-        </ul>
+        ))}
-      </div>
+      </ul>
-    </>
+    </div>
   );
 }

frontend/src/Components/UserProjectListAdmin.tsx

@@ -1,17 +1,17 @@
-import { useEffect, useState } from "react";
+import React, { useEffect, useState } from "react";
 import { api } from "../API/API";
 import { Project } from "../Types/goTypes";
 
-function UserProjectListAdmin(): JSX.Element {
+const UserProjectListAdmin: React.FC = () => {
   const [projects, setProjects] = useState<Project[]>([]);
 
   useEffect(() => {
     const fetchProjects = async (): Promise<void> => {
       try {
         const token = localStorage.getItem("accessToken") ?? "";
-        // const username = props.username;
+        const username = "NoUser"; // getUsernameFromContext(); // Assuming you have a function to get the username from your context
 
-        const response = await api.getUserProjects(token);
+        const response = await api.getUserProjects(username, token);
         if (response.success) {
           setProjects(response.data ?? []);
         } else {
@@ -26,16 +26,18 @@ function UserProjectListAdmin(): JSX.Element {
   }, []);
 
   return (
-    <div className="border-2 border-black bg-white p-2 rounded-lg text-center">
+    <div>
+      <h2>User Projects</h2>
       <ul>
         {projects.map((project) => (
           <li key={project.id}>
             <span>{project.name}</span>
+            {/* Add any additional project details you want to display */}
           </li>
         ))}
       </ul>
     </div>
   );
-}
+};
 
 export default UserProjectListAdmin;

frontend/src/Pages/AdminPages/AdminChangeUsername.tsx

@@ -1,4 +1,3 @@
-import BackButton from "../../Components/BackButton";
 import BasicWindow from "../../Components/BasicWindow";
 import Button from "../../Components/Button";
 
@@ -14,7 +13,13 @@ function AdminChangeUsername(): JSX.Element {
         }}
         type="button"
       />
-      <BackButton />
+      <Button
+        text="Back"
+        onClick={(): void => {
+          return;
+        }}
+        type="button"
+      />
     </>
   );
 

frontend/src/Pages/App.tsx

@@ -13,7 +13,7 @@ function App(): JSX.Element {
     } else if (authority === 2) {
       navigate("/pm");
     } else if (authority === 3) {
-      navigate("/yourProjects");
+      navigate("/user");
     }
   }, [authority, navigate]);
 

frontend/src/Pages/NotFoundPage.tsx

@@ -1,18 +0,0 @@
-import Button from "../Components/Button";
-
-export default function NotFoundPage(): JSX.Element {
-  return (
-    <div className="flex flex-col items-center justify-center min-h-screen bg-white">
-      <h1 className="text-[30px]">404 Page Not Found</h1>
-      <a href="/">
-        <Button
-          text="Go to Home Page"
-          onClick={(): void => {
-            localStorage.clear();
-          }}
-          type="button"
-        />
-      </a>
-    </div>
-  );
-}

frontend/src/Pages/UserPages/UserProjectPage.tsx

@@ -1,20 +1,18 @@
-import { Link, useLocation, useParams } 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 { projectName } = useParams();
-
   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 justify-center min-h-[65vh] h-fit w-[50vw] rounded-3xl content-center overflow-scroll space-y-[10vh] p-[30px]">
-        <Link to={`/projectPage/${projectName}`}>
+        <Link to="/project-page">
           <h1 className="font-bold underline text-[30px] cursor-pointer">
             Your Time Reports
           </h1>
         </Link>
-        <Link to={`/newTimeReport/${projectName}`}>
+        <Link to="/new-time-report">
           <h1 className="font-bold underline text-[30px] cursor-pointer">
             New Time Report
           </h1>

frontend/src/Pages/YourProjectsPage.tsx

@@ -11,8 +11,9 @@ function UserProjectPage(): JSX.Element {
   const [selectedProject, setSelectedProject] = useState("");
 
   const getProjects = async (): Promise<void> => {
-    const token = localStorage.getItem("accessToken") ?? "";
+    const username = localStorage.getItem("username") ?? ""; // replace with actual username
-    const response = await api.getUserProjects(token);
+    const token = localStorage.getItem("accessToken") ?? ""; // replace with actual token
+    const response = await api.getUserProjects(username, token);
     console.log(response);
     if (response.success) {
       setProjects(response.data ?? []);
@@ -35,7 +36,7 @@ function UserProjectPage(): JSX.Element {
       <div className="border-4 border-black bg-white flex flex-col items-center justify-center min-h-[65vh] h-fit w-[50vw] rounded-3xl content-center overflow-scroll space-y-[10vh] p-[30px]">
         {projects.map((project, index) => (
           <Link
-            to={`/project/${project.name}`}
+            to={`/project/${project.id}`}
             onClick={() => {
               handleProjectClick(project.name);
             }}

frontend/src/main.tsx

@@ -29,14 +29,12 @@ import AdminProjectManageMembers from "./Pages/AdminPages/AdminProjectManageMemb
 import AdminProjectStatistics from "./Pages/AdminPages/AdminProjectStatistics.tsx";
 import AdminProjectViewMemberInfo from "./Pages/AdminPages/AdminProjectViewMemberInfo.tsx";
 import AdminProjectPage from "./Pages/AdminPages/AdminProjectPage.tsx";
-import NotFoundPage from "./Pages/NotFoundPage.tsx";
 
 // This is where the routes are mounted
 const router = createBrowserRouter([
   {
     path: "/",
     element: <App />,
-    errorElement: <NotFoundPage />,
   },
   {
     path: "/admin",
@@ -46,25 +44,29 @@ const router = createBrowserRouter([
     path: "/pm",
     element: <YourProjectsPage />,
   },
+  {
+    path: "/user",
+    element: <YourProjectsPage />,
+  },
   {
     path: "/yourProjects",
     element: <YourProjectsPage />,
   },
   {
-    path: "/project/:projectName",
+    path: "/editTimeReport",
-    element: <UserProjectPage />,
+    element: <UserEditTimeReportPage />,
   },
   {
-    path: "/newTimeReport/:projectName",
+    path: "/newTimeReport",
     element: <UserNewTimeReportPage />,
   },
   {
-    path: "/projectPage/:projectName",
+    path: "/project",
-    element: <UserViewTimeReportsPage />,
+    element: <UserProjectPage />,
   },
   {
-    path: "/editTimeReport",
+    path: "/projectPage",
-    element: <UserEditTimeReportPage />,
+    element: <UserViewTimeReportsPage />,
   },
   {
     path: "/changeRole",