Merge imbs

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

@@ -21,7 +21,7 @@ type Database interface {
 	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
+	AddTimeReport(projectName string, userName string, activityType string, start time.Time, end time.Time) error
 	AddUserToProject(username string, projectname string, role string) error
 	ChangeUserRole(username string, projectname string, role string) error
 	GetAllUsersProject(projectname string) ([]UserProjectMember, error)
@@ -52,8 +52,8 @@ const projectInsert = "INSERT INTO projects (name, description, owner_user_id) S
 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 = ?), 
 						ProjectLookup AS (SELECT id FROM projects WHERE name = ?)
-						INSERT INTO time_reports (project_id, user_id, start, end) 
-						VALUES ((SELECT id FROM ProjectLookup), (SELECT id FROM UserLookup), ?, ?);`
+						INSERT INTO time_reports (project_id, user_id, activity_type, start, end) 
+						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 = ?"
 
@@ -89,29 +89,34 @@ func DbConnect(dbpath string) Database {
 	return &Db{db}
 }
 
+// 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
 }
 
+// GetProject retrieves a specific project by its ID.
 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) AddTimeReport(projectName string, userName string, start time.Time, end time.Time) error { // WIP
-	_, err := d.Exec(addTimeReport, userName, projectName, start, end)
+// AddTimeReport adds a time report for a specific project and user.
+func (d *Db) AddTimeReport(projectName string, userName string, activityType string, start time.Time, end time.Time) error { // WIP
+	_, err := d.Exec(addTimeReport, userName, projectName, activityType, start, end)
 	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)
@@ -129,23 +134,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

@@ -112,7 +112,7 @@ func TestAddTimeReport(t *testing.T) {
 	var now = time.Now()
 	var then = now.Add(time.Hour)
 
-	err = db.AddTimeReport("testproject", "testuser", now, then)
+	err = db.AddTimeReport("testproject", "testuser", "activity", now, then)
 	if err != nil {
 		t.Error("AddTimeReport failed:", err)
 	}
@@ -137,7 +137,7 @@ func TestAddUserToProject(t *testing.T) {
 	var now = time.Now()
 	var then = now.Add(time.Hour)
 
-	err = db.AddTimeReport("testproject", "testuser", now, then)
+	err = db.AddTimeReport("testproject", "testuser", "activity", now, then)
 	if err != nil {
 		t.Error("AddTimeReport failed:", err)
 	}

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

@@ -2,10 +2,12 @@ CREATE TABLE IF NOT EXISTS time_reports (
   id INTEGER PRIMARY KEY,
   project_id INTEGER NOT NULL,
   user_id INTEGER NOT NULL,
+  activity_type TEXT 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
+  FOREIGN KEY (activity_type) REFERENCES activity_types (name) ON DELETE CASCADE
 );
 
 CREATE TRIGGER IF NOT EXISTS time_reports_start_before_end

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

@@ -1,7 +1,7 @@
 -- It is unclear weather this table will be used
 
 -- Create the table to store hash salts
-CREATE TABLE salts (
+CREATE TABLE IF NOT EXISTS salts (
     id INTEGER PRIMARY KEY,
     salt TEXT NOT NULL
 );

backend/internal/database/migrations/0080_activity_types.sql

@@ -0,0 +1,10 @@
+CREATE TABLE IF NOT EXISTS activity_types (
+  name TEXT PRIMARY KEY
+);
+
+INSERT OR IGNORE INTO activity_types (name) VALUES ('Development');
+INSERT OR IGNORE INTO activity_types (name) VALUES ('Meeting');
+INSERT OR IGNORE INTO activity_types (name) VALUES ('Administration');
+INSERT OR IGNORE INTO activity_types (name) VALUES ('Own Work');
+INSERT OR IGNORE INTO activity_types (name) VALUES ('Studies');
+INSErt OR IGNORE INTO activity_types (name) VALUES ('Testing');

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> {
-    return fetch("/api/register", {
-      method: "POST",
-      headers: {
-        "Content-Type": "application/json",
-      },
-      body: JSON.stringify(user),
-    }).then((res) => res.json() as Promise<User>);
+  async registerUser(user: NewUser): Promise<APIResponse<User>> {
+    try {
+      const response = await fetch("/api/register", {
+        method: "POST",
+        headers: {
+          "Content-Type": "application/json",
+        },
+        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> {
-    return fetch("/api/userdelete", {
-      method: "POST",
-      headers: {
-        "Content-Type": "application/json",
-      },
-      body: JSON.stringify(username),
-    }).then((res) => res.json() as Promise<User>);
+  async removeUser(
+    username: string,
+    token: string,
+  ): Promise<APIResponse<User>> {
+    try {
+      const response = await fetch("/api/userdelete", {
+        method: "POST",
+        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> {
-    return fetch("/api/project", {
-      method: "POST",
-      headers: {
-        "Content-Type": "application/json",
-      },
-      body: JSON.stringify(project),
-    }).then((res) => res.json() as Promise<Project>);
+  async createProject(
+    project: NewProject,
+    token: string,
+  ): Promise<APIResponse<Project>> {
+    try {
+      const response = await fetch("/api/project", {
+        method: "POST",
+        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> {
-    return fetch("/api/loginrenew", {
-      method: "POST",
-      headers: {
-        "Content-Type": "application/json",
-        Authorization: "Bearer " + token,
-      },
-    }).then((res) => res.json() as Promise<string>);
+  async renewToken(token: string): Promise<APIResponse<string>> {
+    try {
+      const response = await fetch("/api/loginrenew", {
+        method: "POST",
+        headers: {
+          "Content-Type": "application/json",
+          Authorization: "Bearer " + token,
+        },
+      });
+
+      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/Components/Button.tsx

@@ -1,14 +1,17 @@
 function Button({
   text,
   onClick,
+  type,
 }: {
   text: string;
   onClick: () => void;
+  type: "submit" | "button" | "reset";
 }): JSX.Element {
   return (
     <button
       onClick={onClick}
       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;"
+      type={type}
     >
       {text}
     </button>

frontend/src/Components/Register.tsx

@@ -1,6 +1,8 @@
 import { useState } from "react";
 import { NewUser } from "../Types/Users";
 import { api } from "../API/API";
+import Logo from "../assets/Logo.svg";
+import Button from "./Button";
 
 export default function Register(): JSX.Element {
   const [username, setUsername] = useState("");
@@ -12,25 +14,32 @@ export default function Register(): JSX.Element {
   };
 
   return (
-    <div>
-      <div className="w-full max-w-xs">
+    <div className="flex flex-col h-screen 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 shadow-md rounded px-8 pt-6 pb-8 mb-4"
+          className="bg-white rounded px-8 pt-6 pb-8 mb-4 items-center justify-center flex flex-col w-fit h-fit"
           onSubmit={(e) => {
             e.preventDefault();
             void handleRegister();
           }}
         >
-          <h3 className="pb-2">Register new user</h3>
+          <img
+            src={Logo}
+            className="logo 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>
           <div className="mb-4">
             <label
-              className="block text-gray-700 text-sm font-bold mb-2"
+              className="block text-gray-700 text-sm font-sans font-bold mb-2"
               htmlFor="username"
             >
               Username
             </label>
             <input
-              className="shadow appearance-none border rounded w-full py-2 px-3 text-gray-700 leading-tight focus:outline-none focus:shadow-outline"
+              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="username"
               type="text"
               placeholder="Username"
@@ -42,13 +51,13 @@ export default function Register(): JSX.Element {
           </div>
           <div className="mb-6">
             <label
-              className="block text-gray-700 text-sm font-bold mb-2"
+              className="block text-gray-700 text-sm font-sans font-bold mb-2"
               htmlFor="password"
             >
               Password
             </label>
             <input
-              className="shadow appearance-none border rounded w-full py-2 px-3 text-gray-700 mb-3 leading-tight focus:outline-none focus:shadow-outline"
+              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="password"
               type="password"
               placeholder="Choose your password"
@@ -59,12 +68,13 @@ export default function Register(): JSX.Element {
             />
           </div>
           <div className="flex items-center justify-between">
-            <button
-              className="bg-blue-500 hover:bg-blue-700 text-white font-bold py-2 px-4 rounded focus:outline-none focus:shadow-outline"
+            <Button
+              text="Register"
+              onClick={(): void => {
+                return;
+              }}
               type="submit"
-            >
-              Register
-            </button>
+            />
           </div>
         </form>
         <p className="text-center text-gray-500 text-xs"></p>

frontend/src/Pages/AdminPages/AdminAddProject.tsx

@@ -11,12 +11,14 @@ function AdminAddProject(): JSX.Element {
         onClick={(): void => {
           return;
         }}
+        type="button"
       />
       <Button
         text="Back"
         onClick={(): void => {
           return;
         }}
+        type="button"
       />
     </>
   );

frontend/src/Pages/AdminPages/AdminAddUser.tsx

@@ -11,12 +11,14 @@ function AdminAddUser(): JSX.Element {
         onClick={(): void => {
           return;
         }}
+        type="button"
       />
       <Button
         text="Back"
         onClick={(): void => {
           return;
         }}
+        type="button"
       />
     </>
   );

frontend/src/Pages/AdminPages/AdminChangeUsername.tsx

@@ -11,12 +11,14 @@ function AdminChangeUsername(): JSX.Element {
         onClick={(): void => {
           return;
         }}
+        type="button"
       />
       <Button
         text="Back"
         onClick={(): void => {
           return;
         }}
+        type="button"
       />
     </>
   );

frontend/src/Pages/AdminPages/AdminManageProjects.tsx

@@ -11,12 +11,14 @@ function AdminManageProjects(): JSX.Element {
         onClick={(): void => {
           return;
         }}
+        type="button"
       />
       <Button
         text="Back"
         onClick={(): void => {
           return;
         }}
+        type="button"
       />
     </>
   );

frontend/src/Pages/AdminPages/AdminManageUsers.tsx

@@ -11,12 +11,14 @@ function AdminManageUsers(): JSX.Element {
         onClick={(): void => {
           return;
         }}
+        type="button"
       />
       <Button
         text="Back"
         onClick={(): void => {
           return;
         }}
+        type="button"
       />
     </>
   );

frontend/src/Pages/AdminPages/AdminProjectAddMember.tsx

@@ -11,12 +11,14 @@ function AdminProjectAddMember(): JSX.Element {
         onClick={(): void => {
           return;
         }}
+        type="button"
       />
       <Button
         text="Back"
         onClick={(): void => {
           return;
         }}
+        type="button"
       />
     </>
   );

frontend/src/Pages/AdminPages/AdminProjectChangeUserRole.tsx

@@ -11,12 +11,14 @@ function AdminProjectChangeUserRole(): JSX.Element {
         onClick={(): void => {
           return;
         }}
+        type="button"
       />
       <Button
         text="Back"
         onClick={(): void => {
           return;
         }}
+        type="button"
       />
     </>
   );

frontend/src/Pages/AdminPages/AdminProjectManageMembers.tsx

@@ -11,12 +11,14 @@ function AdminProjectManageMembers(): JSX.Element {
         onClick={(): void => {
           return;
         }}
+        type="button"
       />
       <Button
         text="Back"
         onClick={(): void => {
           return;
         }}
+        type="button"
       />
     </>
   );

frontend/src/Pages/AdminPages/AdminProjectPage.tsx

@@ -11,12 +11,14 @@ function AdminProjectPage(): JSX.Element {
         onClick={(): void => {
           return;
         }}
+        type="button"
       />
       <Button
         text="Back"
         onClick={(): void => {
           return;
         }}
+        type="button"
       />
     </>
   );

frontend/src/Pages/AdminPages/AdminProjectStatistics.tsx

@@ -11,6 +11,7 @@ function AdminProjectStatistics(): JSX.Element {
         onClick={(): void => {
           return;
         }}
+        type="button"
       />
     </>
   );

frontend/src/Pages/AdminPages/AdminProjectViewMemberInfo.tsx

@@ -11,12 +11,14 @@ function AdminProjectViewMemberInfo(): JSX.Element {
         onClick={(): void => {
           return;
         }}
+        type="button"
       />
       <Button
         text="Back"
         onClick={(): void => {
           return;
         }}
+        type="button"
       />
     </>
   );

frontend/src/Pages/AdminPages/AdminViewUserInfo.tsx

@@ -11,12 +11,14 @@ function AdminViewUserInfo(): JSX.Element {
         onClick={(): void => {
           return;
         }}
+        type="button"
       />
       <Button
         text="Back"
         onClick={(): void => {
           return;
         }}
+        type="button"
       />
     </>
   );

frontend/src/Pages/LoginPage.tsx

@@ -67,6 +67,7 @@ function LoginPage(): JSX.Element {
               onClick={(): void => {
                 return;
               }}
+              type="button"
             />
           </Link>
           <Link to="/register">
@@ -75,6 +76,7 @@ function LoginPage(): JSX.Element {
               onClick={(): void => {
                 return;
               }}
+              type="button"
             />
           </Link>
         </div>

frontend/src/Pages/ProjectManagerPages/PMChangeRole.tsx

@@ -11,12 +11,14 @@ function ChangeRole(): JSX.Element {
         onClick={(): void => {
           return;
         }}
+        type="button"
       />
       <Button
         text="Back"
         onClick={(): void => {
           return;
         }}
+        type="button"
       />
     </>
   );

frontend/src/Pages/ProjectManagerPages/PMOtherUsersTR.tsx

@@ -11,6 +11,7 @@ function PMOtherUsersTR(): JSX.Element {
         onClick={(): void => {
           return;
         }}
+        type="button"
       />
     </>
   );

frontend/src/Pages/ProjectManagerPages/PMProjectMembers.tsx

@@ -11,18 +11,21 @@ function PMProjectMembers(): JSX.Element {
         onClick={(): void => {
           return;
         }}
+        type="button"
       />
       <Button
         text="Time / Role"
         onClick={(): void => {
           return;
         }}
+        type="button"
       />
       <Button
         text="Back"
         onClick={(): void => {
           return;
         }}
+        type="button"
       />
     </>
   );

frontend/src/Pages/ProjectManagerPages/PMProjectPage.tsx

@@ -29,6 +29,7 @@ function PMProjectPage(): JSX.Element {
         onClick={(): void => {
           return;
         }}
+        type="button"
       />
     </>
   );

frontend/src/Pages/ProjectManagerPages/PMTotalTimeActivity.tsx

@@ -19,6 +19,7 @@ function PMTotalTimeActivity(): JSX.Element {
         onClick={(): void => {
           return;
         }}
+        type="button"
       />
     </>
   );

frontend/src/Pages/ProjectManagerPages/PMTotalTimeRole.tsx

@@ -11,6 +11,7 @@ function PMTotalTimeRole(): JSX.Element {
         onClick={(): void => {
           return;
         }}
+        type="button"
       />
     </>
   );

frontend/src/Pages/ProjectManagerPages/PMUnsignedReports.tsx

@@ -11,6 +11,7 @@ function PMUnsignedReports(): JSX.Element {
         onClick={(): void => {
           return;
         }}
+        type="button"
       />
     </>
   );

frontend/src/Pages/ProjectManagerPages/PMViewUnsignedReport.tsx

@@ -19,18 +19,21 @@ function PMViewUnsignedReport(): JSX.Element {
         onClick={(): void => {
           return;
         }}
+        type="button"
       />
       <Button
         text="Save"
         onClick={(): void => {
           return;
         }}
+        type="button"
       />
       <Button
         text="Back"
         onClick={(): void => {
           return;
         }}
+        type="button"
       />
     </>
   );

frontend/src/Pages/UserPages/UserEditTimeReportPage.tsx

@@ -17,12 +17,14 @@ function UserEditTimeReportPage(): JSX.Element {
         onClick={(): void => {
           return;
         }}
+        type="button"
       />
       <Button
         text="Back"
         onClick={(): void => {
           return;
         }}
+        type="button"
       />
     </>
   );

frontend/src/Pages/UserPages/UserNewTimeReportPage.tsx

@@ -18,6 +18,7 @@ function UserNewTimeReportPage(): JSX.Element {
         onClick={(): void => {
           return;
         }}
+        type="button"
       />
       <Link to="/project">
         <Button
@@ -25,6 +26,7 @@ function UserNewTimeReportPage(): JSX.Element {
           onClick={(): void => {
             return;
           }}
+          type="button"
         />
       </Link>
     </>

frontend/src/Pages/UserPages/UserProjectPage.tsx

@@ -27,6 +27,7 @@ function UserProjectPage(): JSX.Element {
           onClick={(): void => {
             return;
           }}
+          type="button"
         />
       </Link>
     </>

frontend/src/Pages/UserPages/UserViewTimeReportsPage.tsx

@@ -11,6 +11,7 @@ function UserViewTimeReportsPage(): JSX.Element {
         onClick={(): void => {
           return;
         }}
+        type="button"
       />
     </>
   );