.gitignore

@@ -9,16 +9,11 @@ bin
 database.txt
 plantuml.jar
 db.sqlite3
-db.sqlite3-journal
 diagram.puml
 backend/*.png
 backend/*.jpg
 backend/*.svg
 
-/go.work.sum
-/package-lock.json
-/backend/docs/swagger.json
-
 # Test binary, built with `go test -c`
 *.test
 

Justfile

@@ -15,7 +15,7 @@ remove-podman-containers:
 
 # Saves the release container to a tarball, pigz is just gzip but multithreaded
 save-release: build-container-release
-    podman save --format=oci-archive ttime-server | pigz -9 > ttime-server_`date -I`_`git rev-parse --short HEAD`.tar.gz
+    podman save --format=oci-archive ttime-server | pigz -9 > ttime-server.tar.gz
 
 # Loads the release container from a tarball
 load-release file:
@@ -23,13 +23,10 @@ load-release file:
 
 # Tests every part of the project
 testall:
-    cd frontend && npm install
     cd frontend && npm test
     cd frontend && npm run lint
-    cd frontend && npm run build
     cd backend && make test
     cd backend && make lint
-    cd backend && make itest
 
 # Cleans up everything related to the project
 clean: remove-podman-containers

Makefile

@@ -13,13 +13,10 @@ remove-podman-containers:
 
 # Tests every part of the project
 testall:
-	cd frontend && npm install
 	cd frontend && npm test
 	cd frontend && npm run lint
-	cd frontend && npm run build
 	cd backend && make test
 	cd backend && make lint
-	cd backend && make itest
 
 # Cleans up everything related to the project
 clean: remove-podman-containers

backend/Makefile

@@ -8,19 +8,17 @@ GOGET = $(GOCMD) get
 # SQLite database filename
 DB_FILE = db.sqlite3
 
-PROC_NAME = ttime_server
-
 # Directory containing migration SQL scripts
 MIGRATIONS_DIR = internal/database/migrations
 SAMPLE_DATA_DIR = internal/database/sample_data
 
 # Build target
 build:
-	$(GOBUILD) -o bin/$(PROC_NAME) main.go
+	$(GOBUILD) -o bin/server main.go
 
 # Run target
 run: build
-	./bin/$(PROC_NAME)
+	./bin/server
 
 watch: build
 	watchexec -c -w . -r make run
@@ -39,16 +37,6 @@ clean:
 test: db.sqlite3
 	$(GOTEST) ./... -count=1
 
-# Integration test target
-.PHONY: itest
-itest:
-	pgrep $(PROC_NAME) && echo "Server already running" && exit 1 || true
-	make build
-	./bin/$(PROC_NAME) >/dev/null 2>&1 &
-	sleep 1 # Adjust if needed
-	python ../testing.py
-	pkill $(PROC_NAME)
-
 # Get dependencies target
 deps:
 	$(GOGET) -v ./...
@@ -104,16 +92,6 @@ default: build
 docs:
 	swag init -outputTypes go
 
-api: ./docs/swagger.json
-	npx swagger-typescript-api \
-		--api-class-name GenApi \
-		--path ./docs/swagger.json \
-		--output ../frontend/src/API \
-		--name GenApi.ts \
-
-./docs/swagger.json:
-	swag init -outputTypes json
-
 .PHONY: docfmt
 docfmt:
 	swag fmt
@@ -152,12 +130,4 @@ install-just:
 
 .PHONY: types
 types:
-	tygo generate
+	tygo generate
-
-.PHONY: install-golds
-install-golds:
-	go install go101.org/golds@latest
-
-.PHONY: golds
-golds:
-	golds -port 6060 -nouses -plainsrc -wdpkgs-listing=promoted ./...

backend/docs/docs.go

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

backend/internal/config/config_test.go

@@ -5,12 +5,8 @@ import (
 	"testing"
 )
 
-// TestNewConfig tests the creation of a new configuration object
 func TestNewConfig(t *testing.T) {
-	// Arrange
 	c := NewConfig()
-
-	// Act & Assert
 	if c.Port != 8080 {
 		t.Errorf("Expected port to be 8080, got %d", c.Port)
 	}
@@ -28,15 +24,9 @@ func TestNewConfig(t *testing.T) {
 	}
 }
 
-// TestWriteConfig tests the function to write the configuration to a file
 func TestWriteConfig(t *testing.T) {
-	// Arrange
 	c := NewConfig()
-
-	//Act
 	err := c.WriteConfigToFile("test.toml")
-
-	// Assert
 	if err != nil {
 		t.Errorf("Expected no error, got %s", err)
 	}
@@ -45,23 +35,14 @@ func TestWriteConfig(t *testing.T) {
 	_ = os.Remove("test.toml")
 }
 
-// TestReadConfig tests the function to read the configuration from a file
 func TestReadConfig(t *testing.T) {
-	// Arrange
 	c := NewConfig()
-
-	// Act
 	err := c.WriteConfigToFile("test.toml")
-
-	// Assert
 	if err != nil {
 		t.Errorf("Expected no error, got %s", err)
 	}
 
-	// Act
 	c2, err := ReadConfigFromFile("test.toml")
-
-	// Assert
 	if err != nil {
 		t.Errorf("Expected no error, got %s", err)
 	}

backend/internal/database/db.go

@@ -3,7 +3,6 @@ package database
 import (
 	"embed"
 	"errors"
-	"fmt"
 	"path/filepath"
 	"ttime/internal/types"
 
@@ -20,14 +19,12 @@ type Database interface {
 	PromoteToAdmin(username string) error
 	GetUserId(username string) (int, error)
 	AddProject(name string, description string, username string) error
-	DeleteProject(name 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
 	ChangeUserRole(username string, projectname string, role string) error
-	ChangeUserName(username string, newname string) error
 	GetAllUsersProject(projectname string) ([]UserProjectMember, error)
 	GetAllUsersApplication() ([]string, error)
 	GetProjectsForUser(username string) ([]types.Project, error)
@@ -35,14 +32,8 @@ type Database interface {
 	GetProject(projectId int) (types.Project, error)
 	GetUserRole(username string, projectname string) (string, error)
 	GetWeeklyReport(username string, projectName string, week int) (types.WeeklyReport, error)
-	GetWeeklyReportsUser(username string, projectname string) ([]types.WeeklyReportList, error)
-	GetUnsignedWeeklyReports(projectName string) ([]types.WeeklyReport, error)
 	SignWeeklyReport(reportId int, projectManagerId int) error
 	IsSiteAdmin(username string) (bool, error)
-	IsProjectManager(username string, projectname string) (bool, error)
-	GetProjectTimes(projectName string) (map[string]int, error)
-	UpdateWeeklyReport(projectName string, userName string, week int, developmentTime int, meetingTime int, adminTime int, ownWorkTime int, studyTime int, testingTime int) error
-	RemoveProject(projectname string) error
 }
 
 // This struct is a wrapper type that holds the database connection
@@ -64,27 +55,19 @@ 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) VALUES (?, ?, (SELECT id FROM users WHERE username = ?))"
+const projectInsert = "INSERT INTO projects (name, description, owner_user_id) SELECT ?, ?, id FROM users WHERE username = ?"
 const promoteToAdmin = "INSERT INTO site_admin (admin_id) SELECT id FROM users WHERE username = ?"
 const addWeeklyReport = `WITH UserLookup AS (SELECT id FROM users WHERE username = ?), 
 						ProjectLookup AS (SELECT id FROM projects WHERE name = ?)
 						INSERT INTO weekly_reports (project_id, user_id, week, development_time, meeting_time, admin_time, own_work_time, study_time, testing_time)
 						VALUES ((SELECT id FROM ProjectLookup), (SELECT id FROM UserLookup),?, ?, ?, ?, ?, ?, ?);`
-const addUserToProject = `INSERT OR IGNORE INTO user_roles (user_id, project_id, p_role)
+const addUserToProject = "INSERT INTO user_roles (user_id, project_id, p_role) VALUES (?, ?, ?)" // WIP
-			  				VALUES ((SELECT id FROM users WHERE username = ?),
+const changeUserRole = "UPDATE user_roles SET p_role = ? WHERE user_id = ? AND project_id = ?"
-				  			(SELECT id FROM projects WHERE name = ?), ?)`
+
-const changeUserRole = "UPDATE user_roles SET p_role = ? WHERE user_id = (SELECT id FROM users WHERE username = ?) AND project_id = (SELECT id FROM projects WHERE name = ?)"
 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 deleteProject = `DELETE FROM projects
-						WHERE id = ? AND owner_username = ?`
-
-const isProjectManagerQuery = `SELECT COUNT(*) > 0 FROM user_roles
-								JOIN users ON user_roles.user_id = users.id
-								JOIN projects ON user_roles.project_id = projects.id
-								WHERE users.username = ? AND projects.name = ? AND user_roles.p_role = 'project_manager'`
 
 // DbConnect connects to the database
 func DbConnect(dbpath string) Database {
@@ -142,23 +125,42 @@ func (d *Db) AddWeeklyReport(projectName string, userName string, week int, deve
 }
 
 // AddUserToProject adds a user to a project with a specified role.
-func (d *Db) AddUserToProject(username string, projectname string, role string) error {
+func (d *Db) AddUserToProject(username string, projectname string, role string) error { // WIP
-	_, err := d.Exec(addUserToProject, username, projectname, role)
+	var userid int
-	return err
+	userid, err := d.GetUserId(username)
+	if err != nil {
+		panic(err)
+	}
+
+	var projectid int
+	projectid, err2 := d.GetProjectId(projectname)
+	if err2 != nil {
+		panic(err2)
+	}
+
+	_, err3 := d.Exec(addUserToProject, userid, projectid, role)
+	return err3
 }
 
 // ChangeUserRole changes the role of a user within a project.
 func (d *Db) ChangeUserRole(username string, projectname string, role string) error {
-	// Execute the SQL query to change the user's role
+	// Get the user ID
-	_, err := d.Exec(changeUserRole, role, username, projectname)
+	var userid int
-	return err
+	userid, err := d.GetUserId(username)
-}
+	if err != nil {
+		panic(err)
+	}
 
-// ChangeUserName changes the username of a user.
+	// Get the project ID
-func (d *Db) ChangeUserName(username string, newname string) error {
+	var projectid int
-	// Execute the SQL query to update the username
+	projectid, err2 := d.GetProjectId(projectname)
-	_, err := d.Exec("UPDATE users SET username = ? WHERE username = ?", newname, username)
+	if err2 != nil {
-	return err
+		panic(err2)
+	}
+
+	// Execute the SQL query to change the user's role
+	_, err3 := d.Exec(changeUserRole, role, userid, projectid)
+	return err3
 }
 
 // GetUserRole retrieves the role of a user within a project.
@@ -200,7 +202,6 @@ 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 {
 	tx := d.MustBegin()
-	// Insert the project into the database
 	_, err := tx.Exec(projectInsert, name, description, username)
 	if err != nil {
 		if err := tx.Rollback(); err != nil {
@@ -208,9 +209,7 @@ func (d *Db) AddProject(name string, description string, username string) error
 		}
 		return err
 	}
-
+	_, err = tx.Exec(changeUserRole, "project_manager", username, name)
-	// Add creator to project as project manager
-	_, err = tx.Exec(addUserToProject, username, name, "project_manager")
 	if err != nil {
 		if err := tx.Rollback(); err != nil {
 			return err
@@ -224,21 +223,6 @@ func (d *Db) AddProject(name string, description string, username string) error
 	return err
 }
 
-func (d *Db) DeleteProject(projectID string, username string) error {
-	tx := d.MustBegin()
-
-	_, err := tx.Exec(deleteProject, projectID, username)
-
-	if err != nil {
-		if rollbackErr := tx.Rollback(); rollbackErr != nil {
-			return fmt.Errorf("error rolling back transaction: %v, delete error: %v", rollbackErr, err)
-		}
-		panic(err)
-	}
-
-	return err
-}
-
 func (d *Db) GetAllUsersProject(projectname string) ([]UserProjectMember, error) {
 	// Define the SQL query to fetch users and their roles for a given project
 	query := `
@@ -356,51 +340,6 @@ func (d *Db) SignWeeklyReport(reportId int, projectManagerId int) error {
 	return err
 }
 
-func (d *Db) GetUnsignedWeeklyReports(projectName string) ([]types.WeeklyReport, error) {
-	// Define the SQL query to fetch unsigned reports for a given user
-	query := `
-		SELECT
-			report_id,
-			user_id,
-			project_id,
-			week,
-			development_time,
-			meeting_time,
-			admin_time,
-			own_work_time,
-			study_time,
-			testing_time,
-			signed_by
-		FROM
-			weekly_reports
-		WHERE
-			signed_by IS NULL
-			AND project_id = (SELECT id FROM projects WHERE name = ?)
-	`
-
-	// Execute the query
-	rows, err := d.Queryx(query, projectName)
-	if err != nil {
-		return nil, err
-	}
-	defer rows.Close()
-
-	// Iterate over the rows and populate the result slice
-	var reports []types.WeeklyReport
-	for rows.Next() {
-		var report types.WeeklyReport
-		if err := rows.StructScan(&report); err != nil {
-			return nil, err
-		}
-		reports = append(reports, report)
-	}
-	if err := rows.Err(); err != nil {
-		return nil, err
-	}
-
-	return reports, nil
-}
-
 // IsSiteAdmin checks if a given username is a site admin
 func (d *Db) IsSiteAdmin(username string) (bool, error) {
 	// Define the SQL query to check if the user is a site admin
@@ -463,63 +402,6 @@ func (d *Db) Migrate() error {
 	return nil
 }
 
-// GetWeeklyReportsUser retrieves weekly reports for a specific user and project.
-func (d *Db) GetWeeklyReportsUser(username string, projectName string) ([]types.WeeklyReportList, error) {
-	query := `
-		SELECT
-			wr.week,
-			wr.development_time,
-			wr.meeting_time,
-			wr.admin_time,
-			wr.own_work_time,
-			wr.study_time,
-			wr.testing_time,
-			wr.signed_by
-		FROM
-			weekly_reports wr
-		INNER JOIN
-			users u ON wr.user_id = u.id
-		INNER JOIN
-			projects p ON wr.project_id = p.id
-		WHERE
-			u.username = ? AND p.name = ?
-	`
-
-	var reports []types.WeeklyReportList
-	if err := d.Select(&reports, query, username, projectName); err != nil {
-		return nil, err
-	}
-
-	return reports, nil
-}
-
-// IsProjectManager checks if a given username is a project manager for the specified project
-func (d *Db) IsProjectManager(username string, projectname string) (bool, error) {
-	var manager bool
-	err := d.Get(&manager, isProjectManagerQuery, username, projectname)
-	return manager, err
-}
-
-func (d *Db) UpdateWeeklyReport(projectName string, userName string, week int, developmentTime int, meetingTime int, adminTime int, ownWorkTime int, studyTime int, testingTime int) error {
-	query := `
-		UPDATE weekly_reports
-		SET
-			development_time = ?,
-			meeting_time = ?,
-			admin_time = ?,
-			own_work_time = ?,
-			study_time = ?,
-			testing_time = ?
-		WHERE
-			user_id = (SELECT id FROM users WHERE username = ?)
-			AND project_id = (SELECT id FROM projects WHERE name = ?)
-			AND week = ?
-	`
-
-	_, err := d.Exec(query, developmentTime, meetingTime, adminTime, ownWorkTime, studyTime, testingTime, userName, projectName, week)
-	return err
-}
-
 // MigrateSampleData applies sample data to the database.
 func (d *Db) MigrateSampleData() error {
 	// Insert sample data
@@ -558,46 +440,3 @@ func (d *Db) MigrateSampleData() error {
 
 	return nil
 }
-
-// GetProjectTimes retrieves a map with times per "Activity" for a given project
-func (d *Db) GetProjectTimes(projectName string) (map[string]int, error) {
-	query := `
-        SELECT development_time, meeting_time, admin_time, own_work_time, study_time, testing_time
-        FROM weekly_reports
-        JOIN projects ON weekly_reports.project_id = projects.id
-        WHERE projects.name = ?
-    `
-
-	rows, err := d.DB.Query(query, projectName)
-	if err != nil {
-		return nil, err
-	}
-	defer rows.Close()
-
-	totalTime := make(map[string]int)
-
-	for rows.Next() {
-		var developmentTime, meetingTime, adminTime, ownWorkTime, studyTime, testingTime int
-		if err := rows.Scan(&developmentTime, &meetingTime, &adminTime, &ownWorkTime, &studyTime, &testingTime); err != nil {
-			return nil, err
-		}
-
-		totalTime["development"] += developmentTime
-		totalTime["meeting"] += meetingTime
-		totalTime["admin"] += adminTime
-		totalTime["own_work"] += ownWorkTime
-		totalTime["study"] += studyTime
-		totalTime["testing"] += testingTime
-	}
-
-	if err := rows.Err(); err != nil {
-		return nil, err
-	}
-
-	return totalTime, nil
-}
-
-func (d *Db) RemoveProject(projectname string) error {
-	_, err := d.Exec("DELETE FROM projects WHERE name = ?", projectname)
-	return err
-}

backend/internal/database/db_test.go

@@ -1,12 +1,12 @@
 package database
 
 import (
+	"fmt"
 	"testing"
 )
 
 // Tests are not guaranteed to be sequential
 
-// setupState initializes a database instance with necessary setup for testing
 func setupState() (Database, error) {
 	db := DbConnect(":memory:")
 	err := db.Migrate()
@@ -16,62 +16,11 @@ func setupState() (Database, error) {
 	return db, nil
 }
 
-// This is a more advanced setup that includes more data in the database.
-// This is useful for more complex testing scenarios.
-func setupAdvancedState() (Database, error) {
-	db, err := setupState()
-	if err != nil {
-		return nil, err
-	}
-
-	// Add a user
-	if err = db.AddUser("demouser", "password"); err != nil {
-		return nil, err
-	}
-
-	// Add a project
-	if err = db.AddProject("projecttest", "description", "demouser"); err != nil {
-		return nil, err
-	}
-
-	// Add a weekly report
-	if err = db.AddWeeklyReport("projecttest", "demouser", 1, 1, 1, 1, 1, 1, 1); err != nil {
-		return nil, err
-	}
-
-	return db, nil
-}
-
-// TestDbConnect tests the connection to the database
 func TestDbConnect(t *testing.T) {
 	db := DbConnect(":memory:")
 	_ = db
 }
 
-func TestSetupAdvancedState(t *testing.T) {
-	db, err := setupAdvancedState()
-	if err != nil {
-		t.Error("setupAdvancedState failed:", err)
-	}
-
-	// Check if the user was added
-	if _, err = db.GetUserId("demouser"); err != nil {
-		t.Error("GetUserId failed:", err)
-	}
-
-	// Check if the project was added
-	projects, err := db.GetAllProjects()
-	if err != nil {
-		t.Error("GetAllProjects failed:", err)
-	}
-	if len(projects) != 1 {
-		t.Error("GetAllProjects failed: expected 1, got", len(projects))
-	}
-
-	// To be continued...
-}
-
-// TestDbAddUser tests the AddUser function of the database
 func TestDbAddUser(t *testing.T) {
 	db, err := setupState()
 	if err != nil {
@@ -83,7 +32,6 @@ func TestDbAddUser(t *testing.T) {
 	}
 }
 
-// TestDbGetUserId tests the GetUserID function of the database
 func TestDbGetUserId(t *testing.T) {
 	db, err := setupState()
 	if err != nil {
@@ -104,20 +52,18 @@ func TestDbGetUserId(t *testing.T) {
 	}
 }
 
-// TestDbAddProject tests the AddProject function of the database
 func TestDbAddProject(t *testing.T) {
-	db, err := setupAdvancedState()
+	db, err := setupState()
 	if err != nil {
 		t.Error("setupState failed:", err)
 	}
 
-	err = db.AddProject("test", "description", "demouser")
+	err = db.AddProject("test", "description", "test")
 	if err != nil {
 		t.Error("AddProject failed:", err)
 	}
 }
 
-// TestDbRemoveUser tests the RemoveUser function of the database
 func TestDbRemoveUser(t *testing.T) {
 	db, err := setupState()
 	if err != nil {
@@ -130,7 +76,6 @@ func TestDbRemoveUser(t *testing.T) {
 	}
 }
 
-// TestPromoteToAdmin tests the PromoteToAdmin function of the database
 func TestPromoteToAdmin(t *testing.T) {
 	db, err := setupState()
 	if err != nil {
@@ -148,7 +93,6 @@ func TestPromoteToAdmin(t *testing.T) {
 	}
 }
 
-// TestAddWeeklyReport tests the AddWeeklyReport function of the database
 func TestAddWeeklyReport(t *testing.T) {
 	db, err := setupState()
 	if err != nil {
@@ -171,7 +115,6 @@ func TestAddWeeklyReport(t *testing.T) {
 	}
 }
 
-// TestAddUserToProject tests the AddUseToProject function of the database
 func TestAddUserToProject(t *testing.T) {
 	db, err := setupState()
 	if err != nil {
@@ -199,7 +142,6 @@ func TestAddUserToProject(t *testing.T) {
 	}
 }
 
-// TestChangeUserRole tests the ChangeUserRole function of the database
 func TestChangeUserRole(t *testing.T) {
 	db, err := setupState()
 	if err != nil {
@@ -216,15 +158,20 @@ func TestChangeUserRole(t *testing.T) {
 		t.Error("AddProject failed:", err)
 	}
 
+	err = db.AddUserToProject("testuser", "testproject", "user")
+	if err != nil {
+		t.Error("AddUserToProject failed:", err)
+	}
+
 	role, err := db.GetUserRole("testuser", "testproject")
 	if err != nil {
 		t.Error("GetUserRole failed:", err)
 	}
-	if role != "project_manager" {
+	if role != "user" {
-		t.Error("GetUserRole failed: expected project_manager, got", role)
+		t.Error("GetUserRole failed: expected user, got", role)
 	}
 
-	err = db.ChangeUserRole("testuser", "testproject", "member")
+	err = db.ChangeUserRole("testuser", "testproject", "admin")
 	if err != nil {
 		t.Error("ChangeUserRole failed:", err)
 	}
@@ -233,13 +180,12 @@ func TestChangeUserRole(t *testing.T) {
 	if err != nil {
 		t.Error("GetUserRole failed:", err)
 	}
-	if role != "member" {
+	if role != "admin" {
-		t.Error("GetUserRole failed: expected member, got", role)
+		t.Error("GetUserRole failed: expected admin, got", role)
 	}
 
 }
 
-// TestGetAllUsersProject tests the GetAllUsersProject function of the database
 func TestGetAllUsersProject(t *testing.T) {
 	db, err := setupState()
 	if err != nil {
@@ -306,7 +252,6 @@ func TestGetAllUsersProject(t *testing.T) {
 	}
 }
 
-// TestGetAllUsersApplication tests the GetAllUsersApplicsation function of the database
 func TestGetAllUsersApplication(t *testing.T) {
 	db, err := setupState()
 	if err != nil {
@@ -353,7 +298,6 @@ func TestGetAllUsersApplication(t *testing.T) {
 	}
 }
 
-// TestGetProjectsForUser tests the GetProjectsForUser function of the database
 func TestGetProjectsForUser(t *testing.T) {
 	db, err := setupState()
 	if err != nil {
@@ -394,7 +338,6 @@ func TestGetProjectsForUser(t *testing.T) {
 	}
 }
 
-// TestAddProject tests AddProject function of the database
 func TestAddProject(t *testing.T) {
 	db, err := setupState()
 	if err != nil {
@@ -430,7 +373,6 @@ func TestAddProject(t *testing.T) {
 	}
 }
 
-// TestGetWeeklyReport tests GetWeeklyReport function of the database
 func TestGetWeeklyReport(t *testing.T) {
 	db, err := setupState()
 	if err != nil {
@@ -470,48 +412,6 @@ func TestGetWeeklyReport(t *testing.T) {
 	// Check other fields similarly
 }
 
-func TestGetUnsignedWeeklyReports(t *testing.T) {
-	db, err := setupAdvancedState()
-	if err != nil {
-		t.Error("setupState failed:", err)
-	}
-
-	err = db.AddUser("testuser", "password")
-	if err != nil {
-		t.Error("AddUser failed:", err)
-	}
-
-	err = db.AddUser("testuser1", "password")
-	if err != nil {
-		t.Error("AddUser failed:", err)
-	}
-
-	err = db.AddProject("testproject", "description", "testuser")
-	if err != nil {
-		t.Error("AddProject failed:", err)
-	}
-
-	err = db.AddWeeklyReport("testproject", "testuser", 1, 1, 1, 1, 1, 1, 1)
-	if err != nil {
-		t.Error("AddWeeklyReport failed:", err)
-	}
-
-	err = db.AddWeeklyReport("testproject", "testuser1", 1, 1, 1, 1, 1, 1, 1)
-	if err != nil {
-		t.Error("AddWeeklyReport failed:", err)
-	}
-
-	reports, err := db.GetUnsignedWeeklyReports("testproject")
-	if err != nil {
-		t.Error("GetUnsignedWeeklyReports failed:", err)
-	}
-
-	if reports == nil {
-		t.Error("Expected non-nil reports, got nil")
-	}
-}
-
-// TestSignWeeklyReport tests SignWeeklyReport function of the database
 func TestSignWeeklyReport(t *testing.T) {
 	db, err := setupState()
 	if err != nil {
@@ -564,6 +464,7 @@ func TestSignWeeklyReport(t *testing.T) {
 	if err != nil {
 		t.Error("GetUserId failed:", err)
 	}
+	fmt.Println("Project Manager's ID:", projectManagerID)
 
 	// Sign the report with the project manager
 	err = db.SignWeeklyReport(report.ReportId, projectManagerID)
@@ -583,7 +484,6 @@ func TestSignWeeklyReport(t *testing.T) {
 	}
 }
 
-// TestSignWeeklyReportByAnotherProjectManager tests the scenario where a project manager attempts to sign a weekly report for a user who is not assigned to their project
 func TestSignWeeklyReportByAnotherProjectManager(t *testing.T) {
 	db, err := setupState()
 	if err != nil {
@@ -602,7 +502,7 @@ func TestSignWeeklyReportByAnotherProjectManager(t *testing.T) {
 		t.Error("AddUser failed:", err)
 	}
 
-	// Add project, projectManager is the owner
+	// Add project
 	err = db.AddProject("testproject", "description", "projectManager")
 	if err != nil {
 		t.Error("AddProject failed:", err)
@@ -626,29 +526,17 @@ func TestSignWeeklyReportByAnotherProjectManager(t *testing.T) {
 		t.Error("GetWeeklyReport failed:", err)
 	}
 
-	managerID, err := db.GetUserId("projectManager")
+	anotherManagerID, err := db.GetUserId("projectManager")
 	if err != nil {
 		t.Error("GetUserId failed:", err)
 	}
 
-	err = db.SignWeeklyReport(report.ReportId, managerID)
+	err = db.SignWeeklyReport(report.ReportId, anotherManagerID)
-	if err != nil {
+	if err == nil {
-		t.Error("SignWeeklyReport failed:", err)
+		t.Error("Expected SignWeeklyReport to fail with a project manager who is not in the project, but it didn't")
-	}
-
-	// Retrieve the report again to check if it's signed
-	signedReport, err := db.GetWeeklyReport("testuser", "testproject", 1)
-	if err != nil {
-		t.Error("GetWeeklyReport failed:", err)
-	}
-
-	// Ensure the report is signed by the project manager
-	if *signedReport.SignedBy != managerID {
-		t.Errorf("Expected SignedBy to be %d, got %d", managerID, *signedReport.SignedBy)
 	}
 }
 
-// TestGetProject tests GetProject function of the database
 func TestGetProject(t *testing.T) {
 	db, err := setupState()
 	if err != nil {
@@ -678,290 +566,3 @@ func TestGetProject(t *testing.T) {
 		t.Errorf("Expected Name to be testproject, got %s", project.Name)
 	}
 }
-
-func TestGetWeeklyReportsUser(t *testing.T) {
-	db, err := setupState()
-	if err != nil {
-		t.Error("setupState failed:", err)
-	}
-
-	err = db.AddUser("testuser", "password")
-	if err != nil {
-		t.Error("AddUser failed:", err)
-	}
-
-	err = db.AddProject("testproject", "description", "testuser")
-	if err != nil {
-		t.Error("AddProject failed:", err)
-	}
-
-	err = db.AddWeeklyReport("testproject", "testuser", 1, 1, 1, 1, 1, 1, 1)
-	if err != nil {
-		t.Error("AddWeeklyReport failed:", err)
-	}
-
-	err = db.AddWeeklyReport("testproject", "testuser", 2, 1, 1, 1, 1, 1, 1)
-	if err != nil {
-		t.Error("AddWeeklyReport failed:", err)
-	}
-
-	reports, err := db.GetWeeklyReportsUser("testuser", "testproject")
-	if err != nil {
-		t.Error("GetWeeklyReportsUser failed:", err)
-	}
-
-	// Check if the retrieved reports match the expected values
-	if len(reports) != 2 {
-		t.Errorf("Expected 1 report, got %d", len(reports))
-	}
-}
-
-func TestIsProjectManager(t *testing.T) {
-	db, err := setupState()
-	if err != nil {
-		t.Error("setupState failed:", err)
-	}
-
-	// Add a project manager
-	err = db.AddUser("projectManager", "password")
-	if err != nil {
-		t.Error("AddUser failed:", err)
-	}
-
-	// Add a regular user
-	err = db.AddUser("testuser", "password")
-	if err != nil {
-		t.Error("AddUser failed:", err)
-	}
-
-	// Add project
-	err = db.AddProject("testproject", "description", "projectManager")
-	if err != nil {
-		t.Error("AddProject failed:", err)
-	}
-
-	// Add both regular users as members to the project
-	err = db.AddUserToProject("testuser", "testproject", "member")
-	if err != nil {
-		t.Error("AddUserToProject failed:", err)
-	}
-
-	err = db.AddUserToProject("projectManager", "testproject", "project_manager")
-	if err != nil {
-		t.Error("AddUserToProject failed:", err)
-	}
-
-	// Check if the regular user is not a project manager
-	isManager, err := db.IsProjectManager("testuser", "testproject")
-	if err != nil {
-		t.Error("IsProjectManager failed:", err)
-	}
-	if isManager {
-		t.Error("Expected testuser not to be a project manager, but it is.")
-	}
-
-	// Check if the project manager is indeed a project manager
-	isManager, err = db.IsProjectManager("projectManager", "testproject")
-	if err != nil {
-		t.Error("IsProjectManager failed:", err)
-	}
-	if !isManager {
-		t.Error("Expected projectManager to be a project manager, but it's not.")
-	}
-}
-
-func TestGetProjectTimes(t *testing.T) {
-	// Initialize
-	db, err := setupState()
-	if err != nil {
-		t.Error("setupState failed:", err)
-		return
-	}
-
-	// Create a user
-	user := "TeaUser"
-	password := "Vanilla"
-	err = db.AddUser(user, password)
-	if err != nil {
-		t.Error("AddUser failed:", err)
-		return
-	}
-
-	// Create a project
-	projectName := "ProjectVanilla"
-	projectDescription := "When tea tastes its best"
-	err = db.AddProject(projectName, projectDescription, user) // Fix the variable name here
-	if err != nil {
-		t.Error("AddProject failed:", err)
-		return
-	}
-
-	// Tests the func in db.go
-	totalTime, err := db.GetProjectTimes(projectName)
-	if err != nil {
-		t.Error("GetTotalTimePerActivity failed:", err)
-		return
-	}
-
-	// Check if the totalTime map is not nil
-	if totalTime == nil {
-		t.Error("Expected non-nil totalTime map, got nil")
-		return
-	}
-
-	// Define the expected valeus
-	expectedTotalTime := map[string]int{
-		"development": 0,
-		"meeting":     0,
-		"admin":       0,
-		"own_work":    0,
-		"study":       0,
-		"testing":     0,
-	}
-
-	// Compare the expectedTotalTime with the totalTime retrieved from the database
-	for activity, expectedTime := range expectedTotalTime {
-		if totalTime[activity] != expectedTime {
-			t.Errorf("Expected %s time to be %d, got %d", activity, expectedTime, totalTime[activity])
-		}
-	}
-
-	// Insert some data into the database for different activities
-	err = db.AddWeeklyReport(projectName, user, 1, 1, 3, 2, 1, 4, 5)
-	if err != nil {
-		t.Error("Failed to insert data into the database:", err)
-		return
-	}
-
-	newTotalTime, err := db.GetProjectTimes(projectName)
-	if err != nil {
-		t.Error("GetTotalTimePerActivity failed:", err)
-		return
-	}
-
-	newExpectedTotalTime := map[string]int{
-		"development": 1,
-		"meeting":     3,
-		"admin":       2,
-		"own_work":    1,
-		"study":       4,
-		"testing":     5,
-	}
-
-	for activity, newExpectedTime := range newExpectedTotalTime {
-		if newTotalTime[activity] != newExpectedTime {
-			t.Errorf("Expected %s time to be %d, got %d", activity, newExpectedTime, newTotalTime[activity])
-		}
-	}
-}
-func TestEnsureManagerOfCreatedProject(t *testing.T) {
-	db, err := setupState()
-	if err != nil {
-		t.Error("setupState failed:", err)
-	}
-
-	// Add a user
-	err = db.AddUser("testuser", "password")
-	if err != nil {
-		t.Error("AddUser failed:", err)
-	}
-
-	// Add a project
-	err = db.AddProject("testproject", "description", "testuser")
-	if err != nil {
-		t.Error("AddProject failed:", err)
-	}
-
-	// Set user to a project manager
-	// err = db.AddUserToProject("testuser", "testproject", "project_manager")
-	// if err != nil {
-	// 	t.Error("AddUserToProject failed:", err)
-	// }
-
-	managerState, err := db.IsProjectManager("testuser", "testproject")
-	if err != nil {
-		t.Error("IsProjectManager failed:", err)
-	}
-
-	if !managerState {
-		t.Error("Expected testuser to be a project manager, but it's not.")
-	}
-}
-
-// TestUpdateWeeklyReport tests the UpdateWeeklyReport function of the database
-func TestUpdateWeeklyReport(t *testing.T) {
-	db, err := setupState()
-	if err != nil {
-		t.Error("setupState failed:", err)
-	}
-
-	// Add a user
-	err = db.AddUser("testuser", "password")
-	if err != nil {
-		t.Error("AddUser failed:", err)
-	}
-
-	// Add a project
-	err = db.AddProject("testproject", "description", "testuser")
-	if err != nil {
-		t.Error("AddProject failed:", err)
-	}
-
-	// Add a weekly report
-	err = db.AddWeeklyReport("testproject", "testuser", 1, 1, 1, 1, 1, 1, 1)
-	if err != nil {
-		t.Error("AddWeeklyReport failed:", err)
-	}
-
-	// Update the weekly report
-	err = db.UpdateWeeklyReport("testproject", "testuser", 1, 2, 2, 2, 2, 2, 2)
-	if err != nil {
-		t.Error("UpdateWeeklyReport failed:", err)
-	}
-
-	// Retrieve the updated report
-	updatedReport, err := db.GetWeeklyReport("testuser", "testproject", 1)
-	if err != nil {
-		t.Error("GetWeeklyReport failed:", err)
-	}
-
-	// Check if the report was updated correctly
-	if updatedReport.DevelopmentTime != 2 ||
-		updatedReport.MeetingTime != 2 ||
-		updatedReport.AdminTime != 2 ||
-		updatedReport.OwnWorkTime != 2 ||
-		updatedReport.StudyTime != 2 ||
-		updatedReport.TestingTime != 2 {
-		t.Error("UpdateWeeklyReport failed: report not updated correctly")
-	}
-}
-
-func TestRemoveProject(t *testing.T) {
-	db, err := setupAdvancedState()
-	if err != nil {
-		t.Error("setupState failed:", err)
-	}
-
-	// Promote user to Admin
-	err = db.PromoteToAdmin("demouser")
-	if err != nil {
-		t.Error("PromoteToAdmin failed:", err)
-	}
-
-	// Remove project
-	err = db.RemoveProject("projecttest")
-	if err != nil {
-		t.Error("RemoveProject failed:", err)
-	}
-
-	// Check if the project was removed
-	projects, err := db.GetAllProjects()
-	if err != nil {
-		t.Error("GetAllProjects failed:", err)
-	}
-	if len(projects) != 0 {
-		t.Error("RemoveProject failed: expected 0, got", len(projects))
-	}
-	
-}
-	

backend/internal/database/middleware.go

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

backend/internal/database/migrations/0035_weekly_report.sql

@@ -10,7 +10,6 @@ CREATE TABLE IF NOT EXISTS weekly_reports (
   study_time INTEGER,
   testing_time INTEGER,
   signed_by INTEGER,
-  UNIQUE(user_id, project_id, week),
   FOREIGN KEY (user_id) REFERENCES users(id),
   FOREIGN KEY (project_id) REFERENCES projects(id),
   FOREIGN KEY (signed_by) REFERENCES users(id)

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

@@ -7,8 +7,6 @@ VALUES ("user", "123");
 INSERT OR IGNORE INTO users(username, password)
 VALUES ("user2", "123");
 
-INSERT OR IGNORE INTO site_admin VALUES (1);
-
 INSERT OR IGNORE INTO projects(name,description,owner_user_id)
 VALUES ("projecttest","test project", 1);
 
@@ -35,18 +33,3 @@ VALUES (3,3,"member");
 
 INSERT OR IGNORE INTO user_roles(user_id,project_id,p_role)
 VALUES (2,1,"project_manager");
-
-INSERT OR IGNORE INTO weekly_reports (user_id, project_id, week, development_time, meeting_time, admin_time, own_work_time, study_time, testing_time, signed_by)
-VALUES (2, 1, 12, 20, 10, 5, 30, 15, 10, NULL);
-
-INSERT OR IGNORE INTO weekly_reports (user_id, project_id, week, development_time, meeting_time, admin_time, own_work_time, study_time, testing_time, signed_by)
-VALUES (3, 1, 12, 20, 10, 5, 30, 15, 10, NULL);
-
-INSERT OR IGNORE INTO weekly_reports (user_id, project_id, week, development_time, meeting_time, admin_time, own_work_time, study_time, testing_time, signed_by)
-VALUES (3, 1, 14, 20, 10, 5, 30, 15, 10, NULL);
-
-INSERT OR IGNORE INTO weekly_reports (user_id, project_id, week, development_time, meeting_time, admin_time, own_work_time, study_time, testing_time, signed_by)
-VALUES (3, 2, 12, 20, 10, 5, 30, 15, 10, NULL);
-
-INSERT OR IGNORE INTO weekly_reports (user_id, project_id, week, development_time, meeting_time, admin_time, own_work_time, study_time, testing_time, signed_by)
-VALUES (3, 3, 12, 20, 10, 5, 30, 15, 10, NULL);

backend/internal/handlers/global_state.go

@@ -0,0 +1,50 @@
+package handlers
+
+import (
+	"ttime/internal/database"
+
+	"github.com/gofiber/fiber/v2"
+)
+
+// The actual interface that we will use
+type GlobalState interface {
+	Register(c *fiber.Ctx) error        // To register a new user
+	UserDelete(c *fiber.Ctx) error      // To delete a user
+	Login(c *fiber.Ctx) error           // To get the token
+	LoginRenew(c *fiber.Ctx) error      // To renew the token
+	CreateProject(c *fiber.Ctx) error   // To create a new project
+	GetUserProjects(c *fiber.Ctx) error // To get all projects
+	SubmitWeeklyReport(c *fiber.Ctx) error
+	GetWeeklyReport(c *fiber.Ctx) error
+	SignReport(c *fiber.Ctx) error
+	GetProject(c *fiber.Ctx) error
+	AddUserToProjectHandler(c *fiber.Ctx) error
+	PromoteToAdmin(c *fiber.Ctx) error
+	// GetProject(c *fiber.Ctx) error           // To get a specific project
+	// UpdateProject(c *fiber.Ctx) error        // To update a project
+	// DeleteProject(c *fiber.Ctx) error        // To delete a project
+	// CreateTask(c *fiber.Ctx) error           // To create a new task
+	// GetTasks(c *fiber.Ctx) error             // To get all tasks
+	// GetTask(c *fiber.Ctx) error              // To get a specific task
+	// UpdateTask(c *fiber.Ctx) error           // To update a task
+	// DeleteTask(c *fiber.Ctx) error           // To delete a task
+	// CreateCollection(c *fiber.Ctx) error     // To create a new collection
+	// GetCollections(c *fiber.Ctx) error       // To get all collections
+	// GetCollection(c *fiber.Ctx) error        // To get a specific collection
+	// 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
+}
+
+// "Constructor"
+func NewGlobalState(db database.Database) GlobalState {
+	return &GState{Db: db}
+}
+
+// The global state, which implements all the handlers
+type GState struct {
+	Db database.Database
+}

backend/internal/handlers/global_state_test.go

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

backend/internal/handlers/handlers_project_related.go

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

backend/internal/handlers/handlers_report_related.go

@@ -0,0 +1,116 @@
+package handlers
+
+import (
+	"strconv"
+	"ttime/internal/types"
+
+	"github.com/gofiber/fiber/v2"
+	"github.com/gofiber/fiber/v2/log"
+	"github.com/golang-jwt/jwt/v5"
+)
+
+func (gs *GState) SubmitWeeklyReport(c *fiber.Ctx) error {
+	// Extract the necessary parameters from the token
+	user := c.Locals("user").(*jwt.Token)
+	claims := user.Claims.(jwt.MapClaims)
+	username := claims["name"].(string)
+
+	report := new(types.NewWeeklyReport)
+	if err := c.BodyParser(report); err != nil {
+		log.Info("Error parsing weekly report")
+		return c.Status(400).SendString(err.Error())
+	}
+
+	// Make sure all the fields of the report are valid
+	if report.Week < 1 || report.Week > 52 {
+		log.Info("Invalid week number")
+		return c.Status(400).SendString("Invalid week number")
+	}
+	if report.DevelopmentTime < 0 || report.MeetingTime < 0 || report.AdminTime < 0 || report.OwnWorkTime < 0 || report.StudyTime < 0 || report.TestingTime < 0 {
+		log.Info("Invalid time report")
+		return c.Status(400).SendString("Invalid time report")
+	}
+
+	if err := gs.Db.AddWeeklyReport(report.ProjectName, username, report.Week, report.DevelopmentTime, report.MeetingTime, report.AdminTime, report.OwnWorkTime, report.StudyTime, report.TestingTime); err != nil {
+		log.Info("Error adding weekly report")
+		return c.Status(500).SendString(err.Error())
+	}
+
+	log.Info("Weekly report added")
+	return c.Status(200).SendString("Time report added")
+}
+
+// Handler for retrieving weekly report
+func (gs *GState) GetWeeklyReport(c *fiber.Ctx) error {
+	// Extract the necessary parameters from the request
+	user := c.Locals("user").(*jwt.Token)
+	claims := user.Claims.(jwt.MapClaims)
+	username := claims["name"].(string)
+
+	log.Info("Getting weekly report for: ", username)
+
+	// Extract project name and week from query parameters
+	projectName := c.Query("projectName")
+	week := c.Query("week")
+
+	if projectName == "" || week == "" {
+		log.Info("Missing project name or week number")
+		return c.Status(400).SendString("Missing project name or week number")
+	}
+
+	// Convert week to integer
+	weekInt, err := strconv.Atoi(week)
+	if err != nil {
+		log.Info("Invalid week number")
+		return c.Status(400).SendString("Invalid week number")
+	}
+
+	// Call the database function to get the weekly report
+	report, err := gs.Db.GetWeeklyReport(username, projectName, weekInt)
+	if err != nil {
+		log.Info("Error getting weekly report from db:", err)
+		return c.Status(500).SendString(err.Error())
+	}
+
+	log.Info("Returning weekly report")
+	// Return the retrieved weekly report
+	return c.JSON(report)
+}
+
+type ReportId struct {
+	ReportId int
+}
+
+func (gs *GState) SignReport(c *fiber.Ctx) error {
+	// Extract the necessary parameters from the token
+	user := c.Locals("user").(*jwt.Token)
+	claims := user.Claims.(jwt.MapClaims)
+	projectManagerUsername := claims["name"].(string)
+
+	log.Info("Signing report for: ", projectManagerUsername)
+
+	// Extract report ID from the request query parameters
+	// reportID := c.Query("reportId")
+	rid := new(ReportId)
+	if err := c.BodyParser(rid); err != nil {
+		return err
+	}
+	log.Info("Signing report for: ", rid.ReportId)
+
+	// Get the project manager's ID
+	projectManagerID, err := gs.Db.GetUserId(projectManagerUsername)
+	if err != nil {
+		log.Info("Failed to get project manager ID")
+		return c.Status(500).SendString("Failed to get project manager ID")
+	}
+	log.Info("Project manager ID: ", projectManagerID)
+
+	// Call the database function to sign the weekly report
+	err = gs.Db.SignWeeklyReport(rid.ReportId, projectManagerID)
+	if err != nil {
+		log.Info("Error signing weekly report:", err)
+		return c.Status(500).SendString(err.Error())
+	}
+
+	return c.Status(200).SendString("Weekly report signed successfully")
+}

backend/internal/handlers/handlers_user_related.go

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

backend/internal/handlers/projects/AddUserToProject.go

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

backend/internal/handlers/projects/CreateProject.go

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

backend/internal/handlers/projects/DeleteProject.go

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

backend/internal/handlers/projects/GetProject.go

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

backend/internal/handlers/projects/GetProjectTimes.go

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

backend/internal/handlers/projects/GetUserProject.go

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

backend/internal/handlers/projects/IsProjectManager.go

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

backend/internal/handlers/projects/ListAllUserProjects.go

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

backend/internal/handlers/projects/ProjectRoleChange.go

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

backend/internal/handlers/projects/RemoveProject.go

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

backend/internal/handlers/reports/GetUnsignedReports.go

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

backend/internal/handlers/reports/GetWeeklyReport.go

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

backend/internal/handlers/reports/GetWeeklyReportsUserHandler.go

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

backend/internal/handlers/reports/SignReport.go

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

backend/internal/handlers/reports/SubmitWeeklyReport.go

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

backend/internal/handlers/reports/UpdateWeeklyReport.go

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

backend/internal/handlers/users/ChangeUserName.go

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

backend/internal/handlers/users/GetUsersProjects.go

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

backend/internal/handlers/users/ListAllUsers.go

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

backend/internal/handlers/users/Login.go

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

backend/internal/handlers/users/LoginRenew.go

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

backend/internal/handlers/users/PromoteToAdmin.go

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

backend/internal/handlers/users/Register.go

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

backend/internal/handlers/users/UserDelete.go

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

backend/internal/types/WeeklyReport.go

@@ -20,27 +20,6 @@ type NewWeeklyReport struct {
 	TestingTime int `json:"testingTime"`
 }
 
-type WeeklyReportList struct {
-	// The name of the project, as it appears in the database
-	ProjectName string `json:"projectName" db:"project_name"`
-	// The week number
-	Week int `json:"week" db:"week"`
-	// Total time spent on development
-	DevelopmentTime int `json:"developmentTime" db:"development_time"`
-	// Total time spent in meetings
-	MeetingTime int `json:"meetingTime" db:"meeting_time"`
-	// Total time spent on administrative tasks
-	AdminTime int `json:"adminTime" db:"admin_time"`
-	// Total time spent on personal projects
-	OwnWorkTime int `json:"ownWorkTime" db:"own_work_time"`
-	// Total time spent on studying
-	StudyTime int `json:"studyTime" db:"study_time"`
-	// Total time spent on testing
-	TestingTime int `json:"testingTime" db:"testing_time"`
-	// The project manager who signed it
-	SignedBy *int `json:"signedBy" db:"signed_by"`
-}
-
 type WeeklyReport struct {
 	// The ID of the report
 	ReportId int `json:"reportId" db:"report_id"`
@@ -65,24 +44,3 @@ type WeeklyReport struct {
 	// The project manager who signed it
 	SignedBy *int `json:"signedBy" db:"signed_by"`
 }
-
-type UpdateWeeklyReport struct {
-	// The name of the project, as it appears in the database
-	ProjectName string `json:"projectName"`
-	// The name of the user
-	UserName string `json:"userName"`
-	// The week number
-	Week int `json:"week"`
-	// Total time spent on development
-	DevelopmentTime int `json:"developmentTime"`
-	// Total time spent in meetings
-	MeetingTime int `json:"meetingTime"`
-	// Total time spent on administrative tasks
-	AdminTime int `json:"adminTime"`
-	// Total time spent on personal projects
-	OwnWorkTime int `json:"ownWorkTime"`
-	// Total time spent on studying
-	StudyTime int `json:"studyTime"`
-	// Total time spent on testing
-	TestingTime int `json:"testingTime"`
-}

backend/internal/types/project.go

@@ -13,17 +13,3 @@ type NewProject struct {
 	Name        string `json:"name"`
 	Description string `json:"description"`
 }
-
-// Used to change the role of a user in a project.
-// If name is identical to the name contained in the token, the role can be changed.
-// If the name is different, only a project manager can change the role.
-type RoleChange struct {
-	UserName    string `json:"username"`
-	Role        string `json:"role" tstype:"'project_manager' | 'user'"`
-	Projectname string `json:"projectname"`
-}
-
-type NameChange struct {
-	ID   int    `json:"id" db:"id"`
-	Name string `json:"name" db:"name"`
-}

backend/internal/types/users.go

@@ -32,8 +32,3 @@ type PublicUser struct {
 type Token struct {
 	Token string `json:"token"`
 }
-
-type StrNameChange struct {
-	PrevName string `json:"prevName" db:"prevName"`
-	NewName  string `json:"newName" db:"newName"`
-}

backend/main.go

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

container/Containerfile

@@ -13,6 +13,7 @@ FROM docker.io/golang:alpine as go
 RUN apk add gcompat
 RUN apk add gcc
 RUN apk add musl-dev
+RUN apk add make
 RUN apk add sqlite
 WORKDIR /build
 ADD backend/go.mod backend/go.sum ./
@@ -23,7 +24,9 @@ RUN go mod download
 # Add the source code
 ADD backend .
 
-RUN go build -o server
+RUN make migrate
+
+# RUN go build -o server
 RUN CGO_ENABLED=1 GOOS=linux go build -a -installsuffix cgo -o ./server ./main.go
 
 # Strip the binary for a smaller image
@@ -34,7 +37,6 @@ FROM docker.io/alpine:latest as runner
 RUN adduser -D nonroot
 RUN addgroup nonroot nonroot
 WORKDIR /app
-RUN chown nonroot:nonroot /app
 
 # Copy the frontend SPA build into public
 COPY --from=client /build/dist static
@@ -42,6 +44,9 @@ COPY --from=client /build/dist static
 # Copy the server binary
 COPY --from=go /build/server server
 
+# Copy the database
+COPY --from=go /build/db.sqlite3 db.sqlite3
+
 # Expose port 8080
 EXPOSE 8080
 

frontend/src/API/API.ts

@@ -4,167 +4,50 @@ import {
   User,
   Project,
   NewProject,
-  UserProjectMember,
-  WeeklyReport,
-  StrNameChange,
-  NewProjMember,
 } from "../Types/goTypes";
 
-/**
+// This type of pattern should be hard to misuse
- * Response object returned by API methods.
- */
 export interface APIResponse<T> {
-  /** Indicates whether the API call was successful */
   success: boolean;
-  /** Optional message providing additional information or error description */
   message?: string;
-  /** Optional data returned by the API method */
   data?: T;
 }
 
-/**
+// Note that all protected routes also require a token
- * Interface defining methods that an instance of the API must implement.
+// Defines all the methods that an instance of the API must implement
- */
 interface API {
-  /**
+  /** Register a new user */
-   * Register a new user
-   * @param {NewUser} user The user object to be registered
-   * @returns {Promise<APIResponse<User>>} A promise containing the API response with the user data.
-   */
   registerUser(user: NewUser): Promise<APIResponse<User>>;
-
+  /** Remove a user */
-  /**
-   * Removes a user.
-   * @param {string} username The username of the user to be removed.
-   * @param {string} token The authentication token.
-   * @returns {Promise<APIResponse<User>>} A promise containing the API response with the removed user data.
-   */
   removeUser(username: string, token: string): Promise<APIResponse<User>>;
-
+  /** Login */
-  /**
-   * Check if user is project manager.
-   * @param {string} username The username of the user.
-   * @param {string} projectName The name of the project.
-   * @param {string} token The authentication token.
-   * @returns {Promise<APIResponse<boolean>>} A promise containing the API response indicating if the user is a project manager.
-   */
-  checkIfProjectManager(
-    projectName: string,
-    token: string,
-  ): Promise<APIResponse<boolean>>;
-
-  /** Logs in a user with the provided credentials.
-   * @param {NewUser} NewUser The user object containing username and password.
-   * @returns {Promise<APIResponse<string>>} A promise resolving to an API response with a token.
-   */
   login(NewUser: NewUser): Promise<APIResponse<string>>;
-
+  /** Renew the token */
-  /**
-   *  Renew the token
-   * @param {string} token The current authentication token.
-   * @returns {Promise<APIResponse<string>>} A promise resolving to an API response with a renewed token.
-   */
   renewToken(token: string): Promise<APIResponse<string>>;
-
+  /** Create a project */
-  /** Promote user to admin */
-
-  /** Creates a new project.
-   * @param {NewProject} project The project object containing name and description.
-   * @param {string} token The authentication token.
-   * @returns {Promise<APIResponse<Project>>} A promise resolving to an API response with the created project.
-   */
   createProject(
     project: NewProject,
     token: string,
   ): Promise<APIResponse<Project>>;
-
+  /** Submit a weekly report */
-  /** Submits a weekly report
-   * @param {NewWeeklyReport} weeklyReport The weekly report object.
-   * @param {string} token The authentication token.
-   * @returns {Promise<APIResponse<NewWeeklyReport>>} A promise resolving to an API response with the submitted report.
-   */
   submitWeeklyReport(
-    weeklyReport: NewWeeklyReport,
+    project: NewWeeklyReport,
     token: string,
-  ): Promise<APIResponse<string>>;
+  ): Promise<APIResponse<NewWeeklyReport>>;
-
+  /**Gets a weekly report*/
-  /** Gets a weekly report for a specific user, project and week
-   * @param {string} projectName The name of the project.
-   * @param {string} week The week number.
-   * @param {string} token The authentication token.
-   * @returns {Promise<APIResponse<WeeklyReport>>} A promise resolving to an API response with the retrieved report.
-   */
   getWeeklyReport(
+    username: string,
     projectName: string,
     week: string,
     token: string,
-  ): Promise<APIResponse<WeeklyReport>>;
+  ): Promise<APIResponse<NewWeeklyReport>>;
-
+  /** Gets all the projects of a user*/
-  /**
-   * Returns all the weekly reports for a user in a particular project
-   * The username is derived from the token
-   * @param {string} projectName The name of the project
-   * @param {string} token The token of the user
-   * @returns {APIResponse<WeeklyReport[]>} A list of weekly reports
-   */
-  getWeeklyReportsForUser(
-    projectName: string,
-    token: string,
-  ): Promise<APIResponse<WeeklyReport[]>>;
-
-  /** Gets all the projects of a user
-   * @param {string} token - The authentication token.
-   * @returns {Promise<APIResponse<Project[]>>} A promise containing the API response with the user's projects.
-   */
   getUserProjects(token: string): Promise<APIResponse<Project[]>>;
-
+  /** Gets a project from id*/
-  /** Gets a project by its id.
-   * @param {number} id The id of the project to retrieve.
-   * @returns {Promise<APIResponse<Project>>} A promise resolving to an API response containing the project data.
-   */
   getProject(id: number): Promise<APIResponse<Project>>;
-
-  /** Gets a list of all users.
-   * @param {string} token The authentication token of the requesting user.
-   * @returns {Promise<APIResponse<string[]>>} A promise resolving to an API response containing the list of users.
-   */
-  getAllUsers(token: string): Promise<APIResponse<string[]>>;
-  /** Gets all users in a project from name*/
-  getAllUsersProject(
-    projectName: string,
-    token: string,
-  ): Promise<APIResponse<UserProjectMember[]>>;
-  /**
-   * Changes the username of a user in the database.
-   * @param {StrNameChange} data The object containing the previous and new username.
-   * @param {string} token The authentication token.
-   * @returns {Promise<APIResponse<void>>} A promise resolving to an API response.
-   */
-  changeUserName(
-    data: StrNameChange,
-    token: string,
-  ): Promise<APIResponse<void>>;
-  addUserToProject(
-    user: NewProjMember,
-    token: string,
-  ): Promise<APIResponse<NewProjMember>>;
-
-  removeProject(
-    projectName: string,
-    token: string,
-  ): Promise<APIResponse<string>>;
-
-  /**
-   * Signs a report. Keep in mind that the user which the token belongs to must be
-   * the project manager of the project the report belongs to.
-   *
-   * @param {number} reportId The id of the report to sign
-   * @param {string} token The authentication token
-   */
-  signReport(reportId: number, token: string): Promise<APIResponse<string>>;
 }
 
-/** An instance of the API */
+// Export an instance of the API
 export const api: API = {
   async registerUser(user: NewUser): Promise<APIResponse<User>> {
     try {
@@ -198,51 +81,23 @@ export const api: API = {
     token: string,
   ): Promise<APIResponse<User>> {
     try {
-      const response = await fetch(`/api/userdelete/${username}`, {
+      const response = await fetch("/api/userdelete", {
-        method: "DELETE",
+        method: "POST",
         headers: {
           "Content-Type": "application/json",
           Authorization: "Bearer " + token,
         },
         body: JSON.stringify(username),
       });
-      if (!response.ok) {
-        return { success: false, message: "Could not remove user" };
-      } else {
-        return { success: true };
-      }
-    } catch (e) {
-      return { success: false, message: "Failed to remove user" };
-    }
-  },
-
-  async checkIfProjectManager(
-    projectName: string,
-    token: string,
-  ): Promise<APIResponse<boolean>> {
-    try {
-      const response = await fetch(
-        `/api/checkIfProjectManager/${projectName}`,
-        {
-          method: "GET",
-          headers: {
-            "Content-Type": "application/json",
-            Authorization: "Bearer " + token,
-          },
-        },
-      );
 
       if (!response.ok) {
-        return {
+        return { success: false, message: "Failed to remove user" };
-          success: false,
-          message: "Failed to check if project manager",
-        };
       } else {
-        const data = (await response.json()) as boolean;
+        const data = (await response.json()) as User;
         return { success: true, data };
       }
     } catch (e) {
-      return { success: false, message: "Failed to check if project manager" };
+      return { success: false, message: "Failed to remove user" };
     }
   },
 
@@ -271,30 +126,6 @@ export const api: API = {
     }
   },
 
-  async addUserToProject(
-    user: NewProjMember,
-    token: string,
-  ): Promise<APIResponse<NewProjMember>> {
-    try {
-      const response = await fetch("/api/addUserToProject", {
-        method: "PUT",
-        headers: {
-          "Content-Type": "application/json",
-          Authorization: "Bearer " + token,
-        },
-        body: JSON.stringify(user),
-      });
-
-      if (!response.ok) {
-        return { success: false, message: "Failed to add member" };
-      } else {
-        return { success: true, message: "Added member" };
-      }
-    } catch (e) {
-      return { success: false, message: "Failed to add member" };
-    }
-  },
-
   async renewToken(token: string): Promise<APIResponse<string>> {
     try {
       const response = await fetch("/api/loginrenew", {
@@ -346,7 +177,7 @@ export const api: API = {
   async submitWeeklyReport(
     weeklyReport: NewWeeklyReport,
     token: string,
-  ): Promise<APIResponse<string>> {
+  ): Promise<APIResponse<NewWeeklyReport>> {
     try {
       const response = await fetch("/api/submitWeeklyReport", {
         method: "POST",
@@ -364,8 +195,8 @@ export const api: API = {
         };
       }
 
-      const data = await response.text();
+      const data = (await response.json()) as NewWeeklyReport;
-      return { success: true, message: data };
+      return { success: true, data };
     } catch (e) {
       return {
         success: false,
@@ -375,62 +206,29 @@ export const api: API = {
   },
 
   async getWeeklyReport(
+    username: string,
     projectName: string,
     week: string,
     token: string,
-  ): Promise<APIResponse<WeeklyReport>> {
+  ): Promise<APIResponse<NewWeeklyReport>> {
     try {
-      const response = await fetch(
+      const response = await fetch("/api/getWeeklyReport", {
-        `/api/getWeeklyReport?projectName=${projectName}&week=${week}`,
-        {
-          method: "GET",
-          headers: {
-            "Content-Type": "application/json",
-            Authorization: "Bearer " + token,
-          },
-        },
-      );
-
-      if (!response.ok) {
-        return { success: false, message: "Failed to get weekly report" };
-      } else {
-        const data = (await response.json()) as WeeklyReport;
-        return { success: true, data };
-      }
-    } catch (e) {
-      return { success: false, message: "Failed to get weekly report" };
-    }
-  },
-
-  async getWeeklyReportsForUser(
-    projectName: string,
-    token: string,
-  ): Promise<APIResponse<WeeklyReport[]>> {
-    try {
-      const response = await fetch(`/api/getWeeklyReportsUser/${projectName}`, {
         method: "GET",
         headers: {
           "Content-Type": "application/json",
           Authorization: "Bearer " + token,
         },
+        body: JSON.stringify({ username, projectName, week }),
       });
 
       if (!response.ok) {
-        return {
+        return { success: false, message: "Failed to get weekly report" };
-          success: false,
-          message:
-            "Failed to get weekly reports for project: Response code " +
-            response.status,
-        };
       } else {
-        const data = (await response.json()) as WeeklyReport[];
+        const data = (await response.json()) as NewWeeklyReport;
         return { success: true, data };
       }
     } catch (e) {
-      return {
+      return { success: false, message: "Failed to get weekly report" };
-        success: false,
-        message: "Failed to get weekly reports for project, unknown error",
-      };
     }
   },
 
@@ -455,6 +253,7 @@ export const api: API = {
     }
   },
 
+  // Gets a projet by id, currently untested since we have no javascript-based tests
   async getProject(id: number): Promise<APIResponse<Project>> {
     try {
       const response = await fetch(`/api/project/${id}`, {
@@ -479,138 +278,4 @@ export const api: API = {
       };
     }
   },
-
-  async getAllUsers(token: string): Promise<APIResponse<string[]>> {
-    try {
-      const response = await fetch("/api/users/all", {
-        method: "GET",
-        headers: {
-          "Content-Type": "application/json",
-          Authorization: "Bearer " + token,
-        },
-      });
-
-      if (!response.ok) {
-        return Promise.resolve({
-          success: false,
-          message: "Failed to get users",
-        });
-      } else {
-        const data = (await response.json()) as string[];
-        return Promise.resolve({ success: true, data });
-      }
-    } catch (e) {
-      return Promise.resolve({
-        success: false,
-        message: "API is not ok",
-      });
-    }
-  },
-  //Gets all users in a project
-  async getAllUsersProject(
-    projectName: string,
-    token: string,
-  ): Promise<APIResponse<UserProjectMember[]>> {
-    try {
-      const response = await fetch(`/api/getUsersProject/${projectName}`, {
-        method: "GET",
-        headers: {
-          "Content-Type": "application/json",
-          Authorization: "Bearer " + token,
-        },
-      });
-
-      if (!response.ok) {
-        return Promise.resolve({
-          success: false,
-          message: "Failed to get users",
-        });
-      } else {
-        const data = (await response.json()) as UserProjectMember[];
-        return Promise.resolve({ success: true, data });
-      }
-    } catch (e) {
-      return Promise.resolve({
-        success: false,
-        message: "API is not ok",
-      });
-    }
-  },
-
-  async changeUserName(
-    data: StrNameChange,
-    token: string,
-  ): Promise<APIResponse<void>> {
-    try {
-      const response = await fetch("/api/changeUserName", {
-        method: "PUT",
-        headers: {
-          "Content-Type": "application/json",
-          Authorization: "Bearer " + token,
-        },
-        body: JSON.stringify(data),
-      });
-
-      if (!response.ok) {
-        return { success: false, message: "Failed to change username" };
-      } else {
-        return { success: true };
-      }
-    } catch (e) {
-      return { success: false, message: "Failed to change username" };
-    }
-  },
-
-  async removeProject(
-    projectName: string,
-    token: string,
-  ): Promise<APIResponse<string>> {
-    try {
-      const response = await fetch(`/api/projectdelete/${projectName}`, {
-        method: "DELETE",
-        headers: {
-          "Content-Type": "application/json",
-          Authorization: "Bearer " + token,
-        },
-      });
-
-      if (!response.ok) {
-        return Promise.resolve({
-          success: false,
-          message: "Failed to remove project",
-        });
-      } else {
-        const data = await response.text();
-        return Promise.resolve({ success: true, message: data });
-      }
-    } catch (e) {
-      return Promise.resolve({
-        success: false,
-        message: "Failed to remove project",
-      });
-    }
-  },
-
-  async signReport(
-    reportId: number,
-    token: string,
-  ): Promise<APIResponse<string>> {
-    try {
-      const response = await fetch(`/api/signReport/${reportId}`, {
-        method: "PUT",
-        headers: {
-          "Content-Type": "application/json",
-          Authorization: "Bearer " + token,
-        },
-      });
-
-      if (!response.ok) {
-        return { success: false, message: "Failed to sign report" };
-      } else {
-        return { success: true, message: "Report signed" };
-      }
-    } catch (e) {
-      return { success: false, message: "Failed to sign report" };
-    }
-  },
 };

frontend/src/Components/AddMember.tsx

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

frontend/src/Components/AddProject.tsx

@@ -7,7 +7,7 @@ import Button from "./Button";
 
 /**
  * Tries to add a project to the system
- * @param {Object} props - Project name and description
+ * @param props - Project name and description
  * @returns {boolean} True if created, false if not
  */
 function CreateProject(props: { name: string; description: string }): boolean {
@@ -34,8 +34,8 @@ function CreateProject(props: { name: string; description: string }): boolean {
 }
 
 /**
- * Provides UI for adding a project to the system.
+ * Tries to add a project to the system
- * @returns {JSX.Element} - Returns the component UI for adding a project
+ * @returns {JSX.Element} UI for project adding
  */
 function AddProject(): JSX.Element {
   const [name, setName] = useState("");

frontend/src/Components/AddUserToProject.tsx

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

frontend/src/Components/AllTimeReportsInProject.tsx

@@ -1,36 +1,74 @@
-//Info: This component is used to display all the time reports for a project. It will display the week number,
+import React, { useEffect, useState } from "react";
-//total time spent, and if the report has been signed or not. The user can click on a report to edit it.
+import { NewWeeklyReport } from "../Types/goTypes";
-import { useEffect, useState } from "react";
-import { WeeklyReport } from "../Types/goTypes";
 import { Link, useParams } from "react-router-dom";
-import { api } from "../API/API";
 
-/**
- * Renders a component that displays all the time reports for a specific project.
- * @returns {JSX.Element} representing the component.
- */
 function AllTimeReportsInProject(): JSX.Element {
   const { projectName } = useParams();
-  const [weeklyReports, setWeeklyReports] = useState<WeeklyReport[]>([]);
+  const [weeklyReports, setWeeklyReports] = useState<NewWeeklyReport[]>([]);
+
+  /*   const getWeeklyReports = async (): Promise<void> => {
+    const token = localStorage.getItem("accessToken") ?? "";
+    const response = await api.getWeeklyReports(token);
+    console.log(response);
+    if (response.success) {
+        setWeeklyReports(response.data ?? []);
+    } else {
+        console.error(response.message);
+    }
+}; */
+
+  const getWeeklyReports = async (): Promise<void> => {
+    const report: NewWeeklyReport[] = [
+      {
+        projectName: projectName ?? "",
+        week: 10,
+        developmentTime: 1,
+        meetingTime: 1,
+        adminTime: 1,
+        ownWorkTime: 1,
+        studyTime: 1,
+        testingTime: 1,
+      },
+      {
+        projectName: projectName ?? "",
+        week: 11,
+        developmentTime: 1,
+        meetingTime: 1,
+        adminTime: 1,
+        ownWorkTime: 100,
+        studyTime: 1,
+        testingTime: 1,
+      },
+      {
+        projectName: projectName ?? "",
+        week: 12,
+        developmentTime: 1,
+        meetingTime: 1,
+        adminTime: 1,
+        ownWorkTime: 1,
+        studyTime: 1,
+        testingTime: 1000,
+      },
+      {
+        projectName: projectName ?? "",
+        week: 20,
+        developmentTime: 1,
+        meetingTime: 1,
+        adminTime: 1,
+        ownWorkTime: 1,
+        studyTime: 1,
+        testingTime: 10000,
+      },
+      // Add more reports as needed
+    ];
+    setWeeklyReports(report);
+    await Promise.resolve();
+  };
 
   // Call getProjects when the component mounts
   useEffect(() => {
-    const getWeeklyReports = async (): Promise<void> => {
-      const token = localStorage.getItem("accessToken") ?? "";
-      const response = await api.getWeeklyReportsForUser(
-        projectName ?? "",
-        token,
-      );
-      console.log(response);
-      if (response.success) {
-        setWeeklyReports(response.data ?? []);
-      } else {
-        console.error(response.message);
-      }
-    };
-
     void getWeeklyReports();
-  }, [projectName]);
+  }, []);
 
   return (
     <>
@@ -58,7 +96,7 @@ function AllTimeReportsInProject(): JSX.Element {
               </h1>
               <h1>
                 <span className="font-bold">{"Signed: "}</span>
-                {newWeeklyReport.signedBy ? "YES" : "NO"}
+                YES
               </h1>
             </div>
           </Link>

frontend/src/Components/AllTimeReportsInProjectOtherUser.tsx

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

frontend/src/Components/AuthorizedRoute.tsx

@@ -1,18 +0,0 @@
-import { Navigate } from "react-router-dom";
-import React from "react";
-
-interface AuthorizedRouteProps {
-  children: React.ReactNode;
-  isAuthorized: boolean;
-}
-
-export function AuthorizedRoute({
-  children,
-  isAuthorized,
-}: AuthorizedRouteProps): JSX.Element {
-  if (!isAuthorized) {
-    return <Navigate to="/unauthorized" />;
-  }
-
-  return children as React.ReactElement;
-}

frontend/src/Components/BackButton.tsx

@@ -1,11 +1,5 @@
-//info: Back button component to navigate back to the previous page
 import { useNavigate } from "react-router-dom";
 
-/**
- * Renders a back button component.
- *
- * @returns The JSX element representing the back button.
- */
 function BackButton(): JSX.Element {
   const navigate = useNavigate();
   const goBack = (): void => {

frontend/src/Components/BackgroundAnimation.tsx

@@ -1,10 +1,5 @@
-//info: Background animation component to animate the background of loginpage
 import { useEffect } from "react";
 
-/**
- * Renders a background animation component.
- * This component pre-loads images and starts a background transition animation.
- */
 const BackgroundAnimation = (): JSX.Element => {
   useEffect(() => {
     const images = [

frontend/src/Components/BasicWindow.tsx

@@ -1,16 +1,6 @@
-//info: Basic window component to display content and buttons of a page, inclduing header and footer
-//content to insert is placed in the content prop, and buttons in the buttons prop
 import Header from "./Header";
 import Footer from "./Footer";
 
-/**
- * Renders a basic window component with a header, content, and footer.
- *
- * @param {Object} props - The component props.
- * @param {React.ReactNode} props.content - The content to be rendered in the window.
- * @param {React.ReactNode} props.buttons - The buttons to be rendered in the footer.
- * @returns {JSX.Element} The rendered basic window component.
- */
 function BasicWindow({
   content,
   buttons,

frontend/src/Components/Button.tsx

@@ -1,12 +1,3 @@
-/**
- * Button component to display a button with text and onClick function.
- *
- * @param {Object} props - The component props.
- * @param {string} props.text - The text to display on the button.
- * @param {Function} props.onClick - The function to run when the button is clicked.
- * @param {"submit" | "button" | "reset"} props.type - The type of button.
- * @returns {JSX.Element} The rendered Button component.
- */
 function Button({
   text,
   onClick,

frontend/src/Components/ChangeRoles.tsx

@@ -1,83 +0,0 @@
-import { useState } from "react";
-import { useParams } from "react-router-dom";
-import Button from "./Button";
-
-export default function ChangeRoles(): JSX.Element {
-  const [selectedRole, setSelectedRole] = useState("");
-  const { username } = useParams();
-
-  const handleRoleChange = (
-    event: React.ChangeEvent<HTMLInputElement>,
-  ): void => {
-    setSelectedRole(event.target.value);
-  };
-
-  //   const handleSubmit = async (event: React.FormEvent<HTMLFormElement>) => {
-  //     event.preventDefault();
-
-  //     const response = await api.changeRole(username, selectedRole, token);
-  //     if (response.success) {
-  //       console.log("Role changed successfully");
-  //     } else {
-  //       console.error("Failed to change role:", response.message);
-  //     }
-  //   };
-
-  return (
-    <>
-      <h1 className="font-bold text-[30px] mb-[20px]">
-        Change roll for: {username}
-      </h1>
-      <form
-        className="text-[20px] font-bold border-4 border-black bg-white flex flex-col items-center justify-center min-h-[50vh] h-fit w-[30vw] rounded-3xl content-center overflow-scroll space-y-[10vh] p-[30px]"
-        onSubmit={undefined}
-      >
-        <div className="self-start">
-          <div>
-            <label>
-              <input
-                type="radio"
-                value="System Manager"
-                checked={selectedRole === "System Manager"}
-                onChange={handleRoleChange}
-                className="ml-2 mr-2 mb-6"
-              />
-              System Manager
-            </label>
-          </div>
-          <div>
-            <label>
-              <input
-                type="radio"
-                value="Developer"
-                checked={selectedRole === "Developer"}
-                onChange={handleRoleChange}
-                className="ml-2 mr-2 mb-6"
-              />
-              Developer
-            </label>
-          </div>
-          <div>
-            <label>
-              <input
-                type="radio"
-                value="Tester"
-                checked={selectedRole === "Tester"}
-                onChange={handleRoleChange}
-                className="ml-2 mr-2 mb-6"
-              />
-              Tester
-            </label>
-          </div>
-        </div>
-        <Button
-          text="Save"
-          onClick={(): void => {
-            return;
-          }}
-          type="submit"
-        />
-      </form>
-    </>
-  );
-}

frontend/src/Components/ChangeUsername.tsx

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

frontend/src/Components/CountButton.tsx

@@ -0,0 +1,38 @@
+import { useState, useEffect } from "react";
+
+// Interface for the response from the server
+// This should eventually reside in a dedicated file
+interface CountResponse {
+  pressCount: number;
+}
+
+// Some constants for the button
+const BUTTON_ENDPOINT = "/api/button";
+
+// A simple button that counts how many times it's been pressed
+export function CountButton(): JSX.Element {
+  const [count, setCount] = useState<number>(NaN);
+
+  // useEffect with a [] dependency array runs only once
+  useEffect(() => {
+    async function getCount(): Promise<void> {
+      const response = await fetch(BUTTON_ENDPOINT);
+      const data = (await response.json()) as CountResponse;
+      setCount(data.pressCount);
+    }
+    void getCount();
+  }, []);
+
+  // This is what runs on every button click
+  function press(): void {
+    async function pressPost(): Promise<void> {
+      const response = await fetch(BUTTON_ENDPOINT, { method: "POST" });
+      const data = (await response.json()) as CountResponse;
+      setCount(data.pressCount);
+    }
+    void pressPost();
+  }
+
+  // Return some JSX with the button and associated handler
+  return <button onClick={press}>count is {count}</button>;
+}

frontend/src/Components/DeleteUser.tsx

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

frontend/src/Components/DisplayUnsignedReports.tsx

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

frontend/src/Components/DisplayUserProjects.tsx

@@ -1,65 +0,0 @@
-import { useState, useEffect } from "react";
-import { Project } from "../Types/goTypes";
-import { useNavigate } from "react-router-dom";
-import { api } from "../API/API";
-
-/**
- * Renders a component that displays the projects a user is a part of and links to the projects start-page.
- * @returns The JSX element representing the component.
- */
-function DisplayUserProject(): JSX.Element {
-  const [projects, setProjects] = useState<Project[]>([]);
-  const navigate = useNavigate();
-
-  const getProjects = async (): Promise<void> => {
-    const token = localStorage.getItem("accessToken") ?? "";
-    const response = await api.getUserProjects(token);
-    console.log(response);
-    if (response.success) {
-      setProjects(response.data ?? []);
-    } else {
-      console.error(response.message);
-    }
-  };
-
-  const handleProjectClick = async (projectName: string): Promise<void> => {
-    const token = localStorage.getItem("accessToken") ?? "";
-    const response = await api.checkIfProjectManager(projectName, token);
-    console.log(response.data);
-    if (response.success) {
-      if (response.data === true) {
-        navigate(`/PMProjectPage/${projectName}`);
-      } else {
-        navigate(`/project/${projectName}`);
-      }
-    } else {
-      // handle error
-      console.error(response.message);
-    }
-  };
-
-  // Call getProjects when the component mounts
-  useEffect(() => {
-    void getProjects();
-  }, []);
-
-  return (
-    <>
-      <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) => (
-          <div
-            onClick={() => void handleProjectClick(project.name)}
-            key={project.id}
-          >
-            <h1 className="font-bold underline text-[30px] cursor-pointer">
-              {project.name}
-            </h1>
-          </div>
-        ))}
-      </div>
-    </>
-  );
-}
-
-export default DisplayUserProject;

frontend/src/Components/EditWeeklyReport.tsx

@@ -1,13 +1,9 @@
 import { useState, useEffect } from "react";
-import { WeeklyReport, NewWeeklyReport } from "../Types/goTypes";
+import { NewWeeklyReport } from "../Types/goTypes";
 import { api } from "../API/API";
 import { useNavigate, useParams } from "react-router-dom";
 import Button from "./Button";
 
-/**
- * Renders the component for editing a weekly report.
- * @returns JSX.Element
- */
 export default function GetWeeklyReport(): JSX.Element {
   const [week, setWeek] = useState(0);
   const [developmentTime, setDevelopmentTime] = useState(0);
@@ -18,47 +14,45 @@ export default function GetWeeklyReport(): JSX.Element {
   const [testingTime, setTestingTime] = useState(0);
 
   const token = localStorage.getItem("accessToken") ?? "";
-  const { projectName, fetchedWeek } = useParams<{
+  const username = localStorage.getItem("username") ?? "";
-    projectName: string;
+  const { projectName } = useParams();
-    fetchedWeek: string;
+  const { fetchedWeek } = useParams();
-  }>();
+
-  console.log(projectName, fetchedWeek);
+  const fetchWeeklyReport = async (): Promise<void> => {
+    const response = await api.getWeeklyReport(
+      username,
+      projectName ?? "",
+      fetchedWeek?.toString() ?? "0",
+      token,
+    );
+
+    if (response.success) {
+      const report: NewWeeklyReport = response.data ?? {
+        projectName: "",
+        week: 0,
+        developmentTime: 0,
+        meetingTime: 0,
+        adminTime: 0,
+        ownWorkTime: 0,
+        studyTime: 0,
+        testingTime: 0,
+      };
+
+      setWeek(report.week);
+      setDevelopmentTime(report.developmentTime);
+      setMeetingTime(report.meetingTime);
+      setAdminTime(report.adminTime);
+      setOwnWorkTime(report.ownWorkTime);
+      setStudyTime(report.studyTime);
+      setTestingTime(report.testingTime);
+    } else {
+      console.error("Failed to fetch weekly report:", response.message);
+    }
+  };
 
   useEffect(() => {
-    const fetchWeeklyReport = async (): Promise<void> => {
-      const response = await api.getWeeklyReport(
-        projectName ?? "",
-        fetchedWeek ?? "",
-        token,
-      );
-
-      if (response.success) {
-        const report: WeeklyReport = response.data ?? {
-          reportId: 0,
-          userId: 0,
-          projectId: 0,
-          week: 0,
-          developmentTime: 0,
-          meetingTime: 0,
-          adminTime: 0,
-          ownWorkTime: 0,
-          studyTime: 0,
-          testingTime: 0,
-        };
-        setWeek(report.week);
-        setDevelopmentTime(report.developmentTime);
-        setMeetingTime(report.meetingTime);
-        setAdminTime(report.adminTime);
-        setOwnWorkTime(report.ownWorkTime);
-        setStudyTime(report.studyTime);
-        setTestingTime(report.testingTime);
-      } else {
-        console.error("Failed to fetch weekly report:", response.message);
-      }
-    };
-
     void fetchWeeklyReport();
-  }, [projectName, fetchedWeek, token]);
+  });
 
   const handleNewWeeklyReport = async (): Promise<void> => {
     const newWeeklyReport: NewWeeklyReport = {
@@ -79,7 +73,6 @@ export default function GetWeeklyReport(): JSX.Element {
 
   return (
     <>
-      <h1 className="font-bold text-[30px] mb-[20px]">Edit Time Report</h1>
       <div className="border-4 border-black bg-white flex flex-col justify-start min-h-[65vh] h-fit w-[50vw] rounded-3xl overflow-scroll space-y-[2vh] p-[30px] items-center">
         <form
           onSubmit={(e) => {
@@ -94,10 +87,24 @@ export default function GetWeeklyReport(): JSX.Element {
           }}
         >
           <div className="flex flex-col items-center">
-            <div className="flex flex-col w-1/2 border-b-2 border-black items-center justify-center">
+            <input
-              <h1 className="font-bold text-[30px]"> Week: {week}</h1>
+              className="w-fill h-[5vh] font-sans text-[3vh] pl-[1vw] rounded-full text-center pt-[1vh] pb-[1vh] border-2 border-black"
-            </div>
+              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>
@@ -117,14 +124,9 @@ export default function GetWeeklyReport(): JSX.Element {
                       type="number"
                       min="0"
                       className="border-2 border-black rounded-md text-center w-1/2"
-                      value={developmentTime === 0 ? "" : developmentTime}
+                      value={developmentTime}
                       onChange={(e) => {
-                        if (e.target.value === "") {
+                        setDevelopmentTime(parseInt(e.target.value));
-                          setDevelopmentTime(0);
-                          return;
-                        } else {
-                          setDevelopmentTime(parseInt(e.target.value));
-                        }
                       }}
                       onKeyDown={(event) => {
                         const keyValue = event.key;
@@ -141,14 +143,9 @@ export default function GetWeeklyReport(): JSX.Element {
                       type="number"
                       min="0"
                       className="border-2 border-black rounded-md text-center w-1/2"
-                      value={meetingTime === 0 ? "" : meetingTime}
+                      value={meetingTime}
                       onChange={(e) => {
-                        if (e.target.value === "") {
+                        setMeetingTime(parseInt(e.target.value));
-                          setMeetingTime(0);
-                          return;
-                        } else {
-                          setMeetingTime(parseInt(e.target.value));
-                        }
                       }}
                       onKeyDown={(event) => {
                         const keyValue = event.key;
@@ -165,14 +162,9 @@ export default function GetWeeklyReport(): JSX.Element {
                       type="number"
                       min="0"
                       className="border-2 border-black rounded-md text-center w-1/2"
-                      value={adminTime === 0 ? "" : adminTime}
+                      value={adminTime}
                       onChange={(e) => {
-                        if (e.target.value === "") {
+                        setAdminTime(parseInt(e.target.value));
-                          setAdminTime(0);
-                          return;
-                        } else {
-                          setAdminTime(parseInt(e.target.value));
-                        }
                       }}
                       onKeyDown={(event) => {
                         const keyValue = event.key;
@@ -189,14 +181,9 @@ export default function GetWeeklyReport(): JSX.Element {
                       type="number"
                       min="0"
                       className="border-2 border-black rounded-md text-center w-1/2"
-                      value={ownWorkTime === 0 ? "" : ownWorkTime}
+                      value={ownWorkTime}
                       onChange={(e) => {
-                        if (e.target.value === "") {
+                        setOwnWorkTime(parseInt(e.target.value));
-                          setOwnWorkTime(0);
-                          return;
-                        } else {
-                          setOwnWorkTime(parseInt(e.target.value));
-                        }
                       }}
                       onKeyDown={(event) => {
                         const keyValue = event.key;
@@ -213,14 +200,9 @@ export default function GetWeeklyReport(): JSX.Element {
                       type="number"
                       min="0"
                       className="border-2 border-black rounded-md text-center w-1/2"
-                      value={studyTime === 0 ? "" : studyTime}
+                      value={studyTime}
                       onChange={(e) => {
-                        if (e.target.value === "") {
+                        setStudyTime(parseInt(e.target.value));
-                          setStudyTime(0);
-                          return;
-                        } else {
-                          setStudyTime(parseInt(e.target.value));
-                        }
                       }}
                       onKeyDown={(event) => {
                         const keyValue = event.key;
@@ -237,14 +219,9 @@ export default function GetWeeklyReport(): JSX.Element {
                       type="number"
                       min="0"
                       className="border-2 border-black rounded-md text-center w-1/2"
-                      value={testingTime === 0 ? "" : testingTime}
+                      value={testingTime}
                       onChange={(e) => {
-                        if (e.target.value === "") {
+                        setTestingTime(parseInt(e.target.value));
-                          setTestingTime(0);
-                          return;
-                        } else {
-                          setTestingTime(parseInt(e.target.value));
-                        }
                       }}
                       onKeyDown={(event) => {
                         const keyValue = event.key;

frontend/src/Components/Footer.tsx

@@ -1,13 +1,5 @@
-//info: Footer component to display the footer of a page where the buttons are placed
 import React from "react";
 
-/**
- * Footer component.
- *
- * @param {Object} props - The component props.
- * @param {React.ReactNode} props.children - The children elements to render inside the footer (buttons).
- * @returns {JSX.Element} The rendered footer component.
- */
 function Footer({ children }: { children: React.ReactNode }): JSX.Element {
   return (
     <footer className="bg-white">

frontend/src/Components/GetAllUsers.tsx

@@ -1,35 +0,0 @@
-import { Dispatch, useEffect } from "react";
-import { api } from "../API/API";
-
-/**
- * Gets all usernames in the system and puts them in an array
- * @param props - A setStateAction for the array you want to put users in
- * @returns {void} Nothing
- * @example
- *  const [users, setUsers] = useState<string[]>([]);
- *  GetAllUsers({ setUsersProp: setUsers });
- */
-function GetAllUsers(props: {
-  setUsersProp: Dispatch<React.SetStateAction<string[]>>;
-}): void {
-  const setUsers: Dispatch<React.SetStateAction<string[]>> = props.setUsersProp;
-  useEffect(() => {
-    const fetchUsers = async (): Promise<void> => {
-      try {
-        const token = localStorage.getItem("accessToken") ?? "";
-        const response = await api.getAllUsers(token);
-        if (response.success) {
-          setUsers(response.data ?? []);
-        } else {
-          console.error("Failed to fetch users:", response.message);
-        }
-      } catch (error) {
-        console.error("Error fetching users:", error);
-      }
-    };
-
-    void fetchUsers();
-  }, [setUsers]);
-}
-
-export default GetAllUsers;

frontend/src/Components/GetProjects.tsx

@@ -1,37 +0,0 @@
-import { Dispatch, useEffect } from "react";
-import { Project } from "../Types/goTypes";
-import { api } from "../API/API";
-
-/**
- * Gets all projects that user is a member of
- * @param props - A setStateAction for the array you want to put projects in
- * @returns {void} Nothing
- * @example
- *  const [projects, setProjects] = useState<Project[]>([]);
- *  GetAllUsers({ setProjectsProp: setProjects });
- */
-function GetProjects(props: {
-  setProjectsProp: Dispatch<React.SetStateAction<Project[]>>;
-}): void {
-  const setProjects: Dispatch<React.SetStateAction<Project[]>> =
-    props.setProjectsProp;
-  useEffect(() => {
-    const fetchUsers = async (): Promise<void> => {
-      try {
-        const token = localStorage.getItem("accessToken") ?? "";
-        const response = await api.getUserProjects(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 fetchUsers();
-  }, [setProjects]);
-}
-
-export default GetProjects;

frontend/src/Components/GetUsersInProject.tsx

@@ -1,37 +0,0 @@
-import { Dispatch, useEffect } from "react";
-import { UserProjectMember } from "../Types/goTypes";
-import { api } from "../API/API";
-
-/**
- * Gets all projects that user is a member of
- * @param props - A setStateAction for the array you want to put projects in
- * @returns {void} Nothing
- * @example
- *  const [projects, setProjects] = useState<Project[]>([]);
- *  GetAllUsers({ setProjectsProp: setProjects });
- */
-function GetUsersInProject(props: {
-  projectName: string;
-  setUsersProp: Dispatch<React.SetStateAction<UserProjectMember[]>>;
-}): void {
-  const setUsers: Dispatch<React.SetStateAction<UserProjectMember[]>> =
-    props.setUsersProp;
-  useEffect(() => {
-    const fetchUsers = async (): Promise<void> => {
-      try {
-        const token = localStorage.getItem("accessToken") ?? "";
-        const response = await api.getAllUsersProject(props.projectName, token);
-        if (response.success) {
-          setUsers(response.data ?? []);
-        } else {
-          console.error("Failed to fetch projects:", response.message);
-        }
-      } catch (error) {
-        console.error("Error fetching projects:", error);
-      }
-    };
-    void fetchUsers();
-  }, [props.projectName, setUsers]);
-}
-
-export default GetUsersInProject;

frontend/src/Components/Header.tsx

@@ -1,12 +1,7 @@
-//info: Header component to display the header of the page including the logo and user information where thr user can logout
 import { useState } from "react";
 import { Link } from "react-router-dom";
 import backgroundImage from "../assets/1.jpg";
 
-/**
- * Renders the header component.
- * @returns JSX.Element representing the header component.
- */
 function Header(): JSX.Element {
   const [isOpen, setIsOpen] = useState(false);
 

frontend/src/Components/LoginCheck.tsx

@@ -32,11 +32,16 @@ function LoginCheck(props: {
               prevAuth = 1;
               return prevAuth;
             });
-          } else if (token !== "") {
+          } else if (token !== "" && props.username === "pm") {
             props.setAuthority((prevAuth) => {
               prevAuth = 2;
               return prevAuth;
             });
+          } else if (token !== "" && props.username === "user") {
+            props.setAuthority((prevAuth) => {
+              prevAuth = 3;
+              return prevAuth;
+            });
           }
         } else {
           console.error("Token was undefined");

frontend/src/Components/NewWeeklyReport.tsx

@@ -1,114 +1,71 @@
-//info: New weekly report form component to create a new weekly report to
-//sumbit development time, meeting time, admin time, own work time, study time and testing time
 import { useState } from "react";
 import type { NewWeeklyReport } from "../Types/goTypes";
 import { api } from "../API/API";
 import { useNavigate, useParams } from "react-router-dom";
 import Button from "./Button";
 
-/**
- * Renders a form for creating a new weekly report.
- * @returns The JSX element representing the new weekly report form.
- */
 export default function NewWeeklyReport(): JSX.Element {
   const [week, setWeek] = useState<number>(0);
-  const [developmentTime, setDevelopmentTime] = useState<number>(0);
+  const [developmentTime, setDevelopmentTime] = useState<number>();
-  const [meetingTime, setMeetingTime] = useState<number>(0);
+  const [meetingTime, setMeetingTime] = useState<number>();
-  const [adminTime, setAdminTime] = useState<number>(0);
+  const [adminTime, setAdminTime] = useState<number>();
-  const [ownWorkTime, setOwnWorkTime] = useState<number>(0);
+  const [ownWorkTime, setOwnWorkTime] = useState<number>();
-  const [studyTime, setStudyTime] = useState<number>(0);
+  const [studyTime, setStudyTime] = useState<number>();
-  const [testingTime, setTestingTime] = useState<number>(0);
+  const [testingTime, setTestingTime] = useState<number>();
 
   const { projectName } = useParams();
   const token = localStorage.getItem("accessToken") ?? "";
 
-  const handleNewWeeklyReport = async (): Promise<boolean> => {
+  const handleNewWeeklyReport = async (): Promise<void> => {
     const newWeeklyReport: NewWeeklyReport = {
       projectName: projectName ?? "",
       week: week,
-      developmentTime: developmentTime,
+      developmentTime: developmentTime ?? 0,
-      meetingTime: meetingTime,
+      meetingTime: meetingTime ?? 0,
-      adminTime: adminTime,
+      adminTime: adminTime ?? 0,
-      ownWorkTime: ownWorkTime,
+      ownWorkTime: ownWorkTime ?? 0,
-      studyTime: studyTime,
+      studyTime: studyTime ?? 0,
-      testingTime: testingTime,
+      testingTime: testingTime ?? 0,
     };
 
-    const response = await api.submitWeeklyReport(newWeeklyReport, token);
+    await api.submitWeeklyReport(newWeeklyReport, token);
-    console.log(response);
-    if (response.success) {
-      return true;
-    } else {
-      return false;
-    }
   };
 
   const navigate = useNavigate();
-  // Check if the browser is Chrome or Edge
-  const isChromeOrEdge = /Chrome|Edg/.test(navigator.userAgent);
 
   return (
     <>
       <div className="border-4 border-black bg-white flex flex-col justify-start min-h-[65vh] h-fit w-[50vw] rounded-3xl overflow-scroll space-y-[2vh] p-[30px] items-center">
         <form
           onSubmit={(e) => {
+            if (week === 0) {
+              alert("Please enter a week number");
+              e.preventDefault();
+              return;
+            }
             e.preventDefault();
-            void (async (): Promise<void> => {
+            void handleNewWeeklyReport();
-              if (week === 0 || week > 53 || week < 1) {
+            navigate(-1);
-                alert("Please enter a valid week number");
-                return;
-              }
-
-              const success = await handleNewWeeklyReport();
-              if (!success) {
-                alert(
-                  "A Time Report for this week already exists, please go to the edit page to edit it or change week number.",
-                );
-                return;
-              }
-              alert("Weekly report submitted successfully");
-              navigate(-1);
-            })();
           }}
         >
           <div className="flex flex-col items-center">
-            {isChromeOrEdge ? (
+            <input
-              <input
+              className="w-fill h-[5vh] font-sans text-[3vh] pl-[1vw] rounded-full text-center pt-[1vh] pb-[1vh] border-2 border-black"
-                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"
-                type="week"
+              placeholder="Week"
-                placeholder="Week"
+              onChange={(e) => {
-                onChange={(e) => {
+                const weekNumber = parseInt(e.target.value.split("-W")[1]);
-                  const weekNumber = parseInt(e.target.value.split("-W")[1]);
+                setWeek(weekNumber);
-                  setWeek(weekNumber);
+              }}
-                }}
+              onKeyDown={(event) => {
-                onKeyDown={(event) => {
+                const keyValue = event.key;
-                  const keyValue = event.key;
+                if (!/\d/.test(keyValue) && keyValue !== "Backspace")
-                  if (!/\d/.test(keyValue) && keyValue !== "Backspace")
-                    event.preventDefault();
-                }}
-                onPaste={(event) => {
                   event.preventDefault();
-                }}
+              }}
-              />
+              onPaste={(event) => {
-            ) : (
+                event.preventDefault();
-              <input
+              }}
-                className="w-fill h-[5vh] font-sans text-[3vh] pl-[1vw] rounded-full text-center pt-[1vh] pb-[1vh] border-2 border-black"
+            />
-                type="text"
-                placeholder="Week (Numbers Only)"
-                onChange={(e) => {
-                  const weekNumber = parseInt(e.target.value);
-                  setWeek(weekNumber);
-                }}
-                onKeyDown={(event) => {
-                  const keyValue = event.key;
-                  if (!/\d/.test(keyValue) && keyValue !== "Backspace")
-                    event.preventDefault();
-                }}
-                onPaste={(event) => {
-                  event.preventDefault();
-                }}
-              />
-            )}
             <table className="w-full text-center divide-y divide-x divide-white text-[30px]">
               <thead>
                 <tr>
@@ -128,14 +85,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 === 0 ? "" : developmentTime}
+                      value={developmentTime}
                       onChange={(e) => {
-                        if (e.target.value === "") {
+                        setDevelopmentTime(parseInt(e.target.value));
-                          setDevelopmentTime(0);
-                          return;
-                        } else {
-                          setDevelopmentTime(parseInt(e.target.value));
-                        }
                       }}
                       onKeyDown={(event) => {
                         const keyValue = event.key;
@@ -152,14 +104,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 === 0 ? "" : meetingTime}
+                      value={meetingTime}
                       onChange={(e) => {
-                        if (e.target.value === "") {
+                        setMeetingTime(parseInt(e.target.value));
-                          setMeetingTime(0);
-                          return;
-                        } else {
-                          setMeetingTime(parseInt(e.target.value));
-                        }
                       }}
                       onKeyDown={(event) => {
                         const keyValue = event.key;
@@ -176,14 +123,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 === 0 ? "" : adminTime}
+                      value={adminTime}
                       onChange={(e) => {
-                        if (e.target.value === "") {
+                        setAdminTime(parseInt(e.target.value));
-                          setAdminTime(0);
-                          return;
-                        } else {
-                          setAdminTime(parseInt(e.target.value));
-                        }
                       }}
                       onKeyDown={(event) => {
                         const keyValue = event.key;
@@ -200,14 +142,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 === 0 ? "" : ownWorkTime}
+                      value={ownWorkTime}
                       onChange={(e) => {
-                        if (e.target.value === "") {
+                        setOwnWorkTime(parseInt(e.target.value));
-                          setOwnWorkTime(0);
-                          return;
-                        } else {
-                          setOwnWorkTime(parseInt(e.target.value));
-                        }
                       }}
                       onKeyDown={(event) => {
                         const keyValue = event.key;
@@ -224,14 +161,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 === 0 ? "" : studyTime}
+                      value={studyTime}
                       onChange={(e) => {
-                        if (e.target.value === "") {
+                        setStudyTime(parseInt(e.target.value));
-                          setStudyTime(0);
-                          return;
-                        } else {
-                          setStudyTime(parseInt(e.target.value));
-                        }
                       }}
                       onKeyDown={(event) => {
                         const keyValue = event.key;
@@ -248,14 +180,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 === 0 ? "" : testingTime}
+                      value={testingTime}
                       onChange={(e) => {
-                        if (e.target.value === "") {
+                        setTestingTime(parseInt(e.target.value));
-                          setTestingTime(0);
-                          return;
-                        } else {
-                          setTestingTime(parseInt(e.target.value));
-                        }
                       }}
                       onKeyDown={(event) => {
                         const keyValue = event.key;

frontend/src/Components/OtherUsersTR.tsx

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

frontend/src/Components/PMProjectMenu.tsx

@@ -1,34 +0,0 @@
-import { Link, useParams } from "react-router-dom";
-import { JSX } from "react/jsx-runtime";
-
-function PMProjectMenu(): JSX.Element {
-  const { projectName } = useParams();
-  return (
-    <>
-      <h1 className="font-bold text-[30px] mb-[20px]">{projectName}</h1>
-      <div className="border-4 border-black bg-white flex flex-col items-center justify-center min-h-[65vh] h-fit w-[50vw] rounded-3xl content-center overflow-scroll space-y-[5vh] p-[30px]">
-        <Link to={`/timeReports/${projectName}/`}>
-          <h1 className="font-bold underline text-[30px] cursor-pointer">
-            Your Time Reports
-          </h1>
-        </Link>
-        <Link to={`/newTimeReport/${projectName}`}>
-          <h1 className="font-bold underline text-[30px] cursor-pointer">
-            New Time Report
-          </h1>
-        </Link>
-        <Link to={`/projectMembers/${projectName}`}>
-          <h1 className="font-bold underline text-[30px] cursor-pointer">
-            Statistics
-          </h1>
-        </Link>
-        <Link to={`/unsignedReports/${projectName}`}>
-          <h1 className="font-bold underline text-[30px] cursor-pointer">
-            Unsigned Time Reports
-          </h1>
-        </Link>
-      </div>
-    </>
-  );
-}
-export default PMProjectMenu;

frontend/src/Components/ProjectInfoModal.tsx

@@ -1,79 +0,0 @@
-import { useState } from "react";
-import Button from "./Button";
-import { UserProjectMember } from "../Types/goTypes";
-import GetUsersInProject from "./GetUsersInProject";
-import { Link } from "react-router-dom";
-
-function ProjectInfoModal(props: {
-  isVisible: boolean;
-  projectname: string;
-  onClose: () => void;
-  onClick: (username: string) => void;
-}): JSX.Element {
-  const [users, setUsers] = useState<UserProjectMember[]>([]);
-  GetUsersInProject({ projectName: props.projectname, setUsersProp: setUsers });
-  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-2xl text-center h-[47vh] w-[40] flex flex-col">
-        <div className="pl-20 pr-20">
-          <h1 className="font-bold text-[32px] mb-[20px]">
-            {localStorage.getItem("projectName") ?? ""}
-          </h1>
-          <h2 className="font-bold text-[24px] mb-[20px]">Project members:</h2>
-          <div className="border-2 border-black p-2 rounded-lg text-center overflow-scroll h-[26vh]">
-            <ul className="text-left font-medium space-y-2">
-              <div></div>
-              {users.map((user) => (
-                <li
-                  className="items-start p-1 border-2 border-black rounded-lg bg-orange-200 hover:bg-orange-600 hover:text-slate-100 hover:cursor-pointer"
-                  key={user.Username}
-                  onClick={() => {
-                    props.onClick(user.Username);
-                  }}
-                >
-                  <span>
-                    Name: {user.Username}
-                    <div></div>
-                    Role: {user.UserRole}
-                  </span>
-                </li>
-              ))}
-            </ul>
-          </div>
-        </div>
-        <div className="space-x-16">
-          <Button
-            text={"Delete"}
-            onClick={function (): void {
-              //DELETE PROJECT
-            }}
-            type="button"
-          />
-          <Link to={"/adminProjectAddMember"}>
-            <Button
-              text={"Add Member"}
-              onClick={function (): void {
-                return;
-              }}
-              type="button"
-            />
-          </Link>
-          <Button
-            text={"Close"}
-            onClick={function (): void {
-              props.onClose();
-            }}
-            type="button"
-          />
-        </div>
-      </div>
-    </div>
-  );
-}
-
-export default ProjectInfoModal;

frontend/src/Components/ProjectListAdmin.tsx

@@ -1,81 +0,0 @@
-import { useState } from "react";
-import { NewProject } from "../Types/goTypes";
-import ProjectInfoModal from "./ProjectInfoModal";
-import UserInfoModal from "./UserInfoModal";
-
-/**
- * A list of projects for admin manage projects page, that sets an onClick
- * function for eact project <li> element, which displays a modul with
- * user info.
- * @param props - An array of projects to display
- * @returns {JSX.Element} The project list
- * @example
- * const projects: NewProject[] = [{ name: "Project", description: "New" }];
- * return <ProjectListAdmin projects={projects} />
- */
-
-export function ProjectListAdmin(props: {
-  projects: NewProject[];
-}): JSX.Element {
-  const [projectModalVisible, setProjectModalVisible] = useState(false);
-  const [projectname, setProjectname] = useState("");
-  const [userModalVisible, setUserModalVisible] = useState(false);
-  const [username, setUsername] = useState("");
-
-  const handleClickUser = (username: string): void => {
-    setUsername(username);
-    setUserModalVisible(true);
-  };
-
-  const handleClickProject = (projectname: string): void => {
-    setProjectname(projectname);
-    localStorage.setItem("projectName", projectname);
-    setProjectModalVisible(true);
-  };
-
-  const handleCloseProject = (): void => {
-    setProjectname("");
-    setProjectModalVisible(false);
-  };
-
-  const handleCloseUser = (): void => {
-    setProjectname("");
-    setUserModalVisible(false);
-  };
-
-  return (
-    <>
-      <ProjectInfoModal
-        onClose={handleCloseProject}
-        onClick={handleClickUser}
-        isVisible={projectModalVisible}
-        projectname={projectname}
-      />
-      <UserInfoModal
-        manageMember={true}
-        onClose={handleCloseUser}
-        //TODO: CHANGE TO REMOVE USER FROM PROJECT
-        onDelete={() => {
-          return;
-        }}
-        isVisible={userModalVisible}
-        username={username}
-      />
-      <div>
-        <ul className="font-bold underline text-[30px] cursor-pointer padding">
-          {props.projects.map((project) => (
-            <li
-              className="pt-5"
-              key={project.name}
-              onClick={() => {
-                handleClickProject(project.name);
-              }}
-            >
-              {project.name}
-            </li>
-          ))}
-        </ul>
-      </div>
-    </>
-  );
-}

frontend/src/Components/ProjectMembers.tsx

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

frontend/src/Components/Register.tsx

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

frontend/src/Components/TimePerActivity.tsx

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

frontend/src/Components/TimePerRole.tsx

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

frontend/src/Components/UserInfoModal.tsx

@@ -5,38 +5,23 @@ import UserProjectListAdmin from "./UserProjectListAdmin";
 
 function UserInfoModal(props: {
   isVisible: boolean;
-  manageMember: boolean;
   username: string;
   onClose: () => void;
-  onDelete: (username: string) => void;
 }): JSX.Element {
   if (!props.isVisible) return <></>;
-  const ManageUserOrMember = (check: boolean): JSX.Element => {
+
-    if (check) {
-      return (
-        <Link to="/AdminChangeRole">
-          <p className="mb-[20px] hover:font-bold hover:cursor-pointer underline">
-            (Change Role)
-          </p>
-        </Link>
-      );
-    }
-    return (
-      <Link to="/AdminChangeUserName">
-        <p className="mb-[20px] hover:font-bold hover:cursor-pointer underline">
-          (Change Username)
-        </p>
-      </Link>
-    );
-  };
   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 flex flex-col">
+      <div className="border-4 border-black bg-white p-2 rounded-lg text-center">
         <p className="font-bold text-[30px]">{props.username}</p>
-        {ManageUserOrMember(props.manageMember)}
+        <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:
@@ -49,13 +34,7 @@ function UserInfoModal(props: {
           <Button
             text={"Delete"}
             onClick={function (): void {
-              if (
+              DeleteUser({ usernameToDelete: props.username });
-                window.confirm("Are you sure you want to delete this user?")
-              ) {
-                DeleteUser({
-                  usernameToDelete: props.username,
-                });
-              }
             }}
             type="button"
           />

frontend/src/Components/UserListAdmin.tsx

@@ -1,6 +1,13 @@
 import { useState } from "react";
+import { PublicUser } from "../Types/goTypes";
 import UserInfoModal from "./UserInfoModal";
-import DeleteUser from "./DeleteUser";
+
+/**
+ * The props for the UserProps component
+ */
+interface UserProps {
+  users: PublicUser[];
+}
 
 /**
  * A list of users for admin manage users page, that sets an onClick
@@ -13,7 +20,7 @@ import DeleteUser from "./DeleteUser";
  * return <UserList users={users} />;
  */
 
-export function UserListAdmin(props: { users: string[] }): JSX.Element {
+export function UserListAdmin(props: UserProps): JSX.Element {
   const [modalVisible, setModalVisible] = useState(false);
   const [username, setUsername] = useState("");
 
@@ -30,9 +37,7 @@ export function UserListAdmin(props: { users: string[] }): JSX.Element {
   return (
     <>
       <UserInfoModal
-        manageMember={false}
         onClose={handleClose}
-        onDelete={() => DeleteUser}
         isVisible={modalVisible}
         username={username}
       />
@@ -41,12 +46,12 @@ export function UserListAdmin(props: { users: string[] }): JSX.Element {
           {props.users.map((user) => (
             <li
               className="pt-5"
-              key={user}
+              key={user.userId}
               onClick={() => {
-                handleClick(user);
+                handleClick(user.username);
               }}
             >
-              {user}
+              {user.username}
             </li>
           ))}
         </ul>

frontend/src/Components/UserProjectMenu.tsx

@@ -1,32 +0,0 @@
-//info: User project menu component to display the user project menu where the user can navigate to
-//existing time reports in a project and create a new time report
-import { useParams, Link } from "react-router-dom";
-import { JSX } from "react/jsx-runtime";
-
-/**
- * Renders the user project menu component.
- *
- * @returns JSX.Element representing the user project menu.
- */
-function UserProjectMenu(): JSX.Element {
-  const { projectName } = useParams();
-
-  return (
-    <>
-      <h1 className="font-bold text-[30px] mb-[20px]">{projectName}</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={`/timeReports/${projectName}/`}>
-          <h1 className="font-bold underline text-[30px] cursor-pointer">
-            Your Time Reports
-          </h1>
-        </Link>
-        <Link to={`/newTimeReport/${projectName}`}>
-          <h1 className="font-bold underline text-[30px] cursor-pointer">
-            New Time Report
-          </h1>
-        </Link>
-      </div>
-    </>
-  );
-}
-export default UserProjectMenu;

frontend/src/Components/ViewOtherTimeReport.tsx

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

frontend/src/Pages/AdminPages/AdminManageProjects.tsx

@@ -2,22 +2,9 @@ import { Link } from "react-router-dom";
 import BackButton from "../../Components/BackButton";
 import BasicWindow from "../../Components/BasicWindow";
 import Button from "../../Components/Button";
-import { ProjectListAdmin } from "../../Components/ProjectListAdmin";
-import { Project } from "../../Types/goTypes";
-import GetProjects from "../../Components/GetProjects";
-import { useState } from "react";
 
 function AdminManageProjects(): JSX.Element {
-  const [projects, setProjects] = useState<Project[]>([]);
+  const content = <></>;
-  GetProjects({ setProjectsProp: setProjects });
-  const content = (
-    <>
-      <h1 className="font-bold text-[30px] mb-[20px]">Manage Projects</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]">
-        <ProjectListAdmin projects={projects} />
-      </div>
-    </>
-  );
 
   const buttons = (
     <>

frontend/src/Pages/AdminPages/AdminManageUsers.tsx

@@ -2,13 +2,15 @@ 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 { useNavigate } from "react-router-dom";
-import GetAllUsers from "../../Components/GetAllUsers";
-import { useState } from "react";
 
 function AdminManageUsers(): JSX.Element {
-  const [users, setUsers] = useState<string[]>([]);
+  //TODO: Change so that it reads users from database
-  GetAllUsers({ setUsersProp: setUsers });
+  const users: PublicUser[] = [];
+  for (let i = 1; i <= 20; i++) {
+    users.push({ userId: "id" + i, username: "Example User " + i });
+  }
 
   const navigate = useNavigate();
 

frontend/src/Pages/AdminPages/AdminProjectAddMember.tsx

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

frontend/src/Pages/AdminPages/AdminProjectChangeUserRole.tsx

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

frontend/src/Pages/AdminPages/AdminProjectManageMembers.tsx

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

frontend/src/Pages/AdminPages/AdminProjectPage.tsx

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

frontend/src/Pages/AdminPages/AdminProjectStatistics.tsx

@@ -1,12 +1,18 @@
-import BackButton from "../../Components/BackButton";
 import BasicWindow from "../../Components/BasicWindow";
+import Button from "../../Components/Button";
 
 function AdminProjectStatistics(): JSX.Element {
   const content = <></>;
 
   const buttons = (
     <>
-      <BackButton />
+      <Button
+        text="Back"
+        onClick={(): void => {
+          return;
+        }}
+        type="button"
+      />
     </>
   );
 

frontend/src/Pages/AdminPages/AdminProjectViewMemberInfo.tsx

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

frontend/src/Pages/App.tsx

@@ -11,6 +11,8 @@ function App(): JSX.Element {
     if (authority === 1) {
       navigate("/admin");
     } else if (authority === 2) {
+      navigate("/pm");
+    } else if (authority === 3) {
       navigate("/yourProjects");
     }
   }, [authority, navigate]);

frontend/src/Pages/LoginPage.css

@@ -4,23 +4,23 @@ body{
 
 @keyframes backgroundTransition {
     0% {
-        background-image: url('../assets/1.jpg');
+        background-image: url('src/assets/1.jpg');
         animation-timing-function: ease-out;
     }
     25% {
-        background-image: url('../assets/2.jpg');
+        background-image: url('src/assets/2.jpg');
         animation-timing-function: ease-in;
     }
     50% {
-        background-image: url('../assets/3.jpg');
+        background-image: url('src/assets/3.jpg');
         animation-timing-function: ease-out;
     }
     75% {
-        background-image: url('../assets/4.jpg');
+        background-image: url('src/assets/4.jpg');
         animation-timing-function: ease-in;
     }
     100% {
-        background-image: url('../assets/1.jpg');
+        background-image: url('src/assets/1.jpg');
         animation-timing-function: ease-out;
     }
 }

frontend/src/Pages/ProjectManagerPages/PMChangeRole.tsx

@@ -1,16 +1,19 @@
 import BasicWindow from "../../Components/BasicWindow";
+import Button from "../../Components/Button";
 import BackButton from "../../Components/BackButton";
-import ChangeRoles from "../../Components/ChangeRoles";
 
 function ChangeRole(): JSX.Element {
-  const content = (
+  const content = <></>;
-    <>
-      <ChangeRoles />
-    </>
-  );
 
   const buttons = (
     <>
+      <Button
+        text="Save"
+        onClick={(): void => {
+          return;
+        }}
+        type="button"
+      />
       <BackButton />
     </>
   );

frontend/src/Pages/ProjectManagerPages/PMOtherUsersTR.tsx

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

frontend/src/Pages/ProjectManagerPages/PMProjectMembers.tsx

@@ -1,20 +1,14 @@
 import BasicWindow from "../../Components/BasicWindow";
 import Button from "../../Components/Button";
 import BackButton from "../../Components/BackButton";
-import { Link, useParams } from "react-router-dom";
+import { Link } from "react-router-dom";
-import ProjectMembers from "../../Components/ProjectMembers";
 
 function PMProjectMembers(): JSX.Element {
-  const { projectName } = useParams();
+  const content = <></>;
-  const content = (
-    <>
-      <ProjectMembers />
-    </>
-  );
 
   const buttons = (
     <>
-      <Link to={`/PMtimeactivity/${projectName}`}>
+      <Link to="/PM-time-activity">
         <Button
           text="Time / Activity"
           onClick={(): void => {
@@ -23,6 +17,15 @@ function PMProjectMembers(): JSX.Element {
           type={"button"}
         />
       </Link>
+      <Link to="/PM-time-role">
+        <Button
+          text="Time / Role"
+          onClick={(): void => {
+            return;
+          }}
+          type={"button"}
+        />
+      </Link>
       <BackButton />
     </>
   );

frontend/src/Pages/ProjectManagerPages/PMProjectPage.tsx

@@ -1,21 +1,36 @@
+import { Link } from "react-router-dom";
 import BasicWindow from "../../Components/BasicWindow";
 import { JSX } from "react/jsx-runtime";
-import PMProjectMenu from "../../Components/PMProjectMenu";
-import BackButton from "../../Components/BackButton";
 
 function PMProjectPage(): JSX.Element {
   const content = (
     <>
-      <PMProjectMenu />
+      <h1 className="font-bold text-[30px] mb-[20px]">ProjectNameExample</h1>
+      <div className="border-4 border-black bg-white flex flex-col items-center justify-center min-h-[65vh] h-fit w-[50vw] rounded-3xl content-center overflow-scroll space-y-[5vh] p-[30px]">
+        <Link to="/project-page">
+          <h1 className="font-bold underline text-[30px] cursor-pointer">
+            Your Time Reports
+          </h1>
+        </Link>
+        <Link to="/new-time-report">
+          <h1 className="font-bold underline text-[30px] cursor-pointer">
+            New Time Report
+          </h1>
+        </Link>
+        <Link to="/project-members">
+          <h1 className="font-bold underline text-[30px] cursor-pointer">
+            Statistics
+          </h1>
+        </Link>
+        <Link to="/PM-unsigned-reports">
+          <h1 className="font-bold underline text-[30px] cursor-pointer">
+            Unsigned Time Reports
+          </h1>
+        </Link>
+      </div>
     </>
   );
 
-  const buttons = (
+  return <BasicWindow content={content} buttons={undefined} />;
-    <>
-      <BackButton />
-    </>
-  );
-
-  return <BasicWindow content={content} buttons={buttons} />;
 }
 export default PMProjectPage;

frontend/src/Pages/ProjectManagerPages/PMTotalTimeActivity.tsx

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

frontend/src/Pages/ProjectManagerPages/PMTotalTimeRole.tsx

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

frontend/src/Pages/ProjectManagerPages/PMUnsignedReports.tsx

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