.gitignore

@@ -9,7 +9,6 @@ bin
 database.txt
 plantuml.jar
 db.sqlite3
-db.sqlite3-journal
 diagram.puml
 backend/*.png
 backend/*.jpg

Justfile

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

backend/Makefile

@@ -131,11 +131,3 @@ install-just:
 .PHONY: types
 types:
 	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/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,13 +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)
 	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)
-	
-
 }
 
 // This struct is a wrapper type that holds the database connection
@@ -63,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 {
@@ -141,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.
@@ -199,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 {
@@ -207,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
@@ -223,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 := `
@@ -417,43 +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
-}
-
 // MigrateSampleData applies sample data to the database.
 func (d *Db) MigrateSampleData() error {
 	// Insert sample data
@@ -492,41 +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
-}

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,7 +412,6 @@ func TestGetWeeklyReport(t *testing.T) {
 	// Check other fields similarly
 }
 
-// TestSignWeeklyReport tests SignWeeklyReport function of the database
 func TestSignWeeklyReport(t *testing.T) {
 	db, err := setupState()
 	if err != nil {
@@ -523,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)
@@ -542,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 {
@@ -561,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)
@@ -585,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 {
@@ -637,213 +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.")
-	}
-}

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

@@ -33,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

@@ -20,14 +20,23 @@ type GlobalState interface {
 	GetProject(c *fiber.Ctx) error
 	AddUserToProjectHandler(c *fiber.Ctx) error
 	PromoteToAdmin(c *fiber.Ctx) error
-	GetWeeklyReportsUserHandler(c *fiber.Ctx) error
+	// GetProject(c *fiber.Ctx) error           // To get a specific project
-	IsProjectManagerHandler(c *fiber.Ctx) error
+	// UpdateProject(c *fiber.Ctx) error        // To update a project
-	DeleteProject(c *fiber.Ctx) error       // To delete a project // WIP
+	// 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
-	ChangeUserName(c *fiber.Ctx) error      // WIP
-	GetAllUsersProject(c *fiber.Ctx) error  // WIP
 }
 
 // "Constructor"

backend/internal/handlers/handlers_project_related.go

@@ -30,18 +30,6 @@ func (gs *GState) CreateProject(c *fiber.Ctx) error {
 	return c.Status(200).SendString("Project added")
 }
 
-func (gs *GState) DeleteProject(c *fiber.Ctx) error {
-
-	projectID := c.Params("projectID")
-	username := c.Params("username")
-
-	if err := gs.Db.DeleteProject(projectID, username); err != nil {
-		return c.Status(500).SendString((err.Error()))
-	}
-
-	return c.Status(200).SendString("Project deleted")
-}
-
 // GetUserProjects returns all projects that the user is a member of
 func (gs *GState) GetUserProjects(c *fiber.Ctx) error {
 	// First we get the username from the token
@@ -61,32 +49,13 @@ func (gs *GState) GetUserProjects(c *fiber.Ctx) error {
 
 // ProjectRoleChange is a handler that changes a user's role within a project
 func (gs *GState) ProjectRoleChange(c *fiber.Ctx) error {
-
-	//check token and get username of current user
-	user := c.Locals("user").(*jwt.Token)
-	claims := user.Claims.(jwt.MapClaims)
-	username := claims["name"].(string)
-
 	// Extract the necessary parameters from the request
-	data := new(types.RoleChange)
+	username := c.Params("username")
-	if err := c.BodyParser(data); err != nil {
+	projectName := c.Params("projectName")
-		log.Info("error parsing username, project or role")
+	role := c.Params("role")
-		return c.Status(400).SendString(err.Error())
-	}
-
-	log.Info("Changing role for user: ", username, " in project: ", data.Projectname, " to: ", data.Role)
-
-	// Dubble diping and checcking if current user is
-	if ismanager, err := gs.Db.IsProjectManager(username, data.Projectname); err != nil {
-		log.Warn("Error checking if projectmanager:", err)
-		return c.Status(500).SendString(err.Error())
-	} else if !ismanager {
-		log.Warn("User is not projectmanager")
-		return c.Status(401).SendString("User is not projectmanager")
-	}
 
 	// Change the user's role within the project in the database
-	if err := gs.Db.ChangeUserRole(username, data.Projectname, data.Role); err != nil {
+	if err := gs.Db.ChangeUserRole(username, projectName, role); err != nil {
 		return c.Status(500).SendString(err.Error())
 	}
 
@@ -131,31 +100,6 @@ func (gs *GState) ListAllUsersProject(c *fiber.Ctx) error {
 		return c.Status(400).SendString("No project name provided")
 	}
 
-	// Get the user token
-	userToken := c.Locals("user").(*jwt.Token)
-	claims := userToken.Claims.(jwt.MapClaims)
-	username := claims["name"].(string)
-
-	// Check if the user is a project manager for the specified project
-	isManager, err := gs.Db.IsProjectManager(username, projectName)
-	if err != nil {
-		log.Info("Error checking project manager status:", err)
-		return c.Status(500).SendString(err.Error())
-	}
-
-	// If the user is not a project manager, check if the user is a site admin
-	if !isManager {
-		isAdmin, err := gs.Db.IsSiteAdmin(username)
-		if err != nil {
-			log.Info("Error checking admin status:", err)
-			return c.Status(500).SendString(err.Error())
-		}
-		if !isAdmin {
-			log.Info("User is neither a project manager nor a site admin:", username)
-			return c.Status(403).SendString("User is neither a project manager nor a site admin")
-		}
-	}
-
 	// Get all users associated with the project from the database
 	users, err := gs.Db.GetAllUsersProject(projectName)
 	if err != nil {
@@ -210,26 +154,3 @@ func (gs *GState) AddUserToProjectHandler(c *fiber.Ctx) error {
 	log.Info("User added to project successfully:", requestData.Username)
 	return c.SendStatus(fiber.StatusOK)
 }
-
-// IsProjectManagerHandler is a handler that checks if a user is a project manager for a given project
-func (gs *GState) IsProjectManagerHandler(c *fiber.Ctx) error {
-	// Get the username from the token
-	user := c.Locals("user").(*jwt.Token)
-	claims := user.Claims.(jwt.MapClaims)
-	username := claims["name"].(string)
-
-	// Extract necessary parameters from the request query string
-	projectName := c.Params("projectName")
-
-	log.Info("Checking if user ", username, " is a project manager for project ", projectName)
-
-	// Check if the user is a project manager for the specified project
-	isManager, err := gs.Db.IsProjectManager(username, projectName)
-	if err != nil {
-		log.Info("Error checking project manager status:", err)
-		return c.Status(500).SendString(err.Error())
-	}
-
-	// Return the result as JSON
-	return c.JSON(fiber.Map{"isProjectManager": isManager})
-}

backend/internal/handlers/handlers_report_related.go

@@ -32,7 +32,7 @@ func (gs *GState) SubmitWeeklyReport(c *fiber.Ctx) error {
 	}
 
 	if err := gs.Db.AddWeeklyReport(report.ProjectName, username, report.Week, report.DevelopmentTime, report.MeetingTime, report.AdminTime, report.OwnWorkTime, report.StudyTime, report.TestingTime); err != nil {
-		log.Info("Error adding weekly report to db:", err)
+		log.Info("Error adding weekly report")
 		return c.Status(500).SendString(err.Error())
 	}
 
@@ -114,30 +114,3 @@ func (gs *GState) SignReport(c *fiber.Ctx) error {
 
 	return c.Status(200).SendString("Weekly report signed successfully")
 }
-
-// GetWeeklyReportsUserHandler retrieves all weekly reports for a user in a specific project
-func (gs *GState) GetWeeklyReportsUserHandler(c *fiber.Ctx) error {
-	// Extract the necessary parameters from the token
-	user := c.Locals("user").(*jwt.Token)
-	claims := user.Claims.(jwt.MapClaims)
-	username := claims["name"].(string)
-
-	// Extract necessary (path) parameters from the request
-	projectName := c.Params("projectName")
-
-	// TODO: Here we need to check whether the user is a member of the project
-	// If not, we should return an error. On the other hand, if the user not a member,
-	// the returned list of reports will (should) allways be empty.
-
-	// Retrieve weekly reports for the user in the project from the database
-	reports, err := gs.Db.GetWeeklyReportsUser(username, projectName)
-	if err != nil {
-		log.Error("Error getting weekly reports for user:", username, "in project:", projectName, ":", err)
-		return c.Status(500).SendString(err.Error())
-	}
-
-	log.Info("Returning weekly reports for user:", username, "in project:", projectName)
-
-	// Return the list of reports as JSON
-	return c.JSON(reports)
-}

backend/internal/handlers/handlers_user_related.go

@@ -101,15 +101,10 @@ func (gs *GState) Login(c *fiber.Ctx) error {
 		return c.SendStatus(fiber.StatusUnauthorized)
 	}
 
-	isAdmin, err := gs.Db.IsSiteAdmin(u.Username)
-	if err != nil {
-		log.Info("Error checking admin status:", err)
-		return c.Status(500).SendString(err.Error())
-	}
 	// Create the Claims
 	claims := jwt.MapClaims{
 		"name":  u.Username,
-		"admin": isAdmin,
+		"admin": false,
 		"exp":   time.Now().Add(time.Hour * 72).Unix(),
 	}
 
@@ -187,28 +182,14 @@ func (gs *GState) ListAllUsers(c *fiber.Ctx) error {
 	return c.JSON(users)
 }
 
-func (gs *GState) GetAllUsersProject(c *fiber.Ctx) error {
-	// Get all users from a project
-	projectName := c.Params("projectName")
-	users, err := gs.Db.GetAllUsersProject(projectName)
-	if err != nil {
-		log.Info("Error getting users from project:", err) // Debug print
-		return c.Status(500).SendString(err.Error())
-	}
-
-	log.Info("Returning all users")
-	// Return the list of users as JSON
-	return c.JSON(users)
-}
-
 //	@Summary		PromoteToAdmin
 //	@Description	promote chosen user to admin
 //	@Tags			User
 //	@Accept			json
 //	@Produce		plain
 //	@Param			NewUser	body		types.NewUser	true	"user info"
-// @Success		200		{json}		json			"Successfully promoted user"
+//	@Success		200		{json}		json			"Successfully prometed user"
-// @Failure		400		{string}	string			"Bad request"
+//	@Failure		400		{string}	string			"bad request"
 //	@Failure		401		{string}	string			"Unauthorized"
 //	@Failure		500		{string}	string			"Internal server error"
 //	@Router			/promoteToAdmin [post]
@@ -233,37 +214,3 @@ func (gs *GState) PromoteToAdmin(c *fiber.Ctx) error {
 	// Return a success message
 	return c.SendStatus(fiber.StatusOK)
 }
-
-// ChangeUserName changes a user's username in the database
-func (gs *GState) ChangeUserName(c *fiber.Ctx) error {
-	// Check token and get username of current user
-	user := c.Locals("user").(*jwt.Token)
-	claims := user.Claims.(jwt.MapClaims)
-	adminUsername := claims["name"].(string)
-	log.Info(adminUsername)
-
-	// Extract the necessary parameters from the request
-	data := new(types.StrNameChange)
-	if err := c.BodyParser(data); err != nil {
-		log.Info("Error parsing username")
-		return c.Status(400).SendString(err.Error())
-	}
-
-	// Check if the current user is an admin
-	isAdmin, err := gs.Db.IsSiteAdmin(adminUsername)
-	if err != nil {
-		log.Warn("Error checking if admin:", err)
-		return c.Status(500).SendString(err.Error())
-	} else if !isAdmin {
-		log.Warn("Tried changing name when not admin")
-		return c.Status(401).SendString("You cannot change name unless you are an admin")
-	}
-
-	// Change the user's name in the database
-	if err := gs.Db.ChangeUserName(data.PrevName, data.NewName); err != nil {
-		return c.Status(500).SendString(err.Error())
-	}
-
-	// Return a success message
-	return c.SendStatus(fiber.StatusOK)
-}

backend/internal/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"`

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

@@ -87,21 +87,13 @@ func main() {
 	server.Get("/api/getUserProjects", gs.GetUserProjects)
 	server.Post("/api/loginrenew", gs.LoginRenew)
 	server.Delete("/api/userdelete/:username", gs.UserDelete) // Perhaps just use POST to avoid headaches
-	server.Delete("api/project/:projectID", gs.DeleteProject) // WIP
+	server.Post("/api/project", gs.CreateProject)
-	server.Post("/api/project", gs.CreateProject)             // WIP
 	server.Get("/api/project/:projectId", gs.GetProject)
-	server.Get("/api/project/getAllUsers", gs.GetAllUsersProject)
 	server.Get("/api/getWeeklyReport", gs.GetWeeklyReport)
 	server.Post("/api/signReport", gs.SignReport)
 	server.Put("/api/addUserToProject", gs.AddUserToProjectHandler)
-	server.Put("/api/changeUserName", gs.ChangeUserName)
 	server.Post("/api/promoteToAdmin", gs.PromoteToAdmin)
 	server.Get("/api/users/all", gs.ListAllUsers)
-	server.Get("/api/getWeeklyReportsUser/:projectName", gs.GetWeeklyReportsUserHandler)
-	server.Get("/api/checkIfProjectManager/:projectName", gs.IsProjectManagerHandler)
-	server.Post("/api/ProjectRoleChange", gs.ProjectRoleChange)
-	server.Get("/api/getUsersProject/:projectName", gs.ListAllUsersProject)
-
 	// Announce the port we are listening on and start the server
 	err = server.Listen(fmt.Sprintf(":%d", conf.Port))
 	if err != nil {

frontend/src/API/API.ts

@@ -4,138 +4,50 @@ import {
   User,
   Project,
   NewProject,
-  UserProjectMember,
-  WeeklyReport,
 } 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(
-    username: string,
-    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<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[]>>;
 }
 
-/** An instance of the API */
+// Export an instance of the API
 export const api: API = {
   async registerUser(user: NewUser): Promise<APIResponse<User>> {
     try {
@@ -169,7 +81,7 @@ export const api: API = {
     token: string,
   ): Promise<APIResponse<User>> {
     try {
-      const response = await fetch(`/api/userdelete/${username}`, {
+      const response = await fetch("/api/userdelete", {
         method: "POST",
         headers: {
           "Content-Type": "application/json",
@@ -189,35 +101,6 @@ export const api: API = {
     }
   },
 
-  async checkIfProjectManager(
-    username: string,
-    projectName: string,
-    token: string,
-  ): Promise<APIResponse<boolean>> {
-    try {
-      const response = await fetch("/api/checkIfProjectManager", {
-        method: "GET",
-        headers: {
-          "Content-Type": "application/json",
-          Authorization: "Bearer " + token,
-        },
-        body: JSON.stringify({ username, projectName }),
-      });
-
-      if (!response.ok) {
-        return {
-          success: false,
-          message: "Failed to check if project manager",
-        };
-      } else {
-        const data = (await response.json()) as boolean;
-        return { success: true, data };
-      }
-    } catch (e) {
-      return { success: false, message: "fuck" };
-    }
-  },
-
   async createProject(
     project: NewProject,
     token: string,
@@ -323,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",
-      };
     }
   },
 
@@ -403,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}`, {
@@ -427,61 +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",
-      });
-    }
-  },
 };

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/AllTimeReportsInProject.tsx

@@ -1,71 +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 { 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[]>([]);
-
-  // 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 (
-    <>
-      <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={`/editTimeReport/${projectName}/${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>
-                {newWeeklyReport.signedBy ? "YES" : "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,34 +0,0 @@
-import React, { useState } from "react";
-import InputField from "./InputField";
-
-function ChangeUsername(): JSX.Element {
-  const [newUsername, setNewUsername] = useState("");
-
-  const handleChange = (e: React.ChangeEvent<HTMLInputElement>): void => {
-    setNewUsername(e.target.value);
-  };
-
-  // const handleSubmit = async (): Promise<void> => {
-  //   try {
-  //     // Call the API function to update the username
-  //     await api.updateUsername(newUsername);
-  //     // Optionally, add a success message or redirect the user
-  //   } catch (error) {
-  //     console.error("Error updating username:", error);
-  //     // Optionally, handle the error
-  //   }
-  // };
-
-  return (
-    <div>
-      <InputField
-        label="New Username"
-        type="text"
-        value={newUsername}
-        onChange={handleChange}
-      />
-    </div>
-  );
-}
-
-export default ChangeUsername;

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/DisplayUserProjects.tsx

@@ -1,45 +0,0 @@
-import { useState, useEffect } from "react";
-import { Project } from "../Types/goTypes";
-import { Link } 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 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);
-    }
-  };
-
-  // 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, index) => (
-          <Link to={`/project/${project.name}`} key={index}>
-            <h1 className="font-bold underline text-[30px] cursor-pointer">
-              {project.name}
-            </h1>
-          </Link>
-        ))}
-      </div>
-    </>
-  );
-}
-
-export default DisplayUserProject;

frontend/src/Components/EditWeeklyReport.tsx

@@ -1,14 +1,11 @@
 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 { useNavigate } 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 [projectName, setProjectName] = useState("");
   const [week, setWeek] = useState(0);
   const [developmentTime, setDevelopmentTime] = useState(0);
   const [meetingTime, setMeetingTime] = useState(0);
@@ -18,21 +15,20 @@ export default function GetWeeklyReport(): JSX.Element {
   const [testingTime, setTestingTime] = useState(0);
 
   const token = localStorage.getItem("accessToken") ?? "";
-  const { projectName } = useParams();
+  const username = localStorage.getItem("username") ?? "";
-  const { fetchedWeek } = useParams();
 
+  useEffect(() => {
     const fetchWeeklyReport = async (): Promise<void> => {
       const response = await api.getWeeklyReport(
-      projectName ?? "",
+        username,
-      fetchedWeek?.toString() ?? "0",
+        projectName,
+        week.toString(),
         token,
       );
 
       if (response.success) {
-      const report: WeeklyReport = response.data ?? {
+        const report: NewWeeklyReport = response.data ?? {
-        reportId: 0,
+          projectName: "",
-        userId: 0,
-        projectId: 0,
           week: 0,
           developmentTime: 0,
           meetingTime: 0,
@@ -41,6 +37,7 @@ export default function GetWeeklyReport(): JSX.Element {
           studyTime: 0,
           testingTime: 0,
         };
+        setProjectName(report.projectName);
         setWeek(report.week);
         setDevelopmentTime(report.developmentTime);
         setMeetingTime(report.meetingTime);
@@ -53,13 +50,12 @@ export default function GetWeeklyReport(): JSX.Element {
       }
     };
 
-  useEffect(() => {
     void fetchWeeklyReport();
-  });
+  }, [projectName, token, username, week]);
 
   const handleNewWeeklyReport = async (): Promise<void> => {
     const newWeeklyReport: NewWeeklyReport = {
-      projectName: projectName ?? "",
+      projectName,
       week,
       developmentTime,
       meetingTime,
@@ -86,7 +82,7 @@ export default function GetWeeklyReport(): JSX.Element {
             }
             e.preventDefault();
             void handleNewWeeklyReport();
-            navigate(-1);
+            navigate("/project");
           }}
         >
           <div className="flex flex-col items-center">
@@ -237,7 +233,7 @@ export default function GetWeeklyReport(): JSX.Element {
               </tbody>
             </table>
             <Button
-              text="Submit changes"
+              text="Submit"
               onClick={(): void => {
                 return;
               }}

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,17 +1,11 @@
-//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 [week, setWeek] = useState<number>();
   const [developmentTime, setDevelopmentTime] = useState<number>();
   const [meetingTime, setMeetingTime] = useState<number>();
   const [adminTime, setAdminTime] = useState<number>();
@@ -25,7 +19,7 @@ export default function NewWeeklyReport(): JSX.Element {
   const handleNewWeeklyReport = async (): Promise<void> => {
     const newWeeklyReport: NewWeeklyReport = {
       projectName: projectName ?? "",
-      week: week,
+      week: week ?? 0,
       developmentTime: developmentTime ?? 0,
       meetingTime: meetingTime ?? 0,
       adminTime: adminTime ?? 0,
@@ -51,7 +45,7 @@ export default function NewWeeklyReport(): JSX.Element {
             }
             e.preventDefault();
             void handleNewWeeklyReport();
-            navigate(-1);
+            navigate("/project");
           }}
         >
           <div className="flex flex-col items-center">
@@ -60,7 +54,8 @@ export default function NewWeeklyReport(): JSX.Element {
               type="week"
               placeholder="Week"
               onChange={(e) => {
-                setWeek(parseInt(e.target.value));
+                const weekNumber = parseInt(e.target.value.split("-W")[1]);
+                setWeek(weekNumber);
               }}
               onKeyDown={(event) => {
                 const keyValue = event.key;

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,66 +0,0 @@
-import { useState } from "react";
-import Button from "./Button";
-import { UserProjectMember } from "../Types/goTypes";
-import GetUsersInProject from "./GetUsersInProject";
-
-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-[41vh] w-[40vw] flex flex-col">
-        <div className="pl-20 pr-20">
-          <h1 className="font-bold text-[32px] mb-[20px]">Project members:</h1>
-          <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"
-          />
-          <Button
-            text={"Close"}
-            onClick={function (): void {
-              props.onClose();
-            }}
-            type="button"
-          />
-        </div>
-      </div>
-    </div>
-  );
-}
-
-export default ProjectInfoModal;

frontend/src/Components/ProjectListAdmin.tsx

@@ -1,79 +0,0 @@
-import { useState } from "react";
-import { NewProject } from "../Types/goTypes";
-import ProjectInfoModal from "./ProjectInfoModal";
-import UserInfoModal from "./UserInfoModal";
-import DeleteUser from "./DeleteUser";
-
-/**
- * A list of projects for admin manage projects page, that sets an onClick
- * 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 = (username: string): void => {
-    setProjectname(username);
-    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={() => DeleteUser}
-        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,99 +0,0 @@
-import { useEffect, useState } from "react";
-import { Link, useParams } from "react-router-dom";
-
-function ProjectMembers(): JSX.Element {
-  const { projectName } = useParams();
-  const [projectMembers, setProjectMembers] = useState<ProjectMember[]>([]);
-
-  //   const getProjectMembers = async (): Promise<void> => {
-  //     const token = localStorage.getItem("accessToken") ?? "";
-  //     const response = await api.getProjectMembers(projectName ?? "", token);
-  //     console.log(response);
-  //     if (response.success) {
-  //       setProjectMembers(response.data ?? []);
-  //     } else {
-  //       console.error(response.message);
-  //     }
-  //   };
-
-  interface ProjectMember {
-    username: string;
-    role: string;
-  }
-
-  const mockProjectMembers = [
-    {
-      username: "username1",
-      role: "Project Manager",
-    },
-    {
-      username: "username2",
-      role: "System Manager",
-    },
-    {
-      username: "username3",
-      role: "Developer",
-    },
-    {
-      username: "username4",
-      role: "Tester",
-    },
-    {
-      username: "username5",
-      role: "Tester",
-    },
-    {
-      username: "username6",
-      role: "Tester",
-    },
-  ];
-
-  const getProjectMembers = async (): Promise<void> => {
-    // Use the mock data
-    setProjectMembers(mockProjectMembers);
-
-    await Promise.resolve();
-  };
-
-  useEffect(() => {
-    void getProjectMembers();
-  });
-
-  return (
-    <>
-      <div className="border-4 border-black bg-white flex flex-col items-center justify-center min-h-[65vh] h-fit w-[70vw] rounded-3xl content-center overflow-scroll space-y-[10vh] p-[30px] text-[20px]">
-        {projectMembers.map((projectMember, index) => (
-          <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.role}</h1>
-              </div>
-              <div className="flex">
-                <div className="ml-auto flex space-x-4">
-                  <Link
-                    to={`/viewReports/${projectName}/${projectMember.username}`}
-                  >
-                    <h1 className="underline cursor-pointer font-bold">
-                      View Reports
-                    </h1>
-                  </Link>
-                  <Link
-                    to={`/changeRole/${projectName}/${projectMember.username}`}
-                  >
-                    <h1 className="underline cursor-pointer font-bold">
-                      Change Role
-                    </h1>
-                  </Link>
-                </div>
-              </div>
-            </div>
-          </h1>
-        ))}
-      </div>
-    </>
-  );
-}
-
-export default ProjectMembers;

frontend/src/Components/Register.tsx

@@ -6,10 +6,6 @@ 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>();

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:

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/Pages/AdminPages/AdminChangeUsername.tsx

@@ -1,14 +1,9 @@
 import BackButton from "../../Components/BackButton";
 import BasicWindow from "../../Components/BasicWindow";
 import Button from "../../Components/Button";
-import ChangeUsername from "../../Components/ChangeUsername";
 
 function AdminChangeUsername(): JSX.Element {
-  const content = (
+  const content = <></>;
-    <>
-      <ChangeUsername />
-    </>
-  );
 
   const buttons = (
     <>

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

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

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/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/PMProjectMembers.tsx

@@ -1,19 +1,10 @@
 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 = (
-    <>
-      <h1 className="font-bold text-[30px] mb-[20px]">
-        All Members In: {projectName}{" "}
-      </h1>
-      <ProjectMembers />
-    </>
-  );
 
   const buttons = (
     <>

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/UnauthorizedPage.tsx

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

frontend/src/Pages/UserPages/UserNewTimeReportPage.tsx

@@ -1,6 +1,7 @@
-import BackButton from "../../Components/BackButton";
 import BasicWindow from "../../Components/BasicWindow";
+import Button from "../../Components/Button";
 import NewWeeklyReport from "../../Components/NewWeeklyReport";
+import { Link } from "react-router-dom";
 
 function UserNewTimeReportPage(): JSX.Element {
   const content = (
@@ -12,7 +13,15 @@ function UserNewTimeReportPage(): JSX.Element {
 
   const buttons = (
     <>
-      <BackButton />
+      <Link to="/project">
+        <Button
+          text="Back"
+          onClick={(): void => {
+            return;
+          }}
+          type="button"
+        />
+      </Link>
     </>
   );
 

frontend/src/Pages/UserPages/UserProjectPage.tsx

@@ -1,11 +1,25 @@
+import { Link, useLocation, useParams } from "react-router-dom";
 import BasicWindow from "../../Components/BasicWindow";
 import BackButton from "../../Components/BackButton";
-import UserProjectMenu from "../../Components/UserProjectMenu";
 
 function UserProjectPage(): JSX.Element {
+  const { projectName } = useParams();
+
   const content = (
     <>
-      <UserProjectMenu />
+      <h1 className="font-bold text-[30px] mb-[20px]">{useLocation().state}</h1>
+      <div className="border-4 border-black bg-white flex flex-col items-center justify-center min-h-[65vh] h-fit w-[50vw] rounded-3xl content-center overflow-scroll space-y-[10vh] p-[30px]">
+        <Link to={`/projectPage/${projectName}`}>
+          <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>
     </>
   );
 

frontend/src/Pages/UserPages/UserViewTimeReportsPage.tsx

@@ -1,17 +1,11 @@
 import BasicWindow from "../../Components/BasicWindow";
 import BackButton from "../../Components/BackButton";
-import { useParams } from "react-router-dom";
-import AllTimeReportsInProject from "../../Components/AllTimeReportsInProject";
 
 function UserViewTimeReportsPage(): JSX.Element {
-  const { projectName } = useParams();
-
   const content = (
     <>
-      <h1 className="font-bold text-[30px] mb-[20px]">
+      <h1 className="font-bold text-[30px] mb-[20px]">Your Time Reports</h1>
-        Your Time Reports In: {projectName}
+      {/* Här kan du inkludera logiken för att visa användarens tidrapporter */}
-      </h1>
-      <AllTimeReportsInProject />
     </>
   );
 

frontend/src/Pages/YourProjectsPage.tsx

@@ -1,11 +1,53 @@
+import { useState, createContext, useEffect } from "react";
+import { Project } from "../Types/goTypes";
+import { api } from "../API/API";
+import { Link } from "react-router-dom";
 import BasicWindow from "../Components/BasicWindow";
-import DisplayUserProjects from "../Components/DisplayUserProjects";
+
+export const ProjectNameContext = createContext("");
 
 function UserProjectPage(): JSX.Element {
+  const [projects, setProjects] = useState<Project[]>([]);
+  const [selectedProject, setSelectedProject] = useState("");
+
+  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);
+    }
+  };
+  // Call getProjects when the component mounts
+  useEffect(() => {
+    void getProjects();
+  }, []);
+
+  const handleProjectClick = (projectName: string): void => {
+    setSelectedProject(projectName);
+  };
+
   const content = (
-    <>
+    <ProjectNameContext.Provider value={selectedProject}>
-      <DisplayUserProjects />
+      <h1 className="font-bold text-[30px] mb-[20px]">Your Projects</h1>
-    </>
+      <div className="border-4 border-black bg-white flex flex-col items-center justify-center min-h-[65vh] h-fit w-[50vw] rounded-3xl content-center overflow-scroll space-y-[10vh] p-[30px]">
+        {projects.map((project, index) => (
+          <Link
+            to={`/project/${project.name}`}
+            onClick={() => {
+              handleProjectClick(project.name);
+            }}
+            key={index}
+          >
+            <h1 className="font-bold underline text-[30px] cursor-pointer">
+              {project.name}
+            </h1>
+          </Link>
+        ))}
+      </div>
+    </ProjectNameContext.Provider>
   );
 
   const buttons = <></>;

frontend/src/Types/goTypes.ts

@@ -40,90 +40,6 @@ export interface NewWeeklyReport {
    */
   testingTime: number /* int */;
 }
-export interface WeeklyReportList {
-  /**
-   * The name of the project, as it appears in the database
-   */
-  projectName: string;
-  /**
-   * The week number
-   */
-  week: number /* int */;
-  /**
-   * Total time spent on development
-   */
-  developmentTime: number /* int */;
-  /**
-   * Total time spent in meetings
-   */
-  meetingTime: number /* int */;
-  /**
-   * Total time spent on administrative tasks
-   */
-  adminTime: number /* int */;
-  /**
-   * Total time spent on personal projects
-   */
-  ownWorkTime: number /* int */;
-  /**
-   * Total time spent on studying
-   */
-  studyTime: number /* int */;
-  /**
-   * Total time spent on testing
-   */
-  testingTime: number /* int */;
-  /**
-   * The project manager who signed it
-   */
-  signedBy?: number /* int */;
-}
-export interface WeeklyReport {
-  /**
-   * The ID of the report
-   */
-  reportId: number /* int */;
-  /**
-   * The user id of the user who submitted the report
-   */
-  userId: number /* int */;
-  /**
-   * The name of the project, as it appears in the database
-   */
-  projectId: number /* int */;
-  /**
-   * The week number
-   */
-  week: number /* int */;
-  /**
-   * Total time spent on development
-   */
-  developmentTime: number /* int */;
-  /**
-   * Total time spent in meetings
-   */
-  meetingTime: number /* int */;
-  /**
-   * Total time spent on administrative tasks
-   */
-  adminTime: number /* int */;
-  /**
-   * Total time spent on personal projects
-   */
-  ownWorkTime: number /* int */;
-  /**
-   * Total time spent on studying
-   */
-  studyTime: number /* int */;
-  /**
-   * Total time spent on testing
-   */
-  testingTime: number /* int */;
-  /**
-   * The project manager who signed it
-   */
-  signedBy?: number /* int */;
-}
 
 //////////
 // source: project.go
@@ -144,20 +60,6 @@ export interface NewProject {
   name: string;
   description: string;
 }
-/**
- * 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.
- */
-export interface RoleChange {
-  username: string;
-  role: 'project_manager' | 'user';
-  projectname: string;
-}
-export interface NameChange {
-  id: number /* int */;
-  name: string;
-}
 
 //////////
 // source: users.go
@@ -184,18 +86,3 @@ export interface PublicUser {
   userId: string;
   username: string;
 }
-
-export interface UserProjectMember {
-	Username: string;
-	UserRole: string;
-}
-/**
- * wrapper type for token
- */
-export interface Token {
-  token: string;
-}
-export interface StrNameChange {
-  prevName: string;
-  newName: string;
-}

frontend/src/main.tsx

@@ -30,7 +30,6 @@ import AdminProjectStatistics from "./Pages/AdminPages/AdminProjectStatistics.ts
 import AdminProjectViewMemberInfo from "./Pages/AdminPages/AdminProjectViewMemberInfo.tsx";
 import AdminProjectPage from "./Pages/AdminPages/AdminProjectPage.tsx";
 import NotFoundPage from "./Pages/NotFoundPage.tsx";
-import UnauthorizedPage from "./Pages/UnauthorizedPage.tsx";
 
 // This is where the routes are mounted
 const router = createBrowserRouter([
@@ -43,6 +42,10 @@ const router = createBrowserRouter([
     path: "/admin",
     element: <AdminMenuPage />,
   },
+  {
+    path: "/pm",
+    element: <YourProjectsPage />,
+  },
   {
     path: "/yourProjects",
     element: <YourProjectsPage />,
@@ -56,15 +59,15 @@ const router = createBrowserRouter([
     element: <UserNewTimeReportPage />,
   },
   {
-    path: "/timeReports/:projectName",
+    path: "/projectPage/:projectName",
     element: <UserViewTimeReportsPage />,
   },
   {
-    path: "/editTimeReport/:projectName/:weekNumber",
+    path: "/editTimeReport",
     element: <UserEditTimeReportPage />,
   },
   {
-    path: "/changeRole/:projectName/:username",
+    path: "/changeRole",
     element: <PMChangeRole />,
   },
   {
@@ -72,11 +75,11 @@ const router = createBrowserRouter([
     element: <PMOtherUsersTR />,
   },
   {
-    path: "/projectMembers/:projectName",
+    path: "/projectMembers",
     element: <PMProjectMembers />,
   },
   {
-    path: "/PMProjectPage/:projectName",
+    path: "/PMProjectPage",
     element: <PMProjectPage />,
   },
   {
@@ -88,7 +91,7 @@ const router = createBrowserRouter([
     element: <PMTotalTimeRole />,
   },
   {
-    path: "/unsignedReports/:projectName",
+    path: "/PMUnsignedReports",
     element: <PMUnsignedReports />,
   },
   {
@@ -143,10 +146,6 @@ const router = createBrowserRouter([
     path: "/adminManageUser",
     element: <AdminManageUsers />,
   },
-  {
-    path: "/unauthorized",
-    element: <UnauthorizedPage />,
-  },
 ]);
 
 // Semi-hacky way to get the root element

testing.py

@@ -20,8 +20,8 @@ def randomString(len=10):
 
 
 # Defined once per test run
-username = "user_" + randomString()
+username = randomString()
-projectName = "project_" + randomString()
+projectName = randomString()
 
 # The base URL of the API
 base_url = "http://localhost:8080"
@@ -37,46 +37,6 @@ signReportPath = base_url + "/api/signReport"
 addUserToProjectPath = base_url + "/api/addUserToProject"
 promoteToAdminPath = base_url + "/api/promoteToAdmin"
 getUserProjectsPath = base_url + "/api/getUserProjects"
-getWeeklyReportsUserPath = base_url + "/api/getWeeklyReportsUser"
-checkIfProjectManagerPath = base_url + "/api/checkIfProjectManager"
-ProjectRoleChangePath = base_url + "/api/ProjectRoleChange"
-getUsersProjectPath = base_url + "/api/getUsersProject"
-getChangeUserNamePath = base_url + "/api/changeUserName"
-
-#ta bort auth i handlern för att få testet att gå igenom
-def test_ProjectRoleChange():
-    dprint("Testing ProjectRoleChange")
-    localUsername = randomString()
-    localProjectName = randomString()
-    register(localUsername, "username_password")
-
-    token = login(localUsername, "username_password").json()[
-        "token"
-    ]
-
-    # Just checking since this test is built somewhat differently than the others
-    assert token != None, "Login failed"
-
-    response = requests.post(
-        addProjectPath,
-        json={"name": localProjectName, "description": "This is a project"},
-        headers={"Authorization": "Bearer " + token},
-    )
-
-    if response.status_code != 200:
-        print("Add project failed")
-
-    response = requests.post(
-        ProjectRoleChangePath,
-        headers={"Authorization": "Bearer " + token},
-        json={
-            "projectName": localProjectName,
-            "role": "project_manager",
-        },
-    )
-
-    assert response.status_code == 200, "ProjectRoleChange failed"
-    gprint("test_ProjectRoleChange successful")
 
 
 def test_get_user_projects():
@@ -275,7 +235,7 @@ def test_sign_report():
         submitReportPath,
         json={
             "projectName": projectName,
-            "week": 2,
+            "week": 1,
             "developmentTime": 10,
             "meetingTime": 5,
             "adminTime": 5,
@@ -315,123 +275,6 @@ def test_sign_report():
     dprint(response.text)
     gprint("test_sign_report successful")
 
-# Test function to get weekly reports for a user in a project
-def test_get_weekly_reports_user():
-    # Log in as the user
-    token = login(username, "always_same").json()["token"]
-
-    # Get weekly reports for the user in the project
-    response = requests.get(
-        getWeeklyReportsUserPath + "/" + projectName,
-        headers={"Authorization": "Bearer " + token},
-    )
-    
-    dprint(response.text)
-    assert response.status_code == 200, "Get weekly reports for user failed"
-    gprint("test_get_weekly_reports_user successful")
-
-# Test function to check if a user is a project manager
-def test_check_if_project_manager():
-    # Log in as the user
-    token = login(username, "always_same").json()["token"]
-
-    # Check if the user is a project manager for the project
-    response = requests.get(
-        checkIfProjectManagerPath + "/" + projectName,
-        headers={"Authorization": "Bearer " + token},
-    )
-    
-    dprint(response.text)
-    assert response.status_code == 200, "Check if project manager failed"
-    gprint("test_check_if_project_manager successful")
-
-def test_ensure_manager_of_created_project():
-    # Create a new user to add to the project
-    newUser = "karen_" + randomString()
-    newProject = "HR_" + randomString()
-    register(newUser, "new_user_password")
-    token = login(newUser, "new_user_password").json()["token"]
-
-    # Create a new project
-    response = requests.post(
-        addProjectPath,
-        json={"name": newProject, "description": "This is a project"},
-        headers={"Authorization": "Bearer " + token},
-    )
-    assert response.status_code == 200, "Add project failed"
-
-    response = requests.get(
-        checkIfProjectManagerPath + "/" + newProject,
-        headers={"Authorization": "Bearer " + token},
-    )
-    assert response.status_code == 200, "Check if project manager failed"
-    assert response.json()["isProjectManager"] == True, "User is not project manager"
-    gprint("test_ensure_admin_of_created_project successful")
-
-def test_change_user_name():
-    # Register a new user
-    new_user = randomString()
-    register(new_user, "password")
-
-    # Log in as the new user
-    token = login(new_user, "password").json()["token"]
-
-    # Register a new admin
-    admin_username = randomString()
-    admin_password = "admin_password"
-    dprint(
-        "Registering with username: ", admin_username, " and password: ", admin_password
-    )
-    response = requests.post(
-        registerPath, json={"username": admin_username, "password": admin_password}
-    )
-    admin_token = login(admin_username, admin_password).json()["token"]
-
-    # Promote to admin 
-    response = requests.post(
-        promoteToAdminPath,
-        json={"username": admin_username},
-        headers={"Authorization": "Bearer " + admin_token},
-    )
-
-    # Change the user's name
-    response = requests.put(
-        getChangeUserNamePath,
-        json={"prevName": new_user, "newName": randomString()},
-        headers={"Authorization": "Bearer " + admin_token},
-    )
-
-    # Check if the change was successful
-    assert response.status_code == 200, "Change user name failed"
-    gprint("test_change_user_name successful")
-
-def test_list_all_users_project():
-    # Log in as a user who is a member of the project
-    admin_username = randomString()
-    admin_password = "admin_password2"
-    dprint(
-        "Registering with username: ", admin_username, " and password: ", admin_password
-    )
-    response = requests.post(
-        registerPath, json={"username": admin_username, "password": admin_password}
-    )
-    dprint(response.text)
-
-    # Log in as the admin
-    admin_token = login(admin_username, admin_password).json()["token"]
-    response = requests.post(
-        promoteToAdminPath,
-        json={"username": admin_username},
-        headers={"Authorization": "Bearer " + admin_token},
-    )
-
-    # Make a request to list all users associated with the project
-    response = requests.get(
-        getUsersProjectPath + "/" + projectName,
-        headers={"Authorization": "Bearer " + admin_token},    
-    )
-    assert response.status_code == 200, "List all users project failed"
-    gprint("test_list_all_users_project sucessful")
 
 if __name__ == "__main__":
     test_get_user_projects()
@@ -443,9 +286,3 @@ if __name__ == "__main__":
     test_get_project()
     test_sign_report()
     test_add_user_to_project()
-    test_get_weekly_reports_user()
-    test_check_if_project_manager()
-    test_ProjectRoleChange()
-    test_ensure_manager_of_created_project()
-    test_list_all_users_project()
-    test_change_user_name()