cth0604
|
63f2a293f9
|
Merge pull request #45 from CPSC319-Winter-term-2/api-fetch
Api fetch
|
2022-03-25 13:18:46 -07:00 |
|
cth0604
|
ff9f67222b
|
Merge branch 'main' into api-fetch
|
2022-03-25 13:18:34 -07:00 |
|
Taehee Choi
|
ff8cd26a53
|
empty string for mock data
|
2022-03-25 13:15:25 -07:00 |
|
cth0604
|
03803ea711
|
Merge pull request #43 from CPSC319-Winter-term-2/mbalsdon-calendar-upgrade
Add functionality to calendar
|
2022-03-25 11:53:54 -07:00 |
|
Taehee Choi
|
34a1113686
|
Merge branch 'mbalsdon-calendar-upgrade' of github.com:CPSC319-Winter-term-2/Alley-HSBC-Frontend into mbalsdon-calendar-upgrade
|
2022-03-25 11:51:58 -07:00 |
|
Taehee Choi
|
364c920f77
|
currentUser now cannot be null
|
2022-03-25 11:51:33 -07:00 |
|
mbalsdon
|
7f00d00198
|
revert changes
|
2022-03-25 11:32:27 -07:00 |
|
mbalsdon
|
c654985e45
|
fix calendar height (was getting cut off)
|
2022-03-25 11:26:51 -07:00 |
|
mbalsdon
|
f282d0d96c
|
add dropdown that allows viewing meetings for other team members, or all team members at once
|
2022-03-25 11:21:19 -07:00 |
|
mbalsdon
|
62d120afb7
|
add another mock meeting
|
2022-03-25 11:19:40 -07:00 |
|
Taehee Choi
|
04320c0ee5
|
linter fixes
|
2022-03-25 11:08:49 -07:00 |
|
cth0604
|
492c66b8df
|
Merge pull request #42 from CPSC319-Winter-term-2/home
Home
|
2022-03-25 11:01:31 -07:00 |
|
Taehee Choi
|
8dc4fef0c4
|
fetch calls and websocket
|
2022-03-25 10:59:05 -07:00 |
|
mbalsdon
|
7b9ed5e313
|
move everything into one file
|
2022-03-25 09:55:20 -07:00 |
|
CodeServer
|
ee77e90aa2
|
fixed the but
|
2022-03-25 10:43:05 +00:00 |
|
CodeServer
|
5119cd5272
|
trying to fix meetings panel (still have bug)
|
2022-03-25 09:01:20 +00:00 |
|
mbalsdon
|
dcff2d70ef
|
integrate backend meeting structure with calendar, add ability to bring up meeting menu when clicking calendar events
|
2022-03-25 00:14:53 -07:00 |
|
cth0604
|
6260910d47
|
Merge pull request #39 from CPSC319-Winter-term-2/login-pass-uuid
Login pass UUID
|
2022-03-25 00:13:50 -07:00 |
|
cth0604
|
f330be87b6
|
Merge pull request #37 from CPSC319-Winter-term-2/mbalsdon-callfavs-improvement
Add search and per-group-selection to Call Favorites (now "Call Group")
|
2022-03-25 00:12:15 -07:00 |
|
mbalsdon
|
3d0bd5c4d9
|
allow selectUserUpcomingMeetings to take null uuid inputs due to TeamState in usersSlice.tsx supporting null user inputs
|
2022-03-25 00:12:12 -07:00 |
|
Taehee Choi
|
877df73ea5
|
filter now uses includes
|
2022-03-25 00:11:51 -07:00 |
|
mbalsdon
|
ccb5719e4b
|
add selector for uuid of user currently using the app
|
2022-03-25 00:08:25 -07:00 |
|
mbalsdon
|
9ce1314cae
|
remove old mock data
|
2022-03-25 00:07:29 -07:00 |
|
mbalsdon
|
5ef38dad1a
|
add more mock meeting data
|
2022-03-25 00:07:02 -07:00 |
|
cth0604
|
478ebc7881
|
Merge pull request #38 from CPSC319-Winter-term-2/mbalsdon-sidebar-overlap-fix
(mostly) fix gear icon overlap bug
|
2022-03-25 00:04:54 -07:00 |
|
Taehee Choi
|
e810900c7e
|
sidebar position fixed
|
2022-03-24 22:29:00 -07:00 |
|
cth0604
|
b8ed1e825b
|
Merge pull request #36 from CPSC319-Winter-term-2/mbalsdon-contacts-search
contacts page search
|
2022-03-24 22:04:29 -07:00 |
|
Taehee Choi
|
cdac8e9ef4
|
now search uses includes and num contacts updated properly
|
2022-03-24 22:04:00 -07:00 |
|
CodeServer
|
759422969a
|
login connected backend
|
2022-03-25 02:44:47 +00:00 |
|
mbalsdon
|
0a8546f6f7
|
partially fix bug where gear icon overlapped w/ names (still happens on very small viewports since flexShrink only adds a linebreak where there are spaces in text)
|
2022-03-24 18:30:26 -07:00 |
|
mbalsdon
|
bee47e29a8
|
fix small issue where selected checkboxes stay selected after changing group
|
2022-03-24 17:34:37 -07:00 |
|
mbalsdon
|
0c247569b7
|
add onGroupChange input to GroupSelect component
|
2022-03-24 17:33:11 -07:00 |
|
mbalsdon
|
a735ee8304
|
add onGroupChange function parameter (can be null)
|
2022-03-24 17:31:53 -07:00 |
|
mbalsdon
|
c21e4785ce
|
add search to call group dialog
|
2022-03-24 16:48:14 -07:00 |
|
mbalsdon
|
fea1a6aae5
|
change 'call favourites' to 'call group'
|
2022-03-24 16:11:55 -07:00 |
|
mbalsdon
|
ad5ecf2d41
|
add dropdown to switch between groups; remove select all button
|
2022-03-24 16:11:14 -07:00 |
|
mbalsdon
|
e18562c0c9
|
implement basic contactspage search
|
2022-03-24 14:34:46 -07:00 |
|
mbalsdon
|
f09a2177dd
|
implement contactspage search (buggy)
|
2022-03-24 14:22:08 -07:00 |
|
cth0604
|
b0c38934f8
|
Merge pull request #35 from CPSC319-Winter-term-2/home
Home
|
2022-03-23 01:21:54 -07:00 |
|
CodeServer
|
24875f914b
|
home real time update
|
2022-03-23 06:52:55 +00:00 |
|
CodeServer
|
9c7102dccd
|
home fix
|
2022-03-23 06:37:53 +00:00 |
|
CodeServer
|
a5467dadab
|
home update
|
2022-03-23 06:03:50 +00:00 |
|
CodeServer
|
1c85863245
|
get logged in user id
|
2022-03-22 23:16:27 +00:00 |
|
cth0604
|
226d403733
|
Merge pull request #32 from CPSC319-Winter-term-2/sidebar-calendar-updates
sidebar changes
|
2022-03-20 23:57:00 -07:00 |
|
Taehee Choi
|
19906db3da
|
sidebar changes
|
2022-03-20 23:56:18 -07:00 |
|
cth0604
|
16587686d4
|
Merge pull request #31 from CPSC319-Winter-term-2/front-end-fixes
redux updates
|
2022-03-16 17:14:13 -07:00 |
|
Taehee Choi
|
9b5d8002a0
|
redux updates
|
2022-03-15 15:41:41 -07:00 |
|
Jincheng Lu
|
49aee79557
|
Merge pull request #30 from CPSC319-Winter-term-2/home
changed from label to Typography, changed time format
|
2022-03-14 16:39:36 -07:00 |
|
Jincheng Lu
|
4a2f14a388
|
Merge branch 'main' into home
|
2022-03-14 16:39:10 -07:00 |
|
CodeServer
|
c45fb59154
|
changed from label to Typography, changed time format
|
2022-03-14 23:35:14 +00:00 |
|