Release/1.3 [develop] (#92)

Co-authored-by: dawangk <[email protected]>
Co-authored-by: Austin-X <[email protected]>
Co-authored-by: minhhaitran08 <[email protected]>
Co-authored-by: Masahisa Sekita <[email protected]>
Co-authored-by: Dmitriy Prokopchuk <[email protected]>
Co-authored-by: Austin-X <[email protected]>
Co-authored-by: dawangk <[email protected]>
Co-authored-by: kevin-lann <[email protected]>
Co-authored-by: MasahisaSekita <[email protected]>

Author: 7 people

course-matrix/backend/src/routes/courseRouter.ts

@@ -1,5 +1,4 @@
 import express from "express";
-
 import coursesController from "../controllers/coursesController";
 import departmentsController from "../controllers/departmentsController";
 import offeringsController from "../controllers/offeringsController";

course-matrix/backend/tests/mocks/svgMock.tsx

@@ -0,0 +1,2 @@
+export default "SvgrURL";
+export const ReactComponent = "div";

course-matrix/backend/tests/setupTests.ts

@@ -0,0 +1 @@
+import "@testing-library/jest-dom";

course-matrix/backend/tsconfig.app.json

@@ -0,0 +1,31 @@
+{
+  "compilerOptions": {
+    "tsBuildInfoFile": "./node_modules/.tmp/tsconfig.app.tsbuildinfo",
+    "target": "ES2020",
+    "useDefineForClassFields": true,
+    "lib": ["ES2020", "DOM", "DOM.Iterable"],
+    "module": "ESNext",
+    "skipLibCheck": true,
+
+    /* Bundler mode */
+    "moduleResolution": "bundler",
+    "allowImportingTsExtensions": true,
+    "isolatedModules": true,
+    "moduleDetection": "force",
+    "noEmit": true,
+    "jsx": "react-jsx",
+
+    /* Linting */
+    "strict": true,
+    "noUnusedLocals": true,
+    "noUnusedParameters": true,
+    "noFallthroughCasesInSwitch": true,
+    "noUncheckedSideEffectImports": true,
+
+    "baseUrl": ".",
+    "paths": {
+      "@/*": ["./src/*"]
+    }
+  },
+  "include": ["src", "tests/setupTests.ts"]
+}

course-matrix/frontend/__tests__/UserMenu.test.tsx

@@ -0,0 +1,83 @@
+import configureStore from "redux-mock-store";
+import { UserMenu } from "../src/components/UserMenu";
+import { afterEach, beforeEach, describe, expect, test } from "@jest/globals";
+
+// const mockStore = configureStore([]);
+
+describe("UserMenu Component", () => {
+  beforeEach(() => {
+    localStorage.setItem(
+      "userInfo",
+      JSON.stringify({
+        user: {
+          id: "123",
+          user_metadata: {
+            username: "John Doe",
+            email: "[email protected]",
+          },
+        },
+      }),
+    );
+  });
+
+  afterEach(() => {
+    localStorage.clear();
+  });
+
+  test("check local storage", () => {
+    expect(localStorage.getItem("userInfo")).not.toBeNull();
+  });
+
+  // Will finish the rest of the tests below in Sprint 3
+
+  //   test("opens edit account dialog", () => {
+  //     render(
+  //       <Provider store={store}>
+  //         <Router>
+  //           <UserMenu />
+  //         </Router>
+  //       </Provider>,
+  //     );
+
+  //     fireEvent.click(screen.getByText("John Doe"));
+  //     fireEvent.click(screen.getByText("Edit Account"));
+
+  //     expect(screen.getByText("Edit Account")).toBeInTheDocument();
+  //     expect(screen.getByLabelText("New User Name")).toBeInTheDocument();
+  //   });
+
+  //   test("opens delete account dialog", () => {
+  //     render(
+  //       <Provider store={store}>
+  //         <Router>
+  //           <UserMenu />
+  //         </Router>
+  //       </Provider>,
+  //     );
+
+  //     fireEvent.click(screen.getByText("John Doe"));
+  //     fireEvent.click(screen.getByText("Delete Account"));
+
+  //     expect(screen.getByText("Delete Account")).toBeInTheDocument();
+  //     expect(
+  //       screen.getByText(
+  //         "Are you sure you want to delete your account? This action cannot be undone.",
+  //       ),
+  //     ).toBeInTheDocument();
+  //   });
+
+  //   test("logs out user", () => {
+  //     render(
+  //       <Provider store={store}>
+  //         <Router>
+  //           <UserMenu />
+  //         </Router>
+  //       </Provider>,
+  //     );
+
+  //     fireEvent.click(screen.getByText("John Doe"));
+  //     fireEvent.click(screen.getByText("Logout"));
+
+  //     // Add assertions to check if the user is logged out
+  //   });
+});

course-matrix/frontend/src/index.css

@@ -153,4 +153,4 @@ input:-webkit-autofill:focus {
 [class*="sx__"] {
   transition-duration: 0s !important;
   animation-duration: 0s !important;
-}
+}

course-matrix/frontend/src/pages/TimetableBuilder/TimetableBuilder.tsx

@@ -363,7 +363,7 @@ const TimetableBuilder = () => {
                 className="space-y-8"
               >
                 <div className="flex gap-8 w-full">
-                  <FormField
+                  {/* <FormField
                     control={form.control}
                     name="semester"
                     render={({ field }) => (
@@ -395,7 +395,7 @@ const TimetableBuilder = () => {
                         <FormMessage />
                       </FormItem>
                     )}
-                  />
+                  /> */}
 
                   <FormField
                     control={form.control}

course-matrix/frontend/tests/mocks/svgMock.tsx

@@ -0,0 +1,2 @@
+export default "SvgrURL";
+export const ReactComponent = "div";

course-matrix/frontend/tests/setupTests.ts

@@ -0,0 +1 @@
+import "@testing-library/jest-dom";