Commit Graph

17 Commits

Author SHA1 Message Date
Hansi Xu
329cc7c74f Merge branch 'main' of https://github.com/csc309-winter-2022/team58 2022-03-06 21:37:58 -05:00
Hansi Xu
30c407563d Fixed chat 2022-03-06 21:37:30 -05:00
Piyush Sharma
b717c94e4e Added comment 2022-03-06 21:35:10 -05:00
Sahni-Arjun
532b5d3876 minor changes 2022-03-06 21:13:11 -05:00
Sahni-Arjun
528cb80c1f minor changes, added navbar to admin 2022-03-06 21:01:56 -05:00
Arjun Sahni
641eca074f
Merge pull request #3 from csc309-winter-2022/admin
admin functionality
2022-03-06 20:51:53 -05:00
Sahni-Arjun
ae1c05c944 admin functionality 2022-03-06 20:49:04 -05:00
Hansi Xu
9c583ce5e0 Merge branch 'chat' into develop 2022-03-06 20:31:41 -05:00
Piyush Sharma
e1befed115 Added Homepage and Navbar 2022-03-06 20:22:23 -05:00
Hansi Xu
0a1323da8a Finally fixed input 2022-03-06 18:15:21 -05:00
Hansi Xu
7e17e1c9e9 Adding profile pics for phase1 (hard coded contacts) 2022-03-06 16:22:26 -05:00
Hansi Xu
ab80301f31 Adding chat components 2022-03-06 15:57:04 -05:00
Hansi Xu
c332594b40 Revert "The chat component"
This reverts commit fa8c2e7cf9.
2022-03-06 15:53:19 -05:00
Hansi Xu
fa8c2e7cf9 The chat component 2022-03-06 15:40:56 -05:00
Piyush Sharma
4c75dc2c75 Cleaned up files 2022-03-05 18:51:36 -05:00
Piyush Sharma
1b86e6260f Added Routing and Sign in/up Pages 2022-03-01 13:32:42 -05:00
Hansi Xu
e4608b1982 Fixed first commit 2022-02-27 17:46:16 -05:00