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

Conversation

Shzmj
Copy link
Contributor

@Shzmj Shzmj commented Nov 15, 2024

No description provided.

M7s7 and others added 30 commits September 18, 2024 17:11
@M7s7
feat: year, term and classNo added to class data
693b898
@M7s7
feat: add sync functions for add/remove/edit timetables. Create/dupli…
556cda2 
…cate/delete one timetable synced, and history sync started
@hhuolu
feat: added routing for friends page
f78a65d
@M7s7
chore: revert addition of syncing fuctions to individual components
b34215a
@M7s7
feat: sync timetables function refactored to use setInterval
6fa8fad
@M7s7
fix: logic for sync timetables
c5413ad
@M7s7
Merge branch 'dev' of github.com:devsoc-unsw/notangles into sync-time…
a8d3859 
…tables
@M7s7
fix: bugs with typing w/ course codes and class no
33939c2
@M7s7
temp fix: change events back to old schema:
5e58572
@M7s7
feat: add database dto to frontend object parsing. Also, add event to…
8b30f08 
… eventDTO parsing.
@M7s7
feat: add subtype to event in schema
4f1d08c
@M7s7
fix: class info is correctly extracted from map
100b6e9
@M7s7
feat: course code returned in scraped-class object from backend
1ce381b
@M7s7
feat: add default assigned colors for courses when reconstructing tim…
1f145df 
…etable from db
@M7s7
feat: syncing timetable updates user context
3d4ac6f
@M7s7
fix: updated type in runsync arg
9090244
@M7s7
merge: fix conflicts
fb4b4b7
@M7s7
fix: reverted unwanted regression in timetable creation logic
292ddd9
@M7s7
feat: store timetable logic moved to usercontext
07669d3
@M7s7
fix: bug fixes
f8a85f7
@M7s7
feat: add mapkey/termkey to schema
83d0b22
@hhuolu
fix: merge conflicts
041c5bf
@hhuolu
fix: add back friends routing
dab2162
@M7s7
feat: add term key logic to frontend
68f7fba
@Rayahhhmed
merged master in sync branch
c8e382a
@Rayahhhmed
fixed header bug
4a7ede0
sent request to BE when creating a default timetable
d478241
@Rayahhhmed
removing logout problems
45bd563
Changed createDefaultTimetable to accept userID and make a call to BE…
859e20b 
… when setting default timetable.

In convertClassToDTO, fixed reduce to have initial empty [] otherwise it breaks.
Sent missing mapKey from FE to BE in createNewTimetable
Merge branch 'sync-timetables' of github.com:devsoc-unsw/notangles in…
a8109ad 
…to sync-timetables
M7s7 and others added 22 commits October 6, 2024 17:34
@M7s7
fix: user display timetables are deep copies, and other course/app co…
f0096ab 
…ntext variables set during init fetch of timetables
@M7s7
fix: remove hard-coding of term in add timetable, and added back inte…
2ce5dd6 
…rval/altered logic to handle duplication of new timetables bug
@M7s7
fix: first user timetable not being saved to backend fix
572938e
@Rayahhhmed
added types for tt dto
c6471f5
@M7s7
fix: DTO structure fixed, and cleaned up code
dc16c10
removed groupsSidebarCollapsed as location.pathname == /friends can b…
bfc0daf 
…e used. Deleted FriendsButton.tsx. And merged main
added group banner information as fixed
301c47c
fixed useLocation to display group information banner
695eb80
deleted TimetableShared and made Friends page only display a timetable
9faa0b3
fixed top left border radius conditionally rendered on only / page
2403478
created fixed right side bar for friends activities
3c0054c
restyled activity side bar
6e1b1ab
adjusted zIndex of the activity bar to 999 to be below top navbar
6e0690f
added some of chanels functions to FriendsActivity.tsx as noted, and …
e5b5484 
…handle screen display when a user is apart of no groups
changed duplicateClasses in timetableHelpers to generate a new uuid f…
be0f6e6 
…or duplicated classes
merged sync-timetable with lucy-and-chanel-activity
be33adf
returned timetables of the friends of the logged in user
34a67c4
added activity to be saved in the backend for classes
dd02549
unscheduled items are saved to BE
a18b451
fixed interface typing
89a73b5
@M7s7
fix: revert compaction of useUpdateEffects to fix local storage on lo…
a4dab5e 
…ad bug
Merge branch 'sync-timetables' into merging-lucy-and-chanel-friends-a…
7f46f36 
…ctivity
@Shzmj Shzmj requested a review from a team as a code owner November 15, 2024 01:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@Shzmj @M7s7 @hhuolu @Rayahhhmed