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 |
|
mbalsdon
|
7b9ed5e313
|
move everything into one file
|
2022-03-25 09:55:20 -07: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 |
|
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 |
|
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 |
|
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 |
|
Taehee Choi
|
19906db3da
|
sidebar changes
|
2022-03-20 23:56:18 -07:00 |
|
Taehee Choi
|
9b5d8002a0
|
redux updates
|
2022-03-15 15:41:41 -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 |
|
|
|
f7223aef44
|
removed test
|
2022-03-13 18:50:29 -07:00 |
|
Taehee Choi
|
97ed807785
|
merge conflict fixes
|
2022-03-13 18:37:40 -07:00 |
|
cth0604
|
40e33dd0c9
|
Merge branch 'main' into redux-setup
|
2022-03-13 18:26:13 -07:00 |
|
Taehee Choi
|
20a4d5dabf
|
initial redux set up
|
2022-03-13 18:16:19 -07:00 |
|
|
|
353472b7a1
|
fixed eslint warnings
|
2022-03-13 18:08:33 -07:00 |
|
cth0604
|
b86d51d4c1
|
Merge pull request #15 from CPSC319-Winter-term-2/mbalsdon-callfavs
Call favourites dialogbox
|
2022-03-13 12:03:44 -07:00 |
|
cth0604
|
2bc8bbbba2
|
Merge pull request #17 from CPSC319-Winter-term-2/mbalsdon-calendarpage2
add calendar
|
2022-03-13 12:03:06 -07:00 |
|
Taehee Choi
|
52f76f8209
|
fix lint warnings
|
2022-03-13 11:58:14 -07:00 |
|
Taehee Choi
|
3320d0d932
|
initial redux setup
|
2022-03-13 11:56:47 -07:00 |
|
mbalsdon
|
5f79c81b2e
|
add react-big-calendar
|
2022-03-12 11:36:04 -08:00 |
|
mbalsdon
|
18635704bb
|
fix spacing and font
|
2022-03-11 23:45:42 -08:00 |
|
mbalsdon
|
55f91fbfb5
|
finish nonfunctional call favourites button dialog component
|
2022-03-11 21:43:40 -08:00 |
|
CodeServer
|
6b9d210e21
|
hide navbar sidebar bug fixes
|
2022-03-11 21:17:00 +00:00 |
|
CodeServer
|
c14ee4c3ad
|
hided navbar and sidebar from login page
|
2022-03-11 20:44:38 +00:00 |
|
Jincheng Lu
|
e0013d15f5
|
Merge branch 'main' into cochrane
|
2022-03-11 01:29:56 -08:00 |
|
CodeServer
|
686c8fe008
|
finished Protected Routes
|
2022-03-11 08:45:17 +00:00 |
|
Taehee Choi
|
6f8b36bf87
|
sidebar position fixed
|
2022-03-10 18:27:01 -08:00 |
|
Taehee Choi
|
792d254ff7
|
small design change
|
2022-03-08 12:42:07 -08:00 |
|
Mathew Balsdon
|
28abd08255
|
Merge pull request #6 from CPSC319-Winter-term-2/meeting-info-page
meeting details page implemented and api bodies included
|
2022-03-08 08:59:37 -08:00 |
|
CodeServer
|
a20c839324
|
changed index.tsx file back
|
2022-03-08 01:33:02 +00:00 |
|
CodeServer
|
abfc8581f9
|
finished login
|
2022-03-08 01:14:18 +00:00 |
|
cth0604
|
ff53f91a62
|
Merge pull request #5 from CPSC319-Winter-term-2/cochrane
Cochrane
|
2022-03-07 14:32:04 -08:00 |
|
Taehee Choi
|
82f0906124
|
meeting details page implemented and api bodies included
|
2022-03-06 16:43:45 -08:00 |
|
CodeServer
|
8cfc55312c
|
avoid overlap with the sidebar
|
2022-03-06 01:35:29 +00:00 |
|
CodeServer
|
b543030a9c
|
avoid overlap with sidebar
|
2022-03-06 01:34:13 +00:00 |
|
CodeServer
|
d83e6fafd6
|
added login page
|
2022-03-05 23:15:41 +00:00 |
|
cth0604
|
6865a55672
|
Merge pull request #4 from CPSC319-Winter-term-2/contacts-page
Contacts page
|
2022-03-05 01:48:23 -08:00 |
|
Taehee Choi
|
d21dda7719
|
contacts page first draft done
|
2022-03-05 01:30:48 -08:00 |
|
mbalsdon
|
c296241841
|
add settings button context menu (nonfunctional parts)
|
2022-03-03 18:23:17 -08:00 |
|
CodeServer
|
e3b3256bd8
|
moved to material ui
|
2022-03-03 08:42:29 +00:00 |
|
CodeServer
|
775c468548
|
breaking home up into components
|
2022-03-03 02:04:16 +00:00 |
|
