diff --git a/package.json b/package.json index 77697e17d..957f0191d 100644 --- a/package.json +++ b/package.json @@ -59,9 +59,11 @@ "@commitlint/types": "^19.5.0", "@crxjs/vite-plugin": "2.0.0-beta.21", "@iconify-json/bi": "^1.2.1", + "@iconify-json/ic": "^1.2.1", "@iconify-json/iconoir": "^1.2.3", "@iconify-json/material-symbols": "^1.2.6", "@iconify-json/ri": "^1.2.3", + "@iconify-json/streamline": "^1.2.1", "@semantic-release/exec": "^6.0.3", "@sentry/types": "^8.36.0", "@storybook/addon-designs": "^8.0.4", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 18b0d9375..6ef4a92c8 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -110,6 +110,9 @@ importers: '@iconify-json/bi': specifier: ^1.2.1 version: 1.2.1 + '@iconify-json/ic': + specifier: ^1.2.1 + version: 1.2.1 '@iconify-json/iconoir': specifier: ^1.2.3 version: 1.2.3 @@ -119,6 +122,9 @@ importers: '@iconify-json/ri': specifier: ^1.2.3 version: 1.2.3 + '@iconify-json/streamline': + specifier: ^1.2.1 + version: 1.2.1 '@semantic-release/exec': specifier: ^6.0.3 version: 6.0.3(semantic-release@24.2.0(typescript@5.6.3)) @@ -1053,6 +1059,9 @@ packages: '@iconify-json/bi@1.2.1': resolution: {integrity: sha512-wsIWb6bcnBkfN8/2puIIE2ul6NYVjclbE/nI7JZsPnfzBamd3NuRFstXQH9Ckkbrw9eiBTNKwHbH90w3UE5QIg==} + '@iconify-json/ic@1.2.1': + resolution: {integrity: sha512-UjL/bjJP/T5EV881+hTzcfTKVo0KEUjhnMiJcLtPzNgPtU2KZZmRx8BSKKR61H4CN/5FTEbyawGyG0aEt3SwGQ==} + '@iconify-json/iconoir@1.2.3': resolution: {integrity: sha512-CIPFznjl417Y5zBPqZP4+lhHwdTr7aDenzUOL/z92ufuMoX7SOZbZ8dK9/wNaLwCr+2w+MrxfVKc7zjUj9K0Dg==} @@ -1062,6 +1071,9 @@ packages: '@iconify-json/ri@1.2.3': resolution: {integrity: sha512-UVKofd5xkSevGd5K01pvO4NWsu+2C9spu+GxnMZUYymUiaWmpCAxtd22MFSpm6MGf0MP4GCwhDCo1Q8L8oZ9wg==} + '@iconify-json/streamline@1.2.1': + resolution: {integrity: sha512-hqNodkjyIHBymkFY3zMip0F/D5yw4qXgwMJCaTF3zlbpQMgNJhY3D2ikTFTDVcTHfCSd6EX6enKXj4Rvu+5hnw==} + '@iconify/types@2.0.0': resolution: {integrity: sha512-+wluvCrRhXrhyOmRDJ3q8mux9JkKy5SJ/v8ol2tu4FVjyYvtEzkc/3pK15ET6RKg4b4w4BmTk1+gsCUhf21Ykg==} @@ -2462,6 +2474,7 @@ packages: acorn-import-assertions@1.9.0: resolution: {integrity: sha512-cmMwop9x+8KFhxvKrKfPYmN6/pKTYYHBqLa0DfvVZcKMJWNyWLnaqND7dx/qn66R7ewM1UX5XMaDVP5wlVTaVA==} + deprecated: package has been renamed to acorn-import-attributes peerDependencies: acorn: ^8 @@ -5721,7 +5734,6 @@ packages: engines: {node: '>=0.6.0', teleport: '>=0.2.0'} deprecated: |- You or someone you depend on is using Q, the JavaScript Promise library that gave JavaScript developers strong feelings about promises. They can almost certainly migrate to the native JavaScript promise now. Thank you literally everyone for joining me in this bet against the odds. Be excellent to each other. - (For a CapTP with native promises, see @endo/eventual-send and @endo/captp) queue-microtask@1.2.3: @@ -7536,6 +7548,10 @@ snapshots: dependencies: '@iconify/types': 2.0.0 + '@iconify-json/ic@1.2.1': + dependencies: + '@iconify/types': 2.0.0 + '@iconify-json/iconoir@1.2.3': dependencies: '@iconify/types': 2.0.0 @@ -7548,6 +7564,10 @@ snapshots: dependencies: '@iconify/types': 2.0.0 + '@iconify-json/streamline@1.2.1': + dependencies: + '@iconify/types': 2.0.0 + '@iconify/types@2.0.0': {} '@iconify/utils@2.1.33': diff --git a/src/stories/components/calendar/CalendarHeader.stories.tsx b/src/stories/components/calendar/CalendarHeader.stories.tsx index b9738f22b..b2d2cf26c 100644 --- a/src/stories/components/calendar/CalendarHeader.stories.tsx +++ b/src/stories/components/calendar/CalendarHeader.stories.tsx @@ -1,5 +1,5 @@ import type { Meta, StoryObj } from '@storybook/react'; -import CalendarHeader from '@views/components/calendar/CalenderHeader'; +import CalendarHeader from '@views/components/calendar/CalendarHeader'; const meta = { title: 'Components/Calendar/CalendarHeader', diff --git a/src/views/components/PopupMain.tsx b/src/views/components/PopupMain.tsx index 999999a8e..3b733d398 100644 --- a/src/views/components/PopupMain.tsx +++ b/src/views/components/PopupMain.tsx @@ -187,9 +187,6 @@ export default function PopupMain(): JSX.Element { {enableDataRefreshing && (
- - LAST UPDATED: {getUpdatedAtDateTimeString(activeSchedule.updatedAt)} - {/* */} -
- )}
{enableCourseStatusChips && ( @@ -98,7 +88,7 @@ export default function CalendarHeader({ onSidebarToggle }: CalendarHeaderProps) {/*
); diff --git a/src/views/components/common/ScheduleDropdown.tsx b/src/views/components/common/ScheduleDropdown.tsx index c806478c8..cb28ba137 100644 --- a/src/views/components/common/ScheduleDropdown.tsx +++ b/src/views/components/common/ScheduleDropdown.tsx @@ -27,17 +27,23 @@ export default function ScheduleDropdown(props: ScheduleDropdownProps) { <>
- - {(activeSchedule ? activeSchedule.name : 'Schedule').toUpperCase()}: + + {activeSchedule ? activeSchedule.name : 'Schedule'} -

- - {activeSchedule ? activeSchedule.hours : 0} HOURS - - - {activeSchedule ? activeSchedule.courses.length : 0} Courses - -

+
+
+ {activeSchedule ? activeSchedule.hours : 0} + + {activeSchedule.hours === 1 ? 'Hour' : 'Hours'} + +
+
+ {activeSchedule ? activeSchedule.courses.length : 0} + + {activeSchedule.courses.length === 1 ? 'Course' : 'Courses'} + +
+
{open ? : } diff --git a/src/views/components/common/ScheduleTotalHoursAndCourses.tsx b/src/views/components/common/ScheduleTotalHoursAndCourses.tsx index 671b1a577..af6b509e6 100644 --- a/src/views/components/common/ScheduleTotalHoursAndCourses.tsx +++ b/src/views/components/common/ScheduleTotalHoursAndCourses.tsx @@ -21,16 +21,36 @@ export default function ScheduleTotalHoursAndCourses({ totalCourses, }: ScheduleTotalHoursAndCoursesProps): JSX.Element { return ( -
- - {`${scheduleName}: `} - - - {totalHours} {totalHours === 1 ? 'Hour' : 'Hours'} - - {totalCourses} {totalCourses === 1 ? 'Course' : 'Courses'} - +
+ + {scheduleName} +
+
+ + {totalHours} + + + {totalHours === 1 ? 'Hour' : 'Hours'} + +
+
+ + {totalCourses} + + + {totalCourses === 1 ? 'Course' : 'Courses'} + +
+
); } diff --git a/src/views/components/settings/Settings.tsx b/src/views/components/settings/Settings.tsx index 8ccec15b5..66418853b 100644 --- a/src/views/components/settings/Settings.tsx +++ b/src/views/components/settings/Settings.tsx @@ -421,11 +421,6 @@ export default function Settings(): JSX.Element {
{DISPLAY_PREVIEWS && ( -
- - LAST UPDATED: {getUpdatedAtDateTimeString(activeSchedule.updatedAt)} - -