Merge branch 'frontend' into gruppPP

Makefile

@@ -27,6 +27,10 @@ clean: remove-podman-containers
 	cd backend && make clean
 	@echo "Cleaned up!"
 
+.PHONY: itest
+itest:
+	python testing.py
+
 # Cleans up everything related to podman, not just the project. Make sure you understand what this means.
 podman-clean:
 	podman system reset --force

backend/Makefile

@@ -118,3 +118,7 @@ uml: plantuml.jar
 install-just:
 	@echo "Installing just"
 	@curl --proto '=https' --tlsv1.2 -sSf https://just.systems/install.sh | bash -s -- --to /usr/local/bin
+
+.PHONY: types
+types:
+	tygo generate

backend/internal/database/db.go

@@ -4,7 +4,6 @@ import (
 	"embed"
 	"os"
 	"path/filepath"
-	"time"
 	"ttime/internal/types"
 
 	"github.com/jmoiron/sqlx"
@@ -15,19 +14,21 @@ import (
 type Database interface {
 	// Insert a new user into the database, password should be hashed before calling
 	AddUser(username string, password string) error
+	CheckUser(username string, password string) bool
 	RemoveUser(username string) error
 	PromoteToAdmin(username string) error
 	GetUserId(username string) (int, error)
 	AddProject(name string, description string, username string) error
 	Migrate(dirname string) error
 	GetProjectId(projectname string) (int, error)
-	AddTimeReport(projectName string, userName string, start time.Time, end time.Time) error
+	AddWeeklyReport(projectName string, userName string, week int, developmentTime int, meetingTime int, adminTime int, ownWorkTime int, studyTime int, testingTime int) error
 	AddUserToProject(username string, projectname string, role string) error
 	ChangeUserRole(username string, projectname string, role string) error
 	GetAllUsersProject(projectname string) ([]UserProjectMember, error)
 	GetAllUsersApplication() ([]string, error)
 	GetProjectsForUser(username string) ([]types.Project, error)
 	GetAllProjects() ([]types.Project, error)
+	GetProject(projectId int) (types.Project, error)
 	GetUserRole(username string, projectname string) (string, error)
 }
 
@@ -49,27 +50,16 @@ var scripts embed.FS
 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 promoteToAdmin = "INSERT INTO site_admin (admin_id) SELECT id FROM users WHERE username = ?"
-const addTimeReport = `WITH UserLookup AS (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 time_reports (project_id, user_id, start, end) 
+						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), ?, ?);`
+						VALUES ((SELECT id FROM ProjectLookup), (SELECT id FROM UserLookup),?, ?, ?, ?, ?, ?, ?);`
 const addUserToProject = "INSERT INTO user_roles (user_id, project_id, p_role) VALUES (?, ?, ?)" // WIP
 const changeUserRole = "UPDATE user_roles SET p_role = ? WHERE user_id = ? AND project_id = ?"
 
-const getProjectsForUser = `
+const getProjectsForUser = `SELECT projects.id, projects.name, projects.description, projects.owner_user_id 
-SELECT 
+							FROM projects JOIN user_roles ON projects.id = user_roles.project_id
-    projects.id,
+							JOIN users ON user_roles.user_id = users.id WHERE users.username = ?;`
-    projects.name,
-    projects.description,
-    projects.owner_user_id 
-FROM 
-    projects
-JOIN 
-    user_roles ON projects.id = user_roles.project_id
-JOIN 
-    users ON user_roles.user_id = users.id
-WHERE 
-    users.username = ?;`
 
 // DbConnect connects to the database
 func DbConnect(dbpath string) Database {
@@ -88,23 +78,42 @@ func DbConnect(dbpath string) Database {
 	return &Db{db}
 }
 
+func (d *Db) CheckUser(username string, password string) bool {
+	var dbPassword string
+	err := d.Get(&dbPassword, "SELECT password FROM users WHERE username = ?", username)
+	if err != nil {
+		return false
+	}
+	return dbPassword == password
+}
+
+// GetProjectsForUser retrieves all projects associated with a specific user.
 func (d *Db) GetProjectsForUser(username string) ([]types.Project, error) {
 	var projects []types.Project
 	err := d.Select(&projects, getProjectsForUser, username)
 	return projects, err
 }
 
+// GetAllProjects retrieves all projects from the database.
 func (d *Db) GetAllProjects() ([]types.Project, error) {
 	var projects []types.Project
 	err := d.Select(&projects, "SELECT * FROM projects")
 	return projects, err
 }
 
-func (d *Db) AddTimeReport(projectName string, userName string, start time.Time, end time.Time) error { // WIP
+// GetProject retrieves a specific project by its ID.
-	_, err := d.Exec(addTimeReport, userName, projectName, start, end)
+func (d *Db) GetProject(projectId int) (types.Project, error) {
+	var project types.Project
+	err := d.Select(&project, "SELECT * FROM projects WHERE id = ?")
+	return project, err
+}
+
+func (d *Db) AddWeeklyReport(projectName string, userName string, week int, developmentTime int, meetingTime int, adminTime int, ownWorkTime int, studyTime int, testingTime int) error {
+	_, err := d.Exec(addWeeklyReport, userName, projectName, week, developmentTime, meetingTime, adminTime, ownWorkTime, studyTime, testingTime)
 	return err
 }
 
+// AddUserToProject adds a user to a project with a specified role.
 func (d *Db) AddUserToProject(username string, projectname string, role string) error { // WIP
 	var userid int
 	userid, err := d.GetUserId(username)
@@ -122,23 +131,28 @@ func (d *Db) AddUserToProject(username string, projectname string, role string)
 	return err3
 }
 
+// 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
 }
 
+// GetUserRole retrieves the role of a user within a project.
 func (d *Db) GetUserRole(username string, projectname string) (string, error) {
 	var role string
 	err := d.Get(&role, "SELECT p_role FROM user_roles WHERE user_id = (SELECT id FROM users WHERE username = ?) AND project_id = (SELECT id FROM projects WHERE name = ?)", username, projectname)

backend/internal/database/db_test.go

@@ -2,7 +2,6 @@ package database
 
 import (
 	"testing"
-	"time"
 )
 
 // Tests are not guaranteed to be sequential
@@ -93,7 +92,7 @@ func TestPromoteToAdmin(t *testing.T) {
 	}
 }
 
-func TestAddTimeReport(t *testing.T) {
+func TestAddWeeklyReport(t *testing.T) {
 	db, err := setupState()
 	if err != nil {
 		t.Error("setupState failed:", err)
@@ -109,12 +108,9 @@ func TestAddTimeReport(t *testing.T) {
 		t.Error("AddProject failed:", err)
 	}
 
-	var now = time.Now()
+	err = db.AddWeeklyReport("testproject", "testuser", 1, 1, 1, 1, 1, 1, 1)
-	var then = now.Add(time.Hour)
-
-	err = db.AddTimeReport("testproject", "testuser", now, then)
 	if err != nil {
-		t.Error("AddTimeReport failed:", err)
+		t.Error("AddWeeklyReport failed:", err)
 	}
 }
 
@@ -134,12 +130,9 @@ func TestAddUserToProject(t *testing.T) {
 		t.Error("AddProject failed:", err)
 	}
 
-	var now = time.Now()
+	err = db.AddWeeklyReport("testproject", "testuser", 1, 1, 1, 1, 1, 1, 1)
-	var then = now.Add(time.Hour)
-
-	err = db.AddTimeReport("testproject", "testuser", now, then)
 	if err != nil {
-		t.Error("AddTimeReport failed:", err)
+		t.Error("AddWeeklyReport failed:", err)
 	}
 
 	err = db.AddUserToProject("testuser", "testproject", "user")
@@ -343,3 +336,38 @@ func TestGetProjectsForUser(t *testing.T) {
 		t.Error("GetProjectsForUser failed: expected 1, got", len(projects))
 	}
 }
+
+func TestAddProject(t *testing.T) {
+	db, err := setupState()
+	if err != nil {
+		t.Error("setupState failed:", err)
+	}
+
+	err = db.AddUser("testuser", "password")
+	if err != nil {
+		t.Error("AddUser failed:", err)
+	}
+
+	err = db.AddProject("testproject", "description", "testuser")
+	if err != nil {
+		t.Error("AddProject failed:", err)
+	}
+
+	// Retrieve the added project to verify its existence
+	projects, err := db.GetAllProjects()
+	if err != nil {
+		t.Error("GetAllProjects failed:", err)
+	}
+
+	// Check if the project was added successfully
+	found := false
+	for _, project := range projects {
+		if project.Name == "testproject" {
+			found = true
+			break
+		}
+	}
+	if !found {
+		t.Error("Added project not found")
+	}
+}

backend/internal/database/migrations/0030_time_reports.sql

@@ -1,20 +0,0 @@
-CREATE TABLE IF NOT EXISTS time_reports (
-  id INTEGER PRIMARY KEY,
-  project_id INTEGER NOT NULL,
-  user_id INTEGER NOT NULL,
-  start DATETIME NOT NULL,
-  end DATETIME NOT NULL,
-  FOREIGN KEY (project_id) REFERENCES projects (id) ON DELETE CASCADE
-  FOREIGN KEY (user_id) REFERENCES users (id) ON DELETE CASCADE
-);
-
-CREATE TRIGGER IF NOT EXISTS time_reports_start_before_end
-  BEFORE INSERT ON time_reports
-  FOR EACH ROW
-  BEGIN
-    SELECT
-      CASE
-        WHEN NEW.start >= NEW.end THEN
-          RAISE (ABORT, 'start must be before end')
-      END;
-  END;

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

@@ -0,0 +1,14 @@
+CREATE TABLE weekly_reports (
+  user_id INTEGER,
+  project_id INTEGER,
+  week INTEGER,
+  development_time INTEGER,
+  meeting_time INTEGER,
+  admin_time INTEGER,
+  own_work_time INTEGER,
+  study_time INTEGER,
+  testing_time INTEGER,
+  FOREIGN KEY (user_id) REFERENCES users(id),
+  FOREIGN KEY (project_id) REFERENCES projects(id)
+  PRIMARY KEY (user_id, project_id, week)
+)

backend/internal/database/migrations/0040_time_report_collections.sql

@@ -1,9 +0,0 @@
-CREATE TABLE IF NOT EXISTS report_collection (
-  id INTEGER PRIMARY KEY,
-  owner_id INTEGER NOT NULL,
-  project_id INTEGER NOT NULL,
-  date DATE NOT NULL,
-  signed_by INTEGER, -- NULL if not signed
-  FOREIGN KEY (owner_id) REFERENCES users (id)
-  FOREIGN KEY (signed_by) REFERENCES users (id)
-);

backend/internal/database/migrations/0070_salts.sql

@@ -1,16 +0,0 @@
--- It is unclear weather this table will be used
-
--- Create the table to store hash salts
-CREATE TABLE salts (
-    id INTEGER PRIMARY KEY,
-    salt TEXT NOT NULL
-);
-
--- Commented out for now, no time for good practices, which is atrocious
--- Create a trigger to automatically generate a salt when inserting a new user record
--- CREATE TRIGGER generate_salt_trigger
--- AFTER INSERT ON users
--- BEGIN
---     INSERT INTO salts (salt) VALUES (randomblob(16));
---     UPDATE users SET salt_id = (SELECT last_insert_rowid()) WHERE id = new.id;
--- END;

backend/internal/handlers/global_state.go

@@ -1,6 +1,7 @@
 package handlers
 
 import (
+	"strconv"
 	"time"
 	"ttime/internal/database"
 	"ttime/internal/types"
@@ -17,6 +18,7 @@ type GlobalState interface {
 	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
 	// GetProject(c *fiber.Ctx) error           // To get a specific project
 	// UpdateProject(c *fiber.Ctx) error        // To update a project
 	// DeleteProject(c *fiber.Ctx) error        // To delete a project
@@ -76,12 +78,17 @@ func (gs *GState) Register(c *fiber.Ctx) error {
 // This path should obviously be protected in the future
 // UserDelete deletes a user from the database
 func (gs *GState) UserDelete(c *fiber.Ctx) error {
-	u := new(types.User)
+	// Read from path parameters
-	if err := c.BodyParser(u); err != nil {
+	username := c.Params("username")
-		return c.Status(400).SendString(err.Error())
+
+	// Read username from Locals
+	auth_username := c.Locals("user").(*jwt.Token).Claims.(jwt.MapClaims)["name"].(string)
+
+	if username != auth_username {
+		return c.Status(403).SendString("You can only delete yourself")
 	}
 
-	if err := gs.Db.RemoveUser(u.Username); err != nil {
+	if err := gs.Db.RemoveUser(username); err != nil {
 		return c.Status(500).SendString(err.Error())
 	}
 
@@ -99,18 +106,20 @@ func (gs *GState) IncrementButtonCount(c *fiber.Ctx) error {
 
 // Login is a simple login handler that returns a JWT token
 func (gs *GState) Login(c *fiber.Ctx) error {
-	// To test: curl --data "user=user&pass=pass" http://localhost:8080/api/login
+	// The body type is identical to a NewUser
-	user := c.FormValue("user")
+	u := new(types.NewUser)
-	pass := c.FormValue("pass")
+	if err := c.BodyParser(u); err != nil {
+		return c.Status(400).SendString(err.Error())
+	}
 
-	// Throws Unauthorized error
+	if !gs.Db.CheckUser(u.Username, u.Password) {
-	if user != "user" || pass != "pass" {
+		println("User not found")
 		return c.SendStatus(fiber.StatusUnauthorized)
 	}
 
 	// Create the Claims
 	claims := jwt.MapClaims{
-		"name":  user,
+		"name":  u.Username,
 		"admin": false,
 		"exp":   time.Now().Add(time.Hour * 72).Unix(),
 	}
@@ -158,9 +167,9 @@ func (gs *GState) CreateProject(c *fiber.Ctx) 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)
-	p.Owner = claims["name"].(string)
+	owner := claims["name"].(string)
 
-	if err := gs.Db.AddProject(p.Name, p.Description, p.Owner); err != nil {
+	if err := gs.Db.AddProject(p.Name, p.Description, owner); err != nil {
 		return c.Status(500).SendString(err.Error())
 	}
 
@@ -225,3 +234,50 @@ func (gs *GState) ProjectRoleChange(c *fiber.Ctx) 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")
+
+	// Parse the project ID into an integer
+	projectIDInt, err := strconv.Atoi(projectID)
+	if err != nil {
+		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 {
+		return c.Status(500).SendString(err.Error())
+	}
+
+	// Return the project as JSON
+	return c.JSON(project)
+}
+
+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 {
+		return c.Status(400).SendString(err.Error())
+	}
+
+	// Make sure all the fields of the report are valid
+	if report.Week < 1 || report.Week > 52 {
+		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 {
+		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 {
+		return c.Status(500).SendString(err.Error())
+	}
+
+	return c.Status(200).SendString("Time report added")
+}

backend/internal/types/WeeklyReport.go

@@ -0,0 +1,21 @@
+package types
+
+// This is what should be submitted to the server, the username will be derived from the JWT token
+type NewWeeklyReport struct {
+	// The name of the project, as it appears in the database
+	ProjectName string `json:"projectName"`
+	// 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

@@ -8,9 +8,8 @@ type Project struct {
 	Owner       string `json:"owner" db:"owner_user_id"`
 }
 
-// As it arrives from the client
+// As it arrives from the client, Owner is derived from the JWT token
 type NewProject struct {
 	Name        string `json:"name"`
 	Description string `json:"description"`
-	Owner       string `json:"owner"`
 }

backend/internal/types/users.go

@@ -16,6 +16,7 @@ func (u *User) ToPublicUser() (*PublicUser, error) {
 	}, nil
 }
 
+// Should be used when registering, for example
 type NewUser struct {
 	Username string `json:"username"`
 	Password string `json:"password"`

backend/main.go

@@ -68,9 +68,10 @@ func main() {
 		SigningKey: jwtware.SigningKey{Key: []byte("secret")},
 	}))
 
+	server.Post("/api/submitReport", gs.SubmitWeeklyReport)
 	server.Get("/api/getUserProjects", gs.GetUserProjects)
 	server.Post("/api/loginrenew", gs.LoginRenew)
-	server.Delete("/api/userdelete", gs.UserDelete) // Perhaps just use POST to avoid headaches
+	server.Delete("/api/userdelete/:username", gs.UserDelete) // Perhaps just use POST to avoid headaches
 	server.Post("/api/project", gs.CreateProject)
 
 	// Announce the port we are listening on and start the server

backend/tygo.yaml

@@ -0,0 +1,9 @@
+packages:
+  - path: "ttime/internal/types"
+    output_path: "../frontend/src/Types/goTypes.ts"
+    type_mappings:
+      time.Time: "string /* RFC3339 */"
+      null.String: "null | string"
+      null.Bool: "null | boolean"
+      uuid.UUID: "string /* uuid */"
+      uuid.NullUUID: "null | string /* uuid */"

frontend/.eslintrc.cjs

@@ -9,7 +9,7 @@ module.exports = {
     'plugin:react-hooks/recommended',
     'plugin:prettier/recommended',
   ],
-  ignorePatterns: ['dist', '.eslintrc.cjs', 'tailwind.config.js', 'postcss.config.js', 'jest.config.cjs'],
+  ignorePatterns: ['dist', '.eslintrc.cjs', 'tailwind.config.js', 'postcss.config.js', 'jest.config.cjs', 'goTypes.ts'],
   parser: '@typescript-eslint/parser',
   plugins: ['react-refresh', 'prettier'],
   rules: {

frontend/src/API/API.ts

@@ -1,57 +1,120 @@
 import { NewProject, Project } from "../Types/Project";
 import { NewUser, User } from "../Types/Users";
 
+// This type of pattern should be hard to misuse
+interface APIResponse<T> {
+  success: boolean;
+  message?: string;
+  data?: T;
+}
+
+// Note that all protected routes also require a token
 // Defines all the methods that an instance of the API must implement
 interface API {
   /** Register a new user */
-  registerUser(user: NewUser): Promise<User>;
+  registerUser(user: NewUser): Promise<APIResponse<User>>;
   /** Remove a user */
-  removeUser(username: string): Promise<User>;
+  removeUser(username: string, token: string): Promise<APIResponse<User>>;
   /** Create a project */
-  createProject(project: NewProject): Promise<Project>;
+  createProject(
+    project: NewProject,
+    token: string,
+  ): Promise<APIResponse<Project>>;
   /** Renew the token */
-  renewToken(token: string): Promise<string>;
+  renewToken(token: string): Promise<APIResponse<string>>;
 }
 
 // Export an instance of the API
 export const api: API = {
-  async registerUser(user: NewUser): Promise<User> {
+  async registerUser(user: NewUser): Promise<APIResponse<User>> {
-    return fetch("/api/register", {
+    try {
-      method: "POST",
+      const response = await fetch("/api/register", {
-      headers: {
+        method: "POST",
-        "Content-Type": "application/json",
+        headers: {
-      },
+          "Content-Type": "application/json",
-      body: JSON.stringify(user),
+        },
-    }).then((res) => res.json() as Promise<User>);
+        body: JSON.stringify(user),
+      });
+
+      if (!response.ok) {
+        return { success: false, message: "Failed to register user" };
+      } else {
+        const data = (await response.json()) as User;
+        return { success: true, data };
+      }
+    } catch (e) {
+      return { success: false, message: "Failed to register user" };
+    }
   },
 
-  async removeUser(username: string): Promise<User> {
+  async removeUser(
-    return fetch("/api/userdelete", {
+    username: string,
-      method: "POST",
+    token: string,
-      headers: {
+  ): Promise<APIResponse<User>> {
-        "Content-Type": "application/json",
+    try {
-      },
+      const response = await fetch("/api/userdelete", {
-      body: JSON.stringify(username),
+        method: "POST",
-    }).then((res) => res.json() as Promise<User>);
+        headers: {
+          "Content-Type": "application/json",
+          Authorization: "Bearer " + token,
+        },
+        body: JSON.stringify(username),
+      });
+
+      if (!response.ok) {
+        return { success: false, message: "Failed to remove user" };
+      } else {
+        const data = (await response.json()) as User;
+        return { success: true, data };
+      }
+    } catch (e) {
+      return { success: false, message: "Failed to remove user" };
+    }
   },
 
-  async createProject(project: NewProject): Promise<Project> {
+  async createProject(
-    return fetch("/api/project", {
+    project: NewProject,
-      method: "POST",
+    token: string,
-      headers: {
+  ): Promise<APIResponse<Project>> {
-        "Content-Type": "application/json",
+    try {
-      },
+      const response = await fetch("/api/project", {
-      body: JSON.stringify(project),
+        method: "POST",
-    }).then((res) => res.json() as Promise<Project>);
+        headers: {
+          "Content-Type": "application/json",
+          Authorization: "Bearer " + token,
+        },
+        body: JSON.stringify(project),
+      });
+
+      if (!response.ok) {
+        return { success: false, message: "Failed to create project" };
+      } else {
+        const data = (await response.json()) as Project;
+        return { success: true, data };
+      }
+    } catch (e) {
+      return { success: false, message: "Failed to create project" };
+    }
   },
 
-  async renewToken(token: string): Promise<string> {
+  async renewToken(token: string): Promise<APIResponse<string>> {
-    return fetch("/api/loginrenew", {
+    try {
-      method: "POST",
+      const response = await fetch("/api/loginrenew", {
-      headers: {
+        method: "POST",
-        "Content-Type": "application/json",
+        headers: {
-        Authorization: "Bearer " + token,
+          "Content-Type": "application/json",
-      },
+          Authorization: "Bearer " + token,
-    }).then((res) => res.json() as Promise<string>);
+        },
+      });
+
+      if (!response.ok) {
+        return { success: false, message: "Failed to renew token" };
+      } else {
+        const data = (await response.json()) as string;
+        return { success: true, data };
+      }
+    } catch (e) {
+      return { success: false, message: "Failed to renew token" };
+    }
   },
 };

frontend/src/Types/goTypes.ts

@@ -0,0 +1,88 @@
+// Code generated by tygo. DO NOT EDIT.
+
+//////////
+// source: WeeklyReport.go
+
+/**
+ * This is what should be submitted to the server, the username will be derived from the JWT token
+ */
+export interface NewWeeklyReport {
+  /**
+   * The name of the project, as it appears in the database
+   */
+  projectName: string;
+  /**
+   * The week number
+   */
+  week: number /* int */;
+  /**
+   * Total time spent on development
+   */
+  developmentTime: number /* int */;
+  /**
+   * Total time spent in meetings
+   */
+  meetingTime: number /* int */;
+  /**
+   * Total time spent on administrative tasks
+   */
+  adminTime: number /* int */;
+  /**
+   * Total time spent on personal projects
+   */
+  ownWorkTime: number /* int */;
+  /**
+   * Total time spent on studying
+   */
+  studyTime: number /* int */;
+  /**
+   * Total time spent on testing
+   */
+  testingTime: number /* int */;
+}
+
+//////////
+// source: project.go
+
+/**
+ * Project is a struct that holds the information about a project
+ */
+export interface Project {
+  id: number /* int */;
+  name: string;
+  description: string;
+  owner: string;
+}
+/**
+ * As it arrives from the client, Owner is derived from the JWT token
+ */
+export interface NewProject {
+  name: string;
+  description: string;
+}
+
+//////////
+// source: users.go
+
+/**
+ * User struct represents a user in the system
+ */
+export interface User {
+  userId: string;
+  username: string;
+  password: string;
+}
+/**
+ * Should be used when registering, for example
+ */
+export interface NewUser {
+  username: string;
+  password: string;
+}
+/**
+ * PublicUser represents a user that is safe to send over the API (no password)
+ */
+export interface PublicUser {
+  userId: string;
+  username: string;
+}

testing.py

@@ -0,0 +1,97 @@
+import requests
+import string
+import random
+
+
+def randomString(len=10):
+    """Generate a random string of fixed length"""
+    letters = string.ascii_lowercase
+    return "".join(random.choice(letters) for i in range(len))
+
+
+# Defined once per test run
+username = randomString()
+projectName = randomString()
+
+# The base URL of the API
+base_url = "http://localhost:8080"
+
+# Endpoint to test
+registerPath = base_url + "/api/register"
+loginPath = base_url + "/api/login"
+addProjectPath = base_url + "/api/project"
+submitReportPath = base_url + "/api/submitReport"
+
+
+# Posts the username and password to the register endpoint
+def register(username: string, password: string):
+    print("Registering with username: ", username, " and password: ", password)
+    response = requests.post(
+        registerPath, json={"username": username, "password": password}
+    )
+    print(response.text)
+    return response
+
+
+# Posts the username and password to the login endpoint
+def login(username: string, password: string):
+    print("Logging in with username: ", username, " and password: ", password)
+    response = requests.post(
+        loginPath, json={"username": username, "password": password}
+    )
+    print(response.text)
+    return response
+
+
+def test_login():
+    response = login(username, "always_same")
+    assert response.status_code == 200, "Login failed"
+    print("Login successful")
+    return response.json()["token"]
+
+
+def test_create_user():
+    response = register(username, "always_same")
+    assert response.status_code == 200, "Registration failed"
+    print("Registration successful")
+
+
+def test_add_project():
+    loginResponse = login(username, "always_same")
+    token = loginResponse.json()["token"]
+    response = requests.post(
+        addProjectPath,
+        json={"name": projectName, "description": "This is a project"},
+        headers={"Authorization": "Bearer " + token},
+    )
+    print(response.text)
+    assert response.status_code == 200, "Add project failed"
+    print("Add project successful")
+
+
+def test_submit_report():
+    token = login(username, "always_same").json()["token"]
+    response = requests.post(
+        submitReportPath,
+        json={
+            "projectName": "report1",
+            "week": 1,
+            "developmentTime": 10,
+            "meetingTime": 5,
+            "adminTime": 5,
+            "ownWorkTime": 10,
+            "studyTime": 10,
+            "testingTime": 10,
+        },
+        headers={"Authorization": "Bearer " + token},
+    )
+    print(response.text)
+    assert response.status_code == 200, "Submit report failed"
+    print("Submit report successful")
+
+
+if __name__ == "__main__":
+    test_create_user()
+    test_login()
+    test_add_project()
+    test_submit_report()