Merge branch 'frontend' into gruppPP

.gitignore

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

Justfile

@@ -23,10 +23,13 @@ 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,10 +13,13 @@ 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,17 +8,19 @@ 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/server main.go
+	$(GOBUILD) -o bin/$(PROC_NAME) main.go
 
 # Run target
 run: build
-	./bin/server
+	./bin/$(PROC_NAME)
 
 watch: build
 	watchexec -c -w . -r make run
@@ -32,11 +34,22 @@ clean:
 	rm -f plantuml.jar
 	rm -f erd.png
 	rm -f config.toml
+	rm -f database.txt
 
 # Test target
 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/testing.py || pkill $(PROC_NAME)
+	pkill $(PROC_NAME)
+
 # Get dependencies target
 deps:
 	$(GOGET) -v ./...
@@ -92,6 +105,17 @@ default: build
 docs:
 	swag init -outputTypes go
 
+api: ./docs/swagger.json
+	rm ../frontend/src/API/GenApi.ts
+	npx swagger-typescript-api \
+		--api-class-name GenApi \
+		--path ./docs/swagger.json \
+		--output ../frontend/src/API \
+		--name GenApi.ts \
+
+./docs/swagger.json:
+	swag init -outputTypes json
+
 .PHONY: docfmt
 docfmt:
 	swag fmt

backend/docs/docs.go

@@ -21,21 +21,21 @@ const docTemplate = `{
     "paths": {
         "/login": {
             "post": {
-                "description": "logs the user in and returns a jwt token",
+                "description": "Logs in a user and returns a JWT token",
                 "consumes": [
                     "application/json"
                 ],
                 "produces": [
-                    "text/plain"
+                    "application/json"
                 ],
                 "tags": [
-                    "User"
+                    "Auth"
                 ],
-                "summary": "login",
+                "summary": "Login",
                 "parameters": [
                     {
-                        "description": "login info",
-                        "name": "NewUser",
+                        "description": "User credentials",
+                        "name": "body",
                         "in": "body",
                         "required": true,
                         "schema": {
@@ -45,9 +45,9 @@ const docTemplate = `{
                 ],
                 "responses": {
                     "200": {
-                        "description": "Successfully signed token for user",
+                        "description": "JWT token",
                         "schema": {
-                            "type": "Token"
+                            "$ref": "#/definitions/types.Token"
                         }
                     },
                     "400": {
@@ -71,29 +71,26 @@ const docTemplate = `{
                 }
             }
         },
-        "/loginerenew": {
+        "/loginrenew": {
             "post": {
                 "security": [
                     {
-                        "bererToken": []
+                        "JWT": []
                     }
                 ],
-                "description": "renews the users token",
-                "consumes": [
+                "description": "Renews the users token.",
+                "produces": [
                     "application/json"
                 ],
-                "produces": [
-                    "text/plain"
-                ],
                 "tags": [
-                    "User"
+                    "Auth"
                 ],
                 "summary": "LoginRenews",
                 "responses": {
                     "200": {
                         "description": "Successfully signed token for user",
                         "schema": {
-                            "type": "Token"
+                            "$ref": "#/definitions/types.Token"
                         }
                     },
                     "401": {
@@ -111,9 +108,64 @@ const docTemplate = `{
                 }
             }
         },
+        "/promote/{projectName}": {
+            "put": {
+                "security": [
+                    {
+                        "JWT": []
+                    }
+                ],
+                "description": "Promote a user to project manager",
+                "consumes": [
+                    "text/plain"
+                ],
+                "produces": [
+                    "text/plain"
+                ],
+                "tags": [
+                    "Auth"
+                ],
+                "summary": "Promote to project manager",
+                "parameters": [
+                    {
+                        "type": "string",
+                        "description": "Project name",
+                        "name": "projectName",
+                        "in": "path",
+                        "required": true
+                    },
+                    {
+                        "type": "string",
+                        "description": "User name",
+                        "name": "userName",
+                        "in": "query",
+                        "required": true
+                    }
+                ],
+                "responses": {
+                    "403": {
+                        "description": "Forbidden",
+                        "schema": {
+                            "type": "string"
+                        }
+                    },
+                    "500": {
+                        "description": "Internal server error",
+                        "schema": {
+                            "type": "string"
+                        }
+                    }
+                }
+            }
+        },
         "/promoteToAdmin": {
             "post": {
-                "description": "promote chosen user to admin",
+                "security": [
+                    {
+                        "JWT": []
+                    }
+                ],
+                "description": "Promote chosen user to site admin",
                 "consumes": [
                     "application/json"
                 ],
@@ -137,13 +189,13 @@ const docTemplate = `{
                 ],
                 "responses": {
                     "200": {
-                        "description": "Successfully prometed user",
+                        "description": "Successfully promoted user",
                         "schema": {
-                            "type": "json"
+                            "$ref": "#/definitions/types.Token"
                         }
                     },
                     "400": {
-                        "description": "bad request",
+                        "description": "Bad request",
                         "schema": {
                             "type": "string"
                         }
@@ -173,7 +225,7 @@ const docTemplate = `{
                     "text/plain"
                 ],
                 "tags": [
-                    "User"
+                    "Auth"
                 ],
                 "summary": "Register",
                 "parameters": [
@@ -211,6 +263,11 @@ const docTemplate = `{
         },
         "/userdelete/{username}": {
             "delete": {
+                "security": [
+                    {
+                        "JWT": []
+                    }
+                ],
                 "description": "UserDelete deletes a user from the database",
                 "consumes": [
                     "application/json"
@@ -252,12 +309,14 @@ const docTemplate = `{
         },
         "/users/all": {
             "get": {
-                "description": "lists all users",
-                "consumes": [
-                    "application/json"
+                "security": [
+                    {
+                        "JWT": []
+                    }
                 ],
+                "description": "lists all users",
                 "produces": [
-                    "text/plain"
+                    "application/json"
                 ],
                 "tags": [
                     "User"
@@ -265,9 +324,12 @@ const docTemplate = `{
                 "summary": "ListsAllUsers",
                 "responses": {
                     "200": {
-                        "description": "Successfully signed token for user",
+                        "description": "Successfully returned all users",
                         "schema": {
-                            "type": "json"
+                            "type": "array",
+                            "items": {
+                                "type": "string"
+                            }
                         }
                     },
                     "401": {
@@ -291,16 +353,27 @@ const docTemplate = `{
             "type": "object",
             "properties": {
                 "password": {
-                    "type": "string"
+                    "type": "string",
+                    "example": "password123"
                 },
                 "username": {
+                    "type": "string",
+                    "example": "username123"
+                }
+            }
+        },
+        "types.Token": {
+            "type": "object",
+            "properties": {
+                "token": {
                     "type": "string"
                 }
             }
         }
     },
     "securityDefinitions": {
-        "bererToken": {
+        "JWT": {
+            "description": "Use the JWT token provided by the login endpoint to authenticate requests.  **Prefix the token with \"Bearer \".**",
             "type": "apiKey",
             "name": "Authorization",
             "in": "header"

backend/go.mod

@@ -13,10 +13,10 @@ require (
 require (
 	github.com/KyleBanks/depth v1.2.1 // indirect
 	github.com/dustin/go-humanize v1.0.1 // indirect
-	github.com/go-openapi/jsonpointer v0.20.3 // indirect
-	github.com/go-openapi/jsonreference v0.20.5 // indirect
-	github.com/go-openapi/spec v0.20.15 // indirect
-	github.com/go-openapi/swag v0.22.10 // indirect
+	github.com/go-openapi/jsonpointer v0.21.0 // indirect
+	github.com/go-openapi/jsonreference v0.21.0 // indirect
+	github.com/go-openapi/spec v0.21.0 // indirect
+	github.com/go-openapi/swag v0.23.0 // indirect
 	github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect
 	github.com/josharian/intern v1.0.0 // indirect
 	github.com/mailru/easyjson v0.7.7 // indirect
@@ -25,10 +25,10 @@ require (
 	github.com/swaggo/files/v2 v2.0.0 // indirect
 	golang.org/x/tools v0.19.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
-	modernc.org/gc/v3 v3.0.0-20240107210532-573471604cb6 // indirect
-	modernc.org/libc v1.41.0 // indirect
+	modernc.org/gc/v3 v3.0.0-20240304020402-f0dba7c97c2b // indirect
+	modernc.org/libc v1.49.1 // indirect
 	modernc.org/mathutil v1.6.0 // indirect
-	modernc.org/memory v1.7.2 // indirect
+	modernc.org/memory v1.8.0 // indirect
 	modernc.org/strutil v1.2.0 // indirect
 	modernc.org/token v1.1.0 // indirect
 )
@@ -42,7 +42,7 @@ require (
 // These are all for fiber
 require (
 	github.com/andybalholm/brotli v1.1.0 // indirect
-	github.com/gofiber/fiber/v2 v2.52.2
+	github.com/gofiber/fiber/v2 v2.52.4
 	github.com/google/uuid v1.6.0 // indirect
 	github.com/klauspost/compress v1.17.7 // indirect
 	github.com/mattn/go-colorable v0.1.13 // indirect
@@ -52,5 +52,5 @@ require (
 	github.com/valyala/bytebufferpool v1.0.0 // indirect
 	github.com/valyala/fasthttp v1.52.0 // indirect
 	github.com/valyala/tcplisten v1.0.0 // indirect
-	golang.org/x/sys v0.18.0 // indirect
+	golang.org/x/sys v0.19.0 // indirect
 )

backend/go.sum

@@ -10,20 +10,20 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY=
 github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto=
-github.com/go-openapi/jsonpointer v0.20.3 h1:jykzYWS/kyGtsHfRt6aV8JTB9pcQAXPIA7qlZ5aRlyk=
-github.com/go-openapi/jsonpointer v0.20.3/go.mod h1:c7l0rjoouAuIxCm8v/JWKRgMjDG/+/7UBWsXMrv6PsM=
-github.com/go-openapi/jsonreference v0.20.5 h1:hutI+cQI+HbSQaIGSfsBsYI0pHk+CATf8Fk5gCSj0yI=
-github.com/go-openapi/jsonreference v0.20.5/go.mod h1:thAqAp31UABtI+FQGKAQfmv7DbFpKNUlva2UPCxKu2Y=
-github.com/go-openapi/spec v0.20.15 h1:8bDcVxF607pTh9NpPwgsH4J5Uhh5mV5XoWnkurdiY+U=
-github.com/go-openapi/spec v0.20.15/go.mod h1:o0upgqg5uYFG7O5mADrDVmSG3Wa6y6OLhwiCqQ+sTv4=
-github.com/go-openapi/swag v0.22.10 h1:4y86NVn7Z2yYd6pfS4Z+Nyh3aAUL3Nul+LMbhFKy0gA=
-github.com/go-openapi/swag v0.22.10/go.mod h1:Cnn8BYtRlx6BNE3DPN86f/xkapGIcLWzh3CLEb4C1jI=
+github.com/go-openapi/jsonpointer v0.21.0 h1:YgdVicSA9vH5RiHs9TZW5oyafXZFc6+2Vc1rr/O9oNQ=
+github.com/go-openapi/jsonpointer v0.21.0/go.mod h1:IUyH9l/+uyhIYQ/PXVA41Rexl+kOkAPDdXEYns6fzUY=
+github.com/go-openapi/jsonreference v0.21.0 h1:Rs+Y7hSXT83Jacb7kFyjn4ijOuVGSvOdF2+tg1TRrwQ=
+github.com/go-openapi/jsonreference v0.21.0/go.mod h1:LmZmgsrTkVg9LG4EaHeY8cBDslNPMo06cago5JNLkm4=
+github.com/go-openapi/spec v0.21.0 h1:LTVzPc3p/RzRnkQqLRndbAzjY0d0BCL72A6j3CdL9ZY=
+github.com/go-openapi/spec v0.21.0/go.mod h1:78u6VdPw81XU44qEWGhtr982gJ5BWg2c0I5XwVMotYk=
+github.com/go-openapi/swag v0.23.0 h1:vsEVJDUo2hPJ2tu0/Xc+4noaxyEffXNIs3cOULZ+GrE=
+github.com/go-openapi/swag v0.23.0/go.mod h1:esZ8ITTYEsH1V2trKHjAN8Ai7xHb8RV+YSZ577vPjgQ=
 github.com/go-sql-driver/mysql v1.6.0 h1:BCTh4TKNUYmOmMUcQ3IipzF5prigylS7XXjEkfCHuOE=
 github.com/go-sql-driver/mysql v1.6.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg=
 github.com/gofiber/contrib/jwt v1.0.8 h1:/GeOsm/Mr1OGr0GTy+RIVSz5VgNNyP3ZgK4wdqxF/WY=
 github.com/gofiber/contrib/jwt v1.0.8/go.mod h1:gWWBtBiLmKXRN7xy6a96QO0KGvPEyxdh8x496Ujtg84=
-github.com/gofiber/fiber/v2 v2.52.2 h1:b0rYH6b06Df+4NyrbdptQL8ifuxw/Tf2DgfkZkDaxEo=
-github.com/gofiber/fiber/v2 v2.52.2/go.mod h1:KEOE+cXMhXG0zHc9d8+E38hoX+ZN7bhOtgeF2oT6jrQ=
+github.com/gofiber/fiber/v2 v2.52.4 h1:P+T+4iK7VaqUsq2PALYEfBBo6bJZ4q3FP8cZ84EggTM=
+github.com/gofiber/fiber/v2 v2.52.4/go.mod h1:KEOE+cXMhXG0zHc9d8+E38hoX+ZN7bhOtgeF2oT6jrQ=
 github.com/gofiber/swagger v1.0.0 h1:BzUzDS9ZT6fDUa692kxmfOjc1DZiloLiPK/W5z1H1tc=
 github.com/gofiber/swagger v1.0.0/go.mod h1:QrYNF1Yrc7ggGK6ATsJ6yfH/8Zi5bu9lA7wB8TmCecg=
 github.com/golang-jwt/jwt/v5 v5.2.1 h1:OuVbFODueb089Lh128TAcimifWaLhJwVflnrgM17wHk=
@@ -85,8 +85,8 @@ golang.org/x/mod v0.16.0 h1:QX4fJ0Rr5cPQCF7O9lh9Se4pmwfwskqZfq5moyldzic=
 golang.org/x/mod v0.16.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
 golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4=
-golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.19.0 h1:q5f1RH2jigJ1MoAWp2KTp3gm5zAGFUTarQZ5U386+4o=
+golang.org/x/sys v0.19.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/tools v0.19.0 h1:tfGCXNR1OsFG+sVdLAitlpjAvD/I6dHDKnYrpEZUHkw=
 golang.org/x/tools v0.19.0/go.mod h1:qoJWxmGSIBmAeriMx19ogtrEPrGtDbPK634QFIcLAhc=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
@@ -94,16 +94,26 @@ gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntN
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+modernc.org/cc/v4 v4.20.0 h1:45Or8mQfbUqJOG9WaxvlFYOAQO0lQ5RvqBcFCXngjxk=
+modernc.org/cc/v4 v4.20.0/go.mod h1:HM7VJTZbUCR3rV8EYBi9wxnJ0ZBRiGE5OeGXNA0IsLQ=
+modernc.org/ccgo/v4 v4.15.0 h1:uwfCZOkKhaNNotgYW7kxkJwrkQC1HfGitt/7ousudJE=
+modernc.org/ccgo/v4 v4.15.0/go.mod h1:XVITcYGiI+O97UNDLMsnZ9ZjJOhC+ACX+TfxpsWWyRc=
 modernc.org/fileutil v1.3.0 h1:gQ5SIzK3H9kdfai/5x41oQiKValumqNTDXMvKo62HvE=
 modernc.org/fileutil v1.3.0/go.mod h1:XatxS8fZi3pS8/hKG2GH/ArUogfxjpEKs3Ku3aK4JyQ=
-modernc.org/gc/v3 v3.0.0-20240107210532-573471604cb6 h1:5D53IMaUuA5InSeMu9eJtlQXS2NxAhyWQvkKEgXZhHI=
-modernc.org/gc/v3 v3.0.0-20240107210532-573471604cb6/go.mod h1:Qz0X07sNOR1jWYCrJMEnbW/X55x206Q7Vt4mz6/wHp4=
-modernc.org/libc v1.41.0 h1:g9YAc6BkKlgORsUWj+JwqoB1wU3o4DE3bM3yvA3k+Gk=
-modernc.org/libc v1.41.0/go.mod h1:w0eszPsiXoOnoMJgrXjglgLuDy/bt5RR4y3QzUUeodY=
+modernc.org/gc/v2 v2.4.1 h1:9cNzOqPyMJBvrUipmynX0ZohMhcxPtMccYgGOJdOiBw=
+modernc.org/gc/v2 v2.4.1/go.mod h1:wzN5dK1AzVGoH6XOzc3YZ+ey/jPgYHLuVckd62P0GYU=
+modernc.org/gc/v3 v3.0.0-20240304020402-f0dba7c97c2b h1:BnN1t+pb1cy61zbvSUV7SeI0PwosMhlAEi/vBY4qxp8=
+modernc.org/gc/v3 v3.0.0-20240304020402-f0dba7c97c2b/go.mod h1:Qz0X07sNOR1jWYCrJMEnbW/X55x206Q7Vt4mz6/wHp4=
+modernc.org/libc v1.49.1 h1:r4UaWllkYXRPA7Mq/KzmassZBvNJiH9egF4O/KV/gdE=
+modernc.org/libc v1.49.1/go.mod h1:Hx2rWfza47GSzCluTU7Vf0Qx3z9rWCVORL6RNgq+Xog=
 modernc.org/mathutil v1.6.0 h1:fRe9+AmYlaej+64JsEEhoWuAYBkOtQiMEU7n/XgfYi4=
 modernc.org/mathutil v1.6.0/go.mod h1:Ui5Q9q1TR2gFm0AQRqQUaBWFLAhQpCwNcuhBOSedWPo=
-modernc.org/memory v1.7.2 h1:Klh90S215mmH8c9gO98QxQFsY+W451E8AnzjoE2ee1E=
-modernc.org/memory v1.7.2/go.mod h1:NO4NVCQy0N7ln+T9ngWqOQfi7ley4vpwvARR+Hjw95E=
+modernc.org/memory v1.8.0 h1:IqGTL6eFMaDZZhEWwcREgeMXYwmW83LYW8cROZYkg+E=
+modernc.org/memory v1.8.0/go.mod h1:XPZ936zp5OMKGWPqbD3JShgd/ZoQ7899TUuQqxY+peU=
+modernc.org/opt v0.1.3 h1:3XOZf2yznlhC+ibLltsDGzABUGVx8J6pnFMS3E4dcq4=
+modernc.org/opt v0.1.3/go.mod h1:WdSiB5evDcignE70guQKxYUl14mgWtbClRi5wmkkTX0=
+modernc.org/sortutil v1.2.0 h1:jQiD3PfS2REGJNzNCMMaLSp/wdMNieTbKX920Cqdgqc=
+modernc.org/sortutil v1.2.0/go.mod h1:TKU2s7kJMf1AE84OoiGppNHJwvB753OYfNl2WRb++Ss=
 modernc.org/sqlite v1.29.5 h1:8l/SQKAjDtZFo9lkJLdk8g9JEOeYRG4/ghStDCCTiTE=
 modernc.org/sqlite v1.29.5/go.mod h1:S02dvcmm7TnTRvGhv8IGYyLnIt7AS2KPaB1F/71p75U=
 modernc.org/strutil v1.2.0 h1:agBi9dp1I+eOnxXeiZawM8F4LawKv4NzGWSaLfyeNZA=

backend/internal/database/db.go

@@ -2,11 +2,12 @@ package database
 
 import (
 	"embed"
+	"encoding/json"
 	"errors"
-	"fmt"
 	"path/filepath"
 	"ttime/internal/types"
 
+	"github.com/gofiber/fiber/v2/log"
 	"github.com/jmoiron/sqlx"
 	_ "modernc.org/sqlite"
 )
@@ -17,12 +18,11 @@ type Database interface {
 	AddUser(username string, password string) error
 	CheckUser(username string, password string) bool
 	RemoveUser(username string) error
+	RemoveUserFromProject(username string, projectname string) error
 	PromoteToAdmin(username string) error
 	GetUserId(username string) (int, error)
 	AddProject(name string, description string, username string) error
 	DeleteProject(name string, username string) error
-	Migrate() error
-	MigrateSampleData() error
 	GetProjectId(projectname string) (int, error)
 	AddWeeklyReport(projectName string, userName string, week int, developmentTime int, meetingTime int, adminTime int, ownWorkTime int, studyTime int, testingTime int) error
 	AddUserToProject(username string, projectname string, role string) error
@@ -35,19 +35,26 @@ type Database interface {
 	GetProject(projectId int) (types.Project, error)
 	GetUserRole(username string, projectname string) (string, error)
 	GetWeeklyReport(username string, projectName string, week int) (types.WeeklyReport, error)
-	GetWeeklyReportsUser(username string, projectname string) ([]types.WeeklyReportList, error)
+	GetAllWeeklyReports(username string, projectname string) ([]types.WeeklyReportList, error)
+	GetUnsignedWeeklyReports(projectName string) ([]types.WeeklyReport, error)
 	SignWeeklyReport(reportId int, projectManagerId int) error
 	IsSiteAdmin(username string) (bool, error)
 	IsProjectManager(username string, projectname string) (bool, error)
-	GetTotalTimePerActivity(projectName string) (map[string]int, error)
-	
-
+	ReportStatistics(username string, projectName string) (*types.Statistics, 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
+	GetUserName(id int) (string, error)
+	UnsignWeeklyReport(reportId int, projectManagerId int) error
+	DeleteReport(reportID int) error
+	ChangeProjectName(projectName string, newProjectName string) error
+	ChangeUserPassword(username string, password string) error
 }
 
 // This struct is a wrapper type that holds the database connection
 // Internally DB holds a connection pool, so it's safe for concurrent use
 type Db struct {
-	*sqlx.DB
+	*sqlx.Tx
 }
 
 type UserProjectMember struct {
@@ -63,14 +70,16 @@ var sampleData embed.FS
 
 // TODO: Possibly break these out into separate files bundled with the embed package?
 const userInsert = "INSERT INTO users (username, password) VALUES (?, ?)"
-const projectInsert = "INSERT INTO projects (name, description, owner_user_id) SELECT ?, ?, id FROM users WHERE username = ?"
+const projectInsert = "INSERT INTO projects (name, description, owner_user_id) VALUES (?, ?, (SELECT id FROM users WHERE username = ?))"
 const promoteToAdmin = "INSERT INTO site_admin (admin_id) SELECT id FROM users WHERE username = ?"
 const addWeeklyReport = `WITH UserLookup AS (SELECT id FROM users WHERE username = ?), 
 						ProjectLookup AS (SELECT id FROM projects WHERE name = ?)
 						INSERT INTO weekly_reports (project_id, user_id, week, development_time, meeting_time, admin_time, own_work_time, study_time, testing_time)
 						VALUES ((SELECT id FROM ProjectLookup), (SELECT id FROM UserLookup),?, ?, ?, ?, ?, ?, ?);`
-const addUserToProject = "INSERT 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 addUserToProject = `INSERT OR IGNORE INTO user_roles (user_id, project_id, p_role)
+			  				VALUES ((SELECT id FROM users WHERE username = ?),
+				  			(SELECT id FROM projects WHERE name = ?), ?)`
+const changeUserRole = "UPDATE user_roles SET p_role = ? WHERE user_id = (SELECT id FROM users WHERE username = ?) AND project_id = (SELECT id FROM projects WHERE name = ?)"
 const getProjectsForUser = `SELECT p.id, p.name, p.description FROM projects p	
 							JOIN user_roles ur ON p.id = ur.project_id
 							JOIN users u ON ur.user_id = u.id
@@ -78,8 +87,28 @@ const getProjectsForUser = `SELECT p.id, p.name, p.description FROM projects p
 const deleteProject = `DELETE FROM projects
 						WHERE id = ? AND owner_username = ?`
 
+const isProjectManagerQuery = `SELECT COUNT(*) > 0 FROM user_roles
+								JOIN users ON user_roles.user_id = users.id
+								JOIN projects ON user_roles.project_id = projects.id
+								WHERE users.username = ? AND projects.name = ? AND user_roles.p_role = 'project_manager'`
+
+const removeUserFromProjectQuery = `DELETE FROM user_roles 
+									WHERE user_id = (SELECT id FROM users WHERE username = ?) 
+									AND project_id = (SELECT id FROM projects WHERE name = ?)`
+
+const reportStatistics = `SELECT SUM(development_time) AS total_development_time,
+							SUM(meeting_time) AS total_meeting_time,
+							SUM(admin_time) AS total_admin_time,
+							SUM(own_work_time) AS total_own_work_time,
+							SUM(study_time) AS total_study_time,
+							SUM(testing_time) AS total_testing_time
+							FROM weekly_reports
+							WHERE user_id = (SELECT id FROM users WHERE username = ?)
+							AND project_id = (SELECT id FROM projects WHERE name = ?)
+							GROUP BY user_id, project_id`
+
 // DbConnect connects to the database
-func DbConnect(dbpath string) Database {
+func DbConnect(dbpath string) sqlx.DB {
 	// Open the database
 	db, err := sqlx.Connect("sqlite", dbpath)
 	if err != nil {
@@ -92,7 +121,25 @@ func DbConnect(dbpath string) Database {
 		panic(err)
 	}
 
-	return &Db{db}
+	return *db
+}
+
+func (d *Db) ReportStatistics(username string, projectName string) (*types.Statistics, error) {
+	var result types.Statistics
+
+	err := d.Get(&result, reportStatistics, username, projectName)
+	if err != nil {
+		return nil, err
+	}
+
+	serialized, err := json.Marshal(result)
+	if err != nil {
+		return nil, err
+	}
+
+	log.Info(string(serialized))
+
+	return &result, nil
 }
 
 func (d *Db) CheckUser(username string, password string) bool {
@@ -135,41 +182,20 @@ 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 {
-	var userid int
-	userid, err := d.GetUserId(username)
-	if err != nil {
-		panic(err)
-	}
+	_, err := d.Exec(addUserToProject, username, projectname, role)
+	return err
+}
 
-	var projectid int
-	projectid, err2 := d.GetProjectId(projectname)
-	if err2 != nil {
-		panic(err2)
-	}
-
-	_, err3 := d.Exec(addUserToProject, userid, projectid, role)
-	return err3
+func (d *Db) RemoveUserFromProject(username string, projectname string) error {
+	_, err := d.Exec(removeUserFromProjectQuery, username, projectname)
+	return err
 }
 
 // ChangeUserRole changes the role of a user within a project.
 func (d *Db) ChangeUserRole(username string, projectname string, role string) error {
-	// Get the user ID
-	var userid int
-	userid, err := d.GetUserId(username)
-	if err != nil {
-		panic(err)
-	}
-
-	// Get the project ID
-	var projectid int
-	projectid, err2 := d.GetProjectId(projectname)
-	if err2 != nil {
-		panic(err2)
-	}
-
 	// Execute the SQL query to change the user's role
-	_, err3 := d.Exec(changeUserRole, role, userid, projectid)
-	return err3
+	_, err := d.Exec(changeUserRole, role, username, projectname)
+	return err
 }
 
 // ChangeUserName changes the username of a user.
@@ -217,22 +243,15 @@ func (d *Db) GetProjectId(projectname string) (int, error) {
 
 // Creates a new project in the database, associated with a user
 func (d *Db) AddProject(name string, description string, username string) error {
-	tx := d.MustBegin()
-	_, err := tx.Exec(projectInsert, name, description, username)
+	// Insert the project into the database
+	_, err := d.Exec(projectInsert, name, description, username)
 	if err != nil {
-		if err := tx.Rollback(); err != nil {
-			return err
-		}
 		return err
 	}
-	_, err = tx.Exec(changeUserRole, "project_manager", username, name)
+
+	// Add creator to project as project manager
+	_, err = d.Exec(addUserToProject, username, name, "project_manager")
 	if err != nil {
-		if err := tx.Rollback(); err != nil {
-			return err
-		}
-		return err
-	}
-	if err := tx.Commit(); err != nil {
 		return err
 	}
 
@@ -240,16 +259,7 @@ func (d *Db) AddProject(name string, description string, username string) error
 }
 
 func (d *Db) DeleteProject(projectID string, username string) error {
-	tx := d.MustBegin()
-
-	_, err := tx.Exec(deleteProject, projectID, username)
-
-	if err != nil {
-		if rollbackErr := tx.Rollback(); rollbackErr != nil {
-			return fmt.Errorf("error rolling back transaction: %v, delete error: %v", rollbackErr, err)
-		}
-		panic(err)
-	}
+	_, err := d.Exec(deleteProject, projectID, username)
 
 	return err
 }
@@ -354,9 +364,14 @@ func (d *Db) SignWeeklyReport(reportId int, projectManagerId int) error {
 		return err
 	}
 
+	managerQuery := `SELECT project_id FROM user_roles 
+					WHERE user_id = ?
+					AND project_id = (SELECT project_id FROM weekly_reports WHERE report_id = ?) 
+					AND p_role = 'project_manager'`
+
 	// Retrieve the project ID associated with the project manager
 	var managerProjectID int
-	err = d.Get(&managerProjectID, "SELECT project_id FROM user_roles WHERE user_id = ? AND p_role = 'project_manager'", projectManagerId)
+	err = d.Get(&managerProjectID, managerQuery, projectManagerId, reportId)
 	if err != nil {
 		return err
 	}
@@ -371,6 +386,81 @@ func (d *Db) SignWeeklyReport(reportId int, projectManagerId int) error {
 	return err
 }
 
+func (d *Db) UnsignWeeklyReport(reportId int, projectManagerId int) error {
+	// Retrieve the project ID associated with the report
+	var reportProjectID int
+	err := d.Get(&reportProjectID, "SELECT project_id FROM weekly_reports WHERE report_id = ?", reportId)
+	if err != nil {
+		return err
+	}
+
+	managerQuery := `SELECT project_id FROM user_roles 
+					WHERE user_id = ?
+					AND project_id = (SELECT project_id FROM weekly_reports WHERE report_id = ?) 
+					AND p_role = 'project_manager'`
+
+	// Retrieve the project ID associated with the project manager
+	var managerProjectID int
+	err = d.Get(&managerProjectID, managerQuery, projectManagerId, reportId)
+	if err != nil {
+		return err
+	}
+
+	// Check if the project manager is in the same project as the report
+	if reportProjectID != managerProjectID {
+		return errors.New("project manager doesn't have permission to unsign the report")
+	}
+
+	// Update the signed_by field of the specified report
+	_, err = d.Exec("UPDATE weekly_reports SET signed_by = NULL WHERE report_id = ?;", reportId)
+	return err
+}
+
+func (d *Db) GetUnsignedWeeklyReports(projectName string) ([]types.WeeklyReport, error) {
+	// Define the SQL query to fetch unsigned reports for a given user
+	query := `
+		SELECT
+			report_id,
+			user_id,
+			project_id,
+			week,
+			development_time,
+			meeting_time,
+			admin_time,
+			own_work_time,
+			study_time,
+			testing_time,
+			signed_by
+		FROM
+			weekly_reports
+		WHERE
+			signed_by IS NULL
+			AND project_id = (SELECT id FROM projects WHERE name = ?)
+	`
+
+	// Execute the query
+	rows, err := d.Queryx(query, projectName)
+	if err != nil {
+		return nil, err
+	}
+	defer rows.Close()
+
+	// Iterate over the rows and populate the result slice
+	var reports []types.WeeklyReport
+	for rows.Next() {
+		var report types.WeeklyReport
+		if err := rows.StructScan(&report); err != nil {
+			return nil, err
+		}
+		reports = append(reports, report)
+	}
+	if err := rows.Err(); err != nil {
+		return nil, err
+	}
+
+	return reports, nil
+}
+
 // IsSiteAdmin checks if a given username is a site admin
 func (d *Db) IsSiteAdmin(username string) (bool, error) {
 	// Define the SQL query to check if the user is a site admin
@@ -393,7 +483,7 @@ func (d *Db) IsSiteAdmin(username string) (bool, error) {
 
 // Reads a directory of migration files and applies them to the database.
 // This will eventually be used on an embedded directory
-func (d *Db) Migrate() error {
+func Migrate(db sqlx.DB) error {
 	// Read the embedded scripts directory
 	files, err := scripts.ReadDir("migrations")
 	if err != nil {
@@ -405,7 +495,7 @@ func (d *Db) Migrate() error {
 		return nil
 	}
 
-	tr := d.MustBegin()
+	tr := db.MustBegin()
 
 	// Iterate over each SQL file and execute it
 	for _, file := range files {
@@ -433,8 +523,8 @@ func (d *Db) Migrate() error {
 	return nil
 }
 
-// GetWeeklyReportsUser retrieves weekly reports for a specific user and project.
-func (d *Db) GetWeeklyReportsUser(username string, projectName string) ([]types.WeeklyReportList, error) {
+// GetAllWeeklyReports retrieves weekly reports for a specific user and project.
+func (d *Db) GetAllWeeklyReports(username string, projectName string) ([]types.WeeklyReportList, error) {
 	query := `
 		SELECT
 			wr.week,
@@ -465,27 +555,33 @@ func (d *Db) GetWeeklyReportsUser(username string, projectName string) ([]types.
 
 // IsProjectManager checks if a given username is a project manager for the specified project
 func (d *Db) IsProjectManager(username string, projectname string) (bool, error) {
-	// Define the SQL query to check if the user is a project manager for the project
+	var manager bool
+	err := d.Get(&manager, isProjectManagerQuery, username, projectname)
+	return manager, err
+}
+
+func (d *Db) UpdateWeeklyReport(projectName string, userName string, week int, developmentTime int, meetingTime int, adminTime int, ownWorkTime int, studyTime int, testingTime int) error {
 	query := `
-        SELECT COUNT(*) FROM user_roles 
-        JOIN users ON user_roles.user_id = users.id 
-        JOIN projects ON user_roles.project_id = projects.id 
-        WHERE users.username = ? AND projects.name = ? AND user_roles.p_role = 'project_manager'
-    `
+		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 = ?
+	`
 
-	// Execute the query
-	var count int
-	err := d.Get(&count, query, username, projectname)
-	if err != nil {
-		return false, err
-	}
-
-	// If count is greater than 0, the user is a project manager for the project
-	return count > 0, nil
+	_, 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 {
+func MigrateSampleData(db sqlx.DB) error {
 	// Insert sample data
 	files, err := sampleData.ReadDir("sample_data")
 	if err != nil {
@@ -495,7 +591,7 @@ func (d *Db) MigrateSampleData() error {
 	if len(files) == 0 {
 		println("No sample data files found")
 	}
-	tr := d.MustBegin()
+	tr := db.MustBegin()
 
 	// Iterate over each SQL file and execute it
 	for _, file := range files {
@@ -523,40 +619,67 @@ func (d *Db) MigrateSampleData() error {
 	return nil
 }
 
-func (d *Db) GetTotalTimePerActivity(projectName string) (map[string]int, error) {
-    
-    query := `
+// GetProjectTimes retrieves a map with times per "Activity" for a given project
+func (d *Db) GetProjectTimes(projectName string) (map[string]int, error) {
+	query := `
         SELECT development_time, meeting_time, admin_time, own_work_time, study_time, testing_time
-	    FROM weekly_reports
+        FROM weekly_reports
         JOIN projects ON weekly_reports.project_id = projects.id
         WHERE projects.name = ?
     `
-	
-    rows, err := d.DB.Query(query, projectName)
-    if err != nil {
-        return nil, err
-    }
-    defer rows.Close()
 
-    totalTime := make(map[string]int)
+	rows, err := d.Query(query, projectName)
+	if err != nil {
+		return nil, err
+	}
+	defer rows.Close()
 
-    for rows.Next() {
-        var developmentTime, meetingTime, adminTime, ownWorkTime, studyTime, testingTime int
-        if err := rows.Scan(&developmentTime, &meetingTime, &adminTime, &ownWorkTime, &studyTime, &testingTime); err != nil {
-            return nil, err
-        }
-        
-        totalTime["development"] += developmentTime
-        totalTime["meeting"] += meetingTime
-        totalTime["admin"] += adminTime
-        totalTime["own_work"] += ownWorkTime
-        totalTime["study"] += studyTime
-        totalTime["testing"] += testingTime
-    }
+	totalTime := make(map[string]int)
 
-    if err := rows.Err(); err != nil {
-        return nil, err
-    }
+	for rows.Next() {
+		var developmentTime, meetingTime, adminTime, ownWorkTime, studyTime, testingTime int
+		if err := rows.Scan(&developmentTime, &meetingTime, &adminTime, &ownWorkTime, &studyTime, &testingTime); err != nil {
+			return nil, err
+		}
 
-    return totalTime, nil
+		totalTime["development"] += developmentTime
+		totalTime["meeting"] += meetingTime
+		totalTime["admin"] += adminTime
+		totalTime["own_work"] += ownWorkTime
+		totalTime["study"] += studyTime
+		totalTime["testing"] += testingTime
+	}
+
+	if err := rows.Err(); err != nil {
+		return nil, err
+	}
+
+	return totalTime, nil
+}
+
+func (d *Db) RemoveProject(projectname string) error {
+	_, err := d.Exec("DELETE FROM projects WHERE name = ?", projectname)
+	return err
+}
+
+func (d *Db) GetUserName(id int) (string, error) {
+	var username string
+	err := d.Get(&username, "SELECT username FROM users WHERE id = ?", id)
+	return username, err
+}
+
+func (d *Db) DeleteReport(reportID int) error {
+	_, err := d.Exec("DELETE FROM weekly_reports WHERE report_id = ?", reportID)
+	return err
+}
+
+// ChangeProjectName is a handler that changes the name of a project
+func (d *Db) ChangeProjectName(projectName string, newProjectName string) error {
+	_, err := d.Exec("UPDATE projects SET name = ? WHERE name = ?", newProjectName, projectName)
+	return err
+}
+
+func (d *Db) ChangeUserPassword(username string, password string) error {
+	_, err := d.Exec("UPDATE users SET password = ? WHERE username = ?", password, username)
+	return err
 }

backend/internal/database/db_test.go

@@ -1,7 +1,6 @@
 package database
 
 import (
-	"fmt"
 	"testing"
 )
 
@@ -10,10 +9,38 @@ import (
 // setupState initializes a database instance with necessary setup for testing
 func setupState() (Database, error) {
 	db := DbConnect(":memory:")
-	err := db.Migrate()
+	err := Migrate(db)
 	if err != nil {
 		return nil, err
 	}
+
+	db_iface := Db{db.MustBegin()}
+	return &db_iface, nil
+}
+
+// This is a more advanced setup that includes more data in the database.
+// This is useful for more complex testing scenarios.
+func setupAdvancedState() (Database, error) {
+	db, err := setupState()
+	if err != nil {
+		return nil, err
+	}
+
+	// Add a user
+	if err = db.AddUser("demouser", "password"); err != nil {
+		return nil, err
+	}
+
+	// Add a project
+	if err = db.AddProject("projecttest", "description", "demouser"); err != nil {
+		return nil, err
+	}
+
+	// Add a weekly report
+	if err = db.AddWeeklyReport("projecttest", "demouser", 1, 1, 1, 1, 1, 1, 1); err != nil {
+		return nil, err
+	}
+
 	return db, nil
 }
 
@@ -23,6 +50,29 @@ func TestDbConnect(t *testing.T) {
 	_ = db
 }
 
+func TestSetupAdvancedState(t *testing.T) {
+	db, err := setupAdvancedState()
+	if err != nil {
+		t.Error("setupAdvancedState failed:", err)
+	}
+
+	// Check if the user was added
+	if _, err = db.GetUserId("demouser"); err != nil {
+		t.Error("GetUserId failed:", err)
+	}
+
+	// Check if the project was added
+	projects, err := db.GetAllProjects()
+	if err != nil {
+		t.Error("GetAllProjects failed:", err)
+	}
+	if len(projects) != 1 {
+		t.Error("GetAllProjects failed: expected 1, got", len(projects))
+	}
+
+	// To be continued...
+}
+
 // TestDbAddUser tests the AddUser function of the database
 func TestDbAddUser(t *testing.T) {
 	db, err := setupState()
@@ -58,12 +108,12 @@ func TestDbGetUserId(t *testing.T) {
 
 // TestDbAddProject tests the AddProject function of the database
 func TestDbAddProject(t *testing.T) {
-	db, err := setupState()
+	db, err := setupAdvancedState()
 	if err != nil {
 		t.Error("setupState failed:", err)
 	}
 
-	err = db.AddProject("test", "description", "test")
+	err = db.AddProject("test", "description", "demouser")
 	if err != nil {
 		t.Error("AddProject failed:", err)
 	}
@@ -168,20 +218,15 @@ func TestChangeUserRole(t *testing.T) {
 		t.Error("AddProject failed:", err)
 	}
 
-	err = db.AddUserToProject("testuser", "testproject", "user")
-	if err != nil {
-		t.Error("AddUserToProject failed:", err)
-	}
-
 	role, err := db.GetUserRole("testuser", "testproject")
 	if err != nil {
 		t.Error("GetUserRole failed:", err)
 	}
-	if role != "user" {
-		t.Error("GetUserRole failed: expected user, got", role)
+	if role != "project_manager" {
+		t.Error("GetUserRole failed: expected project_manager, got", role)
 	}
 
-	err = db.ChangeUserRole("testuser", "testproject", "admin")
+	err = db.ChangeUserRole("testuser", "testproject", "member")
 	if err != nil {
 		t.Error("ChangeUserRole failed:", err)
 	}
@@ -190,8 +235,8 @@ func TestChangeUserRole(t *testing.T) {
 	if err != nil {
 		t.Error("GetUserRole failed:", err)
 	}
-	if role != "admin" {
-		t.Error("GetUserRole failed: expected admin, got", role)
+	if role != "member" {
+		t.Error("GetUserRole failed: expected member, got", role)
 	}
 
 }
@@ -427,6 +472,47 @@ func TestGetWeeklyReport(t *testing.T) {
 	// Check other fields similarly
 }
 
+func TestGetUnsignedWeeklyReports(t *testing.T) {
+	db, err := setupAdvancedState()
+	if err != nil {
+		t.Error("setupState failed:", err)
+	}
+
+	err = db.AddUser("testuser", "password")
+	if err != nil {
+		t.Error("AddUser failed:", err)
+	}
+
+	err = db.AddUser("testuser1", "password")
+	if err != nil {
+		t.Error("AddUser failed:", err)
+	}
+
+	err = db.AddProject("testproject", "description", "testuser")
+	if err != nil {
+		t.Error("AddProject failed:", err)
+	}
+
+	err = db.AddWeeklyReport("testproject", "testuser", 1, 1, 1, 1, 1, 1, 1)
+	if err != nil {
+		t.Error("AddWeeklyReport failed:", err)
+	}
+
+	err = db.AddWeeklyReport("testproject", "testuser1", 1, 1, 1, 1, 1, 1, 1)
+	if err != nil {
+		t.Error("AddWeeklyReport failed:", err)
+	}
+
+	reports, err := db.GetUnsignedWeeklyReports("testproject")
+	if err != nil {
+		t.Error("GetUnsignedWeeklyReports failed:", err)
+	}
+
+	if reports == nil {
+		t.Error("Expected non-nil reports, got nil")
+	}
+}
+
 // TestSignWeeklyReport tests SignWeeklyReport function of the database
 func TestSignWeeklyReport(t *testing.T) {
 	db, err := setupState()
@@ -480,7 +566,6 @@ func TestSignWeeklyReport(t *testing.T) {
 	if err != nil {
 		t.Error("GetUserId failed:", err)
 	}
-	fmt.Println("Project Manager's ID:", projectManagerID)
 
 	// Sign the report with the project manager
 	err = db.SignWeeklyReport(report.ReportId, projectManagerID)
@@ -500,8 +585,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) {
+func TestUnsignWeeklyReport(t *testing.T) {
 	db, err := setupState()
 	if err != nil {
 		t.Error("setupState failed:", err)
@@ -525,6 +609,95 @@ func TestSignWeeklyReportByAnotherProjectManager(t *testing.T) {
 		t.Error("AddProject failed:", err)
 	}
 
+	// Add both regular users as members to the project
+	err = db.AddUserToProject("testuser", "testproject", "member")
+	if err != nil {
+		t.Error("AddUserToProject failed:", err)
+	}
+
+	err = db.AddUserToProject("projectManager", "testproject", "project_manager")
+	if err != nil {
+		t.Error("AddUserToProject failed:", err)
+	}
+
+	// Add a weekly report for one of the regular users
+	err = db.AddWeeklyReport("testproject", "testuser", 1, 1, 1, 1, 1, 1, 1)
+	if err != nil {
+		t.Error("AddWeeklyReport failed:", err)
+	}
+
+	// Retrieve the added report
+	report, err := db.GetWeeklyReport("testuser", "testproject", 1)
+	if err != nil {
+		t.Error("GetWeeklyReport failed:", err)
+	}
+
+	// Print project manager's ID
+	projectManagerID, err := db.GetUserId("projectManager")
+	if err != nil {
+		t.Error("GetUserId failed:", err)
+	}
+
+	// Sign the report with the project manager
+	err = db.SignWeeklyReport(report.ReportId, projectManagerID)
+	if err != nil {
+		t.Error("SignWeeklyReport failed:", err)
+	}
+
+	// Retrieve the report again to check if it's signed
+	signedReport, err := db.GetWeeklyReport("testuser", "testproject", 1)
+	if err != nil {
+		t.Error("GetWeeklyReport failed:", err)
+	}
+
+	// Ensure the report is signed by the project manager
+	if *signedReport.SignedBy != projectManagerID {
+		t.Errorf("Expected SignedBy to be %d, got %d", projectManagerID, *signedReport.SignedBy)
+	}
+
+	// Unsign the report
+	err = db.UnsignWeeklyReport(report.ReportId, projectManagerID)
+	if err != nil {
+		t.Error("UnsignWeeklyReport failed:", err)
+	}
+
+	// Retrieve the report again to check if it's unsigned
+	unsignedReport, err := db.GetWeeklyReport("testuser", "testproject", 1)
+	if err != nil {
+		t.Error("GetWeeklyReport failed:", err)
+	}
+
+	// Ensure the report is unsigned
+	if unsignedReport.SignedBy != nil {
+		t.Error("Expected SignedBy to be nil, got", unsignedReport.SignedBy)
+	}
+}
+
+// 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 {
+		t.Error("setupState failed:", err)
+	}
+
+	// Add project manager
+	err = db.AddUser("projectManager", "password")
+	if err != nil {
+		t.Error("AddUser failed:", err)
+	}
+
+	// Add a regular user
+	err = db.AddUser("testuser", "password")
+	if err != nil {
+		t.Error("AddUser failed:", err)
+	}
+
+	// Add project, projectManager is the owner
+	err = db.AddProject("testproject", "description", "projectManager")
+	if err != nil {
+		t.Error("AddProject failed:", err)
+	}
+
 	// Add the regular user as a member to the project
 	err = db.AddUserToProject("testuser", "testproject", "member")
 	if err != nil {
@@ -543,14 +716,25 @@ func TestSignWeeklyReportByAnotherProjectManager(t *testing.T) {
 		t.Error("GetWeeklyReport failed:", err)
 	}
 
-	anotherManagerID, err := db.GetUserId("projectManager")
+	managerID, err := db.GetUserId("projectManager")
 	if err != nil {
 		t.Error("GetUserId failed:", err)
 	}
 
-	err = db.SignWeeklyReport(report.ReportId, anotherManagerID)
-	if err == nil {
-		t.Error("Expected SignWeeklyReport to fail with a project manager who is not in the project, but it didn't")
+	err = db.SignWeeklyReport(report.ReportId, managerID)
+	if err != nil {
+		t.Error("SignWeeklyReport failed:", err)
+	}
+
+	// Retrieve the report again to check if it's signed
+	signedReport, err := db.GetWeeklyReport("testuser", "testproject", 1)
+	if err != nil {
+		t.Error("GetWeeklyReport failed:", err)
+	}
+
+	// Ensure the report is signed by the project manager
+	if *signedReport.SignedBy != managerID {
+		t.Errorf("Expected SignedBy to be %d, got %d", managerID, *signedReport.SignedBy)
 	}
 }
 
@@ -611,7 +795,7 @@ func TestGetWeeklyReportsUser(t *testing.T) {
 		t.Error("AddWeeklyReport failed:", err)
 	}
 
-	reports, err := db.GetWeeklyReportsUser("testuser", "testproject")
+	reports, err := db.GetAllWeeklyReports("testuser", "testproject")
 	if err != nil {
 		t.Error("GetWeeklyReportsUser failed:", err)
 	}
@@ -676,27 +860,90 @@ func TestIsProjectManager(t *testing.T) {
 	}
 }
 
-func TestGetTotalTimePerActivity(t *testing.T) {
-	// Initialize your test database connection
+func TestGetProjectTimes(t *testing.T) {
+	// Initialize
 	db, err := setupState()
 	if err != nil {
 		t.Error("setupState failed:", err)
+		return
 	}
 
-	// Run the query to get total time per activity
-	totalTime, err := db.GetTotalTimePerActivity("projecttest")
+	// Create a user
+	user := "TeaUser"
+	password := "Vanilla"
+	err = db.AddUser(user, password)
+	if err != nil {
+		t.Error("AddUser failed:", err)
+		return
+	}
+
+	// Create a project
+	projectName := "ProjectVanilla"
+	projectDescription := "When tea tastes its best"
+	err = db.AddProject(projectName, projectDescription, user) // Fix the variable name here
+	if err != nil {
+		t.Error("AddProject failed:", err)
+		return
+	}
+
+	// Tests the func in db.go
+	totalTime, err := db.GetProjectTimes(projectName)
 	if err != nil {
 		t.Error("GetTotalTimePerActivity failed:", err)
+		return
 	}
 
 	// Check if the totalTime map is not nil
 	if totalTime == nil {
 		t.Error("Expected non-nil totalTime map, got nil")
+		return
 	}
 
-	// ska lägga till fler  assertions
-}
+	// Define the expected valeus
+	expectedTotalTime := map[string]int{
+		"development": 0,
+		"meeting":     0,
+		"admin":       0,
+		"own_work":    0,
+		"study":       0,
+		"testing":     0,
+	}
 
+	// Compare the expectedTotalTime with the totalTime retrieved from the database
+	for activity, expectedTime := range expectedTotalTime {
+		if totalTime[activity] != expectedTime {
+			t.Errorf("Expected %s time to be %d, got %d", activity, expectedTime, totalTime[activity])
+		}
+	}
+
+	// Insert some data into the database for different activities
+	err = db.AddWeeklyReport(projectName, user, 1, 1, 3, 2, 1, 4, 5)
+	if err != nil {
+		t.Error("Failed to insert data into the database:", err)
+		return
+	}
+
+	newTotalTime, err := db.GetProjectTimes(projectName)
+	if err != nil {
+		t.Error("GetTotalTimePerActivity failed:", err)
+		return
+	}
+
+	newExpectedTotalTime := map[string]int{
+		"development": 1,
+		"meeting":     3,
+		"admin":       2,
+		"own_work":    1,
+		"study":       4,
+		"testing":     5,
+	}
+
+	for activity, newExpectedTime := range newExpectedTotalTime {
+		if newTotalTime[activity] != newExpectedTime {
+			t.Errorf("Expected %s time to be %d, got %d", activity, newExpectedTime, newTotalTime[activity])
+		}
+	}
+}
 func TestEnsureManagerOfCreatedProject(t *testing.T) {
 	db, err := setupState()
 	if err != nil {
@@ -715,6 +962,12 @@ func TestEnsureManagerOfCreatedProject(t *testing.T) {
 		t.Error("AddProject failed:", err)
 	}
 
+	// Set user to a project manager
+	// err = db.AddUserToProject("testuser", "testproject", "project_manager")
+	// if err != nil {
+	// 	t.Error("AddUserToProject failed:", err)
+	// }
+
 	managerState, err := db.IsProjectManager("testuser", "testproject")
 	if err != nil {
 		t.Error("IsProjectManager failed:", err)
@@ -724,3 +977,168 @@ 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))
+	}
+
+}
+
+func TestDeleteReport(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)
+	}
+
+	// create a weekly report
+	err = db.AddWeeklyReport("projecttest", "demouser", 16, 1, 1, 1, 1, 1, 1)
+	if err != nil {
+		t.Error("AddWeeklyReport failed:", err)
+	}
+
+	// Check if the report was added
+	report, err := db.GetWeeklyReport("demouser", "projecttest", 16)
+	if err != nil {
+		t.Error("GetWeeklyReport failed:", err)
+	}
+
+	// Remove report
+	err = db.DeleteReport(report.ReportId)
+	if err != nil {
+		t.Error("RemoveReport failed:", err)
+	}
+
+	// Check if the report was removed
+	report, err = db.GetWeeklyReport("demouser", "projecttest", 16)
+	if err == nil {
+		t.Error("RemoveReport failed: report not removed")
+	}
+
+}
+
+func TestChangeProjectName(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)
+	}
+
+	// Change project name
+	err = db.ChangeProjectName("projecttest", "newprojectname")
+	if err != nil {
+		t.Error("ChangeProjectName failed:", err)
+	}
+
+	// Check if the project name was changed
+	projects, err := db.GetAllProjects()
+	if err != nil {
+		t.Error("GetAllProjects failed:", err)
+	}
+	if projects[0].Name != "newprojectname" {
+		t.Error("ChangeProjectName failed: expected newprojectname, got", projects[0].Name)
+	}
+}
+
+func TestChangeUserPassword(t *testing.T) {
+	db, err := setupState()
+	if err != nil {
+		t.Error("setupState failed:", err)
+	}
+
+	// Add a user
+	_ = db.AddUser("testuser", "password")
+
+	// Change user password
+	err = db.ChangeUserPassword("testuser", "newpassword")
+	if err != nil {
+		t.Error("ChangeUserPassword failed:", err)
+	}
+
+	// Check if the password was changed
+	if !db.CheckUser("testuser", "newpassword") {
+		t.Error("ChangeUserPassword failed: password not changed")
+	}
+
+}

backend/internal/database/middleware.go

@@ -0,0 +1,34 @@
+package database
+
+import (
+	"github.com/gofiber/fiber/v2"
+	"github.com/gofiber/fiber/v2/log"
+	"github.com/jmoiron/sqlx"
+)
+
+// Simple middleware that provides a transaction as a local key "db"
+func DbMiddleware(db *sqlx.DB) func(c *fiber.Ctx) error {
+	return func(c *fiber.Ctx) error {
+		tx := db.MustBegin()
+
+		defer func() {
+			if err := tx.Commit(); err != nil {
+				if err = tx.Rollback(); err != nil {
+					log.Error("Failed to rollback transaction: ", err)
+				}
+				return
+			}
+		}()
+
+		var db_iface Database = &Db{tx}
+
+		c.Locals("db", &db_iface)
+		return c.Next()
+	}
+}
+
+// Helper function to get the database from the context, without fiddling with casts
+func GetDb(c *fiber.Ctx) Database {
+	// Dereference a pointer to a local, casted to a pointer to a Database
+	return *c.Locals("db").(*Database)
+}

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

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

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

@@ -1,35 +1,220 @@
 INSERT OR IGNORE INTO users(username, password)
-VALUES ("admin", "123");
+VALUES  ("admin", "123"),
+        ("user", "123"),
+        ("user2", "123"),
+        ("John", "123"),
+        ("Emma", "123"),
+        ("Michael", "123"),
+        ("Liam", "123"),
+        ("Oliver", "123"),
+        ("Amelia", "123"),
+        ("Benjamin", "123"),
+        ("Mia", "123"),
+        ("Elijah", "123"),
+        ("Charlotte", "123"),
+        ("Henry", "123"),
+        ("Harper", "123"),
+        ("Lucas", "123"),
+        ("Emily", "123"),
+        ("Alexander", "123"),
+        ("Daniel", "123"),
+        ("Ella", "123"),
+        ("Matthew", "123"),
+        ("Madison", "123"),
+        ("Samuel", "123"),
+        ("Avery", "123"),
+        ("Sofia", "123"),
+        ("David", "123"),
+        ("Victoria", "123"),
+        ("Jackson", "123"),
+        ("Abigail", "123"),
+        ("Gabriel", "123"),
+        ("Luna", "123"),
+        ("Wyatt", "123"),
+        ("Chloe", "123"),
+        ("Nora", "123"),
+        ("Joshua", "123"),
+        ("Hazel", "123"),
+        ("Riley", "123"),
+        ("Scarlett", "123"),
+        ("Aria", "123"),
+        ("Carter", "123"),
+        ("Grace", "123"),
+        ("Jayden", "123"),
+        ("Hannah", "123"),
+        ("Zoe", "123"),
+        ("Luke", "123"),
+        ("Sophia", "123"),
+        ("Jack", "123"),
+        ("Isabella", "123"),
+        ("William", "123"),
+        ("Mason", "123"),
+        ("Evelyn", "123"),
+        ("James", "123"),
+        ("Cynthia", "123"),
+        ("Abraham", "123"),
+        ("Ava", "123"),
+        ("Aiden", "123"),
+        ("Natalie", "123"),
+        ("Lily", "123"),
+        ("Olivia", "123"),
+        ("Alexander", "123"),
+        ("Ethan", "123"),
+        ("Mila", "123"),
+        ("Evelyn", "123"),
+        ("Logan", "123"),
+        ("Riley", "123"),
+        ("Grace", "123"),
+        ("Arnold", "123"),
+        ("Connor", "123"),
+        ("Samantha", "123"),
+        ("Emma", "123"),
+        ("Sarah", "123"),
+        ("Nathan", "123"),
+        ("Layla", "123"),
+        ("Ryan", "123"),
+        ("Zoey", "123"),
+        ("Megan", "123"),
+        ("Christian", "123"),
+        ("Eva", "123"),
+        ("Isaac", "123"),
+        ("Michaela", "123"),
+        ("Caroline", "123"),
+        ("Elijah", "123"),
+        ("Elena", "123"),
+        ("Julian", "123"),
+        ("Sophie", "123"),
+        ("Gabriella", "123"),
+        ("Cole", "123"),
+        ("Hannah", "123"),
+        ("Lucy", "123"),
+        ("Katherine", "123"),
+        ("Benjamin", "123"),
+        ("Ella", "123"),
+        ("Evan", "123");
 
-INSERT OR IGNORE INTO users(username, password)
-VALUES ("user", "123");
-
-INSERT OR IGNORE INTO users(username, password)
-VALUES ("user2", "123");
-
-INSERT OR IGNORE INTO projects(name,description,owner_user_id)
-VALUES ("projecttest","test project", 1);
-
-INSERT OR IGNORE INTO projects(name,description,owner_user_id)
-VALUES ("projecttest2","test project2", 1);
-
-INSERT OR IGNORE INTO projects(name,description,owner_user_id)
-VALUES ("projecttest3","test project3", 1);
+INSERT OR IGNORE INTO projects(name, description, owner_user_id)
+VALUES  ("projecttest1", "Description for projecttest1", 1),
+        ("projecttest2", "Description for projecttest2", 1),
+        ("projecttest3", "Description for projecttest3", 1),
+        ("projecttest4", "Description for projecttest4", 1),
+        ("projecttest5", "Description for projecttest5", 1),
+        ("projecttest6", "Description for projecttest6", 1),
+        ("projecttest7", "Description for projecttest7", 1),
+        ("projecttest8", "Description for projecttest8", 1),
+        ("projecttest9", "Description for projecttest9", 1),
+        ("projecttest10", "Description for projecttest10", 1),
+        ("projecttest11", "Description for projecttest11", 1),
+        ("projecttest12", "Description for projecttest12", 1),
+        ("projecttest13", "Description for projecttest13", 1),
+        ("projecttest14", "Description for projecttest14", 1),
+        ("projecttest15", "Description for projecttest15", 1);
 
 INSERT OR IGNORE INTO user_roles(user_id,project_id,p_role)
-VALUES (1,1,"project_manager");
+VALUES  (1,1,"project_manager"),
+        (1,2,"project_manager"),
+        (1,3,"project_manager"),
+        (1,4,"project_manager"),
+        (1,5,"project_manager"),
+        (1,6,"project_manager"),
+        (1,7,"project_manager"),
+        (1,8,"project_manager"),
+        (1,9,"project_manager"),
+        (1,10,"project_manager"),
+        (1,11,"project_manager"),
+        (1,12,"project_manager"),
+        (1,13,"project_manager"),
+        (1,14,"project_manager"),
+        (1,15,"project_manager"),
+        (2,1,"project_manager"),
+        (2,2,"member"),
+        (2,3,"member"),
+        (2,4,"member"),
+        (2,5,"member"),
+        (2,6,"member"),
+        (2,7,"member"),
+        (2,8,"member"),
+        (2,9,"member"),
+        (2,10,"member"),
+        (2,11,"member"),
+        (2,12,"member"),
+        (2,13,"member"),
+        (2,14,"member"),
+        (2,15,"member"),
+        (3,1,"member"),
+        (3,2,"member"),
+        (3,3,"member"),
+        (3,4,"member"),
+        (3,5,"member"),
+        (3,6,"member"),
+        (3,7,"member"),
+        (3,8,"member"),
+        (3,9,"member"),
+        (3,10,"member"),
+        (3,11,"member"),
+        (3,12,"member"),
+        (3,13,"member"),
+        (3,14,"member"),
+        (3,15,"member"),
+        (4,1,"member"),
+        (4,2,"member"),
+        (4,3,"member"),
+        (4,4,"member"),
+        (4,5,"member"),
+        (4,6,"member"),
+        (4,7,"member"),
+        (4,8,"member"),
+        (4,9,"member"),
+        (4,10,"member"),
+        (4,11,"member"),
+        (4,12,"member"),
+        (4,13,"member"),
+        (4,14,"member"),
+        (4,15,"member"),
+        (5,1,"member"),
+        (5,2,"member"),
+        (5,3,"member"),
+        (5,4,"member"),
+        (5,5,"member"),
+        (5,6,"member"),
+        (5,7,"member"),
+        (5,8,"member"),
+        (5,9,"member"),
+        (5,10,"member"),
+        (5,11,"member"),
+        (5,12,"member"),
+        (5,13,"member"),
+        (5,14,"member"),
+        (5,15,"member");
 
-INSERT OR IGNORE INTO user_roles(user_id,project_id,p_role)
-VALUES (2,1,"member");
+INSERT OR IGNORE INTO weekly_reports (user_id, project_id, week, development_time, meeting_time, admin_time, own_work_time, study_time, testing_time, signed_by)
+VALUES  (2, 1, 12, 100, 50, 30, 150, 80, 20, NULL),
+        (3, 1, 12, 200, 80, 20, 200, 100, 30, NULL),
+        (3, 1, 14, 150, 70, 40, 180, 90, 25, NULL),
+        (3, 2, 12, 120, 60, 35, 160, 85, 15, NULL),
+        (3, 3, 12, 180, 90, 25, 190, 110, 40, NULL),
+        (2, 1, 13, 130, 70, 40, 170, 95, 35, NULL),
+        (3, 1, 15, 140, 60, 50, 200, 120, 30, NULL),
+        (2, 2, 11, 110, 50, 45, 140, 70, 25, NULL),
+        (3, 3, 14, 170, 80, 30, 180, 100, 35, NULL),
+        (3, 3, 15, 200, 100, 20, 220, 130, 45, NULL),
+        (2, 4, 12, 120, 60, 40, 160, 80, 30, NULL),
+        (3, 5, 14, 150, 70, 30, 180, 90, 25, NULL),
+        (3, 5, 15, 180, 90, 20, 190, 110, 35, NULL), 
+        (2, 6, 11, 100, 50, 35, 130, 60, 20, NULL),
+        (3, 7, 14, 170, 80, 25, 180, 100, 30, NULL),
+        (2, 8, 12, 130, 70, 30, 170, 90, 25, NULL),
+        (2, 8, 13, 150, 80, 20, 180, 110, 35, NULL),
+        (3, 9, 12, 140, 60, 40, 180, 100, 30, NULL),
+        (3, 10, 11, 120, 50, 45, 150, 70, 25, NULL),
+        (2, 11, 13, 110, 60, 35, 140, 80, 30, NULL),
+        (3, 12, 12, 160, 70, 30, 180, 100, 35, NULL),
+        (3, 12, 13, 180, 90, 25, 190, 110, 40, NULL),
+        (3, 12, 14, 200, 100, 20, 220, 130, 45, NULL),
+        (2, 13, 11, 100, 50, 45, 130, 60, 20, NULL),
+        (2, 13, 12, 120, 60, 40, 160, 80, 30, NULL),
+        (3, 14, 13, 140, 70, 30, 160, 90, 35, NULL),
+        (3, 15, 12, 150, 80, 25, 180, 100, 30, NULL),
+        (3, 15, 13, 170, 90, 20, 190, 110, 35, NULL);
 
-INSERT OR IGNORE INTO user_roles(user_id,project_id,p_role)
-VALUES (3,1,"member");
-
-INSERT OR IGNORE INTO user_roles(user_id,project_id,p_role)
-VALUES (3,2,"member");
-
-INSERT OR IGNORE INTO user_roles(user_id,project_id,p_role)
-VALUES (3,3,"member");
-
-INSERT OR IGNORE INTO user_roles(user_id,project_id,p_role)
-VALUES (2,1,"project_manager");
+INSERT OR IGNORE INTO site_admin VALUES (1);

backend/internal/handlers/global_state.go

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

backend/internal/handlers/global_state_test.go

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

backend/internal/handlers/handlers_project_related.go

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

backend/internal/handlers/handlers_report_related.go

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

backend/internal/handlers/handlers_user_related.go

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

backend/internal/handlers/projects/AddUserToProject.go

@@ -0,0 +1,42 @@
+package projects
+
+import (
+	db "ttime/internal/database"
+
+	"github.com/gofiber/fiber/v2"
+	"github.com/gofiber/fiber/v2/log"
+	"github.com/golang-jwt/jwt/v5"
+)
+
+// AddUserToProjectHandler is a handler that adds a user to a project with a specified role
+func AddUserToProjectHandler(c *fiber.Ctx) error {
+	user := c.Locals("user").(*jwt.Token)
+	claims := user.Claims.(jwt.MapClaims)
+	pm_name := claims["name"].(string)
+
+	project := c.Params("projectName")
+	username := c.Query("userName")
+
+	// Check if the user is a project manager
+	isPM, err := db.GetDb(c).IsProjectManager(pm_name, project)
+	if err != nil {
+		log.Info("Error checking if user is project manager:", err)
+		return c.Status(500).SendString(err.Error())
+	}
+
+	if !isPM {
+		log.Info("User: ", pm_name, " is not a project manager in project: ", project)
+		return c.Status(403).SendString("User is not a project manager")
+	}
+
+	// Add the user to the project with the specified role
+	err = db.GetDb(c).AddUserToProject(username, project, "member")
+	if err != nil {
+		log.Info("Error adding user to project:", err)
+		return c.Status(500).SendString(err.Error())
+	}
+
+	// Return success message
+	log.Info("User : ", username, " added to project: ", project)
+	return c.SendStatus(fiber.StatusOK)
+}

backend/internal/handlers/projects/ChangeProjectName.go

@@ -0,0 +1,43 @@
+package projects
+
+import (
+	db "ttime/internal/database"
+
+	"github.com/gofiber/fiber/v2"
+	"github.com/gofiber/fiber/v2/log"
+	"github.com/golang-jwt/jwt/v5"
+)
+
+// ChangeProjectName is a handler that changes the name of a project
+func ChangeProjectName(c *fiber.Ctx) error {
+
+	//check token and get username of current user
+	user := c.Locals("user").(*jwt.Token)
+	claims := user.Claims.(jwt.MapClaims)
+	username := claims["name"].(string)
+
+	// Extract the necessary parameters from the request
+	projectName := c.Params("projectName")
+	newProjectName := c.Query("newProjectName")
+
+	// Check if user is site admin
+	issiteadmin, err := db.GetDb(c).IsSiteAdmin(username)
+	if err != nil {
+		log.Warn("Error checking if siteadmin:", err)
+		return c.Status(500).SendString(err.Error())
+	} else if !issiteadmin {
+		log.Warn("User is not siteadmin")
+		return c.Status(401).SendString("User is not siteadmin")
+	}
+
+
+	// Perform the project name change
+	err = db.GetDb(c).ChangeProjectName(projectName, newProjectName)
+	if err != nil {
+		log.Warn("Error changing project name:", err)
+		return c.Status(500).SendString(err.Error())
+	}
+
+	// Return a success message
+	return c.Status(200).SendString("Project name changed successfully")
+}

backend/internal/handlers/projects/CreateProject.go

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

backend/internal/handlers/projects/DeleteProject.go

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

backend/internal/handlers/projects/GetProject.go

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

backend/internal/handlers/projects/GetProjectTimes.go

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

backend/internal/handlers/projects/GetUserProject.go

@@ -0,0 +1,26 @@
+package projects
+
+import (
+	db "ttime/internal/database"
+
+	"github.com/gofiber/fiber/v2"
+	"github.com/gofiber/fiber/v2/log"
+)
+
+// GetUserProjects returns all projects that the user is a member of
+func GetUserProjects(c *fiber.Ctx) error {
+	username := c.Params("username")
+	if username == "" {
+		log.Info("No username provided")
+		return c.Status(400).SendString("No username provided")
+	}
+
+	// Then dip into the database to get the projects
+	projects, err := db.GetDb(c).GetProjectsForUser(username)
+	if err != nil {
+		return c.Status(500).SendString(err.Error())
+	}
+
+	// Return a json serialized list of projects
+	return c.JSON(projects)
+}

backend/internal/handlers/projects/IsProjectManager.go

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

backend/internal/handlers/projects/ListAllUserProjects.go

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

backend/internal/handlers/projects/ProjectRoleChange.go

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

backend/internal/handlers/projects/PromoteToPm.go

@@ -0,0 +1,55 @@
+package projects
+
+import (
+	db "ttime/internal/database"
+
+	"github.com/gofiber/fiber/v2"
+	"github.com/gofiber/fiber/v2/log"
+	"github.com/golang-jwt/jwt/v5"
+)
+
+//	@Summary		Promote to project manager
+//	@Description	Promote a user to project manager
+//	@Tags			Auth
+//	@Security		JWT
+//	@Accept			plain
+//	@Produce		plain
+//	@Param			projectName	path	string	true	"Project name"
+//	@Param			userName	query	string	true	"User name"
+//	@Failure		500		{string}	string	"Internal server error"
+//	@Failure		403		{string}	string	"Forbidden"
+//	@Router			/promote/{projectName} [put]
+//
+// Login logs in a user and returns a JWT token
+// Promote to project manager
+func PromoteToPm(c *fiber.Ctx) error {
+	user := c.Locals("user").(*jwt.Token)
+	claims := user.Claims.(jwt.MapClaims)
+	pm_name := claims["name"].(string)
+
+	project := c.Params("projectName")
+	new_pm_name := c.Query("userName")
+
+	// Check if the user is a project manager
+	isPM, err := db.GetDb(c).IsProjectManager(pm_name, project)
+	if err != nil {
+		log.Info("Error checking if user is project manager:", err)
+		return c.Status(500).SendString(err.Error())
+	}
+
+	if !isPM {
+		log.Info("User: ", pm_name, " is not a project manager in project: ", project)
+		return c.Status(403).SendString("User is not a project manager")
+	}
+
+	// Add the user to the project with the specified role
+	err = db.GetDb(c).ChangeUserRole(new_pm_name, project, "project_manager")
+	if err != nil {
+		log.Info("Error promoting user to project manager:", err)
+		return c.Status(500).SendString(err.Error())
+	}
+
+	// Return success message
+	log.Info("User : ", new_pm_name, " promoted to project manager in project: ", project)
+	return c.SendStatus(fiber.StatusOK)
+}

backend/internal/handlers/projects/RemoveProject.go

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

backend/internal/handlers/projects/RemoveUserFromProject.go

@@ -0,0 +1,40 @@
+package projects
+
+import (
+	db "ttime/internal/database"
+
+	"github.com/gofiber/fiber/v2"
+	"github.com/gofiber/fiber/v2/log"
+	"github.com/golang-jwt/jwt/v5"
+)
+
+func RemoveUserFromProject(c *fiber.Ctx) error {
+	user := c.Locals("user").(*jwt.Token)
+	claims := user.Claims.(jwt.MapClaims)
+	pm_name := claims["name"].(string)
+
+	project := c.Params("projectName")
+	username := c.Query("userName")
+
+	// Check if the user is a project manager
+	isPM, err := db.GetDb(c).IsProjectManager(pm_name, project)
+	if err != nil {
+		log.Info("Error checking if user is project manager:", err)
+		return c.Status(500).SendString(err.Error())
+	}
+
+	if !isPM {
+		log.Info("User: ", pm_name, " is not a project manager in project: ", project)
+		return c.Status(403).SendString("User is not a project manager")
+	}
+
+	// Remove the user from the project
+	if err = db.GetDb(c).RemoveUserFromProject(username, project); err != nil {
+		log.Info("Error removing user from project:", err)
+		return c.Status(500).SendString(err.Error())
+	}
+
+	// Return success message
+	log.Info("User : ", username, " removed from project: ", project)
+	return c.SendStatus(fiber.StatusOK)
+}

backend/internal/handlers/reports/DeleteReport.go

@@ -0,0 +1,22 @@
+package reports
+
+import (
+	"strconv"
+	db "ttime/internal/database"
+
+	"github.com/gofiber/fiber/v2"
+)
+
+func DeleteReport(c *fiber.Ctx) error {
+	reportID := c.Params("reportID")
+	reportIDInt, err := strconv.Atoi(reportID)
+	if err != nil {
+		return c.Status(400).SendString("Invalid report ID")
+	}
+
+	if err := db.GetDb(c).DeleteReport(reportIDInt); err != nil {
+		return c.Status(500).SendString((err.Error()))
+	}
+
+	return c.Status(200).SendString("Weekly report deleted")
+}

backend/internal/handlers/reports/GetAllWeeklyReports.go

@@ -0,0 +1,56 @@
+package reports
+
+import (
+	db "ttime/internal/database"
+
+	"github.com/gofiber/fiber/v2"
+	"github.com/gofiber/fiber/v2/log"
+	"github.com/golang-jwt/jwt/v5"
+)
+
+// GetAllWeeklyReports retrieves all weekly reports for a user in a specific project
+func GetAllWeeklyReports(c *fiber.Ctx) error {
+	// Extract the necessary parameters from the token
+	user := c.Locals("user").(*jwt.Token)
+	claims := user.Claims.(jwt.MapClaims)
+	username := claims["name"].(string)
+
+	// Extract project name and week from query parameters
+	projectName := c.Params("projectName")
+	target_user := c.Query("targetUser") // The user whose reports are being requested
+
+	// If the target user is not empty, use it as the username
+	if target_user == "" {
+		target_user = username
+	}
+
+	log.Info(username, " trying to get all weekly reports for: ", target_user)
+
+	if projectName == "" {
+		log.Info("Missing project name")
+		return c.Status(400).SendString("Missing project name")
+	}
+
+	// If the user is not a project manager, they can only view their own reports
+	pm, err := db.GetDb(c).IsProjectManager(username, projectName)
+	if err != nil {
+		log.Info("Error checking if user is project manager:", err)
+		return c.Status(500).SendString(err.Error())
+	}
+
+	if !(pm || target_user == username) {
+		log.Info("Unauthorized access")
+		return c.Status(403).SendString("Unauthorized access")
+	}
+
+	// Retrieve weekly reports for the user in the project from the database
+	reports, err := db.GetDb(c).GetAllWeeklyReports(target_user, projectName)
+	if err != nil {
+		log.Error("Error getting weekly reports for user:", target_user, "in project:", projectName, ":", err)
+		return c.Status(500).SendString(err.Error())
+	}
+
+	log.Info("Returning weekly report")
+	// Return the retrieved weekly report
+	return c.JSON(reports)
+}

backend/internal/handlers/reports/GetUnsignedReports.go

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

backend/internal/handlers/reports/GetWeeklyReport.go

@@ -0,0 +1,65 @@
+package reports
+
+import (
+	"strconv"
+	db "ttime/internal/database"
+
+	"github.com/gofiber/fiber/v2"
+	"github.com/gofiber/fiber/v2/log"
+	"github.com/golang-jwt/jwt/v5"
+)
+
+// Handler for retrieving weekly report
+func GetWeeklyReport(c *fiber.Ctx) error {
+	// Extract the necessary parameters from the request
+	user := c.Locals("user").(*jwt.Token)
+	claims := user.Claims.(jwt.MapClaims)
+	username := claims["name"].(string)
+
+	// Extract project name and week from query parameters
+	projectName := c.Query("projectName")
+	week := c.Query("week")
+	target_user := c.Query("targetUser") // The user whose report is being requested
+
+	// If the target user is not empty, use it as the username
+	if target_user == "" {
+		target_user = username
+	}
+
+	log.Info(username, " trying to get weekly report for: ", target_user)
+
+	if projectName == "" || week == "" {
+		log.Info("Missing project name or week number")
+		return c.Status(400).SendString("Missing project name or week number")
+	}
+
+	// Convert week to integer
+	weekInt, err := strconv.Atoi(week)
+	if err != nil {
+		log.Info("Invalid week number")
+		return c.Status(400).SendString("Invalid week number")
+	}
+
+	// If the token user is not an admin, check if the target user is the same as the token user
+	pm, err := db.GetDb(c).IsProjectManager(username, projectName)
+	if err != nil {
+		log.Info("Error checking if user is project manager:", err)
+		return c.Status(500).SendString(err.Error())
+	}
+
+	if !(pm || target_user == username) {
+		log.Info("Unauthorized access")
+		return c.Status(403).SendString("Unauthorized access")
+	}
+
+	// Call the database function to get the weekly report
+	report, err := db.GetDb(c).GetWeeklyReport(target_user, projectName, weekInt)
+	if err != nil {
+		log.Info("Error getting weekly report from db:", err)
+		return c.Status(500).SendString(err.Error())
+	}
+
+	log.Info("Returning weekly report")
+	// Return the retrieved weekly report
+	return c.JSON(report)
+}

backend/internal/handlers/reports/SignReport.go

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

backend/internal/handlers/reports/Statistics.go

@@ -0,0 +1,56 @@
+package reports
+
+import (
+	db "ttime/internal/database"
+
+	"github.com/gofiber/fiber/v2"
+	"github.com/gofiber/fiber/v2/log"
+	"github.com/golang-jwt/jwt/v5"
+)
+
+func GetStatistics(c *fiber.Ctx) error {
+	// Extract the necessary parameters from the token
+	user := c.Locals("user").(*jwt.Token)
+	claims := user.Claims.(jwt.MapClaims)
+	username := claims["name"].(string)
+
+	// Extract project name from query parameters
+	projectName := c.Query("projectName")
+	userNameParam := c.Query("userName")
+
+	log.Info(username, " trying to get statistics for project: ", projectName)
+
+	if projectName == "" {
+		log.Info("Missing project name")
+		return c.Status(400).SendString("Missing project name")
+	}
+
+	// Check if the user is a project manager
+	pm, err := db.GetDb(c).IsProjectManager(username, projectName)
+	if err != nil {
+		log.Info("Error checking if user is project manager:", err)
+		return c.Status(500).SendString(err.Error())
+	}
+
+	// Bail if the user is not a PM or checking its own statistics
+	if !pm && userNameParam != "" && userNameParam != username {
+		log.Info("Unauthorized access for user: ", username, "trying to access project: ", projectName, "statistics for user: ", userNameParam)
+		return c.Status(403).SendString("Unauthorized access")
+	}
+
+	if pm && userNameParam != "" {
+		username = userNameParam
+	}
+
+	// Retrieve statistics for the project from the database
+	statistics, err := db.GetDb(c).ReportStatistics(username, projectName)
+	if err != nil {
+		log.Error("Error getting statistics for project:", projectName, ":", err)
+		return c.Status(500).SendString(err.Error())
+	}
+
+	log.Info("Returning statistics")
+	// Return the retrieved statistics
+	return c.JSON(statistics)
+
+}

backend/internal/handlers/reports/SubmitWeeklyReport.go

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

backend/internal/handlers/reports/UnsignReport.go

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

backend/internal/handlers/reports/UpdateWeeklyReport.go

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

backend/internal/handlers/users/ChangeUserName.go

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

backend/internal/handlers/users/ChangeUserPassword.go

@@ -0,0 +1,42 @@
+package users
+
+import (
+	db "ttime/internal/database"
+
+	"github.com/gofiber/fiber/v2"
+	"github.com/gofiber/fiber/v2/log"
+	"github.com/golang-jwt/jwt/v5"
+)
+
+// ChangeUserPassword is a handler that changes the password of a user
+func ChangeUserPassword(c *fiber.Ctx) error {
+
+	//Check token and get username of current user
+	user := c.Locals("user").(*jwt.Token)
+	claims := user.Claims.(jwt.MapClaims)
+	admin := claims["name"].(string)
+
+	// Extract the necessary parameters from the request
+	username := c.Params("username")
+	newPassword := c.Query("newPassword")
+
+	// Check if user is site admin
+	issiteadmin, err := db.GetDb(c).IsSiteAdmin(admin)
+	if err != nil {
+		log.Warn("Error checking if siteadmin:", err)
+		return c.Status(500).SendString(err.Error())
+	} else if !issiteadmin {
+		log.Warn("User is not siteadmin")
+		return c.Status(401).SendString("User is not siteadmin")
+	}
+
+	// Perform the password change
+	err = db.GetDb(c).ChangeUserPassword(username, newPassword)
+	if err != nil {
+		log.Warn("Error changing password:", err)
+		return c.Status(500).SendString(err.Error())
+	}
+
+	// Return a success message
+	return c.Status(200).SendString("Password changed successfully")
+}

backend/internal/handlers/users/GetUserName.go

@@ -0,0 +1,32 @@
+package users
+
+import (
+	"strconv"
+	db "ttime/internal/database"
+
+	"github.com/gofiber/fiber/v2"
+)
+
+// Return the username of a user given their user id
+func GetUserName(c *fiber.Ctx) error {
+	// Check the query params for userId
+	user_id_string := c.Query("userId")
+	if user_id_string == "" {
+		return c.Status(400).SendString("Missing user id")
+	}
+
+	// Convert to int
+	user_id, err := strconv.Atoi(user_id_string)
+	if err != nil {
+		return c.Status(400).SendString("Invalid user id")
+	}
+
+	// Get the username from the database
+	username, err := db.GetDb(c).GetUserName(user_id)
+	if err != nil {
+		return c.Status(500).SendString(err.Error())
+	}
+
+	// Send the nuclear launch codes to north korea
+	return c.JSON(fiber.Map{"username": username})
+}

backend/internal/handlers/users/GetUsersProjects.go

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

backend/internal/handlers/users/ListAllUsers.go

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

backend/internal/handlers/users/Login.go

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

backend/internal/handlers/users/LoginRenew.go

@@ -0,0 +1,50 @@
+package users
+
+import (
+	"time"
+	"ttime/internal/types"
+
+	"github.com/gofiber/fiber/v2"
+	"github.com/gofiber/fiber/v2/log"
+	"github.com/golang-jwt/jwt/v5"
+)
+
+//	@Summary		LoginRenews
+//	@Description	Renews the users token.
+//	@Tags			Auth
+//	@Produce		json
+//	@Security		JWT
+//	@Success		200	{object}	types.Token	"Successfully signed token for user"
+//	@Failure		401	{string}	string		"Unauthorized"
+//	@Failure		500	{string}	string		"Internal server error"
+//	@Router			/loginrenew [post]
+//
+// LoginRenew renews the users token
+func LoginRenew(c *fiber.Ctx) error {
+	user := c.Locals("user").(*jwt.Token)
+
+	log.Info("Renewing token for user:", user.Claims.(jwt.MapClaims)["name"])
+
+	// Renewing the token means we trust whatever is already in the token
+	claims := user.Claims.(jwt.MapClaims)
+
+	// 72 hour expiration time
+	claims["exp"] = time.Now().Add(time.Hour * 72).Unix()
+
+	// Create token with old claims, but new expiration time
+	token := jwt.NewWithClaims(jwt.SigningMethodHS256, jwt.MapClaims{
+		"name":  claims["name"],
+		"admin": claims["admin"],
+		"exp":   claims["exp"],
+	})
+
+	// Sign it with top secret key
+	t, err := token.SignedString([]byte("secret"))
+	if err != nil {
+		log.Warn("Error signing token")
+		return c.SendStatus(fiber.StatusInternalServerError) // 500
+	}
+
+	log.Info("Successfully renewed token for user:", user.Claims.(jwt.MapClaims)["name"])
+	return c.JSON(types.Token{Token: t})
+}

backend/internal/handlers/users/PromoteToAdmin.go

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

backend/internal/handlers/users/Register.go

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

backend/internal/handlers/users/UserDelete.go

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

backend/internal/types/WeeklyReport.go

@@ -65,3 +65,33 @@ type WeeklyReport struct {
 	// The project manager who signed it
 	SignedBy *int `json:"signedBy" db:"signed_by"`
 }
+
+type Statistics struct {
+	TotalDevelopmentTime int `json:"totalDevelopmentTime" db:"total_development_time"`
+	TotalMeetingTime     int `json:"totalMeetingTime" db:"total_meeting_time"`
+	TotalAdminTime       int `json:"totalAdminTime" db:"total_admin_time"`
+	TotalOwnWorkTime     int `json:"totalOwnWorkTime" db:"total_own_work_time"`
+	TotalStudyTime       int `json:"totalStudyTime" db:"total_study_time"`
+	TotalTestingTime     int `json:"totalTestingTime" db:"total_testing_time"`
+}
+
+type UpdateWeeklyReport struct {
+	// The name of the project, as it appears in the database
+	ProjectName string `json:"projectName"`
+	// The name of the user
+	UserName string `json:"userName"`
+	// The week number
+	Week int `json:"week"`
+	// Total time spent on development
+	DevelopmentTime int `json:"developmentTime"`
+	// Total time spent in meetings
+	MeetingTime int `json:"meetingTime"`
+	// Total time spent on administrative tasks
+	AdminTime int `json:"adminTime"`
+	// Total time spent on personal projects
+	OwnWorkTime int `json:"ownWorkTime"`
+	// Total time spent on studying
+	StudyTime int `json:"studyTime"`
+	// Total time spent on testing
+	TestingTime int `json:"testingTime"`
+}

backend/internal/types/project.go

@@ -14,9 +14,12 @@ type NewProject struct {
 	Description string `json:"description"`
 }
 
+// Used to change the role of a user in a project.
+// If name is identical to the name contained in the token, the role can be changed.
+// If the name is different, only a project manager can change the role.
 type RoleChange struct {
+	UserName    string `json:"username"`
 	Role        string `json:"role" tstype:"'project_manager' | 'user'"`
-	Username    string `json:"username"`
 	Projectname string `json:"projectname"`
 }
 

backend/internal/types/users.go

@@ -18,8 +18,8 @@ func (u *User) ToPublicUser() (*PublicUser, error) {
 
 // Should be used when registering, for example
 type NewUser struct {
-	Username string `json:"username"`
-	Password string `json:"password"`
+	Username string `json:"username" example:"username123"`
+	Password string `json:"password" example:"password123"`
 }
 
 // PublicUser represents a user that is safe to send over the API (no password)

backend/main.go

@@ -6,7 +6,9 @@ import (
 	_ "ttime/docs"
 	"ttime/internal/config"
 	"ttime/internal/database"
-	"ttime/internal/handlers"
+	"ttime/internal/handlers/projects"
+	"ttime/internal/handlers/reports"
+	"ttime/internal/handlers/users"
 
 	"github.com/BurntSushi/toml"
 	"github.com/gofiber/fiber/v2"
@@ -23,15 +25,22 @@ import (
 //	@license.name	AGPL
 //	@license.url	https://www.gnu.org/licenses/agpl-3.0.html
 
-//@securityDefinitions.apikey bererToken
-//@in header
-//@name Authorization
+//	@securityDefinitions.apikey	JWT
+//	@in							header
+//	@name						Authorization
+//	@description				Use the JWT token provided by the login endpoint to authenticate requests.  **Prefix the token with "Bearer ".**
 
 //	@host		localhost:8080
 //	@BasePath	/api
 
-// @externalDocs.description	OpenAPI
-// @externalDocs.url			https://swagger.io/resources/open-api/
+//	@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")
@@ -48,24 +57,28 @@ func main() {
 
 	// Connect to the database
 	db := database.DbConnect(conf.DbPath)
+
 	// Migrate the database
-	if err = db.Migrate(); err != nil {
+	if err = database.Migrate(db); err != nil {
 		fmt.Println("Error migrating database: ", err)
 		os.Exit(1)
 	}
 
-	if err = db.MigrateSampleData(); err != nil {
+	// Migrate sample data, should not be used in production
+	if err = database.MigrateSampleData(db); err != nil {
 		fmt.Println("Error migrating sample data: ", err)
 		os.Exit(1)
 	}
 
-	// Get our global state
-	gs := handlers.NewGlobalState(db)
 	// Create the server
 	server := fiber.New()
 
+	// We want some logs
 	server.Use(logger.New())
 
+	// Sets up db middleware, accessed as Local "db" key
+	server.Use(database.DbMiddleware(&db))
+
 	// Mounts the swagger documentation, this is available at /swagger/index.html
 	server.Get("/swagger/*", swagger.HandlerDefault)
 
@@ -73,34 +86,59 @@ func main() {
 	// This will likely be replaced by an embedded filesystem in the future
 	server.Static("/", "./static")
 
-	// Register our unprotected routes
-	server.Post("/api/register", gs.Register)
-	server.Post("/api/login", gs.Login)
+	// Create a group for our API
+	api := server.Group("/api")
 
-	// Every route from here on will require a valid JWT
+	// Register our unprotected routes
+	api.Post("/register", users.Register)
+	api.Post("/login", users.Login)
+
+	// Every route from here on will require a valid
+	// JWT bearer token authentication in the header
 	server.Use(jwtware.New(jwtware.Config{
 		SigningKey: jwtware.SigningKey{Key: []byte("secret")},
 	}))
 
-	// Protected routes (require a valid JWT bearer token authentication header)
-	server.Post("/api/submitWeeklyReport", gs.SubmitWeeklyReport)
-	server.Get("/api/getUserProjects", gs.GetUserProjects)
-	server.Post("/api/loginrenew", gs.LoginRenew)
-	server.Delete("/api/userdelete/:username", gs.UserDelete) // Perhaps just use POST to avoid headaches
-	server.Delete("api/project/:projectID", gs.DeleteProject) // WIP
-	server.Post("/api/project", gs.CreateProject)             // WIP
-	server.Get("/api/project/:projectId", gs.GetProject)
-	server.Get("/api/project/getAllUsers", gs.GetAllUsersProject)
-	server.Get("/api/getWeeklyReport", gs.GetWeeklyReport)
-	server.Post("/api/signReport", gs.SignReport)
-	server.Put("/api/addUserToProject", gs.AddUserToProjectHandler)
-	server.Put("/api/changeUserName", gs.ChangeUserName)
-	server.Post("/api/promoteToAdmin", gs.PromoteToAdmin)
-	server.Get("/api/users/all", gs.ListAllUsers)
-	server.Get("/api/getWeeklyReportsUser/:projectName", gs.GetWeeklyReportsUserHandler)
-	server.Get("/api/checkIfProjectManager/:projectName", gs.IsProjectManagerHandler)
-	server.Post("/api/ProjectRoleChange", gs.ProjectRoleChange)
-	server.Get("/api/getUsersProject/:projectName", gs.ListAllUsersProject)
+	// All user related routes
+	// userGroup := api.Group("/user") // Not currently in use
+	api.Get("/users/all", users.ListAllUsers)
+	api.Get("/project/getAllUsers", users.GetAllUsersProject)
+	api.Get("/username", users.GetUserName)
+	api.Post("/login", users.Login)
+	api.Post("/register", users.Register)
+	api.Post("/loginrenew", users.LoginRenew)
+	api.Post("/promoteToAdmin", users.PromoteToAdmin)
+	api.Put("/changeUserName", users.ChangeUserName)
+	api.Delete("/userdelete/:username", users.UserDelete) // Perhaps just use POST to avoid headaches
+	api.Put("/changeUserPassword/:username", users.ChangeUserPassword)
+
+	// All project related routes
+	// projectGroup := api.Group("/project") // Not currently in use
+	api.Get("/getProjectTimes/:projectName", projects.GetProjectTimesHandler)
+	api.Get("/getUserProjects/:username", projects.GetUserProjects)
+	api.Get("/project/:projectId", projects.GetProject)
+	api.Get("/checkIfProjectManager/:projectName", projects.IsProjectManagerHandler)
+	api.Get("/getUsersProject/:projectName", projects.ListAllUsersProject)
+	api.Post("/project", projects.CreateProject)
+	api.Post("/ProjectRoleChange", projects.ProjectRoleChange)
+	api.Put("/promoteToPm/:projectName", projects.PromoteToPm)
+	api.Put("/addUserToProject/:projectName", projects.AddUserToProjectHandler)
+	api.Delete("/removeUserFromProject/:projectName", projects.RemoveUserFromProject)
+	api.Delete("/removeProject/:projectName", projects.RemoveProject)
+	api.Delete("/project/:projectID", projects.DeleteProject)
+	api.Put("/changeProjectName/:projectName", projects.ChangeProjectName)
+
+	// All report related routes
+	// reportGroup := api.Group("/report") // Not currently in use
+	api.Get("/getWeeklyReport", reports.GetWeeklyReport)
+	api.Get("/getUnsignedReports/:projectName", reports.GetUnsignedReports)
+	api.Get("/getAllWeeklyReports/:projectName", reports.GetAllWeeklyReports)
+	api.Get("/getStatistics", reports.GetStatistics)
+	api.Post("/submitWeeklyReport", reports.SubmitWeeklyReport)
+	api.Put("/signReport/:reportId", reports.SignReport)
+	api.Put("/updateWeeklyReport", reports.UpdateWeeklyReport)
+	api.Put("/unsignReport/:reportId", reports.UnsignReport)
+	api.Delete("/deleteReport/:reportId", reports.DeleteReport)
 
 	// Announce the port we are listening on and start the server
 	err = server.Listen(fmt.Sprintf(":%d", conf.Port))

container/Containerfile

@@ -13,7 +13,6 @@ 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 ./
@@ -24,9 +23,7 @@ RUN go mod download
 # Add the source code
 ADD backend .
 
-RUN make migrate
-
-# RUN go build -o server
+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
@@ -37,6 +34,7 @@ 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
@@ -44,9 +42,6 @@ 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/.prettierignore

@@ -0,0 +1,2 @@
+goTypes.ts
+GenApi.ts

frontend/src/API/API.ts

@@ -1,10 +1,17 @@
+import { AddMemberInfo } from "../Components/AddMember";
+import { ProjectRoleChange } from "../Components/ChangeRole";
+import { projectTimes } from "../Components/GetProjectTimes";
+import { ProjectMember } from "../Components/GetUsersInProject";
 import {
+  UpdateWeeklyReport,
   NewWeeklyReport,
   NewUser,
   User,
   Project,
   NewProject,
   WeeklyReport,
+  StrNameChange,
+  Statistics,
 } from "../Types/goTypes";
 
 /**
@@ -46,7 +53,6 @@ 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>>;
@@ -71,10 +77,7 @@ interface API {
    * @param {string} token The authentication token.
    * @returns {Promise<APIResponse<Project>>} A promise resolving to an API response with the created project.
    */
-  createProject(
-    project: NewProject,
-    token: string,
-  ): Promise<APIResponse<Project>>;
+  createProject(project: NewProject, token: string): Promise<APIResponse<void>>;
 
   /** Submits a weekly report
    * @param {NewWeeklyReport} weeklyReport The weekly report object.
@@ -84,20 +87,33 @@ interface API {
   submitWeeklyReport(
     weeklyReport: NewWeeklyReport,
     token: string,
-  ): Promise<APIResponse<NewWeeklyReport>>;
+  ): Promise<APIResponse<string>>;
 
-  /** Gets a weekly report for a specific user, project and week
-   * @param {string} username The username of the user.
+  /**
+   * Updates a weekly report.
+   * @param {UpdateWeeklyReport} weeklyReport The updated weekly report object.
+   * @param {string} token The authentication token.
+   * @returns {Promise<APIResponse<string>>} A promise containing the API response with the updated report.
+   */
+  updateWeeklyReport(
+    weeklyReport: UpdateWeeklyReport,
+    token: string,
+  ): Promise<APIResponse<string>>;
+
+  /** Gets a weekly report for a specific user, project and week.
+   * Keep in mind that the user within the token needs to be PM
+   * of the project to get the report, unless the user is the target user.
    * @param {string} projectName The name of the project.
    * @param {string} week The week number.
    * @param {string} token The authentication token.
+   * @param {string} targetUser The username of the target user. Defaults to token user.
    * @returns {Promise<APIResponse<WeeklyReport>>} A promise resolving to an API response with the retrieved report.
    */
   getWeeklyReport(
-    username: string,
     projectName: string,
     week: string,
     token: string,
+    targetUser?: string,
   ): Promise<APIResponse<WeeklyReport>>;
 
   /**
@@ -107,16 +123,21 @@ interface API {
    * @param {string} token The token of the user
    * @returns {APIResponse<WeeklyReport[]>} A list of weekly reports
    */
-  getWeeklyReportsForUser(
+  getAllWeeklyReportsForUser(
     projectName: string,
     token: string,
+    targetUser?: string,
   ): Promise<APIResponse<WeeklyReport[]>>;
 
   /** Gets all the projects of a user
+   * @param {string} username - The authentication token.
    * @param {string} token - The authentication token.
    * @returns {Promise<APIResponse<Project[]>>} A promise containing the API response with the user's projects.
    */
-  getUserProjects(token: string): Promise<APIResponse<Project[]>>;
+  getUserProjects(
+    username: string,
+    token: string,
+  ): Promise<APIResponse<Project[]>>;
 
   /** Gets a project by its id.
    * @param {number} id The id of the project to retrieve.
@@ -124,11 +145,156 @@ interface API {
    */
   getProject(id: number): Promise<APIResponse<Project>>;
 
+  /** Gets a projects reported time
+   * @param {string} projectName The name of the project.
+   * @param {string} token The usertoken.
+   * @returns {Promise<APIResponse<Times>>} A promise resolving to an API response containing the project times.
+   */
+  getProjectTimes(
+    projectName: string,
+    token: string,
+  ): Promise<APIResponse<projectTimes>>;
+
   /** Gets a list of all users.
    * @param {string} token The authentication token of the requesting user.
    * @returns {Promise<APIResponse<string[]>>} A promise resolving to an API response containing the list of users.
    */
   getAllUsers(token: string): Promise<APIResponse<string[]>>;
+  /** Gets all users in a project from name*/
+  getAllUsersProject(
+    projectName: string,
+    token: string,
+  ): Promise<APIResponse<ProjectMember[]>>;
+
+  /** Gets all unsigned reports in a project.
+   * @param {string} projectName The name of the project.
+   * @param {string} token The authentication token.
+   * @returns {Promise<APIResponse<WeeklyReport[]>>} A promise resolving to an API response containing the list of unsigned reports.
+   */
+  getUnsignedReportsInProject(
+    projectName: string,
+    token: string,
+  ): Promise<APIResponse<WeeklyReport[]>>;
+
+  /**
+   * 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>>;
+  /**
+   * Changes the role of a user in the database.
+   * @param {RoleChange} roleInfo 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.
+   */
+  changeUserRole(
+    roleInfo: ProjectRoleChange,
+    token: string,
+  ): Promise<APIResponse<void>>;
+
+  addUserToProject(
+    addMemberInfo: AddMemberInfo,
+    token: string,
+  ): Promise<APIResponse<void>>;
+
+  removeUserFromProject(
+    user: string,
+    project: string,
+    token: string,
+  ): Promise<APIResponse<void>>;
+
+  removeProject(
+    projectName: string,
+    token: string,
+  ): Promise<APIResponse<string>>;
+
+  /**
+   * Signs a report. Keep in mind that the user which the token belongs to must be
+   * the project manager of the project the report belongs to.
+   *
+   * @param {number} reportId The id of the report to sign
+   * @param {string} token The authentication token
+   */
+  signReport(reportId: number, token: string): Promise<APIResponse<string>>;
+
+  /**
+   * Unsigns a report. Keep in mind that the user which the token belongs to must be
+   * the project manager of the project the report belongs to.
+   *
+   * @param {number} reportId The id of the report to sign
+   * @param {string} token The authentication token
+   */
+  unsignReport(reportId: number, token: string): Promise<APIResponse<string>>;
+
+  /**
+   * Promotes a user to project manager within a project.
+   *
+   * @param {string} userName The username of the user to promote
+   * @param {string} projectName The name of the project to promote the user in
+   * @returns {Promise<APIResponse<string>} A promise resolving to an API response.
+   */
+  promoteToPm(
+    userName: string,
+    projectName: string,
+    token: string,
+  ): Promise<APIResponse<string>>;
+  /**
+   * Get the username from the id
+   * @param {number} id The id of the user
+   * @param {string} token Your token
+   */
+  getUsername(id: number, token: string): Promise<APIResponse<string>>;
+
+  /**
+   * Deletes a WeeklyReport from the database
+   * @param {number} reportId The id of the report to delete
+   * @param {string} token The authentication token
+   */
+  deleteWeeklyReport(
+    reportId: number,
+    token: string,
+  ): Promise<APIResponse<string>>;
+
+  /**
+   * Retrieves the total time spent on a project for a particular user (the user is determined by the token)
+   *
+   * @param {string} projectName The name of the project
+   * @param {string} token The authentication token
+   */
+  getStatistics(
+    projectName: string,
+    token: string,
+    userName?: string,
+  ): Promise<APIResponse<Statistics>>;
+
+  /**
+   * Changes the name of a project
+   * @param {string} projectName The name of the project
+   * @param {string} newProjectName The new name of the project
+   * @param {string} token The authentication token
+   */
+  changeProjectName(
+    projectName: string,
+    newProjectName: string,
+    token: string,
+  ): Promise<APIResponse<string>>;
+
+  /**
+   * Changes the password of a user
+   * @param {string} username The username of the user
+   * @param {string} newPassword The new password
+   * @param {string} token The authentication token
+   */
+  changeUserPassword(
+    username: string,
+    newPassword: string,
+    token: string,
+  ): Promise<APIResponse<string>>;
 }
 
 /** An instance of the API */
@@ -166,19 +332,17 @@ export const api: API = {
   ): Promise<APIResponse<User>> {
     try {
       const response = await fetch(`/api/userdelete/${username}`, {
-        method: "POST",
+        method: "DELETE",
         headers: {
           "Content-Type": "application/json",
           Authorization: "Bearer " + token,
         },
         body: JSON.stringify(username),
       });
-
       if (!response.ok) {
-        return { success: false, message: "Failed to remove user" };
+        return { success: false, message: "Could not remove user" };
       } else {
-        const data = (await response.json()) as User;
-        return { success: true, data };
+        return { success: true };
       }
     } catch (e) {
       return { success: false, message: "Failed to remove user" };
@@ -186,19 +350,20 @@ 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,
+      const response = await fetch(
+        `/api/checkIfProjectManager/${projectName}`,
+        {
+          method: "GET",
+          headers: {
+            "Content-Type": "application/json",
+            Authorization: "Bearer " + token,
+          },
         },
-        body: JSON.stringify({ username, projectName }),
-      });
+      );
 
       if (!response.ok) {
         return {
@@ -210,14 +375,14 @@ export const api: API = {
         return { success: true, data };
       }
     } catch (e) {
-      return { success: false, message: "fuck" };
+      return { success: false, message: "Failed to check if project manager" };
     }
   },
 
   async createProject(
     project: NewProject,
     token: string,
-  ): Promise<APIResponse<Project>> {
+  ): Promise<APIResponse<void>> {
     try {
       const response = await fetch("/api/project", {
         method: "POST",
@@ -231,14 +396,64 @@ export const api: API = {
       if (!response.ok) {
         return { success: false, message: "Failed to create project" };
       } else {
-        const data = (await response.json()) as Project;
-        return { success: true, data };
+        return { success: true };
       }
     } catch (e) {
-      return { success: false, message: "Failed to create project" };
+      return { success: false, message: "Failed to create project!" };
     }
   },
 
+  async addUserToProject(
+    addMemberInfo: AddMemberInfo,
+    token: string,
+  ): Promise<APIResponse<void>> {
+    try {
+      const response = await fetch(
+        `/api/addUserToProject/${addMemberInfo.projectName}/?userName=${addMemberInfo.userName}`,
+        {
+          method: "PUT",
+          headers: {
+            "Content-Type": "application/json",
+            Authorization: "Bearer " + token,
+          },
+        },
+      );
+
+      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 removeUserFromProject(
+    user: string,
+    project: string,
+    token: string,
+  ): Promise<APIResponse<void>> {
+    try {
+      const response = await fetch(
+        `/api/removeUserFromProject/${project}?userName=${user}`,
+        {
+          method: "DELETE",
+          headers: {
+            "Content-Type": "application/json",
+            Authorization: "Bearer " + token,
+          },
+        },
+      );
+      if (!response.ok) {
+        return { success: false, message: "Failed to remove member" };
+      }
+    } catch (e) {
+      return { success: false, message: "Failed to remove member" };
+    }
+    return { success: true, message: "Removed member" };
+  },
+
   async renewToken(token: string): Promise<APIResponse<string>> {
     try {
       const response = await fetch("/api/loginrenew", {
@@ -260,9 +475,39 @@ export const api: API = {
     }
   },
 
-  async getUserProjects(token: string): Promise<APIResponse<Project[]>> {
+  async changeUserRole(
+    roleInfo: ProjectRoleChange,
+    token: string,
+  ): Promise<APIResponse<void>> {
     try {
-      const response = await fetch("/api/getUserProjects", {
+      const response = await fetch("/api/ProjectRoleChange", {
+        method: "POST",
+        headers: {
+          "Content-Type": "application/json",
+          Authorization: "Bearer " + token,
+        },
+        body: JSON.stringify(roleInfo),
+      });
+
+      if (!response.ok) {
+        if (response.status === 403) {
+          return { success: false, message: "Cannot change your own role" };
+        }
+        return { success: false, message: "Could not change role" };
+      } else {
+        return { success: true };
+      }
+    } catch (e) {
+      return { success: false, message: "Could not change role" };
+    }
+  },
+
+  async getUserProjects(
+    username: string,
+    token: string,
+  ): Promise<APIResponse<Project[]>> {
+    try {
+      const response = await fetch(`/api/getUserProjects/${username}`, {
         method: "GET",
         headers: {
           "Content-Type": "application/json",
@@ -287,10 +532,41 @@ export const api: API = {
     }
   },
 
+  async getProjectTimes(
+    projectName: string,
+    token: string,
+  ): Promise<APIResponse<projectTimes>> {
+    try {
+      const response = await fetch(`/api/getProjectTimes/${projectName}`, {
+        method: "GET",
+        headers: {
+          "Content-Type": "application/json",
+          Authorization: "Bearer " + token,
+        },
+      });
+
+      if (!response.ok) {
+        return Promise.resolve({
+          success: false,
+          message:
+            "Fetch error: " + response.status + ", failed to get project times",
+        });
+      } else {
+        const data = (await response.json()) as projectTimes;
+        return Promise.resolve({ success: true, data });
+      }
+    } catch (e) {
+      return Promise.resolve({
+        success: false,
+        message: "API error! Could not get times.",
+      });
+    }
+  },
+
   async submitWeeklyReport(
     weeklyReport: NewWeeklyReport,
     token: string,
-  ): Promise<APIResponse<NewWeeklyReport>> {
+  ): Promise<APIResponse<string>> {
     try {
       const response = await fetch("/api/submitWeeklyReport", {
         method: "POST",
@@ -308,8 +584,8 @@ export const api: API = {
         };
       }
 
-      const data = (await response.json()) as NewWeeklyReport;
-      return { success: true, data };
+      const data = await response.text();
+      return { success: true, message: data };
     } catch (e) {
       return {
         success: false,
@@ -318,22 +594,55 @@ export const api: API = {
     }
   },
 
-  async getWeeklyReport(
-    username: string,
-    projectName: string,
-    week: string,
+  async updateWeeklyReport(
+    weeklyReport: UpdateWeeklyReport,
     token: string,
-  ): Promise<APIResponse<WeeklyReport>> {
+  ): Promise<APIResponse<string>> {
     try {
-      const response = await fetch("/api/getWeeklyReport", {
-        method: "GET",
+      const response = await fetch("/api/updateWeeklyReport", {
+        method: "PUT",
         headers: {
           "Content-Type": "application/json",
           Authorization: "Bearer " + token,
         },
-        body: JSON.stringify({ username, projectName, week }),
+        body: JSON.stringify(weeklyReport),
       });
 
+      if (!response.ok) {
+        return {
+          success: false,
+          message: "Failed to update weekly report",
+        };
+      }
+
+      const data = await response.text();
+      return { success: true, message: data };
+    } catch (e) {
+      return {
+        success: false,
+        message: "Failed to update weekly report",
+      };
+    }
+  },
+
+  async getWeeklyReport(
+    projectName: string,
+    week: string,
+    token: string,
+    targetUser?: string,
+  ): Promise<APIResponse<WeeklyReport>> {
+    try {
+      const response = await fetch(
+        `/api/getWeeklyReport?projectName=${projectName}&week=${week}&targetUser=${targetUser ?? ""}`,
+        {
+          method: "GET",
+          headers: {
+            "Content-Type": "application/json",
+            Authorization: "Bearer " + token,
+          },
+        },
+      );
+
       if (!response.ok) {
         return { success: false, message: "Failed to get weekly report" };
       } else {
@@ -345,18 +654,22 @@ export const api: API = {
     }
   },
 
-  async getWeeklyReportsForUser(
+  async getAllWeeklyReportsForUser(
     projectName: string,
     token: string,
+    targetUser?: string,
   ): Promise<APIResponse<WeeklyReport[]>> {
     try {
-      const response = await fetch(`/api/getWeeklyReportsUser/${projectName}`, {
-        method: "GET",
-        headers: {
-          "Content-Type": "application/json",
-          Authorization: "Bearer " + token,
+      const response = await fetch(
+        `/api/getAllWeeklyReports/${projectName}?targetUser=${targetUser ?? ""}`,
+        {
+          method: "GET",
+          headers: {
+            "Content-Type": "application/json",
+            Authorization: "Bearer " + token,
+          },
         },
-      });
+      );
 
       if (!response.ok) {
         return {
@@ -388,7 +701,11 @@ export const api: API = {
       });
 
       if (!response.ok) {
-        return { success: false, message: "Failed to login" };
+        return {
+          success: false,
+          data: `${response.status}`,
+          message: "Failed to login",
+        };
       } else {
         const data = (await response.json()) as { token: string }; // Update the type of 'data'
         return { success: true, data: data.token };
@@ -449,4 +766,322 @@ export const api: API = {
       });
     }
   },
+  //Gets all users in a project
+  async getAllUsersProject(
+    projectName: string,
+    token: string,
+  ): Promise<APIResponse<ProjectMember[]>> {
+    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 ProjectMember[];
+        return Promise.resolve({ success: true, data });
+      }
+    } catch (e) {
+      return Promise.resolve({
+        success: false,
+        message: "API is not ok",
+      });
+    }
+  },
+
+  async getUnsignedReportsInProject(
+    projectName: string,
+    token: string,
+  ): Promise<APIResponse<WeeklyReport[]>> {
+    try {
+      const response = await fetch(`/api/getUnsignedReports/${projectName}`, {
+        method: "GET",
+        headers: {
+          "Content-Type": "application/json",
+          Authorization: "Bearer " + token,
+        },
+      });
+
+      if (!response.ok) {
+        return {
+          success: false,
+          message:
+            "Failed to get unsigned 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 unsigned reports for project, unknown error",
+      };
+    }
+  },
+
+  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/removeProject/${projectName}`, {
+        method: "DELETE",
+        headers: {
+          "Content-Type": "application/json",
+          Authorization: "Bearer " + token,
+        },
+      });
+
+      if (!response.ok) {
+        return Promise.resolve({
+          success: false,
+          message: "Failed to remove project",
+        });
+      } else {
+        const data = await response.text();
+        return Promise.resolve({ success: true, message: data });
+      }
+    } catch (e) {
+      return Promise.resolve({
+        success: false,
+        message: "Failed to remove project",
+      });
+    }
+  },
+
+  async signReport(
+    reportId: number,
+    token: string,
+  ): Promise<APIResponse<string>> {
+    try {
+      const response = await fetch(`/api/signReport/${reportId}`, {
+        method: "PUT",
+        headers: {
+          "Content-Type": "application/json",
+          Authorization: "Bearer " + token,
+        },
+      });
+
+      if (!response.ok) {
+        return { success: false, message: "Failed to sign report" };
+      } else {
+        return { success: true, message: "Report signed" };
+      }
+    } catch (e) {
+      return { success: false, message: "Failed to sign report" };
+    }
+  },
+
+  async unsignReport(
+    reportId: number,
+    token: string,
+  ): Promise<APIResponse<string>> {
+    try {
+      const response = await fetch(`/api/unsignReport/${reportId}`, {
+        method: "PUT",
+        headers: {
+          "Content-Type": "application/json",
+          Authorization: "Bearer " + token,
+        },
+      });
+
+      if (!response.ok) {
+        return { success: false, message: "Failed to unsign report" };
+      } else {
+        return { success: true, message: "Report unsigned" };
+      }
+    } catch (e) {
+      return { success: false, message: "Failed to unsign report" };
+    }
+  },
+
+  async promoteToPm(
+    userName: string,
+    projectName: string,
+    token: string,
+  ): Promise<APIResponse<string>> {
+    try {
+      const response = await fetch(
+        `/api/promoteToPm/${projectName}?userName=${userName}`,
+        {
+          method: "PUT",
+          headers: {
+            "Content-Type": "application/json",
+            Authorization: "Bearer " + token,
+          },
+        },
+      );
+      if (!response.ok) {
+        return {
+          success: false,
+          message: "Failed to promote user to project manager",
+        };
+      }
+    } catch (e) {
+      return {
+        success: false,
+        message: "Failed to promote user to project manager",
+      };
+    }
+    return { success: true, message: "User promoted to project manager" };
+  },
+
+  async getUsername(id: number, token: string): Promise<APIResponse<string>> {
+    try {
+      const response = await fetch(`/api/username?userId=${id}`, {
+        method: "GET",
+        headers: {
+          "Content-Type": "application/json",
+          Authorization: "Bearer " + token,
+        },
+      });
+
+      if (!response.ok) {
+        return { success: false, message: "Failed to get username" };
+      } else {
+        const data = (await response.json()) as string;
+        return { success: true, data };
+      }
+    } catch (e) {
+      return { success: false, message: "Failed to get username" };
+    }
+  },
+
+  async deleteWeeklyReport(
+    reportId: number,
+    token: string,
+  ): Promise<APIResponse<string>> {
+    try {
+      const response = await fetch(`/api/deleteReport/${reportId}`, {
+        method: "DELETE",
+        headers: {
+          "Content-Type": "application/json",
+          Authorization: "Bearer " + token,
+        },
+      });
+
+      if (!response.ok) {
+        return { success: false, message: "Failed to delete report" };
+      } else {
+        return { success: true, message: "Report deleted" };
+      }
+    } catch (e) {
+      return { success: false, message: "Failed to delete report" };
+    }
+  },
+  async getStatistics(
+    projectName: string,
+    token: string,
+    userName?: string,
+  ): Promise<APIResponse<Statistics>> {
+    try {
+      const response = await fetch(
+        `/api/getStatistics/?projectName=${projectName}&userName=${userName ?? ""}`,
+        {
+          method: "GET",
+          headers: {
+            "Content-Type": "application/json",
+            Authorization: "Bearer " + token,
+          },
+        },
+      );
+
+      if (!response.ok) {
+        return { success: false, message: "Failed to get statistics" };
+      } else {
+        const data = (await response.json()) as Statistics;
+        return { success: true, data };
+      }
+    } catch (e) {
+      return { success: false, message: "Failed to get statistics" };
+    }
+  },
+
+  async changeProjectName(
+    projectName: string,
+    newProjectName: string,
+    token: string,
+  ): Promise<APIResponse<string>> {
+    try {
+      const response = await fetch(
+        `/api/changeProjectName/${projectName}?newProjectName=${newProjectName}`,
+        {
+          method: "PUT",
+          headers: {
+            "Content-Type": "application/json",
+            Authorization: "Bearer " + token,
+          },
+        },
+      );
+
+      if (!response.ok) {
+        return { success: false, message: "Failed to change project name" };
+      } else {
+        return { success: true, message: "Project name changed" };
+      }
+    } catch (e) {
+      return { success: false, message: "Failed to change project name" };
+    }
+  },
+
+  async changeUserPassword(
+    username: string,
+    newPassword: string,
+    token: string,
+  ): Promise<APIResponse<string>> {
+    try {
+      const response = await fetch(
+        `/api/changeUserPassword/${username}?newPassword=${newPassword}`,
+        {
+          method: "PUT",
+          headers: {
+            "Content-Type": "application/json",
+            Authorization: "Bearer " + token,
+          },
+        },
+      );
+
+      if (!response.ok) {
+        return { success: false, message: "Failed to change password" };
+      } else {
+        return { success: true, message: "Password changed" };
+      }
+    } catch (e) {
+      return { success: false, message: "Failed to change password" };
+    }
+  },
 };

frontend/src/API/GenApi.ts

@@ -0,0 +1,358 @@
+/* eslint-disable */
+/* tslint:disable */
+/*
+ * ---------------------------------------------------------------
+ * ## THIS FILE WAS GENERATED VIA SWAGGER-TYPESCRIPT-API        ##
+ * ##                                                           ##
+ * ## AUTHOR: acacode                                           ##
+ * ## SOURCE: https://github.com/acacode/swagger-typescript-api ##
+ * ---------------------------------------------------------------
+ */
+
+export interface TypesNewUser {
+  /** @example "password123" */
+  password?: string;
+  /** @example "username123" */
+  username?: string;
+}
+
+export interface TypesToken {
+  token?: string;
+}
+
+export type QueryParamsType = Record<string | number, any>;
+export type ResponseFormat = keyof Omit<Body, "body" | "bodyUsed">;
+
+export interface FullRequestParams extends Omit<RequestInit, "body"> {
+  /** set parameter to `true` for call `securityWorker` for this request */
+  secure?: boolean;
+  /** request path */
+  path: string;
+  /** content type of request body */
+  type?: ContentType;
+  /** query params */
+  query?: QueryParamsType;
+  /** format of response (i.e. response.json() -> format: "json") */
+  format?: ResponseFormat;
+  /** request body */
+  body?: unknown;
+  /** base url */
+  baseUrl?: string;
+  /** request cancellation token */
+  cancelToken?: CancelToken;
+}
+
+export type RequestParams = Omit<FullRequestParams, "body" | "method" | "query" | "path">;
+
+export interface ApiConfig<SecurityDataType = unknown> {
+  baseUrl?: string;
+  baseApiParams?: Omit<RequestParams, "baseUrl" | "cancelToken" | "signal">;
+  securityWorker?: (securityData: SecurityDataType | null) => Promise<RequestParams | void> | RequestParams | void;
+  customFetch?: typeof fetch;
+}
+
+export interface HttpResponse<D extends unknown, E extends unknown = unknown> extends Response {
+  data: D;
+  error: E;
+}
+
+type CancelToken = Symbol | string | number;
+
+export enum ContentType {
+  Json = "application/json",
+  FormData = "multipart/form-data",
+  UrlEncoded = "application/x-www-form-urlencoded",
+  Text = "text/plain",
+}
+
+export class HttpClient<SecurityDataType = unknown> {
+  public baseUrl: string = "//localhost:8080/api";
+  private securityData: SecurityDataType | null = null;
+  private securityWorker?: ApiConfig<SecurityDataType>["securityWorker"];
+  private abortControllers = new Map<CancelToken, AbortController>();
+  private customFetch = (...fetchParams: Parameters<typeof fetch>) => fetch(...fetchParams);
+
+  private baseApiParams: RequestParams = {
+    credentials: "same-origin",
+    headers: {},
+    redirect: "follow",
+    referrerPolicy: "no-referrer",
+  };
+
+  constructor(apiConfig: ApiConfig<SecurityDataType> = {}) {
+    Object.assign(this, apiConfig);
+  }
+
+  public setSecurityData = (data: SecurityDataType | null) => {
+    this.securityData = data;
+  };
+
+  protected encodeQueryParam(key: string, value: any) {
+    const encodedKey = encodeURIComponent(key);
+    return `${encodedKey}=${encodeURIComponent(typeof value === "number" ? value : `${value}`)}`;
+  }
+
+  protected addQueryParam(query: QueryParamsType, key: string) {
+    return this.encodeQueryParam(key, query[key]);
+  }
+
+  protected addArrayQueryParam(query: QueryParamsType, key: string) {
+    const value = query[key];
+    return value.map((v: any) => this.encodeQueryParam(key, v)).join("&");
+  }
+
+  protected toQueryString(rawQuery?: QueryParamsType): string {
+    const query = rawQuery || {};
+    const keys = Object.keys(query).filter((key) => "undefined" !== typeof query[key]);
+    return keys
+      .map((key) => (Array.isArray(query[key]) ? this.addArrayQueryParam(query, key) : this.addQueryParam(query, key)))
+      .join("&");
+  }
+
+  protected addQueryParams(rawQuery?: QueryParamsType): string {
+    const queryString = this.toQueryString(rawQuery);
+    return queryString ? `?${queryString}` : "";
+  }
+
+  private contentFormatters: Record<ContentType, (input: any) => any> = {
+    [ContentType.Json]: (input: any) =>
+      input !== null && (typeof input === "object" || typeof input === "string") ? JSON.stringify(input) : input,
+    [ContentType.Text]: (input: any) => (input !== null && typeof input !== "string" ? JSON.stringify(input) : input),
+    [ContentType.FormData]: (input: any) =>
+      Object.keys(input || {}).reduce((formData, key) => {
+        const property = input[key];
+        formData.append(
+          key,
+          property instanceof Blob
+            ? property
+            : typeof property === "object" && property !== null
+            ? JSON.stringify(property)
+            : `${property}`,
+        );
+        return formData;
+      }, new FormData()),
+    [ContentType.UrlEncoded]: (input: any) => this.toQueryString(input),
+  };
+
+  protected mergeRequestParams(params1: RequestParams, params2?: RequestParams): RequestParams {
+    return {
+      ...this.baseApiParams,
+      ...params1,
+      ...(params2 || {}),
+      headers: {
+        ...(this.baseApiParams.headers || {}),
+        ...(params1.headers || {}),
+        ...((params2 && params2.headers) || {}),
+      },
+    };
+  }
+
+  protected createAbortSignal = (cancelToken: CancelToken): AbortSignal | undefined => {
+    if (this.abortControllers.has(cancelToken)) {
+      const abortController = this.abortControllers.get(cancelToken);
+      if (abortController) {
+        return abortController.signal;
+      }
+      return void 0;
+    }
+
+    const abortController = new AbortController();
+    this.abortControllers.set(cancelToken, abortController);
+    return abortController.signal;
+  };
+
+  public abortRequest = (cancelToken: CancelToken) => {
+    const abortController = this.abortControllers.get(cancelToken);
+
+    if (abortController) {
+      abortController.abort();
+      this.abortControllers.delete(cancelToken);
+    }
+  };
+
+  public request = async <T = any, E = any>({
+    body,
+    secure,
+    path,
+    type,
+    query,
+    format,
+    baseUrl,
+    cancelToken,
+    ...params
+  }: FullRequestParams): Promise<HttpResponse<T, E>> => {
+    const secureParams =
+      ((typeof secure === "boolean" ? secure : this.baseApiParams.secure) &&
+        this.securityWorker &&
+        (await this.securityWorker(this.securityData))) ||
+      {};
+    const requestParams = this.mergeRequestParams(params, secureParams);
+    const queryString = query && this.toQueryString(query);
+    const payloadFormatter = this.contentFormatters[type || ContentType.Json];
+    const responseFormat = format || requestParams.format;
+
+    return this.customFetch(`${baseUrl || this.baseUrl || ""}${path}${queryString ? `?${queryString}` : ""}`, {
+      ...requestParams,
+      headers: {
+        ...(requestParams.headers || {}),
+        ...(type && type !== ContentType.FormData ? { "Content-Type": type } : {}),
+      },
+      signal: (cancelToken ? this.createAbortSignal(cancelToken) : requestParams.signal) || null,
+      body: typeof body === "undefined" || body === null ? null : payloadFormatter(body),
+    }).then(async (response) => {
+      const r = response as HttpResponse<T, E>;
+      r.data = null as unknown as T;
+      r.error = null as unknown as E;
+
+      const data = !responseFormat
+        ? r
+        : await response[responseFormat]()
+            .then((data) => {
+              if (r.ok) {
+                r.data = data;
+              } else {
+                r.error = data;
+              }
+              return r;
+            })
+            .catch((e) => {
+              r.error = e;
+              return r;
+            });
+
+      if (cancelToken) {
+        this.abortControllers.delete(cancelToken);
+      }
+
+      if (!response.ok) throw data;
+      return data;
+    });
+  };
+}
+
+/**
+ * @title TTime API
+ * @version 0.0.1
+ * @license AGPL (https://www.gnu.org/licenses/agpl-3.0.html)
+ * @baseUrl //localhost:8080/api
+ * @externalDocs https://swagger.io/resources/open-api/
+ * @contact
+ *
+ * This is the API for TTime, a time tracking application.
+ */
+export class GenApi<SecurityDataType extends unknown> extends HttpClient<SecurityDataType> {
+  login = {
+    /**
+     * @description Logs in a user and returns a JWT token
+     *
+     * @tags Auth
+     * @name LoginCreate
+     * @summary Login
+     * @request POST:/login
+     */
+    loginCreate: (body: TypesNewUser, params: RequestParams = {}) =>
+      this.request<TypesToken, string>({
+        path: `/login`,
+        method: "POST",
+        body: body,
+        type: ContentType.Json,
+        format: "json",
+        ...params,
+      }),
+  };
+  loginrenew = {
+    /**
+     * @description Renews the users token.
+     *
+     * @tags Auth
+     * @name LoginrenewCreate
+     * @summary LoginRenews
+     * @request POST:/loginrenew
+     * @secure
+     */
+    loginrenewCreate: (params: RequestParams = {}) =>
+      this.request<TypesToken, string>({
+        path: `/loginrenew`,
+        method: "POST",
+        secure: true,
+        format: "json",
+        ...params,
+      }),
+  };
+  promoteToAdmin = {
+    /**
+     * @description Promote chosen user to site admin
+     *
+     * @tags User
+     * @name PromoteToAdminCreate
+     * @summary PromoteToAdmin
+     * @request POST:/promoteToAdmin
+     * @secure
+     */
+    promoteToAdminCreate: (NewUser: TypesNewUser, params: RequestParams = {}) =>
+      this.request<TypesToken, string>({
+        path: `/promoteToAdmin`,
+        method: "POST",
+        body: NewUser,
+        secure: true,
+        type: ContentType.Json,
+        ...params,
+      }),
+  };
+  register = {
+    /**
+     * @description Register a new user
+     *
+     * @tags Auth
+     * @name RegisterCreate
+     * @summary Register
+     * @request POST:/register
+     */
+    registerCreate: (NewUser: TypesNewUser, params: RequestParams = {}) =>
+      this.request<string, string>({
+        path: `/register`,
+        method: "POST",
+        body: NewUser,
+        type: ContentType.Json,
+        ...params,
+      }),
+  };
+  userdelete = {
+    /**
+     * @description UserDelete deletes a user from the database
+     *
+     * @tags User
+     * @name UserdeleteDelete
+     * @summary UserDelete
+     * @request DELETE:/userdelete/{username}
+     * @secure
+     */
+    userdeleteDelete: (username: string, params: RequestParams = {}) =>
+      this.request<string, string>({
+        path: `/userdelete/${username}`,
+        method: "DELETE",
+        secure: true,
+        type: ContentType.Json,
+        ...params,
+      }),
+  };
+  users = {
+    /**
+     * @description lists all users
+     *
+     * @tags User
+     * @name GetUsers
+     * @summary ListsAllUsers
+     * @request GET:/users/all
+     * @secure
+     */
+    getUsers: (params: RequestParams = {}) =>
+      this.request<string[], string>({
+        path: `/users/all`,
+        method: "GET",
+        secure: true,
+        format: "json",
+        ...params,
+      }),
+  };
+}

frontend/src/Components/AddMember.tsx

@@ -0,0 +1,35 @@
+import { api } from "../API/API";
+
+export interface AddMemberInfo {
+  userName: string;
+  projectName: string;
+}
+
+/**
+ * Tries to add a member to a project
+ * @param {AddMemberInfo} props.membertoAdd - Contains user's name and project's name
+ * @returns {Promise<void>}
+ */
+async function AddMember(props: { memberToAdd: AddMemberInfo }): Promise<void> {
+  if (props.memberToAdd.userName === "") {
+    alert("You must choose at least one user to add");
+    return;
+  }
+  try {
+    const response = await api.addUserToProject(
+      props.memberToAdd,
+      localStorage.getItem("accessToken") ?? "",
+    );
+    if (response.success) {
+      alert(`[${props.memberToAdd.userName}] added`);
+    } else {
+      alert(`[${props.memberToAdd.userName}] not added`);
+      console.error(response.message);
+    }
+  } catch (error) {
+    alert(`[${props.memberToAdd.userName}] not added`);
+    console.error("An error occurred during member add:", error);
+  }
+}
+
+export default AddMember;

frontend/src/Components/AddProject.tsx

@@ -1,37 +1,13 @@
 import { useState } from "react";
-import { APIResponse, api } from "../API/API";
-import { NewProject, Project } from "../Types/goTypes";
-import InputField from "./InputField";
+import { api } from "../API/API";
+import { NewProject } from "../Types/goTypes";
 import Logo from "../assets/Logo.svg";
 import Button from "./Button";
-
-/**
- * Tries to add a project to the system
- * @param {Object} props - Project name and description
- * @returns {boolean} True if created, false if not
- */
-function CreateProject(props: { name: string; description: string }): boolean {
-  const project: NewProject = {
-    name: props.name,
-    description: props.description,
-  };
-
-  let created = false;
-
-  api
-    .createProject(project, localStorage.getItem("accessToken") ?? "")
-    .then((response: APIResponse<Project>) => {
-      if (response.success) {
-        created = true;
-      } else {
-        console.error(response.message);
-      }
-    })
-    .catch((error) => {
-      console.error("An error occurred during creation:", error);
-    });
-  return created;
-}
+import { useNavigate } from "react-router-dom";
+import ProjectNameInput from "./Inputs/ProjectNameInput";
+import DescriptionInput from "./Inputs/DescriptionInput";
+import { alphanumeric } from "../Data/regex";
+import { projNameHighLimit, projNameLowLimit } from "../Data/constants";
 
 /**
  * Provides UI for adding a project to the system.
@@ -40,42 +16,85 @@ function CreateProject(props: { name: string; description: string }): boolean {
 function AddProject(): JSX.Element {
   const [name, setName] = useState("");
   const [description, setDescription] = useState("");
+  const navigate = useNavigate();
+
+  /**
+   * Tries to add a project to the system
+   */
+  const handleCreateProject = async (): Promise<void> => {
+    if (
+      !alphanumeric.test(name) ||
+      name.length > projNameHighLimit ||
+      name.length < projNameLowLimit
+    ) {
+      alert(
+        "Please provide valid project name: \n-Between 10-99 characters \n-No special characters (.-!?/*)",
+      );
+      return;
+    }
+    if (description.length > projNameHighLimit) {
+      alert("Please provide valid description: \n-Max 100 characters");
+      return;
+    }
+    const project: NewProject = {
+      name: name.replace(/ /g, ""),
+      description: description.trim(),
+    };
+    try {
+      const response = await api.createProject(
+        project,
+        localStorage.getItem("accessToken") ?? "",
+      );
+      if (response.success) {
+        alert(`${project.name} added!`);
+        setDescription("");
+        setName("");
+        navigate("/admin");
+      } else {
+        alert("Project not added, name could be taken");
+        console.error(response.message);
+      }
+    } catch (error) {
+      alert("Project not added");
+      console.error(error);
+    }
+  };
 
   return (
     <div className="flex flex-col h-fit w-screen items-center justify-center">
       <div className="border-4 border-black bg-white flex flex-col items-center justify-center h-fit w-fit rounded-3xl content-center pl-20 pr-20">
         <form
-          className="bg-white rounded px-8 pt-6 pb-8 mb-4 items-center justify-center flex flex-col w-fit h-fit"
+          className="bg-white rounded px-8 pt-6 pb-8 mb-4 justify-center flex flex-col w-fit h-fit"
           onSubmit={(e) => {
             e.preventDefault();
-            CreateProject({ name: name, description: description });
+            void handleCreateProject();
           }}
         >
           <img
             src={Logo}
-            className="logo w-[7vw] mb-10 mt-10"
+            className="logo w-[7vw] self-center mb-10 mt-10"
             alt="TTIME Logo"
           />
           <h3 className="pb-4 mb-2 text-center font-bold text-[18px]">
             Create a new project
           </h3>
-          <InputField
-            label="Name"
-            type="text"
-            value={name}
+          <ProjectNameInput
+            name={name}
             onChange={(e) => {
+              e.preventDefault();
               setName(e.target.value);
             }}
           />
-          <InputField
-            label="Description"
-            type="text"
-            value={description}
+          <div className="p-2"></div>
+          <DescriptionInput
+            desc={description}
             onChange={(e) => {
+              e.preventDefault();
               setDescription(e.target.value);
             }}
+            placeholder={"Description (Optional)"}
           />
-          <div className="flex items-center justify-between">
+          <div className="flex self-center mt-4 justify-between">
             <Button
               text="Create"
               onClick={(): void => {

frontend/src/Components/AddUserToProject.tsx

@@ -0,0 +1,125 @@
+import { useEffect, useState } from "react";
+import Button from "./Button";
+import AddMember, { AddMemberInfo } from "./AddMember";
+import GetUsersInProject, { ProjectMember } from "./GetUsersInProject";
+import GetAllUsers from "./GetAllUsers";
+import InputField from "./InputField";
+
+/**
+ * Provides UI for adding a member to a project.
+ * @returns {JSX.Element} - Returns the component UI for adding a member
+ */
+function AddUserToProject(props: { projectName: string }): JSX.Element {
+  const [names, setNames] = useState<string[]>([]);
+  const [users, setUsers] = useState<string[]>([]);
+  const [usersProj, setUsersProj] = useState<ProjectMember[]>([]);
+  const [search, setSearch] = useState("");
+
+  // Gets all users and project members for filtering
+  GetAllUsers({ setUsersProp: setUsers });
+  GetUsersInProject({
+    setUsersProp: setUsersProj,
+    projectName: props.projectName,
+  });
+  /*
+   * Filters the members from users so that users who are already
+   * members are not shown
+   */
+  useEffect(() => {
+    setUsers((prevUsers) => {
+      const filteredUsers = prevUsers.filter(
+        (user) =>
+          !usersProj.some((projectUser) => projectUser.Username === user),
+      );
+      return filteredUsers;
+    });
+  }, [usersProj]);
+
+  // Attempts to add all of the selected users to the project
+  const handleAddClick = async (): Promise<void> => {
+    if (names.length === 0) {
+      alert("You have to choose at least one user to add");
+      return;
+    }
+    for (const name of names) {
+      const newMember: AddMemberInfo = {
+        userName: name,
+        projectName: props.projectName,
+      };
+      await AddMember({ memberToAdd: newMember });
+    }
+    setNames([]);
+    location.reload();
+  };
+
+  // Updates the names that have been selected
+  const handleUserClick = (user: string): void => {
+    setNames((prevNames): string[] => {
+      if (!prevNames.includes(user)) {
+        return [...prevNames, user];
+      }
+      return prevNames.filter((name) => name !== user);
+    });
+  };
+
+  return (
+    <div className="border-4 border-black bg-white flex flex-col items-center py-10 px-20 rounded-3xl content-center overflow-auto">
+      <h1 className="text-center font-bold text-[36px] pb-10">
+        {props.projectName}
+      </h1>
+      <p className="p-1 text-center font-bold text-[26px]">
+        Choose users to add:
+      </p>
+
+      <div>
+        <InputField
+          placeholder={"Search users"}
+          type={"Text"}
+          value={search}
+          onChange={(e) => {
+            setSearch(e.target.value);
+          }}
+        />
+        <ul className="font-medium space-y-2 border-2 border-black mt-2 px-2 pb-2 rounded-2xl text-center overflow-auto h-[26vh] w-[34vh]">
+          <div></div>
+          {users
+            .filter((user) => {
+              return search.toLowerCase() === ""
+                ? user
+                : user.toLowerCase().includes(search.toLowerCase());
+            })
+            .map((user) => (
+              <li
+                className={
+                  names.includes(user)
+                    ? "items-start p-1 border-2 border-transparent rounded-full bg-orange-500 transition-all hover:bg-orange-600  text-white hover:cursor-pointer ring-2 ring-black"
+                    : "items-start p-1 border-2 border-black rounded-full bg-orange-200 hover:bg-orange-400 transition-all hover:text-white hover:cursor-pointer"
+                }
+                key={user}
+                value={user}
+                onClick={() => {
+                  handleUserClick(user);
+                }}
+              >
+                <span>{user}</span>
+              </li>
+            ))}
+        </ul>
+      </div>
+      <p className="pt-10 pb-5 underline text-center font-bold text-[18px]">
+        Number of users to be added: {names.length}
+      </p>
+      <div className="space-x-10 items-center">
+        <Button
+          text="Add"
+          onClick={(): void => {
+            void handleAddClick();
+          }}
+          type="button"
+        />
+      </div>
+    </div>
+  );
+}
+
+export default AddUserToProject;

frontend/src/Components/AllTimeReportsInProject.tsx

@@ -13,33 +13,33 @@ function AllTimeReportsInProject(): JSX.Element {
   const { projectName } = useParams();
   const [weeklyReports, setWeeklyReports] = useState<WeeklyReport[]>([]);
 
-  const getWeeklyReports = async (): Promise<void> => {
-    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(() => {
+    const getWeeklyReports = async (): Promise<void> => {
+      const token = localStorage.getItem("accessToken") ?? "";
+      const response = await api.getAllWeeklyReportsForUser(
+        projectName ?? "",
+        token,
+      );
+      console.log(response);
+      if (response.success) {
+        setWeeklyReports(response.data ?? []);
+      } else {
+        console.error(response.message);
+      }
+    };
+
     void getWeeklyReports();
-  });
+  }, [projectName]);
 
   return (
     <>
       <div className="border-4 border-black bg-white flex flex-col items-center justify-center min-h-[65vh] h-fit w-[50vw] rounded-3xl content-center overflow-scroll space-y-[10vh] p-[30px] text-[30px]">
         {weeklyReports.map((newWeeklyReport, index) => (
           <Link
-            to={`/editTimeReport/${projectName}/${newWeeklyReport.week}`}
+            to={`/editTimeReport/${projectName}/${newWeeklyReport.week}/${newWeeklyReport.signedBy ? "signed" : "unsigned"}`}
             key={index}
-            className="border-b-2 border-black w-full"
+            className="border-b-2 border-black w-full cursor-pointer hover:font-extrabold"
           >
             <div className="flex justify-between">
               <h1>

frontend/src/Components/AllTimeReportsInProjectOtherUser.tsx

@@ -0,0 +1,73 @@
+//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 { username } = useParams();
+  const { projectName } = useParams();
+  const [weeklyReports, setWeeklyReports] = useState<WeeklyReport[]>([]);
+
+  useEffect(() => {
+    const getWeeklyReports = async (): Promise<void> => {
+      const token = localStorage.getItem("accessToken") ?? "";
+      const response = await api.getAllWeeklyReportsForUser(
+        projectName ?? "",
+        token,
+        username ?? "",
+      );
+      console.log(response);
+      if (response.success) {
+        setWeeklyReports(response.data ?? []);
+      } else {
+        console.error(response.message);
+      }
+    };
+
+    void getWeeklyReports();
+  }, [projectName, username]);
+
+  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}/${newWeeklyReport.signedBy ? "signed" : "unsigned"}`}
+            key={index}
+            className="border-b-2 border-black w-full hover:font-extrabold"
+          >
+            <div className="flex justify-between">
+              <h1>
+                <span className="font-bold">{"Week: "}</span>
+                {newWeeklyReport.week}
+              </h1>
+              <h1>
+                <span className="font-bold">{"Total Time: "}</span>
+                {newWeeklyReport.developmentTime +
+                  newWeeklyReport.meetingTime +
+                  newWeeklyReport.adminTime +
+                  newWeeklyReport.ownWorkTime +
+                  newWeeklyReport.studyTime +
+                  newWeeklyReport.testingTime}{" "}
+                min
+              </h1>
+              <h1>
+                <span className="font-bold">{"Signed: "}</span>
+                {newWeeklyReport.signedBy ? "YES" : "NO"}
+              </h1>
+            </div>
+          </Link>
+        ))}
+      </div>
+    </>
+  );
+}
+
+export default AllTimeReportsInProject;

frontend/src/Components/ChangeProjectName.tsx

@@ -0,0 +1,36 @@
+import { APIResponse, api } from "../API/API";
+
+/**
+ * Changes the name of a project
+ * @param {string} props.projectName - Current project name
+ * @param {string} props.newProjectName - New project name
+ * @returns {void} - Nothing
+ */
+export default function ChangeProjectName(props: {
+  projectName: string;
+  newProjectName: string;
+}): void {
+  if (props.projectName === "" || props.projectName === props.newProjectName) {
+    alert("You have to give a new name\n\nName not changed");
+    return;
+  }
+  api
+    .changeProjectName(
+      props.projectName,
+      props.newProjectName,
+      localStorage.getItem("accessToken") ?? "",
+    )
+    .then((response: APIResponse<string>) => {
+      if (response.success) {
+        alert("Name changed successfully");
+        location.reload();
+      } else {
+        alert("Name not changed, name could be taken");
+        console.error(response.message);
+      }
+    })
+    .catch((error) => {
+      alert("Name not changed");
+      console.error("An error occurred during change:", error);
+    });
+}

frontend/src/Components/ChangeRole.tsx

@@ -0,0 +1,37 @@
+import { APIResponse, api } from "../API/API";
+
+export interface ProjectRoleChange {
+  username: string;
+  role: "project_manager" | "member" | "";
+  projectname: string;
+}
+
+export default function ChangeRole(roleChangeInfo: ProjectRoleChange): void {
+  if (
+    roleChangeInfo.username === "" ||
+    roleChangeInfo.role === "" ||
+    roleChangeInfo.projectname === ""
+  ) {
+    // FOR DEBUG
+    // console.log(roleChangeInfo.role + ": Role");
+    // console.log(roleChangeInfo.projectname + ": P-Name");
+    // console.log(roleChangeInfo.username + ": U-name");
+    alert("You have to select a role");
+    return;
+  }
+  api
+    .changeUserRole(roleChangeInfo, localStorage.getItem("accessToken") ?? "")
+    .then((response: APIResponse<void>) => {
+      if (response.success) {
+        alert("Role changed successfully");
+        location.reload();
+      } else {
+        alert(response.message);
+        console.error(response.message);
+      }
+    })
+    .catch((error) => {
+      alert(error);
+      console.error("An error occurred during change:", error);
+    });
+}

frontend/src/Components/ChangeRoleView.tsx

@@ -0,0 +1,76 @@
+import { useState } from "react";
+import Button from "./Button";
+import ChangeRole, { ProjectRoleChange } from "./ChangeRole";
+
+export default function ChangeRoleView(props: {
+  projectName: string;
+  username: string;
+  currentRole: string;
+}): JSX.Element {
+  const [selectedRole, setSelectedRole] = useState<
+    "project_manager" | "member" | ""
+  >("");
+
+  const handleRoleChange = (
+    event: React.ChangeEvent<HTMLInputElement>,
+  ): void => {
+    if (event.target.value === "member") {
+      setSelectedRole(event.target.value);
+    } else if (event.target.value === "project_manager") {
+      setSelectedRole(event.target.value);
+    }
+  };
+
+  const handleSubmit = (event: React.FormEvent<HTMLFormElement>): void => {
+    console.log("Cur: " + props.currentRole + " " + "new: " + selectedRole);
+    event.preventDefault();
+    if (selectedRole === props.currentRole) {
+      alert(`Already ${props.currentRole}, nothing changed`);
+      return;
+    }
+    const roleChangeInfo: ProjectRoleChange = {
+      username: props.username,
+      projectname: props.projectName,
+      role: selectedRole,
+    };
+    ChangeRole(roleChangeInfo);
+  };
+
+  return (
+    <div className="overflow-auto">
+      <h1 className="font-bold text-[20px]">Select role:</h1>
+      <form onSubmit={handleSubmit}>
+        <div className="py-1 px-1 w-full self-start text-left font-medium overflow-auto border-2 border-black rounded-2xl">
+          <label className="hover:cursor-pointer hover:font-bold">
+            <input
+              type="radio"
+              value="project_manager"
+              checked={selectedRole === "project_manager"}
+              onChange={handleRoleChange}
+              className="m-2"
+            />
+            Project manager
+          </label>
+          <br />
+          <label className="hover:cursor-pointer hover:font-bold">
+            <input
+              type="radio"
+              value="member"
+              checked={selectedRole === "member"}
+              onChange={handleRoleChange}
+              className="m-2 hover:cursor-pointer"
+            />
+            Member
+          </label>
+        </div>
+        <Button
+          text="Change"
+          onClick={(): void => {
+            return;
+          }}
+          type="submit"
+        />
+      </form>
+    </div>
+  );
+}

frontend/src/Components/ChangeUserPassword.tsx

@@ -0,0 +1,36 @@
+import { APIResponse, api } from "../API/API";
+
+/**
+ * Changes the password of a user
+ * @param {string} props.username - The username of the user
+ * @param {string} props.newPassword - The new password
+ * @returns {void} - Nothing
+ */
+export default function ChangeUserPassword(props: {
+  username: string;
+  newPassword: string;
+}): void {
+  if (props.username === localStorage.getItem("username")) {
+    alert("You cannot change admin password");
+    return;
+  }
+  api
+    .changeUserPassword(
+      props.username,
+      props.newPassword,
+      localStorage.getItem("accessToken") ?? "",
+    )
+    .then((response: APIResponse<string>) => {
+      if (response.success) {
+        alert("Password changed successfully");
+        location.reload();
+      } else {
+        alert("Password not changed");
+        console.error(response.message);
+      }
+    })
+    .catch((error) => {
+      alert("Password not changed");
+      console.error("An error occurred during change:", error);
+    });
+}

frontend/src/Components/ChangeUsername.tsx

@@ -1,34 +1,33 @@
-import React, { useState } from "react";
-import InputField from "./InputField";
+import { APIResponse, api } from "../API/API";
+import { StrNameChange } from "../Types/goTypes";
 
-function ChangeUsername(): JSX.Element {
-  const [newUsername, setNewUsername] = useState("");
-
-  const handleChange = (e: React.ChangeEvent<HTMLInputElement>): void => {
-    setNewUsername(e.target.value);
-  };
-
-  // const handleSubmit = async (): Promise<void> => {
-  //   try {
-  //     // Call the API function to update the username
-  //     await api.updateUsername(newUsername);
-  //     // Optionally, add a success message or redirect the user
-  //   } catch (error) {
-  //     console.error("Error updating username:", error);
-  //     // Optionally, handle the error
-  //   }
-  // };
-
-  return (
-    <div>
-      <InputField
-        label="New Username"
-        type="text"
-        value={newUsername}
-        onChange={handleChange}
-      />
-    </div>
-  );
+function ChangeUsername(props: { nameChange: StrNameChange }): void {
+  if (
+    props.nameChange.newName === "" ||
+    props.nameChange.newName === props.nameChange.prevName
+  ) {
+    alert("You have to give a new name\n\nName not changed");
+    return;
+  }
+  if (props.nameChange.prevName === localStorage.getItem("username")) {
+    alert("You cannot change admin name");
+    return;
+  }
+  api
+    .changeUserName(props.nameChange, localStorage.getItem("accessToken") ?? "")
+    .then((response: APIResponse<void>) => {
+      if (response.success) {
+        alert("Name changed successfully");
+        location.reload();
+      } else {
+        alert("Name not changed, name could be taken");
+        console.error(response.message);
+      }
+    })
+    .catch((error) => {
+      alert("Name not changed");
+      console.error("An error occurred during change:", error);
+    });
 }
 
 export default ChangeUsername;

frontend/src/Components/DeleteProject.tsx

@@ -0,0 +1,33 @@
+import { api, APIResponse } from "../API/API";
+
+/**
+ * Use to delete a project from the system
+ * @param {string} props.projectToDelete - The projectname of project to delete
+ * @returns {void} Nothing
+ * @example
+ * const exampleProjectName = "project";
+ * DeleteProject({ projectToDelete: exampleProjectName });
+ */
+
+function DeleteProject(props: { projectToDelete: string }): void {
+  api
+    .removeProject(
+      props.projectToDelete,
+      localStorage.getItem("accessToken") ?? "",
+    )
+    .then((response: APIResponse<string>) => {
+      if (response.success) {
+        alert("Project has been deleted!");
+        location.reload();
+      } else {
+        alert("Project has not been deleted");
+        console.error(response.message);
+      }
+    })
+    .catch((error) => {
+      alert("project has not been deleted");
+      console.error("An error occurred during deletion:", error);
+    });
+}
+
+export default DeleteProject;

frontend/src/Components/DeleteUser.tsx

@@ -3,7 +3,7 @@ import { api, APIResponse } from "../API/API";
 
 /**
  * Use to remove a user from the system
- * @param props - The username of user to remove
+ * @param {string} props.usernameToDelete - The username of user to remove
  * @returns {boolean} True if removed, false if not
  * @example
  * const exampleUsername = "user";
@@ -11,7 +11,6 @@ import { api, APIResponse } from "../API/API";
  */
 
 function DeleteUser(props: { usernameToDelete: string }): boolean {
-  //console.log(props.usernameToDelete); FOR DEBUG
   let removed = false;
   api
     .removeUser(
@@ -20,13 +19,17 @@ 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) => {
-      console.error("An error occurred during creation:", error);
+      alert("User has not been deleted");
+      console.error("An error occurred during deletion:", error);
     });
   return removed;
 }

frontend/src/Components/DisplayUnsignedReports.tsx

@@ -0,0 +1,82 @@
+import { useState, useEffect } from "react";
+import { Link, useParams } from "react-router-dom";
+import { api } from "../API/API";
+import { WeeklyReport } from "../Types/goTypes";
+
+function DisplayUserProject(): JSX.Element {
+  const { projectName } = useParams();
+  const [unsignedReports, setUnsignedReports] = useState<WeeklyReport[]>([]);
+  const [usernames, setUsernames] = useState<string[]>([]);
+  const token = localStorage.getItem("accessToken") ?? "";
+
+  useEffect(() => {
+    const getUnsignedReports = async (): Promise<void> => {
+      const response = await api.getUnsignedReportsInProject(
+        projectName ?? "",
+        token,
+      );
+      console.log(response);
+      if (response.success) {
+        setUnsignedReports(response.data ?? []);
+        const usernamesPromises = (response.data ?? []).map((report) =>
+          api.getUsername(report.userId, token),
+        );
+        const usernamesResponses = await Promise.all(usernamesPromises);
+        const usernames = usernamesResponses.map(
+          (res) => (res.data as { username?: string }).username ?? "",
+        );
+        setUsernames(usernames);
+      } else {
+        console.error(response.message);
+      }
+    };
+
+    void getUnsignedReports();
+  }, [projectName, token]);
+
+  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: WeeklyReport, index: number) => (
+          <h1 key={index} className="border-b-2 border-black w-full">
+            <div className="flex justify-between">
+              <div className="flex">
+                <span className="ml-6 mr-2 font-bold">Username:</span>
+                <h1>{usernames[index]}</h1>{" "}
+                <span className="ml-6 mr-2 font-bold">Week:</span>
+                <h1>{unsignedReport.week}</h1>
+                <span className="ml-6 mr-2 font-bold">Total Time:</span>
+                <h1>
+                  {unsignedReport.developmentTime +
+                    unsignedReport.meetingTime +
+                    unsignedReport.adminTime +
+                    unsignedReport.ownWorkTime +
+                    unsignedReport.studyTime +
+                    unsignedReport.testingTime}
+                </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}/${usernames[index]}/${unsignedReport.week}`}
+                  >
+                    <h1 className="cursor-pointer font-bold hover:font-extrabold hover:underline">
+                      View Report
+                    </h1>
+                  </Link>
+                </div>
+              </div>
+            </div>
+          </h1>
+        ))}
+      </div>
+    </>
+  );
+}
+
+export default DisplayUserProject;

frontend/src/Components/DisplayUserProjects.tsx

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

frontend/src/Components/EditWeeklyReport.tsx

@@ -1,5 +1,5 @@
 import { useState, useEffect } from "react";
-import { WeeklyReport, NewWeeklyReport } from "../Types/goTypes";
+import { WeeklyReport, UpdateWeeklyReport } from "../Types/goTypes";
 import { api } from "../API/API";
 import { useNavigate, useParams } from "react-router-dom";
 import Button from "./Button";
@@ -18,49 +18,53 @@ export default function GetWeeklyReport(): JSX.Element {
   const [testingTime, setTestingTime] = useState(0);
 
   const token = localStorage.getItem("accessToken") ?? "";
-  const username = localStorage.getItem("username") ?? "";
-  const { projectName } = useParams();
-  const { fetchedWeek } = useParams();
-
-  const fetchWeeklyReport = async (): Promise<void> => {
-    const response = await api.getWeeklyReport(
-      username,
-      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);
-    }
-  };
+  const { projectName, fetchedWeek, signedOrUnsigned } = useParams<{
+    projectName: string;
+    fetchedWeek: string;
+    signedOrUnsigned: string;
+  }>();
+  const username = localStorage.getItem("userName") ?? "";
+  console.log(projectName, fetchedWeek, signedOrUnsigned);
 
   useEffect(() => {
-    void fetchWeeklyReport();
-  });
+    const fetchWeeklyReport = async (): Promise<void> => {
+      const response = await api.getWeeklyReport(
+        projectName ?? "",
+        fetchedWeek ?? "",
+        token,
+      );
 
-  const handleNewWeeklyReport = async (): Promise<void> => {
-    const newWeeklyReport: NewWeeklyReport = {
+      if (response.success) {
+        const report: WeeklyReport = response.data ?? {
+          reportId: 0,
+          userId: 0,
+          projectId: 0,
+          week: 0,
+          developmentTime: 0,
+          meetingTime: 0,
+          adminTime: 0,
+          ownWorkTime: 0,
+          studyTime: 0,
+          testingTime: 0,
+        };
+        setWeek(report.week);
+        setDevelopmentTime(report.developmentTime);
+        setMeetingTime(report.meetingTime);
+        setAdminTime(report.adminTime);
+        setOwnWorkTime(report.ownWorkTime);
+        setStudyTime(report.studyTime);
+        setTestingTime(report.testingTime);
+      } else {
+        console.error("Failed to fetch weekly report:", response.message);
+      }
+    };
+
+    void fetchWeeklyReport();
+  }, [projectName, fetchedWeek, signedOrUnsigned, token]);
+
+  const handleUpdateWeeklyReport = async (): Promise<void> => {
+    const updateWeeklyReport: UpdateWeeklyReport = {
+      userName: username,
       projectName: projectName ?? "",
       week,
       developmentTime,
@@ -71,13 +75,14 @@ export default function GetWeeklyReport(): JSX.Element {
       testingTime,
     };
 
-    await api.submitWeeklyReport(newWeeklyReport, token);
+    await api.updateWeeklyReport(updateWeeklyReport, token);
   };
 
   const navigate = useNavigate();
 
   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) => {
@@ -87,29 +92,16 @@ export default function GetWeeklyReport(): JSX.Element {
               return;
             }
             e.preventDefault();
-            void handleNewWeeklyReport();
+            void handleUpdateWeeklyReport();
+            alert("Changes submitted");
             navigate(-1);
           }}
         >
           <div className="flex flex-col items-center">
-            <input
-              className="w-fill h-[5vh] font-sans text-[3vh] pl-[1vw] rounded-full text-center pt-[1vh] pb-[1vh] border-2 border-black"
-              type="week"
-              placeholder="Week"
-              value={
-                week === 0 ? "" : `2024-W${week.toString().padStart(2, "0")}`
-              }
-              onChange={(e) => {
-                const weekNumber = parseInt(e.target.value.split("-W")[1]);
-                setWeek(weekNumber);
-              }}
-              onKeyDown={(event) => {
-                event.preventDefault();
-              }}
-              onPaste={(event) => {
-                event.preventDefault();
-              }}
-            />
+            <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>
@@ -129,15 +121,31 @@ export default function GetWeeklyReport(): JSX.Element {
                       type="number"
                       min="0"
                       className="border-2 border-black rounded-md text-center w-1/2"
-                      value={developmentTime}
+                      value={developmentTime === 0 ? "" : developmentTime}
                       onChange={(e) => {
-                        setDevelopmentTime(parseInt(e.target.value));
+                        if (e.target.value === "") {
+                          setDevelopmentTime(0);
+                          return;
+                        } else {
+                          setDevelopmentTime(parseInt(e.target.value));
+                        }
                       }}
                       onKeyDown={(event) => {
                         const keyValue = event.key;
-                        if (!/\d/.test(keyValue) && keyValue !== "Backspace")
+                        if (
+                          !/\d/.test(keyValue) &&
+                          keyValue !== "Backspace" &&
+                          keyValue !== "ArrowLeft" &&
+                          keyValue !== "ArrowRight"
+                        )
                           event.preventDefault();
                       }}
+                      onClick={() => {
+                        if (signedOrUnsigned === "signed") {
+                          alert("You cannot edit a signed report.");
+                        }
+                      }}
+                      readOnly={signedOrUnsigned === "signed"}
                     />
                   </td>
                 </tr>
@@ -148,15 +156,31 @@ export default function GetWeeklyReport(): JSX.Element {
                       type="number"
                       min="0"
                       className="border-2 border-black rounded-md text-center w-1/2"
-                      value={meetingTime}
+                      value={meetingTime === 0 ? "" : meetingTime}
                       onChange={(e) => {
-                        setMeetingTime(parseInt(e.target.value));
+                        if (e.target.value === "") {
+                          setMeetingTime(0);
+                          return;
+                        } else {
+                          setMeetingTime(parseInt(e.target.value));
+                        }
                       }}
                       onKeyDown={(event) => {
                         const keyValue = event.key;
-                        if (!/\d/.test(keyValue) && keyValue !== "Backspace")
+                        if (
+                          !/\d/.test(keyValue) &&
+                          keyValue !== "Backspace" &&
+                          keyValue !== "ArrowLeft" &&
+                          keyValue !== "ArrowRight"
+                        )
                           event.preventDefault();
                       }}
+                      onClick={() => {
+                        if (signedOrUnsigned === "signed") {
+                          alert("You cannot edit a signed report.");
+                        }
+                      }}
+                      readOnly={signedOrUnsigned === "signed"}
                     />
                   </td>
                 </tr>
@@ -167,15 +191,31 @@ export default function GetWeeklyReport(): JSX.Element {
                       type="number"
                       min="0"
                       className="border-2 border-black rounded-md text-center w-1/2"
-                      value={adminTime}
+                      value={adminTime === 0 ? "" : adminTime}
                       onChange={(e) => {
-                        setAdminTime(parseInt(e.target.value));
+                        if (e.target.value === "") {
+                          setAdminTime(0);
+                          return;
+                        } else {
+                          setAdminTime(parseInt(e.target.value));
+                        }
                       }}
                       onKeyDown={(event) => {
                         const keyValue = event.key;
-                        if (!/\d/.test(keyValue) && keyValue !== "Backspace")
+                        if (
+                          !/\d/.test(keyValue) &&
+                          keyValue !== "Backspace" &&
+                          keyValue !== "ArrowLeft" &&
+                          keyValue !== "ArrowRight"
+                        )
                           event.preventDefault();
                       }}
+                      onClick={() => {
+                        if (signedOrUnsigned === "signed") {
+                          alert("You cannot edit a signed report.");
+                        }
+                      }}
+                      readOnly={signedOrUnsigned === "signed"}
                     />
                   </td>
                 </tr>
@@ -186,15 +226,31 @@ export default function GetWeeklyReport(): JSX.Element {
                       type="number"
                       min="0"
                       className="border-2 border-black rounded-md text-center w-1/2"
-                      value={ownWorkTime}
+                      value={ownWorkTime === 0 ? "" : ownWorkTime}
                       onChange={(e) => {
-                        setOwnWorkTime(parseInt(e.target.value));
+                        if (e.target.value === "") {
+                          setOwnWorkTime(0);
+                          return;
+                        } else {
+                          setOwnWorkTime(parseInt(e.target.value));
+                        }
                       }}
                       onKeyDown={(event) => {
                         const keyValue = event.key;
-                        if (!/\d/.test(keyValue) && keyValue !== "Backspace")
+                        if (
+                          !/\d/.test(keyValue) &&
+                          keyValue !== "Backspace" &&
+                          keyValue !== "ArrowLeft" &&
+                          keyValue !== "ArrowRight"
+                        )
                           event.preventDefault();
                       }}
+                      onClick={() => {
+                        if (signedOrUnsigned === "signed") {
+                          alert("You cannot edit a signed report.");
+                        }
+                      }}
+                      readOnly={signedOrUnsigned === "signed"}
                     />
                   </td>
                 </tr>
@@ -205,15 +261,31 @@ export default function GetWeeklyReport(): JSX.Element {
                       type="number"
                       min="0"
                       className="border-2 border-black rounded-md text-center w-1/2"
-                      value={studyTime}
+                      value={studyTime === 0 ? "" : studyTime}
                       onChange={(e) => {
-                        setStudyTime(parseInt(e.target.value));
+                        if (e.target.value === "") {
+                          setStudyTime(0);
+                          return;
+                        } else {
+                          setStudyTime(parseInt(e.target.value));
+                        }
                       }}
                       onKeyDown={(event) => {
                         const keyValue = event.key;
-                        if (!/\d/.test(keyValue) && keyValue !== "Backspace")
+                        if (
+                          !/\d/.test(keyValue) &&
+                          keyValue !== "Backspace" &&
+                          keyValue !== "ArrowLeft" &&
+                          keyValue !== "ArrowRight"
+                        )
                           event.preventDefault();
                       }}
+                      onClick={() => {
+                        if (signedOrUnsigned === "signed") {
+                          alert("You cannot edit a signed report.");
+                        }
+                      }}
+                      readOnly={signedOrUnsigned === "signed"}
                     />
                   </td>
                 </tr>
@@ -224,27 +296,45 @@ export default function GetWeeklyReport(): JSX.Element {
                       type="number"
                       min="0"
                       className="border-2 border-black rounded-md text-center w-1/2"
-                      value={testingTime}
+                      value={testingTime === 0 ? "" : testingTime}
                       onChange={(e) => {
-                        setTestingTime(parseInt(e.target.value));
+                        if (e.target.value === "") {
+                          setTestingTime(0);
+                          return;
+                        } else {
+                          setTestingTime(parseInt(e.target.value));
+                        }
                       }}
                       onKeyDown={(event) => {
                         const keyValue = event.key;
-                        if (!/\d/.test(keyValue) && keyValue !== "Backspace")
+                        if (
+                          !/\d/.test(keyValue) &&
+                          keyValue !== "Backspace" &&
+                          keyValue !== "ArrowLeft" &&
+                          keyValue !== "ArrowRight"
+                        )
                           event.preventDefault();
                       }}
+                      onClick={() => {
+                        if (signedOrUnsigned === "signed") {
+                          alert("You cannot edit a signed report.");
+                        }
+                      }}
+                      readOnly={signedOrUnsigned === "signed"}
                     />
                   </td>
                 </tr>
               </tbody>
             </table>
-            <Button
-              text="Submit changes"
-              onClick={(): void => {
-                return;
-              }}
-              type="submit"
-            />
+            {signedOrUnsigned !== "signed" && (
+              <Button
+                text="Submit changes"
+                onClick={(): void => {
+                  return;
+                }}
+                type="submit"
+              />
+            )}
           </div>
         </form>
       </div>

frontend/src/Components/GetProjectTimes.tsx

@@ -0,0 +1,59 @@
+import { Dispatch, SetStateAction, useEffect } from "react";
+import { api } from "../API/API";
+
+/**
+ * Interface for reported time per category + total time reported
+ */
+export interface projectTimes {
+  admin: number;
+  development: number;
+  meeting: number;
+  own_work: number;
+  study: number;
+  testing: number;
+  totalTime?: number;
+}
+
+/**
+ * Gets all reported times for this project
+ * @param {Dispatch} props.setTimesProp - A setStateAction for the map you want to put times in
+ * @param {string} props.projectName - Username
+ * @returns {void} Nothing
+ * @example
+ *  const projectName = "Example";
+ *  const [times, setTimes] = useState<Times>();
+ *  GetProjectTimes({ setTimesProp: setTimes, projectName: projectName });
+ */
+function GetProjectTimes(props: {
+  setTimesProp: Dispatch<SetStateAction<projectTimes | undefined>>;
+  projectName: string;
+}): void {
+  const setTimes: Dispatch<SetStateAction<projectTimes | undefined>> =
+    props.setTimesProp;
+  useEffect(() => {
+    const fetchUsers = async (): Promise<void> => {
+      try {
+        const token = localStorage.getItem("accessToken") ?? "";
+        const response = await api.getProjectTimes(props.projectName, token);
+        if (response.success && response.data) {
+          // Calculates total time reported
+          response.data.totalTime = response.data.admin;
+          response.data.totalTime += response.data.development;
+          response.data.totalTime += response.data.meeting;
+          response.data.totalTime += response.data.own_work;
+          response.data.totalTime += response.data.study;
+          response.data.totalTime += response.data.testing;
+          setTimes(response.data);
+        } else {
+          console.error("Failed to fetch project times:", response.message);
+        }
+      } catch (error) {
+        console.error("Error fetching times:", error);
+      }
+    };
+
+    void fetchUsers();
+  }, [props.projectName, setTimes]);
+}
+
+export default GetProjectTimes;

frontend/src/Components/GetProjects.tsx

@@ -0,0 +1,40 @@
+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 {Dispatch} props.setProjectsProp - A setStateAction for the array you want to put projects in
+ * @param {string} props.username - Username
+ * @returns {void} Nothing
+ * @example
+ *  const username = "Example";
+ *  const [projects, setProjects] = useState<Project[]>([]);
+ *  GetProjects({ setProjectsProp: setProjects, username: username });
+ */
+function GetProjects(props: {
+  setProjectsProp: Dispatch<React.SetStateAction<Project[]>>;
+  username: string;
+}): 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(props.username, token);
+        if (response.success) {
+          setProjects(response.data ?? []);
+        } else {
+          console.error("Failed to fetch projects:", response.message);
+        }
+      } catch (error) {
+        console.error("Error fetching projects:", error);
+      }
+    };
+
+    void fetchUsers();
+  }, [props.username, setProjects]);
+}
+
+export default GetProjects;

frontend/src/Components/GetUsersInProject.tsx

@@ -0,0 +1,42 @@
+import { Dispatch, useEffect } from "react";
+import { api } from "../API/API";
+
+export interface ProjectMember {
+  Username: string;
+  UserRole: string;
+}
+
+/**
+ * Gets all members of a project
+ * @param string - The project's name
+ * @param Dispatch - A setStateAction for the array you want to put members in
+ * @returns {void} Nothing
+ * @example
+ * const [users, setUsers] = useState<User[]>([]);
+ * GetUsersInProject({ projectName: props.projectname, setUsersProp: setUsers });
+ */
+function GetUsersInProject(props: {
+  projectName: string;
+  setUsersProp: Dispatch<React.SetStateAction<ProjectMember[]>>;
+}): void {
+  const setUsers: Dispatch<React.SetStateAction<ProjectMember[]>> =
+    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 members:", response.message);
+        }
+      } catch (error) {
+        console.error("Error fetching members:", error);
+      }
+    };
+    void fetchUsers();
+  }, [props.projectName, setUsers]);
+}
+
+export default GetUsersInProject;

frontend/src/Components/Header.tsx

@@ -1,6 +1,6 @@
 //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 { Link, useNavigate } from "react-router-dom";
 import backgroundImage from "../assets/1.jpg";
 
 /**
@@ -9,23 +9,33 @@ import backgroundImage from "../assets/1.jpg";
  */
 function Header(): JSX.Element {
   const [isOpen, setIsOpen] = useState(false);
+  const username = localStorage.getItem("username");
+  const navigate = useNavigate();
 
   const handleLogout = (): void => {
     localStorage.clear();
   };
 
+  const handleNavigation = (): void => {
+    if (username === "admin") {
+      navigate("/admin");
+    } else {
+      navigate("/yourProjects");
+    }
+  };
+
   return (
     <header
       className="fixed top-0 left-0 right-0 border-[1.75px] border-black text-black p-3 pl-5 flex items-center justify-between bg-cover"
       style={{ backgroundImage: `url(${backgroundImage})` }}
     >
-      <Link to="/your-projects">
+      <div onClick={handleNavigation}>
         <img
           src="/src/assets/Logo.svg"
           alt="TTIME Logo"
           className="w-11 h-14 cursor-pointer"
         />
-      </Link>
+      </div>
 
       <div
         className="relative"

frontend/src/Components/InputField.tsx

@@ -4,22 +4,24 @@
  * @returns {JSX.Element} The input field
  * @example
  * <InputField
- *   type="text"
  *   label="Example"
+ *   placeholder="New placeholder"
+ *   type="text"
+ *   value={example}
  *   onChange={(e) => {
  *     setExample(e.target.value);
  *   }}
- *   value={example}
  * />
  */
 function InputField(props: {
-  label: string;
-  type: string;
-  value: string;
-  onChange: (e: React.ChangeEvent<HTMLInputElement>) => void;
+  label?: string;
+  placeholder?: string;
+  type?: string;
+  value?: string;
+  onChange?: (e: React.ChangeEvent<HTMLInputElement>) => void;
 }): JSX.Element {
   return (
-    <div className="mb-4">
+    <div className="">
       <label
         className="block text-gray-700 text-sm font-sans font-bold mb-2"
         htmlFor={props.label}
@@ -30,7 +32,7 @@ function InputField(props: {
         className="appearance-none border-2 border-black rounded-2xl w-full py-2 px-3 text-gray-700 leading-tight focus:outline-none focus:shadow-outline"
         id={props.label}
         type={props.type}
-        placeholder={props.label}
+        placeholder={props.placeholder}
         value={props.value}
         onChange={props.onChange}
       />

frontend/src/Components/Inputs/DescriptionInput.tsx

@@ -0,0 +1,38 @@
+import { projDescHighLimit, projDescLowLimit } from "../../Data/constants";
+
+export default function DescriptionInput(props: {
+  desc: string;
+  placeholder: string;
+  onChange: (e: React.ChangeEvent<HTMLInputElement>) => void;
+}): JSX.Element {
+  return (
+    <>
+      <input
+        className={
+          props.desc.length <= 100
+            ? "border-2 border-green-500 dark:border-green-500 focus-visible:border-green-500 outline-none rounded-2xl w-full py-2 px-3 text-gray-700 leading-tight"
+            : "border-2 border-red-600 dark:border-red-600 focus:border-red-600 outline-none rounded-2xl w-full py-2 px-3  text-gray-700 leading-tight"
+        }
+        spellCheck="true"
+        id="New desc"
+        type="text"
+        placeholder={props.placeholder}
+        value={props.desc}
+        onChange={props.onChange}
+      />
+      <div className="my-1">
+        {props.desc.length > projDescHighLimit && (
+          <p className="text-red-600 pl-2 text-[13px] text-left">
+            Description must be under 100 characters
+          </p>
+        )}
+        {props.desc.length <= projDescHighLimit &&
+          props.desc.length > projDescLowLimit && (
+            <p className="text-green-500 pl-2 text-[13px] text-left">
+              Valid project description!
+            </p>
+          )}
+      </div>
+    </>
+  );
+}

frontend/src/Components/Inputs/PasswordInput.tsx

@@ -0,0 +1,44 @@
+import { passwordLength } from "../../Data/constants";
+import { lowercase } from "../../Data/regex";
+
+export default function PasswordInput(props: {
+  password: string;
+  onChange: (e: React.ChangeEvent<HTMLInputElement>) => void;
+}): JSX.Element {
+  const password = props.password;
+  return (
+    <>
+      <input
+        className={
+          password.length === passwordLength && lowercase.test(password)
+            ? "border-2 border-green-500 dark:border-green-500 focus-visible:border-green-500 outline-none rounded-2xl w-full py-2 px-3 text-gray-700 leading-tight"
+            : "border-2 border-red-600 dark:border-red-600 focus:border-red-600 outline-none rounded-2xl w-full py-2 px-3  text-gray-700 leading-tight"
+        }
+        spellCheck="false"
+        id="New password"
+        type="password"
+        placeholder="Password"
+        value={password}
+        onChange={props.onChange}
+      />
+      <div className="my-1">
+        {password.length === passwordLength &&
+          lowercase.test(props.password) && (
+            <p className="text-green-500 pl-2 text-[13px] text-left">
+              Valid password!
+            </p>
+          )}
+        {password.length !== passwordLength && (
+          <p className="text-red-600 pl-2 text-[13px] text-left">
+            Password must be 6 characters
+          </p>
+        )}
+        {!lowercase.test(password) && password !== "" && (
+          <p className="text-red-600 pl-2 text-[13px] text-left">
+            No number, uppercase or special <br /> characters allowed
+          </p>
+        )}
+      </div>
+    </>
+  );
+}

frontend/src/Components/Inputs/ProjectNameInput.tsx

@@ -0,0 +1,48 @@
+import { projNameHighLimit, projNameLowLimit } from "../../Data/constants";
+import { alphanumeric } from "../../Data/regex";
+
+export default function ProjectNameInput(props: {
+  name: string;
+  onChange: (e: React.ChangeEvent<HTMLInputElement>) => void;
+}): JSX.Element {
+  const name = props.name;
+  return (
+    <>
+      <input
+        className={
+          name.length >= projNameLowLimit &&
+          name.length <= projNameHighLimit &&
+          alphanumeric.test(name)
+            ? "border-2 border-green-500 dark:border-green-500 focus-visible:border-green-500 outline-none rounded-2xl w-full py-2 px-3 text-gray-700 leading-tight"
+            : "border-2 border-red-600 dark:border-red-600 focus:border-red-600 outline-none rounded-2xl w-full py-2 px-3  text-gray-700 leading-tight"
+        }
+        spellCheck="false"
+        id="New name"
+        type="text"
+        placeholder="Project name"
+        value={name}
+        onChange={props.onChange}
+      />
+      <div className="my-1">
+        {!alphanumeric.test(name) && name !== "" && (
+          <p className="text-red-600 pl-2 text-[13px] text-left">
+            No special characters allowed
+          </p>
+        )}
+        {(name.length < projNameLowLimit ||
+          name.length > projNameHighLimit) && (
+          <p className="text-red-600 pl-2 text-[13px] text-left">
+            Project name must be 10-99 characters
+          </p>
+        )}
+        {alphanumeric.test(props.name) &&
+          name.length >= projNameLowLimit &&
+          name.length <= projNameHighLimit && (
+            <p className="text-green-500 pl-2 text-[13px] text-left">
+              Valid project name!
+            </p>
+          )}
+      </div>
+    </>
+  );
+}

frontend/src/Components/Inputs/UsernameInput.tsx

@@ -0,0 +1,50 @@
+import { usernameLowLimit, usernameUpLimit } from "../../Data/constants";
+import { alphanumeric } from "../../Data/regex";
+
+export default function UsernameInput(props: {
+  username: string;
+  onChange: (e: React.ChangeEvent<HTMLInputElement>) => void;
+}): JSX.Element {
+  const username = props.username;
+  return (
+    <>
+      <input
+        className={
+          username.length >= usernameLowLimit &&
+          username.length <= usernameUpLimit &&
+          alphanumeric.test(props.username)
+            ? "border-2 border-green-500 dark:border-green-500 focus-visible:border-green-500 outline-none rounded-2xl w-full py-2 px-3 text-gray-700 leading-tight"
+            : "border-2 border-red-600 dark:border-red-600 focus:border-red-600 outline-none rounded-2xl w-full py-2 px-3  text-gray-700 leading-tight"
+        }
+        spellCheck="false"
+        id="New username"
+        type="text"
+        placeholder="Username"
+        value={username}
+        onChange={props.onChange}
+      />
+      <div className="my-1">
+        {alphanumeric.test(username) &&
+          username.length >= usernameLowLimit &&
+          username.length <= usernameUpLimit && (
+            <p className="text-green-500 pl-2 text-[13px] text-left">
+              Valid username!
+            </p>
+          )}
+        {!alphanumeric.test(username) && username !== "" && (
+          <p className="text-red-600 pl-2 text-[13px] text-left">
+            No special characters allowed
+          </p>
+        )}
+        {!(
+          username.length >= usernameLowLimit &&
+          username.length <= usernameUpLimit
+        ) && (
+          <p className="text-red-600 pl-2 text-[13px] text-left">
+            Username must be 5-10 characters
+          </p>
+        )}
+      </div>
+    </>
+  );
+}

frontend/src/Components/LoginCheck.tsx

@@ -11,6 +11,10 @@ function LoginCheck(props: {
   password: string;
   setAuthority: Dispatch<SetStateAction<number>>;
 }): void {
+  if (props.username === "" || props.password === "") {
+    alert("Please enter username and password to login");
+    return;
+  }
   const user: NewUser = {
     username: props.username,
     password: props.password,
@@ -42,7 +46,15 @@ function LoginCheck(props: {
           console.error("Token was undefined");
         }
       } else {
-        console.error("Token could not be fetched/No such user");
+        if (response.data === "500") {
+          console.error(response.message);
+          alert("No connection/Error");
+        } else {
+          console.error(
+            "Token could not be fetched/No such user" + response.message,
+          );
+          alert("Incorrect login information");
+        }
       }
     })
     .catch((error) => {

frontend/src/Components/LoginField.tsx

@@ -25,22 +25,26 @@ function Login(props: {
 }): JSX.Element {
   return (
     <form className="flex flex-col items-center" onSubmit={props.handleSubmit}>
-      <InputField
-        type="text"
-        label="Username"
-        onChange={(e) => {
-          props.setUsername(e.target.value);
-        }}
-        value={props.username}
-      />
-      <InputField
-        type="password"
-        label="Password"
-        onChange={(e) => {
-          props.setPassword(e.target.value);
-        }}
-        value={props.password}
-      />
+      <div className="space-y-3">
+        <InputField
+          type="text"
+          label="Username"
+          onChange={(e) => {
+            props.setUsername(e.target.value);
+          }}
+          value={props.username}
+          placeholder={"Username"}
+        />
+        <InputField
+          type="password"
+          label="Password"
+          onChange={(e) => {
+            props.setPassword(e.target.value);
+          }}
+          value={props.password}
+          placeholder={"Password"}
+        />
+      </div>
       <Button
         text="Login"
         onClick={(): void => {

frontend/src/Components/MemberInfoModal.tsx

@@ -0,0 +1,78 @@
+import Button from "./Button";
+import UserProjectListAdmin from "./UserProjectListAdmin";
+import { useState } from "react";
+import RemoveUserFromProj from "./RemoveUserFromProj";
+import ChangeRoleInput from "./ChangeRoleView";
+
+function MemberInfoModal(props: {
+  projectName: string;
+  username: string;
+  role: string;
+  onClose: () => void;
+}): JSX.Element {
+  const [showRoles, setShowRoles] = useState(false);
+
+  const handleChangeRole = (): void => {
+    if (showRoles) {
+      setShowRoles(false);
+    } else {
+      setShowRoles(true);
+    }
+  };
+  return (
+    <div
+      className="fixed inset-0 bg-opacity-30 backdrop-blur-sm 
+      flex justify-center items-center"
+    >
+      <div className="border-4 border-black bg-white rounded-2xl text-center flex flex-col">
+        <div className="mx-10">
+          <p className="font-bold text-[30px]">{props.username}</p>
+          <p className="font-bold text-[20px]">{props.role}</p>
+          <p
+            className="hover:font-bold hover:cursor-pointer underline mb-2 mt-1"
+            onClick={handleChangeRole}
+          >
+            (Change Role)
+          </p>
+          {showRoles && (
+            <ChangeRoleInput
+              projectName={props.projectName}
+              username={props.username}
+              currentRole={props.role}
+            />
+          )}
+          <h2 className="font-bold text-[20px]">Member of these projects:</h2>
+          <UserProjectListAdmin username={props.username} />
+          <div className="items-center space-x-6">
+            <Button
+              text={"Remove"}
+              onClick={function (): void {
+                if (
+                  window.confirm(
+                    "Are you sure you want to remove this user from the project?",
+                  )
+                ) {
+                  RemoveUserFromProj({
+                    userToRemove: props.username,
+                    projectName: props.projectName,
+                  });
+                }
+              }}
+              type="button"
+            />
+            <Button
+              text={"Close"}
+              onClick={function (): void {
+                setShowRoles(false);
+                props.onClose();
+              }}
+              type="button"
+            />
+          </div>
+        </div>
+      </div>
+    </div>
+  );
+}
+
+export default MemberInfoModal;

frontend/src/Components/NavButton.tsx

@@ -0,0 +1,24 @@
+import { useNavigate } from "react-router-dom";
+
+/**
+ * Renders a navigation button component for navigating to
+ * different page
+ * @returns The JSX element representing the navigation button.
+ */
+export default function NavButton(props: {
+  navTo: string;
+  label: string;
+}): JSX.Element {
+  const navigate = useNavigate();
+  const goBack = (): void => {
+    navigate(props.navTo);
+  };
+  return (
+    <button
+      onClick={goBack}
+      className="inline-block py-1 px-8 font-bold bg-orange-500 text-white border-2 border-black rounded-full cursor-pointer mt-5 mb-5 transition-colors duration-10 hover:bg-orange-600 hover:text-gray-300 font-family: 'Segoe UI', Tahoma, Geneva, Verdana, sans-serif; font-size: 4vh;"
+    >
+      {props.label}
+    </button>
+  );
+}

frontend/src/Components/NewWeeklyReport.tsx

@@ -12,66 +12,103 @@ import Button from "./Button";
  */
 export default function NewWeeklyReport(): JSX.Element {
   const [week, setWeek] = 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 [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 { projectName } = useParams();
   const token = localStorage.getItem("accessToken") ?? "";
 
-  const handleNewWeeklyReport = async (): Promise<void> => {
+  const handleNewWeeklyReport = async (): Promise<boolean> => {
     const newWeeklyReport: NewWeeklyReport = {
       projectName: projectName ?? "",
       week: week,
-      developmentTime: developmentTime ?? 0,
-      meetingTime: meetingTime ?? 0,
-      adminTime: adminTime ?? 0,
-      ownWorkTime: ownWorkTime ?? 0,
-      studyTime: studyTime ?? 0,
-      testingTime: testingTime ?? 0,
+      developmentTime: developmentTime,
+      meetingTime: meetingTime,
+      adminTime: adminTime,
+      ownWorkTime: ownWorkTime,
+      studyTime: studyTime,
+      testingTime: testingTime,
     };
 
-    await api.submitWeeklyReport(newWeeklyReport, token);
+    const response = await api.submitWeeklyReport(newWeeklyReport, token);
+    console.log(response);
+    if (response.success) {
+      return true;
+    } else {
+      return false;
+    }
   };
 
   const navigate = useNavigate();
+  // Check if the browser is Chrome or Edge
+  const isChromeOrEdge = /Chrome|Edg/.test(navigator.userAgent);
 
   return (
     <>
       <div className="border-4 border-black bg-white flex flex-col justify-start min-h-[65vh] h-fit w-[50vw] rounded-3xl overflow-scroll space-y-[2vh] p-[30px] items-center">
         <form
           onSubmit={(e) => {
-            if (week === 0) {
-              alert("Please enter a week number");
-              e.preventDefault();
-              return;
-            }
             e.preventDefault();
-            void handleNewWeeklyReport();
-            navigate(-1);
+            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(
+                  "Error occurred! Your connection to the server might be lost or a time report for this week already exists, please check your connection or go to the edit page to edit your report or change week number.",
+                );
+                return;
+              }
+              alert("Weekly report submitted successfully");
+              navigate(-1);
+            })();
           }}
         >
           <div className="flex flex-col items-center">
-            <input
-              className="w-fill h-[5vh] font-sans text-[3vh] pl-[1vw] rounded-full text-center pt-[1vh] pb-[1vh] border-2 border-black"
-              type="week"
-              placeholder="Week"
-              onChange={(e) => {
-                const weekNumber = parseInt(e.target.value.split("-W")[1]);
-                setWeek(weekNumber);
-              }}
-              onKeyDown={(event) => {
-                const keyValue = event.key;
-                if (!/\d/.test(keyValue) && keyValue !== "Backspace")
+            {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"
+                placeholder="Week"
+                onChange={(e) => {
+                  const weekNumber = parseInt(e.target.value.split("-W")[1]);
+                  setWeek(weekNumber);
+                }}
+                onKeyDown={(event) => {
+                  const keyValue = event.key;
+                  if (!/\d/.test(keyValue) && keyValue !== "Backspace")
+                    event.preventDefault();
+                }}
+                onPaste={(event) => {
                   event.preventDefault();
-              }}
-              onPaste={(event) => {
-                event.preventDefault();
-              }}
-            />
+                }}
+              />
+            ) : (
+              <input
+                className="w-fill h-[5vh] font-sans text-[3vh] pl-[1vw] rounded-full text-center pt-[1vh] pb-[1vh] border-2 border-black"
+                type="text"
+                placeholder="Week (Numbers Only)"
+                onChange={(e) => {
+                  const weekNumber = parseInt(e.target.value);
+                  setWeek(weekNumber);
+                }}
+                onKeyDown={(event) => {
+                  const keyValue = event.key;
+                  if (!/\d/.test(keyValue) && keyValue !== "Backspace")
+                    event.preventDefault();
+                }}
+                onPaste={(event) => {
+                  event.preventDefault();
+                }}
+              />
+            )}
             <table className="w-full text-center divide-y divide-x divide-white text-[30px]">
               <thead>
                 <tr>
@@ -91,13 +128,23 @@ export default function NewWeeklyReport(): JSX.Element {
                       type="number"
                       min="0"
                       className="border-2 border-black rounded-md text-center w-1/2"
-                      value={developmentTime}
+                      value={developmentTime === 0 ? "" : developmentTime}
                       onChange={(e) => {
-                        setDevelopmentTime(parseInt(e.target.value));
+                        if (e.target.value === "") {
+                          setDevelopmentTime(0);
+                          return;
+                        } else {
+                          setDevelopmentTime(parseInt(e.target.value));
+                        }
                       }}
                       onKeyDown={(event) => {
                         const keyValue = event.key;
-                        if (!/\d/.test(keyValue) && keyValue !== "Backspace")
+                        if (
+                          !/\d/.test(keyValue) &&
+                          keyValue !== "Backspace" &&
+                          keyValue !== "ArrowLeft" &&
+                          keyValue !== "ArrowRight"
+                        )
                           event.preventDefault();
                       }}
                     />
@@ -110,13 +157,23 @@ export default function NewWeeklyReport(): JSX.Element {
                       type="number"
                       min="0"
                       className="border-2 border-black rounded-md text-center w-1/2"
-                      value={meetingTime}
+                      value={meetingTime === 0 ? "" : meetingTime}
                       onChange={(e) => {
-                        setMeetingTime(parseInt(e.target.value));
+                        if (e.target.value === "") {
+                          setMeetingTime(0);
+                          return;
+                        } else {
+                          setMeetingTime(parseInt(e.target.value));
+                        }
                       }}
                       onKeyDown={(event) => {
                         const keyValue = event.key;
-                        if (!/\d/.test(keyValue) && keyValue !== "Backspace")
+                        if (
+                          !/\d/.test(keyValue) &&
+                          keyValue !== "Backspace" &&
+                          keyValue !== "ArrowLeft" &&
+                          keyValue !== "ArrowRight"
+                        )
                           event.preventDefault();
                       }}
                     />
@@ -129,13 +186,23 @@ export default function NewWeeklyReport(): JSX.Element {
                       type="number"
                       min="0"
                       className="border-2 border-black rounded-md text-center w-1/2"
-                      value={adminTime}
+                      value={adminTime === 0 ? "" : adminTime}
                       onChange={(e) => {
-                        setAdminTime(parseInt(e.target.value));
+                        if (e.target.value === "") {
+                          setAdminTime(0);
+                          return;
+                        } else {
+                          setAdminTime(parseInt(e.target.value));
+                        }
                       }}
                       onKeyDown={(event) => {
                         const keyValue = event.key;
-                        if (!/\d/.test(keyValue) && keyValue !== "Backspace")
+                        if (
+                          !/\d/.test(keyValue) &&
+                          keyValue !== "Backspace" &&
+                          keyValue !== "ArrowLeft" &&
+                          keyValue !== "ArrowRight"
+                        )
                           event.preventDefault();
                       }}
                     />
@@ -148,13 +215,23 @@ export default function NewWeeklyReport(): JSX.Element {
                       type="number"
                       min="0"
                       className="border-2 border-black rounded-md text-center w-1/2"
-                      value={ownWorkTime}
+                      value={ownWorkTime === 0 ? "" : ownWorkTime}
                       onChange={(e) => {
-                        setOwnWorkTime(parseInt(e.target.value));
+                        if (e.target.value === "") {
+                          setOwnWorkTime(0);
+                          return;
+                        } else {
+                          setOwnWorkTime(parseInt(e.target.value));
+                        }
                       }}
                       onKeyDown={(event) => {
                         const keyValue = event.key;
-                        if (!/\d/.test(keyValue) && keyValue !== "Backspace")
+                        if (
+                          !/\d/.test(keyValue) &&
+                          keyValue !== "Backspace" &&
+                          keyValue !== "ArrowLeft" &&
+                          keyValue !== "ArrowRight"
+                        )
                           event.preventDefault();
                       }}
                     />
@@ -167,13 +244,23 @@ export default function NewWeeklyReport(): JSX.Element {
                       type="number"
                       min="0"
                       className="border-2 border-black rounded-md text-center w-1/2"
-                      value={studyTime}
+                      value={studyTime === 0 ? "" : studyTime}
                       onChange={(e) => {
-                        setStudyTime(parseInt(e.target.value));
+                        if (e.target.value === "") {
+                          setStudyTime(0);
+                          return;
+                        } else {
+                          setStudyTime(parseInt(e.target.value));
+                        }
                       }}
                       onKeyDown={(event) => {
                         const keyValue = event.key;
-                        if (!/\d/.test(keyValue) && keyValue !== "Backspace")
+                        if (
+                          !/\d/.test(keyValue) &&
+                          keyValue !== "Backspace" &&
+                          keyValue !== "ArrowLeft" &&
+                          keyValue !== "ArrowRight"
+                        )
                           event.preventDefault();
                       }}
                     />
@@ -186,13 +273,23 @@ export default function NewWeeklyReport(): JSX.Element {
                       type="number"
                       min="0"
                       className="border-2 border-black rounded-md text-center w-1/2"
-                      value={testingTime}
+                      value={testingTime === 0 ? "" : testingTime}
                       onChange={(e) => {
-                        setTestingTime(parseInt(e.target.value));
+                        if (e.target.value === "") {
+                          setTestingTime(0);
+                          return;
+                        } else {
+                          setTestingTime(parseInt(e.target.value));
+                        }
                       }}
                       onKeyDown={(event) => {
                         const keyValue = event.key;
-                        if (!/\d/.test(keyValue) && keyValue !== "Backspace")
+                        if (
+                          !/\d/.test(keyValue) &&
+                          keyValue !== "Backspace" &&
+                          keyValue !== "ArrowLeft" &&
+                          keyValue !== "ArrowRight"
+                        )
                           event.preventDefault();
                       }}
                     />

frontend/src/Components/OtherUsersTR.tsx

@@ -0,0 +1,228 @@
+import { useState, useEffect } from "react";
+import { WeeklyReport } from "../Types/goTypes";
+import { api } from "../API/API";
+import { useParams, useNavigate } 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 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 [reportId, setReportId] = useState(0);
+
+  const token = localStorage.getItem("accessToken") ?? "";
+  const { projectName } = useParams();
+  const { username } = useParams();
+  const { fetchedWeek } = useParams();
+  const { signedOrUnsigned } = useParams();
+  console.log(projectName, username, fetchedWeek, signedOrUnsigned);
+
+  useEffect(() => {
+    const fetchUsersWeeklyReport = async (): Promise<void> => {
+      const response = await api.getWeeklyReport(
+        projectName ?? "",
+        fetchedWeek?.toString() ?? "0",
+        token,
+        username ?? "",
+      );
+
+      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,
+        };
+        setReportId(report.reportId);
+        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 handleUnsignWeeklyReport = async (): Promise<boolean> => {
+    const response = await api.unsignReport(reportId, token);
+    console.log(response);
+    console.log(reportId);
+    if (response.success) {
+      return true;
+    } else {
+      return false;
+    }
+  };
+
+  const handleDeleteWeeklyReport = async (): Promise<boolean> => {
+    const response = await api.deleteWeeklyReport(reportId, token);
+    console.log(response);
+    if (response.success) {
+      return true;
+    }
+    return false;
+  };
+  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">
+        <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}
+                    readOnly
+                  />
+                </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}
+                    readOnly
+                  />
+                </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}
+                    readOnly
+                  />
+                </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}
+                    readOnly
+                  />
+                </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}
+                    readOnly
+                  />
+                </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}
+                    readOnly
+                  />
+                </td>
+              </tr>
+            </tbody>
+          </table>
+          <div className="flex space-x-4">
+            {signedOrUnsigned === "signed" && (
+              <Button
+                text="Unsign Report"
+                onClick={(): void => {
+                  void (async (): Promise<void> => {
+                    const success = await handleUnsignWeeklyReport();
+                    if (success) {
+                      alert("Report successfully unsigned!");
+                      navigate(-1);
+                    } else {
+                      alert("Failed to unsign report");
+                      return;
+                    }
+                  })();
+                }}
+                type={"button"}
+              />
+            )}
+            <Button
+              text="Delete Time Report"
+              onClick={(): void => {
+                void (async (): Promise<void> => {
+                  const confirmDelete = window.confirm(
+                    "Are you sure you want to delete this report? This action cannot be undone.",
+                  );
+                  if (!confirmDelete) {
+                    return;
+                  }
+                  const success = await handleDeleteWeeklyReport();
+                  if (success) {
+                    alert("Report successfully deleted!");
+                    navigate(-1);
+                  } else {
+                    alert("Failed to delete report");
+                    return;
+                  }
+                })();
+              }}
+              type={"button"}
+            />
+          </div>
+        </div>
+      </div>
+    </>
+  );
+}

frontend/src/Components/PMProjectMenu.tsx

@@ -8,22 +8,22 @@ function PMProjectMenu(): JSX.Element {
       <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">
+          <h1 className="font-bold hover:underline text-[30px] cursor-pointer hover:font-extrabold">
             Your Time Reports
           </h1>
         </Link>
         <Link to={`/newTimeReport/${projectName}`}>
-          <h1 className="font-bold underline text-[30px] cursor-pointer">
+          <h1 className="font-bold hover:underline text-[30px] cursor-pointer hover:font-extrabold">
             New Time Report
           </h1>
         </Link>
         <Link to={`/projectMembers/${projectName}`}>
-          <h1 className="font-bold underline text-[30px] cursor-pointer">
+          <h1 className="font-bold hover:underline text-[30px] cursor-pointer hover:font-extrabold">
             Statistics
           </h1>
         </Link>
         <Link to={`/unsignedReports/${projectName}`}>
-          <h1 className="font-bold underline text-[30px] cursor-pointer">
+          <h1 className="font-bold hover:underline text-[30px] cursor-pointer hover:font-extrabold">
             Unsigned Time Reports
           </h1>
         </Link>

frontend/src/Components/ProjectInfoModal.tsx

@@ -0,0 +1,202 @@
+import { useEffect, useRef, useState } from "react";
+import Button from "./Button";
+import GetUsersInProject, { ProjectMember } from "./GetUsersInProject";
+import { Link } from "react-router-dom";
+import GetProjectTimes, { projectTimes } from "./GetProjectTimes";
+import DeleteProject from "./DeleteProject";
+import InputField from "./InputField";
+import ProjectNameInput from "./Inputs/ProjectNameInput";
+import { alphanumeric } from "../Data/regex";
+import { projNameHighLimit, projNameLowLimit } from "../Data/constants";
+import ChangeProjectName from "./ChangeProjectName";
+
+function ProjectInfoModal(props: {
+  projectname: string;
+  onClose: () => void;
+  onClick: (username: string, userRole: string) => void;
+}): JSX.Element {
+  const [showInput, setShowInput] = useState(false);
+  const [users, setUsers] = useState<ProjectMember[]>([]);
+  const [times, setTimes] = useState<projectTimes>();
+  const [search, setSearch] = useState("");
+  const [newProjName, setNewProjName] = useState("");
+  const totalTime = useRef(0);
+  GetUsersInProject({ projectName: props.projectname, setUsersProp: setUsers });
+
+  GetProjectTimes({ setTimesProp: setTimes, projectName: props.projectname });
+
+  const handleChangeNameView = (): void => {
+    if (showInput) {
+      setNewProjName("");
+      setShowInput(false);
+    } else {
+      setShowInput(true);
+    }
+  };
+
+  const handleClickChangeName = (): void => {
+    if (
+      newProjName.length > projNameHighLimit ||
+      newProjName.length < projNameLowLimit ||
+      !alphanumeric.test(newProjName)
+    ) {
+      alert(
+        "Please provide valid project name: \n-Between 10-99 characters \n-No special characters (.-!?/*)",
+      );
+      return;
+    }
+
+    if (
+      confirm(
+        `Are you sure you want to change name of ${props.projectname} to ${newProjName}?`,
+      )
+    ) {
+      ChangeProjectName({
+        projectName: props.projectname,
+        newProjectName: newProjName,
+      });
+    } else {
+      alert("Name was not changed!");
+    }
+  };
+
+  useEffect(() => {
+    if (times?.totalTime !== undefined) {
+      totalTime.current = times.totalTime;
+    }
+  }, [times]);
+
+  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-[64vh] w-[40] overflow-auto">
+        <div className="pl-10 pr-10">
+          <h1 className="font-bold text-[32px]">{props.projectname}</h1>
+          <p
+            className="mb-4 hover:font-bold hover:cursor-pointer hover:underline"
+            onClick={handleChangeNameView}
+          >
+            (Change project name)
+          </p>
+          {showInput && (
+            <>
+              <h2 className="text-[20px] font-bold pb-2">Change name:</h2>
+              <div className="border-2 rounded-2xl border-black px-6 pt-6 pb-1 mb-7">
+                <ProjectNameInput
+                  name={newProjName}
+                  onChange={function (e): void {
+                    setNewProjName(e.target.value);
+                  }}
+                />
+                <div className="px-6 grid grid-cols-2 gap-10">
+                  <Button
+                    text={"Change"}
+                    onClick={function (): void {
+                      handleClickChangeName();
+                    }}
+                    type={"submit"}
+                  />
+                  <Button
+                    text={"Close"}
+                    onClick={function (): void {
+                      handleChangeNameView();
+                    }}
+                    type={"submit"}
+                  />
+                </div>
+              </div>
+            </>
+          )}
+          <h2 className="text-[20px] font-bold pb-2">Statistics:</h2>
+          <div className="border-2 border-black rounded-2xl px-2 py-1 text-left divide-y-2 flex flex-col overflow-auto">
+            <p>Number of members: {users.length}</p>
+            <p>
+              Total time reported:{" "}
+              {Math.floor(totalTime.current / 60 / 24) + " d "}
+              {Math.floor((totalTime.current / 60) % 24) + " h "}
+              {(totalTime.current % 60) + " m "}
+            </p>
+          </div>
+          <h3 className="pt-7 text-[20px] font-bold">Project members:</h3>
+          <div className="">
+            <InputField
+              placeholder={"Search member"}
+              type={"Text"}
+              value={search}
+              onChange={(e) => {
+                setSearch(e.target.value);
+              }}
+            />
+            <ul className="border-2 border-black mt-2 p-2 rounded-2xl text-left overflow-auto h-[24vh] font-medium space-y-2">
+              {users
+                .filter((user) => {
+                  return search.toLowerCase() === ""
+                    ? user.Username
+                    : user.Username.toLowerCase().includes(
+                        search.toLowerCase(),
+                      );
+                })
+                .map((user) => (
+                  <li
+                    className="items-start px-2 py-1 border-2 border-black rounded-2xl bg-orange-200 transition-all hover:bg-orange-600 hover:text-white hover:cursor-pointer"
+                    key={user.Username}
+                    onClick={() => {
+                      props.onClick(user.Username, user.UserRole);
+                    }}
+                  >
+                    <span>
+                      Name: {user.Username}
+                      <div></div>
+                      Role: {user.UserRole}
+                    </span>
+                  </li>
+                ))}
+            </ul>
+          </div>
+          <div className="space-x-5 my-2">
+            <Button
+              text={"Delete"}
+              onClick={function (): void {
+                if (
+                  window.confirm(
+                    "Are you sure you want to delete this project?",
+                  )
+                ) {
+                  DeleteProject({
+                    projectToDelete: props.projectname,
+                  });
+                }
+              }}
+              type="button"
+            />
+            <Link
+              to={{
+                pathname: "/adminProjectAddMember",
+                search: props.projectname,
+              }}
+            >
+              <Button
+                text={"Add Member"}
+                onClick={function (): void {
+                  return;
+                }}
+                type="button"
+              />
+            </Link>
+            <Button
+              text={"Close"}
+              onClick={function (): void {
+                props.onClose();
+              }}
+              type="button"
+            />
+          </div>
+        </div>
+      </div>
+    </div>
+  );
+}
+
+export default ProjectInfoModal;

frontend/src/Components/ProjectListAdmin.tsx

@@ -0,0 +1,99 @@
+import { useState } from "react";
+import { NewProject } from "../Types/goTypes";
+import ProjectInfoModal from "./ProjectInfoModal";
+import MemberInfoModal from "./MemberInfoModal";
+import InputField from "./InputField";
+
+/**
+ * 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 [userRole, setUserRole] = useState("");
+  const [search, setSearch] = useState("");
+
+  const handleClickUser = (username: string, userRole: string): void => {
+    setUsername(username);
+    setUserRole(userRole);
+    setUserModalVisible(true);
+  };
+
+  const handleClickProject = (projectname: string): void => {
+    setProjectName(projectname);
+    setProjectModalVisible(true);
+  };
+
+  const handleCloseProject = (): void => {
+    setProjectName("");
+    setProjectModalVisible(false);
+  };
+
+  const handleCloseUser = (): void => {
+    setUsername("");
+    setUserRole("");
+    setUserModalVisible(false);
+  };
+
+  return (
+    <>
+      <h1 className="font-bold text-[30px] mb-[20px]">Manage Projects</h1>
+      {projectModalVisible && (
+        <ProjectInfoModal
+          onClose={handleCloseProject}
+          onClick={handleClickUser}
+          projectname={projectName}
+        />
+      )}
+      {userModalVisible && (
+        <MemberInfoModal
+          onClose={handleCloseUser}
+          username={username}
+          projectName={projectName}
+          role={userRole}
+        />
+      )}
+      <div>
+        <InputField
+          placeholder={"Search"}
+          type={"Text"}
+          value={search}
+          onChange={(e) => {
+            setSearch(e.target.value);
+          }}
+        />
+        <ul className="mt-3 border-2 text-left border-black rounded-2xl px-2 divide-y divide-gray-300 font-semibold text-[30px] cursor-pointer overflow-auto h-[60vh] w-[40vw]">
+          {props.projects
+            .filter((project) => {
+              return search.toLowerCase() === ""
+                ? project.name
+                : project.name.toLowerCase().includes(search.toLowerCase());
+            })
+            .map((project) => (
+              <li
+                className="hover:font-extrabold hover:underline p-1"
+                key={project.name}
+                onClick={() => {
+                  handleClickProject(project.name);
+                }}
+              >
+                {project.name}
+              </li>
+            ))}
+        </ul>
+      </div>
+    </>
+  );
+}

frontend/src/Components/ProjectMembers.tsx

@@ -1,96 +1,79 @@
-import { useEffect, useState } from "react";
+import { useState } from "react";
 import { Link, useParams } from "react-router-dom";
+import GetUsersInProject, { ProjectMember } from "./GetUsersInProject";
+import { api } from "../API/API";
 
 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();
+  GetUsersInProject({
+    projectName: projectName ?? "",
+    setUsersProp: setProjectMembers,
   });
 
+  const handleUserDeleteClick = async (username: string): Promise<void> => {
+    const token = localStorage.getItem("accessToken") ?? "";
+    const response = await api.removeUserFromProject(
+      username,
+      projectName ?? "",
+      token,
+    );
+    console.log(response.data);
+
+    // Remove the deleted user from the state
+    setProjectMembers((prevMembers) =>
+      prevMembers.filter((member) => member.Username !== username),
+    );
+  };
+
   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, 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>
+        {projectMembers.map((projectMember: ProjectMember, index: number) => {
+          if (projectMember.Username === "admin") {
+            return null; // Skip rendering for admin user
+          }
+          return (
+            <h1 key={index} className="border-b-2 border-black w-full">
+              <div className="flex justify-between">
+                <div className="flex">
+                  <h1>{projectMember.Username}</h1>
+                  <span className="ml-6 mr-2 font-bold">Role:</span>
+                  <h1>{projectMember.UserRole}</h1>
+                </div>
+                <div className="flex">
+                  <div className="ml-auto flex space-x-4">
+                    {projectMember.Username !==
+                      localStorage.getItem("username") && (
+                      <h1
+                        className="cursor-pointer font-bold hover:font-extrabold hover:underline"
+                        onClick={() => {
+                          confirm(
+                            "Are you sure you want to delete this user? This action cannot be undone.",
+                          ) &&
+                            void handleUserDeleteClick(projectMember.Username);
+                        }}
+                      >
+                        Delete User
+                      </h1>
+                    )}
+                    <Link
+                      to={`/otherUsersTimeReports/${projectName}/${projectMember.Username}`}
+                    >
+                      <h1 className="cursor-pointer font-bold hover:font-extrabold hover:underline">
+                        View Reports
+                      </h1>
+                    </Link>
+                  </div>
                 </div>
               </div>
-            </div>
-          </h1>
-        ))}
+            </h1>
+          );
+        })}
       </div>
     </>
   );

frontend/src/Components/Register.tsx

@@ -3,29 +3,52 @@ import { NewUser } from "../Types/goTypes";
 import { api } from "../API/API";
 import Logo from "../assets/Logo.svg";
 import Button from "./Button";
-import InputField from "./InputField";
-import { useNavigate } from "react-router-dom";
+import UsernameInput from "./Inputs/UsernameInput";
+import PasswordInput from "./Inputs/PasswordInput";
+import { alphanumeric, lowercase } from "../Data/regex";
+import {
+  passwordLength,
+  usernameLowLimit,
+  usernameUpLimit,
+} from "../Data/constants";
 
 /**
  * Renders a registration form for the admin to add new users in.
  * @returns The JSX element representing the registration form.
  */
 export default function Register(): JSX.Element {
-  const [username, setUsername] = useState<string>();
-  const [password, setPassword] = useState<string>();
-  const [errMessage, setErrMessage] = useState<string>();
-
-  const nav = useNavigate();
+  const [username, setUsername] = useState<string>("");
+  const [password, setPassword] = useState<string>("");
+  const [errMessage, setErrMessage] = useState<string>("");
 
   const handleRegister = async (): Promise<void> => {
+    if (
+      username.length > usernameUpLimit ||
+      username.length < usernameLowLimit ||
+      !alphanumeric.test(username)
+    ) {
+      alert(
+        "Please provide valid username: \n-Between 5-10 characters \n-No special characters (.-!?/*)",
+      );
+      return;
+    }
+    if (password.length !== passwordLength || !lowercase.test(password)) {
+      alert(
+        "Please provide valid password: \n-Exactly 6 characters \n-No uppercase letters \n-No numbers \n-No special characters (.-!?/*)",
+      );
+      return;
+    }
     const newUser: NewUser = {
-      username: username ?? "",
-      password: password ?? "",
+      username: username,
+      password: password,
     };
     const response = await api.registerUser(newUser);
     if (response.success) {
-      nav("/"); // Instantly navigate to the login page
+      alert(`${newUser.username} added!`);
+      setPassword("");
+      setUsername("");
     } else {
+      alert("User not added, name could be taken");
       setErrMessage(response.message ?? "Unknown error");
       console.error(errMessage);
     }
@@ -35,7 +58,7 @@ export default function Register(): JSX.Element {
     <div className="flex flex-col h-fit w-screen items-center justify-center">
       <div className="border-4 border-black bg-white flex flex-col items-center justify-center h-fit w-fit rounded-3xl content-center pl-20 pr-20">
         <form
-          className="bg-white rounded px-8 pt-6 pb-8 mb-4 items-center justify-center flex flex-col w-fit h-fit"
+          className="bg-white rounded px-8 pt-6 pb-8 mb-4 justify-center flex flex-col w-fit h-fit"
           onSubmit={(e) => {
             e.preventDefault();
             void handleRegister();
@@ -43,29 +66,28 @@ export default function Register(): JSX.Element {
         >
           <img
             src={Logo}
-            className="logo w-[7vw] mb-10 mt-10"
+            className="logo self-center w-[7vw] mb-10 mt-10"
             alt="TTIME Logo"
           />
           <h3 className="pb-4 mb-2 text-center font-bold text-[18px]">
             Register New User
           </h3>
-          <InputField
-            label="Username"
-            type="text"
-            value={username ?? ""}
+
+          <UsernameInput
+            username={username}
             onChange={(e) => {
               setUsername(e.target.value);
             }}
           />
-          <InputField
-            label="Password"
-            type="password"
-            value={password ?? ""}
+          <div className="py-2" />
+          <PasswordInput
+            password={password}
             onChange={(e) => {
               setPassword(e.target.value);
             }}
           />
-          <div className="flex items-center justify-between">
+
+          <div className="flex self-center justify-between">
             <Button
               text="Register"
               onClick={(): void => {

frontend/src/Components/RemoveUserFromProj.tsx

@@ -0,0 +1,41 @@
+import { api, APIResponse } from "../API/API";
+
+/**
+ * Removes a user from a project
+ * @param {string} props.usernameToDelete - The username of user to remove
+ * @param {string} props.projectName - Project to remove user from
+ * @returns {void}
+ * @example
+ * const exampleUsername = "user";
+ * const exampleProjectName "project";
+ * RemoveUserFromProj({ userToRemove: exampleUsername, projectName: exampleProjectName });
+ */
+
+export default function RemoveUserFromProj(props: {
+  userToRemove: string;
+  projectName: string;
+}): void {
+  if (props.userToRemove === localStorage.getItem("username")) {
+    alert("Cannot remove yourself");
+    return;
+  }
+  api
+    .removeUserFromProject(
+      props.userToRemove,
+      props.projectName,
+      localStorage.getItem("accessToken") ?? "",
+    )
+    .then((response: APIResponse<void>) => {
+      if (response.success) {
+        alert(`${props.userToRemove} has been removed!`);
+        location.reload();
+      } else {
+        alert(`${props.userToRemove} has not been removed due to an error`);
+        console.error(response.message);
+      }
+    })
+    .catch((error) => {
+      alert(`${props.userToRemove} has not been removed due to an error`);
+      console.error("An error occurred during deletion:", error);
+    });
+}

frontend/src/Components/TimePerActivity.tsx

@@ -0,0 +1,145 @@
+import { useState, useEffect } from "react";
+import { useParams } from "react-router-dom";
+import { api } from "../API/API";
+import { projectTimes } from "./GetProjectTimes";
+
+/**
+ * Renders the component for showing total time per role in a project.
+ * @returns JSX.Element
+ */
+export default function TimePerRole(): JSX.Element {
+  const [development, setDevelopment] = useState<number>(0);
+  const [meeting, setMeeting] = useState<number>(0);
+  const [admin, setAdmin] = useState<number>(0);
+  const [own_work, setOwnWork] = useState<number>(0);
+  const [study, setStudy] = useState<number>(0);
+  const [testing, setTesting] = useState<number>(0);
+  const total = development + meeting + admin + own_work + study + testing;
+
+  const token = localStorage.getItem("accessToken") ?? "";
+  const { projectName } = useParams();
+
+  const fetchTimePerActivity = async (): Promise<void> => {
+    const response = await api.getProjectTimes(projectName ?? "", token);
+    {
+      if (response.success) {
+        const report: projectTimes = response.data ?? {
+          development: 0,
+          meeting: 0,
+          admin: 0,
+          own_work: 0,
+          study: 0,
+          testing: 0,
+        };
+        setDevelopment(report.development);
+        setMeeting(report.meeting);
+        setAdmin(report.admin);
+        setOwnWork(report.own_work);
+        setStudy(report.study);
+        setTesting(report.testing);
+      } else {
+        console.error("Failed to fetch weekly report:", response.message);
+      }
+    }
+  };
+
+  useEffect(() => {
+    void fetchTimePerActivity();
+  });
+
+  return (
+    <>
+      <h1 className="font-bold text-[30px] mb-[20px]">
+        Total Time Per Activity For All Members 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={development}
+                    readOnly
+                  />
+                </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={meeting}
+                    readOnly
+                  />
+                </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={admin}
+                    readOnly
+                  />
+                </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={own_work}
+                    readOnly
+                  />
+                </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={study}
+                    readOnly
+                  />
+                </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={testing}
+                    readOnly
+                  />
+                </td>
+              </tr>
+              <tr className="h-[10vh] font-bold font-">
+                <td>In Total:</td>
+                <td>
+                  <h1>{total}</h1>
+                </td>
+              </tr>
+            </tbody>
+          </table>
+        </div>
+      </div>
+    </>
+  );
+}

frontend/src/Components/TimePerRole.tsx

@@ -0,0 +1,141 @@
+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

@@ -1,51 +1,203 @@
-import { Link } from "react-router-dom";
 import Button from "./Button";
 import DeleteUser from "./DeleteUser";
 import UserProjectListAdmin from "./UserProjectListAdmin";
+import { useState } from "react";
+import ChangeUsername from "./ChangeUsername";
+import { StrNameChange } from "../Types/goTypes";
+import UsernameInput from "./Inputs/UsernameInput";
+import PasswordInput from "./Inputs/PasswordInput";
+import { alphanumeric, lowercase } from "../Data/regex";
+import {
+  passwordLength,
+  usernameLowLimit,
+  usernameUpLimit,
+} from "../Data/constants";
+import ChangeUserPassword from "./ChangeUserPassword";
 
 function UserInfoModal(props: {
   isVisible: boolean;
   username: string;
   onClose: () => void;
 }): JSX.Element {
-  if (!props.isVisible) return <></>;
+  const [showNameInput, setShowNameInput] = useState(false);
+  const [showPwordInput, setShowPwordInput] = useState(false);
+  const [newUsername, setNewUsername] = useState("");
+  const [newPassword, setNewPassword] = useState("");
+  if (!props.isVisible) {
+    return <></>;
+  }
+
+  /*
+   * Switches name input between visible/invisible
+   * and makes password input invisible
+   */
+  const handleShowNameInput = (): void => {
+    if (showPwordInput) setShowPwordInput(false);
+    if (showNameInput) {
+      setShowNameInput(false);
+      setNewUsername("");
+    } else {
+      setShowNameInput(true);
+      setNewPassword("");
+    }
+  };
+
+  /*
+   * Switches password input between visible/invisible
+   * and makes username input invisible
+   */
+  const handleShowPwordInput = (): void => {
+    if (showNameInput) setShowNameInput(false);
+    if (showPwordInput) {
+      setShowPwordInput(false);
+      setNewPassword("");
+    } else {
+      setShowPwordInput(true);
+      setNewUsername("");
+    }
+  };
+
+  // Handles name change and checks if new name meets requirements
+  const handleClickChangeName = (): void => {
+    if (
+      !alphanumeric.test(newUsername) ||
+      newUsername.length > usernameUpLimit ||
+      newUsername.length < usernameLowLimit
+    ) {
+      alert(
+        "Please provide valid username: \n-Between 5-10 characters \n-No special characters (.-!?/*)",
+      );
+      return;
+    }
+    if (
+      confirm(
+        `Do you really want to change username of ${props.username} to ${newUsername}?`,
+      )
+    ) {
+      const nameChange: StrNameChange = {
+        prevName: props.username,
+        newName: newUsername.replace(/ /g, ""),
+      };
+      ChangeUsername({ nameChange: nameChange });
+    } else {
+      alert("Name was not changed!");
+    }
+  };
+
+  // Handles password change and checks if new password meets requirements
+  const handleClickChangePassword = (): void => {
+    if (newPassword.length !== passwordLength || !lowercase.test(newPassword)) {
+      alert(
+        "Please provide valid password: \n-Exactly 6 characters \n-No uppercase letters \n-No numbers \n-No special characters (.-!?/*)",
+      );
+      return;
+    }
+    if (
+      confirm(`Are you sure you want to change password of ${props.username}?`)
+    ) {
+      ChangeUserPassword({
+        username: props.username,
+        newPassword: newPassword,
+      });
+    } else {
+      alert("Password was not changed!");
+    }
+  };
 
   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">
-        <p className="font-bold text-[30px]">{props.username}</p>
-        <Link to="/AdminChangeUserName">
-          <p className="mb-[20px] hover:font-bold hover:cursor-pointer underline">
-            (Change Username)
+      <div className="border-4 border-black bg-white rounded-2xl text-center flex flex-col">
+        <div className="mx-10">
+          <p className="font-bold text-[30px]">{props.username}</p>
+          <p className="mt-2 font-bold text-[20px]">Change:</p>
+          <p className="mt-2 space-x-3 mb-[10px]">
+            <span
+              className={
+                showNameInput
+                  ? "items-start font-semibold py-1 px-2 border-2 border-transparent rounded-full bg-orange-500 transition-all hover:bg-orange-600  text-white hover:cursor-pointer ring-2 ring-black"
+                  : "items-start font-medium py-1 px-2 border-2 border-gray-500 text-white rounded-full bg-orange-300 hover:bg-orange-400 transition-all hover:text-gray-100 hover:border-gray-600 hover:cursor-pointer"
+              }
+              onClick={handleShowNameInput}
+            >
+              Username
+            </span>{" "}
+            <span
+              className={
+                showPwordInput
+                  ? "items-start font-semibold py-1 px-2 border-2 border-transparent rounded-full bg-orange-500 transition-all hover:bg-orange-600  text-white hover:cursor-pointer ring-2 ring-black"
+                  : "items-start font-medium py-1 px-2 border-2 border-gray-500 text-white rounded-full bg-orange-300 hover:bg-orange-400 transition-all hover:text-gray-100 hover:border-gray-600 hover:cursor-pointer"
+              }
+              onClick={handleShowPwordInput}
+            >
+              Password
+            </span>
           </p>
-        </Link>
-        <div>
-          <h2 className="font-bold text-[22px] mb-[20px]">
-            Member of these projects:
-          </h2>
-          <div className="pr-6 pl-6">
-            <UserProjectListAdmin />
+          {showNameInput && (
+            <div className="mt-7">
+              <UsernameInput
+                username={newUsername}
+                onChange={(e) => {
+                  setNewUsername(e.target.value);
+                }}
+              />
+              <Button
+                text={"Change"}
+                onClick={function (): void {
+                  handleClickChangeName();
+                }}
+                type={"submit"}
+              />
+            </div>
+          )}
+          {showPwordInput && (
+            <div className="mt-7">
+              <PasswordInput
+                password={newPassword}
+                onChange={(e) => {
+                  setNewPassword(e.target.value);
+                }}
+              />
+              <Button
+                text={"Change"}
+                onClick={function (): void {
+                  handleClickChangePassword();
+                }}
+                type={"submit"}
+              />
+            </div>
+          )}
+          <h2 className="font-bold text-[20px]">Member of these projects:</h2>
+          <UserProjectListAdmin username={props.username} />
+          <div className="items-center space-x-6">
+            <Button
+              text={"Delete"}
+              onClick={function (): void {
+                if (
+                  window.confirm("Are you sure you want to delete this user?")
+                ) {
+                  DeleteUser({
+                    usernameToDelete: props.username,
+                  });
+                }
+              }}
+              type="button"
+            />
+            <Button
+              text={"Close"}
+              onClick={function (): void {
+                setNewUsername("");
+                setNewPassword("");
+                setShowNameInput(false);
+                setShowPwordInput(false);
+                props.onClose();
+              }}
+              type="button"
+            />
           </div>
         </div>
-        <div className="items-center space-x-6 pr-6 pl-6">
-          <Button
-            text={"Delete"}
-            onClick={function (): void {
-              DeleteUser({ usernameToDelete: props.username });
-            }}
-            type="button"
-          />
-          <Button
-            text={"Close"}
-            onClick={function (): void {
-              props.onClose();
-            }}
-            type="button"
-          />
-        </div>
       </div>
     </div>
   );

frontend/src/Components/UserListAdmin.tsx

@@ -1,5 +1,6 @@
 import { useState } from "react";
 import UserInfoModal from "./UserInfoModal";
+import InputField from "./InputField";
 
 /**
  * A list of users for admin manage users page, that sets an onClick
@@ -15,6 +16,7 @@ import UserInfoModal from "./UserInfoModal";
 export function UserListAdmin(props: { users: string[] }): JSX.Element {
   const [modalVisible, setModalVisible] = useState(false);
   const [username, setUsername] = useState("");
+  const [search, setSearch] = useState("");
 
   const handleClick = (username: string): void => {
     setUsername(username);
@@ -28,24 +30,39 @@ export function UserListAdmin(props: { users: string[] }): JSX.Element {
 
   return (
     <>
+      <h1 className="font-bold text-[30px] mb-[20px]">Manage Users</h1>
       <UserInfoModal
         onClose={handleClose}
         isVisible={modalVisible}
         username={username}
       />
       <div>
-        <ul className="font-bold underline text-[30px] cursor-pointer padding">
-          {props.users.map((user) => (
-            <li
-              className="pt-5"
-              key={user}
-              onClick={() => {
-                handleClick(user);
-              }}
-            >
-              {user}
-            </li>
-          ))}
+        <InputField
+          placeholder={"Search"}
+          type={"Text"}
+          value={search}
+          onChange={(e) => {
+            setSearch(e.target.value);
+          }}
+        />
+        <ul className="mt-3 border-2 text-left border-black rounded-2xl px-2 divide-y divide-gray-300 font-semibold text-[30px] transition-all cursor-pointer overflow-auto h-[60vh] w-[40vw]">
+          {props.users
+            .filter((user) => {
+              return search.toLowerCase() === ""
+                ? user
+                : user.toLowerCase().includes(search.toLowerCase());
+            })
+            .map((user) => (
+              <li
+                className="hover:font-extrabold hover:underline p-1"
+                key={user}
+                onClick={() => {
+                  handleClick(user);
+                }}
+              >
+                {user}
+              </li>
+            ))}
         </ul>
       </div>
     </>

frontend/src/Components/UserProjectListAdmin.tsx

@@ -1,35 +1,17 @@
-import { useEffect, useState } from "react";
-import { api } from "../API/API";
+import { useState } from "react";
 import { Project } from "../Types/goTypes";
+import GetProjects from "./GetProjects";
 
-function UserProjectListAdmin(): JSX.Element {
+function UserProjectListAdmin(props: { username: string }): JSX.Element {
   const [projects, setProjects] = useState<Project[]>([]);
 
-  useEffect(() => {
-    const fetchProjects = async (): Promise<void> => {
-      try {
-        const token = localStorage.getItem("accessToken") ?? "";
-        // const username = props.username;
-
-        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 fetchProjects();
-  }, []);
+  GetProjects({ setProjectsProp: setProjects, username: props.username });
 
   return (
-    <div className="border-2 border-black bg-white p-2 rounded-lg text-center">
-      <ul>
+    <div className="border-2 border-black bg-white rounded-2xl text-left overflow-auto h-[15vh] font-medium">
+      <ul className="divide-y-2">
         {projects.map((project) => (
-          <li key={project.id}>
+          <li className="mx-2 my-1" key={project.id}>
             <span>{project.name}</span>
           </li>
         ))}