backend/Makefile

@@ -10,7 +10,6 @@ DB_FILE = db.sqlite3
 
 # Directory containing migration SQL scripts
 MIGRATIONS_DIR = internal/database/migrations
-SAMPLE_DATA_DIR = internal/database/sample_data
 
 # Build target
 build:
@@ -55,14 +54,6 @@ 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,167 +19,23 @@ const docTemplate = `{
     "host": "{{.Host}}",
     "basePath": "{{.BasePath}}",
     "paths": {
-        "/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": {
+        "/api/register": {
             "post": {
                 "description": "Register a new user",
                 "consumes": [
                     "application/json"
                 ],
                 "produces": [
-                    "text/plain"
+                    "application/json"
                 ],
                 "tags": [
                     "User"
                 ],
-                "summary": "Register",
+                "summary": "Register a new user",
                 "parameters": [
                     {
                         "description": "User to register",
-                        "name": "NewUser",
+                        "name": "{string}",
                         "in": "body",
                         "required": true,
                         "schema": {
@@ -208,82 +64,6 @@ 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": {
@@ -299,13 +79,6 @@ const docTemplate = `{
             }
         }
     },
-    "securityDefinitions": {
-        "bererToken": {
-            "type": "apiKey",
-            "name": "Authorization",
-            "in": "header"
-        }
-    },
     "externalDocs": {
         "description": "OpenAPI",
         "url": "https://swagger.io/resources/open-api/"

backend/internal/database/db.go

@@ -20,7 +20,6 @@ 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
@@ -50,9 +49,6 @@ 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 = ?"
@@ -64,10 +60,9 @@ 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 p.id, p.name, p.description FROM projects p	
-							JOIN user_roles ur ON p.id = ur.project_id
-							JOIN users u ON ur.user_id = u.id
-							WHERE u.username = ?`
+const getProjectsForUser = `SELECT projects.id, projects.name, projects.description, projects.owner_user_id 
+							FROM projects JOIN user_roles ON projects.id = user_roles.project_id
+							JOIN users ON user_roles.user_id = users.id WHERE users.username = ?;`
 
 // DbConnect connects to the database
 func DbConnect(dbpath string) Database {
@@ -383,42 +378,3 @@ 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,9 +4,11 @@
 -- 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

@@ -1,35 +0,0 @@
-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/global_state.go

@@ -34,17 +34,29 @@ type GlobalState interface {
 	// UpdateCollection(c *fiber.Ctx) error     // To update a collection
 	// DeleteCollection(c *fiber.Ctx) error     // To delete a collection
 	// SignCollection(c *fiber.Ctx) error       // To sign a collection
-	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
+	GetButtonCount(c *fiber.Ctx) error       // For demonstration purposes
+	IncrementButtonCount(c *fiber.Ctx) error // For demonstration purposes
+	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
 }
 
 // "Constructor"
 func NewGlobalState(db database.Database) GlobalState {
-	return &GState{Db: db}
+	return &GState{Db: db, ButtonCount: 0}
 }
 
 // The global state, which implements all the handlers
 type GState struct {
-	Db database.Database
+	Db          database.Database
+	ButtonCount int
+}
+
+func (gs *GState) GetButtonCount(c *fiber.Ctx) error {
+	return c.Status(200).JSON(fiber.Map{"pressCount": gs.ButtonCount})
+}
+
+func (gs *GState) IncrementButtonCount(c *fiber.Ctx) error {
+	gs.ButtonCount++
+	return c.Status(200).JSON(fiber.Map{"pressCount": gs.ButtonCount})
 }

backend/internal/handlers/handlers_project_related.go

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

backend/internal/handlers/handlers_report_related.go

@@ -5,7 +5,6 @@ import (
 	"ttime/internal/types"
 
 	"github.com/gofiber/fiber/v2"
-	"github.com/gofiber/fiber/v2/log"
 	"github.com/golang-jwt/jwt/v5"
 )
 
@@ -17,62 +16,50 @@ 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")
-
-	if projectName == "" || week == "" {
-		log.Info("Missing project name or week number")
-		return c.Status(400).SendString("Missing project name or week number")
-	}
+	println(week)
 
 	// 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)
 }
@@ -82,33 +69,35 @@ 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
 	}
-	log.Info("Signing report for: ", rid.ReportId)
+	println("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")
 	}
-	log.Info("Project manager ID: ", projectManagerID)
+	println("blabla", 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,57 +1,44 @@
 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
+//	@Summary		Register a new user
 //	@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"
+//	@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")
+		println("Error parsing body")
 		return c.Status(400).SendString(err.Error())
 	}
 
-	log.Info("Adding user:", u.Username)
+	println("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)
+	println("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")
@@ -60,44 +47,28 @@ 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 {
-		log.Warn("Error parsing body")
+		println("Error parsing body")
 		return c.Status(400).SendString(err.Error())
 	}
 
-	log.Info("Username logging in:", u.Username)
+	println("Username:", u.Username)
 	if !gs.Db.CheckUser(u.Username, u.Password) {
-		log.Info("User not found")
+		println("User not found")
 		return c.SendStatus(fiber.StatusUnauthorized)
 	}
 
@@ -110,36 +81,23 @@ func (gs *GState) Login(c *fiber.Ctx) error {
 
 	// Create token
 	token := jwt.NewWithClaims(jwt.SigningMethodHS256, claims)
-	log.Info("Token created for user:", u.Username)
+	println("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")
+		println("Error signing token")
 		return c.SendStatus(fiber.StatusInternalServerError)
 	}
 
 	println("Successfully signed token for user:", u.Username)
-	return c.JSON(types.Token{Token: t})
+	return c.JSON(fiber.Map{"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{
@@ -150,49 +108,23 @@ 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)
 	}
-
-	log.Info("Successfully renewed token for user:", user.Claims.(jwt.MapClaims)["name"])
-	return c.JSON(types.Token{Token: t})
+	return c.JSON(fiber.Map{"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
@@ -201,15 +133,15 @@ func (gs *GState) PromoteToAdmin(c *fiber.Ctx) error {
 	}
 	username := newUser.Username
 
-	log.Info("Promoting user to admin:", username) // Debug print
+	println("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
+		fmt.Println("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
+	println("User promoted to admin successfully:", username) // Debug print
 
 	// Return a success message
 	return c.SendStatus(fiber.StatusOK)

backend/internal/types/users.go

@@ -27,8 +27,3 @@ 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,7 +10,6 @@ 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"
@@ -23,10 +22,6 @@ 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
 
@@ -51,12 +46,6 @@ 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
@@ -64,9 +53,6 @@ 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!)
@@ -75,6 +61,11 @@ func main() {
 
 	// Register our unprotected routes
 	server.Post("/api/register", gs.Register)
+
+	// Register handlers for example button count
+	server.Get("/api/button", gs.GetButtonCount)
+	server.Post("/api/button", gs.IncrementButtonCount)
+
 	server.Post("/api/login", gs.Login)
 
 	// Every route from here on will require a valid JWT
@@ -82,7 +73,6 @@ func main() {
 		SigningKey: jwtware.SigningKey{Key: []byte("secret")},
 	}))
 
-	// Protected routes (require a valid JWT bearer token authentication header)
 	server.Post("/api/submitReport", gs.SubmitWeeklyReport)
 	server.Get("/api/getUserProjects", gs.GetUserProjects)
 	server.Post("/api/loginrenew", gs.LoginRenew)
@@ -93,7 +83,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

@@ -46,7 +46,6 @@ interface API {
     username: string,
     token: string,
   ): Promise<APIResponse<Project[]>>;
-  /** Gets a project from id*/
   getProject(id: number): Promise<APIResponse<Project>>;
 }
 
@@ -150,10 +149,7 @@ export const api: API = {
     }
   },
 
-  async getUserProjects(
-    username: string,
-    token: string,
-  ): Promise<APIResponse<Project[]>> {
+  async getUserProjects(token: string): Promise<APIResponse<Project[]>> {
     try {
       const response = await fetch("/api/getUserProjects", {
         method: "GET",
@@ -161,7 +157,6 @@ export const api: API = {
           "Content-Type": "application/json",
           Authorization: "Bearer " + token,
         },
-        body: JSON.stringify({ username }),
       });
 
       if (!response.ok) {

frontend/src/Components/AddProject.tsx

@@ -1,94 +0,0 @@
-import { useState } from "react";
-import { APIResponse, api } from "../API/API";
-import { NewProject, Project } from "../Types/goTypes";
-import InputField from "./InputField";
-import Logo from "../assets/Logo.svg";
-import Button from "./Button";
-
-/**
- * Tries to add a project to the system
- * @param props - Project name and description
- * @returns {boolean} True if created, false if not
- */
-function CreateProject(props: { name: string; description: string }): boolean {
-  const project: NewProject = {
-    name: props.name,
-    description: props.description,
-  };
-
-  let created = false;
-
-  api
-    .createProject(project, localStorage.getItem("accessToken") ?? "")
-    .then((response: APIResponse<Project>) => {
-      if (response.success) {
-        created = true;
-      } else {
-        console.error(response.message);
-      }
-    })
-    .catch((error) => {
-      console.error("An error occurred during creation:", error);
-    });
-  return created;
-}
-
-/**
- * Tries to add a project to the system
- * @returns {JSX.Element} UI for project adding
- */
-function AddProject(): JSX.Element {
-  const [name, setName] = useState("");
-  const [description, setDescription] = useState("");
-
-  return (
-    <div className="flex flex-col h-fit w-screen items-center justify-center">
-      <div className="border-4 border-black bg-white flex flex-col items-center justify-center h-fit w-fit rounded-3xl content-center pl-20 pr-20">
-        <form
-          className="bg-white rounded px-8 pt-6 pb-8 mb-4 items-center justify-center flex flex-col w-fit h-fit"
-          onSubmit={(e) => {
-            e.preventDefault();
-            CreateProject({ name: name, description: description });
-          }}
-        >
-          <img
-            src={Logo}
-            className="logo w-[7vw] mb-10 mt-10"
-            alt="TTIME Logo"
-          />
-          <h3 className="pb-4 mb-2 text-center font-bold text-[18px]">
-            Create a new project
-          </h3>
-          <InputField
-            label="Name"
-            type="text"
-            value={name}
-            onChange={(e) => {
-              setName(e.target.value);
-            }}
-          />
-          <InputField
-            label="Description"
-            type="text"
-            value={description}
-            onChange={(e) => {
-              setDescription(e.target.value);
-            }}
-          />
-          <div className="flex items-center justify-between">
-            <Button
-              text="Create"
-              onClick={(): void => {
-                return;
-              }}
-              type="submit"
-            />
-          </div>
-        </form>
-        <p className="text-center text-gray-500 text-xs"></p>
-      </div>
-    </div>
-  );
-}
-
-export default AddProject;

frontend/src/Components/BasicWindow.tsx

@@ -2,15 +2,17 @@ import Header from "./Header";
 import Footer from "./Footer";
 
 function BasicWindow({
+  username,
   content,
   buttons,
 }: {
+  username: string;
   content: React.ReactNode;
   buttons: React.ReactNode;
 }): JSX.Element {
   return (
     <div className="font-sans flex flex-col h-screen bg-white border-2 border-black overflow-auto pt-[110px]">
-      <Header />
+      <Header username={username} />
       <div className="flex flex-col items-center flex-grow">{content}</div>
       <Footer>{buttons}</Footer>
     </div>

frontend/src/Components/EditWeeklyReport.tsx

@@ -1,247 +0,0 @@
-import { useState, useEffect } from "react";
-import { NewWeeklyReport } from "../Types/goTypes";
-import { api } from "../API/API";
-import { useNavigate } from "react-router-dom";
-import Button from "./Button";
-
-export default function GetWeeklyReport(): JSX.Element {
-  const [projectName, setProjectName] = useState("");
-  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 username = localStorage.getItem("username") ?? "";
-
-  useEffect(() => {
-    const fetchWeeklyReport = async (): Promise<void> => {
-      const response = await api.getWeeklyReport(
-        username,
-        projectName,
-        week.toString(),
-        token,
-      );
-
-      if (response.success) {
-        const report: NewWeeklyReport = response.data ?? {
-          projectName: "",
-          week: 0,
-          developmentTime: 0,
-          meetingTime: 0,
-          adminTime: 0,
-          ownWorkTime: 0,
-          studyTime: 0,
-          testingTime: 0,
-        };
-        setProjectName(report.projectName);
-        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 fetchWeeklyReport();
-  }, [projectName, token, username, week]);
-
-  const handleNewWeeklyReport = async (): Promise<void> => {
-    const newWeeklyReport: NewWeeklyReport = {
-      projectName,
-      week,
-      developmentTime,
-      meetingTime,
-      adminTime,
-      ownWorkTime,
-      studyTime,
-      testingTime,
-    };
-
-    await api.submitWeeklyReport(newWeeklyReport, token);
-  };
-
-  const navigate = useNavigate();
-
-  return (
-    <>
-      <div className="border-4 border-black bg-white flex flex-col justify-start min-h-[65vh] h-fit w-[50vw] rounded-3xl overflow-scroll space-y-[2vh] p-[30px] items-center">
-        <form
-          onSubmit={(e) => {
-            if (week === 0) {
-              alert("Please enter a week number");
-              e.preventDefault();
-              return;
-            }
-            e.preventDefault();
-            void handleNewWeeklyReport();
-            navigate("/project");
-          }}
-        >
-          <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();
-              }}
-            />
-            <table className="w-full text-center divide-y divide-x divide-white text-[30px]">
-              <thead>
-                <tr>
-                  <th className="w-1/2 py-2 border-b-2 border-black">
-                    Activity
-                  </th>
-                  <th className="w-1/2 py-2 border-b-2 border-black">
-                    Total Time (min)
-                  </th>
-                </tr>
-              </thead>
-              <tbody className="divide-y divide-black">
-                <tr className="h-[10vh]">
-                  <td>Development</td>
-                  <td>
-                    <input
-                      type="number"
-                      min="0"
-                      className="border-2 border-black rounded-md text-center w-1/2"
-                      value={developmentTime}
-                      onChange={(e) => {
-                        setDevelopmentTime(parseInt(e.target.value));
-                      }}
-                      onKeyDown={(event) => {
-                        const keyValue = event.key;
-                        if (!/\d/.test(keyValue) && keyValue !== "Backspace")
-                          event.preventDefault();
-                      }}
-                    />
-                  </td>
-                </tr>
-                <tr className="h-[10vh]">
-                  <td>Meeting</td>
-                  <td>
-                    <input
-                      type="number"
-                      min="0"
-                      className="border-2 border-black rounded-md text-center w-1/2"
-                      value={meetingTime}
-                      onChange={(e) => {
-                        setMeetingTime(parseInt(e.target.value));
-                      }}
-                      onKeyDown={(event) => {
-                        const keyValue = event.key;
-                        if (!/\d/.test(keyValue) && keyValue !== "Backspace")
-                          event.preventDefault();
-                      }}
-                    />
-                  </td>
-                </tr>
-                <tr className="h-[10vh]">
-                  <td>Administration</td>
-                  <td>
-                    <input
-                      type="number"
-                      min="0"
-                      className="border-2 border-black rounded-md text-center w-1/2"
-                      value={adminTime}
-                      onChange={(e) => {
-                        setAdminTime(parseInt(e.target.value));
-                      }}
-                      onKeyDown={(event) => {
-                        const keyValue = event.key;
-                        if (!/\d/.test(keyValue) && keyValue !== "Backspace")
-                          event.preventDefault();
-                      }}
-                    />
-                  </td>
-                </tr>
-                <tr className="h-[10vh]">
-                  <td>Own Work</td>
-                  <td>
-                    <input
-                      type="number"
-                      min="0"
-                      className="border-2 border-black rounded-md text-center w-1/2"
-                      value={ownWorkTime}
-                      onChange={(e) => {
-                        setOwnWorkTime(parseInt(e.target.value));
-                      }}
-                      onKeyDown={(event) => {
-                        const keyValue = event.key;
-                        if (!/\d/.test(keyValue) && keyValue !== "Backspace")
-                          event.preventDefault();
-                      }}
-                    />
-                  </td>
-                </tr>
-                <tr className="h-[10vh]">
-                  <td>Studies</td>
-                  <td>
-                    <input
-                      type="number"
-                      min="0"
-                      className="border-2 border-black rounded-md text-center w-1/2"
-                      value={studyTime}
-                      onChange={(e) => {
-                        setStudyTime(parseInt(e.target.value));
-                      }}
-                      onKeyDown={(event) => {
-                        const keyValue = event.key;
-                        if (!/\d/.test(keyValue) && keyValue !== "Backspace")
-                          event.preventDefault();
-                      }}
-                    />
-                  </td>
-                </tr>
-                <tr className="h-[10vh]">
-                  <td>Testing</td>
-                  <td>
-                    <input
-                      type="number"
-                      min="0"
-                      className="border-2 border-black rounded-md text-center w-1/2"
-                      value={testingTime}
-                      onChange={(e) => {
-                        setTestingTime(parseInt(e.target.value));
-                      }}
-                      onKeyDown={(event) => {
-                        const keyValue = event.key;
-                        if (!/\d/.test(keyValue) && keyValue !== "Backspace")
-                          event.preventDefault();
-                      }}
-                    />
-                  </td>
-                </tr>
-              </tbody>
-            </table>
-            <Button
-              text="Submit"
-              onClick={(): void => {
-                return;
-              }}
-              type="submit"
-            />
-          </div>
-        </form>
-      </div>
-    </>
-  );
-}

frontend/src/Components/Header.tsx

@@ -1,11 +1,11 @@
 import { useState } from "react";
 import { Link } from "react-router-dom";
 
-function Header(): JSX.Element {
+function Header({ username }: { username: string }): JSX.Element {
   const [isOpen, setIsOpen] = useState(false);
 
   const handleLogout = (): void => {
-    localStorage.clear();
+    // Add any logout logic here
   };
 
   return (
@@ -31,7 +31,7 @@ function Header(): JSX.Element {
         }}
       >
         <button className="mr-4 underline font-bold text-white">
-          {localStorage.getItem("username")}
+          {username}
         </button>
 
         {isOpen && (

frontend/src/Components/LoginCheck.tsx

@@ -10,22 +10,17 @@ function LoginCheck(props: {
   username: string;
   password: string;
   setAuthority: Dispatch<SetStateAction<number>>;
-}): void {
+}): number {
   const user: NewUser = {
     username: props.username,
     password: props.password,
   };
-
-  localStorage.clear();
-
   api
     .login(user)
     .then((response: APIResponse<string>) => {
       if (response.success) {
         if (response.data !== undefined) {
           const token = response.data;
-          localStorage.setItem("accessToken", token);
-          localStorage.setItem("username", props.username);
           //TODO: change so that it checks for user type (admin, user, pm) instead
           if (token !== "" && props.username === "admin") {
             props.setAuthority((prevAuth) => {
@@ -47,12 +42,14 @@ function LoginCheck(props: {
           console.error("Token was undefined");
         }
       } else {
-        console.error("Token could not be fetched/No such user");
+        console.error("Token could not be fetched");
       }
     })
     .catch((error) => {
       console.error("An error occurred during login:", error);
     });
+
+  return 0;
 }
 
 export default LoginCheck;

frontend/src/Components/Register.tsx

@@ -3,9 +3,34 @@ import { NewUser } from "../Types/goTypes";
 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";
 
+function InputField(props: {
+  label: string;
+  type: string;
+  value: string;
+  onChange: (e: React.ChangeEvent<HTMLInputElement>) => void;
+}): JSX.Element {
+  return (
+    <div className="mb-4">
+      <label
+        className="block text-gray-700 text-sm font-sans font-bold mb-2"
+        htmlFor={props.label}
+      >
+        {props.label}
+      </label>
+      <input
+        className="appearance-none border-2 border-black rounded-2xl w-full py-2 px-3 text-gray-700 leading-tight focus:outline-none focus:shadow-outline"
+        id={props.label}
+        type={props.type}
+        placeholder={props.label}
+        value={props.value}
+        onChange={props.onChange}
+      />
+    </div>
+  );
+}
+
 export default function Register(): JSX.Element {
   const [username, setUsername] = useState<string>();
   const [password, setPassword] = useState<string>();
@@ -23,7 +48,6 @@ export default function Register(): JSX.Element {
       nav("/"); // Instantly navigate to the login page
     } else {
       setErrMessage(response.message ?? "Unknown error");
-      console.error(errMessage);
     }
   };
 
@@ -48,7 +72,7 @@ export default function Register(): JSX.Element {
           <InputField
             label="Username"
             type="text"
-            value={username ?? ""}
+            value={username}
             onChange={(e) => {
               setUsername(e.target.value);
             }}
@@ -56,11 +80,48 @@ export default function Register(): JSX.Element {
           <InputField
             label="Password"
             type="password"
-            value={password ?? ""}
+            value={password}
             onChange={(e) => {
               setPassword(e.target.value);
             }}
           />
+          <div className="mb-4">
+            <label
+              className="block text-gray-700 text-sm font-sans font-bold mb-2"
+              htmlFor="username"
+            >
+              Username
+            </label>
+            <input
+              className="appearance-none border-2 border-black rounded-2xl w-full py-2 px-3 text-gray-700 leading-tight focus:outline-none focus:shadow-outline"
+              id="username"
+              type="text"
+              placeholder="Username"
+              value={username}
+              onChange={(e) => {
+                setUsername(e.target.value);
+              }}
+            />
+          </div>
+          <div className="mb-6">
+            <label
+              className="block text-gray-700 text-sm font-sans font-bold mb-2"
+              htmlFor="password"
+            >
+              Password
+            </label>
+            <input
+              className="appearance-none border-2 border-black rounded-2xl w-full py-2 px-3 text-gray-700 leading-tight focus:outline-none focus:shadow-outline"
+              id="password"
+              type="password"
+              placeholder="Choose your password"
+              value={password}
+              onChange={(e) => {
+                setPassword(e.target.value);
+              }}
+            />
+          </div>
+          {errMessage && <p className="text-red-500 text-xs">{errMessage}</p>}
           <div className="flex items-center justify-between">
             <Button
               text="Register"

frontend/src/Components/TimeReport.tsx

@@ -1,51 +1,50 @@
-import { useState, useContext } from "react";
-import type { NewWeeklyReport } from "../Types/goTypes";
+import { useState } from "react";
 import { api } from "../API/API";
 import { useNavigate } from "react-router-dom";
 import Button from "./Button";
-import { ProjectNameContext } from "../Pages/YourProjectsPage";
+import { NewWeeklyReport } from "../Types/goTypes";
 
-export default function NewWeeklyReport(): 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);
+export default function NewTimeReport(): JSX.Element {
+  const [projectName, setProjectName] = useState<string>("projectName"); // TODO: Get from backend
+  const [week, setWeek] = useState<number>(NaN);
+  const [development, setDevelopment] = useState<number>(NaN);
+  const [meeting, setMeeting] = useState<number>(NaN);
+  const [administration, setAdministration] = useState<number>(NaN);
+  const [ownwork, setOwnWork] = useState<number>(NaN);
+  const [studies, setStudies] = useState<number>(NaN);
+  const [testing, setTesting] = useState<number>(NaN);
 
-  const projectName = useContext(ProjectNameContext);
-  const token = localStorage.getItem("accessToken") ?? "";
-
-  const handleNewWeeklyReport = async (): Promise<void> => {
-    const newWeeklyReport: NewWeeklyReport = {
+  const handleNewTimeReport = async (): Promise<void> => {
+    const newTimeReport: NewWeeklyReport = {
       projectName,
       week,
-      developmentTime,
-      meetingTime,
-      adminTime,
-      ownWorkTime,
-      studyTime,
-      testingTime,
+      developmentTime: development,
+      meetingTime: meeting,
+      adminTime: administration,
+      ownWorkTime: ownwork,
+      studyTime: studies,
+      testingTime: testing,
     };
-
-    await api.submitWeeklyReport(newWeeklyReport, token);
+    await Promise.resolve();
+    await api.submitWeeklyReport(newTimeReport, "token");
   };
 
   const navigate = useNavigate();
 
+  setProjectName("Something Reasonable"); // This should obviously not be used here
+
   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) {
+            if (!week) {
               alert("Please enter a week number");
               e.preventDefault();
               return;
             }
             e.preventDefault();
-            void handleNewWeeklyReport();
+            void handleNewTimeReport();
             navigate("/project");
           }}
         >
@@ -84,9 +83,9 @@ 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={development}
                       onChange={(e) => {
-                        setDevelopmentTime(parseInt(e.target.value));
+                        setDevelopment(parseInt(e.target.value));
                       }}
                       onKeyDown={(event) => {
                         const keyValue = event.key;
@@ -103,9 +102,9 @@ 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={meeting}
                       onChange={(e) => {
-                        setMeetingTime(parseInt(e.target.value));
+                        setMeeting(parseInt(e.target.value));
                       }}
                       onKeyDown={(event) => {
                         const keyValue = event.key;
@@ -122,9 +121,9 @@ 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={administration}
                       onChange={(e) => {
-                        setAdminTime(parseInt(e.target.value));
+                        setAdministration(parseInt(e.target.value));
                       }}
                       onKeyDown={(event) => {
                         const keyValue = event.key;
@@ -141,9 +140,9 @@ 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={ownwork}
                       onChange={(e) => {
-                        setOwnWorkTime(parseInt(e.target.value));
+                        setOwnWork(parseInt(e.target.value));
                       }}
                       onKeyDown={(event) => {
                         const keyValue = event.key;
@@ -160,9 +159,9 @@ 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={studies}
                       onChange={(e) => {
-                        setStudyTime(parseInt(e.target.value));
+                        setStudies(parseInt(e.target.value));
                       }}
                       onKeyDown={(event) => {
                         const keyValue = event.key;
@@ -179,9 +178,9 @@ 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={testing}
                       onChange={(e) => {
-                        setTestingTime(parseInt(e.target.value));
+                        setTesting(parseInt(e.target.value));
                       }}
                       onKeyDown={(event) => {
                         const keyValue = event.key;

frontend/src/Components/UserListAdmin.tsx

@@ -1,11 +1,11 @@
 import { Link } from "react-router-dom";
-import { PublicUser } from "../Types/goTypes";
+import { User } from "../Types/goTypes";
 
 /**
  * The props for the UserProps component
  */
 interface UserProps {
-  users: PublicUser[];
+  users: User[];
 }
 
 /**
@@ -23,7 +23,7 @@ export function UserListAdmin(props: UserProps): JSX.Element {
     <div>
       <ul className="font-bold underline text-[30px] cursor-pointer padding">
         {props.users.map((user) => (
-          <Link to="/adminUserInfo" key={user.userId} state={user.username}>
+          <Link to="/admin-view-user" key={user.userId} state={user.username}>
             <li className="pt-5" key={user.userId}>
               {user.username}
             </li>

frontend/src/Components/UserProjectListAdmin.tsx

@@ -1,43 +0,0 @@
-import React, { useEffect, useState } from "react";
-import { api } from "../API/API";
-import { Project } from "../Types/goTypes";
-
-const UserProjectListAdmin: React.FC = () => {
-  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 response = await api.getUserProjects(username, token);
-        if (response.success) {
-          setProjects(response.data ?? []);
-        } else {
-          console.error("Failed to fetch projects:", response.message);
-        }
-      } catch (error) {
-        console.error("Error fetching projects:", error);
-      }
-    };
-
-    void fetchProjects();
-  }, []);
-
-  return (
-    <div>
-      <h2>User Projects</h2>
-      <ul>
-        {projects.map((project) => (
-          <li key={project.id}>
-            <span>{project.name}</span>
-            {/* Add any additional project details you want to display */}
-          </li>
-        ))}
-      </ul>
-    </div>
-  );
-};
-
-export default UserProjectListAdmin;

frontend/src/Pages/AdminPages/AdminAddProject.tsx

@@ -1,16 +1,28 @@
-import AddProject from "../../Components/AddProject";
-import BackButton from "../../Components/BackButton";
 import BasicWindow from "../../Components/BasicWindow";
+import Button from "../../Components/Button";
 
 function AdminAddProject(): JSX.Element {
-  const content = <AddProject />;
+  const content = <></>;
 
   const buttons = (
     <>
-      <BackButton />
+      <Button
+        text="Finish"
+        onClick={(): void => {
+          return;
+        }}
+        type="button"
+      />
+      <Button
+        text="Back"
+        onClick={(): void => {
+          return;
+        }}
+        type="button"
+      />
     </>
   );
 
-  return <BasicWindow content={content} buttons={buttons} />;
+  return <BasicWindow username="Admin" content={content} buttons={buttons} />;
 }
 export default AdminAddProject;

frontend/src/Pages/AdminPages/AdminAddUser.tsx

@@ -1,5 +1,5 @@
-import BackButton from "../../Components/BackButton";
 import BasicWindow from "../../Components/BasicWindow";
+import Button from "../../Components/Button";
 import Register from "../../Components/Register";
 
 function AdminAddUser(): JSX.Element {
@@ -11,10 +11,16 @@ function AdminAddUser(): JSX.Element {
 
   const buttons = (
     <>
-      <BackButton />
+      <Button
+        text="Back"
+        onClick={(): void => {
+          return;
+        }}
+        type="button"
+      />
     </>
   );
 
-  return <BasicWindow content={content} buttons={buttons} />;
+  return <BasicWindow username="Admin" content={content} buttons={buttons} />;
 }
 export default AdminAddUser;

frontend/src/Pages/AdminPages/AdminChangeUsername.tsx

@@ -23,6 +23,6 @@ function AdminChangeUsername(): JSX.Element {
     </>
   );
 
-  return <BasicWindow content={content} buttons={buttons} />;
+  return <BasicWindow username="Admin" content={content} buttons={buttons} />;
 }
 export default AdminChangeUsername;

frontend/src/Pages/AdminPages/AdminManageProjects.tsx

@@ -1,5 +1,3 @@
-import { Link } from "react-router-dom";
-import BackButton from "../../Components/BackButton";
 import BasicWindow from "../../Components/BasicWindow";
 import Button from "../../Components/Button";
 
@@ -8,19 +6,23 @@ function AdminManageProjects(): JSX.Element {
 
   const buttons = (
     <>
-      <Link to="/addProject">
-        <Button
-          text="Add Project"
-          onClick={(): void => {
-            return;
-          }}
-          type="button"
-        />
-      </Link>
-      <BackButton />
+      <Button
+        text="Add Project"
+        onClick={(): void => {
+          return;
+        }}
+        type="button"
+      />
+      <Button
+        text="Back"
+        onClick={(): void => {
+          return;
+        }}
+        type="button"
+      />
     </>
   );
 
-  return <BasicWindow content={content} buttons={buttons} />;
+  return <BasicWindow username="Admin" content={content} buttons={buttons} />;
 }
 export default AdminManageProjects;

frontend/src/Pages/AdminPages/AdminManageUsers.tsx

@@ -2,14 +2,14 @@ import BasicWindow from "../../Components/BasicWindow";
 import Button from "../../Components/Button";
 import BackButton from "../../Components/BackButton";
 import { UserListAdmin } from "../../Components/UserListAdmin";
-import { PublicUser } from "../../Types/goTypes";
+import { User } from "../../Types/Users";
 import { useNavigate } from "react-router-dom";
 
 function AdminManageUsers(): JSX.Element {
   //TODO: Change so that it reads users from database
-  const users: PublicUser[] = [];
+  const users: User[] = [];
   for (let i = 1; i <= 20; i++) {
-    users.push({ userId: "id" + i, username: "Example User " + i });
+    users.push({ id: i, userName: "Example User " + i });
   }
 
   const navigate = useNavigate();
@@ -28,7 +28,7 @@ function AdminManageUsers(): JSX.Element {
       <Button
         text="Add User"
         onClick={(): void => {
-          navigate("/adminAddUser");
+          navigate("/admin-add-user");
         }}
         type="button"
       />
@@ -36,6 +36,6 @@ function AdminManageUsers(): JSX.Element {
     </>
   );
 
-  return <BasicWindow content={content} buttons={buttons} />;
+  return <BasicWindow username="Admin" content={content} buttons={buttons} />;
 }
 export default AdminManageUsers;

frontend/src/Pages/AdminPages/AdminMenuPage.tsx

@@ -6,12 +6,12 @@ function AdminMenuPage(): JSX.Element {
     <>
       <h1 className="font-bold text-[30px] mb-[20px]">Administrator Menu</h1>
       <div className="border-4 border-black bg-white flex flex-col items-center justify-center min-h-[65vh] h-fit w-[50vw] rounded-3xl content-center overflow-scroll space-y-[10vh] p-[30px]">
-        <Link to="/adminManageUser">
+        <Link to="/admin-manage-users">
           <h1 className="font-bold underline text-[30px] cursor-pointer">
             Manage Users
           </h1>
         </Link>
-        <Link to="/adminManageProject">
+        <Link to="/admin-manage-projects">
           <h1 className="font-bold underline text-[30px] cursor-pointer">
             Manage Projects
           </h1>
@@ -22,6 +22,6 @@ function AdminMenuPage(): JSX.Element {
 
   const buttons = <></>;
 
-  return <BasicWindow content={content} buttons={buttons} />;
+  return <BasicWindow username="Admin" content={content} buttons={buttons} />;
 }
 export default AdminMenuPage;

frontend/src/Pages/AdminPages/AdminProjectAddMember.tsx

@@ -23,6 +23,6 @@ function AdminProjectAddMember(): JSX.Element {
     </>
   );
 
-  return <BasicWindow content={content} buttons={buttons} />;
+  return <BasicWindow username="Admin" content={content} buttons={buttons} />;
 }
 export default AdminProjectAddMember;

frontend/src/Pages/AdminPages/AdminProjectChangeUserRole.tsx

@@ -23,6 +23,6 @@ function AdminProjectChangeUserRole(): JSX.Element {
     </>
   );
 
-  return <BasicWindow content={content} buttons={buttons} />;
+  return <BasicWindow username="Admin" content={content} buttons={buttons} />;
 }
 export default AdminProjectChangeUserRole;

frontend/src/Pages/AdminPages/AdminProjectManageMembers.tsx

@@ -23,6 +23,6 @@ function AdminProjectManageMembers(): JSX.Element {
     </>
   );
 
-  return <BasicWindow content={content} buttons={buttons} />;
+  return <BasicWindow username="Admin" content={content} buttons={buttons} />;
 }
 export default AdminProjectManageMembers;

frontend/src/Pages/AdminPages/AdminProjectPage.tsx

@@ -23,6 +23,6 @@ function AdminProjectPage(): JSX.Element {
     </>
   );
 
-  return <BasicWindow content={content} buttons={buttons} />;
+  return <BasicWindow username="Admin" content={content} buttons={buttons} />;
 }
 export default AdminProjectPage;

frontend/src/Pages/AdminPages/AdminProjectStatistics.tsx

@@ -16,6 +16,6 @@ function AdminProjectStatistics(): JSX.Element {
     </>
   );
 
-  return <BasicWindow content={content} buttons={buttons} />;
+  return <BasicWindow username="Admin" content={content} buttons={buttons} />;
 }
 export default AdminProjectStatistics;

frontend/src/Pages/AdminPages/AdminProjectViewMemberInfo.tsx

@@ -23,6 +23,6 @@ function AdminProjectViewMemberInfo(): JSX.Element {
     </>
   );
 
-  return <BasicWindow content={content} buttons={buttons} />;
+  return <BasicWindow username="Admin" content={content} buttons={buttons} />;
 }
 export default AdminProjectViewMemberInfo;

frontend/src/Pages/AdminPages/AdminViewUserInfo.tsx

@@ -1,12 +1,15 @@
+import { useLocation } from "react-router-dom";
 import BasicWindow from "../../Components/BasicWindow";
 import Button from "../../Components/Button";
 import BackButton from "../../Components/BackButton";
-import UserProjectListAdmin from "../../Components/UserProjectListAdmin";
 
 function AdminViewUserInfo(): JSX.Element {
   const content = (
     <>
-      <UserProjectListAdmin />
+      <h1 className="font-bold text-[30px] mb-[20px]">{useLocation().state}</h1>
+      <div className="border-4 border-black bg-white flex flex-col items-center h-[65vh] w-[50vw] rounded-3xl content-center overflow-scroll space-y-[10vh] p-[30px]">
+        <p>Put relevant info on user from database here</p>
+      </div>
     </>
   );
 
@@ -23,6 +26,6 @@ function AdminViewUserInfo(): JSX.Element {
     </>
   );
 
-  return <BasicWindow content={content} buttons={buttons} />;
+  return <BasicWindow username="Admin" content={content} buttons={buttons} />;
 }
 export default AdminViewUserInfo;

frontend/src/Pages/App.tsx

@@ -1,4 +1,4 @@
-import { useState, useEffect } from "react";
+import { useState } from "react";
 
 import LoginPage from "./LoginPage";
 import { useNavigate } from "react-router-dom";
@@ -6,16 +6,13 @@ import { useNavigate } from "react-router-dom";
 function App(): JSX.Element {
   const navigate = useNavigate();
   const [authority, setAuthority] = useState(0);
-
-  useEffect(() => {
-    if (authority === 1) {
-      navigate("/admin");
-    } else if (authority === 2) {
-      navigate("/pm");
-    } else if (authority === 3) {
-      navigate("/user");
-    }
-  }, [authority, navigate]);
+  if (authority === 1) {
+    navigate("/admin");
+  } else if (authority === 2) {
+    navigate("/pm");
+  } else if (authority === 3) {
+    navigate("/user");
+  }
 
   return <LoginPage setAuthority={setAuthority} />;
 }

frontend/src/Pages/ProjectManagerPages/PMChangeRole.tsx

@@ -18,6 +18,6 @@ function ChangeRole(): JSX.Element {
     </>
   );
 
-  return <BasicWindow content={content} buttons={buttons} />;
+  return <BasicWindow username="Admin" content={content} buttons={buttons} />;
 }
 export default ChangeRole;

frontend/src/Pages/ProjectManagerPages/PMOtherUsersTR.tsx

@@ -10,6 +10,6 @@ function PMOtherUsersTR(): JSX.Element {
     </>
   );
 
-  return <BasicWindow content={content} buttons={buttons} />;
+  return <BasicWindow username="Admin" content={content} buttons={buttons} />;
 }
 export default PMOtherUsersTR;

frontend/src/Pages/ProjectManagerPages/PMProjectMembers.tsx

@@ -30,6 +30,6 @@ function PMProjectMembers(): JSX.Element {
     </>
   );
 
-  return <BasicWindow content={content} buttons={buttons} />;
+  return <BasicWindow username="Admin" content={content} buttons={buttons} />;
 }
 export default PMProjectMembers;

frontend/src/Pages/ProjectManagerPages/PMProjectPage.tsx

@@ -31,6 +31,6 @@ function PMProjectPage(): JSX.Element {
     </>
   );
 
-  return <BasicWindow content={content} buttons={undefined} />;
+  return <BasicWindow username="Admin" content={content} buttons={undefined} />;
 }
 export default PMProjectPage;

frontend/src/Pages/ProjectManagerPages/PMTotalTimeActivity.tsx

@@ -1,6 +1,6 @@
-import BackButton from "../../Components/BackButton";
 import BasicWindow from "../../Components/BasicWindow";
-import TimeReport from "../../Components/NewWeeklyReport";
+import TimeReport from "../../Components/TimeReport";
+import BackButton from "../../Components/BackButton";
 
 function PMTotalTimeActivity(): JSX.Element {
   const content = (
@@ -18,6 +18,6 @@ function PMTotalTimeActivity(): JSX.Element {
     </>
   );
 
-  return <BasicWindow content={content} buttons={buttons} />;
+  return <BasicWindow username="Admin" content={content} buttons={buttons} />;
 }
 export default PMTotalTimeActivity;

frontend/src/Pages/ProjectManagerPages/PMTotalTimeRole.tsx

@@ -10,6 +10,6 @@ function PMTotalTimeRole(): JSX.Element {
     </>
   );
 
-  return <BasicWindow content={content} buttons={buttons} />;
+  return <BasicWindow username="Admin" content={content} buttons={buttons} />;
 }
 export default PMTotalTimeRole;

frontend/src/Pages/ProjectManagerPages/PMUnsignedReports.tsx

@@ -10,6 +10,6 @@ function PMUnsignedReports(): JSX.Element {
     </>
   );
 
-  return <BasicWindow content={content} buttons={buttons} />;
+  return <BasicWindow username="Admin" content={content} buttons={buttons} />;
 }
 export default PMUnsignedReports;

frontend/src/Pages/ProjectManagerPages/PMViewUnsignedReport.tsx

@@ -1,7 +1,7 @@
-import BackButton from "../../Components/BackButton";
 import BasicWindow from "../../Components/BasicWindow";
 import Button from "../../Components/Button";
-import TimeReport from "../../Components/NewWeeklyReport";
+import TimeReport from "../../Components/TimeReport";
+import BackButton from "../../Components/BackButton";
 
 function PMViewUnsignedReport(): JSX.Element {
   const content = (
@@ -33,6 +33,6 @@ function PMViewUnsignedReport(): JSX.Element {
     </>
   );
 
-  return <BasicWindow content={content} buttons={buttons} />;
+  return <BasicWindow username="Admin" content={content} buttons={buttons} />;
 }
 export default PMViewUnsignedReport;

frontend/src/Pages/UserPages/UserEditTimeReportPage.tsx

@@ -1,21 +1,29 @@
 import BasicWindow from "../../Components/BasicWindow";
+import Button from "../../Components/Button";
+import NewTimeReport from "../../Components/TimeReport";
 import BackButton from "../../Components/BackButton";
-import EditWeeklyReport from "../../Components/EditWeeklyReport";
 
 function UserEditTimeReportPage(): JSX.Element {
   const content = (
     <>
       <h1 className="font-bold text-[30px] mb-[20px]">Edit Time Report</h1>
-      <EditWeeklyReport />
+      <NewTimeReport />
     </>
   );
 
   const buttons = (
     <>
+      <Button
+        text="Save"
+        onClick={(): void => {
+          return;
+        }}
+        type="button"
+      />
       <BackButton />
     </>
   );
 
-  return <BasicWindow content={content} buttons={buttons} />;
+  return <BasicWindow username="Admin" content={content} buttons={buttons} />;
 }
 export default UserEditTimeReportPage;

frontend/src/Pages/UserPages/UserNewTimeReportPage.tsx

@@ -1,13 +1,13 @@
 import BasicWindow from "../../Components/BasicWindow";
 import Button from "../../Components/Button";
-import NewWeeklyReport from "../../Components/NewWeeklyReport";
+import NewTimeReport from "../../Components/TimeReport";
 import { Link } from "react-router-dom";
 
 function UserNewTimeReportPage(): JSX.Element {
   const content = (
     <>
       <h1 className="font-bold text-[30px] mb-[20px]">New Time Report</h1>
-      <NewWeeklyReport />
+      <NewTimeReport />
     </>
   );
 
@@ -25,6 +25,6 @@ function UserNewTimeReportPage(): JSX.Element {
     </>
   );
 
-  return <BasicWindow content={content} buttons={buttons} />;
+  return <BasicWindow username="Admin" content={content} buttons={buttons} />;
 }
 export default UserNewTimeReportPage;

frontend/src/Pages/UserPages/UserProjectPage.tsx

@@ -27,6 +27,6 @@ function UserProjectPage(): JSX.Element {
     </>
   );
 
-  return <BasicWindow content={content} buttons={buttons} />;
+  return <BasicWindow username="Admin" content={content} buttons={buttons} />;
 }
 export default UserProjectPage;

frontend/src/Pages/UserPages/UserViewTimeReportsPage.tsx

@@ -15,6 +15,6 @@ function UserViewTimeReportsPage(): JSX.Element {
     </>
   );
 
-  return <BasicWindow content={content} buttons={buttons} />;
+  return <BasicWindow username="Admin" content={content} buttons={buttons} />;
 }
 export default UserViewTimeReportsPage;

frontend/src/Pages/YourProjectsPage.tsx

@@ -1,59 +1,31 @@
-import { useState, createContext, useEffect } from "react";
-import { Project } from "../Types/goTypes";
-import { api } from "../API/API";
-import { Link } from "react-router-dom";
 import BasicWindow from "../Components/BasicWindow";
+import { ProjectListUser } from "../Components/ProjectListUser";
+import { Project } from "../Types/Project";
 
-export const ProjectNameContext = createContext("");
-
-function UserProjectPage(): JSX.Element {
-  const [projects, setProjects] = useState<Project[]>([]);
-  const [selectedProject, setSelectedProject] = useState("");
-
-  const getProjects = async (): Promise<void> => {
-    const username = localStorage.getItem("username") ?? ""; // replace with actual username
-    const token = localStorage.getItem("accessToken") ?? ""; // replace with actual token
-    const response = await api.getUserProjects(username, token);
-    console.log(response);
-    if (response.success) {
-      setProjects(response.data ?? []);
-    } else {
-      console.error(response.message);
-    }
-  };
-  // Call getProjects when the component mounts
-  useEffect(() => {
-    void getProjects();
-  }, []);
-
-  const handleProjectClick = (projectName: string): void => {
-    setSelectedProject(projectName);
-  };
+function YourProjectsPage(): JSX.Element {
+  //TODO: Change so that it reads projects from database
+  const projects: Project[] = [];
+  for (let i = 1; i <= 20; i++) {
+    projects.push({
+      id: i,
+      name: "Example Project " + i,
+      description: "good",
+      created: "now",
+      owner: "me",
+    });
+  }
 
   const content = (
-    <ProjectNameContext.Provider value={selectedProject}>
+    <>
       <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.id}`}
-            onClick={() => {
-              handleProjectClick(project.name);
-            }}
-            key={index}
-          >
-            <h1 className="font-bold underline text-[30px] cursor-pointer">
-              {project.name}
-            </h1>
-          </Link>
-        ))}
+      <div className="border-4 border-black bg-white flex flex-col items-center h-[65vh] w-[50vw] rounded-3xl content-center overflow-scroll space-y-[10vh] p-[30px]">
+        <ProjectListUser projects={projects} />
       </div>
-    </ProjectNameContext.Provider>
+    </>
   );
 
   const buttons = <></>;
 
-  return <BasicWindow content={content} buttons={buttons} />;
+  return <BasicWindow username="Admin" content={content} buttons={buttons} />;
 }
-
-export default UserProjectPage;
+export default YourProjectsPage;

frontend/src/main.tsx

@@ -3,32 +3,8 @@ import ReactDOM from "react-dom/client";
 import "./index.css";
 import { createBrowserRouter, RouterProvider } from "react-router-dom";
 import App from "./Pages/App";
-import YourProjectsPage from "./Pages/YourProjectsPage.tsx";
-import UserProjectPage from "./Pages/UserPages/UserProjectPage.tsx";
-import AdminMenuPage from "./Pages/AdminPages/AdminMenuPage.tsx";
-import UserEditTimeReportPage from "./Pages/UserPages/UserEditTimeReportPage.tsx";
-import UserNewTimeReportPage from "./Pages/UserPages/UserNewTimeReportPage.tsx";
-import UserViewTimeReportsPage from "./Pages/UserPages/UserViewTimeReportsPage.tsx";
-import PMChangeRole from "./Pages/ProjectManagerPages/PMChangeRole.tsx";
-import PMOtherUsersTR from "./Pages/ProjectManagerPages/PMOtherUsersTR.tsx";
-import PMProjectMembers from "./Pages/ProjectManagerPages/PMProjectMembers.tsx";
-import PMProjectPage from "./Pages/ProjectManagerPages/PMProjectPage.tsx";
-import PMTotalTimeActivity from "./Pages/ProjectManagerPages/PMTotalTimeActivity.tsx";
-import PMTotalTimeRole from "./Pages/ProjectManagerPages/PMTotalTimeRole.tsx";
-import PMUnsignedReports from "./Pages/ProjectManagerPages/PMUnsignedReports.tsx";
-import PMViewUnsignedReport from "./Pages/ProjectManagerPages/PMViewUnsignedReport.tsx";
-import AdminManageUsers from "./Pages/AdminPages/AdminManageUsers.tsx";
-import AdminViewUserInfo from "./Pages/AdminPages/AdminViewUserInfo.tsx";
-import AdminManageProjects from "./Pages/AdminPages/AdminManageProjects.tsx";
-import AdminAddProject from "./Pages/AdminPages/AdminAddProject.tsx";
-import AdminAddUser from "./Pages/AdminPages/AdminAddUser.tsx";
-import AdminChangeUsername from "./Pages/AdminPages/AdminChangeUsername.tsx";
-import AdminProjectAddMember from "./Pages/AdminPages/AdminProjectAddMember.tsx";
-import AdminProjectChangeUserRole from "./Pages/AdminPages/AdminProjectChangeUserRole.tsx";
-import AdminProjectManageMembers from "./Pages/AdminPages/AdminProjectManageMembers.tsx";
-import AdminProjectStatistics from "./Pages/AdminPages/AdminProjectStatistics.tsx";
-import AdminProjectViewMemberInfo from "./Pages/AdminPages/AdminProjectViewMemberInfo.tsx";
-import AdminProjectPage from "./Pages/AdminPages/AdminProjectPage.tsx";
+import AdminMenuPage from "./Pages/AdminPages/AdminMenuPage";
+import YourProjectsPage from "./Pages/YourProjectsPage";
 
 // This is where the routes are mounted
 const router = createBrowserRouter([
@@ -44,110 +20,6 @@ const router = createBrowserRouter([
     path: "/pm",
     element: <YourProjectsPage />,
   },
-  {
-    path: "/user",
-    element: <YourProjectsPage />,
-  },
-  {
-    path: "/yourProjects",
-    element: <YourProjectsPage />,
-  },
-  {
-    path: "/editTimeReport",
-    element: <UserEditTimeReportPage />,
-  },
-  {
-    path: "/newTimeReport",
-    element: <UserNewTimeReportPage />,
-  },
-  {
-    path: "/project",
-    element: <UserProjectPage />,
-  },
-  {
-    path: "/projectPage",
-    element: <UserViewTimeReportsPage />,
-  },
-  {
-    path: "/changeRole",
-    element: <PMChangeRole />,
-  },
-  {
-    path: "/otherUsersTimeReports",
-    element: <PMOtherUsersTR />,
-  },
-  {
-    path: "/projectMembers",
-    element: <PMProjectMembers />,
-  },
-  {
-    path: "/PMProjectPage",
-    element: <PMProjectPage />,
-  },
-  {
-    path: "/PMTimeActivity",
-    element: <PMTotalTimeActivity />,
-  },
-  {
-    path: "/PMTimeRole",
-    element: <PMTotalTimeRole />,
-  },
-  {
-    path: "/PMUnsignedReports",
-    element: <PMUnsignedReports />,
-  },
-  {
-    path: "/PMViewUnsignedReport",
-    element: <PMViewUnsignedReport />,
-  },
-  {
-    path: "/adminChangeUsername",
-    element: <AdminChangeUsername />,
-  },
-  {
-    path: "/adminProjectAddMember",
-    element: <AdminProjectAddMember />,
-  },
-  {
-    path: "/adminProjectChangeUserRole",
-    element: <AdminProjectChangeUserRole />,
-  },
-  {
-    path: "/adminProjectManageMembers",
-    element: <AdminProjectManageMembers />,
-  },
-  {
-    path: "/adminProjectPage",
-    element: <AdminProjectPage />,
-  },
-  {
-    path: "/adminProjectStatistics",
-    element: <AdminProjectStatistics />,
-  },
-  {
-    path: "/adminProjectViewMembers",
-    element: <AdminProjectViewMemberInfo />,
-  },
-  {
-    path: "/addProject",
-    element: <AdminAddProject />,
-  },
-  {
-    path: "/adminAddUser",
-    element: <AdminAddUser />,
-  },
-  {
-    path: "/adminUserInfo",
-    element: <AdminViewUserInfo />,
-  },
-  {
-    path: "/adminManageProject",
-    element: <AdminManageProjects />,
-  },
-  {
-    path: "/adminManageUser",
-    element: <AdminManageUsers />,
-  },
 ]);
 
 // Semi-hacky way to get the root element

testing.py

@@ -22,27 +22,13 @@ loginPath = base_url + "/api/login"
 addProjectPath = base_url + "/api/project"
 submitReportPath = base_url + "/api/submitReport"
 getWeeklyReportPath = base_url + "/api/getWeeklyReport"
+<<<<<<< HEAD
 getProjectPath = base_url + "/api/project"
+=======
 signReportPath = base_url + "/api/signReport"
 addUserToProjectPath = base_url + "/api/addUserToProject"
 promoteToAdminPath = base_url + "/api/promoteToAdmin"
-getUserProjectsPath = base_url + "/api/getUserProjects"
-
-
-def test_get_user_projects():
-
-    print("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"]},
-    )
-    print(response.text)
-    print(response.json())
-    assert response.status_code == 200, "Get user projects failed"
-    print("got user projects successfully")
+>>>>>>> 9ad89d60636ac6091d71b0bf307982becc9b89fe
 
 
 # Posts the username and password to the register endpoint
@@ -64,7 +50,6 @@ def login(username: string, password: string):
     print(response.text)
     return response
 
-
 # Test function to login
 def test_login():
     response = login(username, "always_same")
@@ -72,14 +57,12 @@ def test_login():
     print("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")
 
-
 # Test function to add a project
 def test_add_project():
     loginResponse = login(username, "always_same")
@@ -93,7 +76,6 @@ def test_add_project():
     assert response.status_code == 200, "Add project failed"
     print("Add project successful")
 
-
 # Test function to submit a report
 def test_submit_report():
     token = login(username, "always_same").json()["token"]
@@ -115,49 +97,40 @@ def test_submit_report():
     assert response.status_code == 200, "Submit report failed"
     print("Submit report successful")
 
-
 # Test function to get a weekly report
 def test_get_weekly_report():
     token = login(username, "always_same").json()["token"]
     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)
     assert response.status_code == 200, "Get weekly report failed"
 
-
 # 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)
     assert response.status_code == 200, "Get project failed"
 
-
 # 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
-    )
+    print("Registering with username: ", admin_username, " and password: ", admin_password)
     response = requests.post(
         registerPath, json={"username": admin_username, "password": admin_password}
     )
     print(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(promoteToAdminPath, json={"username": admin_username}, headers={"Authorization": "Bearer " + admin_token})
     print(response.text)
     assert response.status_code == 200, "Promote to site admin failed"
     print("Admin promoted to site admin successfully")
@@ -177,7 +150,6 @@ def test_add_user_to_project():
     assert response.status_code == 200, "Add user to project failed"
     print("Add user to project successful")
 
-
 # Test function to sign a report
 def test_sign_report():
     # Create a project manager user
@@ -187,9 +159,7 @@ def test_sign_report():
     # Register an admin
     admin_username = randomString()
     admin_password = "admin_password2"
-    print(
-        "Registering with username: ", admin_username, " and password: ", admin_password
-    )
+    print("Registering with username: ", admin_username, " and password: ", admin_password)
     response = requests.post(
         registerPath, json={"username": admin_username, "password": admin_password}
     )
@@ -197,28 +167,18 @@ def test_sign_report():
 
     # 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")
-
+    
     # 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"]
@@ -243,7 +203,7 @@ def test_sign_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)
     report_id = response.json()["reportId"]
@@ -261,18 +221,20 @@ def test_sign_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)
 
 
 if __name__ == "__main__":
-    test_get_user_projects()
     test_create_user()
     test_login()
     test_add_project()
     test_submit_report()
     test_get_weekly_report()
+<<<<<<< HEAD
     test_get_project()
+=======
     test_sign_report()
     test_add_user_to_project()
+>>>>>>> 9ad89d60636ac6091d71b0bf307982becc9b89fe