Merge branch 'dev' into frontend

frontend/src/Types/goTypes.ts

@@ -40,6 +40,52 @@ export interface NewWeeklyReport {
    */
   testingTime: number /* int */;
 }
+export interface WeeklyReport {
+  /**
+   * The ID of the report
+   */
+  reportId: number /* int */;
+  /**
+   * The user id of the user who submitted the report
+   */
+  userId: number /* int */;
+  /**
+   * The name of the project, as it appears in the database
+   */
+  projectId: number /* int */;
+  /**
+   * The week number
+   */
+  week: number /* int */;
+  /**
+   * Total time spent on development
+   */
+  developmentTime: number /* int */;
+  /**
+   * Total time spent in meetings
+   */
+  meetingTime: number /* int */;
+  /**
+   * Total time spent on administrative tasks
+   */
+  adminTime: number /* int */;
+  /**
+   * Total time spent on personal projects
+   */
+  ownWorkTime: number /* int */;
+  /**
+   * Total time spent on studying
+   */
+  studyTime: number /* int */;
+  /**
+   * Total time spent on testing
+   */
+  testingTime: number /* int */;
+  /**
+   * The project manager who signed it
+   */
+  signedBy?: number /* int */;
+}
 
 //////////
 // source: project.go
@@ -86,3 +132,9 @@ export interface PublicUser {
   userId: string;
   username: string;
 }
+/**
+ * wrapper type for token
+ */
+export interface Token {
+  token: string;
+}