Merge branch 'frontend' into dev

backend/Makefile

@@ -10,6 +10,7 @@ DB_FILE = db.sqlite3
 
 # Directory containing migration SQL scripts
 MIGRATIONS_DIR = internal/database/migrations
+SAMPLE_DATA_DIR = internal/database/sample_data
 
 # Build target
 build:
@@ -54,6 +55,14 @@ migrate:
 		sqlite3 $(DB_FILE) < $$file; \
 	done
 
+sampledata:
+	@echo "If this ever fails, run make clean and try again"
+	@echo "Migrating database $(DB_FILE) using SQL scripts in $(SAMPLE_DATA_DIR)"
+	@for file in $(wildcard $(SAMPLE_DATA_DIR)/*.sql); do \
+		echo "Applying migration: $$file"; \
+		sqlite3 $(DB_FILE) < $$file; \
+	done
+
 # Target added primarily for CI/CD to ensure that the database is created before running tests
 db.sqlite3:
 	make migrate

backend/docs/docs.go

@@ -19,19 +19,174 @@ const docTemplate = `{
     "host": "{{.Host}}",
     "basePath": "{{.BasePath}}",
     "paths": {
-        "/api/register": {
+        "/login": {
+            "post": {
+                "description": "logs the user in and returns a jwt token",
+                "consumes": [
+                    "application/json"
+                ],
+                "produces": [
+                    "text/plain"
+                ],
+                "tags": [
+                    "User"
+                ],
+                "summary": "login",
+                "parameters": [
+                    {
+                        "description": "login info",
+                        "name": "NewUser",
+                        "in": "body",
+                        "required": true,
+                        "schema": {
+                            "$ref": "#/definitions/types.NewUser"
+                        }
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "Successfully signed token for user",
+                        "schema": {
+                            "type": "Token"
+                        }
+                    },
+                    "400": {
+                        "description": "Bad request",
+                        "schema": {
+                            "type": "string"
+                        }
+                    },
+                    "401": {
+                        "description": "Unauthorized",
+                        "schema": {
+                            "type": "string"
+                        }
+                    },
+                    "500": {
+                        "description": "Internal server error",
+                        "schema": {
+                            "type": "string"
+                        }
+                    }
+                }
+            }
+        },
+        "/loginerenew": {
+            "post": {
+                "security": [
+                    {
+                        "bererToken": []
+                    }
+                ],
+                "description": "renews the users token",
+                "consumes": [
+                    "application/json"
+                ],
+                "produces": [
+                    "text/plain"
+                ],
+                "tags": [
+                    "User"
+                ],
+                "summary": "LoginRenews",
+                "responses": {
+                    "200": {
+                        "description": "Successfully signed token for user",
+                        "schema": {
+                            "type": "Token"
+                        }
+                    },
+                    "401": {
+                        "description": "Unauthorized",
+                        "schema": {
+                            "type": "string"
+                        }
+                    },
+                    "500": {
+                        "description": "Internal server error",
+                        "schema": {
+                            "type": "string"
+                        }
+                    }
+                }
+            }
+        },
+        "/promoteToAdmin": {
+            "post": {
+                "description": "promote chosen user to admin",
+                "consumes": [
+                    "application/json"
+                ],
+                "produces": [
+                    "text/plain"
+                ],
+                "tags": [
+                    "User"
+                ],
+                "summary": "PromoteToAdmin",
+                "parameters": [
+                    {
+                        "description": "user info",
+                        "name": "NewUser",
+                        "in": "body",
+                        "required": true,
+                        "schema": {
+                            "$ref": "#/definitions/types.NewUser"
+                        }
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "Successfully prometed user",
+                        "schema": {
+                            "type": "json"
+                        }
+                    },
+                    "400": {
+                        "description": "bad request",
+                        "schema": {
+                            "type": "string"
+                        }
+                    },
+                    "401": {
+                        "description": "Unauthorized",
+                        "schema": {
+                            "type": "string"
+                        }
+                    },
+                    "500": {
+                        "description": "Internal server error",
+                        "schema": {
+                            "type": "string"
+                        }
+                    }
+                }
+            }
+        },
+        "/register": {
             "post": {
                 "description": "Register a new user",
                 "consumes": [
                     "application/json"
                 ],
                 "produces": [
-                    "application/json"
+                    "text/plain"
                 ],
                 "tags": [
                     "User"
                 ],
-                "summary": "Register a new user",
+                "summary": "Register",
+                "parameters": [
+                    {
+                        "description": "User to register",
+                        "name": "NewUser",
+                        "in": "body",
+                        "required": true,
+                        "schema": {
+                            "$ref": "#/definitions/types.NewUser"
+                        }
+                    }
+                ],
                 "responses": {
                     "200": {
                         "description": "User added",
@@ -53,6 +208,102 @@ const docTemplate = `{
                     }
                 }
             }
+        },
+        "/userdelete/{username}": {
+            "delete": {
+                "description": "UserDelete deletes a user from the database",
+                "consumes": [
+                    "application/json"
+                ],
+                "produces": [
+                    "text/plain"
+                ],
+                "tags": [
+                    "User"
+                ],
+                "summary": "UserDelete",
+                "responses": {
+                    "200": {
+                        "description": "User deleted",
+                        "schema": {
+                            "type": "string"
+                        }
+                    },
+                    "401": {
+                        "description": "Unauthorized",
+                        "schema": {
+                            "type": "string"
+                        }
+                    },
+                    "403": {
+                        "description": "You can only delete yourself",
+                        "schema": {
+                            "type": "string"
+                        }
+                    },
+                    "500": {
+                        "description": "Internal server error",
+                        "schema": {
+                            "type": "string"
+                        }
+                    }
+                }
+            }
+        },
+        "/users/all": {
+            "get": {
+                "description": "lists all users",
+                "consumes": [
+                    "application/json"
+                ],
+                "produces": [
+                    "text/plain"
+                ],
+                "tags": [
+                    "User"
+                ],
+                "summary": "ListsAllUsers",
+                "responses": {
+                    "200": {
+                        "description": "Successfully signed token for user",
+                        "schema": {
+                            "type": "json"
+                        }
+                    },
+                    "401": {
+                        "description": "Unauthorized",
+                        "schema": {
+                            "type": "string"
+                        }
+                    },
+                    "500": {
+                        "description": "Internal server error",
+                        "schema": {
+                            "type": "string"
+                        }
+                    }
+                }
+            }
+        }
+    },
+    "definitions": {
+        "types.NewUser": {
+            "type": "object",
+            "properties": {
+                "password": {
+                    "type": "string"
+                },
+                "username": {
+                    "type": "string"
+                }
+            }
+        }
+    },
+    "securityDefinitions": {
+        "bererToken": {
+            "type": "apiKey",
+            "name": "Authorization",
+            "in": "header"
         }
     },
     "externalDocs": {

backend/internal/database/db.go

@@ -20,6 +20,7 @@ type Database interface {
 	GetUserId(username string) (int, error)
 	AddProject(name string, description string, username string) error
 	Migrate() error
+	MigrateSampleData() error
 	GetProjectId(projectname string) (int, error)
 	AddWeeklyReport(projectName string, userName string, week int, developmentTime int, meetingTime int, adminTime int, ownWorkTime int, studyTime int, testingTime int) error
 	AddUserToProject(username string, projectname string, role string) error
@@ -49,6 +50,9 @@ type UserProjectMember struct {
 //go:embed migrations
 var scripts embed.FS
 
+//go:embed sample_data
+var sampleData embed.FS
+
 // TODO: Possibly break these out into separate files bundled with the embed package?
 const userInsert = "INSERT INTO users (username, password) VALUES (?, ?)"
 const projectInsert = "INSERT INTO projects (name, description, owner_user_id) SELECT ?, ?, id FROM users WHERE username = ?"
@@ -60,9 +64,10 @@ const addWeeklyReport = `WITH UserLookup AS (SELECT id FROM users WHERE username
 const addUserToProject = "INSERT INTO user_roles (user_id, project_id, p_role) VALUES (?, ?, ?)" // WIP
 const changeUserRole = "UPDATE user_roles SET p_role = ? WHERE user_id = ? AND project_id = ?"
 
-const getProjectsForUser = `SELECT projects.id, projects.name, projects.description, projects.owner_user_id 
+const getProjectsForUser = `SELECT p.id, p.name, p.description FROM projects p	
-							FROM projects JOIN user_roles ON projects.id = user_roles.project_id
+							JOIN user_roles ur ON p.id = ur.project_id
-							JOIN users ON user_roles.user_id = users.id WHERE users.username = ?;`
+							JOIN users u ON ur.user_id = u.id
+							WHERE u.username = ?`
 
 // DbConnect connects to the database
 func DbConnect(dbpath string) Database {
@@ -196,7 +201,25 @@ func (d *Db) GetProjectId(projectname string) (int, error) {
 
 // Creates a new project in the database, associated with a user
 func (d *Db) AddProject(name string, description string, username string) error {
-	_, err := d.Exec(projectInsert, name, description, username)
+	tx := d.MustBegin()
+	_, err := tx.Exec(projectInsert, name, description, username)
+	if err != nil {
+		if err := tx.Rollback(); err != nil {
+			return err
+		}
+		return err
+	}
+	_, err = tx.Exec(changeUserRole, "project_manager", username, name)
+	if err != nil {
+		if err := tx.Rollback(); err != nil {
+			return err
+		}
+		return err
+	}
+	if err := tx.Commit(); err != nil {
+		return err
+	}
+
 	return err
 }
 
@@ -378,3 +401,42 @@ func (d *Db) Migrate() error {
 
 	return nil
 }
+
+// MigrateSampleData applies sample data to the database.
+func (d *Db) MigrateSampleData() error {
+	// Insert sample data
+	files, err := sampleData.ReadDir("sample_data")
+	if err != nil {
+		return err
+	}
+
+	if len(files) == 0 {
+		println("No sample data files found")
+	}
+	tr := d.MustBegin()
+
+	// Iterate over each SQL file and execute it
+	for _, file := range files {
+		if file.IsDir() || filepath.Ext(file.Name()) != ".sql" {
+			continue
+		}
+
+		// This is perhaps not the most elegant way to do this
+		sqlBytes, err := sampleData.ReadFile("sample_data/" + file.Name())
+		if err != nil {
+			return err
+		}
+
+		sqlQuery := string(sqlBytes)
+		_, err = tr.Exec(sqlQuery)
+		if err != nil {
+			return err
+		}
+	}
+
+	if tr.Commit() != nil {
+		return err
+	}
+
+	return nil
+}

backend/internal/database/migrations/0010_users.sql

@@ -4,11 +4,9 @@
 -- password is the hashed password
 CREATE TABLE IF NOT EXISTS users (
   id INTEGER PRIMARY KEY AUTOINCREMENT,
-  userId TEXT DEFAULT (HEX(RANDOMBLOB(4))) NOT NULL UNIQUE,
   username VARCHAR(255) NOT NULL UNIQUE,
   password VARCHAR(255) NOT NULL
 );
 
 -- Users are commonly searched by username and userId
 CREATE INDEX IF NOT EXISTS users_username_index ON users (username);
-CREATE INDEX IF NOT EXISTS users_userId_index ON users (userId);

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

@@ -0,0 +1,35 @@
+INSERT OR IGNORE INTO users(username, password)
+VALUES ("admin", "123");
+
+INSERT OR IGNORE INTO users(username, password)
+VALUES ("user", "123");
+
+INSERT OR IGNORE INTO users(username, password)
+VALUES ("user2", "123");
+
+INSERT OR IGNORE INTO projects(name,description,owner_user_id)
+VALUES ("projecttest","test project", 1);
+
+INSERT OR IGNORE INTO projects(name,description,owner_user_id)
+VALUES ("projecttest2","test project2", 1);
+
+INSERT OR IGNORE INTO projects(name,description,owner_user_id)
+VALUES ("projecttest3","test project3", 1);
+
+INSERT OR IGNORE INTO user_roles(user_id,project_id,p_role)
+VALUES (1,1,"project_manager");
+
+INSERT OR IGNORE INTO user_roles(user_id,project_id,p_role)
+VALUES (2,1,"member");
+
+INSERT OR IGNORE INTO user_roles(user_id,project_id,p_role)
+VALUES (3,1,"member");
+
+INSERT OR IGNORE INTO user_roles(user_id,project_id,p_role)
+VALUES (3,2,"member");
+
+INSERT OR IGNORE INTO user_roles(user_id,project_id,p_role)
+VALUES (3,3,"member");
+
+INSERT OR IGNORE INTO user_roles(user_id,project_id,p_role)
+VALUES (2,1,"project_manager");

backend/internal/handlers/handlers_project_related.go

@@ -5,6 +5,7 @@ import (
 	"ttime/internal/types"
 
 	"github.com/gofiber/fiber/v2"
+	"github.com/gofiber/fiber/v2/log"
 	"github.com/golang-jwt/jwt/v5"
 )
 
@@ -67,37 +68,47 @@ 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")
 	}
-	println("Getting project with ID: ", projectID)
+	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
-	println("Returning project: ", project.Name)
+	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 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)
 }
@@ -111,7 +122,7 @@ func (gs *GState) AddUserToProjectHandler(c *fiber.Ctx) error {
 		Role        string `json:"role"`
 	}
 	if err := c.BodyParser(&requestData); err != nil {
-		println("Error parsing request body:", err)
+		log.Info("Error parsing request body:", err)
 		return c.Status(400).SendString("Bad request")
 	}
 
@@ -119,27 +130,27 @@ func (gs *GState) AddUserToProjectHandler(c *fiber.Ctx) error {
 	user := c.Locals("user").(*jwt.Token)
 	claims := user.Claims.(jwt.MapClaims)
 	adminUsername := claims["name"].(string)
-	println("Admin username from claims:", adminUsername)
+	log.Info("Admin username from claims:", adminUsername)
 
 	isAdmin, err := gs.Db.IsSiteAdmin(adminUsername)
 	if err != nil {
-		println("Error checking admin status:", err)
+		log.Info("Error checking admin status:", err)
 		return c.Status(500).SendString(err.Error())
 	}
 
 	if !isAdmin {
-		println("User is not a site admin:", adminUsername)
+		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 {
-		println("Error adding user to project:", err)
+		log.Info("Error adding user to project:", err)
 		return c.Status(500).SendString(err.Error())
 	}
 
 	// Return success message
-	println("User added to project successfully:", requestData.Username)
+	log.Info("User added to project successfully:", requestData.Username)
 	return c.SendStatus(fiber.StatusOK)
 }

backend/internal/handlers/handlers_report_related.go

@@ -5,6 +5,7 @@ import (
 	"ttime/internal/types"
 
 	"github.com/gofiber/fiber/v2"
+	"github.com/gofiber/fiber/v2/log"
 	"github.com/golang-jwt/jwt/v5"
 )
 
@@ -16,50 +17,62 @@ func (gs *GState) SubmitWeeklyReport(c *fiber.Ctx) error {
 
 	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")
 		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
-	println("GetWeeklyReport")
 	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")
-	println(projectName)
 	week := c.Query("week")
-	println(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)
 }
@@ -69,35 +82,33 @@ type ReportId struct {
 }
 
 func (gs *GState) SignReport(c *fiber.Ctx) error {
-	println("Signing report...")
 	// 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
 	}
-	println("Signing report for: ", rid.ReportId)
+	log.Info("Signing report for: ", rid.ReportId)
-	// reportIDInt, err := strconv.Atoi(rid.ReportId)
-	// println("Signing report for: ", rid.ReportId)
-	// if err != nil {
-	// 	return c.Status(400).SendString("Invalid report ID")
-	// }
 
 	// 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")
 	}
-	println("blabla", projectManagerID)
+	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())
 	}
 

backend/internal/handlers/handlers_user_related.go

@@ -1,43 +1,57 @@
 package handlers
 
 import (
-	"fmt"
 	"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 a new user
+//	@Summary		Register
 //	@Description	Register a new user
 //	@Tags			User
 //	@Accept			json
-//	@Produce		json
+//	@Produce		plain
-//	@Success		200	{string}	string	"User added"
+//	@Param			NewUser	body		types.NewUser	true	"User to register"
-//	@Failure		400	{string}	string	"Bad request"
+//	@Success		200		{string}	string			"User added"
-//	@Failure		500	{string}	string	"Internal server error"
+//	@Failure		400		{string}	string			"Bad request"
-//	@Router			/api/register [post]
+//	@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 {
-		println("Error parsing body")
+		log.Warn("Error parsing body")
 		return c.Status(400).SendString(err.Error())
 	}
 
-	println("Adding user:", u.Username)
+	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())
 	}
 
-	println("User added:", u.Username)
+	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")
@@ -46,28 +60,44 @@ func (gs *GState) UserDelete(c *fiber.Ctx) error {
 	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 {
-		println("Error parsing body")
+		log.Warn("Error parsing body")
 		return c.Status(400).SendString(err.Error())
 	}
 
-	println("Username:", u.Username)
+	log.Info("Username logging in:", u.Username)
 	if !gs.Db.CheckUser(u.Username, u.Password) {
-		println("User not found")
+		log.Info("User not found")
 		return c.SendStatus(fiber.StatusUnauthorized)
 	}
 
@@ -80,23 +110,36 @@ func (gs *GState) Login(c *fiber.Ctx) error {
 
 	// Create token
 	token := jwt.NewWithClaims(jwt.SigningMethodHS256, claims)
-	println("Token created for user:", u.Username)
+	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 {
-		println("Error signing token")
+		log.Warn("Error signing token")
 		return c.SendStatus(fiber.StatusInternalServerError)
 	}
 
 	println("Successfully signed token for user:", u.Username)
-	return c.JSON(fiber.Map{"token": t})
+	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 {
-	// For testing: curl localhost:3000/restricted -H "Authorization: Bearer <token>"
 	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{
@@ -107,23 +150,49 @@ func (gs *GState) LoginRenew(c *fiber.Ctx) error {
 	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)
 	}
-	return c.JSON(fiber.Map{"token": t})
+
+	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)
 }
 
+//	@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 prometed 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
@@ -132,15 +201,15 @@ func (gs *GState) PromoteToAdmin(c *fiber.Ctx) error {
 	}
 	username := newUser.Username
 
-	println("Promoting user to admin:", username) // Debug print
+	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 {
-		fmt.Println("Error promoting user to admin:", err) // Debug print
+		log.Info("Error promoting user to admin:", err) // Debug print
 		return c.Status(500).SendString(err.Error())
 	}
 
-	println("User promoted to admin successfully:", username) // Debug print
+	log.Info("User promoted to admin successfully:", username) // Debug print
 
 	// Return a success message
 	return c.SendStatus(fiber.StatusOK)

backend/internal/types/users.go

@@ -27,3 +27,8 @@ type PublicUser struct {
 	UserId   string `json:"userId"`
 	Username string `json:"username"`
 }
+
+// wrapper type for token
+type Token struct {
+	Token string `json:"token"`
+}

backend/main.go

@@ -10,6 +10,7 @@ import (
 
 	"github.com/BurntSushi/toml"
 	"github.com/gofiber/fiber/v2"
+	"github.com/gofiber/fiber/v2/middleware/logger"
 	"github.com/gofiber/swagger"
 
 	jwtware "github.com/gofiber/contrib/jwt"
@@ -22,6 +23,10 @@ import (
 //	@license.name	AGPL
 //	@license.url	https://www.gnu.org/licenses/agpl-3.0.html
 
+//@securityDefinitions.apikey bererToken
+//@in header
+//@name Authorization
+
 //	@host		localhost:8080
 //	@BasePath	/api
 
@@ -46,6 +51,12 @@ func main() {
 	// Migrate the database
 	if err = db.Migrate(); err != nil {
 		fmt.Println("Error migrating database: ", err)
+		os.Exit(1)
+	}
+
+	if err = db.MigrateSampleData(); err != nil {
+		fmt.Println("Error migrating sample data: ", err)
+		os.Exit(1)
 	}
 
 	// Get our global state
@@ -53,6 +64,9 @@ func main() {
 	// Create the server
 	server := fiber.New()
 
+	server.Use(logger.New())
+
+	// Mounts the swagger documentation, this is available at /swagger/index.html
 	server.Get("/swagger/*", swagger.HandlerDefault)
 
 	// Mount our static files (Beware of the security implications of this!)
@@ -69,7 +83,7 @@ func main() {
 	}))
 
 	// Protected routes (require a valid JWT bearer token authentication header)
-	server.Post("/api/submitReport", gs.SubmitWeeklyReport)
+	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
@@ -79,7 +93,7 @@ func main() {
 	server.Post("/api/signReport", gs.SignReport)
 	server.Put("/api/addUserToProject", gs.AddUserToProjectHandler)
 	server.Post("/api/promoteToAdmin", gs.PromoteToAdmin)
-
+	server.Get("/api/users/all", gs.ListAllUsers)
 	// Announce the port we are listening on and start the server
 	err = server.Listen(fmt.Sprintf(":%d", conf.Port))
 	if err != nil {

frontend/src/API/API.ts

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

frontend/src/Components/DeleteUser.tsx

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

frontend/src/Components/Header.tsx

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

frontend/src/Components/NewWeeklyReport.tsx

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

frontend/src/Components/UserInfoModal.tsx

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

frontend/src/Components/UserListAdmin.tsx

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

frontend/src/Components/UserProjectListAdmin.tsx

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

frontend/src/Pages/AdminPages/AdminChangeUsername.tsx

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

frontend/src/Pages/App.tsx

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

frontend/src/Pages/NotFoundPage.tsx

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

frontend/src/Pages/UserPages/UserProjectPage.tsx

@@ -1,18 +1,20 @@
-import { Link, useLocation } from "react-router-dom";
+import { Link, useLocation, useParams } from "react-router-dom";
 import BasicWindow from "../../Components/BasicWindow";
 import BackButton from "../../Components/BackButton";
 
 function UserProjectPage(): JSX.Element {
+  const { projectName } = useParams();
+
   const content = (
     <>
       <h1 className="font-bold text-[30px] mb-[20px]">{useLocation().state}</h1>
       <div className="border-4 border-black bg-white flex flex-col items-center justify-center min-h-[65vh] h-fit w-[50vw] rounded-3xl content-center overflow-scroll space-y-[10vh] p-[30px]">
-        <Link to="/project-page">
+        <Link to={`/projectPage/${projectName}`}>
           <h1 className="font-bold underline text-[30px] cursor-pointer">
             Your Time Reports
           </h1>
         </Link>
-        <Link to="/new-time-report">
+        <Link to={`/newTimeReport/${projectName}`}>
           <h1 className="font-bold underline text-[30px] cursor-pointer">
             New Time Report
           </h1>

frontend/src/Pages/YourProjectsPage.tsx

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

frontend/src/main.tsx

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

testing.py

@@ -2,6 +2,16 @@ import requests
 import string
 import random
 
+debug_output = False
+
+def gprint(*args, **kwargs):
+    print("\033[92m", *args, "\033[00m", **kwargs)
+
+print("Running Tests...")
+
+def dprint(*args, **kwargs):
+    if debug_output:
+        print(*args, **kwargs)
 
 def randomString(len=10):
     """Generate a random string of fixed length"""
@@ -20,7 +30,7 @@ base_url = "http://localhost:8080"
 registerPath = base_url + "/api/register"
 loginPath = base_url + "/api/login"
 addProjectPath = base_url + "/api/project"
-submitReportPath = base_url + "/api/submitReport"
+submitReportPath = base_url + "/api/submitWeeklyReport"
 getWeeklyReportPath = base_url + "/api/getWeeklyReport"
 getProjectPath = base_url + "/api/project"
 signReportPath = base_url + "/api/signReport"
@@ -29,37 +39,56 @@ promoteToAdminPath = base_url + "/api/promoteToAdmin"
 getUserProjectsPath = base_url + "/api/getUserProjects"
 
 
+def test_get_user_projects():
+
+    dprint("Testing get user projects")
+    loginResponse = login("user2", "123")
+    # Check if the user is added to the project
+    response = requests.get(
+        getUserProjectsPath,
+        json={"username": "user2"},
+        headers={"Authorization": "Bearer " + loginResponse.json()["token"]},
+    )
+    dprint(response.text)
+    dprint(response.json())
+    assert response.status_code == 200, "Get user projects failed"
+    gprint("test_get_user_projects successful")
+
+
 # Posts the username and password to the register endpoint
 def register(username: string, password: string):
-    print("Registering with username: ", username, " and password: ", password)
+    dprint("Registering with username: ", username, " and password: ", password)
     response = requests.post(
         registerPath, json={"username": username, "password": password}
     )
-    print(response.text)
+    dprint(response.text)
     return response
 
 
 # Posts the username and password to the login endpoint
 def login(username: string, password: string):
-    print("Logging in with username: ", username, " and password: ", password)
+    dprint("Logging in with username: ", username, " and password: ", password)
     response = requests.post(
         loginPath, json={"username": username, "password": password}
     )
-    print(response.text)
+    dprint(response.text)
     return response
 
+
 # Test function to login
 def test_login():
     response = login(username, "always_same")
     assert response.status_code == 200, "Login failed"
-    print("Login successful")
+    dprint("Login successful")
+    gprint("test_login successful")
     return response.json()["token"]
 
+
 # Test function to create a new user
 def test_create_user():
     response = register(username, "always_same")
     assert response.status_code == 200, "Registration failed"
-    print("Registration successful")
+    gprint("test_create_user successful")
 
 # Test function to add a project
 def test_add_project():
@@ -70,9 +99,9 @@ def test_add_project():
         json={"name": projectName, "description": "This is a project"},
         headers={"Authorization": "Bearer " + token},
     )
-    print(response.text)
+    dprint(response.text)
     assert response.status_code == 200, "Add project failed"
-    print("Add project successful")
+    gprint("test_add_project successful")
 
 # Test function to submit a report
 def test_submit_report():
@@ -91,9 +120,9 @@ def test_submit_report():
         },
         headers={"Authorization": "Bearer " + token},
     )
-    print(response.text)
+    dprint(response.text)
     assert response.status_code == 200, "Submit report failed"
-    print("Submit report successful")
+    gprint("test_submit_report successful")
 
 # Test function to get a weekly report
 def test_get_weekly_report():
@@ -101,37 +130,47 @@ def test_get_weekly_report():
     response = requests.get(
         getWeeklyReportPath,
         headers={"Authorization": "Bearer " + token},
-        params={"username": username, "projectName": projectName , "week": 1}
+        params={"username": username, "projectName": projectName, "week": 1},
     )
-    print(response.text)
+    dprint(response.text)
     assert response.status_code == 200, "Get weekly report failed"
+    gprint("test_get_weekly_report successful")
+
 
 # Tests getting a project by id
 def test_get_project():
     token = login(username, "always_same").json()["token"]
     response = requests.get(
-        getProjectPath + "/1", # Assumes that the project with id 1 exists
+        getProjectPath + "/1",  # Assumes that the project with id 1 exists
         headers={"Authorization": "Bearer " + token},
     )
-    print(response.text)
+    dprint(response.text)
     assert response.status_code == 200, "Get project failed"
+    gprint("test_get_project successful")
+
 
 # Test function to add a user to a project
 def test_add_user_to_project():
     # Log in as a site admin
     admin_username = randomString()
     admin_password = "admin_password"
-    print("Registering with username: ", admin_username, " and password: ", admin_password)
+    dprint(
+        "Registering with username: ", admin_username, " and password: ", admin_password
+    )
     response = requests.post(
         registerPath, json={"username": admin_username, "password": admin_password}
     )
-    print(response.text)
+    dprint(response.text)
 
     admin_token = login(admin_username, admin_password).json()["token"]
-    response = requests.post(promoteToAdminPath, json={"username": admin_username}, headers={"Authorization": "Bearer " + admin_token})
+    response = requests.post(
-    print(response.text)
+        promoteToAdminPath,
+        json={"username": admin_username},
+        headers={"Authorization": "Bearer " + admin_token},
+    )
+    dprint(response.text)
     assert response.status_code == 200, "Promote to site admin failed"
-    print("Admin promoted to site admin successfully")
+    dprint("Admin promoted to site admin successfully")
 
     # Create a new user to add to the project
     new_user = randomString()
@@ -144,19 +183,9 @@ def test_add_user_to_project():
         headers={"Authorization": "Bearer " + admin_token},
     )
 
-    print(response.text)
+    dprint(response.text)
     assert response.status_code == 200, "Add user to project failed"
-    print("Add user to project successful")
+    gprint("test_add_user_to_project successful")
-
-    # Check if the user is added to the project
-    response = requests.get(
-        getUserProjectsPath,
-        json={"username": new_user},
-        headers={"Authorization": "Bearer " + admin_token},
-    ) 
-    print(response.text)
-    assert response.status_code == 200, "Get user projects failed"
-    print("got user projects successfully")
 
 # Test function to sign a report
 def test_sign_report():
@@ -167,26 +196,38 @@ def test_sign_report():
     # Register an admin
     admin_username = randomString()
     admin_password = "admin_password2"
-    print("Registering with username: ", admin_username, " and password: ", admin_password)
+    dprint(
+        "Registering with username: ", admin_username, " and password: ", admin_password
+    )
     response = requests.post(
         registerPath, json={"username": admin_username, "password": admin_password}
     )
-    print(response.text)
+    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})
+    response = requests.post(
+        promoteToAdminPath,
+        json={"username": admin_username},
+        headers={"Authorization": "Bearer " + admin_token},
+    )
 
     response = requests.put(
         addUserToProjectPath,
-        json={"projectName": projectName, "username": project_manager, "role": "project_manager"},
+        json={
+            "projectName": projectName,
+            "username": project_manager,
+            "role": "project_manager",
+        },
         headers={"Authorization": "Bearer " + admin_token},
-    ) 
+    )
     assert response.status_code == 200, "Add project manager to project failed"
-    print("Project manager added to project successfully")
+    dprint("Project manager added to project successfully")
-    
+
     # Log in as the project manager
-    project_manager_token = login(project_manager, "project_manager_password").json()["token"]
+    project_manager_token = login(project_manager, "project_manager_password").json()[
+        "token"
+    ]
 
     # Submit a report for the project
     token = login(username, "always_same").json()["token"]
@@ -205,15 +246,15 @@ def test_sign_report():
         headers={"Authorization": "Bearer " + token},
     )
     assert response.status_code == 200, "Submit report failed"
-    print("Submit report successful")
+    dprint("Submit report successful")
 
     # Retrieve the report ID
     response = requests.get(
         getWeeklyReportPath,
         headers={"Authorization": "Bearer " + token},
-        params={"username": username, "projectName": projectName , "week": 1}
+        params={"username": username, "projectName": projectName, "week": 1},
     )
-    print(response.text)
+    dprint(response.text)
     report_id = response.json()["reportId"]
 
     # Sign the report as the project manager
@@ -223,18 +264,20 @@ def test_sign_report():
         headers={"Authorization": "Bearer " + project_manager_token},
     )
     assert response.status_code == 200, "Sign report failed"
-    print("Sign  report successful")
+    dprint("Sign  report successful")
 
     # Retrieve the report ID again for confirmation
     response = requests.get(
         getWeeklyReportPath,
         headers={"Authorization": "Bearer " + token},
-        params={"username": username, "projectName": projectName , "week": 1}
+        params={"username": username, "projectName": projectName, "week": 1},
     )
-    print(response.text)
+    dprint(response.text)
+    gprint("test_sign_report successful")
 
 
 if __name__ == "__main__":
+    test_get_user_projects()
     test_create_user()
     test_login()
     test_add_project()