Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

AddEventToPublishSchedule + Edit/Delete Days + Edit/Delete PS Events #61

Merged
merged 61 commits into from
Mar 29, 2024
Merged

AddEventToPublishSchedule + Edit/Delete Days + Edit/Delete PS Events #61

merged 61 commits into from
Mar 29, 2024

Commits on Feb 10, 2024

  1. added two modals and started search and filter

    @Philip-Jian
    Philip-Jian committed Feb 10, 2024
    Configuration menu
    Copy the full SHA
    ab449fa View commit details
    Browse the repository at this point in the history

Commits on Feb 13, 2024

  1. progress on add day modal and day planner modal.

    @Philip-Jian
    Philip-Jian committed Feb 13, 2024
    Configuration menu
    Copy the full SHA
    d64b9ee View commit details
    Browse the repository at this point in the history

Commits on Feb 14, 2024

  1. added create event form inside day planner 

    Co-authored-by: chloecheng8 <[email protected]>
Co-authored-by: kristenyee <[email protected]>
Co-authored-by: Subin Kim <[email protected]>
    @Philip-Jian @chloecheng8
    @kristenyee @SubinQKim
    4 people committed Feb 14, 2024
    Configuration menu
    Copy the full SHA
    bd73c67 View commit details
    Browse the repository at this point in the history

Commits on Feb 16, 2024

  1. Put the catalog component in PlannerEvents component + fixed useState… 

    … management for button visibility
    @SubinQKim
    SubinQKim committed Feb 16, 2024
    Configuration menu
    Copy the full SHA
    da476ee View commit details
    Browse the repository at this point in the history

Commits on Mar 2, 2024

  1. updated branch from dev

    @Philip-Jian
    Philip-Jian committed Mar 2, 2024
    Configuration menu
    Copy the full SHA
    8a1e6cd View commit details
    Browse the repository at this point in the history

  2. updated branch from dev

    @Philip-Jian
    Philip-Jian committed Mar 2, 2024
    Configuration menu
    Copy the full SHA
    c18f078 View commit details
    Browse the repository at this point in the history

Commits on Mar 3, 2024

  1. added Add Day Modal back to Publish Schedule and connected to backend

    @Philip-Jian
    Philip-Jian committed Mar 3, 2024
    Configuration menu
    Copy the full SHA
    5ae38c9 View commit details
    Browse the repository at this point in the history

Commits on Mar 4, 2024

  1. AddDayContext file so no need for multiple prop passes for addDayForm… 

    … and CreateEventForm
    @SubinQKim
    SubinQKim committed Mar 4, 2024
    Configuration menu
    Copy the full SHA
    ad7a6b9 View commit details
    Browse the repository at this point in the history

  2. Post request to /published-schedule inside CreateEventForm

    @SubinQKim
    SubinQKim committed Mar 4, 2024
    Configuration menu
    Copy the full SHA
    89e1244 View commit details
    Browse the repository at this point in the history

Commits on Mar 5, 2024

  1. AddEventToPublishedSchedule form used in PS modal to create new ps an… 

    …d catalog
    @SubinQKim
    SubinQKim committed Mar 5, 2024
    Configuration menu
    Copy the full SHA
    5768f29 View commit details
    Browse the repository at this point in the history

  2. fixed addEventOverlay rendering the datePart and location on event form

    @SubinQKim
    SubinQKim committed Mar 5, 2024
    Configuration menu
    Copy the full SHA
    49e7616 View commit details
    Browse the repository at this point in the history

  3. AddEventToPublishScheduleForm creates new events in the PS and catalo… 

    …g, PaginationFooter data param fix
    @SubinQKim
    SubinQKim committed Mar 5, 2024
    Configuration menu
    Copy the full SHA
    bb0c798 View commit details
    Browse the repository at this point in the history

Commits on Mar 8, 2024

  1. merged in dev

    @michellelin1
    michellelin1 committed Mar 8, 2024
    Configuration menu
    Copy the full SHA
    b32308b View commit details
    Browse the repository at this point in the history

Commits on Mar 15, 2024

  1. Planner Timeline changes

    @SubinQKim
    SubinQKim committed Mar 15, 2024
    Configuration menu
    Copy the full SHA
    328affc View commit details
    Browse the repository at this point in the history

Commits on Mar 23, 2024

  1. merged in dev

    @michellelin1
    michellelin1 committed Mar 23, 2024
    Configuration menu
    Copy the full SHA
    ecd97ca View commit details
    Browse the repository at this point in the history

Commits on Mar 24, 2024

  1. light styling

    @michellelin1
    michellelin1 committed Mar 24, 2024
    Configuration menu
    Copy the full SHA
    6ed632e View commit details
    Browse the repository at this point in the history

  2. Merge branch 'dev' into 34-add-event-to-published-schedule-full-flow

    @ThatMegamind
    ThatMegamind authored Mar 24, 2024
    Configuration menu
    Copy the full SHA
    1571c30 View commit details
    Browse the repository at this point in the history

  3. semi styled published schedule form

    @michellelin1
    michellelin1 committed Mar 24, 2024
    Configuration menu
    Copy the full SHA
    406731f View commit details
    Browse the repository at this point in the history

Commits on Mar 25, 2024

  1. matched ps form styling

    @michellelin1
    michellelin1 committed Mar 25, 2024
    Configuration menu
    Copy the full SHA
    2cd2d6b View commit details
    Browse the repository at this point in the history

  2. updated styling, events display on timeline

    @ThatMegamind
    ThatMegamind committed Mar 25, 2024
    Configuration menu
    Copy the full SHA
    04ac1e2 View commit details
    Browse the repository at this point in the history

  3. can add existing catalog event to ps

    @ThatMegamind
    ThatMegamind committed Mar 25, 2024
    Configuration menu
    Copy the full SHA
    358de52 View commit details
    Browse the repository at this point in the history

  4. sorting events on schedule by startTime

    @ThatMegamind
    ThatMegamind committed Mar 25, 2024
    Configuration menu
    Copy the full SHA
    f04691d View commit details
    Browse the repository at this point in the history

  5. fixing bugs + re-implementing catalog add

    @ThatMegamind
    ThatMegamind committed Mar 25, 2024
    Configuration menu
    Copy the full SHA
    278488f View commit details
    Browse the repository at this point in the history

  6. (rest of changes)

    @ThatMegamind
    ThatMegamind committed Mar 25, 2024
    Configuration menu
    Copy the full SHA
    942f0eb View commit details
    Browse the repository at this point in the history

  7. replace location with description for individual ps events

    @ThatMegamind
    ThatMegamind committed Mar 25, 2024
    Configuration menu
    Copy the full SHA
    dcc185c View commit details
    Browse the repository at this point in the history

  8. fixed bugs and added styling to timeline

    @ThatMegamind
    ThatMegamind committed Mar 25, 2024
    Configuration menu
    Copy the full SHA
    bd74ebf View commit details
    Browse the repository at this point in the history

  9. change to use planner context

    @michellelin1
    michellelin1 committed Mar 25, 2024
    Configuration menu
    Copy the full SHA
    8dad37d View commit details
    Browse the repository at this point in the history

  10. merge conflict fixes

    @ThatMegamind
    ThatMegamind committed Mar 25, 2024
    Configuration menu
    Copy the full SHA
    4a23028 View commit details
    Browse the repository at this point in the history

Commits on Mar 26, 2024

  1. live events on timeline

    @michellelin1
    michellelin1 committed Mar 26, 2024
    Configuration menu
    Copy the full SHA
    e3ec9f2 View commit details
    Browse the repository at this point in the history

  2. fixed ps table styling + removed date/location from ps form

    @michellelin1
    michellelin1 committed Mar 26, 2024
    Configuration menu
    Copy the full SHA
    bd8da7f View commit details
    Browse the repository at this point in the history

  3. migrated day context to planner context

    @michellelin1
    michellelin1 committed Mar 26, 2024
    Configuration menu
    Copy the full SHA
    5351512 View commit details
    Browse the repository at this point in the history

  4. missed a file

    @michellelin1
    michellelin1 committed Mar 26, 2024
    Configuration menu
    Copy the full SHA
    11222db View commit details
    Browse the repository at this point in the history

  5. edit existing day

    @michellelin1
    michellelin1 committed Mar 26, 2024
    Configuration menu
    Copy the full SHA
    28075d9 View commit details
    Browse the repository at this point in the history

  6. delete day if no events + more styling

    @michellelin1
    michellelin1 committed Mar 26, 2024
    Configuration menu
    Copy the full SHA
    d716182 View commit details
    Browse the repository at this point in the history

  7. handled 2 overlapping events

    @michellelin1
    michellelin1 committed Mar 26, 2024
    Configuration menu
    Copy the full SHA
    3b0a5a5 View commit details
    Browse the repository at this point in the history

Commits on Mar 27, 2024

  1. close ps form after submission + prevent multiple fetches of catalog

    @michellelin1
    michellelin1 committed Mar 27, 2024
    Configuration menu
    Copy the full SHA
    d21615a View commit details
    Browse the repository at this point in the history

  2. delete day + (bad) data revalidation

    @michellelin1
    michellelin1 committed Mar 27, 2024
    Configuration menu
    Copy the full SHA
    d23d4b7 View commit details
    Browse the repository at this point in the history

  3. edit day from day planner implemented

    @ThatMegamind
    ThatMegamind committed Mar 27, 2024
    Configuration menu
    Copy the full SHA
    4bc923e View commit details
    Browse the repository at this point in the history

  4. edit day, edit events (mostly), plus bug fixes

    @ThatMegamind
    ThatMegamind committed Mar 27, 2024
    Configuration menu
    Copy the full SHA
    c7762eb View commit details
    Browse the repository at this point in the history

Commits on Mar 28, 2024

  1. updated navbar, dropdown, catalog, 'finish day' + fixed ps student view

    @michellelin1
    michellelin1 committed Mar 28, 2024
    Configuration menu
    Copy the full SHA
    9feebfd View commit details
    Browse the repository at this point in the history

  2. editing event reflects correctly on timeline, edit/delete appear on h… 

    …over, delete event mostly implemented
    @ThatMegamind
    ThatMegamind committed Mar 28, 2024
    Configuration menu
    Copy the full SHA
    c0328ce View commit details
    Browse the repository at this point in the history

  3. Merge branch '34-add-event-to-published-schedule-full-flow' of https:… 

    …//github.com/ctc-uci/aiss-frontend into 34-add-event-to-published-schedule-full-flow
    @ThatMegamind
    ThatMegamind committed Mar 28, 2024
    Configuration menu
    Copy the full SHA
    f487a0f View commit details
    Browse the repository at this point in the history

  4. edit buttons updated, styling of delete event modal still has darknes… 

    …s bug
    @ThatMegamind
    ThatMegamind committed Mar 28, 2024
    Configuration menu
    Copy the full SHA
    fd377ee View commit details
    Browse the repository at this point in the history

  5. fixed delete event + styled edit/delete buttons

    @michellelin1
    michellelin1 committed Mar 28, 2024
    Configuration menu
    Copy the full SHA
    e19b285 View commit details
    Browse the repository at this point in the history

  6. fixed host bug

    @michellelin1
    michellelin1 committed Mar 28, 2024
    Configuration menu
    Copy the full SHA
    bf42889 View commit details
    Browse the repository at this point in the history

  7. minor visual touch-ups, fixed timeline height issue

    @ThatMegamind
    ThatMegamind committed Mar 28, 2024
    Configuration menu
    Copy the full SHA
    45e09d7 View commit details
    Browse the repository at this point in the history

  8. Merge branch '34-add-event-to-published-schedule-full-flow' of https:… 

    …//github.com/ctc-uci/aiss-frontend into 34-add-event-to-published-schedule-full-flow
    @ThatMegamind
    ThatMegamind committed Mar 28, 2024
    Configuration menu
    Copy the full SHA
    efff1e6 View commit details
    Browse the repository at this point in the history

  9. alt timeline size fix

    @michellelin1
    michellelin1 committed Mar 28, 2024
    Configuration menu
    Copy the full SHA
    bacee9a View commit details
    Browse the repository at this point in the history

  10. fixed season cutoff

    @michellelin1
    michellelin1 committed Mar 28, 2024
    Configuration menu
    Copy the full SHA
    39e6263 View commit details
    Browse the repository at this point in the history

  11. removed unnessary addDayModal

    @michellelin1
    michellelin1 committed Mar 28, 2024
    Configuration menu
    Copy the full SHA
    92aff2d View commit details
    Browse the repository at this point in the history

  12. made catalog scroll bar nicer

    @michellelin1
    michellelin1 committed Mar 28, 2024
    Configuration menu
    Copy the full SHA
    3d4a38b View commit details
    Browse the repository at this point in the history

  13. fixed small catalog bug

    @michellelin1
    michellelin1 committed Mar 28, 2024
    Configuration menu
    Copy the full SHA
    1376329 View commit details
    Browse the repository at this point in the history

  14. fixed bugs, removed second variable tracking edit state, added some t… 

    …oasts
    @ThatMegamind
    ThatMegamind committed Mar 28, 2024
    Configuration menu
    Copy the full SHA
    08112cb View commit details
    Browse the repository at this point in the history

Commits on Mar 29, 2024

  1. update catalog on timeline event edit

    @michellelin1
    michellelin1 committed Mar 29, 2024
    Configuration menu
    Copy the full SHA
    72e9b12 View commit details
    Browse the repository at this point in the history

  2. removed unnessary console logs

    @michellelin1
    michellelin1 committed Mar 29, 2024
    Configuration menu
    Copy the full SHA
    3429a38 View commit details
    Browse the repository at this point in the history

  3. fixed season select issue

    @michellelin1
    michellelin1 committed Mar 29, 2024
    Configuration menu
    Copy the full SHA
    9a322cd View commit details
    Browse the repository at this point in the history

  4. fixed bug of currently edited event disappearing when editing differe… 

    …nt event
    @ThatMegamind
    ThatMegamind committed Mar 29, 2024
    Configuration menu
    Copy the full SHA
    64c5451 View commit details
    Browse the repository at this point in the history

  5. Merge branch '34-add-event-to-published-schedule-full-flow' of https:… 

    …//github.com/ctc-uci/aiss-frontend into 34-add-event-to-published-schedule-full-flow
    @ThatMegamind
    ThatMegamind committed Mar 29, 2024
    Configuration menu
    Copy the full SHA
    f1d2d06 View commit details
    Browse the repository at this point in the history

  6. toast clean up

    @michellelin1
    michellelin1 committed Mar 29, 2024
    Configuration menu
    Copy the full SHA
    d6cdb86 View commit details
    Browse the repository at this point in the history

  7. Merge branch '34-add-event-to-published-schedule-full-flow' of https:… 

    …//github.com/ctc-uci/aiss-frontend into 34-add-event-to-published-schedule-full-flow
    @michellelin1
    michellelin1 committed Mar 29, 2024
    Configuration menu
    Copy the full SHA
    d4c8575 View commit details
    Browse the repository at this point in the history

  8. fixed day toast error message

    @michellelin1
    michellelin1 committed Mar 29, 2024
    Configuration menu
    Copy the full SHA
    2c01db6 View commit details
    Browse the repository at this point in the history