Merge branch 'main' into feat/uniqueID-calendar

README.md

@@ -216,3 +216,5 @@ Special thanks to the developers and contributors behind these amazing tools and
    <img alt="Star History Chart" src="https://api.star-history.com/svg?repos=Longhorn-Developers/UT-Registration-Plus&type=Date" />
  </picture>
 </a>
+
+

package.json

@@ -111,7 +111,7 @@
         "@vitest/coverage-v8": "^2.1.9",
         "@vitest/ui": "^2.1.9",
         "chalk": "^5.4.1",
-        "chromatic": "^15.1.0",
+        "chromatic": "^11.26.0",
         "cssnano": "^7.0.6",
         "cssnano-preset-advanced": "^7.0.6",
         "dotenv": "^16.4.7",

pnpm-lock.yaml

@@ -261,8 +261,8 @@ importers:
         specifier: ^5.4.1
         version: 5.4.1
       chromatic:
-        specifier: ^15.1.0
+        specifier: ^11.26.0
-        version: 15.1.0
+        version: 11.26.0
       cssnano:
         specifier: ^7.0.6
         version: 7.0.6(postcss@8.5.3)
@@ -3210,20 +3210,8 @@ packages:
     resolution: {integrity: sha512-Qgzu8kfBvo+cA4962jnP1KkS6Dop5NS6g7R5LFYJr4b8Ub94PPQXUksCw9PvXoeXPRRddRNC5C1JQUR2SMGtnA==}
     engines: {node: '>= 14.16.0'}
 
-  chromatic@11.29.0:
+  chromatic@11.26.0:
-    resolution: {integrity: sha512-yisBlntp9hHVj19lIQdpTlcYIXuU9H/DbFuu6tyWHmj6hWT2EtukCCcxYXL78XdQt1vm2GfIrtgtKpj/Rzmo4A==}
+    resolution: {integrity: sha512-3rRiPmdnt5sbYZTlr6Uqd11S/teafQA1Dr6mCddIz/FFKYPv/Yt26nJllixyFd9VUwrILMPTyuracUIgJ77VZA==}
-    hasBin: true
-    peerDependencies:
-      '@chromatic-com/cypress': ^0.*.* || ^1.0.0
-      '@chromatic-com/playwright': ^0.*.* || ^1.0.0
-    peerDependenciesMeta:
-      '@chromatic-com/cypress':
-        optional: true
-      '@chromatic-com/playwright':
-        optional: true
-
-  chromatic@15.1.0:
-    resolution: {integrity: sha512-XODNgiczeX5SpaWsCQLEwGpXrF2QVPb9bka7nHa8NQssyRRTt9EI8jVH8BRDUPcrQKqQqmXmxOy2Cq4IK1ydFQ==}
     hasBin: true
     peerDependencies:
       '@chromatic-com/cypress': ^0.*.* || ^1.0.0
@@ -6213,8 +6201,8 @@ packages:
     resolution: {integrity: sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==}
     hasBin: true
 
-  react-confetti@6.4.0:
+  react-confetti@6.2.3:
-    resolution: {integrity: sha512-5MdGUcqxrTU26I2EU7ltkWPwxvucQTuqMm8dUz72z2YMqTD6s9vMcDUysk7n9jnC+lXuCPeJJ7Knf98VEYE9Rg==}
+    resolution: {integrity: sha512-Jt6Fy3jE7FrpKxeDQ3oh36Bz6LoYt4o+vU578ghuF//NxADlcauDYvWr24S8hHKnQ90Uv01XXOngnKVBdZ73zQ==}
     engines: {node: '>=16'}
     peerDependencies:
       react: ^16.3.0 || ^17.0.1 || ^18.0.0 || ^19.0.0
@@ -7672,10 +7660,10 @@ snapshots:
 
   '@chromatic-com/storybook@2.0.2(react@18.3.1)':
     dependencies:
-      chromatic: 11.29.0
+      chromatic: 11.26.0
       filesize: 10.1.6
       jsonfile: 6.1.0
-      react-confetti: 6.4.0(react@18.3.1)
+      react-confetti: 6.2.3(react@18.3.1)
       strip-ansi: 7.1.0
     transitivePeerDependencies:
       - '@chromatic-com/cypress'
@@ -10605,9 +10593,7 @@ snapshots:
     dependencies:
       readdirp: 4.1.2
 
-  chromatic@11.29.0: {}
+  chromatic@11.26.0: {}
-
-  chromatic@15.1.0: {}
 
   chrome-trace-event@1.0.4: {}
 
@@ -14050,7 +14036,7 @@ snapshots:
       minimist: 1.2.8
       strip-json-comments: 2.0.1
 
-  react-confetti@6.4.0(react@18.3.1):
+  react-confetti@6.2.3(react@18.3.1):
     dependencies:
       react: 18.3.1
       tween-functions: 1.2.0

src/views/components/calendar/CalendarCourseCell.tsx

@@ -49,6 +49,7 @@ export default function CalendarCourseCell({
 
     const { colors, uniqueId: courseID } = blockData.course;
     const { dayIndex, startIndex } = blockData.calendarGridPoint;
+    const [courseDepartment, courseInstructor] = courseDeptAndInstr.split('–').map(part => part.trim());
 
     let selectedCourse = false;
     let selectedBlock = false;
@@ -131,7 +132,7 @@ export default function CalendarCourseCell({
                         'text-wrap': !timeAndLocation,
                     })}
                 >
-                    {courseDeptAndInstr}
+                    {courseDepartment}, {courseID} – {courseInstructor}
                 </Text>
                 {timeAndLocation && (
                     <Text variant='h3-course' as='p' className='whitespace-pre-line'>

src/views/components/calendar/CalendarHeader/CalendarHeader.tsx

@@ -1,5 +1,5 @@
 import { Menu, MenuButton, MenuItem, MenuItems } from '@headlessui/react';
-import { CalendarDots, Export, FileCode, FilePng, FileText, Sidebar } from '@phosphor-icons/react';
+import { CalendarDots, Export, FileCode, FilePng, Sidebar } from '@phosphor-icons/react';
 import styles from '@views/components/calendar/CalendarHeader/CalendarHeader.module.scss';
 import { Button } from '@views/components/common/Button';
 import DialogProvider from '@views/components/common/DialogProvider/DialogProvider';
@@ -11,7 +11,7 @@ import useSchedules from '@views/hooks/useSchedules';
 import clsx from 'clsx';
 import React from 'react';
 
-import { handleExportJson, saveAsCal, saveAsText, saveCalAsPng } from '../utils';
+import { handleExportJson, saveAsCal, saveCalAsPng } from '../utils';
 
 interface CalendarHeaderProps {
     sidebarOpen?: boolean;
@@ -111,18 +111,6 @@ export default function CalendarHeader({ sidebarOpen, onSidebarToggle }: Calenda
                                         Save as .json
                                     </Button>
                                 </MenuItem>
-                                <MenuItem>
-                                    <Button
-                                        className='w-full flex justify-start'
-                                        onClick={saveAsText}
-                                        color='ut-black'
-                                        size='small'
-                                        variant='minimal'
-                                        icon={FileText}
-                                    >
-                                        Save as .txt
-                                    </Button>
-                                </MenuItem>
                                 {/* <MenuItem>
                                     <Button color='ut-black' size='small' variant='minimal' icon={FileTxt}>
                                         Export Unique IDs

src/views/components/calendar/utils.ts

@@ -245,27 +245,6 @@ export const scheduleToIcsString = (schedule: Serialized<UserSchedule>) => {
     return icsString;
 };
 
-/**
- * Returns the provided schedule in a human readable/copyable text format
- * @param schedule - The schedule object
- * @returns
- */
-export const scheduleToText = (schedule: Serialized<UserSchedule>) => {
-    const lines: string[] = [];
-
-    lines.push(`Schedule: ${schedule.name}`);
-    lines.push('');
-
-    for (const c of schedule.courses) {
-        lines.push(c.fullName);
-        lines.push(`${c.creditHours} Credit Hours`);
-        lines.push(`${c.uniqueId}`);
-        lines.push('');
-    }
-
-    return lines.join('\n');
-};
-
 /**
  * Saves the current schedule as a calendar file in the iCalendar format (ICS).
  * Fetches the current active schedule and converts it into an ICS string.
@@ -283,25 +262,6 @@ export const saveAsCal = async () => {
     downloadBlob(icsString, 'CALENDAR', 'schedule.ics');
 };
 
-/**
- * Save current schedule as a plain text file consisting of
- * Course Name - Course ID
- * Course Time
- * Unique Number
- * Line Break
- * Repeat
- */
-export const saveAsText = async () => {
-    const schedule = await getSchedule();
-
-    if (!schedule) {
-        throw new Error('No schedule found');
-    }
-
-    const scheduleText = scheduleToText(schedule);
-    downloadBlob(scheduleText, 'TEXT', 'schedule.txt');
-};
-
 /**
  * Saves current schedule to JSON that can be imported on other devices.
  * @param id - Provided schedule ID to download