Release/1.4 - develop (#127)

Co-authored-by: Austin-X <[email protected]>
Co-authored-by: minhhaitran08 <[email protected]>
Co-authored-by: kevin-lann <[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

.github/workflows/workflow.yml

@@ -0,0 +1,22 @@
+name: Format the code
+
+on:
+  push:
+
+jobs:
+  format:
+    runs-on: ubuntu-latest
+    name: Format Files
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-node@v3
+        with:
+          node-version: "20"
+      - name: Prettier
+        run: npx prettier --write **/*.{js,ts,tsx,json,md}
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - uses: stefanzweifel/git-auto-commit-action@v4
+        if: ${{ github.event_name == 'push' || github.event_name == 'workflow_dispatch' }}
+        with:
+          commit_message: "Auto-formatted the code using Prettier"

course-matrix/frontend/src/models/timetable-form.ts

@@ -1,5 +1,4 @@
 import { z, ZodType } from "zod";
-
 import { OfferingModel } from "./models";
 
 const timeRegex = /^([01]\d|2[0-3]):([0-5]\d)$/;

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

@@ -76,15 +76,9 @@ const Home = () => {
   const sharedWithMeTimetables = [...(sharedWithMeData ?? [])]
     .flatMap((share) => share.timetables)
     .sort(sortingFunction);
-  const allTimetables = [...myOwningTimetables, ...sharedWithMeTimetables]
-    .map((timetable, index) => ({
-      ...timetable,
-      isShared: index >= myOwningTimetables.length,
-    }))
-    .sort(sortingFunction);
 
   const [errorMessage, setErrorMessage] = useState<string | null>(null);
-  const [activeTab, setActiveTab] = useState("All");
+  const [activeTab, setActiveTab] = useState("Mine");
 
   const [selectedSharedTimetable, setSelectedSharedTimetable] =
     useState<Timetable | null>(null);
@@ -136,13 +130,6 @@ const Home = () => {
         />
         <div className="mb-4 flex flex-row justify-between items-center">
           <div className="flex gap-4">
-            <Button
-              size="xs"
-              className={`py-3 px-5 hover:bg-blue-300 text-black ${activeTab === "All" ? "bg-blue-300" : "bg-blue-100"}`}
-              onClick={() => setActiveTab("All")}
-            >
-              All
-            </Button>
             <Button
               size="xs"
               className={`py-3 px-5 hover:bg-blue-300 text-black ${activeTab === "Mine" ? "bg-blue-300" : "bg-blue-100"}`}
@@ -167,22 +154,6 @@ const Home = () => {
         <div className="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-4 gap-4 justify-between mt-4">
           {isLoading ? (
             <p className="text-sm text-muted-foreground">Loading...</p>
-          ) : activeTab === "All" ? (
-            allTimetables.map((timetable) => (
-              <TimetableCard
-                refetchMyTimetables={refetchMyTimetables}
-                refetchSharedTimetables={refetchSharedTimetables}
-                setErrorMessage={setErrorMessage}
-                key={`${timetable.id}-${timetable.user_id}`}
-                ownerId={timetable.user_id}
-                title={timetable.timetable_title}
-                lastEditedDate={new Date(timetable.updated_at)}
-                isShared={timetable.isShared}
-                timetable={timetable}
-                setSelectedSharedTimetable={setSelectedSharedTimetable}
-                favorite={timetable.favorite}
-              />
-            ))
           ) : activeTab === "Mine" ? (
             myOwningTimetables.map((timetable) => (
               <TimetableCard

course-matrix/frontend/src/pages/Home/TimetableCardKebabMenu.tsx

@@ -57,7 +57,6 @@ const TimetableCardKebabMenu = ({
           <EllipsisVertical />
         </Button>
       </DropdownMenuTrigger>
-
       <DropdownMenuContent>
         <DropdownMenuItem>
           <Link to={`/dashboard/timetable?edit=${timetableId}`}>

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

@@ -64,13 +64,13 @@ const SharedCalendar = React.memo<SharedCalendarProps>(
 
     const courses = [
       ...new Set(
-        courseEvents.map((event) => event.event_name.split(" - ")[0].trim()),
+        courseEvents.map((event) => event.event_name.split("-")[0].trim()),
       ),
     ];
     const courseToMeetingSectionMap = new Map<string, string[]>();
     courseEvents.forEach((event) => {
-      const course = event.event_name.split(" - ")[0].trim();
-      const meetingSection = event.event_name.split(" - ")[1].trim();
+      const course = event.event_name.split("-")[0].trim();
+      const meetingSection = event.event_name.split("-")[1].trim();
       if (courseToMeetingSectionMap.has(course)) {
         const meetingSections = courseToMeetingSectionMap.get(course);
         if (meetingSections) {