.gitignore

@@ -15,9 +15,6 @@ backend/*.png
 backend/*.jpg
 backend/*.svg
 
-/go.work.sum
-/package-lock.json
-
 # Test binary, built with `go test -c`
 *.test
 

Justfile

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

Makefile

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

backend/Makefile

@@ -8,19 +8,17 @@ GOGET = $(GOCMD) get
 # SQLite database filename
 DB_FILE = db.sqlite3
 
-PROC_NAME = ttime_server
-
 # Directory containing migration SQL scripts
 MIGRATIONS_DIR = internal/database/migrations
 SAMPLE_DATA_DIR = internal/database/sample_data
 
 # Build target
 build:
-	$(GOBUILD) -o bin/$(PROC_NAME) main.go
+	$(GOBUILD) -o bin/server main.go
 
 # Run target
 run: build
-	./bin/$(PROC_NAME)
+	./bin/server
 
 watch: build
 	watchexec -c -w . -r make run
@@ -39,16 +37,6 @@ clean:
 test: db.sqlite3
 	$(GOTEST) ./... -count=1
 
-# Integration test target
-.PHONY: itest
-itest:
-	pgrep $(PROC_NAME) && echo "Server already running" && exit 1 || true
-	make build
-	./bin/$(PROC_NAME) >/dev/null 2>&1 &
-	sleep 1 # Adjust if needed
-	python ../testing.py
-	pkill $(PROC_NAME)
-
 # Get dependencies target
 deps:
 	$(GOGET) -v ./...

backend/internal/database/db.go

@@ -40,9 +40,7 @@ type Database interface {
 	SignWeeklyReport(reportId int, projectManagerId int) error
 	IsSiteAdmin(username string) (bool, error)
 	IsProjectManager(username string, projectname string) (bool, error)
-	GetProjectTimes(projectName string) (map[string]int, error)
-	UpdateWeeklyReport(projectName string, userName string, week int, developmentTime int, meetingTime int, adminTime int, ownWorkTime int, studyTime int, testingTime int) error
-	RemoveProject(projectname string) error
+	GetTotalTimePerActivity(projectName string) (map[string]int, error)
 }
 
 // This struct is a wrapper type that holds the database connection
@@ -500,26 +498,6 @@ func (d *Db) IsProjectManager(username string, projectname string) (bool, error)
 	return manager, err
 }
 
-func (d *Db) UpdateWeeklyReport(projectName string, userName string, week int, developmentTime int, meetingTime int, adminTime int, ownWorkTime int, studyTime int, testingTime int) error {
-	query := `
-		UPDATE weekly_reports
-		SET
-			development_time = ?,
-			meeting_time = ?,
-			admin_time = ?,
-			own_work_time = ?,
-			study_time = ?,
-			testing_time = ?
-		WHERE
-			user_id = (SELECT id FROM users WHERE username = ?)
-			AND project_id = (SELECT id FROM projects WHERE name = ?)
-			AND week = ?
-	`
-
-	_, err := d.Exec(query, developmentTime, meetingTime, adminTime, ownWorkTime, studyTime, testingTime, userName, projectName, week)
-	return err
-}
-
 // MigrateSampleData applies sample data to the database.
 func (d *Db) MigrateSampleData() error {
 	// Insert sample data
@@ -559,8 +537,8 @@ 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) {
+func (d *Db) GetTotalTimePerActivity(projectName string) (map[string]int, error) {
+
 	query := `
         SELECT development_time, meeting_time, admin_time, own_work_time, study_time, testing_time
 	    FROM weekly_reports
@@ -596,8 +574,3 @@ func (d *Db) GetProjectTimes(projectName string) (map[string]int, error) {
 
 	return totalTime, nil
 }
-
-func (d *Db) RemoveProject(projectname string) error {
-	_, err := d.Exec("DELETE FROM projects WHERE name = ?", projectname)
-	return err
-}

backend/internal/database/db_test.go

@@ -481,11 +481,6 @@ func TestGetUnsignedWeeklyReports(t *testing.T) {
 		t.Error("AddUser failed:", err)
 	}
 
-	err = db.AddUser("testuser1", "password")
-	if err != nil {
-		t.Error("AddUser failed:", err)
-	}
-
 	err = db.AddProject("testproject", "description", "testuser")
 	if err != nil {
 		t.Error("AddProject failed:", err)
@@ -496,11 +491,6 @@ func TestGetUnsignedWeeklyReports(t *testing.T) {
 		t.Error("AddWeeklyReport failed:", err)
 	}
 
-	err = db.AddWeeklyReport("testproject", "testuser1", 1, 1, 1, 1, 1, 1, 1)
-	if err != nil {
-		t.Error("AddWeeklyReport failed:", err)
-	}
-
 	reports, err := db.GetUnsignedWeeklyReports("testproject")
 	if err != nil {
 		t.Error("GetUnsignedWeeklyReports failed:", err)
@@ -770,90 +760,27 @@ func TestIsProjectManager(t *testing.T) {
 	}
 }
 
-func TestGetProjectTimes(t *testing.T) {
-	// Initialize
+func TestGetTotalTimePerActivity(t *testing.T) {
+	// Initialize your test database connection
 	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)
+	// Run the query to get total time per activity
+	totalTime, err := db.GetTotalTimePerActivity("projecttest")
 	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])
-		}
-	}
+	// ska lägga till fler  assertions
 }
+
 func TestEnsureManagerOfCreatedProject(t *testing.T) {
 	db, err := setupState()
 	if err != nil {
@@ -887,81 +814,3 @@ func TestEnsureManagerOfCreatedProject(t *testing.T) {
 		t.Error("Expected testuser to be a project manager, but it's not.")
 	}
 }
-
-// TestUpdateWeeklyReport tests the UpdateWeeklyReport function of the database
-func TestUpdateWeeklyReport(t *testing.T) {
-	db, err := setupState()
-	if err != nil {
-		t.Error("setupState failed:", err)
-	}
-
-	// Add a user
-	err = db.AddUser("testuser", "password")
-	if err != nil {
-		t.Error("AddUser failed:", err)
-	}
-
-	// Add a project
-	err = db.AddProject("testproject", "description", "testuser")
-	if err != nil {
-		t.Error("AddProject failed:", err)
-	}
-
-	// Add a weekly report
-	err = db.AddWeeklyReport("testproject", "testuser", 1, 1, 1, 1, 1, 1, 1)
-	if err != nil {
-		t.Error("AddWeeklyReport failed:", err)
-	}
-
-	// Update the weekly report
-	err = db.UpdateWeeklyReport("testproject", "testuser", 1, 2, 2, 2, 2, 2, 2)
-	if err != nil {
-		t.Error("UpdateWeeklyReport failed:", err)
-	}
-
-	// Retrieve the updated report
-	updatedReport, err := db.GetWeeklyReport("testuser", "testproject", 1)
-	if err != nil {
-		t.Error("GetWeeklyReport failed:", err)
-	}
-
-	// Check if the report was updated correctly
-	if updatedReport.DevelopmentTime != 2 ||
-		updatedReport.MeetingTime != 2 ||
-		updatedReport.AdminTime != 2 ||
-		updatedReport.OwnWorkTime != 2 ||
-		updatedReport.StudyTime != 2 ||
-		updatedReport.TestingTime != 2 {
-		t.Error("UpdateWeeklyReport failed: report not updated correctly")
-	}
-}
-
-func TestRemoveProject(t *testing.T) {
-	db, err := setupAdvancedState()
-	if err != nil {
-		t.Error("setupState failed:", err)
-	}
-
-	// Promote user to Admin
-	err = db.PromoteToAdmin("demouser")
-	if err != nil {
-		t.Error("PromoteToAdmin failed:", err)
-	}
-
-	// Remove project
-	err = db.RemoveProject("projecttest")
-	if err != nil {
-		t.Error("RemoveProject failed:", err)
-	}
-
-	// Check if the project was removed
-	projects, err := db.GetAllProjects()
-	if err != nil {
-		t.Error("GetAllProjects failed:", err)
-	}
-	if len(projects) != 0 {
-		t.Error("RemoveProject failed: expected 0, got", len(projects))
-	}
-	
-}
-	

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

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

backend/internal/handlers/global_state.go

@@ -29,8 +29,6 @@ type GlobalState interface {
 	ChangeUserName(c *fiber.Ctx) error      // WIP
 	GetAllUsersProject(c *fiber.Ctx) error  // WIP
 	GetUnsignedReports(c *fiber.Ctx) error  // 
-	UpdateWeeklyReport(c *fiber.Ctx) error
-	RemoveProject(c *fiber.Ctx) error
 }
 
 // "Constructor"

backend/internal/handlers/handlers_project_related.go

@@ -233,83 +233,3 @@ func (gs *GState) IsProjectManagerHandler(c *fiber.Ctx) error {
 	// Return the result as JSON
 	return c.JSON(fiber.Map{"isProjectManager": isManager})
 }
-
-func (gs *GState) GetProjectTimesHandler(c *fiber.Ctx) error {
-	// Get the username from the token
-	user := c.Locals("user").(*jwt.Token)
-	claims := user.Claims.(jwt.MapClaims)
-	username := claims["name"].(string)
-
-	// Get project
-	projectName := c.Params("projectName")
-	if projectName == "" {
-		log.Info("No project name provided")
-		return c.Status(400).SendString("No project name provided")
-	}
-
-	// Get all users in the project and roles
-	userProjects, err := gs.Db.GetAllUsersProject(projectName)
-	if err != nil {
-		log.Info("Error getting users in project:", err)
-		return c.Status(500).SendString(err.Error())
-	}
-
-	// If the user is member
-	isMember := false
-	for _, userProject := range userProjects {
-		if userProject.Username == username {
-			isMember = true
-			break
-		}
-	}
-
-	// If the user is admin
-	if !isMember {
-		isAdmin, err := gs.Db.IsSiteAdmin(username)
-		if err != nil {
-			log.Info("Error checking admin status:", err)
-			return c.Status(500).SendString(err.Error())
-		}
-		if !isAdmin {
-			log.Info("User is neither a project member nor a site admin:", username)
-			return c.Status(403).SendString("User is neither a project member nor a site admin")
-		}
-	}
-
-	// Get project times
-	projectTimes, err := gs.Db.GetProjectTimes(projectName)
-	if err != nil {
-		log.Info("Error getting project times:", err)
-		return c.Status(500).SendString(err.Error())
-	}
-
-	// Return project times as JSON
-	log.Info("Returning project times for project:", projectName)
-	return c.JSON(projectTimes)
-}
-
-func (gs *GState) RemoveProject(c *fiber.Ctx) error {
-	user := c.Locals("user").(*jwt.Token)
-	claims := user.Claims.(jwt.MapClaims)
-	username := claims["name"].(string)
-
-	// Check if the user is a site admin
-	isAdmin, err := 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 not a site admin:", username)
-		return c.Status(403).SendString("User is not a site admin")
-	}
-
-	projectName := c.Params("projectName")
-
-	if err := gs.Db.RemoveProject(projectName); err != nil {
-		return c.Status(500).SendString((err.Error()))
-	}
-
-	return c.Status(200).SendString("Project deleted")
-}

backend/internal/handlers/handlers_report_related.go

@@ -122,7 +122,7 @@ func (gs *GState) GetUnsignedReports(c *fiber.Ctx) error {
 	projectManagerUsername := claims["name"].(string)
 
 	// Extract project name and week from query parameters
-	projectName := c.Params("projectName")
+	projectName := c.Query("projectName")
 
 	log.Info("Getting unsigned reports for")
 
@@ -177,37 +177,3 @@ func (gs *GState) GetWeeklyReportsUserHandler(c *fiber.Ctx) error {
 	// Return the list of reports as JSON
 	return c.JSON(reports)
 }
-
-func (gs *GState) UpdateWeeklyReport(c *fiber.Ctx) error {
-	// Extract the necessary parameters from the token
-	user := c.Locals("user").(*jwt.Token)
-	claims := user.Claims.(jwt.MapClaims)
-	username := claims["name"].(string)
-
-	// Parse the request body into an UpdateWeeklyReport struct
-	var updateReport types.UpdateWeeklyReport
-	if err := c.BodyParser(&updateReport); err != nil {
-		log.Info("Error parsing weekly report")
-		return c.Status(400).SendString(err.Error())
-	}
-
-	// Make sure all the fields of the report are valid
-	if updateReport.Week < 1 || updateReport.Week > 52 {
-		log.Info("Invalid week number")
-		return c.Status(400).SendString("Invalid week number")
-	}
-
-	if updateReport.DevelopmentTime < 0 || updateReport.MeetingTime < 0 || updateReport.AdminTime < 0 || updateReport.OwnWorkTime < 0 || updateReport.StudyTime < 0 || updateReport.TestingTime < 0 {
-		log.Info("Invalid time report")
-		return c.Status(400).SendString("Invalid time report")
-	}
-
-	// Update the weekly report in the database
-	if err := gs.Db.UpdateWeeklyReport(updateReport.ProjectName, username, updateReport.Week, updateReport.DevelopmentTime, updateReport.MeetingTime, updateReport.AdminTime, updateReport.OwnWorkTime, updateReport.StudyTime, updateReport.TestingTime); err != nil {
-		log.Info("Error updating weekly report in db:", err)
-		return c.Status(500).SendString(err.Error())
-	}
-
-	log.Info("Weekly report updated")
-	return c.Status(200).SendString("Weekly report updated")
-}

backend/internal/handlers/handlers_user_related.go

@@ -59,9 +59,9 @@ func (gs *GState) UserDelete(c *fiber.Ctx) error {
 	// Read username from Locals
 	auth_username := c.Locals("user").(*jwt.Token).Claims.(jwt.MapClaims)["name"].(string)
 
-	if username == auth_username {
-		log.Info("User tried to delete itself")
-		return c.Status(403).SendString("You can't delete yourself")
+	if username != auth_username {
+		log.Info("User tried to delete another user")
+		return c.Status(403).SendString("You can only delete yourself")
 	}
 
 	if err := gs.Db.RemoveUser(username); err != nil {
@@ -207,8 +207,8 @@ func (gs *GState) GetAllUsersProject(c *fiber.Ctx) error {
 // @Accept			json
 // @Produce		plain
 // @Param			NewUser	body		types.NewUser	true	"user info"
-// @Success		200		{json}		json			"Successfully promoted user"
-// @Failure		400		{string}	string			"Bad request"
+// @Success		200		{json}		json			"Successfully prometed user"
+// @Failure		400		{string}	string			"bad request"
 // @Failure		401		{string}	string			"Unauthorized"
 // @Failure		500		{string}	string			"Internal server error"
 // @Router			/promoteToAdmin [post]
@@ -234,33 +234,33 @@ func (gs *GState) PromoteToAdmin(c *fiber.Ctx) error {
 	return c.SendStatus(fiber.StatusOK)
 }
 
-// ChangeUserName changes a user's username in the database
+// Changes a users name in the database
 func (gs *GState) ChangeUserName(c *fiber.Ctx) error {
-	// Check token and get username of current user
+
+	//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)
-
+	projectManagerUsername := claims["name"].(string)
+	log.Info(projectManagerUsername)
 	// Extract the necessary parameters from the request
-	data := new(types.StrNameChange)
+	data := new(types.NameChange)
 	if err := c.BodyParser(data); err != nil {
-		log.Info("Error parsing username")
+		log.Info("error parsing username, project or role")
 		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)
+	// dubble diping and checcking if current user is
+
+	if ismanager, err := gs.Db.IsProjectManager(projectManagerUsername, c.Params(data.Name)); err != nil {
+		log.Warn("Error checking if projectmanager:", 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")
+	} else if !ismanager {
+		log.Warn("tried changing name when not projectmanager:", err)
+		return c.Status(401).SendString("you can not change name when not projectmanager")
 	}
 
-	// Change the user's name in the database
-	if err := gs.Db.ChangeUserName(data.PrevName, data.NewName); err != nil {
+	// Change the user's name within the project in the database
+	if err := gs.Db.ChangeUserName(projectManagerUsername, data.Name); err != nil {
 		return c.Status(500).SendString(err.Error())
 	}
 

backend/internal/types/WeeklyReport.go

@@ -65,24 +65,3 @@ type WeeklyReport struct {
 	// The project manager who signed it
 	SignedBy *int `json:"signedBy" db:"signed_by"`
 }
-
-type UpdateWeeklyReport struct {
-	// The name of the project, as it appears in the database
-	ProjectName string `json:"projectName"`
-	// The name of the user
-	UserName string `json:"userName"`
-	// The week number
-	Week int `json:"week"`
-	// Total time spent on development
-	DevelopmentTime int `json:"developmentTime"`
-	// Total time spent in meetings
-	MeetingTime int `json:"meetingTime"`
-	// Total time spent on administrative tasks
-	AdminTime int `json:"adminTime"`
-	// Total time spent on personal projects
-	OwnWorkTime int `json:"ownWorkTime"`
-	// Total time spent on studying
-	StudyTime int `json:"studyTime"`
-	// Total time spent on testing
-	TestingTime int `json:"testingTime"`
-}

backend/main.go

@@ -33,12 +33,6 @@ import (
 // @externalDocs.description	OpenAPI
 // @externalDocs.url			https://swagger.io/resources/open-api/
 
-/**
-Main function for starting the server and initializing configurations.
-Reads configuration from file, pretty prints it, connects to the database,
-migrates it, and sets up routes for the server.
-*/
-
 func main() {
 	conf, err := config.ReadConfigFromFile("config.toml")
 	if err != nil {
@@ -98,7 +92,7 @@ func main() {
 	server.Get("/api/project/:projectId", gs.GetProject)
 	server.Get("/api/project/getAllUsers", gs.GetAllUsersProject)
 	server.Get("/api/getWeeklyReport", gs.GetWeeklyReport)
-	server.Get("/api/getUnsignedReports/:projectName", gs.GetUnsignedReports)
+	server.Get("/api/getUnsignedReports", gs.GetUnsignedReports)
 	server.Post("/api/signReport", gs.SignReport)
 	server.Put("/api/addUserToProject", gs.AddUserToProjectHandler)
 	server.Put("/api/changeUserName", gs.ChangeUserName)
@@ -108,8 +102,6 @@ func main() {
 	server.Get("/api/checkIfProjectManager/:projectName", gs.IsProjectManagerHandler)
 	server.Post("/api/ProjectRoleChange", gs.ProjectRoleChange)
 	server.Get("/api/getUsersProject/:projectName", gs.ListAllUsersProject)
-	server.Put("/api/updateWeeklyReport", gs.UpdateWeeklyReport)
-	server.Delete("/api/removeProject/:projectName", gs.RemoveProject)
 
 	// Announce the port we are listening on and start the server
 	err = server.Listen(fmt.Sprintf(":%d", conf.Port))

container/Containerfile

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

frontend/src/API/API.ts

@@ -4,10 +4,7 @@ import {
   User,
   Project,
   NewProject,
-  UserProjectMember,
   WeeklyReport,
-  StrNameChange,
-  NewProjMember,
 } from "../Types/goTypes";
 
 /**
@@ -49,6 +46,7 @@ interface API {
    * @returns {Promise<APIResponse<boolean>>} A promise containing the API response indicating if the user is a project manager.
    */
   checkIfProjectManager(
+    username: string,
     projectName: string,
     token: string,
   ): Promise<APIResponse<boolean>>;
@@ -86,7 +84,7 @@ interface API {
   submitWeeklyReport(
     weeklyReport: NewWeeklyReport,
     token: string,
-  ): Promise<APIResponse<string>>;
+  ): Promise<APIResponse<NewWeeklyReport>>;
 
   /** Gets a weekly report for a specific user, project and week
    * @param {string} projectName The name of the project.
@@ -129,30 +127,6 @@ interface API {
    * @returns {Promise<APIResponse<string[]>>} A promise resolving to an API response containing the list of users.
    */
   getAllUsers(token: string): Promise<APIResponse<string[]>>;
-  /** Gets all users in a project from name*/
-  getAllUsersProject(
-    projectName: string,
-    token: string,
-  ): Promise<APIResponse<UserProjectMember[]>>;
-  /**
-   * Changes the username of a user in the database.
-   * @param {StrNameChange} data The object containing the previous and new username.
-   * @param {string} token The authentication token.
-   * @returns {Promise<APIResponse<void>>} A promise resolving to an API response.
-   */
-  changeUserName(
-    data: StrNameChange,
-    token: string,
-  ): Promise<APIResponse<void>>;
-  addUserToProject(
-    user: NewProjMember,
-    token: string,
-  ): Promise<APIResponse<NewProjMember>>;
-
-  removeProject(
-    projectName: string,
-    token: string,
-  ): Promise<APIResponse<string>>;
 }
 
 /** An instance of the API */
@@ -190,17 +164,19 @@ export const api: API = {
   ): Promise<APIResponse<User>> {
     try {
       const response = await fetch(`/api/userdelete/${username}`, {
-        method: "DELETE",
+        method: "POST",
         headers: {
           "Content-Type": "application/json",
           Authorization: "Bearer " + token,
         },
         body: JSON.stringify(username),
       });
+
       if (!response.ok) {
-        return { success: false, message: "Could not remove user" };
+        return { success: false, message: "Failed to remove user" };
       } else {
-        return { success: true };
+        const data = (await response.json()) as User;
+        return { success: true, data };
       }
     } catch (e) {
       return { success: false, message: "Failed to remove user" };
@@ -208,20 +184,19 @@ export const api: API = {
   },
 
   async checkIfProjectManager(
+    username: string,
     projectName: string,
     token: string,
   ): Promise<APIResponse<boolean>> {
     try {
-      const response = await fetch(
-        `/api/checkIfProjectManager/${projectName}`,
-        {
+      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 {
@@ -233,7 +208,7 @@ export const api: API = {
         return { success: true, data };
       }
     } catch (e) {
-      return { success: false, message: "Failed to check if project manager" };
+      return { success: false, message: "fuck" };
     }
   },
 
@@ -262,30 +237,6 @@ export const api: API = {
     }
   },
 
-  async addUserToProject(
-    user: NewProjMember,
-    token: string,
-  ): Promise<APIResponse<NewProjMember>> {
-    try {
-      const response = await fetch("/api/addUserToProject", {
-        method: "PUT",
-        headers: {
-          "Content-Type": "application/json",
-          Authorization: "Bearer " + token,
-        },
-        body: JSON.stringify(user),
-      });
-
-      if (!response.ok) {
-        return { success: false, message: "Failed to add member" };
-      } else {
-        return { success: true, message: "Added member" };
-      }
-    } catch (e) {
-      return { success: false, message: "Failed to add member" };
-    }
-  },
-
   async renewToken(token: string): Promise<APIResponse<string>> {
     try {
       const response = await fetch("/api/loginrenew", {
@@ -337,7 +288,7 @@ export const api: API = {
   async submitWeeklyReport(
     weeklyReport: NewWeeklyReport,
     token: string,
-  ): Promise<APIResponse<string>> {
+  ): Promise<APIResponse<NewWeeklyReport>> {
     try {
       const response = await fetch("/api/submitWeeklyReport", {
         method: "POST",
@@ -355,8 +306,8 @@ export const api: API = {
         };
       }
 
-      const data = await response.text();
-      return { success: true, message: data };
+      const data = (await response.json()) as NewWeeklyReport;
+      return { success: true, data };
     } catch (e) {
       return {
         success: false,
@@ -497,88 +448,4 @@ export const api: API = {
       });
     }
   },
-  //Gets all users in a project
-  async getAllUsersProject(
-    projectName: string,
-    token: string,
-  ): Promise<APIResponse<UserProjectMember[]>> {
-    try {
-      const response = await fetch(`/api/getUsersProject/${projectName}`, {
-        method: "GET",
-        headers: {
-          "Content-Type": "application/json",
-          Authorization: "Bearer " + token,
-        },
-      });
-
-      if (!response.ok) {
-        return Promise.resolve({
-          success: false,
-          message: "Failed to get users",
-        });
-      } else {
-        const data = (await response.json()) as UserProjectMember[];
-        return Promise.resolve({ success: true, data });
-      }
-    } catch (e) {
-      return Promise.resolve({
-        success: false,
-        message: "API is not ok",
-      });
-    }
-  },
-
-  async changeUserName(
-    data: StrNameChange,
-    token: string,
-  ): Promise<APIResponse<void>> {
-    try {
-      const response = await fetch("/api/changeUserName", {
-        method: "PUT",
-        headers: {
-          "Content-Type": "application/json",
-          Authorization: "Bearer " + token,
-        },
-        body: JSON.stringify(data),
-      });
-
-      if (!response.ok) {
-        return { success: false, message: "Failed to change username" };
-      } else {
-        return { success: true };
-      }
-    } catch (e) {
-      return { success: false, message: "Failed to change username" };
-    }
-  },
-
-  async removeProject(
-    projectName: string,
-    token: string,
-  ): Promise<APIResponse<string>> {
-    try {
-      const response = await fetch(`/api/projectdelete/${projectName}`, {
-        method: "DELETE",
-        headers: {
-          "Content-Type": "application/json",
-          Authorization: "Bearer " + token,
-        },
-      });
-
-      if (!response.ok) {
-        return Promise.resolve({
-          success: false,
-          message: "Failed to remove project",
-        });
-      } else {
-        const data = await response.text();
-        return Promise.resolve({ success: true, message: data });
-      }
-    } catch (e) {
-      return Promise.resolve({
-        success: false,
-        message: "Failed to remove project",
-      });
-    }
-  },
 };

frontend/src/Components/AddMember.tsx

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

frontend/src/Components/AddUserToProject.tsx

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

frontend/src/Components/AllTimeReportsInProject.tsx

@@ -13,8 +13,6 @@ 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(
@@ -29,8 +27,10 @@ function AllTimeReportsInProject(): JSX.Element {
     }
   };
 
+  // Call getProjects when the component mounts
+  useEffect(() => {
     void getWeeklyReports();
-  }, [projectName]);
+  }, []);
 
   return (
     <>

frontend/src/Components/AllTimeReportsInProjectOtherUser.tsx

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

frontend/src/Components/ChangeUsername.tsx

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

frontend/src/Components/DeleteUser.tsx

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

frontend/src/Components/DisplayUnsignedReports.tsx

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

frontend/src/Components/DisplayUserProjects.tsx

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

frontend/src/Components/EditWeeklyReport.tsx

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

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

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

frontend/src/Components/OtherUsersTR.tsx

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

frontend/src/Components/ProjectInfoModal.tsx

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

frontend/src/Components/ProjectListAdmin.tsx

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

frontend/src/Components/ProjectMembers.tsx

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

frontend/src/Components/Register.tsx

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

frontend/src/Components/TimePerActivity.tsx

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

frontend/src/Components/TimePerRole.tsx

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

frontend/src/Components/UserInfoModal.tsx

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

frontend/src/Components/UserListAdmin.tsx

@@ -1,6 +1,5 @@
 import { useState } from "react";
 import UserInfoModal from "./UserInfoModal";
-import DeleteUser from "./DeleteUser";
 
 /**
  * A list of users for admin manage users page, that sets an onClick
@@ -30,9 +29,7 @@ export function UserListAdmin(props: { users: string[] }): JSX.Element {
   return (
     <>
       <UserInfoModal
-        manageMember={false}
         onClose={handleClose}
-        onDelete={() => DeleteUser}
         isVisible={modalVisible}
         username={username}
       />

frontend/src/Components/ViewOtherTimeReport.tsx

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

frontend/src/Pages/AdminPages/AdminManageProjects.tsx

@@ -2,22 +2,9 @@ import { Link } from "react-router-dom";
 import BackButton from "../../Components/BackButton";
 import BasicWindow from "../../Components/BasicWindow";
 import Button from "../../Components/Button";
-import { ProjectListAdmin } from "../../Components/ProjectListAdmin";
-import { Project } from "../../Types/goTypes";
-import GetProjects from "../../Components/GetProjects";
-import { useState } from "react";
 
 function AdminManageProjects(): JSX.Element {
-  const [projects, setProjects] = useState<Project[]>([]);
-  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 content = <></>;
 
   const buttons = (
     <>

frontend/src/Pages/AdminPages/AdminProjectAddMember.tsx

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

frontend/src/Pages/AdminPages/AdminProjectChangeUserRole.tsx

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

frontend/src/Pages/AdminPages/AdminProjectManageMembers.tsx

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

frontend/src/Pages/AdminPages/AdminProjectPage.tsx

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

frontend/src/Pages/AdminPages/AdminProjectStatistics.tsx

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

frontend/src/Pages/AdminPages/AdminProjectViewMemberInfo.tsx

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

frontend/src/Pages/LoginPage.css

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

frontend/src/Pages/ProjectManagerPages/PMOtherUsersTR.tsx

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

frontend/src/Pages/ProjectManagerPages/PMProjectMembers.tsx

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

frontend/src/Pages/ProjectManagerPages/PMTotalTimeActivity.tsx

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

frontend/src/Pages/ProjectManagerPages/PMTotalTimeRole.tsx

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

frontend/src/Pages/ProjectManagerPages/PMUnsignedReports.tsx

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

frontend/src/Pages/ProjectManagerPages/PMViewOtherUsersTR.tsx

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

frontend/src/Pages/ProjectManagerPages/PMViewUnsignedReport.tsx

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

frontend/src/Pages/UserPages/UserEditTimeReportPage.tsx

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

frontend/src/Types/goTypes.ts

@@ -151,16 +151,9 @@ export interface NewProject {
  */
 export interface RoleChange {
   username: string;
-  role: "project_manager" | "user";
+  role: 'project_manager' | 'user';
   projectname: string;
 }
-
-export interface NewProjMember {
-  username: string;
-  projectname: string;
-  role: string;
-}
-
 export interface NameChange {
   id: number /* int */;
   name: string;
@@ -191,11 +184,6 @@ export interface PublicUser {
   userId: string;
   username: string;
 }
-
-export interface UserProjectMember {
-  Username: string;
-  UserRole: string;
-}
 /**
  * wrapper type for token
  */

frontend/src/main.tsx

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

go.work.sum

@@ -0,0 +1,28 @@
+github.com/PuerkitoBio/purell v1.1.1/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0=
+github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE=
+github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
+github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51/go.mod h1:CzGEWj7cYgsdH8dAjBGEr58BoE7ScuLd+fwFZ44+/x8=
+github.com/klauspost/cpuid/v2 v2.2.3/go.mod h1:RVVoqg1df56z8g3pUjL/3lE5UfnlrJX8tyFgg4nqhuY=
+github.com/philhofer/fwd v1.1.2/go.mod h1:qkPdfjR2SIEbspLqpe1tO4n5yICnr2DY7mqEx2tUTP0=
+github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
+github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
+github.com/tinylib/msgp v1.1.8/go.mod h1:qkpG+2ldGg4xRFmx+jfTvZPxfGFhi64BcnL9vkCm/Tw=
+github.com/urfave/cli/v2 v2.3.0/go.mod h1:LJmUH05zAU44vOAcrfzZQKsZbVcdbOG8rtL3/XcUArI=
+github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
+golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4=
+golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU=
+golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOMs=
+golang.org/x/exp v0.0.0-20231108232855-2478ac86f678/go.mod h1:zk2irFbV9DP96SEBUUAy67IdHUaZuSnrz1n472HUCLE=
+golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE=
+golang.org/x/net v0.22.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg=
+golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
+golang.org/x/telemetry v0.0.0-20240228155512-f48c80bd79b2/go.mod h1:TeRTkGYfJXctD9OcfyVLyj2J3IxLnKwHJR8f4D8a3YE=
+golang.org/x/term v0.18.0/go.mod h1:ILwASektA3OnRv7amZ1xhE/KTR+u50pbXfZ03+6Nx58=
+golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
+golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
+gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
+lukechampine.com/uint128 v1.2.0/go.mod h1:c4eWIwlEGaxC/+H1VguhU4PHXNWDCDMUlWdIWl2j1gk=
+modernc.org/cc/v3 v3.41.0/go.mod h1:Ni4zjJYJ04CDOhG7dn640WGfwBzfE0ecX8TyMB0Fv0Y=
+modernc.org/ccgo/v3 v3.16.15/go.mod h1:yT7B+/E2m43tmMOT51GMoM98/MtHIcQQSleGnddkUNI=
+modernc.org/opt v0.1.3/go.mod h1:WdSiB5evDcignE70guQKxYUl14mgWtbClRi5wmkkTX0=
+sigs.k8s.io/yaml v1.3.0/go.mod h1:GeOyir5tyXNByN85N/dRIT9es5UQNerPYEKK56eTBm8=

package-lock.json

@@ -0,0 +1,6 @@
+{
+  "name": "TTime",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {}
+}

testing.py

@@ -2,7 +2,7 @@ import requests
 import string
 import random
 
-debug_output = True
+debug_output = False
 
 def gprint(*args, **kwargs):
     print("\033[92m", *args, "\033[00m", **kwargs)
@@ -41,10 +41,7 @@ getWeeklyReportsUserPath = base_url + "/api/getWeeklyReportsUser"
 checkIfProjectManagerPath = base_url + "/api/checkIfProjectManager"
 ProjectRoleChangePath = base_url + "/api/ProjectRoleChange"
 getUsersProjectPath = base_url + "/api/getUsersProject"
-getUnsignedReportsPath = base_url + "/api/getUnsignedReports"
-getChangeUserNamePath = base_url + "/api/changeUserName"
-getUpdateWeeklyReportPath = base_url + "/api/updateWeeklyReport"
-removeProjectPath = base_url + "/api/removeProject"
+getUsignedReportsPath = base_url + "/api/getUsignedReports"
 
 #ta bort auth i handlern för att få testet att gå igenom
 def test_ProjectRoleChange():
@@ -333,6 +330,45 @@ def test_get_weekly_reports_user():
     assert response.status_code == 200, "Get weekly reports for user failed"
     gprint("test_get_weekly_reports_user successful")
 
+def test_get_usigned_reports():
+    # Log in as the user
+
+    token = login(username, "always_same").json()["token"]
+    response = requests.post(
+        submitReportPath,
+        json={
+            "projectName": projectName,
+            "week": 3,
+            "developmentTime": 10,
+            "meetingTime": 5,
+            "adminTime": 5,
+            "ownWorkTime": 10,
+            "studyTime": 10,
+            "testingTime": 10,
+        },
+        headers={"Authorization": "Bearer " + token},
+    )
+    dprint(response.text)
+    assert response.status_code == 200, "Submit report failed"
+
+
+    # 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"
+
+    response = requests.get(
+        getUsignedReportsPath + "/" + projectName,
+        headers={"Authorization": "Bearer " + token},
+    )
+    dprint(response.text)
+    assert response.status_code == 200, "Get unsigned reports for user failed"
+    gprint("test_get_usigned_reports successful")
+
 
 
 # Test function to check if a user is a project manager
@@ -373,151 +409,9 @@ def test_ensure_manager_of_created_project():
     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")
-
-def test_update_weekly_report():
-    # Log in as the user
-    token = login(username, "always_same").json()["token"]
-
-    # Prepare the JSON data for updating the weekly report
-    update_data = {
-        "projectName": projectName,
-        "userName": username,
-        "week": 1,
-        "developmentTime": 8,
-        "meetingTime": 6,
-        "adminTime": 4,
-        "ownWorkTime": 11,
-        "studyTime": 8,
-        "testingTime": 18,
-    }
-
-    # Send a request to update the weekly report
-    response = requests.put(
-        getUpdateWeeklyReportPath,
-        json=update_data,
-        headers={"Authorization": "Bearer " + token},
-    )
-
-    # Check if the update was successful
-    assert response.status_code == 200, "Update weekly report failed"
-    gprint("test_update_weekly_report successful")
-
-
-def test_remove_project():
-    admin_username = randomString()
-    admin_password = "admin_password2"
-    dprint(
-        "Registering with username: ", admin_username, " and password: ", admin_password
-    )
-    response = requests.post(
-        registerPath, json={"username": admin_username, "password": admin_password}
-    )
-    dprint(response.text)
-
-    # Log in as the admin
-    admin_token = login(admin_username, admin_password).json()["token"]
-    response = requests.post(
-        promoteToAdminPath,
-        json={"username": admin_username},
-        headers={"Authorization": "Bearer " + admin_token},
-    )
-
-    # Create a new project
-    new_project = randomString()
-    response = requests.post(
-        addProjectPath,
-        json={"name": new_project, "description": "This is a project"},
-        headers={"Authorization": "Bearer " + admin_token},
-    )
-    assert response.status_code == 200, "Add project failed"
-
-    # Remove the project
-    response = requests.delete(
-        removeProjectPath + "/" + new_project,
-        headers={"Authorization": "Bearer " + admin_token},
-    )
-    assert response.status_code == 200, "Remove project failed"
-    gprint("test_remove_project successful")
-
-def test_get_unsigned_reports():
-    # Log in as the user
-        token = login("user2", "123").json()["token"]
-
-        # Make a request to get all unsigned reports
-        response = requests.get(
-            getUnsignedReportsPath + "/" + projectName,
-            headers={"Authorization": "Bearer " + token},
-        )
-        assert response.status_code == 200, "Get unsigned reports failed"
-        gprint("test_get_unsigned_reports successful")
-
 
 if __name__ == "__main__":
-    test_remove_project()
+    test_get_usigned_reports()
     test_get_user_projects()
     test_create_user()
     test_login()
@@ -530,9 +424,5 @@ if __name__ == "__main__":
     test_get_weekly_reports_user()
     test_check_if_project_manager()
     test_ProjectRoleChange()
+    #test_list_all_users_project()
     test_ensure_manager_of_created_project()
-    test_get_unsigned_reports()
-    test_list_all_users_project()
-    test_change_user_name()
-    test_update_weekly_report()
-