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

Merging lucy and chanel friends activity #918

Open
wants to merge 64 commits into
base: dev
Choose a base branch
from
Open

Merging lucy and chanel friends activity #918

wants to merge 64 commits into from

Commits on Sep 18, 2024

  1. feat: year, term and classNo added to class data

    @M7s7
    M7s7 committed Sep 18, 2024
    Configuration menu
    Copy the full SHA
    693b898 View commit details
    Browse the repository at this point in the history

  2. feat: add sync functions for add/remove/edit timetables. Create/dupli… 

    …cate/delete one timetable synced, and history sync started
    @M7s7
    M7s7 committed Sep 18, 2024
    Configuration menu
    Copy the full SHA
    556cda2 View commit details
    Browse the repository at this point in the history

Commits on Sep 22, 2024

  1. feat: added routing for friends page

    @hhuolu
    hhuolu committed Sep 22, 2024
    Configuration menu
    Copy the full SHA
    f78a65d View commit details
    Browse the repository at this point in the history

Commits on Sep 24, 2024

  1. chore: revert addition of syncing fuctions to individual components

    @M7s7
    M7s7 committed Sep 24, 2024
    Configuration menu
    Copy the full SHA
    b34215a View commit details
    Browse the repository at this point in the history

  2. feat: sync timetables function refactored to use setInterval

    @M7s7
    M7s7 committed Sep 24, 2024
    Configuration menu
    Copy the full SHA
    6fa8fad View commit details
    Browse the repository at this point in the history

  3. fix: logic for sync timetables

    @M7s7
    M7s7 committed Sep 24, 2024
    Configuration menu
    Copy the full SHA
    c5413ad View commit details
    Browse the repository at this point in the history

  4. Merge branch 'dev' of github.com:devsoc-unsw/notangles into sync-time… 

    …tables
    @M7s7
    M7s7 committed Sep 24, 2024
    Configuration menu
    Copy the full SHA
    a8d3859 View commit details
    Browse the repository at this point in the history

  5. fix: bugs with typing w/ course codes and class no

    @M7s7
    M7s7 committed Sep 24, 2024
    Configuration menu
    Copy the full SHA
    33939c2 View commit details
    Browse the repository at this point in the history

  6. temp fix: change events back to old schema:

    @M7s7
    M7s7 committed Sep 24, 2024
    Configuration menu
    Copy the full SHA
    5e58572 View commit details
    Browse the repository at this point in the history

Commits on Sep 29, 2024

  1. feat: add database dto to frontend object parsing. Also, add event to… 

    … eventDTO parsing.
    @M7s7
    M7s7 committed Sep 29, 2024
    Configuration menu
    Copy the full SHA
    8b30f08 View commit details
    Browse the repository at this point in the history

  2. feat: add subtype to event in schema

    @M7s7
    M7s7 committed Sep 29, 2024
    Configuration menu
    Copy the full SHA
    4f1d08c View commit details
    Browse the repository at this point in the history

  3. fix: class info is correctly extracted from map

    @M7s7
    M7s7 committed Sep 29, 2024
    Configuration menu
    Copy the full SHA
    100b6e9 View commit details
    Browse the repository at this point in the history

  4. feat: course code returned in scraped-class object from backend

    @M7s7
    M7s7 committed Sep 29, 2024
    Configuration menu
    Copy the full SHA
    1ce381b View commit details
    Browse the repository at this point in the history

  5. feat: add default assigned colors for courses when reconstructing tim… 

    …etable from db
    @M7s7
    M7s7 committed Sep 29, 2024
    Configuration menu
    Copy the full SHA
    1f145df View commit details
    Browse the repository at this point in the history

Commits on Sep 30, 2024

  1. feat: syncing timetable updates user context

    @M7s7
    M7s7 committed Sep 30, 2024
    Configuration menu
    Copy the full SHA
    3d4ac6f View commit details
    Browse the repository at this point in the history

  2. fix: updated type in runsync arg

    @M7s7
    M7s7 committed Sep 30, 2024
    Configuration menu
    Copy the full SHA
    9090244 View commit details
    Browse the repository at this point in the history

Commits on Oct 1, 2024

  1. merge: fix conflicts

    @M7s7
    M7s7 committed Oct 1, 2024
    Configuration menu
    Copy the full SHA
    fb4b4b7 View commit details
    Browse the repository at this point in the history

  2. fix: reverted unwanted regression in timetable creation logic

    @M7s7
    M7s7 committed Oct 1, 2024
    Configuration menu
    Copy the full SHA
    292ddd9 View commit details
    Browse the repository at this point in the history

  3. feat: store timetable logic moved to usercontext

    @M7s7
    M7s7 committed Oct 1, 2024
    Configuration menu
    Copy the full SHA
    07669d3 View commit details
    Browse the repository at this point in the history

  4. fix: bug fixes

    @M7s7
    M7s7 committed Oct 1, 2024
    Configuration menu
    Copy the full SHA
    f8a85f7 View commit details
    Browse the repository at this point in the history

Commits on Oct 2, 2024

  1. feat: add mapkey/termkey to schema

    @M7s7
    M7s7 committed Oct 2, 2024
    Configuration menu
    Copy the full SHA
    83d0b22 View commit details
    Browse the repository at this point in the history

  2. fix: merge conflicts

    @hhuolu
    hhuolu committed Oct 2, 2024
    Configuration menu
    Copy the full SHA
    041c5bf View commit details
    Browse the repository at this point in the history

  3. fix: add back friends routing

    @hhuolu
    hhuolu committed Oct 2, 2024
    Configuration menu
    Copy the full SHA
    dab2162 View commit details
    Browse the repository at this point in the history

  4. feat: add term key logic to frontend

    @M7s7
    M7s7 committed Oct 2, 2024
    Configuration menu
    Copy the full SHA
    68f7fba View commit details
    Browse the repository at this point in the history

Commits on Oct 3, 2024

  1. merged master in sync branch

    @Rayahhhmed
    Rayahhhmed committed Oct 3, 2024
    Configuration menu
    Copy the full SHA
    c8e382a View commit details
    Browse the repository at this point in the history

  2. fixed header bug

    @Rayahhhmed
    Rayahhhmed committed Oct 3, 2024
    Configuration menu
    Copy the full SHA
    4a7ede0 View commit details
    Browse the repository at this point in the history

Commits on Oct 4, 2024

  1. sent request to BE when creating a default timetable

    Jasmine Tran committed Oct 4, 2024
    Configuration menu
    Copy the full SHA
    d478241 View commit details
    Browse the repository at this point in the history

  2. removing logout problems

    @Rayahhhmed
    Rayahhhmed committed Oct 4, 2024
    Configuration menu
    Copy the full SHA
    45bd563 View commit details
    Browse the repository at this point in the history

  3. Changed createDefaultTimetable to accept userID and make a call to BE… 

    … when setting default timetable.

In convertClassToDTO, fixed reduce to have initial empty [] otherwise it breaks.
Sent missing mapKey from FE to BE in createNewTimetable
    Jasmine Tran committed Oct 4, 2024
    Configuration menu
    Copy the full SHA
    859e20b View commit details
    Browse the repository at this point in the history

  4. Merge branch 'sync-timetables' of github.com:devsoc-unsw/notangles in… 

    …to sync-timetables
    Jasmine Tran committed Oct 4, 2024
    Configuration menu
    Copy the full SHA
    a8109ad View commit details
    Browse the repository at this point in the history

  5. reduced four useEffects in App.tsx into one

    Jasmine Tran committed Oct 4, 2024
    Configuration menu
    Copy the full SHA
    493d289 View commit details
    Browse the repository at this point in the history

  6. added fix for logout bugs

    @Rayahhhmed
    Rayahhhmed committed Oct 4, 2024
    Configuration menu
    Copy the full SHA
    923ed2a View commit details
    Browse the repository at this point in the history

  7. checked for valid term, before gettingUserInfo and creating default t… 

    …imetableg
    Jasmine Tran committed Oct 4, 2024
    Configuration menu
    Copy the full SHA
    d6727d7 View commit details
    Browse the repository at this point in the history

  8. removed timeout and fixed delete timetable by including header

    Jasmine Tran committed Oct 4, 2024
    Configuration menu
    Copy the full SHA
    4536dfa View commit details
    Browse the repository at this point in the history

  9. separated useEffect in App.tsx so that displayTimetables is its own t… 

    …o avoid circular calls
    Jasmine Tran committed Oct 4, 2024
    Configuration menu
    Copy the full SHA
    038c665 View commit details
    Browse the repository at this point in the history

Commits on Oct 6, 2024

  1. fix: user display timetables are deep copies, and other course/app co… 

    …ntext variables set during init fetch of timetables
    @M7s7
    M7s7 committed Oct 6, 2024
    Configuration menu
    Copy the full SHA
    f0096ab View commit details
    Browse the repository at this point in the history

  2. fix: remove hard-coding of term in add timetable, and added back inte… 

    …rval/altered logic to handle duplication of new timetables bug
    @M7s7
    M7s7 committed Oct 6, 2024
    Configuration menu
    Copy the full SHA
    2ce5dd6 View commit details
    Browse the repository at this point in the history

  3. fix: first user timetable not being saved to backend fix

    @M7s7
    M7s7 committed Oct 6, 2024
    Configuration menu
    Copy the full SHA
    572938e View commit details
    Browse the repository at this point in the history

Commits on Oct 7, 2024

  1. added types for tt dto

    @Rayahhhmed
    Rayahhhmed committed Oct 7, 2024
    Configuration menu
    Copy the full SHA
    c6471f5 View commit details
    Browse the repository at this point in the history

Commits on Oct 8, 2024

  1. fix: DTO structure fixed, and cleaned up code

    @M7s7
    M7s7 committed Oct 8, 2024
    Configuration menu
    Copy the full SHA
    dc16c10 View commit details
    Browse the repository at this point in the history

Commits on Oct 25, 2024

  1. removed groupsSidebarCollapsed as location.pathname == /friends can b… 

    …e used. Deleted FriendsButton.tsx. And merged main
    Jasmine Tran committed Oct 25, 2024
    Configuration menu
    Copy the full SHA
    bfc0daf View commit details
    Browse the repository at this point in the history

  2. added group banner information as fixed

    Jasmine Tran committed Oct 25, 2024
    Configuration menu
    Copy the full SHA
    301c47c View commit details
    Browse the repository at this point in the history

  3. fixed useLocation to display group information banner

    Jasmine Tran committed Oct 25, 2024
    Configuration menu
    Copy the full SHA
    695eb80 View commit details
    Browse the repository at this point in the history

  4. deleted TimetableShared and made Friends page only display a timetable

    Jasmine Tran committed Oct 25, 2024
    Configuration menu
    Copy the full SHA
    9faa0b3 View commit details
    Browse the repository at this point in the history

  5. fixed top left border radius conditionally rendered on only / page

    Jasmine Tran committed Oct 25, 2024
    Configuration menu
    Copy the full SHA
    2403478 View commit details
    Browse the repository at this point in the history

  6. created fixed right side bar for friends activities

    Jasmine Tran committed Oct 25, 2024
    Configuration menu
    Copy the full SHA
    3c0054c View commit details
    Browse the repository at this point in the history

  7. restyled activity side bar

    Jasmine Tran committed Oct 25, 2024
    Configuration menu
    Copy the full SHA
    6e1b1ab View commit details
    Browse the repository at this point in the history

  8. adjusted zIndex of the activity bar to 999 to be below top navbar

    Jasmine Tran committed Oct 25, 2024
    Configuration menu
    Copy the full SHA
    6e0690f View commit details
    Browse the repository at this point in the history

  9. added some of chanels functions to FriendsActivity.tsx as noted, and … 

    …handle screen display when a user is apart of no groups
    Jasmine Tran committed Oct 25, 2024
    Configuration menu
    Copy the full SHA
    e5b5484 View commit details
    Browse the repository at this point in the history

Commits on Oct 29, 2024

  1. changed duplicateClasses in timetableHelpers to generate a new uuid f… 

    …or duplicated classes
    Jasmine Tran committed Oct 29, 2024
    Configuration menu
    Copy the full SHA
    be0f6e6 View commit details
    Browse the repository at this point in the history

Commits on Oct 30, 2024

  1. merged sync-timetable with lucy-and-chanel-activity

    Jasmine Tran committed Oct 30, 2024
    Configuration menu
    Copy the full SHA
    be33adf View commit details
    Browse the repository at this point in the history

  2. returned timetables of the friends of the logged in user

    Jasmine Tran committed Oct 30, 2024
    Configuration menu
    Copy the full SHA
    34a67c4 View commit details
    Browse the repository at this point in the history

Commits on Nov 1, 2024

  1. added activity to be saved in the backend for classes

    Jasmine Tran committed Nov 1, 2024
    Configuration menu
    Copy the full SHA
    dd02549 View commit details
    Browse the repository at this point in the history

  2. unscheduled items are saved to BE

    Jasmine Tran committed Nov 1, 2024
    Configuration menu
    Copy the full SHA
    a18b451 View commit details
    Browse the repository at this point in the history

  3. fixed interface typing

    Jasmine Tran committed Nov 1, 2024
    Configuration menu
    Copy the full SHA
    89a73b5 View commit details
    Browse the repository at this point in the history

Commits on Nov 3, 2024

  1. fix: revert compaction of useUpdateEffects to fix local storage on lo… 

    …ad bug
    @M7s7
    M7s7 committed Nov 3, 2024
    Configuration menu
    Copy the full SHA
    a4dab5e View commit details
    Browse the repository at this point in the history

Commits on Nov 5, 2024

  1. Merge branch 'sync-timetables' into merging-lucy-and-chanel-friends-a… 

    …ctivity
    Jasmine Tran committed Nov 5, 2024
    Configuration menu
    Copy the full SHA
    7f46f36 View commit details
    Browse the repository at this point in the history

Commits on Nov 15, 2024

  1. Merge branch 'dev' of https://github.com/devsoc-unsw/notangles into m… 

    …erging-lucy-and-chanel-friends-activity
    @Shzmj
    Shzmj committed Nov 15, 2024
    Configuration menu
    Copy the full SHA
    e538669 View commit details
    Browse the repository at this point in the history

  2. fixing repeated classData key

    @Shzmj
    Shzmj committed Nov 15, 2024
    Configuration menu
    Copy the full SHA
    1acc2b9 View commit details
    Browse the repository at this point in the history

  3. fixed minor issues with merging

    @Shzmj
    Shzmj committed Nov 15, 2024
    Configuration menu
    Copy the full SHA
    f740f20 View commit details
    Browse the repository at this point in the history

  4. fixing friendactivity call to getCourseInfo since term string now inc… 

    …ludes year
    @Shzmj
    Shzmj committed Nov 15, 2024
    Configuration menu
    Copy the full SHA
    f1d95cf View commit details
    Browse the repository at this point in the history

  5. fixing dbCourseToCourseData error with number args

    @Shzmj
    Shzmj committed Nov 15, 2024
    Configuration menu
    Copy the full SHA
    dc34091 View commit details
    Browse the repository at this point in the history

  6. attempt at fixing getcurrentactivity. outlined what needs to be done … 

    …next
    @Shzmj
    Shzmj committed Nov 15, 2024
    Configuration menu
    Copy the full SHA
    ce67f1b View commit details
    Browse the repository at this point in the history

  7. partial fix for getCurrentActivity + findCurrentActivity so easier fo… 

    …r future subcom to continue
    @Shzmj
    Shzmj committed Nov 15, 2024
    Configuration menu
    Copy the full SHA
    816438a View commit details
    Browse the repository at this point in the history