diff --git a/backend/internal/config/config_test.go b/backend/internal/config/config_test.go
index cb02a31..e8ddce8 100644
--- a/backend/internal/config/config_test.go
+++ b/backend/internal/config/config_test.go
@@ -5,8 +5,12 @@ import (
"testing"
)
+// TestNewConfig tests the creation of a new configuration object
func TestNewConfig(t *testing.T) {
+ // Arrange
c := NewConfig()
+
+ // Act & Assert
if c.Port != 8080 {
t.Errorf("Expected port to be 8080, got %d", c.Port)
}
@@ -24,9 +28,15 @@ func TestNewConfig(t *testing.T) {
}
}
+// TestWriteConfig tests the function to write the configuration to a file
func TestWriteConfig(t *testing.T) {
+ // Arrange
c := NewConfig()
+
+ //Act
err := c.WriteConfigToFile("test.toml")
+
+ // Assert
if err != nil {
t.Errorf("Expected no error, got %s", err)
}
@@ -35,14 +45,23 @@ func TestWriteConfig(t *testing.T) {
_ = os.Remove("test.toml")
}
+// TestReadConfig tests the function to read the configuration from a file
func TestReadConfig(t *testing.T) {
+ // Arrange
c := NewConfig()
+
+ // Act
err := c.WriteConfigToFile("test.toml")
+
+ // Assert
if err != nil {
t.Errorf("Expected no error, got %s", err)
}
+ // Act
c2, err := ReadConfigFromFile("test.toml")
+
+ // Assert
if err != nil {
t.Errorf("Expected no error, got %s", err)
}
diff --git a/backend/internal/database/db.go b/backend/internal/database/db.go
index 680d7e2..59d3277 100644
--- a/backend/internal/database/db.go
+++ b/backend/internal/database/db.go
@@ -27,6 +27,7 @@ type Database interface {
AddWeeklyReport(projectName string, userName string, week int, developmentTime int, meetingTime int, adminTime int, ownWorkTime int, studyTime int, testingTime int) error
AddUserToProject(username string, projectname string, role string) error
ChangeUserRole(username string, projectname string, role string) error
+ ChangeUserName(username string, newname string) error
GetAllUsersProject(projectname string) ([]UserProjectMember, error)
GetAllUsersApplication() ([]string, error)
GetProjectsForUser(username string) ([]types.Project, error)
@@ -65,9 +66,8 @@ const addWeeklyReport = `WITH UserLookup AS (SELECT id FROM users WHERE username
ProjectLookup AS (SELECT id FROM projects WHERE name = ?)
INSERT INTO weekly_reports (project_id, user_id, week, development_time, meeting_time, admin_time, own_work_time, study_time, testing_time)
VALUES ((SELECT id FROM ProjectLookup), (SELECT id FROM UserLookup),?, ?, ?, ?, ?, ?, ?);`
-const addUserToProject = "INSERT INTO user_roles (user_id, project_id, p_role) VALUES (?, ?, ?)" // WIP
+const addUserToProject = "INSERT INTO user_roles (user_id, project_id, p_role) VALUES (?, ?, ?)"
const changeUserRole = "UPDATE user_roles SET p_role = ? WHERE user_id = ? AND project_id = ?"
-
const getProjectsForUser = `SELECT p.id, p.name, p.description FROM projects p
JOIN user_roles ur ON p.id = ur.project_id
JOIN users u ON ur.user_id = u.id
@@ -131,7 +131,7 @@ func (d *Db) AddWeeklyReport(projectName string, userName string, week int, deve
}
// AddUserToProject adds a user to a project with a specified role.
-func (d *Db) AddUserToProject(username string, projectname string, role string) error { // WIP
+func (d *Db) AddUserToProject(username string, projectname string, role string) error {
var userid int
userid, err := d.GetUserId(username)
if err != nil {
@@ -169,6 +169,13 @@ func (d *Db) ChangeUserRole(username string, projectname string, role string) er
return err3
}
+// ChangeUserName changes the username of a user.
+func (d *Db) ChangeUserName(username string, newname string) error {
+ // Execute the SQL query to update the username
+ _, err := d.Exec("UPDATE users SET username = ? WHERE username = ?", newname, username)
+ return err
+}
+
// GetUserRole retrieves the role of a user within a project.
func (d *Db) GetUserRole(username string, projectname string) (string, error) {
var role string
diff --git a/backend/internal/database/db_test.go b/backend/internal/database/db_test.go
index 2448e7e..6757522 100644
--- a/backend/internal/database/db_test.go
+++ b/backend/internal/database/db_test.go
@@ -7,6 +7,7 @@ import (
// Tests are not guaranteed to be sequential
+// setupState initializes a database instance with necessary setup for testing
func setupState() (Database, error) {
db := DbConnect(":memory:")
err := db.Migrate()
@@ -16,11 +17,13 @@ func setupState() (Database, error) {
return db, nil
}
+// TestDbConnect tests the connection to the database
func TestDbConnect(t *testing.T) {
db := DbConnect(":memory:")
_ = db
}
+// TestDbAddUser tests the AddUser function of the database
func TestDbAddUser(t *testing.T) {
db, err := setupState()
if err != nil {
@@ -32,6 +35,7 @@ func TestDbAddUser(t *testing.T) {
}
}
+// TestDbGetUserId tests the GetUserID function of the database
func TestDbGetUserId(t *testing.T) {
db, err := setupState()
if err != nil {
@@ -52,6 +56,7 @@ func TestDbGetUserId(t *testing.T) {
}
}
+// TestDbAddProject tests the AddProject function of the database
func TestDbAddProject(t *testing.T) {
db, err := setupState()
if err != nil {
@@ -64,6 +69,7 @@ func TestDbAddProject(t *testing.T) {
}
}
+// TestDbRemoveUser tests the RemoveUser function of the database
func TestDbRemoveUser(t *testing.T) {
db, err := setupState()
if err != nil {
@@ -76,6 +82,7 @@ func TestDbRemoveUser(t *testing.T) {
}
}
+// TestPromoteToAdmin tests the PromoteToAdmin function of the database
func TestPromoteToAdmin(t *testing.T) {
db, err := setupState()
if err != nil {
@@ -93,6 +100,7 @@ func TestPromoteToAdmin(t *testing.T) {
}
}
+// TestAddWeeklyReport tests the AddWeeklyReport function of the database
func TestAddWeeklyReport(t *testing.T) {
db, err := setupState()
if err != nil {
@@ -115,6 +123,7 @@ func TestAddWeeklyReport(t *testing.T) {
}
}
+// TestAddUserToProject tests the AddUseToProject function of the database
func TestAddUserToProject(t *testing.T) {
db, err := setupState()
if err != nil {
@@ -142,6 +151,7 @@ func TestAddUserToProject(t *testing.T) {
}
}
+// TestChangeUserRole tests the ChangeUserRole function of the database
func TestChangeUserRole(t *testing.T) {
db, err := setupState()
if err != nil {
@@ -186,6 +196,7 @@ func TestChangeUserRole(t *testing.T) {
}
+// TestGetAllUsersProject tests the GetAllUsersProject function of the database
func TestGetAllUsersProject(t *testing.T) {
db, err := setupState()
if err != nil {
@@ -252,6 +263,7 @@ func TestGetAllUsersProject(t *testing.T) {
}
}
+// TestGetAllUsersApplication tests the GetAllUsersApplicsation function of the database
func TestGetAllUsersApplication(t *testing.T) {
db, err := setupState()
if err != nil {
@@ -298,6 +310,7 @@ func TestGetAllUsersApplication(t *testing.T) {
}
}
+// TestGetProjectsForUser tests the GetProjectsForUser function of the database
func TestGetProjectsForUser(t *testing.T) {
db, err := setupState()
if err != nil {
@@ -338,6 +351,7 @@ func TestGetProjectsForUser(t *testing.T) {
}
}
+// TestAddProject tests AddProject function of the database
func TestAddProject(t *testing.T) {
db, err := setupState()
if err != nil {
@@ -373,6 +387,7 @@ func TestAddProject(t *testing.T) {
}
}
+// TestGetWeeklyReport tests GetWeeklyReport function of the database
func TestGetWeeklyReport(t *testing.T) {
db, err := setupState()
if err != nil {
@@ -412,6 +427,7 @@ func TestGetWeeklyReport(t *testing.T) {
// Check other fields similarly
}
+// TestSignWeeklyReport tests SignWeeklyReport function of the database
func TestSignWeeklyReport(t *testing.T) {
db, err := setupState()
if err != nil {
@@ -484,6 +500,7 @@ func TestSignWeeklyReport(t *testing.T) {
}
}
+// TestSignWeeklyReportByAnotherProjectManager tests the scenario where a project manager attempts to sign a weekly report for a user who is not assigned to their project
func TestSignWeeklyReportByAnotherProjectManager(t *testing.T) {
db, err := setupState()
if err != nil {
@@ -537,6 +554,7 @@ func TestSignWeeklyReportByAnotherProjectManager(t *testing.T) {
}
}
+// TestGetProject tests GetProject function of the database
func TestGetProject(t *testing.T) {
db, err := setupState()
if err != nil {
@@ -657,3 +675,39 @@ func TestIsProjectManager(t *testing.T) {
t.Error("Expected projectManager to be a project manager, but it's not.")
}
}
+
+func TestChangeUserName(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)
+ }
+
+ // Change the user's name
+ err = db.ChangeUserName("testuser", "newname")
+ if err != nil {
+ t.Error("ChangeUserName failed:", err)
+ }
+
+ // Retrieve the user's ID
+ userID, err := db.GetUserId("newname")
+ if err != nil {
+ t.Error("GetUserId failed:", err)
+ }
+
+ // Ensure the user's ID matches the expected value
+ if userID != 1 {
+ t.Errorf("Expected user ID to be 1, got %d", userID)
+ }
+
+ // Attempt to retrieve the user by the old name
+ _, err = db.GetUserId("testuser")
+ if err == nil {
+ t.Error("Expected GetUserId to fail for the old name, but it didn't")
+ }
+}
diff --git a/backend/internal/handlers/global_state.go b/backend/internal/handlers/global_state.go
index 7a4213b..b88bdcd 100644
--- a/backend/internal/handlers/global_state.go
+++ b/backend/internal/handlers/global_state.go
@@ -22,22 +22,12 @@ type GlobalState interface {
PromoteToAdmin(c *fiber.Ctx) error
GetWeeklyReportsUserHandler(c *fiber.Ctx) error
IsProjectManagerHandler(c *fiber.Ctx) error
- // UpdateProject(c *fiber.Ctx) error // To update a project // WIP
- DeleteProject(c *fiber.Ctx) error // To delete a project // WIP
- // CreateTask(c *fiber.Ctx) error // To create a new task // WIP
- // GetTasks(c *fiber.Ctx) error // To get all tasks // WIP
- // GetTask(c *fiber.Ctx) error // To get a specific task // WIP
- // UpdateTask(c *fiber.Ctx) error // To update a task // WIP
- // DeleteTask(c *fiber.Ctx) error // To delete a task // WIP
- // CreateCollection(c *fiber.Ctx) error // To create a new collection // WIP
- // GetCollections(c *fiber.Ctx) error // To get all collections // WIP
- // GetCollection(c *fiber.Ctx) error // To get a specific collection // WIP
- // UpdateCollection(c *fiber.Ctx) error // To update a collection // WIP
- // DeleteCollection(c *fiber.Ctx) error // To delete a collection // WIP
- // SignCollection(c *fiber.Ctx) error // To sign a collection // WIP
+ DeleteProject(c *fiber.Ctx) error // To delete a project // WIP
ListAllUsers(c *fiber.Ctx) error // To get a list of all users in the application database
ListAllUsersProject(c *fiber.Ctx) error // To get a list of all users for a specific project
ProjectRoleChange(c *fiber.Ctx) error // To change a users role in a project
+ ChangeUserName(c *fiber.Ctx) error // WIP
+ GetAllUsersProject(c *fiber.Ctx) error // WIP
}
// "Constructor"
diff --git a/backend/internal/handlers/handlers_report_related.go b/backend/internal/handlers/handlers_report_related.go
index b745400..47d076d 100644
--- a/backend/internal/handlers/handlers_report_related.go
+++ b/backend/internal/handlers/handlers_report_related.go
@@ -117,14 +117,22 @@ func (gs *GState) SignReport(c *fiber.Ctx) error {
// GetWeeklyReportsUserHandler retrieves all weekly reports for a user in a specific project
func (gs *GState) GetWeeklyReportsUserHandler(c *fiber.Ctx) error {
- // Extract necessary parameters from the request
- username := c.Params("username")
+ // Extract the necessary parameters from the token
+ user := c.Locals("user").(*jwt.Token)
+ claims := user.Claims.(jwt.MapClaims)
+ username := claims["name"].(string)
+
+ // Extract necessary (path) parameters from the request
projectName := c.Params("projectName")
+ // TODO: Here we need to check whether the user is a member of the project
+ // If not, we should return an error. On the other hand, if the user not a member,
+ // the returned list of reports will (should) allways be empty.
+
// Retrieve weekly reports for the user in the project from the database
reports, err := gs.Db.GetWeeklyReportsUser(username, projectName)
if err != nil {
- log.Info("Error getting weekly reports for user:", err)
+ log.Error("Error getting weekly reports for user:", username, "in project:", projectName, ":", err)
return c.Status(500).SendString(err.Error())
}
diff --git a/backend/internal/handlers/handlers_user_related.go b/backend/internal/handlers/handlers_user_related.go
index 75b8953..116ce90 100644
--- a/backend/internal/handlers/handlers_user_related.go
+++ b/backend/internal/handlers/handlers_user_related.go
@@ -105,7 +105,7 @@ func (gs *GState) Login(c *fiber.Ctx) error {
if err != nil {
log.Info("Error checking admin status:", err)
return c.Status(500).SendString(err.Error())
-}
+ }
// Create the Claims
claims := jwt.MapClaims{
"name": u.Username,
@@ -187,17 +187,31 @@ func (gs *GState) ListAllUsers(c *fiber.Ctx) error {
return c.JSON(users)
}
-// @Summary PromoteToAdmin
-// @Description promote chosen user to admin
-// @Tags User
-// @Accept json
-// @Produce plain
-// @Param NewUser body types.NewUser true "user info"
-// @Success 200 {json} json "Successfully prometed user"
-// @Failure 400 {string} string "bad request"
-// @Failure 401 {string} string "Unauthorized"
-// @Failure 500 {string} string "Internal server error"
-// @Router /promoteToAdmin [post]
+func (gs *GState) GetAllUsersProject(c *fiber.Ctx) error {
+ // Get all users from a project
+ projectName := c.Params("projectName")
+ users, err := gs.Db.GetAllUsersProject(projectName)
+ if err != nil {
+ log.Info("Error getting users from project:", err) // Debug print
+ return c.Status(500).SendString(err.Error())
+ }
+
+ log.Info("Returning all users")
+ // Return the list of users as JSON
+ return c.JSON(users)
+}
+
+// @Summary PromoteToAdmin
+// @Description promote chosen user to admin
+// @Tags User
+// @Accept json
+// @Produce plain
+// @Param NewUser body types.NewUser true "user info"
+// @Success 200 {json} json "Successfully prometed user"
+// @Failure 400 {string} string "bad request"
+// @Failure 401 {string} string "Unauthorized"
+// @Failure 500 {string} string "Internal server error"
+// @Router /promoteToAdmin [post]
func (gs *GState) PromoteToAdmin(c *fiber.Ctx) error {
// Extract the username from the request body
var newUser types.NewUser
@@ -219,3 +233,37 @@ func (gs *GState) PromoteToAdmin(c *fiber.Ctx) error {
// Return a success message
return c.SendStatus(fiber.StatusOK)
}
+
+// Changes a users name in the database
+func (gs *GState) ChangeUserName(c *fiber.Ctx) error {
+
+ //check token and get username of current user
+ user := c.Locals("user").(*jwt.Token)
+ claims := user.Claims.(jwt.MapClaims)
+ projectManagerUsername := claims["name"].(string)
+ log.Info(projectManagerUsername)
+ // Extract the necessary parameters from the request
+ data := new(types.NameChange)
+ if err := c.BodyParser(data); err != nil {
+ log.Info("error parsing username, project or role")
+ return c.Status(400).SendString(err.Error())
+ }
+
+ // 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 !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 within the project in the database
+ if err := gs.Db.ChangeUserName(projectManagerUsername, data.Name); err != nil {
+ return c.Status(500).SendString(err.Error())
+ }
+
+ // Return a success message
+ return c.SendStatus(fiber.StatusOK)
+}
diff --git a/backend/internal/types/project.go b/backend/internal/types/project.go
index c336bcb..6a7c91a 100644
--- a/backend/internal/types/project.go
+++ b/backend/internal/types/project.go
@@ -19,3 +19,8 @@ type RoleChange struct {
Username string `json:"username"`
Projectname string `json:"projectname"`
}
+
+type NameChange struct {
+ ID int `json:"id" db:"id"`
+ Name string `json:"name" db:"name"`
+}
diff --git a/backend/internal/types/users.go b/backend/internal/types/users.go
index d3f2170..88b4f06 100644
--- a/backend/internal/types/users.go
+++ b/backend/internal/types/users.go
@@ -32,3 +32,8 @@ type PublicUser struct {
type Token struct {
Token string `json:"token"`
}
+
+type StrNameChange struct {
+ PrevName string `json:"prevName" db:"prevName"`
+ NewName string `json:"newName" db:"newName"`
+}
diff --git a/backend/main.go b/backend/main.go
index d0ccdb1..dc4bf0a 100644
--- a/backend/main.go
+++ b/backend/main.go
@@ -87,15 +87,17 @@ func main() {
server.Get("/api/getUserProjects", gs.GetUserProjects)
server.Post("/api/loginrenew", gs.LoginRenew)
server.Delete("/api/userdelete/:username", gs.UserDelete) // Perhaps just use POST to avoid headaches
- server.Delete("api/project", gs.DeleteProject) // WIP
- server.Post("/api/project", gs.CreateProject)
+ server.Delete("api/project/:projectID", gs.DeleteProject) // WIP
+ server.Post("/api/project", gs.CreateProject) // WIP
server.Get("/api/project/:projectId", gs.GetProject)
+ server.Get("/api/project/getAllUsers", gs.GetAllUsersProject)
server.Get("/api/getWeeklyReport", gs.GetWeeklyReport)
server.Post("/api/signReport", gs.SignReport)
server.Put("/api/addUserToProject", gs.AddUserToProjectHandler)
+ server.Put("/api/changeUserName", gs.ChangeUserName)
server.Post("/api/promoteToAdmin", gs.PromoteToAdmin)
server.Get("/api/users/all", gs.ListAllUsers)
- server.Get("/api/getWeeklyReportsUser", gs.GetWeeklyReportsUserHandler)
+ server.Get("/api/getWeeklyReportsUser/:projectName", gs.GetWeeklyReportsUserHandler)
server.Get("api/checkIfProjectManager", gs.IsProjectManagerHandler)
server.Post("/api/ProjectRoleChange", gs.ProjectRoleChange)
server.Get("/api/getUsersProject/:projectName", gs.ListAllUsersProject)
diff --git a/frontend/src/API/API.ts b/frontend/src/API/API.ts
index 69a46af..8d5dd3d 100644
--- a/frontend/src/API/API.ts
+++ b/frontend/src/API/API.ts
@@ -5,6 +5,7 @@ import {
Project,
NewProject,
UserProjectMember,
+ WeeklyReport,
} from "../Types/goTypes";
// This type of pattern should be hard to misuse
@@ -21,10 +22,17 @@ interface API {
registerUser(user: NewUser): Promise<APIResponse<User>>;
/** Remove a user */
removeUser(username: string, token: string): Promise<APIResponse<User>>;
+ /** Check if user is project manager */
+ checkIfProjectManager(
+ username: string,
+ projectName: string,
+ token: string,
+ ): Promise<APIResponse<boolean>>;
/** Login */
login(NewUser: NewUser): Promise<APIResponse<string>>;
/** Renew the token */
renewToken(token: string): Promise<APIResponse<string>>;
+ /** Promote user to admin */
/** Create a project */
createProject(
project: NewProject,
@@ -41,7 +49,19 @@ interface API {
projectName: string,
week: string,
token: string,
- ): Promise<APIResponse<NewWeeklyReport>>;
+ ): Promise<APIResponse<WeeklyReport>>;
+ /**
+ * Returns all the weekly reports for a user in a particular project
+ * The username is derived from the token
+ *
+ * @param {string} projectName The name of the project
+ * @param {string} token The token of the user
+ * @returns {APIResponse<WeeklyReport[]>} A list of weekly reports
+ */
+ getWeeklyReportsForUser(
+ projectName: string,
+ token: string,
+ ): Promise<APIResponse<WeeklyReport[]>>;
/** Gets all the projects of a user*/
getUserProjects(token: string): Promise<APIResponse<Project[]>>;
/** Gets a project from id*/
@@ -109,6 +129,35 @@ export const api: API = {
}
},
+ async checkIfProjectManager(
+ username: string,
+ projectName: string,
+ token: string,
+ ): Promise<APIResponse<boolean>> {
+ try {
+ const response = await fetch("/api/checkIfProjectManager", {
+ method: "GET",
+ headers: {
+ "Content-Type": "application/json",
+ Authorization: "Bearer " + token,
+ },
+ body: JSON.stringify({ username, projectName }),
+ });
+
+ if (!response.ok) {
+ return {
+ success: false,
+ message: "Failed to check if project manager",
+ };
+ } else {
+ const data = (await response.json()) as boolean;
+ return { success: true, data };
+ }
+ } catch (e) {
+ return { success: false, message: "fuck" };
+ }
+ },
+
async createProject(
project: NewProject,
token: string,
@@ -218,7 +267,7 @@ export const api: API = {
projectName: string,
week: string,
token: string,
- ): Promise<APIResponse<NewWeeklyReport>> {
+ ): Promise<APIResponse<WeeklyReport>> {
try {
const response = await fetch("/api/getWeeklyReport", {
method: "GET",
@@ -232,7 +281,7 @@ export const api: API = {
if (!response.ok) {
return { success: false, message: "Failed to get weekly report" };
} else {
- const data = (await response.json()) as NewWeeklyReport;
+ const data = (await response.json()) as WeeklyReport;
return { success: true, data };
}
} catch (e) {
@@ -240,6 +289,38 @@ export const api: API = {
}
},
+ async getWeeklyReportsForUser(
+ projectName: string,
+ token: string,
+ ): Promise<APIResponse<WeeklyReport[]>> {
+ try {
+ const response = await fetch(`/api/getWeeklyReportsUser/${projectName}`, {
+ method: "GET",
+ headers: {
+ "Content-Type": "application/json",
+ Authorization: "Bearer " + token,
+ },
+ });
+
+ if (!response.ok) {
+ return {
+ success: false,
+ message:
+ "Failed to get weekly reports for project: Response code " +
+ response.status,
+ };
+ } else {
+ const data = (await response.json()) as WeeklyReport[];
+ return { success: true, data };
+ }
+ } catch (e) {
+ return {
+ success: false,
+ message: "Failed to get weekly reports for project, unknown error",
+ };
+ }
+ },
+
async login(NewUser: NewUser): Promise<APIResponse<string>> {
try {
const response = await fetch("/api/login", {
diff --git a/frontend/src/Components/AllTimeReportsInProject.tsx b/frontend/src/Components/AllTimeReportsInProject.tsx
index 067712e..1a34e41 100644
--- a/frontend/src/Components/AllTimeReportsInProject.tsx
+++ b/frontend/src/Components/AllTimeReportsInProject.tsx
@@ -1,74 +1,36 @@
-import React, { useEffect, useState } from "react";
-import { NewWeeklyReport } from "../Types/goTypes";
+//Info: This component is used to display all the time reports for a project. It will display the week number,
+//total time spent, and if the report has been signed or not. The user can click on a report to edit it.
+import { useEffect, useState } from "react";
+import { WeeklyReport } from "../Types/goTypes";
import { Link, useParams } from "react-router-dom";
+import { api } from "../API/API";
+/**
+ * Renders a component that displays all the time reports for a specific project.
+ * @returns JSX.Element representing the component.
+ */
function AllTimeReportsInProject(): JSX.Element {
const { projectName } = useParams();
- const [weeklyReports, setWeeklyReports] = useState<NewWeeklyReport[]>([]);
-
- /* const getWeeklyReports = async (): Promise<void> => {
- const token = localStorage.getItem("accessToken") ?? "";
- const response = await api.getWeeklyReports(token);
- console.log(response);
- if (response.success) {
- setWeeklyReports(response.data ?? []);
- } else {
- console.error(response.message);
- }
-}; */
+ const [weeklyReports, setWeeklyReports] = useState<WeeklyReport[]>([]);
const getWeeklyReports = async (): Promise<void> => {
- const report: NewWeeklyReport[] = [
- {
- projectName: projectName ?? "",
- week: 10,
- developmentTime: 1,
- meetingTime: 1,
- adminTime: 1,
- ownWorkTime: 1,
- studyTime: 1,
- testingTime: 1,
- },
- {
- projectName: projectName ?? "",
- week: 11,
- developmentTime: 1,
- meetingTime: 1,
- adminTime: 1,
- ownWorkTime: 100,
- studyTime: 1,
- testingTime: 1,
- },
- {
- projectName: projectName ?? "",
- week: 12,
- developmentTime: 1,
- meetingTime: 1,
- adminTime: 1,
- ownWorkTime: 1,
- studyTime: 1,
- testingTime: 1000,
- },
- {
- projectName: projectName ?? "",
- week: 20,
- developmentTime: 1,
- meetingTime: 1,
- adminTime: 1,
- ownWorkTime: 1,
- studyTime: 1,
- testingTime: 10000,
- },
- // Add more reports as needed
- ];
- setWeeklyReports(report);
- await Promise.resolve();
+ const token = localStorage.getItem("accessToken") ?? "";
+ const response = await api.getWeeklyReportsForUser(
+ token,
+ projectName ?? "",
+ );
+ console.log(response);
+ if (response.success) {
+ setWeeklyReports(response.data ?? []);
+ } else {
+ console.error(response.message);
+ }
};
// Call getProjects when the component mounts
useEffect(() => {
void getWeeklyReports();
- }, []);
+ });
return (
<>
@@ -96,7 +58,7 @@ function AllTimeReportsInProject(): JSX.Element {
</h1>
<h1>
<span className="font-bold">{"Signed: "}</span>
- YES
+ {newWeeklyReport.signedBy ? "YES" : "NO"}
</h1>
</div>
</Link>
diff --git a/frontend/src/Components/AuthorizedRoute.tsx b/frontend/src/Components/AuthorizedRoute.tsx
new file mode 100644
index 0000000..d9c8c59
--- /dev/null
+++ b/frontend/src/Components/AuthorizedRoute.tsx
@@ -0,0 +1,18 @@
+import { Navigate } from "react-router-dom";
+import React from "react";
+
+interface AuthorizedRouteProps {
+ children: React.ReactNode;
+ isAuthorized: boolean;
+}
+
+export function AuthorizedRoute({
+ children,
+ isAuthorized,
+}: AuthorizedRouteProps): JSX.Element {
+ if (!isAuthorized) {
+ return <Navigate to="/unauthorized" />;
+ }
+
+ return children as React.ReactElement;
+}
diff --git a/frontend/src/Components/BackButton.tsx b/frontend/src/Components/BackButton.tsx
index 7a1ac81..4f58140 100644
--- a/frontend/src/Components/BackButton.tsx
+++ b/frontend/src/Components/BackButton.tsx
@@ -1,5 +1,11 @@
+//info: Back button component to navigate back to the previous page
import { useNavigate } from "react-router-dom";
+/**
+ * Renders a back button component.
+ *
+ * @returns The JSX element representing the back button.
+ */
function BackButton(): JSX.Element {
const navigate = useNavigate();
const goBack = (): void => {
diff --git a/frontend/src/Components/BackgroundAnimation.tsx b/frontend/src/Components/BackgroundAnimation.tsx
index 5f402c0..87fca9e 100644
--- a/frontend/src/Components/BackgroundAnimation.tsx
+++ b/frontend/src/Components/BackgroundAnimation.tsx
@@ -1,5 +1,10 @@
+//info: Background animation component to animate the background of loginpage
import { useEffect } from "react";
+/**
+ * Renders a background animation component.
+ * This component pre-loads images and starts a background transition animation.
+ */
const BackgroundAnimation = (): JSX.Element => {
useEffect(() => {
const images = [
diff --git a/frontend/src/Components/BasicWindow.tsx b/frontend/src/Components/BasicWindow.tsx
index d5fd3b6..d53d367 100644
--- a/frontend/src/Components/BasicWindow.tsx
+++ b/frontend/src/Components/BasicWindow.tsx
@@ -1,6 +1,16 @@
+//info: Basic window component to display content and buttons of a page, inclduing header and footer
+//content to insert is placed in the content prop, and buttons in the buttons prop
import Header from "./Header";
import Footer from "./Footer";
+/**
+ * Renders a basic window component with a header, content, and footer.
+ *
+ * @param {Object} props - The component props.
+ * @param {React.ReactNode} props.content - The content to be rendered in the window.
+ * @param {React.ReactNode} props.buttons - The buttons to be rendered in the footer.
+ * @returns {JSX.Element} The rendered basic window component.
+ */
function BasicWindow({
content,
buttons,
diff --git a/frontend/src/Components/Button.tsx b/frontend/src/Components/Button.tsx
index 38a1853..13ae807 100644
--- a/frontend/src/Components/Button.tsx
+++ b/frontend/src/Components/Button.tsx
@@ -1,3 +1,12 @@
+/**
+ * Button component to display a button with text and onClick function.
+ *
+ * @param {Object} props - The component props.
+ * @param {string} props.text - The text to display on the button.
+ * @param {Function} props.onClick - The function to run when the button is clicked.
+ * @param {"submit" | "button" | "reset"} props.type - The type of button.
+ * @returns {JSX.Element} The rendered Button component.
+ */
function Button({
text,
onClick,
diff --git a/frontend/src/Components/ChangeRoles.tsx b/frontend/src/Components/ChangeRoles.tsx
new file mode 100644
index 0000000..e11d623
--- /dev/null
+++ b/frontend/src/Components/ChangeRoles.tsx
@@ -0,0 +1,83 @@
+import { useState } from "react";
+import { useParams } from "react-router-dom";
+import Button from "./Button";
+
+export default function ChangeRoles(): JSX.Element {
+ const [selectedRole, setSelectedRole] = useState("");
+ const { username } = useParams();
+
+ const handleRoleChange = (
+ event: React.ChangeEvent<HTMLInputElement>,
+ ): void => {
+ setSelectedRole(event.target.value);
+ };
+
+ // const handleSubmit = async (event: React.FormEvent<HTMLFormElement>) => {
+ // event.preventDefault();
+
+ // const response = await api.changeRole(username, selectedRole, token);
+ // if (response.success) {
+ // console.log("Role changed successfully");
+ // } else {
+ // console.error("Failed to change role:", response.message);
+ // }
+ // };
+
+ return (
+ <>
+ <h1 className="font-bold text-[30px] mb-[20px]">
+ Change roll for: {username}
+ </h1>
+ <form
+ className="text-[20px] font-bold border-4 border-black bg-white flex flex-col items-center justify-center min-h-[50vh] h-fit w-[30vw] rounded-3xl content-center overflow-scroll space-y-[10vh] p-[30px]"
+ onSubmit={undefined}
+ >
+ <div className="self-start">
+ <div>
+ <label>
+ <input
+ type="radio"
+ value="System Manager"
+ checked={selectedRole === "System Manager"}
+ onChange={handleRoleChange}
+ className="ml-2 mr-2 mb-6"
+ />
+ System Manager
+ </label>
+ </div>
+ <div>
+ <label>
+ <input
+ type="radio"
+ value="Developer"
+ checked={selectedRole === "Developer"}
+ onChange={handleRoleChange}
+ className="ml-2 mr-2 mb-6"
+ />
+ Developer
+ </label>
+ </div>
+ <div>
+ <label>
+ <input
+ type="radio"
+ value="Tester"
+ checked={selectedRole === "Tester"}
+ onChange={handleRoleChange}
+ className="ml-2 mr-2 mb-6"
+ />
+ Tester
+ </label>
+ </div>
+ </div>
+ <Button
+ text="Save"
+ onClick={(): void => {
+ return;
+ }}
+ type="submit"
+ />
+ </form>
+ </>
+ );
+}
diff --git a/frontend/src/Components/ChangeUsername.tsx b/frontend/src/Components/ChangeUsername.tsx
index ffe3809..3c35e94 100644
--- a/frontend/src/Components/ChangeUsername.tsx
+++ b/frontend/src/Components/ChangeUsername.tsx
@@ -1,5 +1,4 @@
import React, { useState } from "react";
-import { api } from "../API/API";
import InputField from "./InputField";
function ChangeUsername(): JSX.Element {
@@ -9,16 +8,16 @@ function ChangeUsername(): JSX.Element {
setNewUsername(e.target.value);
};
- const handleSubmit = async (): Promise<void> => {
- try {
- // Call the API function to update the username
- await api.updateUsername(newUsername);
- // Optionally, add a success message or redirect the user
- } catch (error) {
- console.error("Error updating username:", error);
- // Optionally, handle the error
- }
- };
+ // 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>
diff --git a/frontend/src/Components/CountButton.tsx b/frontend/src/Components/CountButton.tsx
deleted file mode 100644
index a6f1b30..0000000
--- a/frontend/src/Components/CountButton.tsx
+++ /dev/null
@@ -1,38 +0,0 @@
-import { useState, useEffect } from "react";
-
-// Interface for the response from the server
-// This should eventually reside in a dedicated file
-interface CountResponse {
- pressCount: number;
-}
-
-// Some constants for the button
-const BUTTON_ENDPOINT = "/api/button";
-
-// A simple button that counts how many times it's been pressed
-export function CountButton(): JSX.Element {
- const [count, setCount] = useState<number>(NaN);
-
- // useEffect with a [] dependency array runs only once
- useEffect(() => {
- async function getCount(): Promise<void> {
- const response = await fetch(BUTTON_ENDPOINT);
- const data = (await response.json()) as CountResponse;
- setCount(data.pressCount);
- }
- void getCount();
- }, []);
-
- // This is what runs on every button click
- function press(): void {
- async function pressPost(): Promise<void> {
- const response = await fetch(BUTTON_ENDPOINT, { method: "POST" });
- const data = (await response.json()) as CountResponse;
- setCount(data.pressCount);
- }
- void pressPost();
- }
-
- // Return some JSX with the button and associated handler
- return <button onClick={press}>count is {count}</button>;
-}
diff --git a/frontend/src/Components/DisplayUserProjects.tsx b/frontend/src/Components/DisplayUserProjects.tsx
new file mode 100644
index 0000000..f4fd782
--- /dev/null
+++ b/frontend/src/Components/DisplayUserProjects.tsx
@@ -0,0 +1,45 @@
+import { useState, useEffect } from "react";
+import { Project } from "../Types/goTypes";
+import { Link } from "react-router-dom";
+import { api } from "../API/API";
+
+/**
+ * Renders a component that displays the projects a user is a part of and links to the projects start-page.
+ * @returns The JSX element representing the component.
+ */
+function DisplayUserProject(): JSX.Element {
+ const [projects, setProjects] = useState<Project[]>([]);
+
+ const getProjects = async (): Promise<void> => {
+ const token = localStorage.getItem("accessToken") ?? "";
+ const response = await api.getUserProjects(token);
+ console.log(response);
+ if (response.success) {
+ setProjects(response.data ?? []);
+ } else {
+ console.error(response.message);
+ }
+ };
+
+ // Call getProjects when the component mounts
+ useEffect(() => {
+ void getProjects();
+ }, []);
+
+ return (
+ <>
+ <h1 className="font-bold text-[30px] mb-[20px]">Your Projects</h1>
+ <div className="border-4 border-black bg-white flex flex-col items-center justify-center min-h-[65vh] h-fit w-[50vw] rounded-3xl content-center overflow-scroll space-y-[10vh] p-[30px]">
+ {projects.map((project, index) => (
+ <Link to={`/project/${project.name}`} key={index}>
+ <h1 className="font-bold underline text-[30px] cursor-pointer">
+ {project.name}
+ </h1>
+ </Link>
+ ))}
+ </div>
+ </>
+ );
+}
+
+export default DisplayUserProject;
diff --git a/frontend/src/Components/EditWeeklyReport.tsx b/frontend/src/Components/EditWeeklyReport.tsx
index 3017204..76c2b94 100644
--- a/frontend/src/Components/EditWeeklyReport.tsx
+++ b/frontend/src/Components/EditWeeklyReport.tsx
@@ -1,9 +1,13 @@
import { useState, useEffect } from "react";
-import { NewWeeklyReport } from "../Types/goTypes";
+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
+ */
export default function GetWeeklyReport(): JSX.Element {
const [week, setWeek] = useState(0);
const [developmentTime, setDevelopmentTime] = useState(0);
@@ -27,8 +31,10 @@ export default function GetWeeklyReport(): JSX.Element {
);
if (response.success) {
- const report: NewWeeklyReport = response.data ?? {
- projectName: "",
+ const report: WeeklyReport = response.data ?? {
+ reportId: 0,
+ userId: 0,
+ projectId: 0,
week: 0,
developmentTime: 0,
meetingTime: 0,
@@ -37,7 +43,6 @@ export default function GetWeeklyReport(): JSX.Element {
studyTime: 0,
testingTime: 0,
};
-
setWeek(report.week);
setDevelopmentTime(report.developmentTime);
setMeetingTime(report.meetingTime);
diff --git a/frontend/src/Components/Footer.tsx b/frontend/src/Components/Footer.tsx
index a3b7469..192926f 100644
--- a/frontend/src/Components/Footer.tsx
+++ b/frontend/src/Components/Footer.tsx
@@ -1,5 +1,13 @@
+//info: Footer component to display the footer of a page where the buttons are placed
import React from "react";
+/**
+ * Footer component.
+ *
+ * @param {Object} props - The component props.
+ * @param {React.ReactNode} props.children - The children elements to render inside the footer (buttons).
+ * @returns {JSX.Element} The rendered footer component.
+ */
function Footer({ children }: { children: React.ReactNode }): JSX.Element {
return (
<footer className="bg-white">
diff --git a/frontend/src/Components/Header.tsx b/frontend/src/Components/Header.tsx
index 5cdb421..eb4fa5a 100644
--- a/frontend/src/Components/Header.tsx
+++ b/frontend/src/Components/Header.tsx
@@ -1,7 +1,12 @@
+//info: Header component to display the header of the page including the logo and user information where thr user can logout
import { useState } from "react";
import { Link } from "react-router-dom";
import backgroundImage from "../assets/1.jpg";
+/**
+ * Renders the header component.
+ * @returns JSX.Element representing the header component.
+ */
function Header(): JSX.Element {
const [isOpen, setIsOpen] = useState(false);
diff --git a/frontend/src/Components/NewWeeklyReport.tsx b/frontend/src/Components/NewWeeklyReport.tsx
index e53823d..292ddf5 100644
--- a/frontend/src/Components/NewWeeklyReport.tsx
+++ b/frontend/src/Components/NewWeeklyReport.tsx
@@ -1,9 +1,15 @@
+//info: New weekly report form component to create a new weekly report to
+//sumbit development time, meeting time, admin time, own work time, study time and testing time
import { useState } from "react";
import type { NewWeeklyReport } from "../Types/goTypes";
import { api } from "../API/API";
import { useNavigate, useParams } from "react-router-dom";
import Button from "./Button";
+/**
+ * Renders a form for creating a new weekly report.
+ * @returns The JSX element representing the new weekly report form.
+ */
export default function NewWeeklyReport(): JSX.Element {
const [week, setWeek] = useState<number>(0);
const [developmentTime, setDevelopmentTime] = useState<number>();
diff --git a/frontend/src/Components/PMProjectMenu.tsx b/frontend/src/Components/PMProjectMenu.tsx
new file mode 100644
index 0000000..ce7c5c5
--- /dev/null
+++ b/frontend/src/Components/PMProjectMenu.tsx
@@ -0,0 +1,34 @@
+import { Link, useParams } from "react-router-dom";
+import { JSX } from "react/jsx-runtime";
+
+function PMProjectMenu(): JSX.Element {
+ const { projectName } = useParams();
+ return (
+ <>
+ <h1 className="font-bold text-[30px] mb-[20px]">{projectName}</h1>
+ <div className="border-4 border-black bg-white flex flex-col items-center justify-center min-h-[65vh] h-fit w-[50vw] rounded-3xl content-center overflow-scroll space-y-[5vh] p-[30px]">
+ <Link to={`/timeReports/${projectName}/`}>
+ <h1 className="font-bold underline text-[30px] cursor-pointer">
+ Your Time Reports
+ </h1>
+ </Link>
+ <Link to={`/newTimeReport/${projectName}`}>
+ <h1 className="font-bold underline text-[30px] cursor-pointer">
+ New Time Report
+ </h1>
+ </Link>
+ <Link to={`/projectMembers/${projectName}`}>
+ <h1 className="font-bold underline text-[30px] cursor-pointer">
+ Statistics
+ </h1>
+ </Link>
+ <Link to={`/unsignedReports/${projectName}`}>
+ <h1 className="font-bold underline text-[30px] cursor-pointer">
+ Unsigned Time Reports
+ </h1>
+ </Link>
+ </div>
+ </>
+ );
+}
+export default PMProjectMenu;
diff --git a/frontend/src/Components/ProjectMembers.tsx b/frontend/src/Components/ProjectMembers.tsx
new file mode 100644
index 0000000..73e29e5
--- /dev/null
+++ b/frontend/src/Components/ProjectMembers.tsx
@@ -0,0 +1,99 @@
+import { useEffect, useState } from "react";
+import { Link, useParams } from "react-router-dom";
+
+function ProjectMembers(): JSX.Element {
+ const { projectName } = useParams();
+ const [projectMembers, setProjectMembers] = useState<ProjectMember[]>([]);
+
+ // const getProjectMembers = async (): Promise<void> => {
+ // const token = localStorage.getItem("accessToken") ?? "";
+ // const response = await api.getProjectMembers(projectName ?? "", token);
+ // console.log(response);
+ // if (response.success) {
+ // setProjectMembers(response.data ?? []);
+ // } else {
+ // console.error(response.message);
+ // }
+ // };
+
+ interface ProjectMember {
+ username: string;
+ role: string;
+ }
+
+ const mockProjectMembers = [
+ {
+ username: "username1",
+ role: "Project Manager",
+ },
+ {
+ username: "username2",
+ role: "System Manager",
+ },
+ {
+ username: "username3",
+ role: "Developer",
+ },
+ {
+ username: "username4",
+ role: "Tester",
+ },
+ {
+ username: "username5",
+ role: "Tester",
+ },
+ {
+ username: "username6",
+ role: "Tester",
+ },
+ ];
+
+ const getProjectMembers = async (): Promise<void> => {
+ // Use the mock data
+ setProjectMembers(mockProjectMembers);
+
+ await Promise.resolve();
+ };
+
+ useEffect(() => {
+ void getProjectMembers();
+ });
+
+ return (
+ <>
+ <div className="border-4 border-black bg-white flex flex-col items-center justify-center min-h-[65vh] h-fit w-[70vw] rounded-3xl content-center overflow-scroll space-y-[10vh] p-[30px] text-[20px]">
+ {projectMembers.map((projectMember, index) => (
+ <h1 key={index} className="border-b-2 border-black w-full">
+ <div className="flex justify-between">
+ <div className="flex">
+ <h1>{projectMember.username}</h1>
+ <span className="ml-6 mr-2 font-bold">Role:</span>
+ <h1>{projectMember.role}</h1>
+ </div>
+ <div className="flex">
+ <div className="ml-auto flex space-x-4">
+ <Link
+ to={`/viewReports/${projectName}/${projectMember.username}`}
+ >
+ <h1 className="underline cursor-pointer font-bold">
+ View Reports
+ </h1>
+ </Link>
+ <Link
+ to={`/changeRole/${projectName}/${projectMember.username}`}
+ >
+ <h1 className="underline cursor-pointer font-bold">
+ Change Role
+ </h1>
+ </Link>
+ </div>
+ </div>
+ </div>
+ </h1>
+ ))}
+ </div>
+ </>
+ );
+}
+
+export default ProjectMembers;
diff --git a/frontend/src/Components/Register.tsx b/frontend/src/Components/Register.tsx
index 7b003cb..df07c6e 100644
--- a/frontend/src/Components/Register.tsx
+++ b/frontend/src/Components/Register.tsx
@@ -6,6 +6,10 @@ import Button from "./Button";
import InputField from "./InputField";
import { useNavigate } from "react-router-dom";
+/**
+ * Renders a registration form for the admin to add new users in.
+ * @returns The JSX element representing the registration form.
+ */
export default function Register(): JSX.Element {
const [username, setUsername] = useState<string>();
const [password, setPassword] = useState<string>();
diff --git a/frontend/src/Components/UserProjectMenu.tsx b/frontend/src/Components/UserProjectMenu.tsx
new file mode 100644
index 0000000..e307e90
--- /dev/null
+++ b/frontend/src/Components/UserProjectMenu.tsx
@@ -0,0 +1,32 @@
+//info: User project menu component to display the user project menu where the user can navigate to
+//existing time reports in a project and create a new time report
+import { useParams, Link } from "react-router-dom";
+import { JSX } from "react/jsx-runtime";
+
+/**
+ * Renders the user project menu component.
+ *
+ * @returns JSX.Element representing the user project menu.
+ */
+function UserProjectMenu(): JSX.Element {
+ const { projectName } = useParams();
+
+ return (
+ <>
+ <h1 className="font-bold text-[30px] mb-[20px]">{projectName}</h1>
+ <div className="border-4 border-black bg-white flex flex-col items-center justify-center min-h-[65vh] h-fit w-[50vw] rounded-3xl content-center overflow-scroll space-y-[10vh] p-[30px]">
+ <Link to={`/timeReports/${projectName}/`}>
+ <h1 className="font-bold underline text-[30px] cursor-pointer">
+ Your Time Reports
+ </h1>
+ </Link>
+ <Link to={`/newTimeReport/${projectName}`}>
+ <h1 className="font-bold underline text-[30px] cursor-pointer">
+ New Time Report
+ </h1>
+ </Link>
+ </div>
+ </>
+ );
+}
+export default UserProjectMenu;
diff --git a/frontend/src/Pages/ProjectManagerPages/PMChangeRole.tsx b/frontend/src/Pages/ProjectManagerPages/PMChangeRole.tsx
index 9f233a1..c2c1370 100644
--- a/frontend/src/Pages/ProjectManagerPages/PMChangeRole.tsx
+++ b/frontend/src/Pages/ProjectManagerPages/PMChangeRole.tsx
@@ -1,19 +1,16 @@
import BasicWindow from "../../Components/BasicWindow";
-import Button from "../../Components/Button";
import BackButton from "../../Components/BackButton";
+import ChangeRoles from "../../Components/ChangeRoles";
function ChangeRole(): JSX.Element {
- const content = <></>;
+ const content = (
+ <>
+ <ChangeRoles />
+ </>
+ );
const buttons = (
<>
- <Button
- text="Save"
- onClick={(): void => {
- return;
- }}
- type="button"
- />
<BackButton />
</>
);
diff --git a/frontend/src/Pages/ProjectManagerPages/PMProjectMembers.tsx b/frontend/src/Pages/ProjectManagerPages/PMProjectMembers.tsx
index 9fe96cf..11b8636 100644
--- a/frontend/src/Pages/ProjectManagerPages/PMProjectMembers.tsx
+++ b/frontend/src/Pages/ProjectManagerPages/PMProjectMembers.tsx
@@ -1,10 +1,19 @@
import BasicWindow from "../../Components/BasicWindow";
import Button from "../../Components/Button";
import BackButton from "../../Components/BackButton";
-import { Link } from "react-router-dom";
+import { Link, useParams } from "react-router-dom";
+import ProjectMembers from "../../Components/ProjectMembers";
function PMProjectMembers(): JSX.Element {
- const content = <></>;
+ const { projectName } = useParams();
+ const content = (
+ <>
+ <h1 className="font-bold text-[30px] mb-[20px]">
+ All Members In: {projectName}{" "}
+ </h1>
+ <ProjectMembers />
+ </>
+ );
const buttons = (
<>
diff --git a/frontend/src/Pages/ProjectManagerPages/PMProjectPage.tsx b/frontend/src/Pages/ProjectManagerPages/PMProjectPage.tsx
index bd4e6ef..3d550f6 100644
--- a/frontend/src/Pages/ProjectManagerPages/PMProjectPage.tsx
+++ b/frontend/src/Pages/ProjectManagerPages/PMProjectPage.tsx
@@ -1,36 +1,21 @@
-import { Link } from "react-router-dom";
import BasicWindow from "../../Components/BasicWindow";
import { JSX } from "react/jsx-runtime";
+import PMProjectMenu from "../../Components/PMProjectMenu";
+import BackButton from "../../Components/BackButton";
function PMProjectPage(): JSX.Element {
const content = (
<>
- <h1 className="font-bold text-[30px] mb-[20px]">ProjectNameExample</h1>
- <div className="border-4 border-black bg-white flex flex-col items-center justify-center min-h-[65vh] h-fit w-[50vw] rounded-3xl content-center overflow-scroll space-y-[5vh] p-[30px]">
- <Link to="/project-page">
- <h1 className="font-bold underline text-[30px] cursor-pointer">
- Your Time Reports
- </h1>
- </Link>
- <Link to="/new-time-report">
- <h1 className="font-bold underline text-[30px] cursor-pointer">
- New Time Report
- </h1>
- </Link>
- <Link to="/project-members">
- <h1 className="font-bold underline text-[30px] cursor-pointer">
- Statistics
- </h1>
- </Link>
- <Link to="/PM-unsigned-reports">
- <h1 className="font-bold underline text-[30px] cursor-pointer">
- Unsigned Time Reports
- </h1>
- </Link>
- </div>
+ <PMProjectMenu />
</>
);
- return <BasicWindow content={content} buttons={undefined} />;
+ const buttons = (
+ <>
+ <BackButton />
+ </>
+ );
+
+ return <BasicWindow content={content} buttons={buttons} />;
}
export default PMProjectPage;
diff --git a/frontend/src/Pages/UnauthorizedPage.tsx b/frontend/src/Pages/UnauthorizedPage.tsx
new file mode 100644
index 0000000..37e3d2c
--- /dev/null
+++ b/frontend/src/Pages/UnauthorizedPage.tsx
@@ -0,0 +1,18 @@
+import Button from "../Components/Button";
+
+export default function UnauthorizedPage(): JSX.Element {
+ return (
+ <div className="flex flex-col items-center justify-center min-h-screen bg-white">
+ <h1 className="text-[30px]">Unauthorized</h1>
+ <a href="/">
+ <Button
+ text="Go to Home Page"
+ onClick={(): void => {
+ localStorage.clear();
+ }}
+ type="button"
+ />
+ </a>
+ </div>
+ );
+}
diff --git a/frontend/src/Pages/UserPages/UserProjectPage.tsx b/frontend/src/Pages/UserPages/UserProjectPage.tsx
index 596c37d..b9578b4 100644
--- a/frontend/src/Pages/UserPages/UserProjectPage.tsx
+++ b/frontend/src/Pages/UserPages/UserProjectPage.tsx
@@ -1,25 +1,11 @@
-import { Link, useParams } from "react-router-dom";
import BasicWindow from "../../Components/BasicWindow";
import BackButton from "../../Components/BackButton";
+import UserProjectMenu from "../../Components/UserProjectMenu";
function UserProjectPage(): JSX.Element {
- const { projectName } = useParams();
-
const content = (
<>
- <h1 className="font-bold text-[40px] mb-[20px]">{projectName}</h1>
- <div className="border-4 border-black bg-white flex flex-col items-center justify-center min-h-[65vh] h-fit w-[50vw] rounded-3xl content-center overflow-scroll space-y-[10vh] p-[30px]">
- <Link to={`/timeReports/${projectName}/`}>
- <h1 className="font-bold underline text-[30px] cursor-pointer">
- Your Time Reports
- </h1>
- </Link>
- <Link to={`/newTimeReport/${projectName}`}>
- <h1 className="font-bold underline text-[30px] cursor-pointer">
- New Time Report
- </h1>
- </Link>
- </div>
+ <UserProjectMenu />
</>
);
diff --git a/frontend/src/Pages/YourProjectsPage.tsx b/frontend/src/Pages/YourProjectsPage.tsx
index b5644c3..c048746 100644
--- a/frontend/src/Pages/YourProjectsPage.tsx
+++ b/frontend/src/Pages/YourProjectsPage.tsx
@@ -1,39 +1,10 @@
-import { useState, useEffect } from "react";
-import { Project } from "../Types/goTypes";
-import { Link } from "react-router-dom";
import BasicWindow from "../Components/BasicWindow";
-import { api } from "../API/API";
+import DisplayUserProjects from "../Components/DisplayUserProjects";
function UserProjectPage(): JSX.Element {
- const [projects, setProjects] = useState<Project[]>([]);
-
- const getProjects = async (): Promise<void> => {
- const token = localStorage.getItem("accessToken") ?? "";
- const response = await api.getUserProjects(token);
- console.log(response);
- if (response.success) {
- setProjects(response.data ?? []);
- } else {
- console.error(response.message);
- }
- };
- // Call getProjects when the component mounts
- useEffect(() => {
- void getProjects();
- }, []);
-
const content = (
<>
- <h1 className="font-bold text-[30px] mb-[20px]">Your Projects</h1>
- <div className="border-4 border-black bg-white flex flex-col items-center justify-center min-h-[65vh] h-fit w-[50vw] rounded-3xl content-center overflow-scroll space-y-[10vh] p-[30px]">
- {projects.map((project, index) => (
- <Link to={`/project/${project.name}`} key={index}>
- <h1 className="font-bold underline text-[30px] cursor-pointer">
- {project.name}
- </h1>
- </Link>
- ))}
- </div>
+ <DisplayUserProjects />
</>
);
diff --git a/frontend/src/Types/goTypes.ts b/frontend/src/Types/goTypes.ts
index 5f9cbb4..24a76be 100644
--- a/frontend/src/Types/goTypes.ts
+++ b/frontend/src/Types/goTypes.ts
@@ -40,6 +40,44 @@ export interface NewWeeklyReport {
*/
testingTime: number /* int */;
}
+export interface WeeklyReportList {
+ /**
+ * The name of the project, as it appears in the database
+ */
+ projectName: string;
+ /**
+ * The week number
+ */
+ week: number /* int */;
+ /**
+ * Total time spent on development
+ */
+ developmentTime: number /* int */;
+ /**
+ * Total time spent in meetings
+ */
+ meetingTime: number /* int */;
+ /**
+ * Total time spent on administrative tasks
+ */
+ adminTime: number /* int */;
+ /**
+ * Total time spent on personal projects
+ */
+ ownWorkTime: number /* int */;
+ /**
+ * Total time spent on studying
+ */
+ studyTime: number /* int */;
+ /**
+ * Total time spent on testing
+ */
+ testingTime: number /* int */;
+ /**
+ * The project manager who signed it
+ */
+ signedBy?: number /* int */;
+}
export interface WeeklyReport {
/**
* The ID of the report
@@ -106,6 +144,15 @@ export interface NewProject {
name: string;
description: string;
}
+export interface RoleChange {
+ role: 'project_manager' | 'user';
+ username: string;
+ projectname: string;
+}
+export interface NameChange {
+ id: number /* int */;
+ name: string;
+}
//////////
// source: users.go
@@ -143,3 +190,7 @@ export interface UserProjectMember {
export interface Token {
token: string;
}
+export interface StrNameChange {
+ prevName: string;
+ newName: string;
+}
diff --git a/frontend/src/main.tsx b/frontend/src/main.tsx
index 55c6685..bac2292 100644
--- a/frontend/src/main.tsx
+++ b/frontend/src/main.tsx
@@ -30,6 +30,7 @@ import AdminProjectStatistics from "./Pages/AdminPages/AdminProjectStatistics.ts
import AdminProjectViewMemberInfo from "./Pages/AdminPages/AdminProjectViewMemberInfo.tsx";
import AdminProjectPage from "./Pages/AdminPages/AdminProjectPage.tsx";
import NotFoundPage from "./Pages/NotFoundPage.tsx";
+import UnauthorizedPage from "./Pages/UnauthorizedPage.tsx";
// This is where the routes are mounted
const router = createBrowserRouter([
@@ -63,7 +64,7 @@ const router = createBrowserRouter([
element: <UserEditTimeReportPage />,
},
{
- path: "/changeRole",
+ path: "/changeRole/:projectName/:username",
element: <PMChangeRole />,
},
{
@@ -71,11 +72,11 @@ const router = createBrowserRouter([
element: <PMOtherUsersTR />,
},
{
- path: "/projectMembers",
+ path: "/projectMembers/:projectName",
element: <PMProjectMembers />,
},
{
- path: "/PMProjectPage",
+ path: "/PMProjectPage/:projectName",
element: <PMProjectPage />,
},
{
@@ -87,7 +88,7 @@ const router = createBrowserRouter([
element: <PMTotalTimeRole />,
},
{
- path: "/PMUnsignedReports",
+ path: "/unsignedReports/:projectName",
element: <PMUnsignedReports />,
},
{
@@ -142,6 +143,10 @@ const router = createBrowserRouter([
path: "/adminManageUser",
element: <AdminManageUsers />,
},
+ {
+ path: "/unauthorized",
+ element: <UnauthorizedPage />,
+ },
]);
// Semi-hacky way to get the root element
diff --git a/testing.py b/testing.py
index 491419f..9181d39 100644
--- a/testing.py
+++ b/testing.py
@@ -314,9 +314,8 @@ def test_get_weekly_reports_user():
# Get weekly reports for the user in the project
response = requests.get(
- getWeeklyReportsUserPath,
+ getWeeklyReportsUserPath + "/" + projectName,
headers={"Authorization": "Bearer " + token},
- params={"username": username, "projectName": projectName},
)
dprint(response.text)