Compare commits

...

84 Commits

Author SHA1 Message Date
doprz
195d3a219a chore(release): v2.1.1 2025-03-02 21:01:18 -06:00
doprz
c6452c4f2b feat: add isDeveloper 2025-03-02 20:47:31 -06:00
doprz
3dbacf0d65 chore: pin node@20.9.0 (#540) 2025-03-01 12:54:31 -06:00
doprz
56a82baf40 chore: update lock file and set engine to use pnpm v10 (#536)
* chore: update lock file and set engine to use pnpm v10.5.2

* chore: set pnpm version to v10.x.x

* chore(ci): use pnpm v10

* chore: update Dockerfile to use pnpm@latest-10

* chore(ci): use pnpm/action-setup@v4
2025-02-28 22:54:46 -06:00
ishita778
20d210245b chore: rename unscheduled text at calendar footer (#538) 2025-02-28 11:46:19 -06:00
ishita778
21cbcf677a chore: changed text to data source (#537) 2025-02-28 11:07:19 -06:00
Samuel Gunter
8fb355d03b chore(cal): update course schedule links for fall and summer 2025 (#534) 2025-02-27 23:37:38 -06:00
doprz
218477404f feat: map page (#390)
* feat: add boilerplate

* feat: add working paths

* feat: improve building selection controls and add week schedule

Signed-off-by: doprz <52579214+doprz@users.noreply.github.com>

* fix: sort week schedule

Signed-off-by: doprz <52579214+doprz@users.noreply.github.com>

* feat(testing): improve pathfinding

* Revert "feat(testing): improve pathfinding"

This reverts commit 87998cedbf.

* feat: add pathfinding with building selection controls

Signed-off-by: doprz <52579214+doprz@users.noreply.github.com>

* feat: improve path finding algorithm thresholds

* feat: add DaySelector, PathStats, and WeekSchedule components

* feat: add working stats and daily schedule

* chore: refactor everything

* feat: add linear walkway node generation

* feat: add bezier curve walkway node generation

* feat: add circular walkway node generation

* docs: add docs

* feat: add individual path selection and bump version

* fix: tsdoc and updated components/utils

* chore(deps): update deps

* feat: add UTRP Map and Debug Page to Settings > Developer Mode

* chore: fix pr review comments

* chore: add showDebugNodes

* chore: add all buildings around the UT tower

* chore: add stadium POIs

* chore: add east mall buildings

* chore: update DaySelector to use proper button styling

* chore: add university ave walkway

* feat: add zoom, pan, and dev controls functionality

- Fix SVG Overlay Alignment
- Use SVG for map
- Add Dev Controls
- Fix day selector position
- Update the SVG's `preserveAspectRatio` attribute to `xMidYMid` meet to
ensure proper scaling
- Use `useCallback` for event handlers to prevent unnecessary re-renders
- Remove old PNG map

* feat: add dynamic rendering"

* feat: add dynamicRendering dev toggle and fullscreen support

* chore: update deps

* chore: disable viewport svg overlay culling if dynamic rendering is off

* chore: update pnpm-lock.yaml

* chore: add north mall buildings

* chore: add buildings next to JES

* refactor: map components into individual files

* fix: missing import

---------

Signed-off-by: doprz <52579214+doprz@users.noreply.github.com>
2025-02-27 19:44:03 -06:00
Ethan Lanting
766c0bc1b4 fix: import schedule file upload button (#515)
* fix: add active scale style and accept file prop

* chore: improve type safety using MIMEType

* fix: update FileUpload component to support multiple MIME types in accept prop

* chore: run lint

---------

Co-authored-by: doprz <52579214+doprz@users.noreply.github.com>
2025-02-24 20:17:49 -06:00
Samuel Gunter
4a8d0666c2 chore: update grades as of fall 2024 (#508) 2025-02-21 16:09:53 -06:00
doprz
8fac10a743 chore(release): v2.1.0 2025-02-19 19:39:25 -06:00
doprz
1aa4e8c5fb feat(build): add vite-build-logger (#507)
* feat(build): add vite-build-logger

* chore: fix types

* chore: fix logic

---------

Co-authored-by: Preston-Cook <preston.l.cook@gmail.com>
2025-02-15 00:05:56 -06:00
Preston Cook
ee4c6ce699 feat(ui): update popup and course blocks (#506)
* feat(ui): add time and location to popup

* feat(ui): memoize meeting times

* feat(ui): remove resizing

* feat(ui): add no select to copy course id button

* feat(ui): complete update to popup and course blocks

* chore: update settings page

* chore: fix types

* fix(ui): update spacing, padding, and remove last updated section

* chore: fix type issues

* fix(ui): update borders to offwhite/50

* fix(ui): apply proper offwhite styling

* fix(ui): add unique key to async courses in bottom bar
2025-02-13 18:07:05 -06:00
Ethan Lanting
b171f01d01 feat(ui): Modify Calendar Footer design and Unscheduled courses (#503)
* feat: update styling and text for unscheduled courses in footer

* refactor: correct offwhite theme colors

* fix(ui): adjust em dash spacing, footer bottom padding, and vertically align course text

---------

Co-authored-by: doprz <52579214+doprz@users.noreply.github.com>
2025-02-13 13:09:40 -06:00
Preston Cook
846070ebb5 fix(ui): stop import button dropdown from squishing (#504) 2025-02-07 20:52:03 -06:00
Preston Cook
9c766c2695 feat(ui): calendar header redesign (#479)
* feat(ui): calendar header redesign (WIP)

* feat(ui): calendar header redesign (WIP)

* chore: use path alias

* feat(ui): calendar header redesign

* implement Isaiah changes

* refactor to prevent unnecessary recreations of resize observer

* clean up resize observer and remove unnecessary checks

* remove offwhite border from toolbar

* merge

* complete toolbar

* update screenreader functionality

* ensure truncation works

* merge

* finish new toolbar

* remove unused screen size hook and .mjs file

* add in export button with options

* add static size for export button dropdown to prevent shrinking on smaller viewports

* change schedule section min width to prevent shrinkage

* change text for schedule section to match small caps

* fix truncating issues with small caps

* remove hidden overflow

* add padding

* add min height for hader

* reserve scrollbar width

* tmp

* add sticky positioning to header

* fix inert prop issue

* remove pnpm lock file

* fix scrollbar appearing too early

* fix vertical stickiness

* fix(ui): fix header spacing

* fix(ui): update total hours and courses to be h4

* fix(ui): reduce top spacing on header

* fix(ui): remove header top padding

* fix(ui): stop bottom scrollbar from shifting layout

* feat: add functionality to header and fix screenshot spacing

* feat: add functionality to header and fix screenshot spacing

* fix(ui): allow scrollbar in header and adjust padding to compensate for reserved space

* fix(ui): make export options container hug children

* fix(ui): add offwhite border

* chore: add back lock file from main branch :)

* feat(ui): add reduced motion for accessability

* feat(ui): change right scrollbar on calendar grid to be hidden when not necessary

* chore: make all buttons except export invisible

* chore: remove all buttons except export and adjust hardcoded pixel widths for responsiveness

---------

Co-authored-by: doprz <52579214+doprz@users.noreply.github.com>
Co-authored-by: Razboy20 <razboy20@gmail.com>
2025-02-05 23:53:16 -06:00
Preston Cook
4752f5860a fix(ui): fix longstanding drag-and-drop duplication issue (#502)
* fix(ui): fixed color switching on list reordering

* chore: remove lock file

* chore: add back lock file

* feat(ui): fix color duplication issue and prevent scrolling beyond parent

* feat(ui): add to storybook

* fix(ui): remove white background while dragging

* chore: remove dnd pangea from package.json

* chore: rebuild lock file

* chore: remove nested li element issue

* fix(ui): allow grabbing cursor while dragging

* fix(ui): address chromatic errors

* fix(ui): address chromatic errors

* fix(ui): address linting issues and pass tests

* fix(ui): create hook for modifying the cursor globally

* chore: add check for storybook env

* chore: add back unused import to AddAllButton

* fix: make cursor grabbing hook more explicit

* chore: move sortable list item into sortable list file

* fix: remove isStorybook prop from ScheduleListItem

---------

Co-authored-by: doprz <52579214+doprz@users.noreply.github.com>
2025-02-04 17:28:54 -06:00
Ethan Lanting
c2328e461e feat(ui): color picker final touches (#491)
* fix: update CourseCellColorPicker.tsx background to white

* feat: add color picker to CalendarCourseCell component

* feat: add color picker functionality to update course colors

* fix: type issues with storybook components

* feat: add useColorPicker hook, isValidHexColor and updateCourseColors utilities

* refactor: color picker logic and UI components

* refactor: update useFlattenedCourseSchedule hook to include courseID property

* refactor: update storybook calendar components with updated props

* refactor: update color picker ui logic to account for position of cell

* fix: revert back to error handling for invalid rgb

* refactor: update jsdocs

* refactor: integrate ColorPickerContext into Calendar components and update props

* refactor: integrate ColorPickerContext into Calendar components and update related props

* refactor: change JSDocs comments and remove unused color inversion state

* refactor: update story components

* feat: add functionality for selecting secondary course colors

* refactor: enhance HexColorEditor to dynamically adjust tag icon color based on preview color

* refactor: simplify JSDoc comment in useColorPicker hook

* fix: revert Button component

* refactor: update CalendarCourseCell component positioning and styling

* fix: correct types in color.ts

* feat: add getDarkerShade function to compute darker shades of hex colors

* feat: add shadow to color picker button

* fix: update button size in ColorPatch component

* feat: implement debounced input for hex color editor and add useDebounce hook

* chore: utilize the logical and && operator instead of the ternary operator

* fix: imports and palette icon

* refactor: remove unused import

* fix: bug when course add fails with custom colors

* chore: run lint

* chore: run check-types

* feat: add HSL color type and conversion functions

* refactor: rename colorway to theme

* fix: hide color picker on screenshot

* fix: undo important syntax

* refactor: rename SomeFunction to DebouncedCallback

* refactor: remove inner function

* refactor: update return type to DebouncedCallback

* fix: adjust sizes for hash and palette button

* feat: create tests for hexToHSL and isValidHexColor

* refactor: update parameter type to use HexColor

* fix: increase size of palette button

* fix: update dependency array for hex code debounce

* fix: change colorPickerRef element ref

* feat: add Roboto Mono font

* fix: update input class to use monospace font

* feat: add getLighterShade function

* chore: run prettier and lint

* feat: synchronize local hex code with hexCode prop changes

---------

Co-authored-by: doprz <52579214+doprz@users.noreply.github.com>
2025-01-29 20:32:06 -06:00
doprz
aa29bcf9fe feat: update SWE list 2025-01-27 19:39:59 -06:00
Preston Cook
f0b257aa12 feat(ui): add schedule list icons (#500) 2025-01-25 20:10:40 -06:00
Abdulrahman Alshahrani
93733e3721 feat: add open calendar button (#457)
* feat: add open calendar button

* fix: replace function to open calendar page

* fix: make open calendar function a one-liner

* fix: import correct calendar icon

---------

Co-authored-by: doprz <52579214+doprz@users.noreply.github.com>
2025-01-24 21:27:53 -06:00
Ethan L
501f506677 feat(ui): course unique number copy button (#490)
* feat: add copy icon for course unique ID

* feat: update Button component to support event parameter in onClick handler

* feat: add copy functionality for course unique ID

* refactor: use Text component instead of span

* fix: remove duplicate course number

* fix: remove unnecessary event forwarding

* fix: remove unnecessary boolean type

Co-authored-by: Samuel Gunter <29130894+Samathingamajig@users.noreply.github.com>

* fix: remove double space

Co-authored-by: Samuel Gunter <29130894+Samathingamajig@users.noreply.github.com>

* refactor: reduce clipboard copy delay and use formatted unique ID

* feat: add copy animation to dialog

---------

Co-authored-by: Samuel Gunter <29130894+Samathingamajig@users.noreply.github.com>
Co-authored-by: doprz <52579214+doprz@users.noreply.github.com>
Co-authored-by: nikshitak <nikkikurva@gmail.com>
2025-01-21 00:02:00 -06:00
Samuel Gunter
009de62828 feat(settings): add option to always open calendar in new tab (#488)
* feat(settings): add option to always open calendar in new tab

* fix: await setting

---------

Co-authored-by: doprz <52579214+doprz@users.noreply.github.com>
2025-01-20 23:18:00 -06:00
Samuel Gunter
b74c698866 feat(settings): allow disabling of auto-loading courses (#489) 2025-01-20 23:04:14 -06:00
cd05e5e7fc feat: validate login passed to background and implemented into add all injected button (#443)
* docs: proper captializing

* docs: confirmed that the for loop is entered but on first startup something else

* feat: turns out - validate login status - not in background - pass background now

* feat: kronk.gif

* Update UserScheduleMessages.ts

* Update addCourseByURL.ts

* chore: format

* chore: chore

---------

Co-authored-by: doprz <52579214+doprz@users.noreply.github.com>
2025-01-20 18:42:15 -06:00
doprz
f425510e11 docs: add repobeats and star history (#487)
* docs: add repobeats and star history

* chore: update alt
2025-01-20 18:21:32 -06:00
Ethan
1f635d2515 feat(ui): course color picker (#382)
* fix: update CourseCellColorPicker.tsx background to white

* feat: add color picker to CalendarCourseCell component

* feat: add color picker functionality to update course colors

* fix: type issues with storybook components

* feat: add useColorPicker hook, isValidHexColor and updateCourseColors utilities

* refactor: color picker logic and UI components

* refactor: update useFlattenedCourseSchedule hook to include courseID property

* refactor: update storybook calendar components with updated props

* refactor: update color picker ui logic to account for position of cell

* fix: revert back to error handling for invalid rgb

* refactor: update jsdocs

* refactor: integrate ColorPickerContext into Calendar components and update props

* refactor: integrate ColorPickerContext into Calendar components and update related props

* refactor: change JSDocs comments and remove unused color inversion state

* refactor: update story components

* feat: add functionality for selecting secondary course colors

* refactor: enhance HexColorEditor to dynamically adjust tag icon color based on preview color

* refactor: simplify JSDoc comment in useColorPicker hook

* fix: revert Button component

* refactor: update CalendarCourseCell component positioning and styling

* fix: correct types in color.ts

* feat: add getDarkerShade function to compute darker shades of hex colors

* feat: add shadow to color picker button

* fix: update button size in ColorPatch component

* feat: implement debounced input for hex color editor and add useDebounce hook

* chore: utilize the logical and && operator instead of the ternary operator

* fix: imports and palette icon

* refactor: remove unused import

* fix: bug when course add fails with custom colors

* chore: run lint

* chore: run check-types

* feat: add HSL color type and conversion functions

* refactor: rename colorway to theme

* fix: hide color picker on screenshot

* fix: undo important syntax

* refactor: rename SomeFunction to DebouncedCallback

* refactor: remove inner function

* refactor: update return type to DebouncedCallback

* fix: adjust sizes for hash and palette button

* feat: create tests for hexToHSL and isValidHexColor

* refactor: update parameter type to use HexColor

* fix: increase size of palette button

* fix: update dependency array for hex code debounce

* fix: change colorPickerRef element ref

---------

Co-authored-by: doprz <52579214+doprz@users.noreply.github.com>
2025-01-20 17:48:52 -06:00
Abdulrahman Alshahrani
a61bddf0e8 feat(ui): redesign grade distribution tooltip (#485)
* feat(ui): redesign grade distribution tooltip

* chore: prettier

* fix: use theme color for graph background

---------

Co-authored-by: Derek Chen <derex1987@gmail.com>
Co-authored-by: doprz <52579214+doprz@users.noreply.github.com>
2025-01-20 13:03:06 -06:00
Ethan
843cb5b443 feat(ui): calendar sidebar redesign (#464)
* feat: update calendar sidebar, footer, and header with Figma design

* chore: run lint

* feat: update header with Figma design

* chore: run lint

* chore: remove unused vars

* chore: fix types

* fix: adjust sidebar minimum width

* fix: update LogoIcon layout to ensure text is always displayed

* feat: add spacing constants

* fix: add sidebar styling with spacing system and sticky header

* fix: update spacing constants to use rem units

* refactor: replace padding with spacing system and colors with UTRP theme

* refactor: rename ImportantLinks to ResourceLinks

* refactor: simplify CalendarHeader button component by using icon prop

* feat: add sidebar open and close transition

* refactor: rename unused var

* fix: update social icon color

* feat: improve layout and spacing in calendar components

* refactor: remove unused GearSix icon and options handler

* feat: update calendar components with new icons and improved spacing

* fix: correct class name

* refactor: organize social links into array and update link styling

* refactor: remove unused import

* fix: adjust gap spacing in radio button

* fix: update divider component to use theme offwhite1

* fix: increase size of outward arrow icon

* feat: add getSpacingInPx function to convert rem to pixels

* fix: update gap spacing in CalendarSchedules component to use spacing system

* fix: rollback footer social icons to original icons

* fix: update Calendar styles to use theme offwhite1 and adjust padding to account for scrollbar

* fix: update LargeLogo component to use gap-spacing-3

* fix: update button variants to 'minimal' and adjust styles for consistency

* fix: adjust padding in Calendar component for better layout consistency

* fix: increase size of arrow icon

* fix: add shrink-0 to radio buttons
2025-01-19 18:34:20 -06:00
Aaron Chen
52347fd56d feat(ui): change red text when instructor not found (#483)
* feat(ui): change red text when instructor not found

* feat(ui): fix wrong &apos; usage

* feat(ui): changed/shortened text

* feat(ui): update text, get rid of formatting

* feat(ui): removed unintentional H character from testing

* feat(ui): add space

---------

Co-authored-by: doprz <52579214+doprz@users.noreply.github.com>
2025-01-18 22:58:30 -06:00
Aaron Chen
a20332e53d feat(ui): added shadows to popup buttons and course blocks (#378)
* feat(ui): added shadows to popup buttons and course blocks

* feat(ui): keep shadow state while dragging course block

* feat(ui): fixed transition "flash" after dragging

* feat(ui): fix linting/styling

* Update src/views/components/PopupMain.tsx

Co-authored-by: Samuel Gunter <29130894+Samathingamajig@users.noreply.github.com>

* fix(ui): change old icons to the new ones from main

* fix(ui): show flag icon instead of plus icon for feedback

* chore: fix button variants after merge

---------

Co-authored-by: doprz <52579214+doprz@users.noreply.github.com>
Co-authored-by: Samuel Gunter <29130894+Samathingamajig@users.noreply.github.com>
Co-authored-by: Samuel Gunter <sgunter@utexas.edu>
2025-01-08 02:20:10 -06:00
Preston Cook
0aa469af81 feat(ui): update button variants following figma (#482)
* feat(ui): update button variants following figma

* feat(ui): separate size prop to allow for regular and small sized button variants

* update type to no longer include minimal-small

* update uno css config to use new spacing system

* add variants and sizes to file upload; update button and file upload stories

* add mini button variant and update small button

* specify width on icon-only regular variant

* update plus buttons to be mini sizes

* remove redundant classnames

---------

Co-authored-by: doprz <52579214+doprz@users.noreply.github.com>
2025-01-07 14:59:15 -06:00
Preston Cook
0d73b13b28 feat(ui): update theme colors #466 (#473)
* feat(ui): update theme colors

* remove kebab-casing from all colors

* remove ut-concrete and replace concrete with ut-gray throughout app

* feat(ui): update staticutrpblack to staticblack

---------

Co-authored-by: doprz <52579214+doprz@users.noreply.github.com>
2025-01-02 20:23:40 -06:00
Long Phan
24256798ba fix: 4th attempt for: now able to delete schedule even if active (#435)
* fix: 2nd attempt for: now able to delete schedule even if active

* fix: 3rd attempt for: now able to delete schedule even if active

* fix: 4th attempt for: now able to delete schedule even if active

---------

Co-authored-by: doprz <52579214+doprz@users.noreply.github.com>
2025-01-02 12:31:41 -06:00
Ethan
e61ab565c3 feat: add spacing system (#474)
* feat: add spacing system

* refactor: update spacing naming

* chore: add leading 0

---------

Co-authored-by: doprz <52579214+doprz@users.noreply.github.com>
2025-01-01 22:12:00 -06:00
Samuel Gunter
9cbcfa4720 chore: migrate to new scss import syntax (#478)
Co-authored-by: Long Phan <75595656+Wizardbacon13@users.noreply.github.com>
2024-12-31 20:43:40 -06:00
doprz
c712fc741e chore: remove typo (#476)
Remove "hello" from "I Understand" button
2024-12-31 15:17:00 -06:00
Abdulrahman Alshahrani
ca5e4c13d3 feat: add 'new search' link to the course catalog page (#456)
Co-authored-by: doprz <52579214+doprz@users.noreply.github.com>
2024-12-31 13:44:16 -06:00
Preston Cook
37bd7e79d9 feat(ui): change icons to phosphor-icons #467 (#469)
* change icons to phosphor-icons

* feat(ui): change icons to phosphor-icons

* feat(ui): change icons to phosphor-icons

* feat(ui): correct icon sizes, weights, and colors

* feat(ui): change arrow-up-right sizes to 16px
2024-12-31 13:36:08 -06:00
Ethan
918f4e419c feat: update text styles (#468)
Fixes #465
2024-12-28 14:21:58 -06:00
3abb11734a refactor: change a file name (#447)
* refactor: file upload component

* refactor: changed name of a function and added a new line
2024-11-23 00:14:49 -06:00
doprz
a5e921fd75 feat(build): add Docker support (#322)
* feat(build): add Docker support

* fix: pnpm patches

* chore: update readme

* chore: refactor Docker section into separate markdown file

* chore: remove polling and host 0.0.0.0

* feat: add .dockerignore

* feat: update .dockerignore
2024-11-21 22:41:52 -06:00
Warith Rahman
7dd93690d6 fix: place hours and courses under schedule name (#388)
* fix(header): bottom-aligned the schedule name + hours/courses in calendar

* feat: updated font style in header and dropdown

* fix: new hour/course styling per discussion

i love having 80 different ideas, hopefully after this there's like maybe a tiny commit left to do before this is done..

* feat(header): added icons to cal header

WORK IN PROGRESS

* style: updated layout of header and main popup

* fix: updated font and spacing for header and popup

* fix: updated cal + popup style details
- schedule title is now in normal casing w/ colon removed
- last updated on is now entirely deleted from everywhere
- hour and course numbers now h3 in calendar ONLY

* refactor: changed size for calendar header

* refactor: changed ut-black to theme-black

* refactor: remove hiding on small window sizes

* refactor: reduced spacing in popup

* refactor: updated unocss for small-caps configuration

* style: changed variant + className order

* fix: readded update time text

* style: auto formatter, unused imports, capitalization

---------

Co-authored-by: Razboy20 <razboy20@gmail.com>
Co-authored-by: Samuel Gunter <sgunter@utexas.edu>
Co-authored-by: doprz <52579214+doprz@users.noreply.github.com>
2024-11-21 20:56:56 -06:00
7dbffc6eef feat: export/import functionality (backup/restore/share with friends) + a new input component (#433)
* feat: export schedule function to be added to handler

* feat: use UserScheduleStore and return json

* feat: download functionality

* feat: oh wow we already have a blob download util that is very very nice

* feat: return empty json if none found

* feat: import function completion

* feat: file uploading done

* feat: new input component-stories made-settings input replaced with component

* feat: attempt 1 to hook settings.tsx to importSchedule

* feat: it works horray aka using right Course constructor it works

* chore: fix jsdoc

* chore: comments and debug style

* docs: extra comment

* feat: name of schedule more user friendly

* feat: reworked how schedule is passed and check for file being schedule

* feat: color is kept on import

* fix: add sendResponse to exportSchedule

---------

Co-authored-by: doprz <52579214+doprz@users.noreply.github.com>
2024-11-21 12:55:48 -06:00
Samuel Gunter
8b922082a7 fix: instructor formatting errors (#425)
* fix: instructor formatting errors

* refactor: simplify logic in Instructor toString, remove unused formatters

* refactor: remove "unnecessary" else's after returns

I think it looks worse like this but whatever
2024-11-19 19:28:38 -06:00
Sean Sy
19e3838df2 Merge pull request #440
* style(ui): changed tick marks to match x-axis
2024-11-19 11:28:38 -06:00
25e3ba1ed4 docs: remove redundant sentence in readme (#439)
* Update README.md

Removed redundant line

* chore: add newline

---------

Co-authored-by: doprz <52579214+doprz@users.noreply.github.com>
2024-11-17 23:02:44 -06:00
ali v
598bafe67f fix: transition added (#381) 2024-11-16 19:37:42 -06:00
ali v
ebcc0aa76a fix: updated text when time/location not provided (#289)
* fix: updated text when time/location not provided

* fix(issue): fixed text when time/loc isn't provided

* chore: lint and format

* fix: created location&time component

* fix: renamed component & restructured component

* chore: fix lint

* fix: variety of issues within DisplayMeetingInfo component

* fix: fixed lint error

* fix: ran prettier

* chore: locationInfo usage

* chore: cleanup

* fix: removed periods and added online info

* fix: wrapped in div to remove space

* fix: space now shows properly

* fix: spacing fixed

* chore: remove types from jsdoc

* fix: extra arg

* chore: fix lint

---------

Co-authored-by: doprz <52579214+doprz@users.noreply.github.com>
Co-authored-by: Razboy20 <razboy20@gmail.com>
2024-11-16 15:11:30 -06:00
doprz
e987fbbe8e feat: add eslint-plugin-tsdoc (#430)
* feat: add eslint-plugin-tsdoc

* feat(doc): update current jsdoc to tsdoc specification

* chore: update deps

* feat: update warn to error for jsdoc and tsdoc

* chore(doc): lint
2024-11-16 00:20:36 -06:00
c41467c617 feat: injected button - add all courses from MyUT AND passing URL to handler (#291)
* feat: first button attempt

* feat: fetching each course code

* feat: adding courses function from there but idk where to get the active schedule from

* docs: todo

* feat: retrieved active schedule

* feat: button tactics

* feat: add support for my.utexas.edu

* feat: inject button into MyUT

* feat: refactor code to render components dynamically based on site

* feat: scrape course ids from MyUT and remove duplicates

* feat: site support links for classlist

* feat: add utility function to add course by URL

* feat: support additional case for course cal

* feat: duplicates

* chore: cleanup

* feat: temporary checkpoint

* feat: reroute to use new add course by url

* feat: linking to new function, cleaning up, adding messaging for course url add

* chore: unused import

* feat: relinking addCourse function to the button fingers crossed

* feat: we did it!

* chore: remove comment

* chore: cleanup cleanup

* feat: tried to handle the async stuff because of that small bug but nothing fixed. doesnt hurt tho

* feat: i have fixed it holy kevinnn

* chore: delete unused file and organization

* chore: removed unused log

* feat: better log for course add

* chore: refactor via data destructuring

* chore: pass component as prop via React.ComponentType

---------

Co-authored-by: Ethan Lanting <ethanlanting@gmail.com>
Co-authored-by: doprz <52579214+doprz@users.noreply.github.com>
2024-11-15 19:07:37 -06:00
Abdulrahman Alshahrani
9ad32390d1 feat: add explanation to grade distribution (#325)
* feat: add 'About the data' link to grade distribution chart

* chore: change the About the data text style/variant to small

---------

Co-authored-by: doprz <52579214+doprz@users.noreply.github.com>
2024-11-15 14:54:19 -06:00
Tony Dinh
0d51cae4c8 feat: modify Course Block text style and time and location text (#409) 2024-11-15 13:43:41 -06:00
Aaron Chen
91fa78e2d0 fix(ui): reduce left side grade distribution margin/padding (#427)
* fix(ui): align left margin of grade distribution

* fix(ui): remove accidental linewidth change (not relevant to this pr)
2024-11-15 13:13:37 -06:00
doprz
b13e217a5b chore: remove extra package 2024-11-14 20:16:38 -06:00
Kabir Ramzan
b732a80eaa feat: add CacheStore for GitHub stats and use names instead of usernames (#405)
* feat: add CacheStore for GitHub stats and use names instead of usernames

* fix: only cache name for successful API queries

* chore: linting

* chore: refactor any with unknown and add jsdocs

* fix: use cached endpoint to avoid rate limiting issues

* fix: code style

* chore: add type assertion

* fix: use correct type

* Revert "fix: use correct type"

This reverts commit 74956c12f3.

* fix: use correct type

* fix: use URL Web API

* fix: add CONTRIBUTORS_API_ROUTE constant

---------

Co-authored-by: Derek Chen <derex1987@gmail.com>
Co-authored-by: doprz <52579214+doprz@users.noreply.github.com>
2024-11-13 12:01:20 -06:00
doprz
46c76b1703 feat: add 404 page (#426)
* feat: add 404 page

* chore: lint and format

* fix: remove extra line
2024-11-12 21:57:59 -06:00
doprz
db04bbb52e feat(build): refactor gulpfile to use gulp-execa (#323)
* feat(build): refactor gulpfile to use gulp-execa

* chore: fix PR comments

* chore(deps): update deps
2024-11-10 19:23:19 -06:00
Isaiah David Rodriguez
e425daf041 chore: update issue templates (#327)
* Update issue templates

* feat: refactor bug and feature issue templates

---------

Co-authored-by: doprz <52579214+doprz@users.noreply.github.com>
2024-11-05 18:32:58 -06:00
doprz
93548627a6 chore: bump v2.0.2 2024-11-04 18:15:09 -06:00
suhas
638ee88c96 feat: bold course number in grade distribution chart, change text to ut-black (#406)
* feat: bold course number in grade distribution chart, change text to text-ut-black

* fix: use !important instead of manual style

Co-authored-by: Samuel Gunter <29130894+Samathingamajig@users.noreply.github.com>

* fix: use tailwind classname instead of manual font weight

Co-authored-by: Samuel Gunter <29130894+Samathingamajig@users.noreply.github.com>

---------

Co-authored-by: Samuel Gunter <29130894+Samathingamajig@users.noreply.github.com>
2024-11-04 15:38:51 -06:00
adityamkk
50e88fa015 fix(ui): multiple instructors are formatted properly, displays last name only, and are capitalized in all course blocks (#342) (#403)
* fix(ui): updated multiple instructor name formatting in course blocks

* fix(ui): display instructor last names only in all course blocks

* refactor: use instructor toString when getting instructor full name

* refactor: toString in useFlattenedCourseSchedule without template literal

Co-authored-by: Samuel Gunter <29130894+Samathingamajig@users.noreply.github.com>

* refactor: delete type hint and unnecessary comments

* fix(ui): instructor names semicolon delimiter in calendar course block

* fix(ui): removed 'unknown' when there are no instructors

* fix(ui): change - to &ndash

* fix(ui): changed - to ndash in hook

---------

Co-authored-by: Samuel Gunter <29130894+Samathingamajig@users.noreply.github.com>
2024-10-29 16:07:26 -05:00
adityamkk
b3ae91d8f3 fix(ui): placeholder text for no instructor course #400 (#402)
* fix(ui): placeholder text for no instructor course #400

* Update src/views/components/injected/CourseCatalogInjectedPopup/HeadingAndActions.tsx

Co-authored-by: Samuel Gunter <sgunter@utexas.edu>

---------

Co-authored-by: Samuel Gunter <sgunter@utexas.edu>
2024-10-29 12:12:51 -05:00
shehreenr
0077ae70d2 feat(ui): changed popup close icon to ut-black (#394)
* feat(ui): changed popup close icon to #333F48

* feat(ui): ran prettier

* feat(ui): changed hex code to ut-black

* feat(ui): change popup close button color

* feat(ui): got rid of extra space
2024-10-29 12:06:56 -05:00
Kabir Ramzan
94744e01b9 feat: use "copy of" for duplicated schedules and place them under the original schedule #358 (#397)
* feat: use "copy of" for duplicated schedules and place them under the original schedule #358

* fix: code style and consistency
2024-10-28 17:56:02 -05:00
Rishthegreat
8de88d6ad7 fix(ui): main popup now shows 0 for empty schedule (#395) 2024-10-27 17:11:51 -05:00
Razboy20
2d0804f90e fix: sentry issues (#389) 2024-10-23 14:15:47 -05:00
Samuel Gunter
d3577358d0 fix: typo in settings page (#386) 2024-10-22 23:23:06 -05:00
adityamkk
7346720894 fix(ui): duplicate schedule warning (#295)
* fix(ui): duplicate schedule warning

* fix(ui): duplicate schedule warning

* fix(ui): duplicate schedules

* fix(ui): schedule limit loophole refactored

* fix(ui): schedule bypass hooks

* fix(ui): useEnforceScheduleLimit hook created

* fix(ui): added useCallback to hook

* fix(ui): updated jsdoc comment on hook

* fix(ui): updated jsdoc comments on hook
2024-10-22 23:10:54 -05:00
Aditya Angajala
b00bf6c180 fix: change schedule total courses text color to UTRP black (#369) 2024-10-22 22:11:48 -05:00
Samuel Gunter
eb306787ae chore: fix lint warnings (#385) 2024-10-22 21:47:35 -05:00
Tony Dinh
643ea13207 feat: add more relevant links to the From the Team section (#380)
* feat: add more relevant links to the From the Team section

* feat: add CRXPages.ts

* chore: update to TS 4.9 satisfies

---------

Co-authored-by: doprz <52579214+doprz@users.noreply.github.com>
2024-10-22 17:17:12 -05:00
suhas
6f1afc5b25 feat: add core curriculum chips to injected popup (#372)
* feat: add core curriculum chips to injected popup

* fix: add VP and MAcore indicators

* feat: core now defined in constructor

* fix: make core and flags closer together

* fix: stop empty core chip from showing when no core requirements

* fix: remove optional chaining for core chips

* feat: generalize Chip for both flags and core classes

* fix: change types for storybook and add new story for CoreChip

* fix: remove labelMap prop from Chip, chore: clean up imports

* feat: change tooltip for core curriculum requirement

---------

Co-authored-by: Derek Chen <derex1987@gmail.com>
2024-10-22 16:15:27 -05:00
Brianna-Flo
83d76f72da chore: One red color of #D10000 (#377)
* chore: change UTRP red color

* chore: change UTRP Red

* chore: change red update

* chore: utrp red, consistent capitalization

---------

Co-authored-by: Samuel Gunter <sgunter@utexas.edu>
2024-10-22 16:00:14 -05:00
Preston Cook
768ac776ed fix: remove screenshot padding class for png download for #344 (#376)
Fixes #334
2024-10-22 00:11:28 -05:00
Brianna-Flo
9995b93d2a chore: change UTRP red color (#373) 2024-10-21 22:23:10 -05:00
Long Phan
4f609aeec7 fix: changed the font-weight of h1-course (#370)
Fixes #347
2024-10-21 22:20:21 -05:00
Parth
b6eccaca6a feat: Add linkedin social to calendar (#368)
* feat: update calendar footer with kibedjkib

* fix: made it prettier

* Update src/views/components/calendar/CalendarFooter.tsx

Co-authored-by: Samuel Gunter <sgunter@utexas.edu>

---------

Co-authored-by: Samuel Gunter <sgunter@utexas.edu>
2024-10-21 22:16:55 -05:00
Warith Rahman
cef99c2d72 feat: update useful links (#367)
added and rearranged links on calendar sidebar
2024-10-21 19:13:11 -05:00
Yahya Kousa
86792eb56f fix(ui): add space before/after forward slash in "ASYNC/OTHER" text (#366)
* fix(ui): add space before/after forward slash in "ASYNC./OTHER" text

* fix(ui): add space before/after forward slash in "ASYNC./OTHER" text
2024-10-21 19:01:09 -05:00
Preston Cook
a715bbd933 fix: added descending sort for commits on contributor section in settings page (#365)
* fix: bug fix to address issue #363

* fix: bug fix to address issue #363

* fix: bug fix to sort LONGHORN_SWE constant

* fix: fix to sort LONGHORN_SWE constant

Resolves #363
2024-10-21 16:24:09 -05:00
Ethan
c2007ef090 fix: ensure input elements take full width of parent (#364) 2024-10-21 14:35:34 -05:00
doprz
b967240f8f feat: update senior swe admins (#326) 2024-10-18 22:17:47 -05:00
Samuel Gunter
839f9c6d6a feat: disable/some actions when no instructor (#319) 2024-10-17 12:03:57 -05:00
174 changed files with 19250 additions and 5536 deletions

242
.dockerignore Normal file
View File

@@ -0,0 +1,242 @@
# File created using '.gitignore Generator' for Visual Studio Code: https://bit.ly/vscode-gig
# Created by https://www.toptal.com/developers/gitignore/api/visualstudiocode,macos,node,react,storybookjs
# Edit at https://www.toptal.com/developers/gitignore?templates=visualstudiocode,macos,node,react,storybookjs
### macOS ###
# General
.DS_Store
.AppleDouble
.LSOverride
# Thumbnails
._*
# Files that might appear in the root of a volume
.DocumentRevisions-V100
.fseventsd
.Spotlight-V100
.TemporaryItems
.Trashes
.VolumeIcon.icns
.com.apple.timemachine.donotpresent
# Directories potentially created on remote AFP share
.AppleDB
.AppleDesktop
Network Trash Folder
Temporary Items
.apdisk
### macOS Patch ###
# iCloud generated files
*.icloud
### Node ###
# Logs
logs
*.log
npm-debug.log*
yarn-debug.log*
yarn-error.log*
lerna-debug.log*
.pnpm-debug.log*
# Diagnostic reports (https://nodejs.org/api/report.html)
report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json
# Runtime data
pids
*.pid
*.seed
*.pid.lock
# Directory for instrumented libs generated by jscoverage/JSCover
lib-cov
# Coverage directory used by tools like istanbul
coverage
*.lcov
# nyc test coverage
.nyc_output
# Grunt intermediate storage (https://gruntjs.com/creating-plugins#storing-task-files)
.grunt
# Bower dependency directory (https://bower.io/)
bower_components
# node-waf configuration
.lock-wscript
# Compiled binary addons (https://nodejs.org/api/addons.html)
build
# Dependency directories
node_modules/
jspm_packages/
# Snowpack dependency directory (https://snowpack.dev/)
web_modules/
# TypeScript cache
*.tsbuildinfo
# Optional npm cache directory
.npm
# Optional eslint cache
.eslintcache
# Optional stylelint cache
.stylelintcache
# Microbundle cache
.rpt2_cache/
.rts2_cache_cjs/
.rts2_cache_es/
.rts2_cache_umd/
# Optional REPL history
.node_repl_history
# Output of 'npm pack'
*.tgz
# Yarn Integrity file
.yarn-integrity
# dotenv environment variable files
.env
.env.development.local
.env.test.local
.env.production.local
.env.local
.env.*
!.env.example
# parcel-bundler cache (https://parceljs.org/)
.cache
.parcel-cache
# Next.js build output
.next
out
# Nuxt.js build / generate output
.nuxt
dist
# Gatsby files
.cache/
# Comment in the public line in if your project uses Gatsby and not Next.js
# https://nextjs.org/blog/next-9-1#public-directory-support
# public
# vuepress build output
.vuepress/dist
# vuepress v2.x temp and cache directory
.temp
# Docusaurus cache and generated files
.docusaurus
# Serverless directories
.serverless/
# FuseBox cache
.fusebox/
# DynamoDB Local files
.dynamodb/
# TernJS port file
.tern-port
# Stores VSCode versions used for testing VSCode extensions
.vscode-te
node_modulesst
# yarn v2
.yarn/cache
.yarn/unplugged
.yarn/build-state.yml
.yarn/install-state.gz
.pnp.*
### Node Patch ###
# Serverless Webpack directories
.webpack/
# Optional stylelint cache
# SvelteKit build / generate output
.svelte-kit
### react ###
.DS_*
**/*.backup.*
**/*.back.*
*.sublime*
psd
thumb
sketch
### VisualStudioCode ###
.vscode/*
!.vscode/settings.json
!.vscode/tasks.json
!.vscode/launch.json
!.vscode/extensions.json
!.vscode/*.code-snippets
# Local History for Visual Studio Code
.history/
# Built Visual Studio Code Extensions
*.vsix
### VisualStudioCode Patch ###
# Ignore all local history of files
.history
.ionide
# End of https://www.toptal.com/developers/gitignore/api/visualstudiocode,macos,node,react,storybookjs
# Custom rules (everything added below won't be overriden by 'Generate .gitignore File' if you use 'Update' option)
package-lock.json
storybook-static/
package/
# Version control
.git
.gitignore
.gitattributes
# Dependencies
.pnpm-store
!pnpm-lock.yaml
# Testing
coverage
.nyc_output
# OS files
.DS_Store
Thumbs.db
# Docker
Dockerfile
.dockerignore
docker-compose*
# Documentation
README.md
CHANGELOG.md
DOCKER_DEV_SETUP.md
docs/

View File

@@ -23,6 +23,7 @@ module.exports = {
'import',
'import-essentials',
'jsdoc',
'eslint-plugin-tsdoc',
'react-prefer-function-component',
'@typescript-eslint',
'simple-import-sort',
@@ -143,7 +144,7 @@ module.exports = {
'jsdoc/newline-after-description': 'off',
'react/require-default-props': 'off',
'jsdoc/require-jsdoc': [
'warn',
'error',
{
enableFixer: false,
publicOnly: true,
@@ -171,8 +172,16 @@ module.exports = {
],
},
],
'tsdoc/syntax': 'error',
'@typescript-eslint/no-explicit-any': 'error',
'@typescript-eslint/no-unused-vars': 'warn',
'@typescript-eslint/no-unused-vars': [
'warn',
{
argsIgnorePattern: '^_',
varsIgnorePattern: '^_',
caughtErrorsIgnorePattern: '^_',
},
],
'@typescript-eslint/naming-convention': 'off',
'@typescript-eslint/space-before-function-paren': 'off',
'@typescript-eslint/ban-ts-comment': 'off',

58
.github/ISSUE_TEMPLATE/bug_report.md vendored Normal file
View File

@@ -0,0 +1,58 @@
---
name: Bug report
about: Create a report to help us improve
title: '[BUG] '
labels: 'bug'
assignees: ''
---
**Pre-submission Checklist**
<!-- Please check all applicable boxes before submitting your issue -->
- [ ] I have searched existing issues to make sure this is not a duplicate
- [ ] I have cleared my browser cache and confirmed the issue persists
- [ ] I have checked this issue affects the latest version of the extension
- [ ] I have disabled other extensions to ensure this isn't a conflict issue
- [ ] I have included all the information requested below
**Bug Description**
<!-- A clear and concise description of what the bug is -->
**Steps To Reproduce**
1. Go to '...'
2. Click on '....'
3. Scroll down to '....'
4. See error
**Expected Behavior**
<!-- A clear and concise description of what you expected to happen -->
**Current Behavior**
<!-- A clear and concise description of what actually happened -->
**Screenshots**
<!-- If applicable, add screenshots to help explain your problem -->
**Debug Information**
- UTRP Extension Version: [e.g. 1.2.0]
- Browser Info: [e.g. Chrome 120.0.0]
- OS: [e.g. Windows 11, macOS Sonoma]
**Console Logs**
<!-- Please check the browser console (F12) and paste any relevant error messages -->
```
// Paste console logs here
```
**Additional Context**
<!-- Add any other context about the problem here -->

View File

@@ -0,0 +1,33 @@
---
name: Feature Request
about: Suggest an idea for this project
title: '[FEATURE] '
labels: 'feature'
assignees: ''
---
**Pre-submission Checklist**
<!-- Please check all applicable boxes before submitting your feature request -->
- [ ] I have searched existing issues to ensure this feature hasn't been requested
- [ ] I have searched closed issues to check if this was previously rejected/implemented
- [ ] I have checked the project roadmap (if available) for planned similar features
- [ ] I have reviewed the documentation to confirm this feature doesn't exist
- [ ] I have completed all sections below with detailed information
**Feature Description**
<!-- A clear and concise description of the feature you'd like to see -->
**Proposed Solution**
<!-- A clear and concise description of what you want to happen -->
**UI/UX Considerations**
<!-- If this feature involves UI changes, please describe the visual aspects -->
**Technical Implementation Details**
<!-- If you have specific technical suggestions, list them here -->

View File

@@ -13,9 +13,9 @@ jobs:
fetch-depth: 0
- name: Setup pnpm
uses: pnpm/action-setup@v3
uses: pnpm/action-setup@v4
with:
version: 9
version: 10
- name: Install dependencies
run: pnpm install
@@ -32,9 +32,9 @@ jobs:
fetch-depth: 0
- name: Setup pnpm
uses: pnpm/action-setup@v3
uses: pnpm/action-setup@v4
with:
version: 9
version: 10
- name: Install dependencies
run: pnpm install

View File

@@ -13,9 +13,9 @@ jobs:
fetch-depth: 0
- name: Setup pnpm
uses: pnpm/action-setup@v3
uses: pnpm/action-setup@v4
with:
version: 9
version: 10
- name: Install dependencies
run: pnpm install

View File

@@ -11,9 +11,9 @@ jobs:
with:
fetch-depth: 0
- name: Setup pnpm
uses: pnpm/action-setup@v3
uses: pnpm/action-setup@v4
with:
version: 9
version: 10
- name: Install dependencies
run: pnpm install

View File

@@ -13,9 +13,9 @@ jobs:
fetch-depth: 0
- name: Setup pnpm
uses: pnpm/action-setup@v3
uses: pnpm/action-setup@v4
with:
version: 9
version: 10
- name: Install dependencies
run: pnpm install

View File

@@ -2,6 +2,7 @@
interface ImportMetaEnv {
readonly VITE_PACKAGE_VERSION: string;
readonly VITE_SENTRY_ENVIRONMENT: string;
readonly VITE_BETA_BUILD?: 'true';
}

View File

@@ -1,3 +1,91 @@
## [2.1.1](https://github.com/Longhorn-Developers/UT-Registration-Plus/compare/v2.1.0...v2.1.1) (2025-03-03)
### Features
- add isDeveloper ([c6452c4](https://github.com/Longhorn-Developers/UT-Registration-Plus/commit/c6452c4f2b174487e6f51ad546ca1c3f8b4dbc1f))
- map page ([#390](https://github.com/Longhorn-Developers/UT-Registration-Plus/issues/390)) ([2184774](https://github.com/Longhorn-Developers/UT-Registration-Plus/commit/218477404fdeacda7b39cd233e4e1e65995935d4))
### Bug Fixes
- import schedule file upload button ([#515](https://github.com/Longhorn-Developers/UT-Registration-Plus/issues/515)) ([766c0bc](https://github.com/Longhorn-Developers/UT-Registration-Plus/commit/766c0bc1b4a75f8146a922cb2eca8871032c1dc9))
## [2.1.0](https://github.com/Longhorn-Developers/UT-Registration-Plus/compare/v2.0.2...v2.1.0) (2025-02-20)
### Features
- add 'new search' link to the course catalog page ([#456](https://github.com/Longhorn-Developers/UT-Registration-Plus/issues/456)) ([ca5e4c1](https://github.com/Longhorn-Developers/UT-Registration-Plus/commit/ca5e4c13d31aeb603660972536712ea161c6f870))
- add 404 page ([#426](https://github.com/Longhorn-Developers/UT-Registration-Plus/issues/426)) ([46c76b1](https://github.com/Longhorn-Developers/UT-Registration-Plus/commit/46c76b1703ea2344c3330c4cfa82560663be1c4c))
- add CacheStore for GitHub stats and use names instead of usernames ([#405](https://github.com/Longhorn-Developers/UT-Registration-Plus/issues/405)) ([b732a80](https://github.com/Longhorn-Developers/UT-Registration-Plus/commit/b732a80eaa6f6cbf5b627ffc31ab321de3a8e8f4))
- add eslint-plugin-tsdoc ([#430](https://github.com/Longhorn-Developers/UT-Registration-Plus/issues/430)) ([e987fbb](https://github.com/Longhorn-Developers/UT-Registration-Plus/commit/e987fbbe8e733de6767d62811c2d4d6eaccf2d24))
- add explanation to grade distribution ([#325](https://github.com/Longhorn-Developers/UT-Registration-Plus/issues/325)) ([9ad3239](https://github.com/Longhorn-Developers/UT-Registration-Plus/commit/9ad32390d13e1d413ca01b1bc45d02c695bc23dd))
- add open calendar button ([#457](https://github.com/Longhorn-Developers/UT-Registration-Plus/issues/457)) ([93733e3](https://github.com/Longhorn-Developers/UT-Registration-Plus/commit/93733e37214f00543479e77209ca03864776a1a6))
- add spacing system ([#474](https://github.com/Longhorn-Developers/UT-Registration-Plus/issues/474)) ([e61ab56](https://github.com/Longhorn-Developers/UT-Registration-Plus/commit/e61ab565c35a197609d205adcaac9c7ffe0fc6da))
- **build:** add Docker support ([#322](https://github.com/Longhorn-Developers/UT-Registration-Plus/issues/322)) ([a5e921f](https://github.com/Longhorn-Developers/UT-Registration-Plus/commit/a5e921fd75109a50f17d05c9682e73ba246f3dd1))
- **build:** add vite-build-logger ([#507](https://github.com/Longhorn-Developers/UT-Registration-Plus/issues/507)) ([1aa4e8c](https://github.com/Longhorn-Developers/UT-Registration-Plus/commit/1aa4e8c5fb2d1aea308e4cccea3e2818a9c946ec))
- **build:** refactor gulpfile to use gulp-execa ([#323](https://github.com/Longhorn-Developers/UT-Registration-Plus/issues/323)) ([db04bbb](https://github.com/Longhorn-Developers/UT-Registration-Plus/commit/db04bbb52e4ab19730dd66f417e68ab013ce2f79))
- export/import functionality (backup/restore/share with friends) + a new input component ([#433](https://github.com/Longhorn-Developers/UT-Registration-Plus/issues/433)) ([7dbffc6](https://github.com/Longhorn-Developers/UT-Registration-Plus/commit/7dbffc6eef346747042f1596da627ad0a2fcae1a))
- injected button - add all courses from MyUT AND passing URL to handler ([#291](https://github.com/Longhorn-Developers/UT-Registration-Plus/issues/291)) ([c41467c](https://github.com/Longhorn-Developers/UT-Registration-Plus/commit/c41467c6176d31f70cd3ecdcf56eeb73696c6c23))
- modify Course Block text style and time and location text ([#409](https://github.com/Longhorn-Developers/UT-Registration-Plus/issues/409)) ([0d51cae](https://github.com/Longhorn-Developers/UT-Registration-Plus/commit/0d51cae4c8b27201b09c0898f4d7a6e7abb3c100))
- **settings:** add option to always open calendar in new tab ([#488](https://github.com/Longhorn-Developers/UT-Registration-Plus/issues/488)) ([009de62](https://github.com/Longhorn-Developers/UT-Registration-Plus/commit/009de628285ce9c6571e492f8e3f52cdeeed4459))
- **settings:** allow disabling of auto-loading courses ([#489](https://github.com/Longhorn-Developers/UT-Registration-Plus/issues/489)) ([b74c698](https://github.com/Longhorn-Developers/UT-Registration-Plus/commit/b74c698866c1074ce2236ede549c94555667e6a5))
- **ui:** add schedule list icons ([#500](https://github.com/Longhorn-Developers/UT-Registration-Plus/issues/500)) ([f0b257a](https://github.com/Longhorn-Developers/UT-Registration-Plus/commit/f0b257aa124a8fff0bb31e3396715aecb09948d5))
- **ui:** added shadows to popup buttons and course blocks ([#378](https://github.com/Longhorn-Developers/UT-Registration-Plus/issues/378)) ([a20332e](https://github.com/Longhorn-Developers/UT-Registration-Plus/commit/a20332e53da9bda873fabb8395afe6ff6303799c))
- **ui:** calendar header redesign ([#479](https://github.com/Longhorn-Developers/UT-Registration-Plus/issues/479)) ([9c766c2](https://github.com/Longhorn-Developers/UT-Registration-Plus/commit/9c766c26959673389e372c3a440c1a73d5887b1d))
- **ui:** calendar sidebar redesign ([#464](https://github.com/Longhorn-Developers/UT-Registration-Plus/issues/464)) ([843cb5b](https://github.com/Longhorn-Developers/UT-Registration-Plus/commit/843cb5b4430885527592feee33656dfae50c95c2))
- **ui:** change icons to phosphor-icons [#467](https://github.com/Longhorn-Developers/UT-Registration-Plus/issues/467) ([#469](https://github.com/Longhorn-Developers/UT-Registration-Plus/issues/469)) ([37bd7e7](https://github.com/Longhorn-Developers/UT-Registration-Plus/commit/37bd7e79d9202d55c7d0f566518526b0aed53c68))
- **ui:** change red text when instructor not found ([#483](https://github.com/Longhorn-Developers/UT-Registration-Plus/issues/483)) ([52347fd](https://github.com/Longhorn-Developers/UT-Registration-Plus/commit/52347fd56dff95190915d9f375dbebe1383e76c8))
- **ui:** color picker final touches ([#491](https://github.com/Longhorn-Developers/UT-Registration-Plus/issues/491)) ([c2328e4](https://github.com/Longhorn-Developers/UT-Registration-Plus/commit/c2328e461ea0a846f399a22bc525540da2796dcd))
- **ui:** course color picker ([#382](https://github.com/Longhorn-Developers/UT-Registration-Plus/issues/382)) ([1f635d2](https://github.com/Longhorn-Developers/UT-Registration-Plus/commit/1f635d2515fc403ad7f08fc3a244a17d262e3f7b))
- **ui:** course unique number copy button ([#490](https://github.com/Longhorn-Developers/UT-Registration-Plus/issues/490)) ([501f506](https://github.com/Longhorn-Developers/UT-Registration-Plus/commit/501f50667725aa1515391869b133908b8383d868))
- **ui:** Modify Calendar Footer design and Unscheduled courses ([#503](https://github.com/Longhorn-Developers/UT-Registration-Plus/issues/503)) ([b171f01](https://github.com/Longhorn-Developers/UT-Registration-Plus/commit/b171f01d01f47c75e7df5e5c8e4e7b15b7397c52))
- **ui:** redesign grade distribution tooltip ([#485](https://github.com/Longhorn-Developers/UT-Registration-Plus/issues/485)) ([a61bddf](https://github.com/Longhorn-Developers/UT-Registration-Plus/commit/a61bddf0e8a76c89d4963d9e580fb063309bee92))
- **ui:** update button variants following figma ([#482](https://github.com/Longhorn-Developers/UT-Registration-Plus/issues/482)) ([0aa469a](https://github.com/Longhorn-Developers/UT-Registration-Plus/commit/0aa469af81e7912a6b26ee1b80c5920f677b5fbd))
- **ui:** update popup and course blocks ([#506](https://github.com/Longhorn-Developers/UT-Registration-Plus/issues/506)) ([ee4c6ce](https://github.com/Longhorn-Developers/UT-Registration-Plus/commit/ee4c6ce6999ad35821b9be5d657790f2dee017b3))
- **ui:** update theme colors [#466](https://github.com/Longhorn-Developers/UT-Registration-Plus/issues/466) ([#473](https://github.com/Longhorn-Developers/UT-Registration-Plus/issues/473)) ([0d73b13](https://github.com/Longhorn-Developers/UT-Registration-Plus/commit/0d73b13b288bf8b18444f26455da24c2f4acedf6))
- update SWE list ([aa29bcf](https://github.com/Longhorn-Developers/UT-Registration-Plus/commit/aa29bcf9fe4bad7812336d55d7575a6032aea91c))
- update text styles ([#468](https://github.com/Longhorn-Developers/UT-Registration-Plus/issues/468)) ([918f4e4](https://github.com/Longhorn-Developers/UT-Registration-Plus/commit/918f4e419cf5fa71bda1112597e9a373daca69ea)), closes [#465](https://github.com/Longhorn-Developers/UT-Registration-Plus/issues/465)
- validate login passed to background and implemented into add all injected button ([#443](https://github.com/Longhorn-Developers/UT-Registration-Plus/issues/443)) ([cd05e5e](https://github.com/Longhorn-Developers/UT-Registration-Plus/commit/cd05e5e7fcaa02dab30f230c178f189d8052a7c9))
### Bug Fixes
- 4th attempt for: now able to delete schedule even if active ([#435](https://github.com/Longhorn-Developers/UT-Registration-Plus/issues/435)) ([2425679](https://github.com/Longhorn-Developers/UT-Registration-Plus/commit/24256798ba7b877dd170d77ce4970b13b8a69a68))
- instructor formatting errors ([#425](https://github.com/Longhorn-Developers/UT-Registration-Plus/issues/425)) ([8b92208](https://github.com/Longhorn-Developers/UT-Registration-Plus/commit/8b922082a79ebdbf50a09f37ecb9dfea1be6e1f3))
- place hours and courses under schedule name ([#388](https://github.com/Longhorn-Developers/UT-Registration-Plus/issues/388)) ([7dd9369](https://github.com/Longhorn-Developers/UT-Registration-Plus/commit/7dd93690d6dbd206cb50442f42ec85d6bbfc1da8))
- transition added ([#381](https://github.com/Longhorn-Developers/UT-Registration-Plus/issues/381)) ([598bafe](https://github.com/Longhorn-Developers/UT-Registration-Plus/commit/598bafe67f47ad57b3801a425e61f86093ba2be8))
- **ui:** fix longstanding drag-and-drop duplication issue ([#502](https://github.com/Longhorn-Developers/UT-Registration-Plus/issues/502)) ([4752f58](https://github.com/Longhorn-Developers/UT-Registration-Plus/commit/4752f5860a96e08a1177c0ddf57a0fa269d89072))
- **ui:** reduce left side grade distribution margin/padding ([#427](https://github.com/Longhorn-Developers/UT-Registration-Plus/issues/427)) ([91fa78e](https://github.com/Longhorn-Developers/UT-Registration-Plus/commit/91fa78e2d0532a73e24ecc013d2ba6c0f62c1fcd))
- **ui:** stop import button dropdown from squishing ([#504](https://github.com/Longhorn-Developers/UT-Registration-Plus/issues/504)) ([846070e](https://github.com/Longhorn-Developers/UT-Registration-Plus/commit/846070ebb5e13e0fc0df94666dbce75194100049))
- updated text when time/location not provided ([#289](https://github.com/Longhorn-Developers/UT-Registration-Plus/issues/289)) ([ebcc0aa](https://github.com/Longhorn-Developers/UT-Registration-Plus/commit/ebcc0aa76a89f0d1a9e90cfc50d70f017c9bed42))
## [2.0.2](https://github.com/Longhorn-Developers/UT-Registration-Plus/compare/v2.0.1...v2.0.2) (2024-11-05)
### Features
- add core curriculum chips to injected popup ([#372](https://github.com/Longhorn-Developers/UT-Registration-Plus/issues/372)) ([6f1afc5](https://github.com/Longhorn-Developers/UT-Registration-Plus/commit/6f1afc5b25441c6a1fbfdf57b3c8b5b74e36f5a0))
- Add linkedin social to calendar ([#368](https://github.com/Longhorn-Developers/UT-Registration-Plus/issues/368)) ([b6eccac](https://github.com/Longhorn-Developers/UT-Registration-Plus/commit/b6eccaca6a2cdba9b57d2f49f064ae8504bbd5cb))
- add more relevant links to the From the Team section ([#380](https://github.com/Longhorn-Developers/UT-Registration-Plus/issues/380)) ([643ea13](https://github.com/Longhorn-Developers/UT-Registration-Plus/commit/643ea1320798aabb7783d267f5e6fd7c00fc2e3f))
- bold course number in grade distribution chart, change text to ut-black ([#406](https://github.com/Longhorn-Developers/UT-Registration-Plus/issues/406)) ([638ee88](https://github.com/Longhorn-Developers/UT-Registration-Plus/commit/638ee88c96510a779c157b524903caaeffc9ef19))
- disable/some actions when no instructor ([#319](https://github.com/Longhorn-Developers/UT-Registration-Plus/issues/319)) ([839f9c6](https://github.com/Longhorn-Developers/UT-Registration-Plus/commit/839f9c6d6afd4a1eae1a0bdf8893ab2e19b9fdff))
- **ui:** changed popup close icon to ut-black ([#394](https://github.com/Longhorn-Developers/UT-Registration-Plus/issues/394)) ([0077ae7](https://github.com/Longhorn-Developers/UT-Registration-Plus/commit/0077ae70d22f24549c4c3b243188d19adbfbac14)), closes [#333F48](https://github.com/Longhorn-Developers/UT-Registration-Plus/issues/333F48)
- update senior swe admins ([#326](https://github.com/Longhorn-Developers/UT-Registration-Plus/issues/326)) ([b967240](https://github.com/Longhorn-Developers/UT-Registration-Plus/commit/b967240f8fbb7a790a78f4aa256f0a77a491abb8))
- update useful links ([#367](https://github.com/Longhorn-Developers/UT-Registration-Plus/issues/367)) ([cef99c2](https://github.com/Longhorn-Developers/UT-Registration-Plus/commit/cef99c2d72d3a2800f8a918d01cb116f8795d0c8))
- use "copy of" for duplicated schedules and place them under the original schedule [#358](https://github.com/Longhorn-Developers/UT-Registration-Plus/issues/358) ([#397](https://github.com/Longhorn-Developers/UT-Registration-Plus/issues/397)) ([94744e0](https://github.com/Longhorn-Developers/UT-Registration-Plus/commit/94744e01b94819fb4f5d64616ea56857b906c2dd))
### Bug Fixes
- added descending sort for commits on contributor section in settings page ([#365](https://github.com/Longhorn-Developers/UT-Registration-Plus/issues/365)) ([a715bbd](https://github.com/Longhorn-Developers/UT-Registration-Plus/commit/a715bbd933a87742e7bce3a44e8ba1bd419ad5eb)), closes [#363](https://github.com/Longhorn-Developers/UT-Registration-Plus/issues/363) [#363](https://github.com/Longhorn-Developers/UT-Registration-Plus/issues/363) [#363](https://github.com/Longhorn-Developers/UT-Registration-Plus/issues/363)
- change schedule total courses text color to UTRP black ([#369](https://github.com/Longhorn-Developers/UT-Registration-Plus/issues/369)) ([b00bf6c](https://github.com/Longhorn-Developers/UT-Registration-Plus/commit/b00bf6c180f1c6c3a61c5ef855e160ddf4af3ea4))
- changed the font-weight of h1-course ([#370](https://github.com/Longhorn-Developers/UT-Registration-Plus/issues/370)) ([4f609ae](https://github.com/Longhorn-Developers/UT-Registration-Plus/commit/4f609aeec797c1f99f0a57e5aeef7b82756ea4bc)), closes [#347](https://github.com/Longhorn-Developers/UT-Registration-Plus/issues/347)
- ensure input elements take full width of parent ([#364](https://github.com/Longhorn-Developers/UT-Registration-Plus/issues/364)) ([c2007ef](https://github.com/Longhorn-Developers/UT-Registration-Plus/commit/c2007ef090aab3bbfcb8bca1ebc476255d09cb90))
- remove screenshot padding class for png download for [#344](https://github.com/Longhorn-Developers/UT-Registration-Plus/issues/344) ([#376](https://github.com/Longhorn-Developers/UT-Registration-Plus/issues/376)) ([768ac77](https://github.com/Longhorn-Developers/UT-Registration-Plus/commit/768ac776ed4d5ca2113a032a93c2dc7432915aa1)), closes [#334](https://github.com/Longhorn-Developers/UT-Registration-Plus/issues/334)
- sentry issues ([#389](https://github.com/Longhorn-Developers/UT-Registration-Plus/issues/389)) ([2d0804f](https://github.com/Longhorn-Developers/UT-Registration-Plus/commit/2d0804f90e5d7a9ff83f7fd5c5acfdc7c1b1cc84))
- typo in settings page ([#386](https://github.com/Longhorn-Developers/UT-Registration-Plus/issues/386)) ([d357735](https://github.com/Longhorn-Developers/UT-Registration-Plus/commit/d3577358d0d1fb60f2c776ae4b01e255fcf9109e))
- **ui:** add space before/after forward slash in "ASYNC/OTHER" text ([#366](https://github.com/Longhorn-Developers/UT-Registration-Plus/issues/366)) ([86792eb](https://github.com/Longhorn-Developers/UT-Registration-Plus/commit/86792eb56f04b615f7d52b2f417b88f4cb9a82ec))
- **ui:** duplicate schedule warning ([#295](https://github.com/Longhorn-Developers/UT-Registration-Plus/issues/295)) ([7346720](https://github.com/Longhorn-Developers/UT-Registration-Plus/commit/73467208947e0116ce8538052ee75dea1d8038f9))
- **ui:** main popup now shows 0 for empty schedule ([#395](https://github.com/Longhorn-Developers/UT-Registration-Plus/issues/395)) ([8de88d6](https://github.com/Longhorn-Developers/UT-Registration-Plus/commit/8de88d6ad7d4c2b5c3aa08e1efc59f7226b40c6b))
- **ui:** multiple instructors are formatted properly, displays last name only, and are capitalized in all course blocks ([#342](https://github.com/Longhorn-Developers/UT-Registration-Plus/issues/342)) ([#403](https://github.com/Longhorn-Developers/UT-Registration-Plus/issues/403)) ([50e88fa](https://github.com/Longhorn-Developers/UT-Registration-Plus/commit/50e88fa015e0290fbe0dab8a19f8fcdbc4dd02b0))
- **ui:** placeholder text for no instructor course [#400](https://github.com/Longhorn-Developers/UT-Registration-Plus/issues/400) ([#402](https://github.com/Longhorn-Developers/UT-Registration-Plus/issues/402)) ([b3ae91d](https://github.com/Longhorn-Developers/UT-Registration-Plus/commit/b3ae91d8f3cebb89e5e5cea7f1200d28326afb4d))
## [2.0.1](https://github.com/Longhorn-Developers/UT-Registration-Plus/compare/v2.0.0...v2.0.1) (2024-10-17)
### Features

89
DOCKER_DEV_SETUP.md Normal file
View File

@@ -0,0 +1,89 @@
# Docker Dev Setup
## Prerequisites
- Docker installed on your machine
- Git (to clone the repository)
## Getting Started
1. Clone the repository:
```
git clone https://github.com/Longhorn-Developers/UT-Registration-Plus.git
cd UT-Registration-Plus
```
2. Build the Docker image:
```
docker build -t ut-registration-plus .
```
## Using Docker for Different Modes
The Docker setup supports three modes of operation: build, zip, and dev. You can choose the mode either by passing it as a command or by setting the `BUILD_MODE` environment variable.
### Build Mode (Default)
This mode builds the extension and places the output in the `dist` folder.
```
docker run -it --rm -v $(pwd)/dist:/extension/dist ut-registration-plus build
```
or
```
docker run -it --rm -v $(pwd)/dist:/extension/dist -e BUILD_MODE=build ut-registration-plus
```
### Zip Mode
This mode builds the extension and creates a zipped package in the `package` folder.
```
docker run -it --rm -v $(pwd)/package:/extension/package ut-registration-plus zip
```
or
```
docker run -it --rm -v $(pwd)/package:/extension/package -e BUILD_MODE=zip ut-registration-plus
```
### Development Mode with Hot Module Replacement (HMR)
This mode runs the extension in development mode with HMR support.
_Note_: This currently doesn't work.
```
docker run -it --rm -v $(pwd)/dist:/extension/dist -v $(pwd)/dist:/extension/dist -p 5173:5173 ut-registration-plus dev
```
or
```
docker run -it --rm -v $(pwd)/dist:/extension/dist -p 5173:5173 -e BUILD_MODE=dev ut-registration-plus
```
## Accessing the Built Extension
- For build mode, the extension files will be in the `dist` directory on your host machine.
- For zip mode, the zipped extension will be in the `package` directory on your host machine.
- For dev mode, the extension will be continuously built in the `dist` directory, and you can load it as an unpacked extension in Chrome.
## Docker Development Workflow
When working on the extension:
1. Run the container in dev mode
2. Make changes to your source code
3. The extension will automatically rebuild thanks to HMR
4. Reload the extension in Chrome to see your changes
## Troubleshooting
- If you encounter permission issues with the output directories, ensure that the directories exist on your host machine and have the correct permissions.
- For any other issues, please check the Docker logs or open an issue in the GitHub repository.

47
Dockerfile Normal file
View File

@@ -0,0 +1,47 @@
# Stage 1: Base image with Node.js and pnpm
FROM node:20.9.0-alpine AS base
# Install pnpm
RUN npm install -g pnpm@latest-10
# Set working directory
WORKDIR /app
# Copy package.json, pnpm-lock.yaml, and .nvmrc
COPY package.json pnpm-lock.yaml .nvmrc ./
# Copy patches directory if it exists
COPY patches ./patches
# Install dependencies, including applying patches
RUN pnpm install --frozen-lockfile
# Copy the rest of the source code
COPY . .
# Stage 2: Final stage
FROM base AS final
# Install zip utility and bash
RUN apk add --no-cache zip bash
# Set working directory
WORKDIR /extension
# Copy all files from base
COPY --from=base /app ./
# Copy the entrypoint script
COPY docker-entrypoint.sh /usr/local/bin/
# Make the entrypoint script executable
RUN chmod +x /usr/local/bin/docker-entrypoint.sh
# Expose port for HMR
EXPOSE 5173
# Set the entrypoint to our new script
ENTRYPOINT ["docker-entrypoint.sh"]
# Set the default command (which can be overridden)
CMD ["build"]

View File

@@ -6,7 +6,7 @@
![Downloads](https://img.shields.io/chrome-web-store/d/hboadpjkoaieogjimneceaahlppnipaa)
![License](https://img.shields.io/github/license/Longhorn-Developers/UT-Registration-Plus)
**UT Registration Plus (UTRP)** streamlines the process of registering for classes at UT Austin by reducing the chaos of juggling multiple tabs like Rate My Professor, Google Sheets, and the UT Course Schedule. With UTRP, you can simplify class selection and schedule management. We've all been there. 20 tabs of Rate My Professor, Google Spreadsheet, and the UT Course Schedule open and you still don't know what classes to take. UT Registration Plus (UTRP), tries to streamline most of the unnecessary steps and headaches of registering for classes at UT Austin.
**UT Registration Plus (UTRP)** streamlines the process of registering for classes at UT Austin by reducing the chaos of juggling multiple tabs like Rate My Professor, Google Sheets, and the UT Course Schedule. With UTRP, you can simplify class selection and schedule management. We've all been there. 20 tabs of Rate My Professor, Google Spreadsheet, and the UT Course Schedule open and you still don't know what classes to take.
## Demo
@@ -58,7 +58,9 @@ Contributions are welcome and encouraged! To get started:
For significant changes, its recommended to open an issue first to discuss the proposed updates.
## Development: Getting Started
## Development
### Getting Started
1. Clone this repository: `git clone https://github.com/Longhorn-Developers/UT-Registration-Plus.git`
2. **Node Version**: This project requires the Node.js version specified in `.nvmrc`. Use [nvm](https://github.com/nvm-sh/nvm) to install and manage the correct version:
@@ -101,6 +103,10 @@ Use `BETA=true pnpm build` to generate a beta build.
</details>
### Docker
This project includes a Dockerfile that allows you to build, zip, or run the extension in development mode using Docker. Refer to [Docker Dev Setup](./DOCKER_DEV_SETUP.md) to get started.
## Loading the Extension Manually
To load the extension manually in Chrome:
@@ -194,3 +200,17 @@ Special thanks to the developers and contributors behind these amazing tools and
- [Figma Designs](https://www.figma.com/design/8tsCay2FRqctrdcZ3r9Ahw/UTRP) by @IsaDavRod
- [Longhorn Developers](https://github.com/Longhorn-Developers) - established in 2024
- The UTRP devs, beta testers, and all supporters of the project!
## Activity
![UT-Registration-Plus Activity](https://repobeats.axiom.co/api/embed/47930fa3916ac1b475cd63a05948c449eb5ad502.svg "UT-Registration-Plus Repobeats analytics image")
## Star History
<a href="https://star-history.com/#Longhorn-Developers/UT-Registration-Plus&Date">
<picture>
<source media="(prefers-color-scheme: dark)" srcset="https://api.star-history.com/svg?repos=Longhorn-Developers/UT-Registration-Plus&type=Date&theme=dark" />
<source media="(prefers-color-scheme: light)" srcset="https://api.star-history.com/svg?repos=Longhorn-Developers/UT-Registration-Plus&type=Date" />
<img alt="Star History Chart" src="https://api.star-history.com/svg?repos=Longhorn-Developers/UT-Registration-Plus&type=Date" />
</picture>
</a>

46
docker-entrypoint.sh Normal file
View File

@@ -0,0 +1,46 @@
#!/usr/bin/env bash
set -euo pipefail
# Define supported modes
SUPPORTED_MODES=("build" "zip" "dev")
# Function to display usage information
usage() {
echo "Usage: $0 [build|zip|dev]"
echo " build: Build the extension"
echo " zip: Build and zip the extension"
echo " dev: Run in development mode with HMR"
exit 1
}
# Check if BUILD_MODE is set, otherwise use the first argument
if [ -n "${BUILD_MODE:-}" ]; then
mode="$BUILD_MODE"
elif [ $# -eq 1 ]; then
mode="$1"
else
usage
fi
# Validate the mode
if [[ ! " ${SUPPORTED_MODES[*]} " =~ " ${mode} " ]]; then
echo "Error: Invalid mode '${mode}'" >&2
usage
fi
# Execute the appropriate command based on the mode
case "$mode" in
build)
echo "Building extension..."
exec pnpm run build
;;
zip)
echo "Building and zipping extension..."
exec pnpm run zip
;;
dev)
echo "Running in development mode with HMR..."
exec pnpm run dev
;;
esac

View File

@@ -1,48 +1,93 @@
// (Thanks go to https://github.com/pnd280/complexity/blob/alpha/gulpfile.js)
import cp from 'child_process';
import chalk from 'chalk';
import fs from 'fs';
import gulp from 'gulp';
import gulpZip from 'gulp-zip';
import { createRequire } from 'module';
import { dest, series, src } from 'gulp';
import { exec } from 'gulp-execa';
import zip from 'gulp-zip';
import path from 'path';
const DIST_DIR = 'dist';
const PACKAGE_DIR = 'package';
const DATABASE_DIR = path.join(DIST_DIR, 'database');
// Custom log functions
const log = message => console.log(chalk.blue(`[${new Date().toTimeString().split(' ')[0]}]`), chalk.white(message));
const logWarn = message =>
console.warn(
chalk.blue(`[${new Date().toTimeString().split(' ')[0]}]`),
chalk.yellow(' [WARN]'),
chalk.white(message)
);
const logError = message =>
console.error(
chalk.blue(`[${new Date().toTimeString().split(' ')[0]}]`),
chalk.red(' [ERROR]'),
chalk.white(message)
);
// Remove extra database folder
function removeExtraDatabaseDir(cb) {
fs.rmSync(DATABASE_DIR, { recursive: true, force: true });
log('Extra database directory removed.');
cb();
}
// Instrument with Sentry
// Make sure sentry is configured https://docs.sentry.io/platforms/javascript/sourcemaps/uploading/typescript/#2-configure-sentry-cli
function instrumentWithSentry() {
return cp.exec('sentry-cli sourcemaps inject dist/ && sentry-cli sourcemaps upload dist/');
async function instrumentWithSentry(cb) {
await exec(`sentry-cli sourcemaps inject ${DIST_DIR}`);
await exec(`sentry-cli sourcemaps upload ${DIST_DIR}`);
log('Sentry instrumentation completed.');
cb();
}
// Zip the dist folder
function zipDist() {
const require = createRequire(import.meta.url);
const manifest = require('./package.json');
const zipFileName = `${manifest.name.replaceAll(' ', '-')}-${manifest.version}.zip`;
const packageInfo = JSON.parse(fs.readFileSync('package.json', 'utf-8'));
const zipFileName = `${packageInfo.name.replace(/ /g, '-')}-${packageInfo.version}.zip`;
return gulp
.src('dist/**', {
encoding: false,
return src(`${DIST_DIR}/**`, {
base: DIST_DIR,
encoding: false, // Disable encoding to handle binary files correctly
})
.pipe(gulpZip(zipFileName))
.pipe(gulp.dest('package'));
.pipe(zip(zipFileName))
.pipe(dest(PACKAGE_DIR))
.on('end', () => log(`Zip file created: ${path.join(PACKAGE_DIR, zipFileName)}`));
}
const zip = gulp.series(instrumentWithSentry, zipDist);
// Temp fix for CSP on Chrome 130
// Manually remove them because there is no option to disable use_dynamic_url on @crxjs/vite-plugin
function forceDisableUseDynamicUrl(done) {
const require = createRequire(import.meta.url);
const manifest = require('./dist/manifest.json');
// Force disable use_dynamic_url in manifest.json
function forceDisableUseDynamicUrl(cb) {
const manifestPath = path.join(DIST_DIR, 'manifest.json');
if (!fs.existsSync(manifestPath)) {
logWarn('manifest.json not found. Skipping modification.');
return cb();
}
const manifest = JSON.parse(fs.readFileSync(manifestPath, 'utf-8'));
let modified = false;
manifest.web_accessible_resources.forEach(resource => {
if (resource.use_dynamic_url) {
delete resource.use_dynamic_url;
modified = true;
}
});
if (!fs.existsSync('./dist/manifest.json')) {
return done();
if (modified) {
fs.writeFileSync(manifestPath, JSON.stringify(manifest, null, 2));
log('use_dynamic_url removed from manifest.json');
} else {
log('No use_dynamic_url found in manifest.json. No changes made.');
}
fs.writeFileSync('./dist/manifest.json', JSON.stringify(manifest, null, 2));
done();
cb();
}
export { forceDisableUseDynamicUrl, zip };
// Main build task
const zipProdBuild = series(removeExtraDatabaseDir, instrumentWithSentry, zipDist);
export { forceDisableUseDynamicUrl, zipProdBuild };

View File

@@ -1,7 +1,7 @@
{
"name": "ut-registration-plus",
"displayName": "UT Registration Plus",
"version": "2.0.1",
"version": "2.1.1",
"description": "UT Registration Plus is a Chrome extension that allows students to easily register for classes.",
"private": true,
"homepage": "https://github.com/Longhorn-Developers/UT-Registration-Plus",
@@ -10,7 +10,7 @@
"dev": "vite",
"build": "tsc && vite build",
"build:watch": "NODE_ENV='development' vite build --mode development -w",
"zip": "pnpm build && pnpm gulp zip",
"zip": "PROD=true pnpm build && pnpm gulp zipProdBuild",
"prettier": "prettier src --check",
"prettier:fix": "prettier src --write",
"lint": "eslint src --ext ts,tsx --report-unused-disable-directives",
@@ -27,113 +27,125 @@
"prepare": "husky"
},
"dependencies": {
"@headlessui/react": "^2.1.10",
"@hello-pangea/dnd": "^17.0.0",
"@octokit/rest": "^21.0.2",
"@sentry/react": "^8.34.0",
"@unocss/vite": "^0.63.4",
"@vitejs/plugin-react": "^4.3.2",
"@dnd-kit/core": "^6.3.1",
"@dnd-kit/modifiers": "^9.0.0",
"@dnd-kit/sortable": "^10.0.0",
"@dnd-kit/utilities": "^3.2.2",
"@headlessui/react": "^2.2.0",
"@octokit/rest": "^21.1.1",
"@phosphor-icons/react": "^2.1.7",
"@sentry/react": "^8.55.0",
"@unocss/vite": "^0.63.6",
"@vitejs/plugin-react": "^4.3.4",
"chrome-extension-toolkit": "^0.0.54",
"clsx": "^2.1.1",
"conventional-changelog": "^6.0.0",
"highcharts": "^11.4.8",
"highcharts-react-official": "^3.2.1",
"html-to-image": "^1.11.11",
"husky": "^9.1.6",
"html-to-image": "^1.11.13",
"husky": "^9.1.7",
"kc-dabr-wasm": "^0.1.2",
"nanoid": "^5.0.7",
"nanoid": "^5.1.2",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"react-loading-skeleton": "^3.5.0",
"react-markdown": "^9.0.1",
"react-syntax-highlighter": "^15.5.0",
"remark-gfm": "^4.0.0",
"sass": "^1.79.5",
"react-markdown": "^9.1.0",
"react-syntax-highlighter": "^15.6.1",
"remark-gfm": "^4.0.1",
"sass": "^1.85.1",
"simple-git": "^3.27.0",
"sql.js": "1.11.0"
},
"devDependencies": {
"@chromatic-com/storybook": "^2.0.2",
"@commitlint/cli": "^19.5.0",
"@commitlint/config-conventional": "^19.5.0",
"@commitlint/cli": "^19.7.1",
"@commitlint/config-conventional": "^19.7.1",
"@commitlint/types": "^19.5.0",
"@crxjs/vite-plugin": "2.0.0-beta.21",
"@iconify-json/bi": "^1.2.1",
"@iconify-json/iconoir": "^1.2.2",
"@iconify-json/material-symbols": "^1.2.4",
"@iconify-json/ri": "^1.2.1",
"@iconify-json/bi": "^1.2.2",
"@iconify-json/ic": "^1.2.2",
"@iconify-json/iconoir": "^1.2.7",
"@iconify-json/material-symbols": "^1.2.14",
"@iconify-json/ri": "^1.2.5",
"@iconify-json/streamline": "^1.2.2",
"@semantic-release/exec": "^6.0.3",
"@sentry/types": "^8.34.0",
"@storybook/addon-designs": "^8.0.3",
"@storybook/addon-essentials": "^8.3.5",
"@storybook/addon-links": "^8.3.5",
"@storybook/blocks": "^8.3.5",
"@storybook/react": "^8.3.5",
"@storybook/react-vite": "^8.3.5",
"@storybook/test": "^8.3.5",
"@sentry/types": "^8.55.0",
"@storybook/addon-designs": "^8.2.0",
"@storybook/addon-essentials": "^8.6.0",
"@storybook/addon-links": "^8.6.0",
"@storybook/blocks": "^8.6.0",
"@storybook/react": "^8.6.0",
"@storybook/react-vite": "^8.6.0",
"@storybook/test": "^8.6.0",
"@svgr/core": "^8.1.0",
"@svgr/plugin-jsx": "^8.1.0",
"@types/chrome": "^0.0.273",
"@types/conventional-changelog": "^3.1.5",
"@types/gulp": "^4.0.17",
"@types/gulp-zip": "^4.0.4",
"@types/node": "^22.7.5",
"@types/node": "^22.13.5",
"@types/prompts": "^2.4.9",
"@types/react": "^18.3.11",
"@types/react-dom": "^18.3.1",
"@types/react": "^18.3.18",
"@types/react-dom": "^18.3.5",
"@types/react-syntax-highlighter": "^15.5.13",
"@types/semantic-release": "^20.0.6",
"@types/semver": "^7.5.8",
"@types/sql.js": "^1.4.9",
"@typescript-eslint/eslint-plugin": "^7.18.0",
"@typescript-eslint/parser": "^7.18.0",
"@unocss/eslint-config": "^0.63.4",
"@unocss/postcss": "^0.63.4",
"@unocss/preset-uno": "^0.63.4",
"@unocss/preset-web-fonts": "^0.63.4",
"@unocss/reset": "^0.63.4",
"@unocss/transformer-directives": "^0.63.4",
"@unocss/transformer-variant-group": "^0.63.4",
"@vitejs/plugin-react-swc": "^3.7.1",
"@vitest/coverage-v8": "^2.1.2",
"@vitest/ui": "^2.1.2",
"chalk": "^5.3.0",
"chromatic": "^11.12.5",
"@unocss/eslint-config": "^0.63.6",
"@unocss/postcss": "^0.63.6",
"@unocss/preset-uno": "^0.63.6",
"@unocss/preset-web-fonts": "^0.63.6",
"@unocss/reset": "^0.63.6",
"@unocss/transformer-directives": "^0.63.6",
"@unocss/transformer-variant-group": "^0.63.6",
"@vitejs/plugin-react-swc": "^3.8.0",
"@vitest/coverage-v8": "^2.1.9",
"@vitest/ui": "^2.1.9",
"chalk": "^5.4.1",
"chromatic": "^11.26.0",
"cssnano": "^7.0.6",
"cssnano-preset-advanced": "^7.0.6",
"dotenv": "^16.4.5",
"es-module-lexer": "^1.5.4",
"dotenv": "^16.4.7",
"es-module-lexer": "^1.6.0",
"eslint": "^8.57.1",
"eslint-config-airbnb": "^19.0.4",
"eslint-config-airbnb-base": "^15.0.0",
"eslint-config-airbnb-typescript": "^18.0.0",
"eslint-config-prettier": "^9.1.0",
"eslint-import-resolver-typescript": "^3.6.3",
"eslint-import-resolver-typescript": "^3.8.3",
"eslint-plugin-import": "^2.31.0",
"eslint-plugin-import-essentials": "^0.2.1",
"eslint-plugin-jsdoc": "^50.3.2",
"eslint-plugin-prettier": "^5.2.1",
"eslint-plugin-react": "^7.37.1",
"eslint-plugin-jsdoc": "^50.6.3",
"eslint-plugin-prettier": "^5.2.3",
"eslint-plugin-react": "^7.37.4",
"eslint-plugin-react-hooks": "^4.6.2",
"eslint-plugin-react-prefer-function-component": "^3.3.0",
"eslint-plugin-react-refresh": "^0.4.12",
"eslint-plugin-react-prefer-function-component": "^3.4.0",
"eslint-plugin-react-refresh": "^0.4.19",
"eslint-plugin-simple-import-sort": "^12.1.1",
"eslint-plugin-storybook": "^0.9.0",
"eslint-plugin-tsdoc": "^0.3.0",
"gulp": "^5.0.0",
"gulp-zip": "^6.0.0",
"gulp-execa": "^7.0.1",
"gulp-zip": "^6.1.0",
"path": "^0.12.7",
"postcss": "^8.4.47",
"prettier": "^3.3.3",
"postcss": "^8.5.3",
"prettier": "^3.5.2",
"react-dev-utils": "^12.0.1",
"semantic-release": "^24.1.2",
"storybook": "^8.3.5",
"typescript": "^5.6.3",
"unocss": "^0.63.4",
"semantic-release": "^24.2.3",
"storybook": "^8.6.0",
"typescript": "^5.7.3",
"unocss": "^0.63.6",
"unocss-preset-primitives": "0.0.2-beta.1",
"unplugin-icons": "^0.19.3",
"vite": "^5.4.8",
"vite-plugin-inspect": "^0.8.7",
"vitest": "^2.1.2"
"vite": "^5.4.14",
"vite-plugin-inspect": "^0.8.9",
"vitest": "^2.1.9"
},
"engineStrict": true,
"engines": {
"pnpm": "^10"
},
"pnpm": {
"patchedDependencies": {
@@ -143,5 +155,8 @@
"overrides": {
"es-module-lexer": "^1.5.4"
}
},
"volta": {
"node": "20.9.0"
}
}

7659
pnpm-lock.yaml generated

File diff suppressed because it is too large Load Diff

Binary file not shown.

View File

@@ -27,8 +27,8 @@ interface Props {
/**
* Generates a changelog using the conventional-changelog command.
*
* @returns {Promise<void>} A promise that resolves when the changelog is generated.
* @throws {Error} If there is an error generating the changelog.
* @returns A promise that resolves when the changelog is generated.
* @throws If there is an error generating the changelog.
*/
async function generateChangelog({ preset, outFile = 'CHANGELOG.md', releaseCount = 1 }: Props): Promise<void> {
try {

5075
src/assets/UT-Map.svg Normal file

File diff suppressed because one or more lines are too long

After

Width:  |  Height:  |  Size: 347 KiB

View File

@@ -8,8 +8,8 @@ const manifest = chrome.runtime.getManifest();
/**
* Handles editing the storage for a specific area.
*
* @param {string} areaName - The name of the storage area.
* @returns {Function} - A function that accepts changes and sets them in the storage.
* @param areaName - The name of the storage area.
* @returns A function that accepts changes and sets them in the storage.
*/
const handleEditStorage = (areaName: 'local' | 'sync' | 'session') => (changes: Record<string, unknown>) => {
chrome.storage[areaName].set(changes);

View File

@@ -18,11 +18,13 @@ const nameSuffix = isBeta ? ' (beta)' : mode === 'development' ? ' (dev)' : '';
const HOST_PERMISSIONS: string[] = [
'*://*.utdirect.utexas.edu/apps/registrar/course_schedule/*',
'*://*.utdirect.utexas.edu/registration/classlist/*',
'*://*.utexas.collegescheduler.com/*',
'*://*.catalog.utexas.edu/ribbit/',
'*://*.registrar.utexas.edu/schedules/*',
'*://*.login.utexas.edu/login/*',
'https://utexas.bluera.com/*',
'*://my.utexas.edu/student/student/*',
];
const manifest = defineManifest(async () => ({

486
src/pages/404/Page404.tsx Normal file
View File

@@ -0,0 +1,486 @@
// @ts-nocheck
/* eslint-disable */
import React, { useEffect, useRef } from 'react';
/**
* Page404 component
*
* @returns The Page404 component
*/
export default function Page404(): JSX.Element {
const canvasRef = useRef(null);
const ASPECT_RATIO = 848 / 480;
useEffect(() => {
// Credit: Notch
function _0x58e5() {
let _0x33cb15 = [
'putImageData',
'sin',
'getContext',
'random',
'sqrt',
'3498792PzxeQW',
'2JZNlgj',
'1199520qBJBWq',
'8OebCGy',
'156395VBdeaj',
'79193hyrbkc',
'10iqsPJh',
'now',
'data',
'80uLyuyX',
'cos',
'1843331yKjgfa',
'createImageData',
'2266182vPDGCM',
'current',
'49758oxlYFR',
];
_0x58e5 = function () {
return _0x33cb15;
};
return _0x58e5();
}
let _0xdd3699 = _0x9cb4;
(function (_0x5cc1ea, _0x44f991) {
let _0x3b1280 = _0x9cb4;
let _0x500290 = _0x5cc1ea();
while ([]) {
try {
let _0xea56e3 =
(-parseInt(_0x3b1280(0x8b)) / (0x2344 + 0x63 * 0x59 + -0x45ae)) *
(parseInt(_0x3b1280(0x87)) / (0x2ec * -0x3 + -0x9 * 0x3ed + 0x2c1b)) +
(parseInt(_0x3b1280(0x95)) / (0x4 * -0x8b7 + -0x16 * -0x109 + 0x1 * 0xc19)) *
(-parseInt(_0x3b1280(0x8f)) / (0x17 * -0x8c + 0x1 * 0x1f0f + 0x1d * -0xa3)) +
-parseInt(_0x3b1280(0x8a)) / (-0x113 * 0x21 + -0x1 * 0xc20 + 0x2f98) +
-parseInt(_0x3b1280(0x88)) / (-0x125c + 0xd * 0x12d + 0x1 * 0x319) +
parseInt(_0x3b1280(0x91)) / (0x389 * -0x2 + 0x1 * 0xb9c + -0x483) +
(-parseInt(_0x3b1280(0x89)) / (0x4e7 + -0xcf * -0x1 + -0x2d7 * 0x2)) *
(-parseInt(_0x3b1280(0x93)) / (-0x1859 + 0x1366 + 0x4fc)) +
(parseInt(_0x3b1280(0x8c)) / (-0x1 * -0x22b2 + -0x438 * -0x5 + -0x1be * 0x20)) *
(parseInt(_0x3b1280(0x86)) / (0x29 * 0x29 + 0x1d09 * 0x1 + -0x238f));
if (_0xea56e3 === _0x44f991) break;
else _0x500290.push(_0x500290.shift());
} catch (_0x5847bb) {
_0x500290.push(_0x500290.shift());
}
}
})(_0x58e5, 0x3c063 + 0x13c * -0x305 + 0x2e43c);
const _0x5dce41 = canvasRef[_0xdd3699(0x94)];
const _0x16f39e = _0x5dce41[_0xdd3699(0x83)]('2d');
let _0x228047;
const _0x124180 = 0x2 * -0x7f7 + -0x70 * 0x1 + -0x602 * -0x3;
const _0x591e4f = 0xba7 * 0x1 + 0x1ebc + -0x2973;
let _0x39dbea = new Array(
(0x94f + -0x215 * -0x1 + -0xb24) *
(-0x1 * -0x1dda + -0x23e + -0x1b5c) *
(0xb9c + 0x1 * 0x1c57 + -0x27b3 * 0x1)
);
let _0x391e96 = new Array(
(-0x1e8f + -0x1 * -0x20f9 + -0x25a) *
(-0xce6 + 0x2a * 0x86 + -0x906) *
(0x1d57 * -0x1 + -0x1170 + 0x2eca) *
(0x1c2 + -0x11a9 + 0x1 * 0xff7)
);
function _0x3ebd0f() {
let _0x53ab34 = _0xdd3699;
for (
var _0x599786 = 0x1e5b + 0x7a * -0x3a + -0x2b6;
_0x599786 < -0x1 * 0x593 + 0x9 * -0x15 + 0x660;
_0x599786++
) {
let _0x5dd0b8 =
0x1043 +
0x401 +
-0x1345 -
((Math[_0x53ab34(0x84)]() * (-0xb10 + -0x173e + 0x22ae)) |
(0x1 * -0xf5b + -0x83 * -0xd + -0x8b4 * -0x1));
for (
var _0xebe028 = -0x1827 * -0x1 + 0x385 + 0x142 * -0x16;
_0xebe028 < (-0x77c + 0x11d * 0x1b + -0x1683) * (0x1a * 0x162 + 0x13 * -0xc3 + -0x1578);
_0xebe028++
) {
for (
var _0x4bc490 = 0x2c * 0x55 + -0xf1d + -0x3 * -0x2b;
_0x4bc490 < 0x3 * -0x9a5 + -0x1ee8 + 0x5 * 0xbfb;
_0x4bc490++
) {
let _0x36dcfc = -0xd60e5f * 0x1 + -0x3f232d + 0x1ab9dd6;
if (_0x599786 == -0x517 * -0x5 + -0x1b9b + -0x8b * -0x4)
_0x36dcfc = -0xcc5387 * 0x1 + -0xa89ad4 + -0xa6 * -0x303bf;
(_0x599786 != -0x9 * -0x4f + 0x53 * -0x22 + 0x843 ||
((Math[_0x53ab34(0x84)]() * (-0x11de + -0x1 * -0xbf1 + 0x5f0)) |
(0xf60 + -0x704 + -0x85c)) ==
0xb0b * -0x2 + -0x139b + 0x29b1) &&
(_0x5dd0b8 =
0x1 * 0x6d4 +
-0x9 * -0x1f2 +
-0x19 * 0xef -
((Math[_0x53ab34(0x84)]() * (-0x5 * 0x79d + -0x233 * -0xb + 0xe40)) |
(-0x4e4 + -0x165a + 0x1b3e)));
if (
_0x599786 == 0xe17 + 0x2a1 + -0x10b7 &&
_0xebe028 <
(((_0x4bc490 * _0x4bc490 * (-0x25c0 + -0x24 * 0x76 + -0x5 * -0xadf) +
_0x4bc490 * (0x2569 + -0x396 + 0x10c1 * -0x2)) >>
(-0x6d * 0x5 + 0x3b9 * 0x9 + 0x646 * -0x5)) &
(-0x249a + 0xec3 + 0x15da)) +
(-0x56 * 0x29 + -0x11 * -0x219 + -0x15d1)
)
_0x36dcfc = -0x1 * -0x3d6586 + 0x8bbbc5 + -0x5e770b;
else
_0x599786 == 0x9e + 0x29 * -0xa2 + 0x1955 &&
_0xebe028 <
(((_0x4bc490 * _0x4bc490 * (0x647 * -0x5 + -0x2359 + 0x42bf) +
_0x4bc490 * (-0xf * 0xb8 + -0x220c + 0x2d25)) >>
(0x13 * -0xc4 + -0x15fc + -0x3 * -0xc2e)) &
(-0x2483 + 0x13a9 + 0x59f * 0x3)) +
(0xca3 + -0x480 + -0x810) &&
(_0x5dd0b8 =
(_0x5dd0b8 * (-0xf2a * 0x1 + 0x4ab + 0xa81 * 0x1)) /
(-0x1 * 0x1e5d + -0x1f7a + -0x261 * -0x1a));
if (_0x599786 == 0xdad + 0xbe5 + 0xd * -0x1f7) {
_0x36dcfc = 0x30e9f6 * -0x2 + -0x3c841f + 0x105aa3c;
if (
_0x4bc490 > -0x1af + -0x2 * -0xf94 + -0x5 * 0x5e5 &&
_0x4bc490 < 0x1ed5 + 0x3c4 * 0x3 + -0x2a12 &&
((_0xebe028 > 0x164 + -0x1720 + 0x56f * 0x4 &&
_0xebe028 < 0x1514 + -0x127d * 0x1 + -0x288) ||
(_0xebe028 > 0x1b * 0x147 + -0x1415 * -0x1 + 0x1b39 * -0x2 &&
_0xebe028 < 0x2208 + -0x2408 + 0x22f * 0x1))
) {
_0x36dcfc = -0x1a7143 + 0x16bbd0e + -0x94b369;
let _0xf0bb95 = _0x4bc490 - (-0x20 * -0xce + -0x1222 * -0x1 + -0x2bdb);
var _0x436c14 =
(_0xebe028 & (0x1f03 + -0x1506 + -0x3e * 0x29)) -
(-0x1e7 + 0xef9 * 0x2 + -0x28c * 0xb);
if (_0xf0bb95 < -0x10 * 0xe0 + -0x207d + 0x3 * 0xf7f)
_0xf0bb95 = -0x8f * 0x2b + -0xd18 + 0x251e * 0x1 - _0xf0bb95;
if (_0x436c14 < 0x1f64 + -0x18d * -0x3 + -0x240b * 0x1)
_0x436c14 = -0x755 * 0x4 + -0xafb + 0x81 * 0x50 - _0x436c14;
if (_0x436c14 > _0xf0bb95) _0xf0bb95 = _0x436c14;
_0x5dd0b8 =
0x3b5 * 0x5 +
-0x1 * 0x1db7 +
0xbf2 -
((Math.random() * (-0xc45 + 0x257 * -0xb + 0x2622)) |
(-0xf29 * -0x1 + -0x948 + 0x1 * -0x5e1)) +
(_0xf0bb95 % (-0x1 * -0x13e1 + 0xa4e * -0x3 + 0x1c * 0x65)) *
(-0x939 + -0x1d87 + 0x26e0);
} else
((Math[_0x53ab34(0x84)]() * (-0x405 * 0x6 + -0x122a + 0x2a4a)) |
(0x7f7 + -0x1 * 0xc4f + -0x1 * -0x458)) ==
0x1 * -0x26b + -0x131 * 0xd + 0x2 * 0x8f4 &&
(_0x5dd0b8 =
(_0x5dd0b8 *
(0x102c +
-0x2f9 * 0x4 +
-0x3b2 -
(_0x4bc490 & (0x18a7 * -0x1 + 0x236e + 0x563 * -0x2)) *
(0x89 * 0x45 + 0xb38 + -0x2fc1))) /
(-0x1 * 0x156 + -0x4d * 0x65 + 0x201b * 0x1));
}
_0x599786 == -0x2 * -0x1087 + -0x3 * 0xcb3 + 0x9 * 0x90 &&
((_0x36dcfc = -0x100d2 * -0x9f + -0x659425 + 0x7b4bcc),
((_0x4bc490 +
(_0xebe028 >> (-0x12 * -0x205 + 0x1ca + -0x1 * 0x2622)) *
(-0xe67 + -0x1c85 * 0x1 + -0x30 * -0xe5)) %
(0x15c1 * -0x1 + 0x73f + 0xe8a * 0x1) ==
-0x1729 + -0x1 * 0x247 + 0x1970 ||
_0xebe028 % (0x14e9 * -0x1 + 0x21e1 + -0x1 * 0xcf4) ==
0x641 * 0x1 + -0x16fd + 0x4 * 0x42f) &&
(_0x36dcfc = 0x112d086 + -0x442565 + -0x47edf * 0x4));
_0x599786 == 0x6 * -0x2bb + -0x24 + 0x9d * 0x1b &&
(_0x36dcfc = -0x197 * 0x4ae9 + -0x22af5 * 0x1 + 0xb98463);
let _0xba7812 = _0x5dd0b8;
if (_0xebe028 >= -0x4 * -0x52 + 0x25d + -0x385)
_0xba7812 /= -0x1 * -0x497 + 0x1a3f + -0x7b5 * 0x4;
_0x599786 == -0x1d35 * -0x1 + -0x2445 + 0x718 &&
((_0x36dcfc = -0x981b * 0xc4 + -0x6c2f7 * -0x16 + -0x11 * -0x2db19),
((Math.random() * (-0x1 * 0x181a + -0x1700 + 0x2f1c)) | (-0x266 + 0x3 * 0x8b4 + -0x17b6)) ==
0xcc2 + -0xbc6 + -0xe * 0x12 &&
((_0x36dcfc = 0x2589 + -0xd * 0x27f + 0x3e * -0x15),
(_0xba7812 = 0x10ef + -0x68a + -0x966)));
let _0x1206cd =
(((((_0x36dcfc >> (0x2 * 0xfb3 + -0x118a + -0xdcc)) & (-0x8fc + -0x1a19 + 0x1 * 0x2414)) *
_0xba7812) /
(0xa6 * -0x25 + 0x112c + 0x7d1)) <<
(0x140c + -0xac0 + -0x1 * 0x93c)) |
(((((_0x36dcfc >> (-0x11 * -0x3e + 0x157d + -0x1993 * 0x1)) &
(-0x9 * 0x421 + -0x2102 + 0x472a * 0x1)) *
_0xba7812) /
(0x107b * -0x1 + -0x16fc + 0x2876)) <<
(-0x20e8 + -0x5e * -0x53 + 0x276)) |
(((_0x36dcfc & (0x581 * 0x3 + 0x1 * 0x977 + -0x18fb)) * _0xba7812) /
(-0xaa0 + 0x211 + 0x2 * 0x4c7));
_0x391e96[
_0x4bc490 +
_0xebe028 * (0x7 * -0x415 + 0x1b6e * -0x1 + 0x1f * 0x1cf) +
_0x599786 * (0x504 + -0x2075 + -0x97b * -0x3) * (0x25 * -0xa9 + 0x171d + -0x3 * -0x71)
] = _0x1206cd;
}
}
}
for (
var _0x4bc490 = -0x825 * -0x3 + 0x71a + -0x1b * 0x12b;
_0x4bc490 < 0x17f0 + -0x15a3 + -0x20d;
_0x4bc490++
) {
for (
var _0xebe028 = 0x53a + 0x7fe + -0x24 * 0x5e;
_0xebe028 < 0x1 * 0x1445 + 0x6d * 0x2 + -0xd * 0x19b;
_0xebe028++
) {
for (
let _0x2eee05 = 0x69 * 0x39 + -0x202 * 0xb + -0x14b;
_0x2eee05 < 0x97 * 0x27 + -0x261 + -0x1 * 0x1460;
_0x2eee05++
) {
var _0x599786 =
(_0x2eee05 << (-0x1 * -0x235e + 0x121 + -0x2473)) |
(_0xebe028 << (-0x7db + -0x80 * 0x23 + 0x1961)) |
_0x4bc490;
var _0x436c14 =
(_0xebe028 - (0xec6 + 0x6 * 0x199 + -0xbc * 0x21 + 0.5)) *
(0x1fca + 0x7 * 0xf9 + 0x2699 * -0x1 + 0.4);
let _0x198036 =
(_0x2eee05 - (0x1 * 0xecb + -0x24b8 + 0x160d + 0.5)) * (0xc * 0xda + -0x825 + -0x213 + 0.4);
_0x39dbea[_0x599786] =
(Math.random() * (0x1134 + -0x131 * -0x9 + -0x1bdd)) | (0x160c + -0x7 * 0x6b + -0x131f);
if (
Math[_0x53ab34(0x84)]() >
Math[_0x53ab34(0x85)](Math.sqrt(_0x436c14 * _0x436c14 + _0x198036 * _0x198036)) -
(0x15a9 + -0xe8f * -0x2 + 0x32c7 * -0x1 + 0.8)
)
_0x39dbea[_0x599786] = 0x1a62 + -0xaf * -0x1 + 0x1 * -0x1b11;
}
}
}
_0x228047 = _0x16f39e[_0x53ab34(0x92)](_0x124180, _0x591e4f);
for (
var _0x599786 = 0x26b7 + -0x1b66 * 0x1 + -0x1 * 0xb51;
_0x599786 < _0x124180 * _0x591e4f;
_0x599786++
) {
_0x228047[_0x53ab34(0x8e)][
_0x599786 * (-0x4 * -0x4c0 + 0x228a + -0x3586) + (-0x856 + -0x22 * 0x37 + 0x1 * 0xfa7)
] = -0x4e5 + 0x196a + -0x126 * 0x11;
}
setInterval(_0x5629d1, (0x26b5 + 0x1 * 0xf9b + 0x1934 * -0x2) / (0x1 * 0xca1 + -0xbb6 + -0x87));
}
function _0x5629d1() {
let _0x13c635 = _0xdd3699;
_0x5b7f43(),
_0x16f39e[_0x13c635(0x81)](
_0x228047,
0x9c + -0x1 * 0x23ab + 0x230f * 0x1,
-0x1c26 + 0x7bf + -0x6cd * -0x3
);
}
let _0x93f360 = 0x64 * 0x49 + 0x1e1e + -0x3aa2;
function _0x5b7f43() {
let _0x4626de = _0xdd3699;
let _0x400eca =
Math[_0x4626de(0x82)](
((Date.now() % (-0x1f15 * -0x1 + 0x1 * -0x44b9 + -0x265a * -0x2)) /
(-0x396f + 0x1 * -0x995 + 0x6a14)) *
Math.PI *
(0x2429 + 0x2360 + -0x4787)
) *
(-0x106 * -0x1d + -0x3e * -0xa0 + -0x446e + 0.4) +
Math.PI / (0x1b21 + -0x1 * -0xa9 + 0x379 * -0x8);
let _0xaac757 =
Math[_0x4626de(0x90)](
((Date[_0x4626de(0x8d)]() % (0xd * -0x351 + -0x3994 + 0x13f7 * 0x7)) /
(0x1ceb + -0x9ef * 0x1 + 0x1414)) *
Math.PI *
(0x1420 + 0x12b1 + -0x26cf)
) *
(-0x1 * -0x211a + -0x18ff + -0x81b * 0x1 + 0.4);
let _0x159021 = Math[_0x4626de(0x90)](_0xaac757);
let _0x11f9a2 = Math[_0x4626de(0x82)](_0xaac757);
let _0x1ac9ca = Math[_0x4626de(0x90)](_0x400eca);
let _0x49fc16 = Math[_0x4626de(0x82)](_0x400eca);
let _0x116a45 =
0x1b4f +
-0x1167 +
-0x9c8 +
0.5 +
((Date[_0x4626de(0x8d)]() % (-0x1 * -0xfaa + 0x169 * 0x1f + -0x7 * 0x2e7)) /
(-0x2831 + 0x1 * 0x171 + 0x4dd0)) *
(-0x911 + -0x26e2 + -0x1b * -0x1c9);
let _0x46282c = 0x1 * 0x238 + 0x252d + -0x2745 + 0.5;
let _0x1680c5 = -0x14ad + -0x187 * 0x15 + -0x30 * -0x11a + 0.5;
_0x93f360++;
for (let _0x132623 = -0x174b + 0x19 * -0xb7 + 0x292a; _0x132623 < _0x124180; _0x132623++) {
let _0x1859c2 = (_0x132623 - _0x124180 / (-0x3e5 * 0x8 + -0x1e7b + -0x3da5 * -0x1)) / _0x591e4f;
for (let _0x1a573d = 0x2440 + -0x262f + -0x1ef * -0x1; _0x1a573d < _0x591e4f; _0x1a573d++) {
let _0x58642d = (_0x1a573d - _0x591e4f / (0x14f4 + 0x24b * 0x11 + -0x3bed)) / _0x591e4f;
let _0x3109fa = -0x7ca + 0x5 * -0x503 + 0x349 * 0xa;
let _0x1df399 = _0x3109fa * _0x159021 + _0x58642d * _0x11f9a2;
let _0x8e77ec = _0x58642d * _0x159021 - _0x3109fa * _0x11f9a2;
let _0x5d0446 = _0x1859c2 * _0x1ac9ca + _0x1df399 * _0x49fc16;
let _0x14ed58 = _0x1df399 * _0x1ac9ca - _0x1859c2 * _0x49fc16;
let _0x13f1b0 = 0x1af9 + -0x3 * 0xc1b + 0x34 * 0x2e;
let _0x2062a9 = -0x6c * -0x21 + -0x13bb * 0x1 + 0x43 * 0x1a;
let _0x5c387a = 0x1124 + 0x862 * 0x2 + 0x9b * -0x38;
let _0x267dd3 = -0x986 + 0x5 * 0x1f5 + 0x5 * -0x7;
for (
let _0x3e178a = -0xf01 + 0xd * -0x59 + 0x93 * 0x22;
_0x3e178a < -0x16f6 + -0x204b * 0x1 + -0x36 * -0x106;
_0x3e178a++
) {
let _0x828a0c = _0x5d0446;
if (_0x3e178a == 0x411 * -0x7 + 0x2 * 0x80f + 0x11 * 0xba) _0x828a0c = _0x8e77ec;
if (_0x3e178a == -0x1e6d + -0xdb1 * -0x1 + 0x85f * 0x2) _0x828a0c = _0x14ed58;
let _0x57383c =
(0x18ab + 0x183f + -0x1 * 0x30e9) /
(_0x828a0c < 0x25 * -0xe3 + -0x2424 + 0x44f3 ? -_0x828a0c : _0x828a0c);
let _0x4b089b = _0x5d0446 * _0x57383c;
let _0x5b3085 = _0x8e77ec * _0x57383c;
let _0x1eaaad = _0x14ed58 * _0x57383c;
let _0x2a568a = _0x116a45 - (_0x116a45 | (-0xcdb + 0x1447 + -0x13 * 0x64));
if (_0x3e178a == 0x1 * -0x1048 + -0x7ea + -0x4d7 * -0x5)
_0x2a568a = _0x46282c - (_0x46282c | (-0x1db5 + 0x1 * -0x35 + -0x223 * -0xe));
if (_0x3e178a == 0x107e + 0x2c7 + -0x1343 * 0x1)
_0x2a568a = _0x1680c5 - (_0x1680c5 | (0x234d + -0x2368 + -0x3 * -0x9));
if (_0x828a0c > 0xe00 + 0xc9b * -0x1 + -0x165)
_0x2a568a = 0xb * -0x117 + 0x1 * -0x1e0b + 0x2a09 - _0x2a568a;
let _0x38c463 = _0x57383c * _0x2a568a;
let _0x227002 = _0x116a45 + _0x4b089b * _0x2a568a;
let _0x2aec99 = _0x46282c + _0x5b3085 * _0x2a568a;
let _0x32116b = _0x1680c5 + _0x1eaaad * _0x2a568a;
if (_0x828a0c < 0x180b + 0x19e3 * 0x1 + 0x391 * -0xe) {
if (_0x3e178a == 0x1313 * -0x2 + 0x1 * 0x2605 + -0x1 * -0x21) _0x227002--;
if (_0x3e178a == 0x3d * 0x15 + 0x114d + 0x164d * -0x1) _0x2aec99--;
if (_0x3e178a == -0x1c1 * -0x8 + -0x60c + -0x3fd * 0x2) _0x32116b--;
}
while (_0x38c463 < _0x267dd3) {
let _0x3db6a4 =
_0x39dbea[
((_0x32116b & (-0x3 * 0x1f3 + 0x1ef2 + -0x18da * 0x1)) <<
(-0x8d3 * 0x2 + -0x1f7 * 0x9 + 0x2361)) |
((_0x2aec99 & (-0x1a92 + 0x6b8 + 0x1419)) << (-0xe71 * 0x1 + -0x788 + 0x15ff)) |
(_0x227002 & (0x1897 + 0x2134 + -0x398c))
];
if (_0x3db6a4 > -0x18f6 + 0x513 * 0x2 + 0xed0) {
let _0x546fb5 =
((_0x227002 + _0x32116b) * (-0x861 + -0x16bd + 0x1f2e)) &
(0xd1c + -0x94 * -0x8 + -0x11ad);
let _0x1667c5 =
((_0x2aec99 * (-0x16f5 * -0x1 + -0x47 * -0x2f + 0x2a * -0xdb)) &
(-0x2469 + 0x156a * -0x1 + 0x39e2)) +
(-0x1 * 0x13f8 + 0x6df + -0x1 * -0xd29);
if (_0x3e178a == 0x1 * -0x1a87 + 0x1fdd + -0x555 * 0x1) {
(_0x546fb5 =
(_0x227002 * (-0x10d7 + 0x1 * 0x15ad + -0x2 * 0x263)) &
(-0x25ca * 0x1 + 0x8 * 0x278 + -0x1 * -0x1219)),
(_0x1667c5 =
(_0x32116b * (0x4d3 + 0x1c09 * -0x1 + 0x3 * 0x7c2)) &
(-0xf06 * 0x2 + -0x144f * -0x1 + -0x344 * -0x3));
if (_0x5b3085 < -0xa * 0xed + -0xd19 + 0x1 * 0x165b)
_0x1667c5 += -0xd48 + 0xf6c + 0xc * -0x2b;
}
let _0x5206c3 =
_0x391e96[
_0x546fb5 +
_0x1667c5 * (0x1c90 + 0x2 * -0x1297 + 0x8ae) +
_0x3db6a4 *
(0x208 * -0x13 + -0x2550 + 0x1 * 0x4ce8) *
(0xbc5 + -0x7b3 * -0x2 + -0x58 * 0x4f)
];
_0x5206c3 > 0x65a * -0x4 + 0xf9a + -0x5 * -0x1f6 &&
((_0x13f1b0 = _0x5206c3),
(_0x5c387a =
0x181c +
0x1449 +
-0x2b66 -
(((_0x38c463 / (-0x15 * -0x59 + -0x3 * -0x3c9 + 0x944 * -0x2)) *
(0x9cd * 0x1 + -0x15ce + 0x100 * 0xd)) |
(-0xc * -0x2a0 + 0x1 * -0x23bf + 0x43f))),
(_0x2062a9 =
((0x7a0 + 0x3f * 0x51 + 0x8 * -0x352) *
(-0xf60 +
0x21e9 +
-0xa * 0x1c1 -
((_0x3e178a + (0x1439 + -0x1049 + -0x1 * 0x3ee)) %
(-0xbd7 + -0x1 * -0x7d5 + 0x405)) *
(0x214 * -0x7 + 0x17 * 0x7 + 0xe1d * 0x1))) /
(-0x2709 + -0x6 * -0x312 + -0x39a * -0x6)),
(_0x267dd3 = _0x38c463));
}
(_0x227002 += _0x4b089b),
(_0x2aec99 += _0x5b3085),
(_0x32116b += _0x1eaaad),
(_0x38c463 += _0x57383c);
}
}
let _0x5cba48 =
(((_0x13f1b0 >> (0x8bb + 0x407 * -0x2 + -0x9d * 0x1)) & (-0xc6 + 0xb43 + -0x97e)) *
_0x2062a9 *
_0x5c387a) /
((-0x1df7 * -0x1 + -0x48b * 0x1 + -0x186d) * (-0x5 * -0x585 + -0x1497 + -0x603));
let _0x48b547 =
(((_0x13f1b0 >> (-0xa42 + -0x760 * 0x2 + 0x5 * 0x502)) &
(0xb31 + 0x1 * -0x538 + 0x31 * -0x1a)) *
_0x2062a9 *
_0x5c387a) /
((-0x1cff * -0x1 + -0xecd + -0xd33) * (-0x1 * 0x4d5 + 0x2440 + -0x2c * 0xb1));
let _0xdf8389 =
((_0x13f1b0 & (-0x247a + -0x4 * -0x9c2 + -0x39 * 0x7)) * _0x2062a9 * _0x5c387a) /
((0x1d5 * 0xa + -0x250a + -0x31 * -0x67) * (-0x7 * 0x25f + -0xae7 + 0x1c7f * 0x1));
(_0x228047[_0x4626de(0x8e)][
(_0x132623 + _0x1a573d * _0x124180) * (0x29 * -0xa9 + -0x94 * -0x2b + -0x239 * -0x1) +
(0x55d * 0x2 + 0xeed * 0x1 + -0xc7 * 0x21)
] = _0x5cba48),
(_0x228047[_0x4626de(0x8e)][
(_0x132623 + _0x1a573d * _0x124180) * (0x9 * -0x205 + -0xfb7 * 0x1 + -0x1c * -0x136) +
(-0x1 * -0x1e79 + 0x10cd + -0x2f45)
] = _0x48b547),
(_0x228047[_0x4626de(0x8e)][
(_0x132623 + _0x1a573d * _0x124180) * (0x1e2a + -0x21df + -0x1 * -0x3b9) +
(0x1e79 + 0x860 * -0x2 + 0x1 * -0xdb7)
] = _0xdf8389);
}
}
}
function _0x9cb4(_0x473675, _0x42315f) {
let _0x1c3f44 = _0x58e5();
return (
(_0x9cb4 = function (_0x2f27e0, _0x487e61) {
_0x2f27e0 -= -0x6c7 * -0x2 + 0x1 * -0x1b75 + -0x4 * -0x39a;
let _0x44ff4c = _0x1c3f44[_0x2f27e0];
return _0x44ff4c;
}),
_0x9cb4(_0x473675, _0x42315f)
);
}
_0x3ebd0f();
console.log('404 page loaded');
}, []);
return (
<div className='relative h-screen w-screen flex items-center justify-center overflow-hidden bg-white'>
{/* Canvas Container */}
<div className='relative h-full w-full'>
<canvas
ref={canvasRef}
className='absolute left-1/2 top-1/2 h-full w-full object-contain -translate-x-1/2 -translate-y-1/2'
style={{
maxWidth: '100vw',
maxHeight: '100vh',
aspectRatio: ASPECT_RATIO,
imageRendering: 'crisp-edges',
}}
/>
</div>
{/* 404 Text Overlay */}
<div className='absolute left-1/2 top-1/2 z-10 -translate-x-1/2 -translate-y-1/2'>
<h1 className='text-8xl text-white font-bold'>404 Page not found</h1>
</div>
</div>
);
}

27
src/pages/404/index.html Normal file
View File

@@ -0,0 +1,27 @@
<!doctype html>
<html lang="en">
<head>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<meta name="theme-color" content="#000000" />
<title>404</title>
</head>
<style type="text/css">
body {
margin: 0;
padding: 0;
display: flex;
justify-content: center;
align-items: center;
overflow: hidden;
}
</style>
<body>
<noscript>You need to enable JavaScript to run this app.</noscript>
<div id="root"></div>
<script src="./index.tsx" type="module"></script>
</body>
</html>

8
src/pages/404/index.tsx Normal file
View File

@@ -0,0 +1,8 @@
import 'uno.css';
import React from 'react';
import { createRoot } from 'react-dom/client';
import Page404 from './Page404';
createRoot(document.getElementById('root')!).render(<Page404 />);

View File

@@ -32,7 +32,7 @@ chrome.runtime.onInstalled.addListener(details => {
});
// migration/login logic
chrome.tabs.onUpdated.addListener(async (tabId, changeInfo, tab) => {
chrome.tabs.onUpdated.addListener(async (tabId, changeInfo) => {
// console.log(changeInfo);
if (changeInfo.url === 'https://utdirect.utexas.edu/apps/registrar/course_schedule/utrp_login/') {
function openPopupAction() {
@@ -59,15 +59,11 @@ messageListener.listen();
UserScheduleStore.listen('schedules', async schedules => {
const index = await UserScheduleStore.get('activeIndex');
const numCourses = schedules.newValue[index]?.courses?.length;
if (!numCourses) return;
updateBadgeText(numCourses);
updateBadgeText(numCourses || 0);
});
UserScheduleStore.listen('activeIndex', async ({ newValue }) => {
const schedules = await UserScheduleStore.get('schedules');
const numCourses = schedules[newValue]?.courses?.length;
if (!numCourses) return;
updateBadgeText(numCourses);
updateBadgeText(numCourses || 0);
});

View File

@@ -2,6 +2,8 @@ import type { TabWithId } from '@background/util/openNewTab';
import openNewTab from '@background/util/openNewTab';
import { tabs } from '@shared/messages';
import type { CalendarBackgroundMessages } from '@shared/messages/CalendarMessages';
import { OptionsStore } from '@shared/storage/OptionsStore';
import { CRX_PAGES } from '@shared/types/CRXPages';
import type { MessageHandler } from 'chrome-extension-toolkit';
const getAllTabInfos = async () => {
@@ -21,13 +23,13 @@ const getAllTabInfos = async () => {
const calendarBackgroundHandler: MessageHandler<CalendarBackgroundMessages> = {
async switchToCalendarTab({ data, sendResponse }) {
const { uniqueId } = data;
const calendarUrl = chrome.runtime.getURL(`calendar.html`);
const calendarUrl = chrome.runtime.getURL(CRX_PAGES.CALENDAR);
const allTabs = await getAllTabInfos();
const openCalendarTabInfo = allTabs.find(tab => tab.url?.startsWith(calendarUrl));
if (openCalendarTabInfo !== undefined) {
if (openCalendarTabInfo !== undefined && !(await OptionsStore.get('alwaysOpenCalendarInNewTab'))) {
const tabid = openCalendarTabInfo.tab.id;
await chrome.tabs.update(tabid, { active: true });

View File

@@ -2,16 +2,18 @@ import addCourse from '@pages/background/lib/addCourse';
import clearCourses from '@pages/background/lib/clearCourses';
import createSchedule from '@pages/background/lib/createSchedule';
import deleteSchedule from '@pages/background/lib/deleteSchedule';
import exportSchedule from '@pages/background/lib/exportSchedule';
import removeCourse from '@pages/background/lib/removeCourse';
import renameSchedule from '@pages/background/lib/renameSchedule';
import switchSchedule from '@pages/background/lib/switchSchedule';
import type { UserScheduleMessages } from '@shared/messages/UserScheduleMessages';
import { Course } from '@shared/types/Course';
import { validateLoginStatus } from '@shared/util/checkLoginStatus';
import type { MessageHandler } from 'chrome-extension-toolkit';
const userScheduleHandler: MessageHandler<UserScheduleMessages> = {
addCourse({ data, sendResponse }) {
addCourse(data.scheduleId, new Course(data.course)).then(sendResponse);
addCourse(data.scheduleId, new Course(data.course), data.hasColor ?? false).then(sendResponse);
},
removeCourse({ data, sendResponse }) {
removeCourse(data.scheduleId, new Course(data.course)).then(sendResponse);
@@ -31,6 +33,21 @@ const userScheduleHandler: MessageHandler<UserScheduleMessages> = {
renameSchedule({ data, sendResponse }) {
renameSchedule(data.scheduleId, data.newName).then(sendResponse);
},
// proxy so we can add courses
addCourseByURL({ data: { url, method, body, response }, sendResponse }) {
fetch(url, {
method,
body,
})
.then(res => (response === 'json' ? res.json() : res.text()))
.then(sendResponse);
},
validateLoginStatus({ data, sendResponse }) {
validateLoginStatus(data.url).then(sendResponse);
},
exportSchedule({ data, sendResponse }) {
exportSchedule(data.scheduleId).then(sendResponse);
},
};
export default userScheduleHandler;

View File

@@ -4,21 +4,26 @@ import { getUnusedColor } from '@shared/util/colors';
/**
* Adds a course to a user's schedule.
*
* @param scheduleId - The id of the schedule to add the course to.
* @param course - The course to add.
* @param hasColor - If the course block already has colors manually set
* @returns A promise that resolves to void.
* @throws An error if the schedule is not found.
*/
export default async function addCourse(scheduleId: string, course: Course): Promise<void> {
export default async function addCourse(scheduleId: string, course: Course, hasColor = false): Promise<void> {
const schedules = await UserScheduleStore.get('schedules');
const activeSchedule = schedules.find(s => s.id === scheduleId);
if (!activeSchedule) {
throw new Error('Schedule not found');
}
if (!hasColor) {
course.colors = getUnusedColor(activeSchedule, course);
}
activeSchedule.courses.push(course);
activeSchedule.updatedAt = Date.now();
await UserScheduleStore.set('schedules', schedules);
console.log(`Course added: ${course.courseName} (ID: ${course.uniqueId})`);
}

View File

@@ -0,0 +1,65 @@
import addCourse from '@pages/background/lib/addCourse';
import { background } from '@shared/messages';
import type { UserSchedule } from '@shared/types/UserSchedule';
import { CourseCatalogScraper } from '@views/lib/CourseCatalogScraper';
import getCourseTableRows from '@views/lib/getCourseTableRows';
import { SiteSupport } from '@views/lib/getSiteSupport';
/**
* Adds a course to the active schedule by fetching course details from a provided URL.
* If no URL is provided, prompts the user to enter one.
* Sriram and Elie made this
*
* @param activeSchedule - The user's active schedule to which the course will be added.
* @param link - The URL from which to fetch the course details. If not provided, a prompt will ask for it.
*
* @returns A promise that resolves when the course has been added or the operation is cancelled.
*
* @throws an error if there is an issue with scraping the course details.
*/
export async function addCourseByURL(activeSchedule: UserSchedule, link?: string): Promise<void> {
// todo: Use a proper modal instead of a prompt
// eslint-disable-next-line no-param-reassign, no-alert
if (!link) link = prompt('Enter course link') || undefined;
// Exit if the user cancels the prompt
if (!link) {
return;
}
try {
let htmlText: string;
try {
htmlText = await background.addCourseByURL({
url: link,
method: 'GET',
response: 'text',
});
} catch (e) {
// eslint-disable-next-line no-alert
alert(`Failed to fetch url '${link}'`);
return;
}
const doc = new DOMParser().parseFromString(htmlText, 'text/html');
const scraper = new CourseCatalogScraper(SiteSupport.COURSE_CATALOG_DETAILS, doc, link);
const tableRows = getCourseTableRows(doc);
const scrapedCourses = scraper.scrape(tableRows, false);
if (scrapedCourses.length !== 1) return;
const description = scraper.getDescription(doc);
const row = scrapedCourses[0]!;
const course = row.course!;
course.description = description;
if (activeSchedule.courses.every(c => c.uniqueId !== course.uniqueId)) {
console.log('Adding course');
await addCourse(activeSchedule.id, course);
} else {
console.log('Course already exists');
}
} catch (error) {
console.error('Error scraping course:', error);
}
}

View File

@@ -5,8 +5,9 @@ import type { Serialized } from 'chrome-extension-toolkit';
/**
* Creates a new schedule with the given name
* @param scheduleName the name of the schedule to create
* @returns undefined if successful, otherwise an error message
*
* @param scheduleName - The name of the schedule to create
* @returns Undefined if successful, otherwise an error message
*/
export default async function createSchedule(scheduleName: string) {
const schedules = await UserScheduleStore.get('schedules');

View File

@@ -18,20 +18,18 @@ export default async function deleteSchedule(scheduleId: string): Promise<string
if (scheduleIndex === -1) {
throw new Error(`Schedule ${scheduleId} does not exist`);
}
if (scheduleIndex === activeIndex) {
throw new Error(`Cannot delete active schedule`);
}
if (scheduleIndex < activeIndex) {
await UserScheduleStore.set('activeIndex', activeIndex - 1);
}
schedules.splice(scheduleIndex, 1);
await UserScheduleStore.set('schedules', schedules);
if (activeIndex >= schedules.length) {
await UserScheduleStore.set('activeIndex', schedules.length - 1);
let newActiveIndex = activeIndex;
if (scheduleIndex < activeIndex) {
newActiveIndex = activeIndex - 1;
} else if (activeIndex >= schedules.length) {
newActiveIndex = schedules.length - 1;
}
await UserScheduleStore.set('activeIndex', newActiveIndex);
return undefined;
}

View File

@@ -5,20 +5,24 @@ import handleDuplicate from './handleDuplicate';
/**
* Creates a new schedule with the given name
* @param scheduleName the name of the schedule to create
* @returns undefined if successful, otherwise an error message
*
* @param scheduleName - The name of the schedule to create
* @returns Undefined if successful, otherwise an error message
*/
export default async function duplicateSchedule(scheduleId: string): Promise<string | undefined> {
const schedules = await UserScheduleStore.get('schedules');
const schedule = schedules.find(schedule => schedule.id === scheduleId);
const scheduleIndex = schedules.findIndex(schedule => schedule.id === scheduleId);
if (schedule === undefined) {
if (scheduleIndex === -1) {
throw new Error(`Schedule ${scheduleId} does not exist`);
}
const updatedName = await handleDuplicate(schedule.name);
const schedule = schedules[scheduleIndex]!;
schedules.push({
const copyOfName = `Copy of ${schedule.name}`;
const updatedName = await handleDuplicate(copyOfName);
schedules.splice(scheduleIndex + 1, 0, {
id: generateRandomId(),
name: updatedName,
courses: JSON.parse(JSON.stringify(schedule.courses)),

View File

@@ -0,0 +1,24 @@
import { UserScheduleStore } from '@shared/storage/UserScheduleStore';
/**
* Exports the provided schedule to a portable JSON
*
* @param scheduleId - The Id matching the to-be-exported schedule
* @returns JSON format of the provided schedule ID, empty if one was not found
*/
export default async function exportSchedule(scheduleId: string): Promise<string | undefined> {
try {
const storageData = await UserScheduleStore.get('schedules');
const selectedSchedule = storageData.find(s => s.id === scheduleId);
if (!selectedSchedule) {
console.warn(`Schedule ${scheduleId} does not exist`);
return JSON.stringify({});
}
console.log(selectedSchedule);
return JSON.stringify(selectedSchedule, null, 2);
} catch (error) {
console.error('Error getting storage data:', error);
}
}

View File

@@ -3,9 +3,10 @@ import { UserScheduleStore } from '@shared/storage/UserScheduleStore';
/**
* Duplicates a new schedule with the given name.
* Assumes that each schedule has a unique name.
* @param scheduleName the name of the schedule to handle duplication for
* @param schedules the list of UserSchedules to find existing names
* @returns the new name for the schedule, of the form `{baseName}({index})`
*
* @param scheduleName - The name of the schedule to handle duplication for
* @param schedules - The list of UserSchedules to find existing names
* @returns The new name for the schedule, of the form `{baseName}({index})`
*/
export default async function handleDuplicate(scheduleName: string): Promise<string> {
const schedules = await UserScheduleStore.get('schedules');

View File

@@ -0,0 +1,34 @@
import { Course } from '@shared/types/Course';
import type { UserSchedule } from '@shared/types/UserSchedule';
import type { Serialized } from 'chrome-extension-toolkit';
import addCourse from './addCourse';
import createSchedule from './createSchedule';
import switchSchedule from './switchSchedule';
function isValidSchedule(data: unknown): data is Serialized<UserSchedule> {
if (typeof data !== 'object' || data === null) return false;
const schedule = data as Record<string, unknown>;
return typeof schedule.id === 'string' && typeof schedule.name === 'string' && Array.isArray(schedule.courses);
}
/**
* Imports a user schedule from portable file, creating a new schedule for it
* @param scheduleData - Data to be parsed back into a course schedule
*/
export default async function importSchedule(scheduleData: unknown): Promise<void> {
if (isValidSchedule(scheduleData)) {
const newScheduleId = await createSchedule(scheduleData.name);
await switchSchedule(newScheduleId);
for (const c of scheduleData.courses) {
const course = new Course(c);
// eslint-disable-next-line no-await-in-loop
await addCourse(newScheduleId, course, true);
}
console.log('Course schedule successfully parsed!');
} else {
console.error('No schedule data provided for import');
}
}

View File

@@ -1,18 +1,27 @@
import CourseCatalogMain from '@views/components/CourseCatalogMain';
import InjectedButton from '@views/components/injected/AddAllButton';
import getSiteSupport, { SiteSupport } from '@views/lib/getSiteSupport';
import React from 'react';
import { createRoot } from 'react-dom/client';
const support = getSiteSupport(window.location.href);
if (support === SiteSupport.COURSE_CATALOG_DETAILS || support === SiteSupport.COURSE_CATALOG_LIST) {
const renderComponent = (Component: React.ComponentType) => {
const container = document.createElement('div');
container.id = 'extension-root';
document.body.appendChild(container);
createRoot(container).render(
<React.StrictMode>
<CourseCatalogMain support={support} />
<Component />
</React.StrictMode>
);
};
if (support === SiteSupport.COURSE_CATALOG_DETAILS || support === SiteSupport.COURSE_CATALOG_LIST) {
renderComponent(() => <CourseCatalogMain support={support} />);
}
if (support === SiteSupport.MY_UT) {
renderComponent(InjectedButton);
}

19
src/pages/map/Map.tsx Normal file
View File

@@ -0,0 +1,19 @@
import DialogProvider from '@views/components/common/DialogProvider/DialogProvider';
import ExtensionRoot from '@views/components/common/ExtensionRoot/ExtensionRoot';
import Map from '@views/components/map/Map';
import useKC_DABR_WASM from 'kc-dabr-wasm';
import React from 'react';
/**
* Renders the map page for the UTRP (UT Registration Plus) extension.
*/
export default function MapPage() {
useKC_DABR_WASM();
return (
<ExtensionRoot>
<DialogProvider>
<Map />
</DialogProvider>
</ExtensionRoot>
);
}

16
src/pages/map/index.html Normal file
View File

@@ -0,0 +1,16 @@
<!doctype html>
<html lang="en">
<head>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<meta name="theme-color" content="#000000" />
<title>UTRP Map</title>
</head>
<body style="min-height: 100vh; height: 0; margin: 0">
<noscript>You need to enable JavaScript to run this app.</noscript>
<div id="root"></div>
<script src="./index.tsx" type="module"></script>
</body>
</html>

6
src/pages/map/index.tsx Normal file
View File

@@ -0,0 +1,6 @@
import React from 'react';
import { createRoot } from 'react-dom/client';
import Map from './Map';
createRoot(document.getElementById('root')!).render(<Map />);

View File

@@ -9,7 +9,7 @@
body {
margin: 0;
padding: 0;
width: 400px;
width: 430px;
height: 540px;
}
</style>

View File

@@ -2,7 +2,7 @@ interface CESMessage {
/**
* Opens the CES page for the specified instructor
*
* @param data first and last name of the instructor
* @param data - First and last name of the instructor
*/
openCESPage: (data: { instructorFirstName: string; instructorLastName: string }) => chrome.tabs.Tab;
}

View File

@@ -4,17 +4,22 @@
export default interface TabManagementMessages {
/**
* Opens a new tab with the given URL
* @param data The URL to open
*
* @param data - The URL to open
*/
openNewTab: (data: { url: string }) => chrome.tabs.Tab;
/**
* Gets the ID of the current tab (the tab that sent the message)
*
* @returns The ID of the current tab
*/
getTabId: () => number;
/**
* Removes the tab with the given ID
* @param data The ID of the tab to remove
*
* @param data - The ID of the tab to remove
* @returns The ID of the tab that was removed
*/
removeTab: (data: { tabId: number }) => void;

View File

@@ -6,42 +6,77 @@ import type { Course } from '@shared/types/Course';
export interface UserScheduleMessages {
/**
* Add a course to a schedule
* @param data the schedule id and course to add
*
* @param data - The schedule id and course to add
*/
addCourse: (data: { scheduleId: string; course: Course }) => void;
addCourse: (data: { scheduleId: string; course: Course; hasColor?: boolean }) => void;
/**
* Adds a course by URL
*
* @param data - The URL of the course to add
* @returns Response of the requested course URL
*/
addCourseByURL: (data: { url: string; method: string; body?: string; response: 'json' | 'text' }) => string;
/**
* Remove a course from a schedule
* @param data the schedule id and course to remove
*
* @param data - The schedule id and course to remove
*/
removeCourse: (data: { scheduleId: string; course: Course }) => void;
/**
* Clears all courses from a schedule
* @param data the id of the schedule to clear
*
* @param data - The id of the schedule to clear
*/
clearCourses: (data: { scheduleId: string }) => void;
/**
* Switches the active schedule to the one specified
* @param data the id of the schedule to switch to
*
* @param data - The id of the schedule to switch to
*/
switchSchedule: (data: { scheduleId: string }) => void;
/**
* Creates a new schedule with the specified name
* @param data the name of the schedule to create
* @returns undefined if successful, otherwise an error message
*
* @param data - The name of the schedule to create
* @returns Undefined if successful, otherwise an error message
*/
createSchedule: (data: { scheduleName: string }) => string | undefined;
/**
* Deletes a schedule with the specified name
* @param data the id of the schedule to delete
* @returns undefined if successful, otherwise an error message
*
* @param data - The id of the schedule to delete
* @returns Undefined if successful, otherwise an error message
*/
deleteSchedule: (data: { scheduleId: string }) => string | undefined;
/**
* Renames a schedule with the specified name
* @param data the id of the schedule to rename and the new name
* @returns undefined if successful, otherwise an error message
*
* @param data - The id of the schedule to rename and the new name
* @returns Undefined if successful, otherwise an error message
*/
renameSchedule: (data: { scheduleId: string; newName: string }) => string | undefined;
/**
* Checks the login status by making a request to the provided URL.
*
* @param data - The URL to check the login status against.
* @returns true if user was already logged into the provided URL, false otherwise
*/
validateLoginStatus: (data: { url: string }) => boolean;
/**
* Exports the current schedule to a JSON file for backing up and sharing
*
* @param data - Id of schedule that will be exported
* @returns
*/
exportSchedule: (data: { scheduleId: string }) => string | undefined;
}

View File

@@ -0,0 +1,15 @@
import type { CachedData } from '@shared/types/CachedData';
import { createLocalStore, debugStore } from 'chrome-extension-toolkit';
interface ICacheStore {
github: Record<string, CachedData<unknown>>;
}
/**
* A store that is used for storing cached data such as GitHub contributors
*/
export const CacheStore = createLocalStore<ICacheStore>({
github: {},
});
debugStore({ cacheStore: CacheStore });

View File

@@ -4,6 +4,8 @@ import { createLocalStore, debugStore } from 'chrome-extension-toolkit';
* A store that is used to store data that is only relevant during development
*/
interface IDevStore {
/** whether the user is a developer */
isDeveloper: boolean;
/** the tabId for the debug tab */
debugTabId?: number;
/** whether the debug tab is visible */
@@ -17,6 +19,7 @@ interface IDevStore {
}
export const DevStore = createLocalStore<IDevStore>({
isDeveloper: false,
debugTabId: undefined,
isTabReloading: true,
wasDebugTabVisible: false,

View File

@@ -7,9 +7,6 @@ export interface IOptionsStore {
/** whether we should enable course status chips (indicator for waitlisted, cancelled, and closed courses) */
enableCourseStatusChips: boolean;
/** whether we should enable course's time and location in the extension's popup */
enableTimeAndLocationInPopup: boolean;
/** whether we should automatically highlight conflicts on the course schedule page (adds a red strikethrough to courses that have conflicting times) */
enableHighlightConflicts: boolean;
@@ -18,27 +15,31 @@ export interface IOptionsStore {
/** whether we should automatically refresh the data for the waitlist, course status, and other info with the latest data from UT's site */
enableDataRefreshing: boolean;
/** whether we should open the calendar in a new tab; default is to focus an existing calendar tab */
alwaysOpenCalendarInNewTab: boolean;
}
export const OptionsStore = createSyncStore<IOptionsStore>({
enableCourseStatusChips: false,
enableTimeAndLocationInPopup: false,
enableHighlightConflicts: true,
enableScrollToLoad: true,
enableDataRefreshing: true,
enableDataRefreshing: false,
alwaysOpenCalendarInNewTab: false,
});
/**
* Initializes the settings by retrieving the values from the OptionsStore.
* @returns {Promise<IOptionsStore>} A promise that resolves to an object satisfying the IOptionsStore interface.
*
* @returns A promise that resolves to an object satisfying the IOptionsStore interface.
*/
export const initSettings = async () =>
({
enableCourseStatusChips: await OptionsStore.get('enableCourseStatusChips'),
enableTimeAndLocationInPopup: await OptionsStore.get('enableTimeAndLocationInPopup'),
enableHighlightConflicts: await OptionsStore.get('enableHighlightConflicts'),
enableScrollToLoad: await OptionsStore.get('enableScrollToLoad'),
enableDataRefreshing: await OptionsStore.get('enableDataRefreshing'),
alwaysOpenCalendarInNewTab: await OptionsStore.get('alwaysOpenCalendarInNewTab'),
}) satisfies IOptionsStore;
// Clothing retailer right

View File

@@ -0,0 +1,16 @@
/**
* An object containing the paths to various pages used in the CRX application.
*/
export const CRX_PAGES = {
DEBUG: '/debug.html',
CALENDAR: '/calendar.html',
OPTIONS: '/options.html',
MAP: '/map.html',
REPORT: '/report.html',
} as const;
/**
* Represents a type that corresponds to the keys of the `CRX_PAGES` object.
* This type is used to ensure that only valid page keys are used within the application.
*/
export type CRX_Page = keyof typeof CRX_PAGES;

View File

@@ -0,0 +1,7 @@
/**
* Represents cached data with its fetch timestamp
*/
export type CachedData<T> = {
data: T;
dataFetched: number;
};

View File

@@ -25,3 +25,8 @@ export type sRGB = [r: number, g: number, b: number];
* Represents a Lab color value.
*/
export type Lab = [l: number, a: number, b: number];
/**
* Represents a HSL color value.
*/
export type HSL = [h: number, s: number, l: number];

View File

@@ -79,6 +79,8 @@ export class Course {
scrapedAt!: number;
/** The colors of the course when displayed */
colors: CourseColors;
/** The core curriculum requirements the course satisfies */
core: string[];
constructor(course: Serialized<Course>) {
Object.assign(this, course);
@@ -88,12 +90,14 @@ export class Course {
this.scrapedAt = Date.now();
}
this.colors = course.colors ? structuredClone(course.colors) : getCourseColors('emerald', 500);
this.core = course.core ?? [];
}
/**
* Gets a list of all the conflicts between this course and another course (i.e. if they have a meeting at the same time)
* @param other another course to compare this course to
* @returns a list of all the conflicts between this course and the other course as a tuple of the two conflicting meetings
*
* @param other - Another course to compare this course to
* @returns A list of all the conflicts between this course and the other course as a tuple of the two conflicting meetings
*/
getConflicts(other: Course): [CourseMeeting, CourseMeeting][] {
const conflicts: [CourseMeeting, CourseMeeting][] = [];

View File

@@ -48,13 +48,13 @@ export class CourseMeeting {
/**
* Whether or not this meeting conflicts with another meeting
* MWF 10:00 am - 11:00 am conflicts with a F 10:00 am - 10:30 am
* @param meeting the meeting to check for conflicts with
* @returns true if the given meeting conflicts with this meeting, false otherwise
*
* @remarks MWF 10:00 am - 11:00 am conflicts with a F 10:00 am - 10:30 am
* @param meeting - The meeting to check for conflicts with
* @returns True if the given meeting conflicts with this meeting, false otherwise
*/
isConflicting(meeting: CourseMeeting): boolean {
isConflicting({ days: otherDays, startTime: otherStartTime, endTime: otherEndTime }: CourseMeeting): boolean {
const { days, startTime, endTime } = this;
const { days: otherDays, startTime: otherStartTime, endTime: otherEndTime } = meeting;
const hasDayConflict = days.some(day => otherDays.includes(day));
const hasTimeConflict = startTime < otherEndTime && endTime > otherStartTime;
@@ -64,17 +64,17 @@ export class CourseMeeting {
/**
* Return the string representation of the days of the week that this meeting is taught
* @param options options for the string representation
* @returns string representation of the days of the week that this meeting is taught
*
* @param options - Options for the string representation
* @returns String representation of the days of the week that this meeting is taught
*/
getDaysString(options: DaysStringOptions): string {
let { format, separator } = options;
getDaysString({ format, separator }: DaysStringOptions): string {
let { days } = this;
if (format === 'short') {
days = Object.keys(DAY_MAP).filter(day => days.includes(DAY_MAP[day as keyof typeof DAY_MAP])) as Day[];
}
if (separator === 'none') {
if (!separator) {
return days.join('');
}
const listFormat = new Intl.ListFormat('en-US', {
@@ -86,10 +86,11 @@ export class CourseMeeting {
/**
* Return the string representation of the time range for the course
* @param options options for the string representation
* @returns string representation of the time range for the course
*
* @param options - Options for the string representation
* @returns String representation of the time range for the course
*/
getTimeString(options: TimeStringOptions): string {
getTimeString({ separator = '-' }: TimeStringOptions): string {
const { startTime, endTime } = this;
const startHour = Math.floor(startTime / 60);
const startMinute = startTime % 60;
@@ -108,7 +109,7 @@ export class CourseMeeting {
}
startTimeString += startMinute === 0 ? ':00' : `:${startMinute}`;
startTimeString += startHour >= 12 ? ' p.m.' : ' a.m.';
startTimeString += startHour >= 12 ? 'pm' : 'am';
if (endHour === 0) {
endTimeString = '12';
@@ -117,15 +118,11 @@ export class CourseMeeting {
} else {
endTimeString = `${endHour}`;
}
endTimeString += endMinute === 0 ? ':00' : `:${endMinute}`;
endTimeString += endHour >= 12 ? ' p.m.' : ' a.m.';
endTimeString += endHour >= 12 ? 'pm' : 'am';
if (options.capitalize) {
startTimeString = startTimeString.toUpperCase();
endTimeString = endTimeString.toUpperCase();
}
return `${startTimeString} ${options.separator} ${endTimeString}`;
return `${startTimeString} ${separator} ${endTimeString}`;
}
}
@@ -135,8 +132,6 @@ export class CourseMeeting {
type TimeStringOptions = {
/** the separator between the start and end times */
separator: string;
/** capitalizes the AM/PM */
capitalize?: boolean;
};
/**
@@ -156,5 +151,5 @@ type DaysStringOptions = {
*
* 'narrow' = `Monday Wednesday Friday`
*/
separator: Intl.ListFormatStyle | 'none';
separator?: Intl.ListFormatStyle;
};

View File

@@ -20,9 +20,10 @@ export class CourseSchedule {
/**
* Given a string representation of the meeting information for a class, parse it into a CourseMeeting object
* @param dayLine a string representation of the days of the week that the course is taught: MWF, TR, etc.
* @param timeLine a string representation of a time-range that the course is taught: 10:00 am - 11:00 am, 1:00 pm - 2:00 pm, etc.
* @param locLine a string representation of the location that the course is taught in: JGB 2.302, etc.
*
* @param dayLine - A string representation of the days of the week that the course is taught: MWF, TR, etc.
* @param timeLine - A string representation of a time-range that the course is taught: 10:00 am - 11:00 am, 1:00 pm - 2:00 pm, etc.
* @param locLine - A string representation of the location that the course is taught in: JGB 2.302, etc.
* @returns CourseMeeting object representing the meeting information
*/
static parse(dayLine: string, timeLine: string, locLine: string): CourseMeeting {

View File

@@ -16,68 +16,51 @@ export default class Instructor {
});
}
/**
* Get the URL to the instructor's directory page on the UT Directory website
* @returns a URL string to the instructor's directory page
*/
getDirectoryUrl(): string {
const name = this.toString({
format: 'full_name',
case: 'capitalize',
});
const url = new URL('https://directory.utexas.edu/index.php');
url.searchParams.set('q', name);
url.searchParams.set('scope', 'faculty/staff');
url.searchParams.set('submit', 'Search');
return url.toString();
}
/**
* Get a string representation of the instructor
* @param options the options for how to format the instructor string
* @returns a string representation of the instructor
*
* @param options - The options for how to format the instructor string
* @returns A string representation of the instructor
*/
toString(options: InstructorFormatOptions): string {
const { firstName, lastName, fullName } = this;
const { format, case: caseType } = options;
const { format } = options;
const process = (str: string) => {
if (caseType === 'lowercase') {
return str.toLowerCase();
}
if (caseType === 'uppercase') {
return str.toUpperCase();
}
return capitalize(str);
};
if (format === 'abbr' && firstName && lastName && firstName[0]) {
return `${process(firstName[0])}. ${process(lastName)}`;
}
if (format === 'full_name' && fullName) {
return process(fullName);
}
if (format === 'first_last' && firstName && lastName) {
return `${process(firstName)} ${process(lastName)}`;
}
if (format === 'last' && lastName) {
return process(lastName);
switch (format) {
case 'first_last':
if (firstName && lastName) {
return `${capitalize(firstName)} ${capitalize(lastName)}`;
}
if (lastName) {
return capitalize(lastName);
}
if (fullName) {
return fullName;
}
return '';
case 'last':
if (lastName) {
return capitalize(lastName);
}
if (fullName) {
return fullName;
}
return '';
default:
throw new Error(`Invalid Instructor String format: ${format}`);
}
}
}
/**
* Options for how to format the instructor string
*/
type InstructorFormatOptions = {
/** How do you want the names of the professors formatted */
format: 'abbr' | 'first_last' | 'last' | 'full_name';
/**
* What the case of the string should be
*/
case: 'capitalize' | 'lowercase' | 'uppercase';
format: 'first_last' | 'last';
};

View File

@@ -17,4 +17,9 @@ const MIMEType = {
*/
export type MIMETypeKey = keyof typeof MIMEType;
/**
* Represents a value of the MIMEType object
*/
export type MIMETypeValue = (typeof MIMEType)[MIMETypeKey];
export default MIMEType;

File diff suppressed because it is too large Load Diff

View File

@@ -0,0 +1,26 @@
/**
* An object representing various spacing values used throughout the application.
* Each key corresponds to a specific spacing size based on the 4px grid system.
*/
export const spacing = {
'spacing-1': '0.125rem',
'spacing-2': '0.25rem',
'spacing-3': '0.5rem',
'spacing-4': '0.75rem',
'spacing-5': '1rem',
'spacing-6': '1.25rem',
'spacing-7': '1.5rem',
'spacing-8': '2rem',
} as const;
type SpacingKey = keyof typeof spacing;
/**
* Converts a spacing value from rem to pixels
* @param key - The spacing key to convert
* @returns The spacing value in pixels
*/
export function getSpacingInPx(key: SpacingKey): number {
const remValue = parseFloat(spacing[key]);
return remValue * 16; // 1rem = 16px
}

View File

@@ -14,12 +14,17 @@ export const colors = {
blue: '#005F86',
gray: '#9CADB7',
offwhite: '#D6D2C4',
concrete: '#95A5A6',
red: '#B91C1C', // Not sure if this should be here, but it's used for remove course, and add course is ut-green
},
theme: {
red: '#BF0000',
red: '#D10000',
black: '#1A2024',
offwhite: '#D6D2C4',
black1: '#333F4850',
black2: '#333F4820',
staticwhite: '#FFFFFF',
staticblack: '#1A2024',
majorgridline: '#D1D5DB',
minorgridline: '#F3F4F6',
},
} as const satisfies Record<string, Record<string, string>>;
@@ -38,7 +43,7 @@ export const extendedColors = {
d: '#DC2626',
dminus: '#B91C1C',
f: '#B91C1C',
other: '#6B7280',
other: '#D6D3D1',
},
} as const;

View File

@@ -1,11 +1,11 @@
import type { Serialized } from 'chrome-extension-toolkit';
import { theme } from 'unocss/preset-mini';
import type { HexColor, Lab, RGB, sRGB } from '../types/Color';
import type { HexColor, HSL, Lab, RGB, sRGB } from '../types/Color';
import { isHexColor } from '../types/Color';
import type { Course } from '../types/Course';
import type { CourseColors, TWColorway, TWIndex } from '../types/ThemeColors';
import { colorwayIndexes } from '../types/ThemeColors';
import { colors, colorwayIndexes } from '../types/ThemeColors';
import type { UserSchedule } from '../types/UserSchedule';
/**
@@ -26,6 +26,19 @@ export function hexToRGB(hex: HexColor): RGB | undefined {
return [parseInt(result[1]!, 16), parseInt(result[2]!, 16), parseInt(result[3]!, 16)];
}
/**
* Checks if a given string is a valid hex color.
*
* A valid hex color is a string that starts with a '#' followed by either
* 3 or 6 hexadecimal characters (0-9, A-F, a-f).
*
* @param hex - The hex color string to validate.
* @returns True if the string is a valid hex color, false otherwise.
*/
export function isValidHexColor(hex: string): boolean {
return /^#?([A-Fa-f0-9]{6}|[A-Fa-f0-9]{3})$/.test(hex);
}
export const useableColorways = Object.keys(theme.colors)
// check that the color is a colorway (is an object)
.filter(color => typeof theme.colors[color as keyof typeof theme.colors] === 'object')
@@ -33,7 +46,9 @@ export const useableColorways = Object.keys(theme.colors)
/**
* Generate a Tailwind classname for the font color based on the background color
* @param bgColor the hex color of the background
*
* @param bgColor - The hex color of the background
* @returns The Tailwind classname for the font color
*/
export function pickFontColor(bgColor: HexColor): 'text-white' | 'text-black' | 'text-theme-black' {
const coefficients = [0.2126729, 0.7151522, 0.072175] as const;
@@ -54,9 +69,20 @@ export function pickFontColor(bgColor: HexColor): 'text-white' | 'text-black' |
return Ys < 0.365 ? 'text-black' : 'text-theme-black';
}
// Mapping of Tailwind CSS class names to their corresponding hex values
export const tailwindColorMap: Record<string, HexColor> = {
'text-white': '#FFFFFF',
'text-black': '#000000',
'text-theme-black': colors.theme.black,
};
/**
* Get primary and secondary colors from a Tailwind colorway
* @param colorway the Tailwind colorway ex. "emerald"
*
* @param colorway - The Tailwind colorway ex. "emerald"
* @param index - The index of the primary color in the colorway
* @param offset - The offset to get the secondary color
* @returns The primary and secondary colors
*/
export function getCourseColors(colorway: TWColorway, index?: number, offset: number = 300): CourseColors {
if (index === undefined) {
@@ -76,10 +102,15 @@ export function getCourseColors(colorway: TWColorway, index?: number, offset: nu
* @param color - The hexadecimal color value.
* @returns The Tailwind colorway.
*/
export function getColorwayFromColor(color: HexColor): TWColorway {
export function getColorwayFromColor(color: HexColor): {
colorway: TWColorway;
index: TWIndex;
} {
for (const colorway of useableColorways) {
if (Object.values(theme.colors[colorway]).includes(color)) {
return colorway as TWColorway;
const colorValues = Object.values(theme.colors[colorway]);
const index = colorValues.indexOf(color);
if (index !== -1) {
return { colorway: colorway as TWColorway, index: (index * 100) as TWIndex };
}
}
@@ -115,10 +146,159 @@ export function getColorwayFromColor(color: HexColor): TWColorway {
return getColorwayFromColor(closestColor);
}
/**
* Converts a hexadecimal color value to HSL (Hue, Saturation, Lightness) format
*
* @param hex - The hexadecimal color string
* @returns An array of [hue (0-360), saturation (0-100), lightness (0-100)]
* @throws If the hex color cannot be converted to RGB
*/
export const hexToHSL = (hex: HexColor): HSL => {
const rgb = hexToRGB(hex);
if (!rgb) {
throw new Error('hexToRGB returned undefined');
}
// Convert RGB to decimals
const r = rgb[0] / 255;
const g = rgb[1] / 255;
const b = rgb[2] / 255;
// Find min/max/delta
const max = Math.max(r, g, b);
const min = Math.min(r, g, b);
const delta = max - min;
// Calculate HSL values
let h = 0;
let s = 0;
let l = (max + min) / 2;
if (delta !== 0) {
// Calculate saturation
s = delta / (1 - Math.abs(2 * l - 1));
// Calculate hue
if (max === r) {
h = ((g - b) / delta) % 6;
} else if (max === g) {
h = (b - r) / delta + 2;
} else {
h = (r - g) / delta + 4;
}
h *= 60;
}
// Normalize values
h = Math.round(h < 0 ? h + 360 : h);
s = Math.round(s * 100);
l = Math.round(l * 100);
return [h, s, l];
};
/**
* Converts an HSL color value to RGB format.
*
* @param hsl - The HSL color value
* @returns An RGB color value
*/
function hslToRGB([hue, saturation, lightness]: HSL): RGB {
// Convert percentages to decimals
const s = saturation / 100;
const l = lightness / 100;
// Calculate intermediate values
const c = (1 - Math.abs(2 * l - 1)) * s;
const x = c * (1 - Math.abs(((hue / 60) % 2) - 1));
const m = l - c / 2;
let r = 0;
let g = 0;
let b = 0;
// Determine RGB values based on hue
if (hue >= 0 && hue < 60) {
[r, g, b] = [c, x, 0];
} else if (hue >= 60 && hue < 120) {
[r, g, b] = [x, c, 0];
} else if (hue >= 120 && hue < 180) {
[r, g, b] = [0, c, x];
} else if (hue >= 180 && hue < 240) {
[r, g, b] = [0, x, c];
} else if (hue >= 240 && hue < 300) {
[r, g, b] = [x, 0, c];
} else {
[r, g, b] = [c, 0, x];
}
// Convert to 0-255 range and round
return [Math.round((r + m) * 255), Math.round((g + m) * 255), Math.round((b + m) * 255)];
}
/**
* Returns a darker shade of the given hex color by reducing the lightness in HSL color space.
*
* @param color - The hexadecimal color value to darken.
* @param offset - The percentage to reduce the lightness by (default is 20).
* @returns The darker shade of the given hex color.
* @throws If the provided color is not a valid hex color.
*/
export function getDarkerShade(color: HexColor, offset: number = 20): HexColor {
const rgb = hexToRGB(color);
if (!rgb) {
throw new Error('color: Invalid hex.');
}
// Convert to HSL
const [h, s, l] = hexToHSL(color);
// Reduce lightness by offset percentage, ensuring it doesn't go below 0
const newL = Math.max(0, l - offset);
// Convert back to RGB
const newRGB = hslToRGB([h, s, newL]);
// Convert to hex
return `#${newRGB.map(c => Math.round(c).toString(16).padStart(2, '0')).join('')}`;
}
/**
* Returns a lighter shade of the given hex color by increasing the lightness in HSL color space.
*
* @param color - The hexadecimal color value to lighten.
* @param offset - The percentage to increase the lightness by (default is 20).
* @returns The lighter shade of the given hex color.
* @throws If the provided color is not a valid hex color.
*/
export function getLighterShade(color: HexColor, offset: number = 20): HexColor {
const rgb = hexToRGB(color);
if (!rgb) {
throw new Error('color: Invalid hex.');
}
// Convert to HSL
const [h, s, l] = hexToHSL(color);
// Increase lightness by offset percentage, ensuring it doesn't go above 100
const newL = Math.min(100, l + offset);
// Convert back to RGB
const newRGB = hslToRGB([h, s, newL]);
// Convert to hex
return `#${newRGB.map(c => Math.round(c).toString(16).padStart(2, '0')).join('')}`;
}
/**
* Get next unused color in a tailwind colorway for a given schedule
* @param schedule the schedule which the course is in
* @param course the course to get the color for
*
* @param schedule - The schedule which the course is in
* @param course - The course to get the color for
* @param index - The index of the primary color in the colorway
* @param offset - The offset to get the secondary color
* @returns The primary and secondary colors
*/
export function getUnusedColor(
schedule: Serialized<UserSchedule>,
@@ -143,17 +323,28 @@ export function getUnusedColor(
const scheduleCourses = schedule.courses.map(c => ({
...c,
colorway: getColorwayFromColor(c.colors.primaryColor),
theme: (() => {
try {
return getColorwayFromColor(c.colors.primaryColor);
} catch (error) {
// Default to emerald colorway with index 500
return {
colorway: 'emerald' as TWColorway,
index: 500 as TWIndex,
};
}
})(),
}));
const usedColorways = new Set(scheduleCourses.map(c => c.colorway));
const usedColorways = new Set(scheduleCourses.map(c => c.theme.colorway));
const availableColorways = new Set(useableColorways.filter(c => !usedColorways.has(c)));
if (availableColorways.size > 0) {
let sameDepartment = scheduleCourses.filter(c => c.department === course.department);
sameDepartment.sort((a, b) => {
const aIndex = useableColorways.indexOf(a.colorway);
const bIndex = useableColorways.indexOf(b.colorway);
const aIndex = useableColorways.indexOf(a.theme.colorway);
const bIndex = useableColorways.indexOf(b.theme.colorway);
return aIndex - bIndex;
});
@@ -162,8 +353,8 @@ export function getUnusedColor(
// check to see if any adjacent colorways are available
const centerCourse = sameDepartment[Math.floor(Math.random() * sameDepartment.length)]!;
let nextColorway = getNextColorway(centerCourse.colorway);
let prevColorway = getPreviousColorway(centerCourse.colorway);
let nextColorway = getNextColorway(centerCourse.theme.colorway);
let prevColorway = getPreviousColorway(centerCourse.theme.colorway);
// eslint-disable-next-line no-constant-condition
while (true) {
@@ -221,8 +412,9 @@ function rgbToSrgb(rgb: RGB): sRGB {
/**
* Convert an RGB color to the OKLab color space
* @param rgb the RGB color
* @returns the color in the OKLab color space
*
* @param rgb - The RGB color
* @returns The color in the OKLab color space
*/
function srgbToOKlab([r, g, b]: sRGB): Lab {
let l = 0.4122214708 * r + 0.5363325363 * g + 0.0514459929 * b;

View File

@@ -3,9 +3,10 @@ import MIMEType from '../types/MIMEType';
/**
* Downloads a blob by creating a temporary URL and triggering a download.
* @param blobPart The blob data to be downloaded.
* @param type The MIME type of the blob.
* @param fileName The name of the file to be downloaded.
*
* @param blobPart - The blob data to be downloaded.
* @param type - The MIME type of the blob.
* @param fileName - The name of the file to be downloaded.
* @returns A promise that resolves when the download is successful, or rejects with an error if the download fails.
*/
export function downloadBlob(blobPart: BlobPart, type: MIMETypeKey, fileName: string): Promise<void> {

View File

@@ -1,27 +1,29 @@
import { ClockUser, LockKey, Prohibit } from '@phosphor-icons/react';
import type { StatusType } from '@shared/types/Course';
import { Status } from '@shared/types/Course';
import type { SVGProps } from 'react';
import React from 'react';
import ClosedIcon from '~icons/material-symbols/lock';
import WaitlistIcon from '~icons/material-symbols/timelapse';
import CancelledIcon from '~icons/material-symbols/warning';
interface StatusIconProps extends SVGProps<SVGSVGElement> {
status: StatusType;
}
/**
* Get Icon component based on status
* @param props.status status
* @returns the icon component
*
* @param props - The props for the StatusIcon component
* @returns The rendered icon component
*/
export function StatusIcon(props: SVGProps<SVGSVGElement> & { status: StatusType }): JSX.Element | null {
export function StatusIcon(props: StatusIconProps): JSX.Element | null {
const { status, ...rest } = props;
switch (props.status) {
switch (status) {
case Status.WAITLISTED:
return <WaitlistIcon {...rest} />;
return <ClockUser weight='fill' {...rest} />;
case Status.CLOSED:
return <ClosedIcon {...rest} />;
return <LockKey weight='fill' {...rest} />;
case Status.CANCELLED:
return <CancelledIcon {...rest} />;
return <Prohibit weight='fill' {...rest} />;
default:
return null;
}

View File

@@ -3,7 +3,7 @@ import { customAlphabet } from 'nanoid';
/**
* Generate secure URL-friendly unique ID.
*
* @param size Size of the ID. The default size is 12.
* @param size - Size of the ID. The default size is 12.
* @returns A random string.
*/
export const generateRandomId = customAlphabet('abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789', 12);

View File

@@ -1,6 +1,7 @@
/**
* Given a string, returns a string with the first letter capitalized.
* @input The string to capitalize.
*
* @param input - The string to capitalize.
*/
export function capitalize(input: string): string {
let capitalized = '';
@@ -25,8 +26,9 @@ export function capitalize(input: string): string {
/**
* Given a string, returns a string with the first letter capitalized.
* @param input capitalize the first letter of this string
* @returns the string with the first letter capitalized
*
* @param input - Capitalize the first letter of this string
* @returns The string with the first letter capitalized
*/
export function capitalizeFirstLetter(input: string): string {
return input.charAt(0).toUpperCase() + input.slice(1).toLowerCase();
@@ -34,8 +36,9 @@ export function capitalizeFirstLetter(input: string): string {
/**
* Cuts the input string to the specified length and adds an ellipsis if the string is longer than the specified length.
* @param input The string to ellipsify.
* @param length The length of the string to return.
*
* @param input - The string to ellipsify.
* @param length - The length of the string to return.
* @returns The ellipsified string.
*/
export const ellipsify = (input: string, chars: number): string => {

View File

@@ -0,0 +1,112 @@
import { getLighterShade, hexToHSL, isValidHexColor } from '@shared/util/colors';
import { describe, expect, it } from 'vitest';
describe('hexToHSL', () => {
it('should convert pure red to HSL', () => {
const result = hexToHSL('#FF0000');
expect(result).toEqual([0, 100, 50]);
});
it('should convert pure green to HSL', () => {
const result = hexToHSL('#00FF00');
expect(result).toEqual([120, 100, 50]);
});
it('should convert pure blue to HSL', () => {
const result = hexToHSL('#0000FF');
expect(result).toEqual([240, 100, 50]);
});
it('should convert white to HSL', () => {
const result = hexToHSL('#FFFFFF');
expect(result).toEqual([0, 0, 100]);
});
it('should convert black to HSL', () => {
const result = hexToHSL('#000000');
expect(result).toEqual([0, 0, 0]);
});
it('should convert UT burnt orange to HSL', () => {
const result = hexToHSL('#BF5700');
expect(result).toEqual([27, 100, 37]);
});
it('should convert gray to HSL', () => {
const result = hexToHSL('#808080');
expect(result).toEqual([0, 0, 50]);
});
it('should throw error for invalid hex color', () => {
expect(() => hexToHSL('#GGGGGG')).toThrow('hexToRGB returned undefined');
});
});
describe('isValidHexColor', () => {
it('should validate 6-digit hex colors with hash', () => {
expect(isValidHexColor('#000000')).toBe(true);
expect(isValidHexColor('#FFFFFF')).toBe(true);
expect(isValidHexColor('#BF5700')).toBe(true);
expect(isValidHexColor('#D6D2C4')).toBe(true);
});
it('should validate 6-digit hex colors without hash', () => {
expect(isValidHexColor('000000')).toBe(true);
expect(isValidHexColor('FFFFFF')).toBe(true);
expect(isValidHexColor('BF5700')).toBe(true);
});
it('should validate 3-digit hex colors with hash', () => {
expect(isValidHexColor('#000')).toBe(true);
expect(isValidHexColor('#FFF')).toBe(true);
expect(isValidHexColor('#F0F')).toBe(true);
});
it('should validate 3-digit hex colors without hash', () => {
expect(isValidHexColor('000')).toBe(true);
expect(isValidHexColor('FFF')).toBe(true);
expect(isValidHexColor('F0F')).toBe(true);
});
it('should reject invalid hex colors', () => {
expect(isValidHexColor('#')).toBe(false);
expect(isValidHexColor('#GGG')).toBe(false);
expect(isValidHexColor('#GGGGGG')).toBe(false);
expect(isValidHexColor('GGGGGG')).toBe(false);
expect(isValidHexColor('#12345')).toBe(false);
expect(isValidHexColor('#1234567')).toBe(false);
expect(isValidHexColor('not a color')).toBe(false);
expect(isValidHexColor('')).toBe(false);
});
});
describe('getLighterShade', () => {
it('should lighten a color by default offset (20%)', () => {
const result = getLighterShade('#BF5700');
expect(result).toBe('#ff8624');
});
it('should lighten black correctly', () => {
const result = getLighterShade('#000000');
expect(result).toBe('#333333');
});
it('should not exceed 100% lightness', () => {
const result = getLighterShade('#FFFFFF', 20);
expect(result).toBe('#ffffff');
});
it('should handle custom offset values', () => {
const result = getLighterShade('#BF5700', 40);
expect(result).toBe('#ffbe8a');
});
it('should maintain hue while increasing lightness', () => {
const result = getLighterShade('#00FF00', 20); // Pure green
expect(result.toLowerCase()).toBe('#66ff66');
});
it('should throw error for invalid hex color', () => {
expect(() => getLighterShade('#GGGGGG')).toThrow('color: Invalid hex.');
});
});

View File

@@ -6,6 +6,7 @@ export const DAY = 24 * HOUR;
/**
* Pauses the execution for the specified number of milliseconds.
*
* @param milliseconds - The number of milliseconds to sleep.
* @returns A promise that resolves after the specified number of milliseconds.
*/
@@ -14,8 +15,8 @@ export const sleep = (milliseconds: number): Promise<void> => new Promise(resolv
/**
* Checks to see if expired by the time first stored and the time frame that it is stored for
*
* @param time time it was stored
* @param threshold time frame it can be stored for
* @return true if expired, false if the time frame is still in range
* @param time - time it was stored
* @param threshold - time frame it can be stored for
* @returns true if expired, false if the time frame is still in range
*/
export const didExpire = (time: number, threshold: number): boolean => time + threshold <= Date.now();

View File

@@ -14,7 +14,7 @@ export const BADGE_LIMIT = 10;
*/
export default function updateBadgeText(value: number): void {
let badgeText = '';
if (value > 0) {
if (value >= 0) {
if (value > BADGE_LIMIT) {
badgeText = `${BADGE_LIMIT}+`;
} else {

View File

@@ -1,16 +1,9 @@
import { CalendarDots, ChatText, FileText, ImageSquare, Minus, Plus, Smiley } from '@phosphor-icons/react';
import { colorsFlattened } from '@shared/util/themeColors';
import type { Meta, StoryObj } from '@storybook/react';
import { Button } from '@views/components/common/Button';
import React from 'react';
import AddIcon from '~icons/material-symbols/add';
import CalendarMonthIcon from '~icons/material-symbols/calendar-month';
import DescriptionIcon from '~icons/material-symbols/description';
import ImagePlaceholderIcon from '~icons/material-symbols/image';
import HappyFaceIcon from '~icons/material-symbols/mood';
import RemoveIcon from '~icons/material-symbols/remove';
import ReviewsIcon from '~icons/material-symbols/reviews';
// More on how to set up stories at: https://storybook.js.org/docs/writing-stories#default-export
const meta = {
title: 'Components/Common/Button',
@@ -24,7 +17,7 @@ const meta = {
// More on argTypes: https://storybook.js.org/docs/api/argtypes
args: {
children: 'Button',
icon: ImagePlaceholderIcon,
icon: ImageSquare,
},
argTypes: {
children: { control: 'text' },
@@ -42,6 +35,62 @@ export const Default: Story = {
},
};
export const Small: Story = {
// @ts-ignore
args: {
children: '',
},
render: props => (
<div style={{ display: 'flex', flexDirection: 'column', gap: '15px' }}>
<div style={{ display: 'flex', gap: '15px' }}>
<Button {...props} variant='filled' color='ut-black' size='small'>
Button
</Button>
<Button {...props} variant='outline' color='ut-black' size='small'>
Button
</Button>
<Button {...props} variant='minimal' color='ut-black' size='small'>
Button
</Button>
</div>
<hr />
<div style={{ display: 'flex', gap: '15px' }}>
<Button {...props} icon={ImageSquare} variant='filled' color='ut-black' size='small' />
<Button {...props} icon={ImageSquare} variant='outline' color='ut-black' size='small' />
<Button {...props} icon={ImageSquare} variant='minimal' color='ut-black' size='small' />
</div>
</div>
),
};
export const Mini: Story = {
// @ts-ignore
args: {
children: '',
},
render: props => (
<div style={{ display: 'flex', flexDirection: 'column', gap: '15px' }}>
<div style={{ display: 'flex', gap: '15px' }}>
<Button {...props} variant='filled' color='ut-black' size='mini'>
Button
</Button>
<Button {...props} variant='outline' color='ut-black' size='mini'>
Button
</Button>
<Button {...props} variant='minimal' color='ut-black' size='mini'>
Button
</Button>
</div>
<hr />
<div style={{ display: 'flex', gap: '15px' }}>
<Button {...props} icon={ImageSquare} variant='filled' color='ut-black' size='mini' />
<Button {...props} icon={ImageSquare} variant='outline' color='ut-black' size='mini' />
<Button {...props} icon={ImageSquare} variant='minimal' color='ut-black' size='mini' />
</div>
</div>
),
};
export const Disabled: Story = {
args: {
variant: 'filled',
@@ -57,7 +106,7 @@ export const Grid: Story = {
<div style={{ display: 'flex', gap: '15px' }}>
<Button {...props} variant='filled' color='ut-black' />
<Button {...props} variant='outline' color='ut-black' />
<Button {...props} variant='single' color='ut-black' />
<Button {...props} variant='minimal' color='ut-black' />
</div>
<hr />
@@ -65,7 +114,7 @@ export const Grid: Story = {
<div style={{ display: 'flex', gap: '15px' }}>
<Button {...props} variant='filled' color='ut-black' disabled />
<Button {...props} variant='outline' color='ut-black' disabled />
<Button {...props} variant='single' color='ut-black' disabled />
<Button {...props} variant='minimal' color='ut-black' disabled />
</div>
</div>
),
@@ -89,12 +138,12 @@ export const PrettyColors: Story = {
<Button {...props} variant='outline' color={color}>
Button
</Button>
<Button {...props} variant='single' color={color}>
<Button {...props} variant='minimal' color={color}>
Button
</Button>
<Button {...props} variant='filled' color={color} />
<Button {...props} variant='outline' color={color} />
<Button {...props} variant='single' color={color} />
<Button {...props} variant='minimal' color={color} />
</div>
))}
</div>
@@ -106,10 +155,10 @@ export const PrettyColors: Story = {
export const CourseButtons: Story = {
render: props => (
<div style={{ display: 'flex', flexDirection: 'column', gap: '15px', alignItems: 'center' }}>
<Button {...props} variant='filled' color='ut-green' icon={AddIcon}>
<Button {...props} variant='filled' color='ut-green' icon={Plus}>
Add Course
</Button>
<Button {...props} variant='filled' color='theme-red' icon={RemoveIcon}>
<Button {...props} variant='filled' color='theme-red' icon={Minus}>
Remove Course
</Button>
</div>
@@ -129,17 +178,17 @@ export const CourseCatalogActionButtons: Story = {
},
render: props => (
<div style={{ display: 'flex', gap: '15px' }}>
<Button {...props} variant='filled' color='ut-burntorange' icon={CalendarMonthIcon} />
<Button {...props} variant='outline' color='ut-blue' icon={ReviewsIcon}>
<Button {...props} variant='filled' color='ut-burntorange' icon={CalendarDots} />
<Button {...props} variant='outline' color='ut-blue' icon={ChatText}>
RateMyProf
</Button>
<Button {...props} variant='outline' color='ut-teal' icon={HappyFaceIcon}>
<Button {...props} variant='outline' color='ut-teal' icon={Smiley}>
CES
</Button>
<Button {...props} variant='outline' color='ut-orange' icon={DescriptionIcon}>
<Button {...props} variant='outline' color='ut-orange' icon={FileText}>
Past Syllabi
</Button>
<Button {...props} variant='filled' color='ut-green' icon={AddIcon}>
<Button {...props} variant='filled' color='ut-green' icon={Plus}>
Add Course
</Button>
</div>

View File

@@ -16,8 +16,16 @@ export default meta;
type Story = StoryObj<typeof meta>;
export const Default: Story = {
export const FlagChip: Story = {
args: {
label: 'QR',
variant: 'flag',
},
};
export const CoreChip: Story = {
args: {
label: 'SB',
variant: 'core',
},
};

View File

@@ -17,6 +17,7 @@ export const ExampleCourse: Course = new Course({
'Taught as a Web-based course.',
],
flags: ['Quantitative Reasoning'],
core: ['Natural Science and Technology, Part I'],
fullName: 'C S 303E ELEMS OF COMPTRS/PROGRAMMNG-WB',
instructionMode: 'Online',
instructors: [
@@ -60,6 +61,7 @@ export const ExampleCourse2: Course = new Course({
'May be counted toward the Independent Inquiry flag requirement.',
],
flags: ['Independent Inquiry'],
core: ['Natural Science and Technology, Part II'],
fullName: 'C S 439 PRINCIPLES OF COMPUTER SYSTEMS',
instructionMode: 'In Person',
instructors: [

View File

@@ -1,11 +1,10 @@
import { ArrowsVertical } from '@phosphor-icons/react';
import type { Meta, StoryObj } from '@storybook/react';
import { Button } from '@views/components/common/Button';
import DialogProvider, { usePrompt } from '@views/components/common/DialogProvider/DialogProvider';
import Text from '@views/components/common/Text/Text';
import React, { useState } from 'react';
import MaterialSymbolsExpandAllRoundedIcon from '~icons/material-symbols/expand-all-rounded';
const meta = {
title: 'Components/Common/DialogProvider',
component: DialogProvider,
@@ -46,7 +45,13 @@ const InnerComponent = () => {
};
return (
<Button variant='filled' color='ut-burntorange' icon={MaterialSymbolsExpandAllRoundedIcon} onClick={myShow}>
<Button
variant='filled'
color='ut-burntorange'
icon={ArrowsVertical}
iconProps={{ className: 'h-4 w-4' }}
onClick={myShow}
>
Open Dialog
</Button>
);
@@ -86,7 +91,7 @@ const FiveDialogsInnerComponent = () => {
};
return (
<Button variant='filled' color='ut-burntorange' icon={MaterialSymbolsExpandAllRoundedIcon} onClick={myShow}>
<Button variant='filled' color='ut-burntorange' icon={ArrowsVertical} onClick={myShow}>
Open Dialogs
</Button>
);
@@ -121,7 +126,7 @@ const NestedDialogsInnerComponent = () => {
};
return (
<Button variant='filled' color='ut-burntorange' icon={MaterialSymbolsExpandAllRoundedIcon} onClick={myShow}>
<Button variant='filled' color='ut-burntorange' icon={ArrowsVertical} onClick={myShow}>
Open Next Dialog
</Button>
);
@@ -161,7 +166,7 @@ const DialogWithOnCloseInnerComponent = () => {
<h1>
You closed the button below {timesClosed} {timesClosed === 1 ? 'time' : 'times'}
</h1>
<Button variant='filled' color='ut-burntorange' icon={MaterialSymbolsExpandAllRoundedIcon} onClick={myShow}>
<Button variant='filled' color='ut-burntorange' icon={ArrowsVertical} onClick={myShow}>
Open Dialog
</Button>
</>

View File

@@ -1,14 +1,9 @@
import { CalendarDots, ChatText, FileText, Plus, Smiley } from '@phosphor-icons/react';
import type { Meta, StoryObj } from '@storybook/react';
import { Button } from '@views/components/common/Button';
import Divider from '@views/components/common/Divider';
import React from 'react';
import AddIcon from '~icons/material-symbols/add';
import CalendarMonthIcon from '~icons/material-symbols/calendar-month';
import DescriptionIcon from '~icons/material-symbols/description';
import HappyFaceIcon from '~icons/material-symbols/mood';
import ReviewsIcon from '~icons/material-symbols/reviews';
const meta = {
title: 'Components/Common/Divider',
component: Divider,
@@ -59,18 +54,18 @@ export const CourseCatalogActionButtons: Story = {
},
render: props => (
<div className='flex items-center gap-3.75'>
<Button variant='filled' color='ut-burntorange' icon={CalendarMonthIcon} />
<Button variant='filled' color='ut-burntorange' icon={CalendarDots} />
<Divider {...props} />
<Button variant='outline' color='ut-blue' icon={ReviewsIcon}>
<Button variant='outline' color='ut-blue' icon={ChatText}>
RateMyProf
</Button>
<Button variant='outline' color='ut-teal' icon={HappyFaceIcon}>
<Button variant='outline' color='ut-teal' icon={Smiley}>
CES
</Button>
<Button variant='outline' color='ut-orange' icon={DescriptionIcon}>
<Button variant='outline' color='ut-orange' icon={FileText}>
Past Syllabi
</Button>
<Button variant='filled' color='ut-green' icon={AddIcon}>
<Button variant='filled' color='ut-green' icon={Plus}>
Add Course
</Button>
</div>

View File

@@ -2,10 +2,10 @@ import { UserScheduleStore } from '@shared/storage/UserScheduleStore';
import { UserSchedule } from '@shared/types/UserSchedule';
import { generateRandomId } from '@shared/util/random';
import type { Meta, StoryObj } from '@storybook/react';
import List from '@views/components/common/List';
import type { ScheduleDropdownProps } from '@views/components/common/ScheduleDropdown';
import ScheduleDropdown from '@views/components/common/ScheduleDropdown';
import ScheduleListItem from '@views/components/common/ScheduleListItem';
import { SortableList } from '@views/components/common/SortableList';
import useSchedules, { getActiveSchedule, switchSchedule } from '@views/hooks/useSchedules';
import type { Serialized } from 'chrome-extension-toolkit';
import React, { useEffect } from 'react';
@@ -48,10 +48,10 @@ const meta: Meta<typeof ScheduleDropdown> = {
return (
<div className='w-80'>
<ScheduleDropdown {...args}>
<List
<SortableList
className='gap-spacing-3'
draggables={schedules}
itemKey={s => s.id}
onReordered={reordered => {
onChange={reordered => {
const activeSchedule = getActiveSchedule();
const activeIndex = reordered.findIndex(s => s.id === activeSchedule.id);
@@ -59,18 +59,10 @@ const meta: Meta<typeof ScheduleDropdown> = {
UserScheduleStore.set('schedules', reordered);
UserScheduleStore.set('activeIndex', activeIndex);
}}
gap={10}
>
{(schedule, handleProps) => (
<ScheduleListItem
schedule={schedule}
onClick={() => {
switchSchedule(schedule.id);
}}
dragHandleProps={handleProps}
/>
renderItem={schedule => (
<ScheduleListItem schedule={schedule} onClick={() => switchSchedule(schedule.id)} />
)}
</List>
/>
</ScheduleDropdown>
</div>
);

View File

@@ -0,0 +1,159 @@
import { ImageSquare } from '@phosphor-icons/react';
import { colorsFlattened } from '@shared/util/themeColors';
import type { Meta, StoryObj } from '@storybook/react';
import FileUpload from '@views/components/common/FileUpload';
import React from 'react';
/**
* Stole this straight from Button.stories.tsx to test the input
*/
const meta = {
title: 'Components/Common/FileUpload',
component: FileUpload,
parameters: {
layout: 'centered',
},
tags: ['autodocs'],
args: {
children: 'Upload File',
icon: ImageSquare,
},
argTypes: {
children: { control: 'text' },
color: {
control: 'select',
options: Object.keys(colorsFlattened),
},
variant: {
control: 'select',
options: ['filled', 'outline', 'single'],
},
disabled: {
control: 'boolean',
},
onChange: { action: 'file selected' }, // action to show when file is selected
},
} satisfies Meta<typeof FileUpload>;
export default meta;
type Story = StoryObj<typeof meta>;
export const Default: Story = {
args: {
variant: 'filled',
color: 'ut-black', // Default theme color
},
};
export const Small: Story = {
// @ts-ignore
args: {
children: '',
},
render: props => (
<div style={{ display: 'flex', flexDirection: 'column', gap: '15px' }}>
<div style={{ display: 'flex', gap: '15px' }}>
<FileUpload {...props} variant='filled' color='ut-black' size='small'>
Upload File
</FileUpload>
<FileUpload {...props} variant='outline' color='ut-black' size='small'>
Upload File
</FileUpload>
<FileUpload {...props} variant='minimal' color='ut-black' size='small'>
Upload File
</FileUpload>
</div>
<hr />
<div style={{ display: 'flex', gap: '15px' }}>
<FileUpload {...props} icon={ImageSquare} variant='filled' color='ut-black' size='small' />
<FileUpload {...props} icon={ImageSquare} variant='outline' color='ut-black' size='small' />
<FileUpload {...props} icon={ImageSquare} variant='minimal' color='ut-black' size='small' />
</div>
</div>
),
};
export const Mini: Story = {
// @ts-ignore
args: {
children: '',
},
render: props => (
<div style={{ display: 'flex', flexDirection: 'column', gap: '15px' }}>
<div style={{ display: 'flex', gap: '15px' }}>
<FileUpload {...props} variant='filled' color='ut-black' size='mini'>
Button
</FileUpload>
<FileUpload {...props} variant='outline' color='ut-black' size='mini'>
Button
</FileUpload>
<FileUpload {...props} variant='minimal' color='ut-black' size='mini'>
Button
</FileUpload>
</div>
<hr />
<div style={{ display: 'flex', gap: '15px' }}>
<FileUpload {...props} icon={ImageSquare} variant='filled' color='ut-black' size='mini' />
<FileUpload {...props} icon={ImageSquare} variant='outline' color='ut-black' size='mini' />
<FileUpload {...props} icon={ImageSquare} variant='minimal' color='ut-black' size='mini' />
</div>
</div>
),
};
export const Disabled: Story = {
args: {
variant: 'filled',
color: 'ut-black',
disabled: true,
},
};
// @ts-ignore
export const Grid: Story = {
render: props => (
<div style={{ display: 'flex', flexDirection: 'column', gap: '15px' }}>
<div style={{ display: 'flex', gap: '15px' }}>
<FileUpload {...props} variant='filled' color='ut-black' />
<FileUpload {...props} variant='outline' color='ut-black' />
<FileUpload {...props} variant='minimal' color='ut-black' />
</div>
<hr />
<div style={{ display: 'flex', gap: '15px' }}>
<FileUpload {...props} variant='filled' color='ut-black' disabled />
<FileUpload {...props} variant='outline' color='ut-black' disabled />
<FileUpload {...props} variant='minimal' color='ut-black' disabled />
</div>
</div>
),
};
export const PrettyColors: Story = {
// @ts-ignore
args: {
children: '',
},
render: props => {
const colorsNames = Object.keys(colorsFlattened) as (keyof typeof colorsFlattened)[];
return (
<div style={{ display: 'flex', flexDirection: 'column', gap: '15px' }}>
{colorsNames.map(color => (
<div style={{ display: 'flex', gap: '15px' }} key={color}>
<FileUpload {...props} variant='filled' color={color}>
Button
</FileUpload>
<FileUpload {...props} variant='outline' color={color}>
Button
</FileUpload>
<FileUpload {...props} variant='minimal' color={color}>
Button
</FileUpload>
</div>
))}
</div>
);
},
};

View File

@@ -26,6 +26,7 @@ export const ExampleCourse: Course = new Course({
'Taught as a Web-based course.',
],
flags: ['Quantitative Reasoning'],
core: ['Natural Science and Technology, Part I'],
fullName: 'C S 303E ELEMS OF COMPTRS/PROGRAMMNG-WB',
instructionMode: 'Online',
instructors: [

View File

@@ -56,10 +56,10 @@ export const AreYouSure: StoryObj<PromptDialogProps> = {
</Text>
),
children: [
<Button key='yes' variant='single' color='ut-burntorange'>
<Button key='yes' variant='minimal' color='ut-burntorange'>
Yes
</Button>,
<Button key='no' variant='single' color='ut-black'>
<Button key='no' variant='minimal' color='ut-black'>
No
</Button>,
],
@@ -76,7 +76,7 @@ export const YouHave10ActiveSchedules: StoryObj<PromptDialogProps> = {
</Text>
),
children: [
<Button key='yes' variant='single' color='ut-black'>
<Button key='yes' variant='minimal' color='ut-black'>
I understand
</Button>,
],
@@ -94,10 +94,10 @@ export const WelcomeToUTRPV2: StoryObj<PromptDialogProps> = {
</Text>
),
children: [
<Button key='migrate' variant='single' color='ut-black'>
<Button key='migrate' variant='minimal' color='ut-black'>
Don&apos;t Migrate
</Button>,
<Button key='start-fresh' variant='single' color='ut-burntorange'>
<Button key='start-fresh' variant='minimal' color='ut-burntorange'>
Migrate
</Button>,
],

View File

@@ -0,0 +1,19 @@
import type { Meta, StoryObj } from '@storybook/react';
import ResourceLinks from '@views/components/calendar/ResourceLinks';
const meta = {
title: 'Components/Common/ResourceLinks',
component: ResourceLinks,
parameters: {
layout: 'centered',
},
tags: ['autodocs'],
argTypes: {},
} satisfies Meta<typeof ResourceLinks>;
export default meta;
type Story = StoryObj<typeof meta>;
export const Default: Story = {
args: {},
};

View File

@@ -1,16 +1,15 @@
import type { DraggableProvidedDragHandleProps } from '@hello-pangea/dnd';
import { Course, Status } from '@shared/types/Course';
import { CourseMeeting } from '@shared/types/CourseMeeting';
import Instructor from '@shared/types/Instructor';
import { tailwindColorways } from '@shared/util/storybook';
import type { Meta, StoryObj } from '@storybook/react';
import List from '@views/components/common/List';
import PopupCourseBlock from '@views/components/common/PopupCourseBlock';
import type { BaseItem } from '@views/components/common/SortableList';
import { SortableList } from '@views/components/common/SortableList';
import React from 'react';
const numberOfCourses = 5;
// TODO: move into utils
/**
* Generates an array of courses.
*
@@ -34,6 +33,7 @@ const generateCourses = (count: number): Course[] => {
'Taught as a Web-based course.',
],
flags: ['Quantitative Reasoning'],
core: ['Natural Science and Technology, Part I'],
fullName: 'C S 303E ELEMS OF COMPTRS/PROGRAMMNG-WB',
instructionMode: 'Online',
instructors: [
@@ -72,36 +72,34 @@ const generateCourses = (count: number): Course[] => {
};
const exampleCourses = generateCourses(numberOfCourses);
const generateCourseBlocks = (course: Course, dragHandleProps: DraggableProvidedDragHandleProps) => (
<PopupCourseBlock key={course.uniqueId} course={course} colors={course.colors} dragHandleProps={dragHandleProps} />
);
type CourseWithId = Course & BaseItem;
const meta = {
title: 'Components/Common/List',
component: List,
title: 'Components/Common/SortableList',
component: SortableList,
parameters: {
layout: 'centered',
},
tags: ['autodocs'],
argTypes: {
gap: { control: 'number' },
},
} satisfies Meta<typeof List<Course>>;
} satisfies Meta<typeof SortableList<CourseWithId>>;
export default meta;
type Story = StoryObj<Meta<typeof List<Course>>>;
type Story = StoryObj<Meta<typeof SortableList<CourseWithId>>>;
export const Default: Story = {
args: {
draggables: exampleCourses,
children: generateCourseBlocks,
itemKey: item => item.uniqueId,
gap: 12,
onReordered: () => {},
draggables: exampleCourses.map(course => ({
id: course.uniqueId,
...course,
getConflicts: course.getConflicts,
})),
onChange: () => {},
renderItem: course => <PopupCourseBlock key={course.id} course={course} colors={course.colors} />,
},
render: args => (
<div className='w-sm'>
<List {...args} />
<div className='h-3xl w-3xl transform-none'>
<SortableList {...args} />
</div>
),
};

View File

@@ -3,6 +3,7 @@ import Instructor from '@shared/types/Instructor';
import { getCourseColors } from '@shared/util/colors';
import type { Meta, StoryObj } from '@storybook/react';
import CalendarBottomBar from '@views/components/calendar/CalendarBottomBar';
import type { CalendarGridCourse } from '@views/hooks/useFlattenedCourseSchedule';
import React from 'react';
const exampleGovCourse: Course = new Course({
@@ -11,6 +12,7 @@ const exampleGovCourse: Course = new Course({
department: 'GOV',
description: ['nah', 'aint typing this', 'corndog'],
flags: ['no flag for you >:)'],
core: ['American and Texas Government'],
fullName: 'GOV 312L Something something',
instructionMode: 'Online',
instructors: [
@@ -43,6 +45,7 @@ const examplePsyCourse: Course = new Course({
department: 'PSY',
description: ['nah', 'aint typing this', 'corndog'],
flags: ['no flag for you >:)'],
core: ['Social and Behavioral Sciences'],
fullName: 'PSY 317L Yada yada',
instructionMode: 'Online',
scrapedAt: Date.now(),
@@ -89,9 +92,18 @@ export const Default: Story = {
async: true,
calendarGridPoint: { dayIndex: -1, endIndex: -1, startIndex: -1 },
componentProps: {
colors: getCourseColors('pink', 200),
courseDeptAndInstr: `${exampleGovCourse.department} ${exampleGovCourse.number} ${exampleGovCourse.instructors[0]!.lastName}`,
status: exampleGovCourse.status,
blockData: {
calendarGridPoint: { dayIndex: -1, endIndex: -1, startIndex: -1 },
componentProps: {
courseDeptAndInstr: `${exampleGovCourse.department} ${exampleGovCourse.number} ${exampleGovCourse.instructors[0]!.lastName}`,
status: exampleGovCourse.status,
blockData: {} as CalendarGridCourse,
},
course: exampleGovCourse,
async: true,
},
},
course: exampleGovCourse,
},
@@ -99,9 +111,18 @@ export const Default: Story = {
async: true,
calendarGridPoint: { dayIndex: -1, endIndex: -1, startIndex: -1 },
componentProps: {
colors: getCourseColors('slate', 500),
courseDeptAndInstr: `${examplePsyCourse.department} ${examplePsyCourse.number} ${examplePsyCourse.instructors[0]!.lastName}`,
status: examplePsyCourse.status,
blockData: {
calendarGridPoint: { dayIndex: -1, endIndex: -1, startIndex: -1 },
componentProps: {
courseDeptAndInstr: `${examplePsyCourse.department} ${examplePsyCourse.number} ${examplePsyCourse.instructors[0]!.lastName}`,
status: examplePsyCourse.status,
blockData: {} as CalendarGridCourse,
},
course: examplePsyCourse,
async: true,
},
},
course: examplePsyCourse,
},

View File

@@ -1,8 +1,8 @@
import { Status } from '@shared/types/Course';
import { getCourseColors } from '@shared/util/colors';
import type { Meta, StoryObj } from '@storybook/react';
import type { CalendarCourseCellProps } from '@views/components/calendar/CalendarCourseCell';
import CalendarCourseCell from '@views/components/calendar/CalendarCourseCell';
import type { CalendarGridCourse } from '@views/hooks/useFlattenedCourseSchedule';
import React from 'react';
import { ExampleCourse } from '../PopupCourseBlock.stories';
@@ -19,7 +19,6 @@ const meta = {
className: { control: { type: 'text' } },
status: { control: { type: 'select', options: Object.values(Status) } },
timeAndLocation: { control: { type: 'text' } },
colors: { control: { type: 'object' } },
},
render: (args: CalendarCourseCellProps) => (
<div className='w-45'>
@@ -30,24 +29,71 @@ const meta = {
courseDeptAndInstr: ExampleCourse.department,
className: ExampleCourse.number,
status: ExampleCourse.status,
timeAndLocation: ExampleCourse.schedule.meetings[0]!.getTimeString({ separator: '-' }),
colors: getCourseColors('emerald', 500),
timeAndLocation: ExampleCourse.schedule.meetings[0]!.getTimeString({ separator: '' }),
},
} satisfies Meta<typeof CalendarCourseCell>;
export default meta;
type Story = StoryObj<typeof meta>;
export const Default: Story = {};
export const Default: Story = {
args: {
courseDeptAndInstr: ExampleCourse.department,
className: ExampleCourse.number,
status: ExampleCourse.status,
timeAndLocation: ExampleCourse.schedule.meetings[0]!.getTimeString({ separator: '-' }),
blockData: {
calendarGridPoint: {
dayIndex: 4,
startIndex: 10,
endIndex: 11,
},
course: ExampleCourse,
async: false,
componentProps: {
courseDeptAndInstr: ExampleCourse.department,
status: ExampleCourse.status,
timeAndLocation: ExampleCourse.schedule.meetings[0]!.getTimeString({ separator: '-' }),
blockData: {} as CalendarGridCourse,
},
},
},
};
export const Variants: Story = {
render: props => (
<div className='grid grid-cols-2 h-40 max-w-60 w-90vw gap-x-4 gap-y-2'>
<CalendarCourseCell {...props} colors={getCourseColors('green', 500)} />
<CalendarCourseCell {...props} colors={getCourseColors('teal', 400)} />
<CalendarCourseCell {...props} colors={getCourseColors('indigo', 400)} />
<CalendarCourseCell {...props} colors={getCourseColors('red', 500)} />
</div>
),
args: {
courseDeptAndInstr: ExampleCourse.department,
className: ExampleCourse.number,
status: ExampleCourse.status,
timeAndLocation: ExampleCourse.schedule.meetings[0]!.getTimeString({ separator: '-' }),
blockData: {
calendarGridPoint: {
dayIndex: 4,
startIndex: 10,
endIndex: 11,
},
course: ExampleCourse,
async: false,
componentProps: {
courseDeptAndInstr: ExampleCourse.department,
status: ExampleCourse.status,
timeAndLocation: ExampleCourse.schedule.meetings[0]!.getTimeString({ separator: '-' }),
blockData: {
calendarGridPoint: {
dayIndex: 4,
startIndex: 10,
endIndex: 11,
},
componentProps: {
courseDeptAndInstr: ExampleCourse.department,
status: ExampleCourse.status,
timeAndLocation: ExampleCourse.schedule.meetings[0]!.getTimeString({ separator: '-' }),
blockData: {} as CalendarGridCourse,
},
course: ExampleCourse,
async: false,
},
},
},
},
};

View File

@@ -1,5 +1,4 @@
import { Status } from '@shared/types/Course';
import { getCourseColors } from '@shared/util/colors';
import type { Meta, StoryObj } from '@storybook/react';
import CalendarGrid from '@views/components/calendar/CalendarGrid';
import type { CalendarGridCourse } from '@views/hooks/useFlattenedCourseSchedule';
@@ -32,7 +31,21 @@ const testData: CalendarGridCourse[] = [
courseDeptAndInstr: 'Course 1',
timeAndLocation: '9:00 AM - 10:00 AM, Room 101',
status: Status.OPEN,
colors: getCourseColors('emerald', 500),
blockData: {
calendarGridPoint: {
dayIndex: 4,
startIndex: 10,
endIndex: 11,
},
componentProps: {
courseDeptAndInstr: 'Course 1',
timeAndLocation: '9:00 AM - 10:00 AM, Room 101',
status: Status.OPEN,
blockData: {} as CalendarGridCourse,
},
course: ExampleCourse,
async: false,
},
},
course: ExampleCourse,
async: false,
@@ -47,7 +60,21 @@ const testData: CalendarGridCourse[] = [
courseDeptAndInstr: 'Course 1',
timeAndLocation: '9:00 AM - 10:00 AM, Room 101',
status: Status.OPEN,
colors: getCourseColors('emerald', 500),
blockData: {
calendarGridPoint: {
dayIndex: 2,
startIndex: 5,
endIndex: 6,
},
componentProps: {
courseDeptAndInstr: 'Course 1',
timeAndLocation: '9:00 AM - 10:00 AM, Room 101',
status: Status.OPEN,
blockData: {} as CalendarGridCourse,
},
course: ExampleCourse,
async: false,
},
},
course: ExampleCourse,
async: false,
@@ -62,7 +89,21 @@ const testData: CalendarGridCourse[] = [
courseDeptAndInstr: 'Course 2',
timeAndLocation: '10:00 AM - 11:00 AM, Room 102',
status: Status.CLOSED,
colors: getCourseColors('emerald', 500),
blockData: {
calendarGridPoint: {
dayIndex: 1,
startIndex: 10,
endIndex: 12,
},
componentProps: {
courseDeptAndInstr: 'Course 2',
timeAndLocation: '10:00 AM - 11:00 AM, Room 102',
status: Status.CLOSED,
blockData: {} as CalendarGridCourse,
},
course: ExampleCourse,
async: false,
},
},
course: ExampleCourse,
async: false,
@@ -77,7 +118,21 @@ const testData: CalendarGridCourse[] = [
courseDeptAndInstr: 'Course 1',
timeAndLocation: '9:00 AM - 10:00 AM, Room 101',
status: Status.OPEN,
colors: getCourseColors('emerald', 500),
blockData: {
calendarGridPoint: {
dayIndex: 4,
startIndex: 10,
endIndex: 11,
},
componentProps: {
courseDeptAndInstr: 'Course 1',
timeAndLocation: '9:00 AM - 10:00 AM, Room 101',
status: Status.OPEN,
blockData: {} as CalendarGridCourse,
},
course: ExampleCourse,
async: false,
},
},
course: ExampleCourse,
async: false,
@@ -92,7 +147,21 @@ const testData: CalendarGridCourse[] = [
courseDeptAndInstr: 'Course 2',
timeAndLocation: '10:00 AM - 11:00 AM, Room 102',
status: Status.CLOSED,
colors: getCourseColors('emerald', 500),
blockData: {
calendarGridPoint: {
dayIndex: 1,
startIndex: 10,
endIndex: 12,
},
componentProps: {
courseDeptAndInstr: 'Course 2',
timeAndLocation: '10:00 AM - 11:00 AM, Room 102',
status: Status.CLOSED,
blockData: {} as CalendarGridCourse,
},
course: ExampleCourse,
async: false,
},
},
course: ExampleCourse,
async: false,
@@ -107,7 +176,21 @@ const testData: CalendarGridCourse[] = [
courseDeptAndInstr: 'Course 3',
timeAndLocation: '10:00 AM - 11:00 AM, Room 102',
status: Status.CLOSED,
colors: getCourseColors('emerald', 500),
blockData: {
calendarGridPoint: {
dayIndex: 1,
startIndex: 10,
endIndex: 12,
},
componentProps: {
courseDeptAndInstr: 'Course 3',
timeAndLocation: '10:00 AM - 11:00 AM, Room 102',
status: Status.CLOSED,
blockData: {} as CalendarGridCourse,
},
course: ExampleCourse,
async: false,
},
},
course: ExampleCourse,
async: false,
@@ -122,7 +205,21 @@ const testData: CalendarGridCourse[] = [
courseDeptAndInstr: 'Course 4',
timeAndLocation: '10:00 AM - 11:00 AM, Room 102',
status: Status.CLOSED,
colors: getCourseColors('emerald', 500),
blockData: {
calendarGridPoint: {
dayIndex: 1,
startIndex: 10,
endIndex: 12,
},
componentProps: {
courseDeptAndInstr: 'Course 4',
timeAndLocation: '10:00 AM - 11:00 AM, Room 102',
status: Status.CLOSED,
blockData: {} as CalendarGridCourse,
},
course: ExampleCourse,
async: false,
},
},
course: ExampleCourse,
async: false,

View File

@@ -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/CalendarHeader';
const meta = {
title: 'Components/Calendar/CalendarHeader',

View File

@@ -1,7 +1,6 @@
import type { ThemeColor } from '@shared/types/ThemeColors';
import type { Meta, StoryObj } from '@storybook/react';
import CourseCellColorPicker from '@views/components/calendar/CalendarCourseCellColorPicker/CourseCellColorPicker';
import React, { useState } from 'react';
import React from 'react';
const meta = {
title: 'Components/Calendar/CourseCellColorPicker',
@@ -12,15 +11,7 @@ export default meta;
type Story = StoryObj<typeof CourseCellColorPicker>;
function CourseCellColorPickerWithState() {
const [, setSelectedColor] = useState<ThemeColor | null>(null);
const [isInvertColorsToggled, setIsInvertColorsToggled] = useState<boolean>(false);
return (
<CourseCellColorPicker
setSelectedColor={setSelectedColor}
isInvertColorsToggled={isInvertColorsToggled}
setIsInvertColorsToggled={setIsInvertColorsToggled}
/>
);
return <CourseCellColorPicker defaultColor='#000000' />;
}
export const Default: Story = {

View File

@@ -16,6 +16,7 @@ export const exampleCourse: Course = new Course({
'Taught as a Web-based course.',
],
flags: ['Quantitative Reasoning'],
core: ['Natural Science and Technology, Part I'],
fullName: 'C S 303E ELEMS OF COMPTRS/PROGRAMMNG-WB',
instructionMode: 'Online',
scrapedAt: Date.now(),
@@ -99,6 +100,7 @@ export const bevoCourse: Course = new Course({
},
url: 'https://utdirect.utexas.edu/apps/registrar/course_schedule/20242/12345/',
flags: ['Independent Inquiry', 'Writing'],
core: ['Humanities'],
instructionMode: 'In Person',
semester: {
code: '12345',
@@ -154,6 +156,7 @@ export const mikeScottCS314Course: Course = new Course({
},
url: 'https://utdirect.utexas.edu/apps/registrar/course_schedule/20242/50825/',
flags: ['Writing', 'Independent Inquiry'],
core: ['Natural Science and Technology, Part II'],
instructionMode: 'In Person',
semester: {
code: '12345',

View File

@@ -1,7 +1,9 @@
import { OptionsStore } from '@shared/storage/OptionsStore';
import type { Course, ScrapedRow } from '@shared/types/Course';
import ExtensionRoot from '@views/components/common/ExtensionRoot/ExtensionRoot';
import AutoLoad from '@views/components/injected/AutoLoad/AutoLoad';
import CourseCatalogInjectedPopup from '@views/components/injected/CourseCatalogInjectedPopup/CourseCatalogInjectedPopup';
import NewSearchLink from '@views/components/injected/NewSearchLink';
import RecruitmentBanner from '@views/components/injected/RecruitmentBanner/RecruitmentBanner';
import TableHead from '@views/components/injected/TableHead';
import TableRow from '@views/components/injected/TableRow/TableRow';
@@ -24,6 +26,7 @@ export default function CourseCatalogMain({ support }: Props): JSX.Element | nul
const [rows, setRows] = React.useState<ScrapedRow[]>([]);
const [selectedCourse, setSelectedCourse] = useState<Course | null>(null);
const [showPopup, setShowPopup] = useState(false);
const [enableScrollToLoad, setEnableScrollToLoad] = useState<boolean>(false);
useEffect(() => {
populateSearchInputs();
@@ -42,6 +45,10 @@ export default function CourseCatalogMain({ support }: Props): JSX.Element | nul
setRows(scrapedRows);
}, [support]);
useEffect(() => {
OptionsStore.get('enableScrollToLoad').then(setEnableScrollToLoad);
}, []);
const addRows = (newRows: ScrapedRow[]) => {
newRows.forEach(row => {
document.querySelector('table tbody')!.appendChild(row.element);
@@ -61,6 +68,7 @@ export default function CourseCatalogMain({ support }: Props): JSX.Element | nul
return (
<ExtensionRoot>
<NewSearchLink />
<RecruitmentBanner />
<TableHead>Plus</TableHead>
{rows.map(
@@ -81,7 +89,7 @@ export default function CourseCatalogMain({ support }: Props): JSX.Element | nul
onClose={() => setShowPopup(false)}
afterLeave={() => setSelectedCourse(null)}
/>
<AutoLoad addRows={addRows} />
{enableScrollToLoad && <AutoLoad addRows={addRows} />}
</ExtensionRoot>
);
}

View File

@@ -1,28 +1,23 @@
import splashText from '@assets/insideJokes';
import createSchedule from '@pages/background/lib/createSchedule';
import { CalendarDots, GearSix, Plus } from '@phosphor-icons/react';
import { background } from '@shared/messages';
import { initSettings, OptionsStore } from '@shared/storage/OptionsStore';
import { UserScheduleStore } from '@shared/storage/UserScheduleStore';
import { openReportWindow } from '@shared/util/openReportWindow';
import Divider from '@views/components/common/Divider';
import List from '@views/components/common/List';
import Text from '@views/components/common/Text/Text';
import { useEnforceScheduleLimit } from '@views/hooks/useEnforceScheduleLimit';
import useSchedules, { getActiveSchedule, replaceSchedule, switchSchedule } from '@views/hooks/useSchedules';
import { getUpdatedAtDateTimeString } from '@views/lib/getUpdatedAtDateTimeString';
import useKC_DABR_WASM from 'kc-dabr-wasm';
import React, { useEffect, useState } from 'react';
import AddSchedule from '~icons/material-symbols/add';
import CalendarIcon from '~icons/material-symbols/calendar-month';
import Feedback from '~icons/material-symbols/flag';
import SettingsIcon from '~icons/material-symbols/settings';
import { Button } from './common/Button';
import CourseStatus from './common/CourseStatus';
import { SmallLogo } from './common/LogoIcon';
import PopupCourseBlock from './common/PopupCourseBlock';
import ScheduleDropdown from './common/ScheduleDropdown';
import ScheduleListItem from './common/ScheduleListItem';
import { SortableList } from './common/SortableList';
/**
* Renders the main popup component.
@@ -30,14 +25,14 @@ import ScheduleListItem from './common/ScheduleListItem';
*/
export default function PopupMain(): JSX.Element {
const [enableCourseStatusChips, setEnableCourseStatusChips] = useState<boolean>(false);
const [enableDataRefreshing, setEnableDataRefreshing] = useState<boolean>(false);
// const [enableDataRefreshing, setEnableDataRefreshing] = useState<boolean>(false);
useKC_DABR_WASM();
useEffect(() => {
const initAllSettings = async () => {
const { enableCourseStatusChips, enableDataRefreshing } = await initSettings();
const { enableCourseStatusChips } = await initSettings();
setEnableCourseStatusChips(enableCourseStatusChips);
setEnableDataRefreshing(enableDataRefreshing);
// setEnableDataRefreshing(enableDataRefreshing);
};
initAllSettings();
@@ -47,21 +42,29 @@ export default function PopupMain(): JSX.Element {
// console.log('enableCourseStatusChips', newValue);
});
const l2 = OptionsStore.listen('enableDataRefreshing', async ({ newValue }) => {
setEnableDataRefreshing(newValue);
// console.log('enableDataRefreshing', newValue);
});
// const l2 = OptionsStore.listen('enableDataRefreshing', async ({ newValue }) => {
// setEnableDataRefreshing(newValue);
// // console.log('enableDataRefreshing', newValue);
// });
return () => {
OptionsStore.removeListener(l1);
OptionsStore.removeListener(l2);
// OptionsStore.removeListener(l2);
};
}, []);
const [activeSchedule, schedules] = useSchedules();
const [isRefreshing, setIsRefreshing] = useState(false);
// const [isRefreshing, setIsRefreshing] = useState(false);
const [funny, setFunny] = useState<string>('');
const enforceScheduleLimit = useEnforceScheduleLimit();
const handleAddSchedule = () => {
if (enforceScheduleLimit()) {
createSchedule('New Schedule');
}
};
useEffect(() => {
const randomIndex = Math.floor(Math.random() * splashText.length);
setFunny(
@@ -81,29 +84,29 @@ export default function PopupMain(): JSX.Element {
return (
<div className='h-screen max-h-full flex flex-col bg-white'>
<div className='p-5 py-3.5'>
<div className='px-spacing-6 py-spacing-5'>
<div className='flex items-center justify-between bg-white'>
<SmallLogo />
<div className='flex items-center gap-2.5'>
<button className='bg-ut-burntorange px-2 py-1.25 btn' onClick={handleCalendarOpenOnClick}>
<CalendarIcon className='size-6 text-white' />
</button>
<button className='bg-transparent px-2 py-1.25 btn' onClick={handleOpenOptions}>
<SettingsIcon className='size-6 color-ut-black' />
</button>
<button className='bg-transparent px-2 py-1.25 btn' onClick={openReportWindow}>
<Feedback className='size-6 color-ut-black' />
</button>
<Button
variant='filled'
color='ut-burntorange'
onClick={handleCalendarOpenOnClick}
icon={CalendarDots}
iconProps={{ weight: 'fill' }}
>
Calendar
</Button>
<Button variant='minimal' color='ut-black' onClick={handleOpenOptions} icon={GearSix} />
</div>
</div>
</div>
<Divider orientation='horizontal' size='100%' />
<Divider className='bg-ut-offwhite/50' orientation='horizontal' size='100%' />
<div className='px-5 pb-2.5 pt-3.75'>
<ScheduleDropdown>
<List
<SortableList
draggables={schedules}
itemKey={schedule => schedule.id}
onReordered={reordered => {
onChange={reordered => {
const activeSchedule = getActiveSchedule();
const activeIndex = reordered.findIndex(s => s.id === activeSchedule.id);
@@ -111,27 +114,18 @@ export default function PopupMain(): JSX.Element {
UserScheduleStore.set('schedules', reordered);
UserScheduleStore.set('activeIndex', activeIndex);
}}
gap={10}
>
{(schedule, handleProps) => (
<ScheduleListItem
schedule={schedule}
onClick={() => {
switchSchedule(schedule.id);
}}
dragHandleProps={handleProps}
/>
renderItem={schedule => (
<ScheduleListItem schedule={schedule} onClick={() => switchSchedule(schedule.id)} />
)}
</List>
/>
<div className='bottom-0 right-0 mt-2.5 w-full flex justify-end'>
<Button
variant='filled'
size='mini'
color='ut-burntorange'
className='h-fit p-0 btn'
onClick={() => createSchedule('New Schedule')}
>
<AddSchedule className='h-6 w-6' />
</Button>
onClick={handleAddSchedule}
icon={Plus}
/>
</div>
</ScheduleDropdown>
</div>
@@ -145,43 +139,42 @@ export default function PopupMain(): JSX.Element {
</Text>
</div>
)}
<div className='flex-1 self-stretch overflow-y-auto px-5'>
<div
style={{ scrollbarGutter: 'stable' }}
className='flex-1 self-stretch overflow-y-scroll pl-spacing-6 pr-[6px]'
>
{activeSchedule?.courses?.length > 0 && (
<List
draggables={activeSchedule.courses}
onReordered={reordered => {
activeSchedule.courses = reordered;
<SortableList
draggables={activeSchedule.courses.map(course => ({
id: course.uniqueId,
...course,
getConflicts: course.getConflicts,
}))}
onChange={reordered => {
activeSchedule.courses = reordered.map(({ id: _id, ...course }) => course);
replaceSchedule(getActiveSchedule(), activeSchedule);
}}
itemKey={e => e.uniqueId}
gap={10}
>
{(course, handleProps) => (
<PopupCourseBlock
key={course.uniqueId}
course={course}
colors={course.colors}
dragHandleProps={handleProps}
renderItem={course => (
<PopupCourseBlock key={course.id} course={course} colors={course.colors} />
)}
/>
)}
</List>
)}
</div>
<div className='w-full flex flex-col items-center gap-1.25 p-5 pt-3.75'>
<div className='flex gap-2.5'>
<div className='w-full flex flex-col items-center gap-1.25 px-spacing-6 py-spacing-5'>
<div className='flex gap-spacing-6'>
{enableCourseStatusChips && (
<>
<CourseStatus status='WAITLISTED' size='mini' />
<CourseStatus status='CLOSED' size='mini' />
<CourseStatus status='CANCELLED' size='mini' />
<CourseStatus status='WAITLISTED' size='small' />
<CourseStatus status='CLOSED' size='small' />
<CourseStatus status='CANCELLED' size='small' />
</>
)}
</div>
{enableDataRefreshing && (
<div className='inline-flex items-center self-center gap-1'>
<Text variant='mini' className='text-ut-gray !font-normal'>
{/* {enableDataRefreshing && (
<div className='inline-flex items-center self-center gap-1'> */}
{/* <Text variant='mini' className='text-ut-gray !font-normal'>
LAST UPDATED: {getUpdatedAtDateTimeString(activeSchedule.updatedAt)}
</Text>
</Text> */}
{/* <button
className='h-4 w-4 bg-transparent p-0 btn'
onClick={() => {
@@ -194,8 +187,8 @@ export default function PopupMain(): JSX.Element {
})}
/>
</button> */}
</div>
)}
{/* </div>
)} */}
</div>
</div>
);

View File

@@ -81,6 +81,7 @@ export default function ReportIssueMain(): JSX.Element {
<label htmlFor='email' className='mb-1 block text-sm text-ut-black font-medium'>
Your @utexas.edu email
</label>
<div className='flex'>
<input
type='email'
id='email'
@@ -91,11 +92,13 @@ export default function ReportIssueMain(): JSX.Element {
required
/>
</div>
</div>
<div className='mb-4'>
<label htmlFor='feedback' className='mb-1 block text-sm text-ut-black font-medium'>
Your feedback
</label>
<div className='flex'>
<textarea
id='feedback'
value={feedback}
@@ -105,6 +108,7 @@ export default function ReportIssueMain(): JSX.Element {
required
/>
</div>
</div>
<Button
onClick={submitFeedback}

View File

@@ -1,20 +1,28 @@
import { Sidebar } from '@phosphor-icons/react';
import type { CalendarTabMessages } from '@shared/messages/CalendarMessages';
import type { Course } from '@shared/types/Course';
import { CRX_PAGES } from '@shared/types/CRXPages';
import { openReportWindow } from '@shared/util/openReportWindow';
import CalendarBottomBar from '@views/components/calendar/CalendarBottomBar';
import CalendarGrid from '@views/components/calendar/CalendarGrid';
import CalendarHeader from '@views/components/calendar/CalendarHeader/CalendarHeader';
import { CalendarSchedules } from '@views/components/calendar/CalendarSchedules';
import CalendarHeader from '@views/components/calendar/CalenderHeader';
import ImportantLinks from '@views/components/calendar/ImportantLinks';
import ResourceLinks from '@views/components/calendar/ResourceLinks';
import Divider from '@views/components/common/Divider';
import CourseCatalogInjectedPopup from '@views/components/injected/CourseCatalogInjectedPopup/CourseCatalogInjectedPopup';
import { CalendarContext } from '@views/contexts/CalendarContext';
import useCourseFromUrl from '@views/hooks/useCourseFromUrl';
import { useFlattenedCourseSchedule } from '@views/hooks/useFlattenedCourseSchedule';
import { MessageListener } from 'chrome-extension-toolkit';
import clsx from 'clsx';
import React, { useEffect, useState } from 'react';
import OutwardArrowIcon from '~icons/material-symbols/arrow-outward';
import { Button } from '../common/Button';
import { LargeLogo } from '../common/LogoIcon';
import Text from '../common/Text/Text';
import CalendarFooter from './CalendarFooter';
import TeamLinks from './TeamLinks';
/**
* Calendar page component
@@ -54,26 +62,76 @@ export default function Calendar(): JSX.Element {
return (
<CalendarContext.Provider value>
<div className='h-full w-full flex flex-col'>
<div className='h-screen flex overflow-auto'>
<div
className={clsx(
'py-spacing-6 relative h-full min-h-screen w-full flex flex-none flex-col justify-between overflow-clip whitespace-nowrap border-r border-ut-offwhite/50 shadow-[2px_0_10px,rgba(214_210_196_/_.1)] motion-safe:duration-300 motion-safe:ease-out-expo motion-safe:transition-[max-width] screenshot:hidden',
{
'max-w-[20.3125rem] ': showSidebar,
'max-w-0 pointer-events-none': !showSidebar,
}
)}
tabIndex={showSidebar ? 0 : -1}
aria-hidden={!showSidebar}
{...{ inert: !showSidebar }}
>
<div className='sticky top-0 z-50 w-full flex items-center justify-between gap-x-3xl bg-white px-spacing-8 pb-spacing-6'>
<LargeLogo />
<Button
variant='minimal'
color='theme-black'
onClick={() => {
setShowSidebar(!showSidebar);
}}
className='h-fit screenshot:hidden !p-0'
icon={Sidebar}
/>
</div>
<div
style={{
scrollbarGutter: 'stable',
}}
className='relative h-full w-full flex grow flex-col gap-y-spacing-6 overflow-x-clip overflow-y-auto pb-spacing-6 pl-spacing-8 pr-4.5'
>
<CalendarSchedules />
<Divider orientation='horizontal' size='100%' />
<ResourceLinks />
<Divider orientation='horizontal' size='100%' />
{/* <TeamLinks /> */}
<a
href={CRX_PAGES.REPORT}
className='flex items-center gap-spacing-2 text-ut-burntorange underline-offset-2 hover:underline'
target='_blank'
rel='noreferrer'
onClick={event => {
event.preventDefault();
openReportWindow();
}}
>
<Text variant='p'>Send us Feedback!</Text>
<OutwardArrowIcon className='h-4 w-4' />
</a>
</div>
<CalendarFooter />
</div>
<div
style={
{
// scrollbarGutter: 'stable',
}
}
className='h-full flex flex-grow flex-col overflow-x-scroll px-spacing-5'
>
<CalendarHeader
sidebarOpen={showSidebar}
onSidebarToggle={() => {
setShowSidebar(!showSidebar);
}}
/>
<div className='h-full flex overflow-auto pl-3'>
{showSidebar && (
<div className='h-full flex flex-none flex-col justify-between pb-5 screenshot:hidden'>
<div className='mb-3 h-full w-fit flex flex-col overflow-auto pb-2 pl-4.5 pr-4 pt-5'>
<CalendarSchedules />
<Divider orientation='horizontal' size='100%' className='my-5' />
<ImportantLinks />
<Divider orientation='horizontal' size='100%' className='my-5' />
<TeamLinks />
</div>
<CalendarFooter />
</div>
)}
<div className='h-full min-w-5xl flex flex-grow flex-col overflow-y-auto'>
<div className='min-h-2xl flex-grow overflow-auto pl-2 pr-4 pt-6 screenshot:min-h-xl'>
<div className='min-h-2xl min-w-5xl flex-grow overflow-auto pl-spacing-3 pt-spacing-3 screenshot:min-h-xl'>
<CalendarGrid courseCells={courseCells} setCourse={setCourse} />
</div>
<CalendarBottomBar courseCells={courseCells} setCourse={setCourse} />

View File

@@ -1,15 +1,10 @@
import type { Course } from '@shared/types/Course';
import { saveAsCal, saveCalAsPng } from '@views/components/calendar/utils';
import { Button } from '@views/components/common/Button';
import Divider from '@views/components/common/Divider';
import Text from '@views/components/common/Text/Text';
import { ColorPickerProvider } from '@views/contexts/ColorPickerContext';
import type { CalendarGridCourse } from '@views/hooks/useFlattenedCourseSchedule';
import clsx from 'clsx';
import React from 'react';
import CalendarMonthIcon from '~icons/material-symbols/calendar-month';
import ImageIcon from '~icons/material-symbols/image';
import CalendarCourseBlock from './CalendarCourseCell';
type CalendarBottomBarProps = {
@@ -20,61 +15,48 @@ type CalendarBottomBarProps = {
/**
* Renders the bottom bar of the calendar component.
*
* @param {Object[]} courses - The list of courses to display in the calendar.
* @returns {JSX.Element} The rendered bottom bar component.
* @param courses - The list of courses to display in the calendar.
* @returns The rendered bottom bar component.
*/
export default function CalendarBottomBar({ courseCells, setCourse }: CalendarBottomBarProps): JSX.Element {
const asyncCourseCells = courseCells?.filter(block => block.async);
const displayCourses = asyncCourseCells && asyncCourseCells.length > 0;
return (
<div className='w-full flex py-1.25 pl-7.5 pr-6.25'>
<div className='w-full flex pl-spacing-7 pr-spacing-3 pt-spacing-4'>
<div
className={clsx('flex flex-grow items-center gap-3.75 text-nowrap', {
className={clsx('flex flex-grow items-center gap-1 text-nowrap', {
'py-7.5': !displayCourses,
})}
>
{displayCourses && (
<>
<Text variant='p' className='text-ut-black'>
ASYNC/OTHER
<Text variant='p' className='text-ut-black uppercase'>
Async / Other
</Text>
<Text variant='h4' className='text-gray-300'>
<Text variant='h4' className='text-theme-offwhite/50'>
</Text>
<div className='inline-flex gap-2.5'>
<ColorPickerProvider>
{asyncCourseCells.map(block => {
const { courseDeptAndInstr, status, colors, className } = block.componentProps;
const { courseDeptAndInstr, status, className } = block.componentProps;
return (
<CalendarCourseBlock
key={block.course.uniqueId}
courseDeptAndInstr={courseDeptAndInstr}
status={status}
colors={colors}
key={courseDeptAndInstr}
className={clsx(className, 'w-35! h-15!')}
className={clsx(className, 'w-35! h-12.5! items-center')}
onClick={() => setCourse(block.course)}
blockData={block}
/>
);
})}
</ColorPickerProvider>
</div>
</>
)}
</div>
<div className='flex items-center screenshot:hidden'>
{displayCourses && <Divider orientation='vertical' size='1rem' className='mx-1.25' />}
<Button variant='single' color='ut-black' icon={CalendarMonthIcon} onClick={saveAsCal}>
Save as .CAL
</Button>
<Divider orientation='vertical' size='1rem' className='mx-1.25' />
<Button
variant='single'
color='ut-black'
icon={ImageIcon}
onClick={() => requestAnimationFrame(() => saveCalAsPng())}
>
Save as .PNG
</Button>
</div>
</div>
);
}

View File

@@ -1,15 +1,16 @@
import { ClockUser, LockKey, Palette, Prohibit } from '@phosphor-icons/react';
import { initSettings, OptionsStore } from '@shared/storage/OptionsStore';
import type { StatusType } from '@shared/types/Course';
import { Status } from '@shared/types/Course';
import type { CourseColors } from '@shared/types/ThemeColors';
import { pickFontColor } from '@shared/util/colors';
import { hexToRGB, pickFontColor } from '@shared/util/colors';
import Text from '@views/components/common/Text/Text';
import { useColorPickerContext } from '@views/contexts/ColorPickerContext';
import type { CalendarGridCourse } from '@views/hooks/useFlattenedCourseSchedule';
import clsx from 'clsx';
import React, { useEffect, useState } from 'react';
import React, { useEffect, useRef, useState } from 'react';
import ClosedIcon from '~icons/material-symbols/lock';
import WaitlistIcon from '~icons/material-symbols/timelapse';
import CancelledIcon from '~icons/material-symbols/warning';
import { Button } from '../common/Button';
import CourseCellColorPicker from './CalendarCourseCellColorPicker/CourseCellColorPicker';
/**
* Props for the CalendarCourseCell component.
@@ -18,32 +19,44 @@ export interface CalendarCourseCellProps {
courseDeptAndInstr: string;
timeAndLocation?: string;
status: StatusType;
colors: CourseColors;
className?: string;
onClick?: React.MouseEventHandler<HTMLDivElement>;
blockData: CalendarGridCourse;
className?: string;
}
/**
* Renders a cell for a calendar course.
*
* @component
* @param {CalendarCourseCellProps} props - The component props.
* @param {string} props.courseDeptAndInstr - The course department and instructor.
* @param {string} props.timeAndLocation - The time and location of the course.
* @param {StatusType} props.status - The status of the course.
* @param {Colors} props.colors - The colors for styling the cell.
* @param {string} props.className - Additional CSS class name for the cell.
* @returns {JSX.Element} The rendered component.
* @param courseDeptAndInstr - The course department and instructor.
* @param timeAndLocation - The time and location of the course.
* @param status - The status of the course.
* @param colors - The colors for styling the cell.
* @param className - Additional CSS class name for the cell.
* @returns The rendered component.
*/
export default function CalendarCourseCell({
courseDeptAndInstr,
timeAndLocation,
status,
colors,
className,
onClick,
blockData,
className,
}: CalendarCourseCellProps): JSX.Element {
const [enableCourseStatusChips, setEnableCourseStatusChips] = useState<boolean>(false);
const colorPickerRef = useRef<HTMLDivElement>(null);
const { selectedColor, setSelectedCourse, handleCloseColorPicker, isSelectedBlock, isSelectedCourse } =
useColorPickerContext();
const { colors, uniqueId: courseID } = blockData.course;
const { dayIndex, startIndex } = blockData.calendarGridPoint;
let selectedCourse = false;
let selectedBlock = false;
if (isSelectedCourse && isSelectedBlock) {
selectedCourse = isSelectedCourse(courseID);
selectedBlock = isSelectedBlock(courseID, dayIndex, startIndex);
}
useEffect(() => {
initSettings().then(({ enableCourseStatusChips }) => setEnableCourseStatusChips(enableCourseStatusChips));
@@ -58,14 +71,34 @@ export default function CalendarCourseCell({
};
}, []);
useEffect(() => {
function handleClickOutside(event: MouseEvent) {
if (selectedBlock && colorPickerRef.current) {
const path = event.composedPath();
const isClickOutside = !path.some(
element => (element as HTMLElement).classList === colorPickerRef.current?.classList
);
if (isClickOutside) {
handleCloseColorPicker();
}
}
}
document.addEventListener('mousedown', handleClickOutside);
return () => {
document.removeEventListener('mousedown', handleClickOutside);
};
}, [handleCloseColorPicker, selectedBlock]);
let rightIcon: React.ReactNode | null = null;
if (enableCourseStatusChips) {
if (status === Status.WAITLISTED) {
rightIcon = <WaitlistIcon className='h-5 w-5' />;
rightIcon = <ClockUser weight='fill' className='h-5 w-5' />;
} else if (status === Status.CLOSED) {
rightIcon = <ClosedIcon className='h-5 w-5' />;
rightIcon = <LockKey weight='fill' className='h-5 w-5' />;
} else if (status === Status.CANCELLED) {
rightIcon = <CancelledIcon className='h-5 w-5' />;
rightIcon = <Prohibit weight='fill' className='h-5 w-5' />;
}
}
@@ -76,7 +109,7 @@ export default function CalendarCourseCell({
return (
<div
className={clsx(
'h-full w-0 flex justify-center rounded p-x-2 p-y-1.2 cursor-pointer screenshot:p-1.5 hover:shadow-md transition-shadow-100 ease-out',
'h-full w-0 flex group relative justify-center rounded p-x-2 p-y-1.2 cursor-pointer screenshot:p-1.5 hover:shadow-md transition-shadow-100 ease-out',
{
'min-w-full': timeAndLocation,
'w-full': !timeAndLocation,
@@ -101,7 +134,7 @@ export default function CalendarCourseCell({
{courseDeptAndInstr}
</Text>
{timeAndLocation && (
<Text variant='h3-course' as='p'>
<Text variant='h3-course' as='p' className='whitespace-pre-line'>
{timeAndLocation}
</Text>
)}
@@ -116,6 +149,62 @@ export default function CalendarCourseCell({
{rightIcon}
</div>
)}
<div
onClick={e => {
e.stopPropagation();
}}
className={clsx(
'absolute screenshot:opacity-0! text-black transition-all ease-in-out group-focus-within:pointer-events-auto group-hover:pointer-events-auto group-focus-within:opacity-100 group-hover:opacity-100 gap-y-0.75',
dayIndex === 4 ? 'left-0 -translate-x-full pr-0.75 items-end' : 'right-0 translate-x-full pl-0.75', // If the cell is on the right side of the screen
selectedBlock ? 'opacity-100 pointer-events-auto' : 'opacity-0 pointer-events-none'
)}
style={{
// Prevents from button from appear on top of color picker
zIndex: selectedBlock ? 30 : 29,
}}
>
<div className={clsx('relative', dayIndex === 4 && 'flex flex-col items-end')}>
<Button
onClick={() => {
if (selectedBlock) {
handleCloseColorPicker();
} else {
setSelectedCourse(courseID, dayIndex, startIndex);
}
}}
icon={Palette}
iconProps={{
fill: colors.secondaryColor,
weight: 'fill',
}}
variant='outline'
className={clsx(
'size-8.5! border border-white rounded-full !p-1 bg-opacity-100 !hover:enabled:bg-opacity-100 rounded-full shadow-lg shadow-black/20'
)}
color='ut-gray'
style={{
color: colors.secondaryColor,
backgroundColor: selectedCourse
? (selectedColor ?? colors.primaryColor)
: `rgba(${hexToRGB(`${colors.primaryColor}`)}, var(--un-bg-opacity))`,
}}
/>
{selectedBlock && (
<div
ref={colorPickerRef}
className={
startIndex < 21 && !blockData.async
? 'relative top-0.75 w-max'
: 'absolute bottom-full mb-0.75 w-max'
}
>
<CourseCellColorPicker defaultColor={colors.primaryColor} />
</div>
)}
</div>
</div>
</div>
);
}

View File

@@ -1,38 +1,48 @@
import { getThemeColorHexByName } from '@shared/util/themeColors';
import { Check } from '@phosphor-icons/react';
import { useColorPickerContext } from '@views/contexts/ColorPickerContext';
import React from 'react';
import CheckIcon from '~icons/material-symbols/check';
/**
* Props for the ColorPatch component
*/
interface ColorPatchProps {
color: string;
isSelected: boolean;
handleSetSelectedColor: (color: string) => void;
handleSelectColorPatch: (color: string) => void;
defaultColor: string;
}
/**
* Renders a color patch square used in the CalendarCourseCellColorPicker component.
*
* @param {Object} props - The component props.
* @param {string} props.color - The color value (as a hex string with a hash prefix) to display in the patch.
* @param {boolean} props.isSelected - Indicates whether the patch is selected.
* @param {Function} props.handleSetSelectedColor - Function from parent component to control selection state of a patch.
* color is a hex string with a hash prefix.
* @returns {JSX.Element} The rendered color patch button.
* @param color - The color value (as a hex string with a hash prefix) to display in the patch.
* @param isSelected - Indicates whether the patch is selected.
* @param handleSetSelectedColor - Function from parent component to control selection state of a patch.
* @returns The rendered color patch button.
*/
export default function ColorPatch({ color, isSelected, handleSetSelectedColor }: ColorPatchProps): JSX.Element {
const handleClick = () => {
handleSetSelectedColor(isSelected ? getThemeColorHexByName('ut-gray') : color);
export default function ColorPatch({
color,
isSelected,
handleSelectColorPatch,
defaultColor,
}: ColorPatchProps): JSX.Element {
const { handleCloseColorPicker } = useColorPickerContext();
const handleClick = async () => {
// If the color patch is already selected, close the color picker
if (isSelected) {
handleCloseColorPicker();
} else {
handleSelectColorPatch(isSelected ? defaultColor : color);
}
};
return (
<button
className='h-5.5 w-5.5 p-0 transition-all duration-200 hover:scale-110 btn'
className='size-6.5 p-0 transition-all duration-200 hover:scale-110 btn'
style={{ backgroundColor: color }}
onClick={handleClick}
>
{isSelected && <CheckIcon className='h-5 w-5 color-white' />}
{isSelected && <Check className='h-5 w-5 color-white' />}
</button>
);
}

View File

@@ -1,12 +1,10 @@
import type { ThemeColor, TWIndex } from '@shared/types/ThemeColors';
import { getThemeColorHexByName } from '@shared/util/themeColors';
import Divider from '@views/components/common/Divider';
import { useColorPickerContext } from '@views/contexts/ColorPickerContext';
import React from 'react';
import { theme } from 'unocss/preset-mini';
import InvertColorsIcon from '~icons/material-symbols/invert-colors';
import InvertColorsOffIcon from '~icons/material-symbols/invert-colors-off';
import ColorPatch from './ColorPatch';
import HexColorEditor from './HexColorEditor';
@@ -55,16 +53,18 @@ const hexCodeToBaseColor = new Map<string, string>(
* Props for the CourseCellColorPicker component.
*/
export interface CourseCellColorPickerProps {
setSelectedColor: React.Dispatch<React.SetStateAction<ThemeColor | null>>;
isInvertColorsToggled: boolean;
setIsInvertColorsToggled: React.Dispatch<React.SetStateAction<boolean>>;
defaultColor: string;
}
/**
* @param {CourseCellColorPickerProps} props - the props for the component
* @param {React.Dispatch<React.SetStateAction<string | null>>} props.setSelectedColor - set state function passed down from the parent component
* @param {boolean} props.isInvertColorsToggled - boolean state passed down from the parent component that indicates whether the color picker is in invert colors mode
* @param {React.Dispatch<React.SetStateAction<boolean>>} props.setIsInvertColorsToggled - set state function passed down from the parent component to set invert colors mode
* The CourseCellColorPicker component that displays a color palette with a list of color patches.
*
* @remarks This component is available when a user hovers over a course cell in their calendar to
* color for the course cell. The user can set any valid hex color they want.
*
* @param setSelectedColor - Set state function passed down from the parent component
* @param isInvertColorsToggled - Boolean state passed down from the parent component that indicates whether the color picker is in invert colors mode
* @param setIsInvertColorsToggled - Set state function passed down from the parent component to set invert colors mode
* that will be called when a color is selected. The user can set any valid hex color they want.
*
* @example
@@ -80,53 +80,45 @@ export interface CourseCellColorPickerProps {
* );
* ```
*
* @returns {JSX.Element} - the color picker component that displays a color palette with a list of color patches.
* This component is available when a user hovers over a course cell in their calendar to
* color for the course cell. The user can set any valid hex color they want.
* @returns The color picker component that displays a color palette with a list of color patches.
*/
export default function CourseCellColorPicker({
setSelectedColor: setFinalColor,
isInvertColorsToggled,
setIsInvertColorsToggled,
}: CourseCellColorPickerProps): JSX.Element {
export default function CourseCellColorPicker({ defaultColor }: CourseCellColorPickerProps): JSX.Element {
// hexCode mirrors contents of HexColorEditor which has no hash prefix
const [hexCode, setHexCode] = React.useState<string>(
getThemeColorHexByName('ut-gray').slice(1).toLocaleLowerCase()
defaultColor.slice(1).toLocaleLowerCase() || getThemeColorHexByName('ut-gray')
);
const { setSelectedColor } = useColorPickerContext();
const hexCodeWithHash = `#${hexCode}` as ThemeColor;
const selectedBaseColor = hexCodeToBaseColor.get(hexCodeWithHash);
const handleSelectColorPatch = (baseColor: string) => {
setHexCode(baseColor.slice(1).toLocaleLowerCase());
let hexCode = baseColor.toLocaleLowerCase();
if (hexCode.startsWith('#')) {
hexCode = baseColor.slice(1);
}
setHexCode(hexCode);
setSelectedColor(`#${hexCode}` as ThemeColor);
};
React.useEffect(() => {
setFinalColor(hexCodeWithHash);
}, [hexCodeWithHash, setFinalColor]);
return (
<div className='inline-flex flex-col border border-1 border-ut-offwhite rounded-1 p-1.25'>
<div className='inline-flex flex-col border border-ut-offwhite rounded-1 bg-white p-1.25'>
<div className='grid grid-cols-6 gap-1'>
{Array.from(colorPatchColors.keys()).map(baseColor => (
<ColorPatch
key={baseColor}
color={baseColor}
isSelected={baseColor === selectedBaseColor}
handleSetSelectedColor={handleSelectColorPatch}
handleSelectColorPatch={handleSelectColorPatch}
defaultColor={defaultColor}
/>
))}
<div className='col-span-3 flex items-center justify-center overflow-hidden'>
<HexColorEditor hexCode={hexCode} setHexCode={setHexCode} />
<HexColorEditor hexCode={hexCode} setHexCode={handleSelectColorPatch} />
</div>
<button
className='h-5.5 w-5.5 bg-ut-black p-0 transition-all duration-200 hover:scale-110 btn'
onClick={() => setIsInvertColorsToggled(prev => !prev)}
>
{isInvertColorsToggled ? (
<InvertColorsIcon className='h-3.5 w-3.5 color-white' />
) : (
<InvertColorsOffIcon className='h-3.5 w-3.5 color-white' />
)}
</button>
</div>
{selectedBaseColor && (
<>
@@ -136,9 +128,11 @@ export default function CourseCellColorPicker({
.get(selectedBaseColor)
?.map(shadeColor => (
<ColorPatch
key={shadeColor}
color={shadeColor}
isSelected={shadeColor === hexCodeWithHash}
handleSetSelectedColor={handleSelectColorPatch}
handleSelectColorPatch={handleSelectColorPatch}
defaultColor={defaultColor}
/>
))}
</div>

View File

@@ -1,44 +1,62 @@
import { Hash } from '@phosphor-icons/react';
import { isValidHexColor, pickFontColor } from '@shared/util/colors';
import { getThemeColorHexByName } from '@shared/util/themeColors';
import { useDebounce } from '@views/hooks/useDebounce';
import clsx from 'clsx';
import React from 'react';
import TagIcon from '~icons/material-symbols/tag';
/**
* Props for the HexColorEditor component
*/
export interface HexColorEditorProps {
hexCode: string;
setHexCode: React.Dispatch<React.SetStateAction<string>>;
setHexCode: (hexCode: string) => void;
}
/**
* Utility component to allow the user to enter a valid hex color code
*
* @param {HexColorEditorProps} props - the props for the component
* @param {string} props.hexCode - the current hex color code displayed in this component. Note that this code does not
* @param hexCode - The current hex color code displayed in this component. Note that this code does not
* include the leading '#' character since it is already included in the component. Passed down from the parent component.
* @param {React.Dispatch<React.SetStateAction<string>>} props.setHexCode - set state fn to control the hex color code from parent
* @returns {JSX.Element} - the hex color editor component
* @param setHexCode - Set state fn to control the hex color code from parent
* @returns The HexColorEditor component
*/
export default function HexColorEditor({ hexCode, setHexCode }: HexColorEditorProps): JSX.Element {
const baseColor = React.useMemo(() => getThemeColorHexByName('ut-gray'), []);
const previewColor = hexCode.length === 6 ? `#${hexCode}` : baseColor;
const previewColor = isValidHexColor(`#${hexCode}`) ? `#${hexCode}` : baseColor;
const tagColor = pickFontColor(previewColor.slice(1) as `#${string}`);
const [localHexCode, setLocalHexCode] = React.useState(hexCode);
const debouncedSetHexCode = useDebounce((value: string) => setHexCode(value), 500);
React.useEffect(() => {
if (hexCode !== localHexCode) {
setLocalHexCode(hexCode);
}
}, [hexCode]);
React.useEffect(() => {
debouncedSetHexCode(localHexCode);
// This is on purpose
// eslint-disable-next-line react-hooks/exhaustive-deps
}, [localHexCode]);
return (
<>
<div
style={{ backgroundColor: previewColor }}
className='h-5.5 w-5.25 flex items-center justify-center rounded-l-1'
className='h-6.5 w-6.5 flex items-center justify-center rounded-l-1'
>
<TagIcon className='h-4 w-4 text-color-white' />
<Hash className={clsx('h-5 w-5 text-color-white', tagColor)} />
</div>
<div className='h-5.5 w-[53px] flex flex-1 items-center justify-center border-b border-r border-t rounded-br rounded-tr p-1.25'>
<div className='h-6.5 w-[53px] flex flex-1 items-center justify-center border-b border-r border-t rounded-br rounded-tr p-1.25'>
<input
type='text'
maxLength={6}
className='w-full border-none bg-transparent font-size-2.75 font-normal outline-none focus:outline-none'
value={hexCode}
onChange={e => setHexCode(e.target.value)}
className='w-full border-none bg-transparent font-size-2.75 font-normal font-mono outline-none focus:outline-none'
value={localHexCode}
onChange={e => setLocalHexCode(e.target.value)}
/>
</div>
</>

View File

@@ -1,33 +1,71 @@
import { GearSix } from '@phosphor-icons/react';
import { openTabFromContentScript } from '@views/lib/openNewTabFromContentScript';
import React from 'react';
import DiscordIcon from '~icons/bi/discord';
import GithubIcon from '~icons/ri/github-fill';
import InstagramIcon from '~icons/ri/instagram-line';
import LinkedinIcon from '~icons/ri/linkedin-box-fill';
import { Button } from '../common/Button';
import Link from '../common/Link';
interface SocialLink {
icon: React.FC<React.SVGProps<SVGSVGElement>>;
url: string;
}
const socialLinks: SocialLink[] = [
{
icon: InstagramIcon,
url: 'https://www.instagram.com/longhorndevelopers',
},
{
icon: DiscordIcon,
url: 'https://discord.gg/7pQDBGdmb7',
},
{
icon: GithubIcon,
url: 'https://github.com/Longhorn-Developers',
},
{
icon: LinkedinIcon,
url: 'https://www.linkedin.com/company/longhorn-developers/posts/?feedView=all',
},
];
/**
* Opens the options page in a new tab.
* @returns A promise that resolves when the options page is opened.
*/
const handleOpenOptions = async (): Promise<void> => {
const url = chrome.runtime.getURL('/options.html');
await openTabFromContentScript(url);
};
/**
* The footer section of the calendar's sidebar
* @returns
*/
export default function CalendarFooter(): JSX.Element {
return (
<footer className='min-w-full w-0 pl-4.5 space-y-2'>
<div className='flex gap-2'>
<Link className='linkanimate' href='https://www.instagram.com/longhorndevelopers'>
<InstagramIcon className='h-6 w-6' />
</Link>
<Link className='linkanimate' href='https://discord.gg/7pQDBGdmb7'>
<DiscordIcon className='h-6 w-6' />
</Link>
<Link className='linkanimate' href='https://github.com/Longhorn-Developers'>
<GithubIcon className='h-6 w-6' />
<footer className='min-w-full w-0 flex items-center justify-between bg-white px-spacing-8 pt-spacing-4'>
<div className='flex gap-spacing-5'>
{socialLinks.map(({ icon: Icon, url }) => (
<Link className='linkanimate' href={url}>
<Icon className='h-6 w-6' />
</Link>
))}
</div>
<div>
<Button
className='h-fit w-fit !p-0'
variant='minimal'
icon={GearSix}
color='ut-black'
onClick={handleOpenOptions}
/>
</div>
<p className='text-2.5 text-ut-concrete font-light tracking-wide'>
UT Registration Plus is a project under Longhorn Developers, a student-led organization aimed at
addressing issues at UT Austin.
</p>
</footer>
);
}

View File

@@ -1,6 +1,7 @@
import type { Course } from '@shared/types/Course';
import CalendarCourseCell from '@views/components/calendar/CalendarCourseCell';
import Text from '@views/components/common/Text/Text';
import { ColorPickerProvider } from '@views/contexts/ColorPickerContext';
import type { CalendarGridCourse } from '@views/hooks/useFlattenedCourseSchedule';
import React from 'react';
@@ -43,11 +44,15 @@ function makeGridRow(row: number, cols: number): JSX.Element {
/**
* Grid of CalendarGridCell components forming the user's course schedule calendar view
* @param props
*
* @param courseCells - The courses to display on the calendar
* @param saturdayClass - Whether the user has a Saturday class
* @param setCourse - Function to set the course to display in the course details panel
* @returns The CalendarGrid component
*/
export default function CalendarGrid({
courseCells,
saturdayClass, // TODO: implement/move away from props
saturdayClass: _saturdayClass, // TODO: implement/move away from props
setCourse,
}: React.PropsWithChildren<Props>): JSX.Element {
return (
@@ -69,7 +74,9 @@ export default function CalendarGrid({
.map(() => (
<div className='h-4 flex items-end justify-center border-r border-gray-300' />
))}
{courseCells ? <AccountForCourseConflicts courseCells={courseCells} setCourse={setCourse} /> : null}
<ColorPickerProvider>
{courseCells && <AccountForCourseConflicts courseCells={courseCells} setCourse={setCourse} />}
</ColorPickerProvider>
</div>
);
}
@@ -143,8 +150,8 @@ function AccountForCourseConflicts({ courseCells, setCourse }: AccountForCourseC
courseDeptAndInstr={courseDeptAndInstr}
timeAndLocation={timeAndLocation}
status={status}
colors={block.course.colors}
onClick={() => setCourse(block.course)}
blockData={block}
/>
</div>
);

View File

@@ -7,15 +7,18 @@ interface Props {
/**
* Component representing each 1 hour time block of a calendar
* @param props
*
* @param row - The row of the cell
* @param col - The column of the cell
* @returns The CalendarCell component
*/
function CalendarCell(props: Props): JSX.Element {
function CalendarCell({ row, col }: Props): JSX.Element {
return (
<div
className='h-full w-full flex items-center border-b border-r border-gray-300'
style={{
gridColumn: props.col + 3,
gridRow: `${2 * props.row + 2} / ${2 * props.row + 4}`,
gridColumn: col + 3,
gridRow: `${2 * row + 2} / ${2 * row + 4}`,
}}
>
<div className='h-0 w-full border-t border-gray-300/25' />

View File

@@ -0,0 +1,28 @@
.cqInline {
container-type: inline-size;
@mixin visually-hidden {
border: 0;
clip: rect(0 0 0 0);
height: auto;
margin: 0;
overflow: hidden;
padding: 0;
position: absolute;
width: 1px;
white-space: nowrap;
}
// value with all buttons is 610px
@container (width < 90px) {
.primaryActions span {
@include visually-hidden;
}
}
// @container (width < 445px) {
// .secondaryActions span {
// @include visually-hidden;
// }
// }
}

View File

@@ -0,0 +1,124 @@
import { Menu, MenuButton, MenuItem, MenuItems } from '@headlessui/react';
import { CalendarDots, Export, 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';
import Divider from '@views/components/common/Divider';
import { ExtensionRootWrapper, styleResetClass } from '@views/components/common/ExtensionRoot/ExtensionRoot';
import ScheduleTotalHoursAndCourses from '@views/components/common/ScheduleTotalHoursAndCourses';
import useSchedules from '@views/hooks/useSchedules';
import clsx from 'clsx';
import React from 'react';
import { saveAsCal, saveCalAsPng } from '../utils';
interface CalendarHeaderProps {
sidebarOpen?: boolean;
onSidebarToggle?: () => void;
}
/**
* Renders the header component for the calendar.
* @returns The JSX element representing the calendar header.
*/
export default function CalendarHeader({ sidebarOpen, onSidebarToggle }: CalendarHeaderProps): JSX.Element {
const [activeSchedule] = useSchedules();
return (
<div
style={{ scrollbarGutter: 'stable' }}
className='sticky left-0 right-0 min-h-[85px] flex items-center gap-5 overflow-x-scroll overflow-y-hidden pl-spacing-7 pt-spacing-5'
>
{!sidebarOpen && (
<Button
variant='minimal'
color='theme-black'
onClick={onSidebarToggle}
className='h-fit w-fit screenshot:hidden !p-0'
icon={Sidebar}
/>
)}
<div className='min-w-[11.5rem] screenshot:transform-origin-left screenshot:scale-120'>
<ScheduleTotalHoursAndCourses
scheduleName={activeSchedule.name}
totalHours={activeSchedule.hours}
totalCourses={activeSchedule.courses.length}
/>
</div>
<Divider className='self-center screenshot:hidden' size='1.75rem' orientation='vertical' />
{/* min-w-[310px] is the value with all the buttons */}
<div className={clsx(styles.cqInline, 'flex flex-1 gap-5 min-w-[45x] screenshot:hidden')}>
<div className={clsx(styles.primaryActions, 'min-w-fit flex gap-5')}>
<DialogProvider>
<Menu>
<MenuButton className='bg-transparent'>
<Button color='ut-black' size='small' variant='minimal' icon={Export}>
Export
</Button>
</MenuButton>
<MenuItems
as={ExtensionRootWrapper}
className={clsx([
styleResetClass,
'mt-spacing-3',
'min-w-max cursor-pointer origin-top-right rounded bg-white p-1 text-black shadow-lg transition border border-ut-offwhite/50 focus:outline-none',
'data-[closed]:(opacity-0 scale-95)',
'data-[enter]:(ease-out-expo duration-150)',
'data-[leave]:(ease-out duration-50)',
])}
transition
anchor='bottom start'
>
<MenuItem>
<Button
className='w-full flex justify-start'
onClick={() => requestAnimationFrame(() => saveCalAsPng())}
color='ut-black'
size='small'
variant='minimal'
icon={FilePng}
>
Save as .png
</Button>
</MenuItem>
<MenuItem>
<Button
className='w-full flex justify-start'
onClick={saveAsCal}
color='ut-black'
size='small'
variant='minimal'
icon={CalendarDots}
>
Save as .cal
</Button>
</MenuItem>
{/* <MenuItem>
<Button color='ut-black' size='small' variant='minimal' icon={FileTxt}>
Export Unique IDs
</Button>
</MenuItem> */}
</MenuItems>
</Menu>
</DialogProvider>
{/* <Button className='invisible' color='ut-black' size='small' variant='minimal' icon={PlusCircle}>
Quick Add
</Button>
<Button className='invisible' color='ut-black' size='small' variant='minimal' icon={SelectionPlus}>
Block
</Button> */}
</div>
{/* <Divider className='self-center' size='1.75rem' orientation='vertical' />
<div className={clsx(styles.secondaryActions, 'min-w-fit flex flex-1 justify-end gap-5')}>
<Button className='invisible' color='ut-black' size='small' variant='minimal' icon={BookmarkSimple}>
Bookmarks
</Button>
<Button className='invisible' color='ut-black' size='small' variant='minimal' icon={MapPinArea}>
UT Map
</Button>
</div> */}
</div>
</div>
);
}

View File

@@ -1,16 +1,14 @@
import createSchedule from '@pages/background/lib/createSchedule';
import { Plus } from '@phosphor-icons/react';
import { UserScheduleStore } from '@shared/storage/UserScheduleStore';
import { Button } from '@views/components/common/Button';
import List from '@views/components/common/List';
import ScheduleListItem from '@views/components/common/ScheduleListItem';
import { SortableList } from '@views/components/common/SortableList';
import Text from '@views/components/common/Text/Text';
import { useEnforceScheduleLimit } from '@views/hooks/useEnforceScheduleLimit';
import useSchedules, { getActiveSchedule, switchSchedule } from '@views/hooks/useSchedules';
import React from 'react';
import AddSchedule from '~icons/material-symbols/add';
import { usePrompt } from '../common/DialogProvider/DialogProvider';
/**
* Renders a component that displays a list of schedules.
*
@@ -19,50 +17,33 @@ import { usePrompt } from '../common/DialogProvider/DialogProvider';
*/
export function CalendarSchedules() {
const [, schedules] = useSchedules();
const showDialog = usePrompt();
const enforceScheduleLimit = useEnforceScheduleLimit();
const handleAddSchedule = () => {
if (schedules.length >= 10) {
showDialog({
title: `You have 10 active schedules!`,
description: (
<>
To encourage organization,{' '}
<span className='text-ut-burntorange'>please consider removing some unused schedules</span> you
may have.
</>
),
// eslint-disable-next-line react/no-unstable-nested-components
buttons: close => (
<Button variant='filled' color='ut-burntorange' onClick={close}>
I Understand
</Button>
),
});
return;
}
if (enforceScheduleLimit()) {
createSchedule('New Schedule');
}
};
return (
<div className='min-w-full w-0 items-center'>
<div className='m0 m-b-2 w-full flex justify-between'>
<Text variant='h3' className='text-nowrap'>
<div className='min-w-full w-0 flex flex-col items-center gap-y-spacing-3'>
<div className='m0 w-full flex justify-between'>
<Text variant='h3' className='text-nowrap text-theme-black'>
MY SCHEDULES
</Text>
<Button variant='single' color='theme-black' className='h-fit p-0 btn' onClick={handleAddSchedule}>
<AddSchedule className='h-6 w-6' />
</Button>
<Button
variant='minimal'
color='theme-black'
className='h-fit w-fit !p-0 btn'
onClick={handleAddSchedule}
icon={Plus}
/>
</div>
<div className='flex flex-col space-y-2.5'>
<List
gap={10}
<div className='w-full flex flex-col'>
<SortableList
className='gap-spacing-3'
draggables={schedules}
itemKey={s => s.id}
onReordered={reordered => {
onChange={reordered => {
const activeSchedule = getActiveSchedule();
const activeIndex = reordered.findIndex(s => s.id === activeSchedule.id);
@@ -70,17 +51,10 @@ export function CalendarSchedules() {
UserScheduleStore.set('schedules', reordered);
UserScheduleStore.set('activeIndex', activeIndex);
}}
>
{(schedule, handleProps) => (
<ScheduleListItem
schedule={schedule}
onClick={() => {
switchSchedule(schedule.id);
}}
dragHandleProps={handleProps}
/>
renderItem={schedule => (
<ScheduleListItem schedule={schedule} onClick={() => switchSchedule(schedule.id)} />
)}
</List>
/>
</div>
</div>
);

View File

@@ -1,105 +0,0 @@
import { initSettings, OptionsStore } from '@shared/storage/OptionsStore';
import { Button } from '@views/components/common/Button';
import CourseStatus from '@views/components/common/CourseStatus';
import Divider from '@views/components/common/Divider';
import { LargeLogo } from '@views/components/common/LogoIcon';
import ScheduleTotalHoursAndCourses from '@views/components/common/ScheduleTotalHoursAndCourses';
import Text from '@views/components/common/Text/Text';
import useSchedules from '@views/hooks/useSchedules';
import { getUpdatedAtDateTimeString } from '@views/lib/getUpdatedAtDateTimeString';
import { openTabFromContentScript } from '@views/lib/openNewTabFromContentScript';
import React, { useEffect, useState } from 'react';
import MenuIcon from '~icons/material-symbols/menu';
// import RefreshIcon from '~icons/material-symbols/refresh';
import SettingsIcon from '~icons/material-symbols/settings';
/**
* Opens the options page in a new tab.
* @returns A promise that resolves when the options page is opened.
*/
const handleOpenOptions = async (): Promise<void> => {
const url = chrome.runtime.getURL('/options.html');
await openTabFromContentScript(url);
};
interface CalendarHeaderProps {
onSidebarToggle?: () => void;
}
/**
* Renders the header component for the calendar.
* @returns The JSX element representing the calendar header.
*/
export default function CalendarHeader({ onSidebarToggle }: CalendarHeaderProps): JSX.Element {
const [enableCourseStatusChips, setEnableCourseStatusChips] = useState<boolean>(false);
const [enableDataRefreshing, setEnableDataRefreshing] = useState<boolean>(false);
const [activeSchedule] = useSchedules();
useEffect(() => {
initSettings().then(({ enableCourseStatusChips, enableDataRefreshing }) => {
setEnableCourseStatusChips(enableCourseStatusChips);
setEnableDataRefreshing(enableDataRefreshing);
});
const l1 = OptionsStore.listen('enableCourseStatusChips', async ({ newValue }) => {
setEnableCourseStatusChips(newValue);
// console.log('enableCourseStatusChips', newValue);
});
const l2 = OptionsStore.listen('enableDataRefreshing', async ({ newValue }) => {
setEnableDataRefreshing(newValue);
// console.log('enableDataRefreshing', newValue);
});
return () => {
OptionsStore.removeListener(l1);
OptionsStore.removeListener(l2);
};
}, []);
return (
<div className='flex items-center gap-5 overflow-x-auto overflow-y-hidden border-b border-ut-offwhite px-7 py-4 md:overflow-x-hidden'>
<Button
variant='single'
icon={MenuIcon}
color='ut-gray'
onClick={onSidebarToggle}
className='screenshot:hidden'
/>
<LargeLogo />
<Divider className='mx-2 self-center md:mx-4' size='2.5rem' orientation='vertical' />
<div className='flex-1 screenshot:transform-origin-left screenshot:scale-120'>
<ScheduleTotalHoursAndCourses
scheduleName={activeSchedule.name}
totalHours={activeSchedule.hours}
totalCourses={activeSchedule.courses.length}
/>
{enableDataRefreshing && (
<div className='flex items-center gap-1 screenshot:hidden'>
<Text variant='mini' className='text-nowrap text-ut-gray font-normal!'>
LAST UPDATED: {getUpdatedAtDateTimeString(activeSchedule.updatedAt)}
</Text>
{/* <button className='inline-block h-4 w-4 bg-transparent p-0 btn'>
<RefreshIcon className='h-4 w-4 animate-duration-800 text-ut-black' />
</button> */}
</div>
)}
</div>
<div className='hidden flex-row items-center justify-end gap-6 screenshot:hidden lg:flex'>
{enableCourseStatusChips && (
<>
<CourseStatus status='WAITLISTED' size='mini' />
<CourseStatus status='CLOSED' size='mini' />
<CourseStatus status='CANCELLED' size='mini' />
</>
)}
{/* <Button variant='single' icon={UndoIcon} color='ut-black' />
<Button variant='single' icon={RedoIcon} color='ut-black' /> */}
<Button variant='single' icon={SettingsIcon} color='ut-black' onClick={handleOpenOptions} />
</div>
</div>
);
}

Some files were not shown because too many files have changed in this diff Show More