More sane swagger-typescript-api generator parameters

.gitignore

@@ -17,6 +17,7 @@ backend/*.svg
 
 /go.work.sum
 /package-lock.json
+/backend/docs/swagger.json
 
 # Test binary, built with `go test -c`
 *.test

backend/Makefile

@@ -104,6 +104,16 @@ default: build
 docs:
 	swag init -outputTypes go
 
+api: ./docs/swagger.json
+	npx swagger-typescript-api \
+		--api-class-name GenApi \
+		--path ./docs/swagger.json \
+		--output ../frontend/src/API \
+		--name GenApi.ts \
+
+./docs/swagger.json:
+	swag init -outputTypes json
+
 .PHONY: docfmt
 docfmt:
 	swag fmt

backend/docs/docs.go

@@ -137,13 +137,13 @@ const docTemplate = `{
                 ],
                 "responses": {
                     "200": {
-                        "description": "Successfully prometed user",
+                        "description": "Successfully promoted user",
                         "schema": {
                             "type": "json"
                         }
                     },
                     "400": {
-                        "description": "bad request",
+                        "description": "Bad request",
                         "schema": {
                             "type": "string"
                         }

backend/internal/database/db.go

@@ -36,11 +36,13 @@ type Database interface {
 	GetUserRole(username string, projectname string) (string, error)
 	GetWeeklyReport(username string, projectName string, week int) (types.WeeklyReport, error)
 	GetWeeklyReportsUser(username string, projectname string) ([]types.WeeklyReportList, error)
+	GetUnsignedWeeklyReports(projectName string) ([]types.WeeklyReport, error)
 	SignWeeklyReport(reportId int, projectManagerId int) error
 	IsSiteAdmin(username string) (bool, error)
 	IsProjectManager(username string, projectname string) (bool, error)
 	GetProjectTimes(projectName string) (map[string]int, error)
 	UpdateWeeklyReport(projectName string, userName string, week int, developmentTime int, meetingTime int, adminTime int, ownWorkTime int, studyTime int, testingTime int) error
+	RemoveProject(projectname string) error
 }
 
 // This struct is a wrapper type that holds the database connection
@@ -354,6 +356,51 @@ func (d *Db) SignWeeklyReport(reportId int, projectManagerId int) error {
 	return err
 }
 
+func (d *Db) GetUnsignedWeeklyReports(projectName string) ([]types.WeeklyReport, error) {
+	// Define the SQL query to fetch unsigned reports for a given user
+	query := `
+		SELECT
+			report_id,
+			user_id,
+			project_id,
+			week,
+			development_time,
+			meeting_time,
+			admin_time,
+			own_work_time,
+			study_time,
+			testing_time,
+			signed_by
+		FROM
+			weekly_reports
+		WHERE
+			signed_by IS NULL
+			AND project_id = (SELECT id FROM projects WHERE name = ?)
+	`
+
+	// Execute the query
+	rows, err := d.Queryx(query, projectName)
+	if err != nil {
+		return nil, err
+	}
+	defer rows.Close()
+
+	// Iterate over the rows and populate the result slice
+	var reports []types.WeeklyReport
+	for rows.Next() {
+		var report types.WeeklyReport
+		if err := rows.StructScan(&report); err != nil {
+			return nil, err
+		}
+		reports = append(reports, report)
+	}
+	if err := rows.Err(); err != nil {
+		return nil, err
+	}
+
+	return reports, nil
+}
+
 // IsSiteAdmin checks if a given username is a site admin
 func (d *Db) IsSiteAdmin(username string) (bool, error) {
 	// Define the SQL query to check if the user is a site admin
@@ -549,3 +596,8 @@ func (d *Db) GetProjectTimes(projectName string) (map[string]int, error) {
 
 	return totalTime, nil
 }
+
+func (d *Db) RemoveProject(projectname string) error {
+	_, err := d.Exec("DELETE FROM projects WHERE name = ?", projectname)
+	return err
+}

backend/internal/database/db_test.go

@@ -470,6 +470,47 @@ func TestGetWeeklyReport(t *testing.T) {
 	// Check other fields similarly
 }
 
+func TestGetUnsignedWeeklyReports(t *testing.T) {
+	db, err := setupAdvancedState()
+	if err != nil {
+		t.Error("setupState failed:", err)
+	}
+
+	err = db.AddUser("testuser", "password")
+	if err != nil {
+		t.Error("AddUser failed:", err)
+	}
+
+	err = db.AddUser("testuser1", "password")
+	if err != nil {
+		t.Error("AddUser failed:", err)
+	}
+
+	err = db.AddProject("testproject", "description", "testuser")
+	if err != nil {
+		t.Error("AddProject failed:", err)
+	}
+
+	err = db.AddWeeklyReport("testproject", "testuser", 1, 1, 1, 1, 1, 1, 1)
+	if err != nil {
+		t.Error("AddWeeklyReport failed:", err)
+	}
+
+	err = db.AddWeeklyReport("testproject", "testuser1", 1, 1, 1, 1, 1, 1, 1)
+	if err != nil {
+		t.Error("AddWeeklyReport failed:", err)
+	}
+
+	reports, err := db.GetUnsignedWeeklyReports("testproject")
+	if err != nil {
+		t.Error("GetUnsignedWeeklyReports failed:", err)
+	}
+
+	if reports == nil {
+		t.Error("Expected non-nil reports, got nil")
+	}
+}
+
 // TestSignWeeklyReport tests SignWeeklyReport function of the database
 func TestSignWeeklyReport(t *testing.T) {
 	db, err := setupState()
@@ -894,3 +935,33 @@ func TestUpdateWeeklyReport(t *testing.T) {
 		t.Error("UpdateWeeklyReport failed: report not updated correctly")
 	}
 }
+
+func TestRemoveProject(t *testing.T) {
+	db, err := setupAdvancedState()
+	if err != nil {
+		t.Error("setupState failed:", err)
+	}
+
+	// Promote user to Admin
+	err = db.PromoteToAdmin("demouser")
+	if err != nil {
+		t.Error("PromoteToAdmin failed:", err)
+	}
+
+	// Remove project
+	err = db.RemoveProject("projecttest")
+	if err != nil {
+		t.Error("RemoveProject failed:", err)
+	}
+
+	// Check if the project was removed
+	projects, err := db.GetAllProjects()
+	if err != nil {
+		t.Error("GetAllProjects failed:", err)
+	}
+	if len(projects) != 0 {
+		t.Error("RemoveProject failed: expected 0, got", len(projects))
+	}
+	
+}
+	

backend/internal/database/middleware.go

@@ -0,0 +1,17 @@
+package database
+
+import "github.com/gofiber/fiber/v2"
+
+// Simple middleware that provides a shared database pool as a local key "db"
+func DbMiddleware(db *Database) func(c *fiber.Ctx) error {
+	return func(c *fiber.Ctx) error {
+		c.Locals("db", db)
+		return c.Next()
+	}
+}
+
+// Helper function to get the database from the context, without fiddling with casts
+func GetDb(c *fiber.Ctx) Database {
+	// Dereference a pointer to a local, casted to a pointer to a Database
+	return *c.Locals("db").(*Database)
+}

backend/internal/database/sample_data/0010_sample_data.sql

@@ -7,6 +7,8 @@ VALUES ("user", "123");
 INSERT OR IGNORE INTO users(username, password)
 VALUES ("user2", "123");
 
+INSERT OR IGNORE INTO site_admin VALUES (1);
+
 INSERT OR IGNORE INTO projects(name,description,owner_user_id)
 VALUES ("projecttest","test project", 1);
 

backend/internal/handlers/global_state.go

@@ -1,42 +0,0 @@
-package handlers
-
-import (
-	"ttime/internal/database"
-
-	"github.com/gofiber/fiber/v2"
-)
-
-// The actual interface that we will use
-type GlobalState interface {
-	Register(c *fiber.Ctx) error        // To register a new user
-	UserDelete(c *fiber.Ctx) error      // To delete a user
-	Login(c *fiber.Ctx) error           // To get the token
-	LoginRenew(c *fiber.Ctx) error      // To renew the token
-	CreateProject(c *fiber.Ctx) error   // To create a new project
-	GetUserProjects(c *fiber.Ctx) error // To get all projects
-	SubmitWeeklyReport(c *fiber.Ctx) error
-	GetWeeklyReport(c *fiber.Ctx) error
-	SignReport(c *fiber.Ctx) error
-	GetProject(c *fiber.Ctx) error
-	AddUserToProjectHandler(c *fiber.Ctx) error
-	PromoteToAdmin(c *fiber.Ctx) error
-	GetWeeklyReportsUserHandler(c *fiber.Ctx) error
-	IsProjectManagerHandler(c *fiber.Ctx) error
-	DeleteProject(c *fiber.Ctx) error       // To delete a project // WIP
-	ListAllUsers(c *fiber.Ctx) error        // To get a list of all users in the application database
-	ListAllUsersProject(c *fiber.Ctx) error // To get a list of all users for a specific project
-	ProjectRoleChange(c *fiber.Ctx) error   // To change a users role in a project
-	ChangeUserName(c *fiber.Ctx) error      // WIP
-	GetAllUsersProject(c *fiber.Ctx) error  // WIP
-	UpdateWeeklyReport(c *fiber.Ctx) error
-}
-
-// "Constructor"
-func NewGlobalState(db database.Database) GlobalState {
-	return &GState{Db: db}
-}
-
-// The global state, which implements all the handlers
-type GState struct {
-	Db database.Database
-}

backend/internal/handlers/global_state_test.go

@@ -1,15 +0,0 @@
-package handlers
-
-import (
-	"testing"
-	"ttime/internal/database"
-)
-
-// The actual interface that we will use
-func TestGlobalState(t *testing.T) {
-	db := database.DbConnect(":memory:")
-	gs := NewGlobalState(db)
-	if gs == nil {
-		t.Error("NewGlobalState returned nil")
-	}
-}

backend/internal/handlers/handlers_project_related.go

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

backend/internal/handlers/handlers_report_related.go

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

backend/internal/handlers/handlers_user_related.go

@@ -1,269 +0,0 @@
-package handlers
-
-import (
-	"time"
-	"ttime/internal/types"
-
-	"github.com/gofiber/fiber/v2/log"
-
-	"github.com/gofiber/fiber/v2"
-	"github.com/golang-jwt/jwt/v5"
-)
-
-// Register is a simple handler that registers a new user
-//
-//	@Summary		Register
-//	@Description	Register a new user
-//	@Tags			User
-//	@Accept			json
-//	@Produce		plain
-//	@Param			NewUser	body		types.NewUser	true	"User to register"
-//	@Success		200		{string}	string			"User added"
-//	@Failure		400		{string}	string			"Bad request"
-//	@Failure		500		{string}	string			"Internal server error"
-//	@Router			/register [post]
-func (gs *GState) Register(c *fiber.Ctx) error {
-	u := new(types.NewUser)
-	if err := c.BodyParser(u); err != nil {
-		log.Warn("Error parsing body")
-		return c.Status(400).SendString(err.Error())
-	}
-
-	log.Info("Adding user:", u.Username)
-	if err := gs.Db.AddUser(u.Username, u.Password); err != nil {
-		log.Warn("Error adding user:", err)
-		return c.Status(500).SendString(err.Error())
-	}
-
-	log.Info("User added:", u.Username)
-	return c.Status(200).SendString("User added")
-}
-
-// This path should obviously be protected in the future
-// UserDelete deletes a user from the database
-//
-//	@Summary		UserDelete
-//	@Description	UserDelete deletes a user from the database
-//	@Tags			User
-//	@Accept			json
-//	@Produce		plain
-//	@Success		200	{string}	string	"User deleted"
-//	@Failure		403	{string}	string	"You can only delete yourself"
-//	@Failure		500	{string}	string	"Internal server error"
-//	@Failure		401	{string}	string	"Unauthorized"
-//	@Router			/userdelete/{username} [delete]
-func (gs *GState) UserDelete(c *fiber.Ctx) error {
-	// Read from path parameters
-	username := c.Params("username")
-
-	// Read username from Locals
-	auth_username := c.Locals("user").(*jwt.Token).Claims.(jwt.MapClaims)["name"].(string)
-
-	if username != auth_username {
-		log.Info("User tried to delete another user")
-		return c.Status(403).SendString("You can only delete yourself")
-	}
-
-	if err := gs.Db.RemoveUser(username); err != nil {
-		log.Warn("Error deleting user:", err)
-		return c.Status(500).SendString(err.Error())
-	}
-
-	log.Info("User deleted:", username)
-	return c.Status(200).SendString("User deleted")
-}
-
-// Login is a simple login handler that returns a JWT token
-//
-//	@Summary		login
-//	@Description	logs the user in and returns a jwt token
-//	@Tags			User
-//	@Accept			json
-//	@Param			NewUser	body	types.NewUser	true	"login info"
-//	@Produce		plain
-//	@Success		200	Token		types.Token	"Successfully signed token for user"
-//	@Failure		400	{string}	string		"Bad request"
-//	@Failure		401	{string}	string		"Unauthorized"
-//	@Failure		500	{string}	string		"Internal server error"
-//	@Router			/login [post]
-func (gs *GState) Login(c *fiber.Ctx) error {
-	// The body type is identical to a NewUser
-
-	u := new(types.NewUser)
-	if err := c.BodyParser(u); err != nil {
-		log.Warn("Error parsing body")
-		return c.Status(400).SendString(err.Error())
-	}
-
-	log.Info("Username logging in:", u.Username)
-	if !gs.Db.CheckUser(u.Username, u.Password) {
-		log.Info("User not found")
-		return c.SendStatus(fiber.StatusUnauthorized)
-	}
-
-	isAdmin, err := gs.Db.IsSiteAdmin(u.Username)
-	if err != nil {
-		log.Info("Error checking admin status:", err)
-		return c.Status(500).SendString(err.Error())
-	}
-	// Create the Claims
-	claims := jwt.MapClaims{
-		"name":  u.Username,
-		"admin": isAdmin,
-		"exp":   time.Now().Add(time.Hour * 72).Unix(),
-	}
-
-	// Create token
-	token := jwt.NewWithClaims(jwt.SigningMethodHS256, claims)
-	log.Info("Token created for user:", u.Username)
-
-	// Generate encoded token and send it as response.
-	t, err := token.SignedString([]byte("secret"))
-	if err != nil {
-		log.Warn("Error signing token")
-		return c.SendStatus(fiber.StatusInternalServerError)
-	}
-
-	println("Successfully signed token for user:", u.Username)
-	return c.JSON(types.Token{Token: t})
-}
-
-// LoginRenew is a simple handler that renews the token
-//
-//	@Summary		LoginRenews
-//	@Description	renews the users token
-//	@Security		bererToken
-//	@Tags			User
-//	@Accept			json
-//	@Produce		plain
-//	@Success		200	Token		types.Token	"Successfully signed token for user"
-//	@Failure		401	{string}	string		"Unauthorized"
-//	@Failure		500	{string}	string		"Internal server error"
-//	@Router			/loginerenew [post]
-func (gs *GState) LoginRenew(c *fiber.Ctx) error {
-	user := c.Locals("user").(*jwt.Token)
-
-	log.Info("Renewing token for user:", user.Claims.(jwt.MapClaims)["name"])
-
-	claims := user.Claims.(jwt.MapClaims)
-	claims["exp"] = time.Now().Add(time.Hour * 72).Unix()
-	renewed := jwt.MapClaims{
-		"name":  claims["name"],
-		"admin": claims["admin"],
-		"exp":   claims["exp"],
-	}
-	token := jwt.NewWithClaims(jwt.SigningMethodHS256, renewed)
-	t, err := token.SignedString([]byte("secret"))
-	if err != nil {
-		log.Warn("Error signing token")
-		return c.SendStatus(fiber.StatusInternalServerError)
-	}
-
-	log.Info("Successfully renewed token for user:", user.Claims.(jwt.MapClaims)["name"])
-	return c.JSON(types.Token{Token: t})
-}
-
-// ListAllUsers is a handler that returns a list of all users in the application database
-//
-//	@Summary		ListsAllUsers
-//	@Description	lists all users
-//	@Tags			User
-//	@Accept			json
-//	@Produce		plain
-//	@Success		200	{json}		json	"Successfully signed token for user"
-//	@Failure		401	{string}	string	"Unauthorized"
-//	@Failure		500	{string}	string	"Internal server error"
-//	@Router			/users/all [get]
-func (gs *GState) ListAllUsers(c *fiber.Ctx) error {
-	// Get all users from the database
-	users, err := gs.Db.GetAllUsersApplication()
-	if err != nil {
-		log.Info("Error getting users from db:", err) // Debug print
-		return c.Status(500).SendString(err.Error())
-	}
-
-	log.Info("Returning all users")
-	// Return the list of users as JSON
-	return c.JSON(users)
-}
-
-func (gs *GState) GetAllUsersProject(c *fiber.Ctx) error {
-	// Get all users from a project
-	projectName := c.Params("projectName")
-	users, err := gs.Db.GetAllUsersProject(projectName)
-	if err != nil {
-		log.Info("Error getting users from project:", err) // Debug print
-		return c.Status(500).SendString(err.Error())
-	}
-
-	log.Info("Returning all users")
-	// Return the list of users as JSON
-	return c.JSON(users)
-}
-
-// @Summary		PromoteToAdmin
-// @Description	promote chosen user to admin
-// @Tags			User
-// @Accept			json
-// @Produce		plain
-// @Param			NewUser	body		types.NewUser	true	"user info"
-// @Success		200		{json}		json			"Successfully promoted user"
-// @Failure		400		{string}	string			"Bad request"
-// @Failure		401		{string}	string			"Unauthorized"
-// @Failure		500		{string}	string			"Internal server error"
-// @Router			/promoteToAdmin [post]
-func (gs *GState) PromoteToAdmin(c *fiber.Ctx) error {
-	// Extract the username from the request body
-	var newUser types.NewUser
-	if err := c.BodyParser(&newUser); err != nil {
-		return c.Status(400).SendString("Bad request")
-	}
-	username := newUser.Username
-
-	log.Info("Promoting user to admin:", username) // Debug print
-
-	// Promote the user to a site admin in the database
-	if err := gs.Db.PromoteToAdmin(username); err != nil {
-		log.Info("Error promoting user to admin:", err) // Debug print
-		return c.Status(500).SendString(err.Error())
-	}
-
-	log.Info("User promoted to admin successfully:", username) // Debug print
-
-	// Return a success message
-	return c.SendStatus(fiber.StatusOK)
-}
-
-// ChangeUserName changes a user's username in the database
-func (gs *GState) ChangeUserName(c *fiber.Ctx) error {
-	// Check token and get username of current user
-	user := c.Locals("user").(*jwt.Token)
-	claims := user.Claims.(jwt.MapClaims)
-	adminUsername := claims["name"].(string)
-	log.Info(adminUsername)
-
-	// Extract the necessary parameters from the request
-	data := new(types.StrNameChange)
-	if err := c.BodyParser(data); err != nil {
-		log.Info("Error parsing username")
-		return c.Status(400).SendString(err.Error())
-	}
-
-	// Check if the current user is an admin
-	isAdmin, err := gs.Db.IsSiteAdmin(adminUsername)
-	if err != nil {
-		log.Warn("Error checking if admin:", err)
-		return c.Status(500).SendString(err.Error())
-	} else if !isAdmin {
-		log.Warn("Tried changing name when not admin")
-		return c.Status(401).SendString("You cannot change name unless you are an admin")
-	}
-
-	// Change the user's name in the database
-	if err := gs.Db.ChangeUserName(data.PrevName, data.NewName); err != nil {
-		return c.Status(500).SendString(err.Error())
-	}
-
-	// Return a success message
-	return c.SendStatus(fiber.StatusOK)
-}

backend/internal/handlers/projects/AddUserToProject.go

@@ -0,0 +1,51 @@
+package projects
+
+import (
+	db "ttime/internal/database"
+
+	"github.com/gofiber/fiber/v2"
+	"github.com/gofiber/fiber/v2/log"
+	"github.com/golang-jwt/jwt/v5"
+)
+
+// AddUserToProjectHandler is a handler that adds a user to a project with a specified role
+func AddUserToProjectHandler(c *fiber.Ctx) error {
+	// Extract necessary parameters from the request
+	var requestData struct {
+		Username    string `json:"username"`
+		ProjectName string `json:"projectName"`
+		Role        string `json:"role"`
+	}
+	if err := c.BodyParser(&requestData); err != nil {
+		log.Info("Error parsing request body:", err)
+		return c.Status(400).SendString("Bad request")
+	}
+
+	// Check if the user adding another user to the project is a site admin
+	user := c.Locals("user").(*jwt.Token)
+	claims := user.Claims.(jwt.MapClaims)
+	adminUsername := claims["name"].(string)
+	log.Info("Admin username from claims:", adminUsername)
+
+	isAdmin, err := db.GetDb(c).IsSiteAdmin(adminUsername)
+	if err != nil {
+		log.Info("Error checking admin status:", err)
+		return c.Status(500).SendString(err.Error())
+	}
+
+	if !isAdmin {
+		log.Info("User is not a site admin:", adminUsername)
+		return c.Status(403).SendString("User is not a site admin")
+	}
+
+	// Add the user to the project with the specified role
+	err = db.GetDb(c).AddUserToProject(requestData.Username, requestData.ProjectName, requestData.Role)
+	if err != nil {
+		log.Info("Error adding user to project:", err)
+		return c.Status(500).SendString(err.Error())
+	}
+
+	// Return success message
+	log.Info("User added to project successfully:", requestData.Username)
+	return c.SendStatus(fiber.StatusOK)
+}

backend/internal/handlers/projects/CreateProject.go

@@ -0,0 +1,30 @@
+package projects
+
+import (
+	db "ttime/internal/database"
+	"ttime/internal/types"
+
+	"github.com/gofiber/fiber/v2"
+	"github.com/golang-jwt/jwt/v5"
+)
+
+// CreateProject is a simple handler that creates a new project
+func CreateProject(c *fiber.Ctx) error {
+	user := c.Locals("user").(*jwt.Token)
+
+	p := new(types.NewProject)
+	if err := c.BodyParser(p); err != nil {
+		return c.Status(400).SendString(err.Error())
+	}
+
+	// Get the username from the token and set it as the owner of the project
+	// This is ugly but
+	claims := user.Claims.(jwt.MapClaims)
+	owner := claims["name"].(string)
+
+	if err := db.GetDb(c).AddProject(p.Name, p.Description, owner); err != nil {
+		return c.Status(500).SendString(err.Error())
+	}
+
+	return c.Status(200).SendString("Project added")
+}

backend/internal/handlers/projects/DeleteProject.go

@@ -0,0 +1,19 @@
+package projects
+
+import (
+	db "ttime/internal/database"
+
+	"github.com/gofiber/fiber/v2"
+)
+
+func DeleteProject(c *fiber.Ctx) error {
+
+	projectID := c.Params("projectID")
+	username := c.Params("username")
+
+	if err := db.GetDb(c).DeleteProject(projectID, username); err != nil {
+		return c.Status(500).SendString((err.Error()))
+	}
+
+	return c.Status(200).SendString("Project deleted")
+}

backend/internal/handlers/projects/GetProject.go

@@ -0,0 +1,38 @@
+package projects
+
+import (
+	"strconv"
+	db "ttime/internal/database"
+
+	"github.com/gofiber/fiber/v2"
+	"github.com/gofiber/fiber/v2/log"
+)
+
+// GetProject retrieves a specific project by its ID
+func GetProject(c *fiber.Ctx) error {
+	// Extract the project ID from the request parameters or body
+	projectID := c.Params("projectID")
+	if projectID == "" {
+		log.Info("No project ID provided")
+		return c.Status(400).SendString("No project ID provided")
+	}
+	log.Info("Getting project with ID: ", projectID)
+
+	// Parse the project ID into an integer
+	projectIDInt, err := strconv.Atoi(projectID)
+	if err != nil {
+		log.Info("Invalid project ID")
+		return c.Status(400).SendString("Invalid project ID")
+	}
+
+	// Get the project from the database by its ID
+	project, err := db.GetDb(c).GetProject(projectIDInt)
+	if err != nil {
+		log.Info("Error getting project:", err)
+		return c.Status(500).SendString(err.Error())
+	}
+
+	// Return the project as JSON
+	log.Info("Returning project: ", project.Name)
+	return c.JSON(project)
+}

backend/internal/handlers/projects/GetProjectTimes.go

@@ -0,0 +1,63 @@
+package projects
+
+import (
+	db "ttime/internal/database"
+
+	"github.com/gofiber/fiber/v2"
+	"github.com/gofiber/fiber/v2/log"
+	"github.com/golang-jwt/jwt/v5"
+)
+
+func GetProjectTimesHandler(c *fiber.Ctx) error {
+	// Get the username from the token
+	user := c.Locals("user").(*jwt.Token)
+	claims := user.Claims.(jwt.MapClaims)
+	username := claims["name"].(string)
+
+	// Get project
+	projectName := c.Params("projectName")
+	if projectName == "" {
+		log.Info("No project name provided")
+		return c.Status(400).SendString("No project name provided")
+	}
+
+	// Get all users in the project and roles
+	userProjects, err := db.GetDb(c).GetAllUsersProject(projectName)
+	if err != nil {
+		log.Info("Error getting users in project:", err)
+		return c.Status(500).SendString(err.Error())
+	}
+
+	// If the user is member
+	isMember := false
+	for _, userProject := range userProjects {
+		if userProject.Username == username {
+			isMember = true
+			break
+		}
+	}
+
+	// If the user is admin
+	if !isMember {
+		isAdmin, err := db.GetDb(c).IsSiteAdmin(username)
+		if err != nil {
+			log.Info("Error checking admin status:", err)
+			return c.Status(500).SendString(err.Error())
+		}
+		if !isAdmin {
+			log.Info("User is neither a project member nor a site admin:", username)
+			return c.Status(403).SendString("User is neither a project member nor a site admin")
+		}
+	}
+
+	// Get project times
+	projectTimes, err := db.GetDb(c).GetProjectTimes(projectName)
+	if err != nil {
+		log.Info("Error getting project times:", err)
+		return c.Status(500).SendString(err.Error())
+	}
+
+	// Return project times as JSON
+	log.Info("Returning project times for project:", projectName)
+	return c.JSON(projectTimes)
+}

backend/internal/handlers/projects/GetUserProject.go

@@ -0,0 +1,25 @@
+package projects
+
+import (
+	db "ttime/internal/database"
+
+	"github.com/gofiber/fiber/v2"
+	"github.com/golang-jwt/jwt/v5"
+)
+
+// GetUserProjects returns all projects that the user is a member of
+func GetUserProjects(c *fiber.Ctx) error {
+	// First we get the username from the token
+	user := c.Locals("user").(*jwt.Token)
+	claims := user.Claims.(jwt.MapClaims)
+	username := claims["name"].(string)
+
+	// Then dip into the database to get the projects
+	projects, err := db.GetDb(c).GetProjectsForUser(username)
+	if err != nil {
+		return c.Status(500).SendString(err.Error())
+	}
+
+	// Return a json serialized list of projects
+	return c.JSON(projects)
+}

backend/internal/handlers/projects/IsProjectManager.go

@@ -0,0 +1,32 @@
+package projects
+
+import (
+	db "ttime/internal/database"
+
+	"github.com/gofiber/fiber/v2"
+	"github.com/gofiber/fiber/v2/log"
+	"github.com/golang-jwt/jwt/v5"
+)
+
+// IsProjectManagerHandler is a handler that checks if a user is a project manager for a given project
+func IsProjectManagerHandler(c *fiber.Ctx) error {
+	// Get the username from the token
+	user := c.Locals("user").(*jwt.Token)
+	claims := user.Claims.(jwt.MapClaims)
+	username := claims["name"].(string)
+
+	// Extract necessary parameters from the request query string
+	projectName := c.Params("projectName")
+
+	log.Info("Checking if user ", username, " is a project manager for project ", projectName)
+
+	// Check if the user is a project manager for the specified project
+	isManager, err := db.GetDb(c).IsProjectManager(username, projectName)
+	if err != nil {
+		log.Info("Error checking project manager status:", err)
+		return c.Status(500).SendString(err.Error())
+	}
+
+	// Return the result as JSON
+	return c.JSON(fiber.Map{"isProjectManager": isManager})
+}

backend/internal/handlers/projects/ListAllUserProjects.go

@@ -0,0 +1,55 @@
+package projects
+
+import (
+	db "ttime/internal/database"
+
+	"github.com/gofiber/fiber/v2"
+	"github.com/gofiber/fiber/v2/log"
+	"github.com/golang-jwt/jwt/v5"
+)
+
+func ListAllUsersProject(c *fiber.Ctx) error {
+	// Extract the project name from the request parameters or body
+	projectName := c.Params("projectName")
+	if projectName == "" {
+		log.Info("No project name provided")
+		return c.Status(400).SendString("No project name provided")
+	}
+
+	// Get the user token
+	userToken := c.Locals("user").(*jwt.Token)
+	claims := userToken.Claims.(jwt.MapClaims)
+	username := claims["name"].(string)
+
+	// Check if the user is a project manager for the specified project
+	isManager, err := db.GetDb(c).IsProjectManager(username, projectName)
+	if err != nil {
+		log.Info("Error checking project manager status:", err)
+		return c.Status(500).SendString(err.Error())
+	}
+
+	// If the user is not a project manager, check if the user is a site admin
+	if !isManager {
+		isAdmin, err := db.GetDb(c).IsSiteAdmin(username)
+		if err != nil {
+			log.Info("Error checking admin status:", err)
+			return c.Status(500).SendString(err.Error())
+		}
+		if !isAdmin {
+			log.Info("User is neither a project manager nor a site admin:", username)
+			return c.Status(403).SendString("User is neither a project manager nor a site admin")
+		}
+	}
+
+	// Get all users associated with the project from the database
+	users, err := db.GetDb(c).GetAllUsersProject(projectName)
+	if err != nil {
+		log.Info("Error getting users for project:", err)
+		return c.Status(500).SendString(err.Error())
+	}
+
+	log.Info("Returning users for project: ", projectName)
+
+	// Return the list of users as JSON
+	return c.JSON(users)
+}

backend/internal/handlers/projects/ProjectRoleChange.go

@@ -0,0 +1,45 @@
+package projects
+
+import (
+	db "ttime/internal/database"
+	"ttime/internal/types"
+
+	"github.com/gofiber/fiber/v2"
+	"github.com/gofiber/fiber/v2/log"
+	"github.com/golang-jwt/jwt/v5"
+)
+
+// ProjectRoleChange is a handler that changes a user's role within a project
+func ProjectRoleChange(c *fiber.Ctx) error {
+
+	//check token and get username of current user
+	user := c.Locals("user").(*jwt.Token)
+	claims := user.Claims.(jwt.MapClaims)
+	username := claims["name"].(string)
+
+	// Extract the necessary parameters from the request
+	data := new(types.RoleChange)
+	if err := c.BodyParser(data); err != nil {
+		log.Info("error parsing username, project or role")
+		return c.Status(400).SendString(err.Error())
+	}
+
+	log.Info("Changing role for user: ", username, " in project: ", data.Projectname, " to: ", data.Role)
+
+	// Dubble diping and checcking if current user is
+	if ismanager, err := db.GetDb(c).IsProjectManager(username, data.Projectname); err != nil {
+		log.Warn("Error checking if projectmanager:", err)
+		return c.Status(500).SendString(err.Error())
+	} else if !ismanager {
+		log.Warn("User is not projectmanager")
+		return c.Status(401).SendString("User is not projectmanager")
+	}
+
+	// Change the user's role within the project in the database
+	if err := db.GetDb(c).ChangeUserRole(username, data.Projectname, data.Role); err != nil {
+		return c.Status(500).SendString(err.Error())
+	}
+
+	// Return a success message
+	return c.SendStatus(fiber.StatusOK)
+}

backend/internal/handlers/projects/RemoveProject.go

@@ -0,0 +1,35 @@
+package projects
+
+import (
+	db "ttime/internal/database"
+
+	"github.com/gofiber/fiber/v2"
+	"github.com/gofiber/fiber/v2/log"
+	"github.com/golang-jwt/jwt/v5"
+)
+
+func RemoveProject(c *fiber.Ctx) error {
+	user := c.Locals("user").(*jwt.Token)
+	claims := user.Claims.(jwt.MapClaims)
+	username := claims["name"].(string)
+
+	// Check if the user is a site admin
+	isAdmin, err := db.GetDb(c).IsSiteAdmin(username)
+	if err != nil {
+		log.Info("Error checking admin status:", err)
+		return c.Status(500).SendString(err.Error())
+	}
+
+	if !isAdmin {
+		log.Info("User is not a site admin:", username)
+		return c.Status(403).SendString("User is not a site admin")
+	}
+
+	projectName := c.Params("projectName")
+
+	if err := db.GetDb(c).RemoveProject(projectName); err != nil {
+		return c.Status(500).SendString((err.Error()))
+	}
+
+	return c.Status(200).SendString("Project deleted")
+}

backend/internal/handlers/reports/GetUnsignedReports.go

@@ -0,0 +1,45 @@
+package reports
+
+import (
+	db "ttime/internal/database"
+
+	"github.com/gofiber/fiber/v2"
+	"github.com/gofiber/fiber/v2/log"
+	"github.com/golang-jwt/jwt/v5"
+)
+
+func GetUnsignedReports(c *fiber.Ctx) error {
+	// Extract the necessary parameters from the token
+	user := c.Locals("user").(*jwt.Token)
+	claims := user.Claims.(jwt.MapClaims)
+	projectManagerUsername := claims["name"].(string)
+
+	// Extract project name and week from query parameters
+	projectName := c.Params("projectName")
+
+	log.Info("Getting unsigned reports for")
+
+	if projectName == "" {
+		log.Info("Missing project name")
+		return c.Status(400).SendString("Missing project name")
+	}
+
+	// Get the project manager's ID
+	isProjectManager, err := db.GetDb(c).IsProjectManager(projectManagerUsername, projectName)
+	if err != nil {
+		log.Info("Failed to get project manager ID")
+		return c.Status(500).SendString("Failed to get project manager ID")
+	}
+	log.Info("User is Project Manager: ", isProjectManager)
+
+	// Call the database function to get the unsigned weekly reports
+	reports, err := db.GetDb(c).GetUnsignedWeeklyReports(projectName)
+	if err != nil {
+		log.Info("Error getting unsigned weekly reports:", err)
+		return c.Status(500).SendString(err.Error())
+	}
+
+	log.Info("Returning unsigned reports")
+	// Return the list of unsigned reports
+	return c.JSON(reports)
+}

backend/internal/handlers/reports/GetWeeklyReport.go

@@ -0,0 +1,47 @@
+package reports
+
+import (
+	"strconv"
+	db "ttime/internal/database"
+
+	"github.com/gofiber/fiber/v2"
+	"github.com/gofiber/fiber/v2/log"
+	"github.com/golang-jwt/jwt/v5"
+)
+
+// Handler for retrieving weekly report
+func GetWeeklyReport(c *fiber.Ctx) error {
+	// Extract the necessary parameters from the request
+	user := c.Locals("user").(*jwt.Token)
+	claims := user.Claims.(jwt.MapClaims)
+	username := claims["name"].(string)
+
+	log.Info("Getting weekly report for: ", username)
+
+	// Extract project name and week from query parameters
+	projectName := c.Query("projectName")
+	week := c.Query("week")
+
+	if projectName == "" || week == "" {
+		log.Info("Missing project name or week number")
+		return c.Status(400).SendString("Missing project name or week number")
+	}
+
+	// Convert week to integer
+	weekInt, err := strconv.Atoi(week)
+	if err != nil {
+		log.Info("Invalid week number")
+		return c.Status(400).SendString("Invalid week number")
+	}
+
+	// Call the database function to get the weekly report
+	report, err := db.GetDb(c).GetWeeklyReport(username, projectName, weekInt)
+	if err != nil {
+		log.Info("Error getting weekly report from db:", err)
+		return c.Status(500).SendString(err.Error())
+	}
+
+	log.Info("Returning weekly report")
+	// Return the retrieved weekly report
+	return c.JSON(report)
+}

backend/internal/handlers/reports/GetWeeklyReportsUserHandler.go

@@ -0,0 +1,36 @@
+package reports
+
+import (
+	db "ttime/internal/database"
+
+	"github.com/gofiber/fiber/v2"
+	"github.com/gofiber/fiber/v2/log"
+	"github.com/golang-jwt/jwt/v5"
+)
+
+// GetWeeklyReportsUserHandler retrieves all weekly reports for a user in a specific project
+func GetWeeklyReportsUserHandler(c *fiber.Ctx) error {
+	// Extract the necessary parameters from the token
+	user := c.Locals("user").(*jwt.Token)
+	claims := user.Claims.(jwt.MapClaims)
+	username := claims["name"].(string)
+
+	// Extract necessary (path) parameters from the request
+	projectName := c.Params("projectName")
+
+	// TODO: Here we need to check whether the user is a member of the project
+	// If not, we should return an error. On the other hand, if the user not a member,
+	// the returned list of reports will (should) allways be empty.
+
+	// Retrieve weekly reports for the user in the project from the database
+	reports, err := db.GetDb(c).GetWeeklyReportsUser(username, projectName)
+	if err != nil {
+		log.Error("Error getting weekly reports for user:", username, "in project:", projectName, ":", err)
+		return c.Status(500).SendString(err.Error())
+	}
+
+	log.Info("Returning weekly reports for user:", username, "in project:", projectName)
+
+	// Return the list of reports as JSON
+	return c.JSON(reports)
+}

backend/internal/handlers/reports/SignReport.go

@@ -0,0 +1,41 @@
+package reports
+
+import (
+	"strconv"
+	db "ttime/internal/database"
+
+	"github.com/gofiber/fiber/v2"
+	"github.com/gofiber/fiber/v2/log"
+	"github.com/golang-jwt/jwt/v5"
+)
+
+func SignReport(c *fiber.Ctx) error {
+	// Extract the necessary parameters from the token
+	user := c.Locals("user").(*jwt.Token)
+	claims := user.Claims.(jwt.MapClaims)
+	projectManagerUsername := claims["name"].(string)
+
+	// Extract report ID from the path
+	reportId, err := strconv.Atoi(c.Params("reportId"))
+	if err != nil {
+		log.Info("Invalid report ID")
+		return c.Status(400).SendString("Invalid report ID")
+	}
+
+	// Get the project manager's ID
+	projectManagerID, err := db.GetDb(c).GetUserId(projectManagerUsername)
+	if err != nil {
+		log.Info("Failed to get project manager ID for user: ", projectManagerUsername)
+		return c.Status(500).SendString("Failed to get project manager ID")
+	}
+
+	// Call the database function to sign the weekly report
+	err = db.GetDb(c).SignWeeklyReport(reportId, projectManagerID)
+	if err != nil {
+		log.Info("Error signing weekly report:", err)
+		return c.Status(500).SendString(err.Error())
+	}
+
+	log.Info("Project manager ID: ", projectManagerID, " signed report ID: ", reportId)
+	return c.Status(200).SendString("Weekly report signed successfully")
+}

backend/internal/handlers/reports/SubmitWeeklyReport.go

@@ -0,0 +1,41 @@
+package reports
+
+import (
+	db "ttime/internal/database"
+	"ttime/internal/types"
+
+	"github.com/gofiber/fiber/v2"
+	"github.com/gofiber/fiber/v2/log"
+	"github.com/golang-jwt/jwt/v5"
+)
+
+func SubmitWeeklyReport(c *fiber.Ctx) error {
+	// Extract the necessary parameters from the token
+	user := c.Locals("user").(*jwt.Token)
+	claims := user.Claims.(jwt.MapClaims)
+	username := claims["name"].(string)
+
+	report := new(types.NewWeeklyReport)
+	if err := c.BodyParser(report); err != nil {
+		log.Info("Error parsing weekly report")
+		return c.Status(400).SendString(err.Error())
+	}
+
+	// Make sure all the fields of the report are valid
+	if report.Week < 1 || report.Week > 52 {
+		log.Info("Invalid week number")
+		return c.Status(400).SendString("Invalid week number")
+	}
+	if report.DevelopmentTime < 0 || report.MeetingTime < 0 || report.AdminTime < 0 || report.OwnWorkTime < 0 || report.StudyTime < 0 || report.TestingTime < 0 {
+		log.Info("Invalid time report")
+		return c.Status(400).SendString("Invalid time report")
+	}
+
+	if err := db.GetDb(c).AddWeeklyReport(report.ProjectName, username, report.Week, report.DevelopmentTime, report.MeetingTime, report.AdminTime, report.OwnWorkTime, report.StudyTime, report.TestingTime); err != nil {
+		log.Info("Error adding weekly report to db:", err)
+		return c.Status(500).SendString(err.Error())
+	}
+
+	log.Info("Weekly report added")
+	return c.Status(200).SendString("Time report added")
+}

backend/internal/handlers/reports/UpdateWeeklyReport.go

@@ -0,0 +1,44 @@
+package reports
+
+import (
+	db "ttime/internal/database"
+	"ttime/internal/types"
+
+	"github.com/gofiber/fiber/v2"
+	"github.com/gofiber/fiber/v2/log"
+	"github.com/golang-jwt/jwt/v5"
+)
+
+func UpdateWeeklyReport(c *fiber.Ctx) error {
+	// Extract the necessary parameters from the token
+	user := c.Locals("user").(*jwt.Token)
+	claims := user.Claims.(jwt.MapClaims)
+	username := claims["name"].(string)
+
+	// Parse the request body into an UpdateWeeklyReport struct
+	var updateReport types.UpdateWeeklyReport
+	if err := c.BodyParser(&updateReport); err != nil {
+		log.Info("Error parsing weekly report")
+		return c.Status(400).SendString(err.Error())
+	}
+
+	// Make sure all the fields of the report are valid
+	if updateReport.Week < 1 || updateReport.Week > 52 {
+		log.Info("Invalid week number")
+		return c.Status(400).SendString("Invalid week number")
+	}
+
+	if updateReport.DevelopmentTime < 0 || updateReport.MeetingTime < 0 || updateReport.AdminTime < 0 || updateReport.OwnWorkTime < 0 || updateReport.StudyTime < 0 || updateReport.TestingTime < 0 {
+		log.Info("Invalid time report")
+		return c.Status(400).SendString("Invalid time report")
+	}
+
+	// Update the weekly report in the database
+	if err := db.GetDb(c).UpdateWeeklyReport(updateReport.ProjectName, username, updateReport.Week, updateReport.DevelopmentTime, updateReport.MeetingTime, updateReport.AdminTime, updateReport.OwnWorkTime, updateReport.StudyTime, updateReport.TestingTime); err != nil {
+		log.Info("Error updating weekly report in db:", err)
+		return c.Status(500).SendString(err.Error())
+	}
+
+	log.Info("Weekly report updated")
+	return c.Status(200).SendString("Weekly report updated")
+}

backend/internal/handlers/users/ChangeUserName.go

@@ -0,0 +1,44 @@
+package users
+
+import (
+	db "ttime/internal/database"
+	"ttime/internal/types"
+
+	"github.com/gofiber/fiber/v2"
+	"github.com/gofiber/fiber/v2/log"
+	"github.com/golang-jwt/jwt/v5"
+)
+
+// ChangeUserName changes a user's username in the database
+func ChangeUserName(c *fiber.Ctx) error {
+	// Check token and get username of current user
+	user := c.Locals("user").(*jwt.Token)
+	claims := user.Claims.(jwt.MapClaims)
+	adminUsername := claims["name"].(string)
+	log.Info(adminUsername)
+
+	// Extract the necessary parameters from the request
+	data := new(types.StrNameChange)
+	if err := c.BodyParser(data); err != nil {
+		log.Info("Error parsing username")
+		return c.Status(400).SendString(err.Error())
+	}
+
+	// Check if the current user is an admin
+	isAdmin, err := db.GetDb(c).IsSiteAdmin(adminUsername)
+	if err != nil {
+		log.Warn("Error checking if admin:", err)
+		return c.Status(500).SendString(err.Error())
+	} else if !isAdmin {
+		log.Warn("Tried changing name when not admin")
+		return c.Status(401).SendString("You cannot change name unless you are an admin")
+	}
+
+	// Change the user's name in the database
+	if err := db.GetDb(c).ChangeUserName(data.PrevName, data.NewName); err != nil {
+		return c.Status(500).SendString(err.Error())
+	}
+
+	// Return a success message
+	return c.SendStatus(fiber.StatusOK)
+}

backend/internal/handlers/users/GetUsersProjects.go

@@ -0,0 +1,22 @@
+package users
+
+import (
+	db "ttime/internal/database"
+
+	"github.com/gofiber/fiber/v2"
+	"github.com/gofiber/fiber/v2/log"
+)
+
+func GetAllUsersProject(c *fiber.Ctx) error {
+	// Get all users from a project
+	projectName := c.Params("projectName")
+	users, err := db.GetDb(c).GetAllUsersProject(projectName)
+	if err != nil {
+		log.Info("Error getting users from project:", err) // Debug print
+		return c.Status(500).SendString(err.Error())
+	}
+
+	log.Info("Returning all users")
+	// Return the list of users as JSON
+	return c.JSON(users)
+}

backend/internal/handlers/users/ListAllUsers.go

@@ -0,0 +1,31 @@
+package users
+
+import (
+	db "ttime/internal/database"
+
+	"github.com/gofiber/fiber/v2"
+	"github.com/gofiber/fiber/v2/log"
+)
+
+// ListAllUsers is a handler that returns a list of all users in the application database
+// @Summary		ListsAllUsers
+// @Description	lists all users
+// @Tags			User
+// @Accept			json
+// @Produce		plain
+// @Success		200	{json}		json	"Successfully signed token for user"
+// @Failure		401	{string}	string	"Unauthorized"
+// @Failure		500	{string}	string	"Internal server error"
+// @Router			/users/all [get]
+func ListAllUsers(c *fiber.Ctx) error {
+	// Get all users from the database
+	users, err := db.GetDb(c).GetAllUsersApplication()
+	if err != nil {
+		log.Info("Error getting users from db:", err) // Debug print
+		return c.Status(500).SendString(err.Error())
+	}
+
+	log.Info("Returning all users")
+	// Return the list of users as JSON
+	return c.JSON(users)
+}

backend/internal/handlers/users/Login.go

@@ -0,0 +1,65 @@
+package users
+
+import (
+	"time"
+	db "ttime/internal/database"
+	"ttime/internal/types"
+
+	"github.com/gofiber/fiber/v2"
+	"github.com/gofiber/fiber/v2/log"
+	"github.com/golang-jwt/jwt/v5"
+)
+
+// Login is a simple login handler that returns a JWT token
+// @Summary		login
+// @Description	logs the user in and returns a jwt token
+// @Tags			User
+// @Accept			json
+// @Param			NewUser	body	types.NewUser	true	"login info"
+// @Produce		plain
+// @Success		200	Token		types.Token	"Successfully signed token for user"
+// @Failure		400	{string}	string		"Bad request"
+// @Failure		401	{string}	string		"Unauthorized"
+// @Failure		500	{string}	string		"Internal server error"
+// @Router			/login [post]
+func Login(c *fiber.Ctx) error {
+	// The body type is identical to a NewUser
+
+	u := new(types.NewUser)
+	if err := c.BodyParser(u); err != nil {
+		log.Warn("Error parsing body")
+		return c.Status(400).SendString(err.Error())
+	}
+
+	log.Info("Username logging in:", u.Username)
+	if !db.GetDb(c).CheckUser(u.Username, u.Password) {
+		log.Info("User not found")
+		return c.SendStatus(fiber.StatusUnauthorized)
+	}
+
+	isAdmin, err := db.GetDb(c).IsSiteAdmin(u.Username)
+	if err != nil {
+		log.Info("Error checking admin status:", err)
+		return c.Status(500).SendString(err.Error())
+	}
+	// Create the Claims
+	claims := jwt.MapClaims{
+		"name":  u.Username,
+		"admin": isAdmin,
+		"exp":   time.Now().Add(time.Hour * 72).Unix(),
+	}
+
+	// Create token
+	token := jwt.NewWithClaims(jwt.SigningMethodHS256, claims)
+	log.Info("Token created for user:", u.Username)
+
+	// Generate encoded token and send it as response.
+	t, err := token.SignedString([]byte("secret"))
+	if err != nil {
+		log.Warn("Error signing token")
+		return c.SendStatus(fiber.StatusInternalServerError)
+	}
+
+	println("Successfully signed token for user:", u.Username)
+	return c.JSON(types.Token{Token: t})
+}

backend/internal/handlers/users/LoginRenew.go

@@ -0,0 +1,44 @@
+package users
+
+import (
+	"time"
+	"ttime/internal/types"
+
+	"github.com/gofiber/fiber/v2"
+	"github.com/gofiber/fiber/v2/log"
+	"github.com/golang-jwt/jwt/v5"
+)
+
+// LoginRenew is a simple handler that renews the token
+// @Summary		LoginRenews
+// @Description	renews the users token
+// @Security		bererToken
+// @Tags			User
+// @Accept			json
+// @Produce		plain
+// @Success		200	Token		types.Token	"Successfully signed token for user"
+// @Failure		401	{string}	string		"Unauthorized"
+// @Failure		500	{string}	string		"Internal server error"
+// @Router			/loginerenew [post]
+func LoginRenew(c *fiber.Ctx) error {
+	user := c.Locals("user").(*jwt.Token)
+
+	log.Info("Renewing token for user:", user.Claims.(jwt.MapClaims)["name"])
+
+	claims := user.Claims.(jwt.MapClaims)
+	claims["exp"] = time.Now().Add(time.Hour * 72).Unix()
+	renewed := jwt.MapClaims{
+		"name":  claims["name"],
+		"admin": claims["admin"],
+		"exp":   claims["exp"],
+	}
+	token := jwt.NewWithClaims(jwt.SigningMethodHS256, renewed)
+	t, err := token.SignedString([]byte("secret"))
+	if err != nil {
+		log.Warn("Error signing token")
+		return c.SendStatus(fiber.StatusInternalServerError)
+	}
+
+	log.Info("Successfully renewed token for user:", user.Claims.(jwt.MapClaims)["name"])
+	return c.JSON(types.Token{Token: t})
+}

backend/internal/handlers/users/PromoteToAdmin.go

@@ -0,0 +1,42 @@
+package users
+
+import (
+	db "ttime/internal/database"
+	"ttime/internal/types"
+
+	"github.com/gofiber/fiber/v2"
+	"github.com/gofiber/fiber/v2/log"
+)
+
+// @Summary		PromoteToAdmin
+// @Description	promote chosen user to admin
+// @Tags			User
+// @Accept			json
+// @Produce		plain
+// @Param			NewUser	body		types.NewUser	true	"user info"
+// @Success		200		{json}		json			"Successfully promoted user"
+// @Failure		400		{string}	string			"Bad request"
+// @Failure		401		{string}	string			"Unauthorized"
+// @Failure		500		{string}	string			"Internal server error"
+// @Router			/promoteToAdmin [post]
+func PromoteToAdmin(c *fiber.Ctx) error {
+	// Extract the username from the request body
+	var newUser types.NewUser
+	if err := c.BodyParser(&newUser); err != nil {
+		return c.Status(400).SendString("Bad request")
+	}
+	username := newUser.Username
+
+	log.Info("Promoting user to admin:", username) // Debug print
+
+	// Promote the user to a site admin in the database
+	if err := db.GetDb(c).PromoteToAdmin(username); err != nil {
+		log.Info("Error promoting user to admin:", err) // Debug print
+		return c.Status(500).SendString(err.Error())
+	}
+
+	log.Info("User promoted to admin successfully:", username) // Debug print
+
+	// Return a success message
+	return c.SendStatus(fiber.StatusOK)
+}

backend/internal/handlers/users/Register.go

@@ -0,0 +1,38 @@
+package users
+
+import (
+	db "ttime/internal/database"
+	"ttime/internal/types"
+
+	"github.com/gofiber/fiber/v2"
+	"github.com/gofiber/fiber/v2/log"
+)
+
+// Register is a simple handler that registers a new user
+//
+//	@Summary		Register
+//	@Description	Register a new user
+//	@Tags			User
+//	@Accept			json
+//	@Produce		plain
+//	@Param			NewUser	body		types.NewUser	true	"User to register"
+//	@Success		200		{string}	string			"User added"
+//	@Failure		400		{string}	string			"Bad request"
+//	@Failure		500		{string}	string			"Internal server error"
+//	@Router			/register [post]
+func Register(c *fiber.Ctx) error {
+	u := new(types.NewUser)
+	if err := c.BodyParser(u); err != nil {
+		log.Warn("Error parsing body")
+		return c.Status(400).SendString(err.Error())
+	}
+
+	log.Info("Adding user:", u.Username)
+	if err := db.GetDb(c).AddUser(u.Username, u.Password); err != nil {
+		log.Warn("Error adding user:", err)
+		return c.Status(500).SendString(err.Error())
+	}
+
+	log.Info("User added:", u.Username)
+	return c.Status(200).SendString("User added")
+}

backend/internal/handlers/users/UserDelete.go

@@ -0,0 +1,43 @@
+package users
+
+import (
+	db "ttime/internal/database"
+
+	"github.com/gofiber/fiber/v2"
+	"github.com/gofiber/fiber/v2/log"
+	"github.com/golang-jwt/jwt/v5"
+)
+
+// This path should obviously be protected in the future
+// UserDelete deletes a user from the database
+//
+//	@Summary		UserDelete
+//	@Description	UserDelete deletes a user from the database
+//	@Tags			User
+//	@Accept			json
+//	@Produce		plain
+//	@Success		200	{string}	string	"User deleted"
+//	@Failure		403	{string}	string	"You can only delete yourself"
+//	@Failure		500	{string}	string	"Internal server error"
+//	@Failure		401	{string}	string	"Unauthorized"
+//	@Router			/userdelete/{username} [delete]
+func UserDelete(c *fiber.Ctx) error {
+	// Read from path parameters
+	username := c.Params("username")
+
+	// Read username from Locals
+	auth_username := c.Locals("user").(*jwt.Token).Claims.(jwt.MapClaims)["name"].(string)
+
+	if username == auth_username {
+		log.Info("User tried to delete itself")
+		return c.Status(403).SendString("You can't delete yourself")
+	}
+
+	if err := db.GetDb(c).RemoveUser(username); err != nil {
+		log.Warn("Error deleting user:", err)
+		return c.Status(500).SendString(err.Error())
+	}
+
+	log.Info("User deleted:", username)
+	return c.Status(200).SendString("User deleted")
+}

backend/main.go

@@ -6,7 +6,9 @@ import (
 	_ "ttime/docs"
 	"ttime/internal/config"
 	"ttime/internal/database"
-	"ttime/internal/handlers"
+	"ttime/internal/handlers/projects"
+	"ttime/internal/handlers/reports"
+	"ttime/internal/handlers/users"
 
 	"github.com/BurntSushi/toml"
 	"github.com/gofiber/fiber/v2"
@@ -54,24 +56,28 @@ func main() {
 
 	// Connect to the database
 	db := database.DbConnect(conf.DbPath)
+
 	// Migrate the database
 	if err = db.Migrate(); err != nil {
 		fmt.Println("Error migrating database: ", err)
 		os.Exit(1)
 	}
 
+	// Migrate sample data, should not be used in production
 	if err = db.MigrateSampleData(); err != nil {
 		fmt.Println("Error migrating sample data: ", err)
 		os.Exit(1)
 	}
 
-	// Get our global state
-	gs := handlers.NewGlobalState(db)
 	// Create the server
 	server := fiber.New()
 
+	// We want some logs
 	server.Use(logger.New())
 
+	// Sets up db middleware, accessed as Local "db" key
+	server.Use(database.DbMiddleware(&db))
+
 	// Mounts the swagger documentation, this is available at /swagger/index.html
 	server.Get("/swagger/*", swagger.HandlerDefault)
 
@@ -79,35 +85,50 @@ func main() {
 	// This will likely be replaced by an embedded filesystem in the future
 	server.Static("/", "./static")
 
-	// Register our unprotected routes
-	server.Post("/api/register", gs.Register)
-	server.Post("/api/login", gs.Login)
+	// Create a group for our API
+	api := server.Group("/api")
 
-	// Every route from here on will require a valid JWT
+	// Register our unprotected routes
+	api.Post("/register", users.Register)
+	api.Post("/login", users.Login)
+
+	// Every route from here on will require a valid
+	// JWT bearer token authentication in the header
 	server.Use(jwtware.New(jwtware.Config{
 		SigningKey: jwtware.SigningKey{Key: []byte("secret")},
 	}))
 
-	// Protected routes (require a valid JWT bearer token authentication header)
-	server.Post("/api/submitWeeklyReport", gs.SubmitWeeklyReport)
-	server.Get("/api/getUserProjects", gs.GetUserProjects)
-	server.Post("/api/loginrenew", gs.LoginRenew)
-	server.Delete("/api/userdelete/:username", gs.UserDelete) // Perhaps just use POST to avoid headaches
-	server.Delete("api/project/:projectID", gs.DeleteProject) // WIP
-	server.Post("/api/project", gs.CreateProject)             // WIP
-	server.Get("/api/project/:projectId", gs.GetProject)
-	server.Get("/api/project/getAllUsers", gs.GetAllUsersProject)
-	server.Get("/api/getWeeklyReport", gs.GetWeeklyReport)
-	server.Post("/api/signReport", gs.SignReport)
-	server.Put("/api/addUserToProject", gs.AddUserToProjectHandler)
-	server.Put("/api/changeUserName", gs.ChangeUserName)
-	server.Post("/api/promoteToAdmin", gs.PromoteToAdmin)
-	server.Get("/api/users/all", gs.ListAllUsers)
-	server.Get("/api/getWeeklyReportsUser/:projectName", gs.GetWeeklyReportsUserHandler)
-	server.Get("/api/checkIfProjectManager/:projectName", gs.IsProjectManagerHandler)
-	server.Post("/api/ProjectRoleChange", gs.ProjectRoleChange)
-	server.Get("/api/getUsersProject/:projectName", gs.ListAllUsersProject)
-	server.Put("/api/updateWeeklyReport", gs.UpdateWeeklyReport)
+	// All user related routes
+	// userGroup := api.Group("/user") // Not currently in use
+	api.Get("/users/all", users.ListAllUsers)
+	api.Get("/project/getAllUsers", users.GetAllUsersProject)
+	api.Post("/login", users.Login)
+	api.Post("/register", users.Register)
+	api.Post("/loginrenew", users.LoginRenew)
+	api.Post("/promoteToAdmin", users.PromoteToAdmin)
+	api.Put("/changeUserName", users.ChangeUserName)
+	api.Delete("/userdelete/:username", users.UserDelete) // Perhaps just use POST to avoid headaches
+
+	// All project related routes
+	// projectGroup := api.Group("/project") // Not currently in use
+	api.Get("/getUserProjects", projects.GetUserProjects)
+	api.Get("/project/:projectId", projects.GetProject)
+	api.Get("/checkIfProjectManager/:projectName", projects.IsProjectManagerHandler)
+	api.Get("/getUsersProject/:projectName", projects.ListAllUsersProject)
+	api.Post("/project", projects.CreateProject)
+	api.Post("/ProjectRoleChange", projects.ProjectRoleChange)
+	api.Delete("/removeProject/:projectName", projects.RemoveProject)
+	api.Delete("/project/:projectID", projects.DeleteProject)
+
+	// All report related routes
+	// reportGroup := api.Group("/report") // Not currently in use
+	api.Get("/getWeeklyReport", reports.GetWeeklyReport)
+	api.Get("/getUnsignedReports/:projectName", reports.GetUnsignedReports)
+	api.Get("/getWeeklyReportsUser/:projectName", reports.GetWeeklyReportsUserHandler)
+	api.Post("/submitWeeklyReport", reports.SubmitWeeklyReport)
+	api.Put("/signReport/:reportId", reports.SignReport)
+	api.Put("/addUserToProject", projects.AddUserToProjectHandler)
+	api.Put("/updateWeeklyReport", reports.UpdateWeeklyReport)
 
 	// Announce the port we are listening on and start the server
 	err = server.Listen(fmt.Sprintf(":%d", conf.Port))

frontend/src/API/API.ts

@@ -6,6 +6,8 @@ import {
   NewProject,
   UserProjectMember,
   WeeklyReport,
+  StrNameChange,
+  NewProjMember,
 } from "../Types/goTypes";
 
 /**
@@ -47,7 +49,6 @@ interface API {
    * @returns {Promise<APIResponse<boolean>>} A promise containing the API response indicating if the user is a project manager.
    */
   checkIfProjectManager(
-    username: string,
     projectName: string,
     token: string,
   ): Promise<APIResponse<boolean>>;
@@ -133,6 +134,37 @@ interface API {
     projectName: string,
     token: string,
   ): Promise<APIResponse<UserProjectMember[]>>;
+  /**
+   * Changes the username of a user in the database.
+   * @param {StrNameChange} data The object containing the previous and new username.
+   * @param {string} token The authentication token.
+   * @returns {Promise<APIResponse<void>>} A promise resolving to an API response.
+   */
+  changeUserName(
+    data: StrNameChange,
+    token: string,
+  ): Promise<APIResponse<void>>;
+  addUserToProject(
+    user: NewProjMember,
+    token: string,
+  ): Promise<APIResponse<NewProjMember>>;
+
+  removeProject(
+    projectName: string,
+    token: string,
+  ): Promise<APIResponse<string>>;
+
+  /**
+   * Signs a report. Keep in mind that the user which the token belongs to must be
+   * the project manager of the project the report belongs to.
+   *
+   * @param {number} reportId The id of the report to sign
+   * @param {string} token The authentication token
+   */
+  signReport(
+    reportId: number,
+    token: string,
+  ): Promise<APIResponse<string>>;
 }
 
 /** An instance of the API */
@@ -170,19 +202,17 @@ export const api: API = {
   ): Promise<APIResponse<User>> {
     try {
       const response = await fetch(`/api/userdelete/${username}`, {
-        method: "POST",
+        method: "DELETE",
         headers: {
           "Content-Type": "application/json",
           Authorization: "Bearer " + token,
         },
         body: JSON.stringify(username),
       });
-
       if (!response.ok) {
-        return { success: false, message: "Failed to remove user" };
+        return { success: false, message: "Could not remove user" };
       } else {
-        const data = (await response.json()) as User;
-        return { success: true, data };
+        return { success: true };
       }
     } catch (e) {
       return { success: false, message: "Failed to remove user" };
@@ -190,19 +220,20 @@ export const api: API = {
   },
 
   async checkIfProjectManager(
-    username: string,
     projectName: string,
     token: string,
   ): Promise<APIResponse<boolean>> {
     try {
-      const response = await fetch("/api/checkIfProjectManager", {
+      const response = await fetch(
+        `/api/checkIfProjectManager/${projectName}`,
+        {
           method: "GET",
           headers: {
             "Content-Type": "application/json",
             Authorization: "Bearer " + token,
           },
-        body: JSON.stringify({ username, projectName }),
-      });
+        },
+      );
 
       if (!response.ok) {
         return {
@@ -214,7 +245,7 @@ export const api: API = {
         return { success: true, data };
       }
     } catch (e) {
-      return { success: false, message: "fuck" };
+      return { success: false, message: "Failed to check if project manager" };
     }
   },
 
@@ -243,6 +274,30 @@ export const api: API = {
     }
   },
 
+  async addUserToProject(
+    user: NewProjMember,
+    token: string,
+  ): Promise<APIResponse<NewProjMember>> {
+    try {
+      const response = await fetch("/api/addUserToProject", {
+        method: "PUT",
+        headers: {
+          "Content-Type": "application/json",
+          Authorization: "Bearer " + token,
+        },
+        body: JSON.stringify(user),
+      });
+
+      if (!response.ok) {
+        return { success: false, message: "Failed to add member" };
+      } else {
+        return { success: true, message: "Added member" };
+      }
+    } catch (e) {
+      return { success: false, message: "Failed to add member" };
+    }
+  },
+
   async renewToken(token: string): Promise<APIResponse<string>> {
     try {
       const response = await fetch("/api/loginrenew", {
@@ -484,4 +539,81 @@ export const api: API = {
       });
     }
   },
+
+  async changeUserName(
+    data: StrNameChange,
+    token: string,
+  ): Promise<APIResponse<void>> {
+    try {
+      const response = await fetch("/api/changeUserName", {
+        method: "PUT",
+        headers: {
+          "Content-Type": "application/json",
+          Authorization: "Bearer " + token,
+        },
+        body: JSON.stringify(data),
+      });
+
+      if (!response.ok) {
+        return { success: false, message: "Failed to change username" };
+      } else {
+        return { success: true };
+      }
+    } catch (e) {
+      return { success: false, message: "Failed to change username" };
+    }
+  },
+
+  async removeProject(
+    projectName: string,
+    token: string,
+  ): Promise<APIResponse<string>> {
+    try {
+      const response = await fetch(`/api/projectdelete/${projectName}`, {
+        method: "DELETE",
+        headers: {
+          "Content-Type": "application/json",
+          Authorization: "Bearer " + token,
+        },
+      });
+
+      if (!response.ok) {
+        return Promise.resolve({
+          success: false,
+          message: "Failed to remove project",
+        });
+      } else {
+        const data = await response.text();
+        return Promise.resolve({ success: true, message: data });
+      }
+    } catch (e) {
+      return Promise.resolve({
+        success: false,
+        message: "Failed to remove project",
+      });
+    }
+  },
+
+  async signReport(
+    reportId: number,
+    token: string,
+  ): Promise<APIResponse<string>> {
+    try {
+      const response = await fetch(`/api/signReport/${reportId}`, {
+        method: "PUT",
+        headers: {
+          "Content-Type": "application/json",
+          Authorization: "Bearer " + token,
+        },
+      });
+
+      if (!response.ok) {
+        return { success: false, message: "Failed to sign report" };
+      } else {
+        return { success: true, message: "Report signed" };
+      }
+    } catch (e) {
+      return { success: false, message: "Failed to sign report" };
+    }
+  }
 };

frontend/src/Components/AddMember.tsx

@@ -0,0 +1,39 @@
+import { APIResponse, api } from "../API/API";
+import { NewProjMember } from "../Types/goTypes";
+
+/**
+ * Tries to add a member to a project
+ * @param {Object} props - A NewProjMember
+ * @returns {boolean} True if added, false if not
+ */
+function AddMember(props: { memberToAdd: NewProjMember }): boolean {
+  let added = false;
+  if (
+    props.memberToAdd.username === "" ||
+    props.memberToAdd.role === "" ||
+    props.memberToAdd.projectname === ""
+  ) {
+    alert("All fields must be filled before adding");
+    return added;
+  }
+  api
+    .addUserToProject(
+      props.memberToAdd,
+      localStorage.getItem("accessToken") ?? "",
+    )
+    .then((response: APIResponse<NewProjMember>) => {
+      if (response.success) {
+        alert("Member added");
+        added = true;
+      } else {
+        alert("Member not added");
+        console.error(response.message);
+      }
+    })
+    .catch((error) => {
+      console.error("An error occurred during member add:", error);
+    });
+  return added;
+}
+
+export default AddMember;

frontend/src/Components/AddUserToProject.tsx

@@ -0,0 +1,92 @@
+import { useState } from "react";
+import { NewProjMember } from "../Types/goTypes";
+import Button from "./Button";
+import GetAllUsers from "./GetAllUsers";
+import AddMember from "./AddMember";
+import BackButton from "./BackButton";
+
+/**
+ * Provides UI for adding a member to a project.
+ * @returns {JSX.Element} - Returns the component UI for adding a member
+ */
+function AddUserToProject(): JSX.Element {
+  const [name, setName] = useState("");
+  const [users, setUsers] = useState<string[]>([]);
+  const [role, setRole] = useState("");
+  GetAllUsers({ setUsersProp: setUsers });
+
+  const handleClick = (): boolean => {
+    const newMember: NewProjMember = {
+      username: name,
+      projectname: localStorage.getItem("projectName") ?? "",
+      role: role,
+    };
+    return AddMember({ memberToAdd: newMember });
+  };
+
+  return (
+    <div className="border-4 border-black bg-white flex flex-col items-center justify-center rounded-3xl content-center pl-20 pr-20  h-[75vh] w-[50vh]">
+      <p className="pb-4 mb-2 text-center font-bold text-[18px]">
+        User chosen: [{name}]
+      </p>
+      <p className="pb-4 mb-2 text-center font-bold text-[18px]">
+        Role chosen: [{role}]
+      </p>
+      <p className="pb-4 mb-2 text-center font-bold text-[18px]">
+        Project chosen: [{localStorage.getItem("projectName") ?? ""}]
+      </p>
+      <p className="p-1">Choose role:</p>
+      <div className="border-2 border-black p-2 rounded-xl text-center h-[10h] w-[16vh]">
+        <ul className="text-center items-center font-medium space-y-2">
+          <li
+            className="h-[10h] w-[14vh] items-start p-1 border-2 border-black rounded-full bg-orange-200 hover:bg-orange-600 hover:text-slate-100 hover:cursor-pointer"
+            onClick={() => {
+              setRole("member");
+            }}
+          >
+            {"Member"}
+          </li>
+          <li
+            className="h-[10h] w-[14vh] items-start p-1 border-2 border-black rounded-full bg-orange-200 hover:bg-orange-600 hover:text-slate-100 hover:cursor-pointer"
+            onClick={() => {
+              setRole("project_manager");
+            }}
+          >
+            {"Project manager"}
+          </li>
+        </ul>
+      </div>
+      <p className="p-1">Choose user:</p>
+      <div className="border-2 border-black p-2 rounded-xl text-center overflow-scroll h-[26vh] w-[26vh]">
+        <ul className="text-center font-medium space-y-2">
+          <div></div>
+          {users.map((user) => (
+            <li
+              className="items-start p-1 border-2 border-black rounded-full bg-orange-200 hover:bg-orange-600 hover:text-slate-100 hover:cursor-pointer"
+              key={user}
+              value={user}
+              onClick={() => {
+                setName(user);
+              }}
+            >
+              <span>{user}</span>
+            </li>
+          ))}
+        </ul>
+      </div>
+      <div className="flex space-x-5 items-center justify-between">
+        <Button
+          text="Add"
+          onClick={(): void => {
+            handleClick();
+          }}
+          type="submit"
+        />
+        <BackButton />
+      </div>
+      <p className="text-center text-gray-500 text-xs"></p>
+    </div>
+  );
+}
+
+export default AddUserToProject;

frontend/src/Components/AllTimeReportsInProjectOtherUser.tsx

@@ -0,0 +1,103 @@
+//Info: This component is used to display all the time reports for a project. It will display the week number,
+//total time spent, and if the report has been signed or not. The user can click on a report to edit it.
+import { useEffect, useState } from "react";
+import { NewWeeklyReport } from "../Types/goTypes";
+import { Link, useParams } from "react-router-dom";
+
+/**
+ * Renders a component that displays all the time reports for a specific project.
+ * @returns {JSX.Element} representing the component.
+ */
+function AllTimeReportsInProject(): JSX.Element {
+  const { username } = useParams();
+  const { projectName } = useParams();
+  const [weeklyReports, setWeeklyReports] = useState<NewWeeklyReport[]>([]);
+
+  /*   // Call getProjects when the component mounts
+  useEffect(() => {
+    const getWeeklyReports = async (): Promise<void> => {
+      const token = localStorage.getItem("accessToken") ?? "";
+      const response = await api.getWeeklyReportsForUser(
+        projectName ?? "",
+        token,
+      );
+      console.log(response);
+      if (response.success) {
+        setWeeklyReports(response.data ?? []);
+      } else {
+        console.error(response.message);
+      }
+    }; */
+  // Mock data
+  const getWeeklyReports = async (): Promise<void> => {
+    // Simulate a delay
+    await Promise.resolve();
+    const mockWeeklyReports: NewWeeklyReport[] = [
+      {
+        projectName: "Project 1",
+        week: 1,
+        developmentTime: 10,
+        meetingTime: 2,
+        adminTime: 1,
+        ownWorkTime: 3,
+        studyTime: 4,
+        testingTime: 5,
+      },
+      {
+        projectName: "Project 1",
+        week: 2,
+        developmentTime: 8,
+        meetingTime: 2,
+        adminTime: 1,
+        ownWorkTime: 3,
+        studyTime: 4,
+        testingTime: 5,
+      },
+      // Add more reports as needed
+    ];
+
+    // Use the mock data instead of the real data
+    setWeeklyReports(mockWeeklyReports);
+  };
+  useEffect(() => {
+    void getWeeklyReports();
+  }, []);
+
+  return (
+    <>
+      <h1 className="text-[30px] font-bold">{username}&apos;s Time Reports</h1>
+      <div className="border-4 border-black bg-white flex flex-col items-center justify-center min-h-[65vh] h-fit w-[50vw] rounded-3xl content-center overflow-scroll space-y-[10vh] p-[30px] text-[30px]">
+        {weeklyReports.map((newWeeklyReport, index) => (
+          <Link
+            to={`/editOthersTR/${projectName}/${username}/${newWeeklyReport.week}`}
+            key={index}
+            className="border-b-2 border-black w-full"
+          >
+            <div className="flex justify-between">
+              <h1>
+                <span className="font-bold">{"Week: "}</span>
+                {newWeeklyReport.week}
+              </h1>
+              <h1>
+                <span className="font-bold">{"Total Time: "}</span>
+                {newWeeklyReport.developmentTime +
+                  newWeeklyReport.meetingTime +
+                  newWeeklyReport.adminTime +
+                  newWeeklyReport.ownWorkTime +
+                  newWeeklyReport.studyTime +
+                  newWeeklyReport.testingTime}{" "}
+                min
+              </h1>
+              <h1>
+                <span className="font-bold">{"Signed: "}</span>
+                NO
+              </h1>
+            </div>
+          </Link>
+        ))}
+      </div>
+    </>
+  );
+}
+
+export default AllTimeReportsInProject;

frontend/src/Components/ChangeUsername.tsx

@@ -1,23 +1,48 @@
 import React, { useState } from "react";
 import InputField from "./InputField";
+import { api } from "../API/API";
 
 function ChangeUsername(): JSX.Element {
   const [newUsername, setNewUsername] = useState("");
+  const [errorMessage, setErrorMessage] = useState("");
 
   const handleChange = (e: React.ChangeEvent<HTMLInputElement>): void => {
     setNewUsername(e.target.value);
   };
 
-  // const handleSubmit = async (): Promise<void> => {
-  //   try {
-  //     // Call the API function to update the username
-  //     await api.updateUsername(newUsername);
-  //     // Optionally, add a success message or redirect the user
-  //   } catch (error) {
-  //     console.error("Error updating username:", error);
-  //     // Optionally, handle the error
-  //   }
-  // };
+  const handleSubmit = async (): Promise<void> => {
+    try {
+      // Call the API function to change the username
+      const token = localStorage.getItem("accessToken");
+      if (!token) {
+        throw new Error("Access token not found");
+      }
+
+      const response = await api.changeUserName(
+        { prevName: "currentName", newName: newUsername },
+        token,
+      );
+
+      if (response.success) {
+        // Optionally, add a success message or redirect the user
+        console.log("Username changed successfully");
+      } else {
+        // Handle the error message
+        console.error("Failed to change username:", response.message);
+        setErrorMessage(response.message ?? "Failed to change username");
+      }
+    } catch (error) {
+      console.error("Error changing username:", error);
+      // Optionally, handle the error
+      setErrorMessage("Failed to change username");
+    }
+  };
+
+  const handleButtonClick = (): void => {
+    handleSubmit().catch((error) => {
+      console.error("Error in handleSubmit:", error);
+    });
+  };
 
   return (
     <div>
@@ -27,6 +52,8 @@ function ChangeUsername(): JSX.Element {
         value={newUsername}
         onChange={handleChange}
       />
+      {errorMessage && <div>{errorMessage}</div>}
+      <button onClick={handleButtonClick}>Update Username</button>
     </div>
   );
 }

frontend/src/Components/DeleteUser.tsx

@@ -11,7 +11,6 @@ import { api, APIResponse } from "../API/API";
  */
 
 function DeleteUser(props: { usernameToDelete: string }): boolean {
-  //console.log(props.usernameToDelete); FOR DEBUG
   let removed = false;
   api
     .removeUser(
@@ -20,12 +19,16 @@ function DeleteUser(props: { usernameToDelete: string }): boolean {
     )
     .then((response: APIResponse<User>) => {
       if (response.success) {
+        alert("User has been deleted!");
+        location.reload();
         removed = true;
       } else {
+        alert("User has not been deleted");
         console.error(response.message);
       }
     })
     .catch((error) => {
+      alert("User has not been deleted");
       console.error("An error occurred during creation:", error);
     });
   return removed;

frontend/src/Components/DisplayUnsignedReports.tsx

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

frontend/src/Components/DisplayUserProjects.tsx

@@ -1,6 +1,6 @@
 import { useState, useEffect } from "react";
 import { Project } from "../Types/goTypes";
-import { Link } from "react-router-dom";
+import { useNavigate } from "react-router-dom";
 import { api } from "../API/API";
 
 /**
@@ -9,6 +9,7 @@ import { api } from "../API/API";
  */
 function DisplayUserProject(): JSX.Element {
   const [projects, setProjects] = useState<Project[]>([]);
+  const navigate = useNavigate();
 
   const getProjects = async (): Promise<void> => {
     const token = localStorage.getItem("accessToken") ?? "";
@@ -21,6 +22,21 @@ function DisplayUserProject(): JSX.Element {
     }
   };
 
+  const handleProjectClick = async (projectName: string): Promise<void> => {
+    const token = localStorage.getItem("accessToken") ?? "";
+    const response = await api.checkIfProjectManager(projectName, token);
+    if (response.success) {
+      if (response.data) {
+        navigate(`/PMProjectPage/${projectName}`);
+      } else {
+        navigate(`/project/${projectName}`);
+      }
+    } else {
+      // handle error
+      console.error(response.message);
+    }
+  };
+
   // Call getProjects when the component mounts
   useEffect(() => {
     void getProjects();
@@ -30,12 +46,15 @@ function DisplayUserProject(): JSX.Element {
     <>
       <h1 className="font-bold text-[30px] mb-[20px]">Your Projects</h1>
       <div className="border-4 border-black bg-white flex flex-col items-center justify-center min-h-[65vh] h-fit w-[50vw] rounded-3xl content-center overflow-scroll space-y-[10vh] p-[30px]">
-        {projects.map((project, index) => (
-          <Link to={`/project/${project.name}`} key={index}>
+        {projects.map((project) => (
+          <div
+            onClick={() => void handleProjectClick(project.name)}
+            key={project.id}
+          >
             <h1 className="font-bold underline text-[30px] cursor-pointer">
               {project.name}
             </h1>
-          </Link>
+          </div>
         ))}
       </div>
     </>

frontend/src/Components/EditWeeklyReport.tsx

@@ -18,13 +18,17 @@ export default function GetWeeklyReport(): JSX.Element {
   const [testingTime, setTestingTime] = useState(0);
 
   const token = localStorage.getItem("accessToken") ?? "";
-  const { projectName } = useParams();
-  const { fetchedWeek } = useParams();
+  const { projectName, fetchedWeek } = useParams<{
+    projectName: string;
+    fetchedWeek: string;
+  }>();
+  console.log(projectName, fetchedWeek);
 
+  useEffect(() => {
     const fetchWeeklyReport = async (): Promise<void> => {
       const response = await api.getWeeklyReport(
         projectName ?? "",
-      fetchedWeek?.toString() ?? "0",
+        fetchedWeek ?? "",
         token,
       );
 
@@ -53,9 +57,8 @@ export default function GetWeeklyReport(): JSX.Element {
       }
     };
 
-  useEffect(() => {
     void fetchWeeklyReport();
-  });
+  }, [projectName, fetchedWeek, token]);
 
   const handleNewWeeklyReport = async (): Promise<void> => {
     const newWeeklyReport: NewWeeklyReport = {
@@ -76,6 +79,7 @@ export default function GetWeeklyReport(): JSX.Element {
 
   return (
     <>
+      <h1 className="font-bold text-[30px] mb-[20px]">Edit Time Report</h1>
       <div className="border-4 border-black bg-white flex flex-col justify-start min-h-[65vh] h-fit w-[50vw] rounded-3xl overflow-scroll space-y-[2vh] p-[30px] items-center">
         <form
           onSubmit={(e) => {
@@ -90,24 +94,10 @@ export default function GetWeeklyReport(): JSX.Element {
           }}
         >
           <div className="flex flex-col items-center">
-            <input
-              className="w-fill h-[5vh] font-sans text-[3vh] pl-[1vw] rounded-full text-center pt-[1vh] pb-[1vh] border-2 border-black"
-              type="week"
-              placeholder="Week"
-              value={
-                week === 0 ? "" : `2024-W${week.toString().padStart(2, "0")}`
-              }
-              onChange={(e) => {
-                const weekNumber = parseInt(e.target.value.split("-W")[1]);
-                setWeek(weekNumber);
-              }}
-              onKeyDown={(event) => {
-                event.preventDefault();
-              }}
-              onPaste={(event) => {
-                event.preventDefault();
-              }}
-            />
+            <div className="flex flex-col w-1/2 border-b-2 border-black items-center justify-center">
+              <h1 className="font-bold text-[30px]"> Week: {week}</h1>
+            </div>
+
             <table className="w-full text-center divide-y divide-x divide-white text-[30px]">
               <thead>
                 <tr>
@@ -127,9 +117,14 @@ export default function GetWeeklyReport(): JSX.Element {
                       type="number"
                       min="0"
                       className="border-2 border-black rounded-md text-center w-1/2"
-                      value={developmentTime}
+                      value={developmentTime === 0 ? "" : developmentTime}
                       onChange={(e) => {
+                        if (e.target.value === "") {
+                          setDevelopmentTime(0);
+                          return;
+                        } else {
                           setDevelopmentTime(parseInt(e.target.value));
+                        }
                       }}
                       onKeyDown={(event) => {
                         const keyValue = event.key;
@@ -146,9 +141,14 @@ export default function GetWeeklyReport(): JSX.Element {
                       type="number"
                       min="0"
                       className="border-2 border-black rounded-md text-center w-1/2"
-                      value={meetingTime}
+                      value={meetingTime === 0 ? "" : meetingTime}
                       onChange={(e) => {
+                        if (e.target.value === "") {
+                          setMeetingTime(0);
+                          return;
+                        } else {
                           setMeetingTime(parseInt(e.target.value));
+                        }
                       }}
                       onKeyDown={(event) => {
                         const keyValue = event.key;
@@ -165,9 +165,14 @@ export default function GetWeeklyReport(): JSX.Element {
                       type="number"
                       min="0"
                       className="border-2 border-black rounded-md text-center w-1/2"
-                      value={adminTime}
+                      value={adminTime === 0 ? "" : adminTime}
                       onChange={(e) => {
+                        if (e.target.value === "") {
+                          setAdminTime(0);
+                          return;
+                        } else {
                           setAdminTime(parseInt(e.target.value));
+                        }
                       }}
                       onKeyDown={(event) => {
                         const keyValue = event.key;
@@ -184,9 +189,14 @@ export default function GetWeeklyReport(): JSX.Element {
                       type="number"
                       min="0"
                       className="border-2 border-black rounded-md text-center w-1/2"
-                      value={ownWorkTime}
+                      value={ownWorkTime === 0 ? "" : ownWorkTime}
                       onChange={(e) => {
+                        if (e.target.value === "") {
+                          setOwnWorkTime(0);
+                          return;
+                        } else {
                           setOwnWorkTime(parseInt(e.target.value));
+                        }
                       }}
                       onKeyDown={(event) => {
                         const keyValue = event.key;
@@ -203,9 +213,14 @@ export default function GetWeeklyReport(): JSX.Element {
                       type="number"
                       min="0"
                       className="border-2 border-black rounded-md text-center w-1/2"
-                      value={studyTime}
+                      value={studyTime === 0 ? "" : studyTime}
                       onChange={(e) => {
+                        if (e.target.value === "") {
+                          setStudyTime(0);
+                          return;
+                        } else {
                           setStudyTime(parseInt(e.target.value));
+                        }
                       }}
                       onKeyDown={(event) => {
                         const keyValue = event.key;
@@ -222,9 +237,14 @@ export default function GetWeeklyReport(): JSX.Element {
                       type="number"
                       min="0"
                       className="border-2 border-black rounded-md text-center w-1/2"
-                      value={testingTime}
+                      value={testingTime === 0 ? "" : testingTime}
                       onChange={(e) => {
+                        if (e.target.value === "") {
+                          setTestingTime(0);
+                          return;
+                        } else {
                           setTestingTime(parseInt(e.target.value));
+                        }
                       }}
                       onKeyDown={(event) => {
                         const keyValue = event.key;

frontend/src/Components/NewWeeklyReport.tsx

@@ -12,55 +12,74 @@ import Button from "./Button";
  */
 export default function NewWeeklyReport(): JSX.Element {
   const [week, setWeek] = useState<number>(0);
-  const [developmentTime, setDevelopmentTime] = useState<number>();
-  const [meetingTime, setMeetingTime] = useState<number>();
-  const [adminTime, setAdminTime] = useState<number>();
-  const [ownWorkTime, setOwnWorkTime] = useState<number>();
-  const [studyTime, setStudyTime] = useState<number>();
-  const [testingTime, setTestingTime] = useState<number>();
+  const [developmentTime, setDevelopmentTime] = useState<number>(0);
+  const [meetingTime, setMeetingTime] = useState<number>(0);
+  const [adminTime, setAdminTime] = useState<number>(0);
+  const [ownWorkTime, setOwnWorkTime] = useState<number>(0);
+  const [studyTime, setStudyTime] = useState<number>(0);
+  const [testingTime, setTestingTime] = useState<number>(0);
 
   const { projectName } = useParams();
   const token = localStorage.getItem("accessToken") ?? "";
 
-  const handleNewWeeklyReport = async (): Promise<void> => {
+  const handleNewWeeklyReport = async (): Promise<boolean> => {
     const newWeeklyReport: NewWeeklyReport = {
       projectName: projectName ?? "",
       week: week,
-      developmentTime: developmentTime ?? 0,
-      meetingTime: meetingTime ?? 0,
-      adminTime: adminTime ?? 0,
-      ownWorkTime: ownWorkTime ?? 0,
-      studyTime: studyTime ?? 0,
-      testingTime: testingTime ?? 0,
+      developmentTime: developmentTime,
+      meetingTime: meetingTime,
+      adminTime: adminTime,
+      ownWorkTime: ownWorkTime,
+      studyTime: studyTime,
+      testingTime: testingTime,
     };
 
-    await api.submitWeeklyReport(newWeeklyReport, token);
+    const response = await api.submitWeeklyReport(newWeeklyReport, token);
+    console.log(response);
+    if (response.success) {
+      return true;
+    } else {
+      return false;
+    }
   };
 
   const navigate = useNavigate();
+  // Check if the browser is Chrome or Edge
+  const isChromeOrEdge = /Chrome|Edg/.test(navigator.userAgent);
 
   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">
         <form
           onSubmit={(e) => {
-            if (week === 0) {
-              alert("Please enter a week number");
             e.preventDefault();
+            void (async (): Promise<void> => {
+              if (week === 0 || week > 53 || week < 1) {
+                alert("Please enter a valid week number");
                 return;
               }
-            e.preventDefault();
-            void handleNewWeeklyReport();
+
+              const success = await handleNewWeeklyReport();
+              if (!success) {
+                alert(
+                  "A Time Report for this week already exists, please go to the edit page to edit it or change week number.",
+                );
+                return;
+              }
+              alert("Weekly report submitted successfully");
               navigate(-1);
+            })();
           }}
         >
           <div className="flex flex-col items-center">
+            {isChromeOrEdge ? (
               <input
                 className="w-fill h-[5vh] font-sans text-[3vh] pl-[1vw] rounded-full text-center pt-[1vh] pb-[1vh] border-2 border-black"
                 type="week"
                 placeholder="Week"
                 onChange={(e) => {
-                setWeek(parseInt(e.target.value));
+                  const weekNumber = parseInt(e.target.value.split("-W")[1]);
+                  setWeek(weekNumber);
                 }}
                 onKeyDown={(event) => {
                   const keyValue = event.key;
@@ -71,6 +90,25 @@ export default function NewWeeklyReport(): JSX.Element {
                   event.preventDefault();
                 }}
               />
+            ) : (
+              <input
+                className="w-fill h-[5vh] font-sans text-[3vh] pl-[1vw] rounded-full text-center pt-[1vh] pb-[1vh] border-2 border-black"
+                type="text"
+                placeholder="Week (Numbers Only)"
+                onChange={(e) => {
+                  const weekNumber = parseInt(e.target.value);
+                  setWeek(weekNumber);
+                }}
+                onKeyDown={(event) => {
+                  const keyValue = event.key;
+                  if (!/\d/.test(keyValue) && keyValue !== "Backspace")
+                    event.preventDefault();
+                }}
+                onPaste={(event) => {
+                  event.preventDefault();
+                }}
+              />
+            )}
             <table className="w-full text-center divide-y divide-x divide-white text-[30px]">
               <thead>
                 <tr>
@@ -90,9 +128,14 @@ export default function NewWeeklyReport(): JSX.Element {
                       type="number"
                       min="0"
                       className="border-2 border-black rounded-md text-center w-1/2"
-                      value={developmentTime}
+                      value={developmentTime === 0 ? "" : developmentTime}
                       onChange={(e) => {
+                        if (e.target.value === "") {
+                          setDevelopmentTime(0);
+                          return;
+                        } else {
                           setDevelopmentTime(parseInt(e.target.value));
+                        }
                       }}
                       onKeyDown={(event) => {
                         const keyValue = event.key;
@@ -109,9 +152,14 @@ export default function NewWeeklyReport(): JSX.Element {
                       type="number"
                       min="0"
                       className="border-2 border-black rounded-md text-center w-1/2"
-                      value={meetingTime}
+                      value={meetingTime === 0 ? "" : meetingTime}
                       onChange={(e) => {
+                        if (e.target.value === "") {
+                          setMeetingTime(0);
+                          return;
+                        } else {
                           setMeetingTime(parseInt(e.target.value));
+                        }
                       }}
                       onKeyDown={(event) => {
                         const keyValue = event.key;
@@ -128,9 +176,14 @@ export default function NewWeeklyReport(): JSX.Element {
                       type="number"
                       min="0"
                       className="border-2 border-black rounded-md text-center w-1/2"
-                      value={adminTime}
+                      value={adminTime === 0 ? "" : adminTime}
                       onChange={(e) => {
+                        if (e.target.value === "") {
+                          setAdminTime(0);
+                          return;
+                        } else {
                           setAdminTime(parseInt(e.target.value));
+                        }
                       }}
                       onKeyDown={(event) => {
                         const keyValue = event.key;
@@ -147,9 +200,14 @@ export default function NewWeeklyReport(): JSX.Element {
                       type="number"
                       min="0"
                       className="border-2 border-black rounded-md text-center w-1/2"
-                      value={ownWorkTime}
+                      value={ownWorkTime === 0 ? "" : ownWorkTime}
                       onChange={(e) => {
+                        if (e.target.value === "") {
+                          setOwnWorkTime(0);
+                          return;
+                        } else {
                           setOwnWorkTime(parseInt(e.target.value));
+                        }
                       }}
                       onKeyDown={(event) => {
                         const keyValue = event.key;
@@ -166,9 +224,14 @@ export default function NewWeeklyReport(): JSX.Element {
                       type="number"
                       min="0"
                       className="border-2 border-black rounded-md text-center w-1/2"
-                      value={studyTime}
+                      value={studyTime === 0 ? "" : studyTime}
                       onChange={(e) => {
+                        if (e.target.value === "") {
+                          setStudyTime(0);
+                          return;
+                        } else {
                           setStudyTime(parseInt(e.target.value));
+                        }
                       }}
                       onKeyDown={(event) => {
                         const keyValue = event.key;
@@ -185,9 +248,14 @@ export default function NewWeeklyReport(): JSX.Element {
                       type="number"
                       min="0"
                       className="border-2 border-black rounded-md text-center w-1/2"
-                      value={testingTime}
+                      value={testingTime === 0 ? "" : testingTime}
                       onChange={(e) => {
+                        if (e.target.value === "") {
+                          setTestingTime(0);
+                          return;
+                        } else {
                           setTestingTime(parseInt(e.target.value));
+                        }
                       }}
                       onKeyDown={(event) => {
                         const keyValue = event.key;

frontend/src/Components/OtherUsersTR.tsx

@@ -0,0 +1,153 @@
+import { useState, useEffect } from "react";
+import { WeeklyReport } from "../Types/goTypes";
+import { api } from "../API/API";
+import { useParams } from "react-router-dom";
+
+/**
+ * Renders the component for editing a weekly report.
+ * @returns JSX.Element
+ */
+
+//This component does not yet work as intended. It is supposed to display the weekly report of a user in a project.
+export default function OtherUsersTR(): JSX.Element {
+  const [week, setWeek] = useState(0);
+  const [developmentTime, setDevelopmentTime] = useState(0);
+  const [meetingTime, setMeetingTime] = useState(0);
+  const [adminTime, setAdminTime] = useState(0);
+  const [ownWorkTime, setOwnWorkTime] = useState(0);
+  const [studyTime, setStudyTime] = useState(0);
+  const [testingTime, setTestingTime] = useState(0);
+
+  const token = localStorage.getItem("accessToken") ?? "";
+  const { projectName } = useParams();
+  const { username } = useParams();
+  const { fetchedWeek } = useParams();
+
+  useEffect(() => {
+    const fetchUsersWeeklyReport = async (): Promise<void> => {
+      const response = await api.getWeeklyReport(
+        projectName ?? "",
+        fetchedWeek?.toString() ?? "0",
+        token,
+      );
+
+      if (response.success) {
+        const report: WeeklyReport = response.data ?? {
+          reportId: 0,
+          userId: 0,
+          projectId: 0,
+          week: 0,
+          developmentTime: 0,
+          meetingTime: 0,
+          adminTime: 0,
+          ownWorkTime: 0,
+          studyTime: 0,
+          testingTime: 0,
+        };
+        setWeek(report.week);
+        setDevelopmentTime(report.developmentTime);
+        setMeetingTime(report.meetingTime);
+        setAdminTime(report.adminTime);
+        setOwnWorkTime(report.ownWorkTime);
+        setStudyTime(report.studyTime);
+        setTestingTime(report.testingTime);
+      } else {
+        console.error("Failed to fetch weekly report:", response.message);
+      }
+    };
+
+    void fetchUsersWeeklyReport();
+  });
+
+  return (
+    <>
+      <h1 className="text-[30px] font-bold">{username}&apos;s Report</h1>
+      <div className="border-4 border-black bg-white flex flex-col justify-start min-h-[65vh] h-fit w-[50vw] rounded-3xl overflow-scroll space-y-[2vh] p-[30px] items-center">
+        <div className="flex flex-col items-center">
+          <div className="flex flex-col w-1/2 border-b-2 border-black items-center justify-center">
+            <h1 className="font-bold text-[30px]"> Week: {week}</h1>
+          </div>
+
+          <table className="w-full text-center divide-y divide-x divide-white text-[30px]">
+            <thead>
+              <tr>
+                <th className="w-1/2 py-2 border-b-2 border-black">Activity</th>
+                <th className="w-1/2 py-2 border-b-2 border-black">
+                  Total Time (min)
+                </th>
+              </tr>
+            </thead>
+            <tbody className="divide-y divide-black">
+              <tr className="h-[10vh]">
+                <td>Development</td>
+                <td>
+                  <input
+                    type="text"
+                    min="0"
+                    className="border-2 border-black rounded-md text-center w-1/2"
+                    value={developmentTime === 0 ? "" : developmentTime}
+                  />
+                </td>
+              </tr>
+              <tr className="h-[10vh]">
+                <td>Meeting</td>
+                <td>
+                  <input
+                    type="text"
+                    min="0"
+                    className="border-2 border-black rounded-md text-center w-1/2"
+                    value={meetingTime === 0 ? "" : meetingTime}
+                  />
+                </td>
+              </tr>
+              <tr className="h-[10vh]">
+                <td>Administration</td>
+                <td>
+                  <input
+                    type="text"
+                    min="0"
+                    className="border-2 border-black rounded-md text-center w-1/2"
+                    value={adminTime === 0 ? "" : adminTime}
+                  />
+                </td>
+              </tr>
+              <tr className="h-[10vh]">
+                <td>Own Work</td>
+                <td>
+                  <input
+                    type="text"
+                    min="0"
+                    className="border-2 border-black rounded-md text-center w-1/2"
+                    value={ownWorkTime === 0 ? "" : ownWorkTime}
+                  />
+                </td>
+              </tr>
+              <tr className="h-[10vh]">
+                <td>Studies</td>
+                <td>
+                  <input
+                    type="text"
+                    min="0"
+                    className="border-2 border-black rounded-md text-center w-1/2"
+                    value={studyTime === 0 ? "" : studyTime}
+                  />
+                </td>
+              </tr>
+              <tr className="h-[10vh]">
+                <td>Testing</td>
+                <td>
+                  <input
+                    type="text"
+                    min="0"
+                    className="border-2 border-black rounded-md text-center w-1/2"
+                    value={testingTime === 0 ? "" : testingTime}
+                  />
+                </td>
+              </tr>
+            </tbody>
+          </table>
+        </div>
+      </div>
+    </>
+  );
+}

frontend/src/Components/ProjectInfoModal.tsx

@@ -2,6 +2,7 @@ import { useState } from "react";
 import Button from "./Button";
 import { UserProjectMember } from "../Types/goTypes";
 import GetUsersInProject from "./GetUsersInProject";
+import { Link } from "react-router-dom";
 
 function ProjectInfoModal(props: {
   isVisible: boolean;
@@ -18,9 +19,12 @@ function ProjectInfoModal(props: {
       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-2xl text-center h-[41vh] w-[40vw] flex flex-col">
+      <div className="border-4 border-black bg-white p-2 rounded-2xl text-center h-[47vh] w-[40] flex flex-col">
         <div className="pl-20 pr-20">
-          <h1 className="font-bold text-[32px] mb-[20px]">Project members:</h1>
+          <h1 className="font-bold text-[32px] mb-[20px]">
+            {localStorage.getItem("projectName") ?? ""}
+          </h1>
+          <h2 className="font-bold text-[24px] mb-[20px]">Project members:</h2>
           <div className="border-2 border-black p-2 rounded-lg text-center overflow-scroll h-[26vh]">
             <ul className="text-left font-medium space-y-2">
               <div></div>
@@ -50,6 +54,15 @@ function ProjectInfoModal(props: {
             }}
             type="button"
           />
+          <Link to={"/adminProjectAddMember"}>
+            <Button
+              text={"Add Member"}
+              onClick={function (): void {
+                return;
+              }}
+              type="button"
+            />
+          </Link>
           <Button
             text={"Close"}
             onClick={function (): void {

frontend/src/Components/ProjectListAdmin.tsx

@@ -2,7 +2,6 @@ import { useState } from "react";
 import { NewProject } from "../Types/goTypes";
 import ProjectInfoModal from "./ProjectInfoModal";
 import UserInfoModal from "./UserInfoModal";
-import DeleteUser from "./DeleteUser";
 
 /**
  * A list of projects for admin manage projects page, that sets an onClick
@@ -28,8 +27,9 @@ export function ProjectListAdmin(props: {
     setUserModalVisible(true);
   };
 
-  const handleClickProject = (username: string): void => {
-    setProjectname(username);
+  const handleClickProject = (projectname: string): void => {
+    setProjectname(projectname);
+    localStorage.setItem("projectName", projectname);
     setProjectModalVisible(true);
   };
 
@@ -55,7 +55,9 @@ export function ProjectListAdmin(props: {
         manageMember={true}
         onClose={handleCloseUser}
         //TODO: CHANGE TO REMOVE USER FROM PROJECT
-        onDelete={() => DeleteUser}
+        onDelete={() => {
+          return;
+        }}
         isVisible={userModalVisible}
         username={username}
       />

frontend/src/Components/ProjectMembers.tsx

@@ -1,91 +1,55 @@
 import { useEffect, useState } from "react";
 import { Link, useParams } from "react-router-dom";
+import { api } from "../API/API";
+import { UserProjectMember } from "../Types/goTypes";
 
 function ProjectMembers(): JSX.Element {
   const { projectName } = useParams();
-  const [projectMembers, setProjectMembers] = useState<ProjectMember[]>([]);
-
-  //   const getProjectMembers = async (): Promise<void> => {
-  //     const token = localStorage.getItem("accessToken") ?? "";
-  //     const response = await api.getProjectMembers(projectName ?? "", token);
-  //     console.log(response);
-  //     if (response.success) {
-  //       setProjectMembers(response.data ?? []);
-  //     } else {
-  //       console.error(response.message);
-  //     }
-  //   };
-
-  interface ProjectMember {
-    username: string;
-    role: string;
-  }
-
-  const mockProjectMembers = [
-    {
-      username: "username1",
-      role: "Project Manager",
-    },
-    {
-      username: "username2",
-      role: "System Manager",
-    },
-    {
-      username: "username3",
-      role: "Developer",
-    },
-    {
-      username: "username4",
-      role: "Tester",
-    },
-    {
-      username: "username5",
-      role: "Tester",
-    },
-    {
-      username: "username6",
-      role: "Tester",
-    },
-  ];
-
-  const getProjectMembers = async (): Promise<void> => {
-    // Use the mock data
-    setProjectMembers(mockProjectMembers);
-
-    await Promise.resolve();
-  };
+  const [projectMembers, setProjectMembers] = useState<UserProjectMember[]>([]);
 
   useEffect(() => {
+    const getProjectMembers = async (): Promise<void> => {
+      const token = localStorage.getItem("accessToken") ?? "";
+      const response = await api.getAllUsersProject(projectName ?? "", token);
+      console.log(response);
+      if (response.success) {
+        setProjectMembers(response.data ?? []);
+      } else {
+        console.error(response.message);
+      }
+    };
+
     void getProjectMembers();
-  });
+  }, [projectName]);
+
+  interface ProjectMember {
+    Username: string;
+    UserRole: string;
+  }
 
   return (
     <>
+      <h1 className="font-bold text-[30px] mb-[20px]">
+        All Members In: {projectName}{" "}
+      </h1>
       <div className="border-4 border-black bg-white flex flex-col items-center justify-center min-h-[65vh] h-fit w-[70vw] rounded-3xl content-center overflow-scroll space-y-[10vh] p-[30px] text-[20px]">
-        {projectMembers.map((projectMember, index) => (
+        {projectMembers.map((projectMember: ProjectMember, index: number) => (
           <h1 key={index} className="border-b-2 border-black w-full">
             <div className="flex justify-between">
               <div className="flex">
-                <h1>{projectMember.username}</h1>
+                <h1>{projectMember.Username}</h1>
                 <span className="ml-6 mr-2 font-bold">Role:</span>
-                <h1>{projectMember.role}</h1>
+                <h1>{projectMember.UserRole}</h1>
               </div>
               <div className="flex">
                 <div className="ml-auto flex space-x-4">
                   <Link
-                    to={`/viewReports/${projectName}/${projectMember.username}`}
+                    to={`/otherUsersTimeReports/${projectName}/${projectMember.Username}`}
                   >
                     <h1 className="underline cursor-pointer font-bold">
                       View Reports
                     </h1>
                   </Link>
-                  <Link
-                    to={`/changeRole/${projectName}/${projectMember.username}`}
-                  >
-                    <h1 className="underline cursor-pointer font-bold">
-                      Change Role
-                    </h1>
-                  </Link>
                 </div>
               </div>
             </div>

frontend/src/Components/Register.tsx

@@ -4,7 +4,6 @@ import { api } from "../API/API";
 import Logo from "../assets/Logo.svg";
 import Button from "./Button";
 import InputField from "./InputField";
-import { useNavigate } from "react-router-dom";
 
 /**
  * Renders a registration form for the admin to add new users in.
@@ -15,8 +14,6 @@ export default function Register(): JSX.Element {
   const [password, setPassword] = useState<string>();
   const [errMessage, setErrMessage] = useState<string>();
 
-  const nav = useNavigate();
-
   const handleRegister = async (): Promise<void> => {
     const newUser: NewUser = {
       username: username ?? "",
@@ -24,8 +21,9 @@ export default function Register(): JSX.Element {
     };
     const response = await api.registerUser(newUser);
     if (response.success) {
-      nav("/"); // Instantly navigate to the login page
+      alert("User added!");
     } else {
+      alert("User not added");
       setErrMessage(response.message ?? "Unknown error");
       console.error(errMessage);
     }

frontend/src/Components/TimePerActivity.tsx

@@ -0,0 +1,175 @@
+import { useState, useEffect } from "react";
+import { useParams } from "react-router-dom";
+
+/**
+ * Renders the component for showing total time per role in a project.
+ * @returns JSX.Element
+ */
+export default function TimePerRole(): JSX.Element {
+  const [developmentTime, setDevelopmentTime] = useState<number>();
+  const [meetingTime, setMeetingTime] = useState<number>();
+  const [adminTime, setAdminTime] = useState<number>();
+  const [ownWorkTime, setOwnWorkTime] = useState<number>();
+  const [studyTime, setStudyTime] = useState<number>();
+  const [testingTime, setTestingTime] = useState<number>();
+
+  //   const token = localStorage.getItem("accessToken") ?? "";
+  //   const username = localStorage.getItem("username") ?? "";
+  const { projectName } = useParams();
+
+  //   const fetchTimePerRole = async (): Promise<void> => {
+  //     const response = await api.getTimePerRole(
+  //       username,
+  //       projectName ?? "",
+  //       token,
+  //     );
+  // {
+  //     if (response.success) {
+  //       const report: TimePerRole = response.data ?? {
+  //         PManagerTime: 0,
+  //         SManagerTime: 0,
+  //         DeveloperTime: 0,
+  //         TesterTime: 0,
+  //       };
+  //     } else {
+  //       console.error("Failed to fetch weekly report:", response.message);
+  //     }
+  //   }
+
+  interface TimePerActivity {
+    developmentTime: number;
+    meetingTime: number;
+    adminTime: number;
+    ownWorkTime: number;
+    studyTime: number;
+    testingTime: number;
+  }
+
+  const fetchTimePerActivity = async (): Promise<void> => {
+    // Use mock data
+    const report: TimePerActivity = {
+      developmentTime: 100,
+      meetingTime: 200,
+      adminTime: 300,
+      ownWorkTime: 50,
+      studyTime: 75,
+      testingTime: 110,
+    };
+
+    // Set the state with the mock data
+    setDevelopmentTime(report.developmentTime);
+    setMeetingTime(report.meetingTime);
+    setAdminTime(report.adminTime);
+    setOwnWorkTime(report.ownWorkTime);
+    setStudyTime(report.studyTime);
+    setTestingTime(report.testingTime);
+
+    await Promise.resolve();
+  };
+
+  useEffect(() => {
+    void fetchTimePerActivity();
+  });
+
+  return (
+    <>
+      <h1 className="font-bold text-[30px] mb-[20px]">
+        Total Time Per Activity In: {projectName}{" "}
+      </h1>
+      <div className="border-4 border-black bg-white flex flex-col justify-start min-h-[65vh] h-fit w-[50vw] rounded-3xl overflow-scroll space-y-[2vh] p-[30px] items-center">
+        <div className="flex flex-col items-center">
+          <table className="w-full text-center divide-y divide-x divide-white text-[30px]">
+            <thead>
+              <tr>
+                <th className="w-1/2 py-2 border-b-2 border-black">Activity</th>
+                <th className="w-1/2 py-2 border-b-2 border-black">
+                  Total Time (min)
+                </th>
+              </tr>
+            </thead>
+            <tbody className="divide-y divide-black">
+              <tr className="h-[10vh]">
+                <td>Development</td>
+                <td>
+                  <input
+                    type="string"
+                    className="border-2 border-black rounded-md text-center w-1/2"
+                    value={developmentTime}
+                    onKeyDown={(event) => {
+                      event.preventDefault();
+                    }}
+                  />
+                </td>
+              </tr>
+              <tr className="h-[10vh]">
+                <td>Meeting</td>
+                <td>
+                  <input
+                    type="string"
+                    className="border-2 border-black rounded-md text-center w-1/2"
+                    value={meetingTime}
+                    onKeyDown={(event) => {
+                      event.preventDefault();
+                    }}
+                  />
+                </td>
+              </tr>
+              <tr className="h-[10vh]">
+                <td>Administration</td>
+                <td>
+                  <input
+                    type="string"
+                    className="border-2 border-black rounded-md text-center w-1/2"
+                    value={adminTime}
+                    onKeyDown={(event) => {
+                      event.preventDefault();
+                    }}
+                  />
+                </td>
+              </tr>
+              <tr className="h-[10vh]">
+                <td>Own Work</td>
+                <td>
+                  <input
+                    type="string"
+                    className="border-2 border-black rounded-md text-center w-1/2"
+                    value={ownWorkTime}
+                    onKeyDown={(event) => {
+                      event.preventDefault();
+                    }}
+                  />
+                </td>
+              </tr>
+              <tr className="h-[10vh]">
+                <td>Studies</td>
+                <td>
+                  <input
+                    type="string"
+                    className="border-2 border-black rounded-md text-center w-1/2"
+                    value={studyTime}
+                    onKeyDown={(event) => {
+                      event.preventDefault();
+                    }}
+                  />
+                </td>
+              </tr>
+              <tr className="h-[10vh]">
+                <td>Testing</td>
+                <td>
+                  <input
+                    type="string"
+                    className="border-2 border-black rounded-md text-center w-1/2"
+                    value={testingTime}
+                    onKeyDown={(event) => {
+                      event.preventDefault();
+                    }}
+                  />
+                </td>
+              </tr>
+            </tbody>
+          </table>
+        </div>
+      </div>
+    </>
+  );
+}

frontend/src/Components/TimePerRole.tsx

@@ -0,0 +1,141 @@
+import { useState, useEffect } from "react";
+import { useParams } from "react-router-dom";
+
+/**
+ * Renders the component for showing total time per role in a project.
+ * @returns JSX.Element
+ */
+export default function TimePerRole(): JSX.Element {
+  const [PManagerTime, setPManagerTime] = useState(0);
+  const [SManagerTime, setSManagerTime] = useState(0);
+  const [DeveloperTime, setDeveloperTime] = useState(0);
+  const [TesterTime, setTesterTime] = useState(0);
+
+  //   const token = localStorage.getItem("accessToken") ?? "";
+  //   const username = localStorage.getItem("username") ?? "";
+  const { projectName } = useParams();
+
+  //   const fetchTimePerRole = async (): Promise<void> => {
+  //     const response = await api.getTimePerRole(
+  //       username,
+  //       projectName ?? "",
+  //       token,
+  //     );
+  // {
+  //     if (response.success) {
+  //       const report: TimePerRole = response.data ?? {
+  //         PManagerTime: 0,
+  //         SManagerTime: 0,
+  //         DeveloperTime: 0,
+  //         TesterTime: 0,
+  //       };
+  //     } else {
+  //       console.error("Failed to fetch weekly report:", response.message);
+  //     }
+  //   }
+
+  interface TimePerRole {
+    PManager: number;
+    SManager: number;
+    Developer: number;
+    Tester: number;
+  }
+
+  const fetchTimePerRole = async (): Promise<void> => {
+    // Use mock data
+    const report: TimePerRole = {
+      PManager: 120,
+      SManager: 80,
+      Developer: 200,
+      Tester: 150,
+    };
+
+    // Set the state with the mock data
+    setPManagerTime(report.PManager);
+    setSManagerTime(report.SManager);
+    setDeveloperTime(report.Developer);
+    setTesterTime(report.Tester);
+
+    await Promise.resolve();
+  };
+
+  useEffect(() => {
+    void fetchTimePerRole();
+  });
+
+  return (
+    <>
+      <h1 className="font-bold text-[30px] mb-[20px]">
+        Total Time Per Role In: {projectName}{" "}
+      </h1>
+      <div className="border-4 border-black bg-white flex flex-col justify-start min-h-[65vh] h-fit w-[50vw] rounded-3xl overflow-scroll space-y-[2vh] p-[30px] items-center">
+        <div className="flex flex-col items-center">
+          <table className="w-full text-center divide-y divide-x divide-white text-[30px]">
+            <thead>
+              <tr>
+                <th className="w-1/2 py-2 border-b-2 border-black">Role</th>
+                <th className="w-1/2 py-2 border-b-2 border-black">
+                  Total Time (min)
+                </th>
+              </tr>
+            </thead>
+            <tbody className="divide-y divide-black">
+              <tr className="h-[10vh]">
+                <td>Project Manager</td>
+                <td>
+                  <input
+                    type="string"
+                    className="border-2 border-black rounded-md text-center w-1/2"
+                    value={PManagerTime}
+                    onKeyDown={(event) => {
+                      event.preventDefault();
+                    }}
+                  />
+                </td>
+              </tr>
+              <tr className="h-[10vh]">
+                <td>System Manager</td>
+                <td>
+                  <input
+                    type="string"
+                    className="border-2 border-black rounded-md text-center w-1/2"
+                    value={SManagerTime}
+                    onKeyDown={(event) => {
+                      event.preventDefault();
+                    }}
+                  />
+                </td>
+              </tr>
+              <tr className="h-[10vh]">
+                <td>Administration</td>
+                <td>
+                  <input
+                    type="string"
+                    className="border-2 border-black rounded-md text-center w-1/2"
+                    value={DeveloperTime}
+                    onKeyDown={(event) => {
+                      event.preventDefault();
+                    }}
+                  />
+                </td>
+              </tr>
+              <tr className="h-[10vh]">
+                <td>Own Work</td>
+                <td>
+                  <input
+                    type="string"
+                    className="border-2 border-black rounded-md text-center w-1/2"
+                    value={TesterTime}
+                    onKeyDown={(event) => {
+                      event.preventDefault();
+                    }}
+                  />
+                </td>
+              </tr>
+            </tbody>
+          </table>
+        </div>
+      </div>
+    </>
+  );
+}

frontend/src/Components/UserInfoModal.tsx

@@ -49,7 +49,13 @@ function UserInfoModal(props: {
           <Button
             text={"Delete"}
             onClick={function (): void {
-              DeleteUser({ usernameToDelete: props.username });
+              if (
+                window.confirm("Are you sure you want to delete this user?")
+              ) {
+                DeleteUser({
+                  usernameToDelete: props.username,
+                });
+              }
             }}
             type="button"
           />

frontend/src/Components/ViewOtherTimeReport.tsx

@@ -0,0 +1,188 @@
+import { useState, useEffect } from "react";
+import { WeeklyReport, NewWeeklyReport } from "../Types/goTypes";
+import { api } from "../API/API";
+import { useNavigate, useParams } from "react-router-dom";
+import Button from "./Button";
+
+/**
+ * Renders the component for editing a weekly report.
+ * @returns JSX.Element
+ */
+
+//This component does not yet work as intended. It is supposed to display the weekly report of a user in a project.
+export default function GetOtherUsersReport(): JSX.Element {
+  const [week, setWeek] = useState(0);
+  const [developmentTime, setDevelopmentTime] = useState(0);
+  const [meetingTime, setMeetingTime] = useState(0);
+  const [adminTime, setAdminTime] = useState(0);
+  const [ownWorkTime, setOwnWorkTime] = useState(0);
+  const [studyTime, setStudyTime] = useState(0);
+  const [testingTime, setTestingTime] = useState(0);
+
+  const token = localStorage.getItem("accessToken") ?? "";
+  const { projectName } = useParams();
+  const { username } = useParams();
+  const { fetchedWeek } = useParams();
+
+  useEffect(() => {
+    const fetchUsersWeeklyReport = async (): Promise<void> => {
+      const response = await api.getWeeklyReport(
+        projectName ?? "",
+        fetchedWeek?.toString() ?? "0",
+        token,
+      );
+
+      if (response.success) {
+        const report: WeeklyReport = response.data ?? {
+          reportId: 0,
+          userId: 0,
+          projectId: 0,
+          week: 0,
+          developmentTime: 0,
+          meetingTime: 0,
+          adminTime: 0,
+          ownWorkTime: 0,
+          studyTime: 0,
+          testingTime: 0,
+        };
+        setWeek(report.week);
+        setDevelopmentTime(report.developmentTime);
+        setMeetingTime(report.meetingTime);
+        setAdminTime(report.adminTime);
+        setOwnWorkTime(report.ownWorkTime);
+        setStudyTime(report.studyTime);
+        setTestingTime(report.testingTime);
+      } else {
+        console.error("Failed to fetch weekly report:", response.message);
+      }
+    };
+
+    void fetchUsersWeeklyReport();
+  });
+
+  const handleSignWeeklyReport = async (): Promise<void> => {
+    const newWeeklyReport: NewWeeklyReport = {
+      projectName: projectName ?? "",
+      week,
+      developmentTime,
+      meetingTime,
+      adminTime,
+      ownWorkTime,
+      studyTime,
+      testingTime,
+    };
+
+    await api.submitWeeklyReport(newWeeklyReport, token);
+  };
+
+  const navigate = useNavigate();
+
+  return (
+    <>
+      <h1 className="text-[30px] font-bold">{username}&apos;s Report</h1>
+      <div className="border-4 border-black bg-white flex flex-col justify-start min-h-[65vh] h-fit w-[50vw] rounded-3xl overflow-scroll space-y-[2vh] p-[30px] items-center">
+        <form
+          onSubmit={(e) => {
+            e.preventDefault();
+            void handleSignWeeklyReport();
+            navigate(-1);
+          }}
+        >
+          <div className="flex flex-col items-center">
+            <div className="flex flex-col w-1/2 border-b-2 border-black items-center justify-center">
+              <h1 className="font-bold text-[30px]"> Week: {week}</h1>
+            </div>
+
+            <table className="w-full text-center divide-y divide-x divide-white text-[30px]">
+              <thead>
+                <tr>
+                  <th className="w-1/2 py-2 border-b-2 border-black">
+                    Activity
+                  </th>
+                  <th className="w-1/2 py-2 border-b-2 border-black">
+                    Total Time (min)
+                  </th>
+                </tr>
+              </thead>
+              <tbody className="divide-y divide-black">
+                <tr className="h-[10vh]">
+                  <td>Development</td>
+                  <td>
+                    <input
+                      type="text"
+                      min="0"
+                      className="border-2 border-black rounded-md text-center w-1/2"
+                      value={developmentTime === 0 ? "" : developmentTime}
+                    />
+                  </td>
+                </tr>
+                <tr className="h-[10vh]">
+                  <td>Meeting</td>
+                  <td>
+                    <input
+                      type="text"
+                      min="0"
+                      className="border-2 border-black rounded-md text-center w-1/2"
+                      value={meetingTime === 0 ? "" : meetingTime}
+                    />
+                  </td>
+                </tr>
+                <tr className="h-[10vh]">
+                  <td>Administration</td>
+                  <td>
+                    <input
+                      type="text"
+                      min="0"
+                      className="border-2 border-black rounded-md text-center w-1/2"
+                      value={adminTime === 0 ? "" : adminTime}
+                    />
+                  </td>
+                </tr>
+                <tr className="h-[10vh]">
+                  <td>Own Work</td>
+                  <td>
+                    <input
+                      type="text"
+                      min="0"
+                      className="border-2 border-black rounded-md text-center w-1/2"
+                      value={ownWorkTime === 0 ? "" : ownWorkTime}
+                    />
+                  </td>
+                </tr>
+                <tr className="h-[10vh]">
+                  <td>Studies</td>
+                  <td>
+                    <input
+                      type="text"
+                      min="0"
+                      className="border-2 border-black rounded-md text-center w-1/2"
+                      value={studyTime === 0 ? "" : studyTime}
+                    />
+                  </td>
+                </tr>
+                <tr className="h-[10vh]">
+                  <td>Testing</td>
+                  <td>
+                    <input
+                      type="text"
+                      min="0"
+                      className="border-2 border-black rounded-md text-center w-1/2"
+                      value={testingTime === 0 ? "" : testingTime}
+                    />
+                  </td>
+                </tr>
+              </tbody>
+            </table>
+            <Button
+              text="Sign Report"
+              onClick={(): void => {
+                return;
+              }}
+              type="submit"
+            />
+          </div>
+        </form>
+      </div>
+    </>
+  );
+}

frontend/src/Pages/AdminPages/AdminProjectAddMember.tsx

@@ -1,22 +1,10 @@
-import BackButton from "../../Components/BackButton";
+import AddUserToProject from "../../Components/AddUserToProject";
 import BasicWindow from "../../Components/BasicWindow";
-import Button from "../../Components/Button";
 
 function AdminProjectAddMember(): JSX.Element {
-  const content = <></>;
+  const content = <AddUserToProject />;
 
-  const buttons = (
-    <>
-      <Button
-        text="Add"
-        onClick={(): void => {
-          return;
-        }}
-        type="button"
-      />
-      <BackButton />
-    </>
-  );
+  const buttons = <></>;
 
   return <BasicWindow content={content} buttons={buttons} />;
 }

frontend/src/Pages/AdminPages/AdminProjectPage.tsx

@@ -1,17 +1,26 @@
+import { useParams } from "react-router-dom";
+import { api } from "../../API/API";
 import BackButton from "../../Components/BackButton";
 import BasicWindow from "../../Components/BasicWindow";
 import Button from "../../Components/Button";
 
+async function handleDeleteProject(
+  projectName: string,
+  token: string,
+): Promise<void> {
+  await api.removeProject(projectName, token);
+}
+
 function AdminProjectPage(): JSX.Element {
   const content = <></>;
+  const { projectName } = useParams();
+  const token = localStorage.getItem("accessToken");
 
   const buttons = (
     <>
       <Button
         text="Delete"
-        onClick={(): void => {
-          return;
-        }}
+        onClick={() => handleDeleteProject(projectName, token)}
         type="button"
       />
       <BackButton />
@@ -20,4 +29,5 @@ function AdminProjectPage(): JSX.Element {
 
   return <BasicWindow content={content} buttons={buttons} />;
 }
+
 export default AdminProjectPage;

frontend/src/Pages/ProjectManagerPages/PMOtherUsersTR.tsx

@@ -1,8 +1,13 @@
 import BasicWindow from "../../Components/BasicWindow";
 import BackButton from "../../Components/BackButton";
+import AllTimeReportsInProjectOtherUser from "../../Components/AllTimeReportsInProjectOtherUser";
 
 function PMOtherUsersTR(): JSX.Element {
-  const content = <></>;
+  const content = (
+    <>
+      <AllTimeReportsInProjectOtherUser />
+    </>
+  );
 
   const buttons = (
     <>

frontend/src/Pages/ProjectManagerPages/PMProjectMembers.tsx

@@ -8,16 +8,13 @@ function PMProjectMembers(): JSX.Element {
   const { projectName } = useParams();
   const content = (
     <>
-      <h1 className="font-bold text-[30px] mb-[20px]">
-        All Members In: {projectName}{" "}
-      </h1>
       <ProjectMembers />
     </>
   );
 
   const buttons = (
     <>
-      <Link to="/PM-time-activity">
+      <Link to={`/PMtimeactivity/${projectName}`}>
         <Button
           text="Time / Activity"
           onClick={(): void => {
@@ -26,15 +23,6 @@ function PMProjectMembers(): JSX.Element {
           type={"button"}
         />
       </Link>
-      <Link to="/PM-time-role">
-        <Button
-          text="Time / Role"
-          onClick={(): void => {
-            return;
-          }}
-          type={"button"}
-        />
-      </Link>
       <BackButton />
     </>
   );

frontend/src/Pages/ProjectManagerPages/PMTotalTimeActivity.tsx

@@ -1,14 +1,11 @@
 import BackButton from "../../Components/BackButton";
 import BasicWindow from "../../Components/BasicWindow";
-import TimeReport from "../../Components/NewWeeklyReport";
+import TimePerActivity from "../../Components/TimePerActivity";
 
 function PMTotalTimeActivity(): JSX.Element {
   const content = (
     <>
-      <h1 className="font-bold text-[30px] mb-[20px]">
-        Total Time Per Activity
-      </h1>
-      <TimeReport />
+      <TimePerActivity />
     </>
   );
 

frontend/src/Pages/ProjectManagerPages/PMTotalTimeRole.tsx

@@ -1,8 +1,13 @@
 import BasicWindow from "../../Components/BasicWindow";
 import BackButton from "../../Components/BackButton";
+import TimePerRole from "../../Components/TimePerRole";
 
 function PMTotalTimeRole(): JSX.Element {
-  const content = <></>;
+  const content = (
+    <>
+      <TimePerRole />
+    </>
+  );
 
   const buttons = (
     <>

frontend/src/Pages/ProjectManagerPages/PMUnsignedReports.tsx

@@ -1,8 +1,13 @@
 import BasicWindow from "../../Components/BasicWindow";
 import BackButton from "../../Components/BackButton";
+import DisplayUnsignedReports from "../../Components/DisplayUnsignedReports";
 
 function PMUnsignedReports(): JSX.Element {
-  const content = <></>;
+  const content = (
+    <>
+      <DisplayUnsignedReports />
+    </>
+  );
 
   const buttons = (
     <>

frontend/src/Pages/ProjectManagerPages/PMViewOtherUsersTR.tsx

@@ -0,0 +1,20 @@
+import BasicWindow from "../../Components/BasicWindow";
+import BackButton from "../../Components/BackButton";
+import OtherUsersTR from "../../Components/OtherUsersTR";
+
+function PMViewOtherUsersTR(): JSX.Element {
+  const content = (
+    <>
+      <OtherUsersTR />
+    </>
+  );
+
+  const buttons = (
+    <>
+      <BackButton />
+    </>
+  );
+
+  return <BasicWindow content={content} buttons={buttons} />;
+}
+export default PMViewOtherUsersTR;

frontend/src/Pages/ProjectManagerPages/PMViewUnsignedReport.tsx

@@ -1,34 +1,16 @@
 import BackButton from "../../Components/BackButton";
 import BasicWindow from "../../Components/BasicWindow";
-import Button from "../../Components/Button";
-import TimeReport from "../../Components/NewWeeklyReport";
+import ViewOtherTimeReport from "../../Components/ViewOtherTimeReport";
 
 function PMViewUnsignedReport(): JSX.Element {
   const content = (
     <>
-      <h1 className="font-bold text-[30px] mb-[20px]">
-        Username&apos;s Time Report
-      </h1>
-      <TimeReport />
+      <ViewOtherTimeReport />
     </>
   );
 
   const buttons = (
     <>
-      <Button
-        text="Sign"
-        onClick={(): void => {
-          return;
-        }}
-        type="button"
-      />
-      <Button
-        text="Save"
-        onClick={(): void => {
-          return;
-        }}
-        type="button"
-      />
       <BackButton />
     </>
   );

frontend/src/Pages/UserPages/UserEditTimeReportPage.tsx

@@ -5,7 +5,6 @@ import EditWeeklyReport from "../../Components/EditWeeklyReport";
 function UserEditTimeReportPage(): JSX.Element {
   const content = (
     <>
-      <h1 className="font-bold text-[30px] mb-[20px]">Edit Time Report</h1>
       <EditWeeklyReport />
     </>
   );

frontend/src/Types/goTypes.ts

@@ -151,9 +151,16 @@ export interface NewProject {
  */
 export interface RoleChange {
   username: string;
-  role: 'project_manager' | 'user';
+  role: "project_manager" | "user";
   projectname: string;
 }
+
+export interface NewProjMember {
+  username: string;
+  projectname: string;
+  role: string;
+}
+
 export interface NameChange {
   id: number /* int */;
   name: string;

frontend/src/main.tsx

@@ -31,6 +31,7 @@ import AdminProjectViewMemberInfo from "./Pages/AdminPages/AdminProjectViewMembe
 import AdminProjectPage from "./Pages/AdminPages/AdminProjectPage.tsx";
 import NotFoundPage from "./Pages/NotFoundPage.tsx";
 import UnauthorizedPage from "./Pages/UnauthorizedPage.tsx";
+import PMViewOtherUsersTR from "./Pages/ProjectManagerPages/PMViewOtherUsersTR.tsx";
 
 // This is where the routes are mounted
 const router = createBrowserRouter([
@@ -60,7 +61,7 @@ const router = createBrowserRouter([
     element: <UserViewTimeReportsPage />,
   },
   {
-    path: "/editTimeReport/:projectName/:weekNumber",
+    path: "/editTimeReport/:projectName/:fetchedWeek",
     element: <UserEditTimeReportPage />,
   },
   {
@@ -68,9 +69,13 @@ const router = createBrowserRouter([
     element: <PMChangeRole />,
   },
   {
-    path: "/otherUsersTimeReports",
+    path: "/otherUsersTimeReports/:projectName/:username",
     element: <PMOtherUsersTR />,
   },
+  {
+    path: "/editOthersTR/:projectName/:username/:fetchedWeek",
+    element: <PMViewOtherUsersTR />,
+  },
   {
     path: "/projectMembers/:projectName",
     element: <PMProjectMembers />,
@@ -80,11 +85,11 @@ const router = createBrowserRouter([
     element: <PMProjectPage />,
   },
   {
-    path: "/PMTimeActivity",
+    path: "/PMTimeActivity/:projectName",
     element: <PMTotalTimeActivity />,
   },
   {
-    path: "/PMTimeRole",
+    path: "/PMTimeRole/:projectName",
     element: <PMTotalTimeRole />,
   },
   {
@@ -92,7 +97,7 @@ const router = createBrowserRouter([
     element: <PMUnsignedReports />,
   },
   {
-    path: "/PMViewUnsignedReport",
+    path: "/PMViewUnsignedReport/:projectName/:username/:fetchedWeek",
     element: <PMViewUnsignedReport />,
   },
   {

testing.py

@@ -2,7 +2,7 @@ import requests
 import string
 import random
 
-debug_output = False
+debug_output = True
 
 def gprint(*args, **kwargs):
     print("\033[92m", *args, "\033[00m", **kwargs)
@@ -41,8 +41,10 @@ getWeeklyReportsUserPath = base_url + "/api/getWeeklyReportsUser"
 checkIfProjectManagerPath = base_url + "/api/checkIfProjectManager"
 ProjectRoleChangePath = base_url + "/api/ProjectRoleChange"
 getUsersProjectPath = base_url + "/api/getUsersProject"
+getUnsignedReportsPath = base_url + "/api/getUnsignedReports"
 getChangeUserNamePath = base_url + "/api/changeUserName"
 getUpdateWeeklyReportPath = base_url + "/api/updateWeeklyReport"
+removeProjectPath = base_url + "/api/removeProject"
 
 #ta bort auth i handlern för att få testet att gå igenom
 def test_ProjectRoleChange():
@@ -299,9 +301,8 @@ def test_sign_report():
     report_id = response.json()["reportId"]
 
     # Sign the report as the project manager
-    response = requests.post(
-        signReportPath,
-        json={"reportId": report_id},
+    response = requests.put(
+        signReportPath + "/" + str(report_id),
         headers={"Authorization": "Bearer " + project_manager_token},
     )
     assert response.status_code == 200, "Sign report failed"
@@ -331,6 +332,8 @@ def test_get_weekly_reports_user():
     assert response.status_code == 200, "Get weekly reports for user failed"
     gprint("test_get_weekly_reports_user successful")
 
+
+
 # Test function to check if a user is a project manager
 def test_check_if_project_manager():
     # Log in as the user
@@ -462,7 +465,58 @@ def test_update_weekly_report():
     assert response.status_code == 200, "Update weekly report failed"
     gprint("test_update_weekly_report successful")
 
+
+def test_remove_project():
+    admin_username = randomString()
+    admin_password = "admin_password2"
+    dprint(
+        "Registering with username: ", admin_username, " and password: ", admin_password
+    )
+    response = requests.post(
+        registerPath, json={"username": admin_username, "password": admin_password}
+    )
+    dprint(response.text)
+
+    # Log in as the admin
+    admin_token = login(admin_username, admin_password).json()["token"]
+    response = requests.post(
+        promoteToAdminPath,
+        json={"username": admin_username},
+        headers={"Authorization": "Bearer " + admin_token},
+    )
+
+    # Create a new project
+    new_project = randomString()
+    response = requests.post(
+        addProjectPath,
+        json={"name": new_project, "description": "This is a project"},
+        headers={"Authorization": "Bearer " + admin_token},
+    )
+    assert response.status_code == 200, "Add project failed"
+
+    # Remove the project
+    response = requests.delete(
+        removeProjectPath + "/" + new_project,
+        headers={"Authorization": "Bearer " + admin_token},
+    )
+    assert response.status_code == 200, "Remove project failed"
+    gprint("test_remove_project successful")
+
+def test_get_unsigned_reports():
+    # Log in as the user
+        token = login("user2", "123").json()["token"]
+
+        # Make a request to get all unsigned reports
+        response = requests.get(
+            getUnsignedReportsPath + "/" + projectName,
+            headers={"Authorization": "Bearer " + token},
+        )
+        assert response.status_code == 200, "Get unsigned reports failed"
+        gprint("test_get_unsigned_reports successful")
+
+
 if __name__ == "__main__":
+    test_remove_project()
     test_get_user_projects()
     test_create_user()
     test_login()
@@ -476,6 +530,8 @@ if __name__ == "__main__":
     test_check_if_project_manager()
     test_ProjectRoleChange()
     test_ensure_manager_of_created_project()
+    test_get_unsigned_reports()
     test_list_all_users_project()
     test_change_user_name()
     test_update_weekly_report()
+