Merge branch 'main' into release/1.2

Author: Austin-X

course-matrix/backend/src/controllers/departmentsController.ts

@@ -30,7 +30,7 @@ export default {
       res.status(200).json(departments);
     } catch (error) {
       console.error(error);
-      res.status(500).json({ message: "Internal Server Error" });
+      res.status(500).json({message: 'Internal Server Error'});
     }
   }),
-};
+}

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

@@ -0,0 +1,12 @@
+import express from 'express';
+
+import {handleAuthCode} from '../controllers/authentication'
+import {login, logout, session, signUp} from '../controllers/userController'
+
+export const usersRouter = express.Router();
+
+usersRouter.post('/signup', signUp);
+usersRouter.post('/login', login);
+usersRouter.post('/logout', logout);
+usersRouter.get('/confirm', handleAuthCode);
+usersRouter.get('/session', session);

course-matrix/frontend/src/app/dashboard/page.tsx

@@ -0,0 +1,50 @@
+import { AppSidebar } from "@/components/app-sidebar"
+import {
+  Breadcrumb,
+  BreadcrumbItem,
+  BreadcrumbLink,
+  BreadcrumbList,
+  BreadcrumbPage,
+  BreadcrumbSeparator,
+} from "@/components/ui/breadcrumb"
+import { Separator } from "@/components/ui/separator"
+import {
+  SidebarInset,
+  SidebarProvider,
+  SidebarTrigger,
+} from "@/components/ui/sidebar"
+
+export default function Page() {
+  return (
+    <SidebarProvider>
+      <AppSidebar />
+      <SidebarInset>
+        <header className="flex h-16 shrink-0 items-center gap-2 border-b px-4">
+          <SidebarTrigger className="-ml-1" />
+          <Separator orientation="vertical" className="mr-2 h-4" />
+          <Breadcrumb>
+            <BreadcrumbList>
+              <BreadcrumbItem className="hidden md:block">
+                <BreadcrumbLink href="#">
+                  Building Your Application
+                </BreadcrumbLink>
+              </BreadcrumbItem>
+              <BreadcrumbSeparator className="hidden md:block" />
+              <BreadcrumbItem>
+                <BreadcrumbPage>Data Fetching</BreadcrumbPage>
+              </BreadcrumbItem>
+            </BreadcrumbList>
+          </Breadcrumb>
+        </header>
+        <div className="flex flex-1 flex-col gap-4 p-4">
+          <div className="grid auto-rows-min gap-4 md:grid-cols-3">
+            <div className="aspect-video rounded-xl bg-muted/50" />
+            <div className="aspect-video rounded-xl bg-muted/50" />
+            <div className="aspect-video rounded-xl bg-muted/50" />
+          </div>
+          <div className="min-h-[100vh] flex-1 rounded-xl bg-muted/50 md:min-h-min" />
+        </div>
+      </SidebarInset>
+    </SidebarProvider>
+  )
+}

course-matrix/frontend/src/components/time-picker-hr.tsx

@@ -3,7 +3,6 @@ import { Label } from "@/components/ui/label";
 import { TimePickerInput } from "./time-picker-input";
 import { TimePeriodSelect } from "./period-select";
 import { Period } from "../utils/time-picker-utils";
-
 interface TimePickerHrProps {
   date: Date | undefined;
   setDate: (date: Date | undefined) => void;
@@ -16,7 +15,6 @@ export function TimePickerHr({ date, setDate }: TimePickerHrProps) {
   const hourRef = React.useRef<HTMLInputElement>(null);
   const secondRef = React.useRef<HTMLInputElement>(null);
   const periodRef = React.useRef<HTMLButtonElement>(null);
-
   return (
     <div className="flex items-end gap-2">
       <div className="grid gap-1 text-center">

course-matrix/frontend/src/components/time-picker-input.tsx

@@ -1,5 +1,4 @@
 import { Input } from "@/components/ui/input";
-
 import { cn } from "@/lib/utils";
 import React from "react";
 import {
@@ -9,7 +8,6 @@ import {
   getDateByType,
   setDateByType,
 } from "../utils/time-picker-utils";
-
 export interface TimePickerInputProps
   extends React.InputHTMLAttributes<HTMLInputElement> {
   picker: TimePickerType;
@@ -19,7 +17,6 @@ export interface TimePickerInputProps
   onRightFocus?: () => void;
   onLeftFocus?: () => void;
 }
-
 const TimePickerInput = React.forwardRef<
   HTMLInputElement,
   TimePickerInputProps
@@ -91,15 +88,13 @@ const TimePickerInput = React.forwardRef<
       }
       if (e.key >= "0" && e.key <= "9") {
         if (picker === "12hours") setPrevIntKey(e.key);
-
         const newValue = calculateNewValue(e.key);
         if (flag) onRightFocus?.();
         setFlag((prev) => !prev);
         const tempDate = new Date(date);
         setDate(setDateByType(tempDate, newValue, picker, period));
       }
     };
-
     return (
       <Input
         ref={ref}

course-matrix/frontend/src/utils/time-picker-utils.tsx

@@ -4,14 +4,12 @@
 export function isValidHour(value: string) {
   return /^(0[0-9]|1[0-9]|2[0-3])$/.test(value);
 }
-
 /**
  * regular expression to check for valid 12 hour format (01-12)
  */
 export function isValid12Hour(value: string) {
   return /^(0[1-9]|1[0-2])$/.test(value);
 }
-
 /**
  * regular expression to check for valid minute format (00-59)
  */
@@ -45,17 +43,14 @@ export function getValidHour(value: string) {
   if (isValidHour(value)) return value;
   return getValidNumber(value, { max: 23 });
 }
-
 export function getValid12Hour(value: string) {
   if (isValid12Hour(value)) return value;
   return getValidNumber(value, { min: 1, max: 12 });
 }
-
 export function getValidMinuteOrSecond(value: string) {
   if (isValidMinuteOrSecond(value)) return value;
   return getValidNumber(value, { max: 59 });
 }
-
 type GetValidArrowNumberConfig = {
   min: number;
   max: number;
@@ -91,19 +86,16 @@ export function setMinutes(date: Date, value: string) {
   date.setMinutes(parseInt(minutes, 10));
   return date;
 }
-
 export function setSeconds(date: Date, value: string) {
   const seconds = getValidMinuteOrSecond(value);
   date.setSeconds(parseInt(seconds, 10));
   return date;
 }
-
 export function setHours(date: Date, value: string) {
   const hours = getValidHour(value);
   date.setHours(parseInt(hours, 10));
   return date;
 }
-
 export function set12Hours(date: Date, value: string, period: Period) {
   const hours = parseInt(getValid12Hour(value), 10);
   const convertedHours = convert12HourTo24Hour(hours, period);
@@ -135,7 +127,6 @@ export function setDateByType(
       return date;
   }
 }
-
 export function getDateByType(date: Date, type: TimePickerType) {
   switch (type) {
     case "minutes":
@@ -170,7 +161,6 @@ export function getArrowByType(
       return "00";
   }
 }
-
 /**
  * handles value change of 12-hour input
  * 12:00 PM is 12:00
@@ -189,7 +179,6 @@ export function convert12HourTo24Hour(hour: number, period: Period) {
   }
   return hour;
 }
-
 /**
  * time is stored in the 24-hour form,
  * but needs to be displayed to the user

doc/sprint0/product.md

@@ -78,7 +78,6 @@ A fully realized Course Matrix will include the following features and developme
 - **Intuitive User Interface**: A seamless and user-friendly design ensures users can easily navigate and utilize the platform without requiring extensive instructions.
 
 **Development Standards**:
-
 - **Rigorous Testing**: All code is thoroughly tested to address potential bugs and ensure functionality across all use cases.
 - **Feature Integration and Code Review**: New features are reviewed by at least two team members to ensure quality and consistency before being merged into the production environment, adhering to a structured code review process.