Commit Graph

59 Commits

Author SHA1 Message Date
Sahni-Arjun
0d5e9351ab merge 2022-04-07 22:21:05 -04:00
Sahni-Arjun
a01b9a0f48 added rentals page 2022-04-07 22:16:48 -04:00
88c0de660e Start of profile page. 2022-04-07 20:59:30 -05:00
5948ed561c Removed extra pardon button for matches. 2022-04-07 20:51:32 -05:00
753669c0af If the user session has expired, update context appropriately. 2022-04-07 20:47:12 -05:00
90040f9049 Admin display connected to backend. 2022-04-07 20:43:31 -05:00
9c4696b797 Fixed date issue with models. 2022-04-07 20:23:32 -05:00
a0a347e0c2 Authentication guard will now always refresh user identity. 2022-04-07 18:00:14 -05:00
e7d689cdde Finished sign up page. 2022-04-07 17:59:55 -05:00
f9fef07b9a Made change to api call to reflect server-side changes. 2022-04-07 17:59:12 -05:00
eb4e4b2444 Added suspension mechanism. 2022-04-07 17:57:08 -05:00
92289c87b3 Auth. guard now only renders child if authenticated. 2022-04-07 15:37:45 -05:00
525c2b6d5a Authentication guard now takes in a access level prop. 2022-04-07 13:51:38 -05:00
0e218750f8 Removed unecessary async declaration. 2022-04-07 13:38:29 -05:00
fa8552d488 Fixed login route and authentication guards. 2022-04-07 13:36:49 -05:00
ef66904c60 Merge branch 'develop' of https://github.com/csc309-winter-2022/team58 into develop 2022-04-06 22:54:22 -05:00
b575fc7fde Login endpoint now returns the user profile. 2022-04-06 22:53:20 -05:00
Arjun Sahni
da3dc6fdad
Merge pull request #8 from csc309-winter-2022/admin_page
Admin page
2022-04-06 23:00:08 -04:00
Sahni-Arjun
26abdd6aa5 comment 2022-04-06 22:57:53 -04:00
f98b003808 Implemented component version of authentication guard. 2022-04-06 21:18:48 -05:00
Sahni-Arjun
468f1cfa31 Merge branch 'develop' into admin_page 2022-04-06 22:15:09 -04:00
Sahni-Arjun
7c8e37aea8 finished admin frontend 2022-04-06 22:09:03 -04:00
499cbf3409 Fixed api client url error. 2022-04-06 20:35:41 -05:00
Sahni-Arjun
54b01f81c5 Admin page 2022-04-06 19:34:21 -04:00
30894c59c4 Merge branch 'develop' of https://github.com/csc309-winter-2022/team58 into develop 2022-04-05 20:54:29 -05:00
34bbfb3d5d Final changes. 2022-04-05 20:54:26 -05:00
Hansi Xu
9f1df7f7f4 Merge branch 'restructure' into develop 2022-04-05 21:48:51 -04:00
Hansi Xu
f6a8cebbec Merge branch 'signup-page' into restructure 2022-04-05 21:48:32 -04:00
Hansi Xu
5a49a1e4f8 Moved signup to pages 2022-04-05 21:48:08 -04:00
Hansi Xu
1fd60e39d4 Merge branch 'restructure' into develop 2022-04-05 21:40:49 -04:00
Hansi Xu
332e4e94d8 Merge branch 'signup-page' into restructure 2022-04-05 21:40:21 -04:00
Hansi Xu
d86570996e updating the signup page 2022-04-05 21:39:48 -04:00
Hansi Xu
c691b710b7 Merge branch 'restructure' into develop 2022-04-05 21:18:15 -04:00
Hansi Xu
6c79a4e9b3 Merge branch 'signup-page' into restructure 2022-04-05 21:16:49 -04:00
Hansi Xu
559973de5a Create signup.js 2022-04-05 21:15:39 -04:00
6cd421ba01 Fixed sport display. 2022-04-05 20:13:55 -05:00
911e5a2c79 Merge branch 'Dashboard' into restructure 2022-04-05 20:00:28 -05:00
999f884694 Login now displays an error message on a failed login. 2022-04-05 19:51:13 -05:00
Piyush Sharma
8f46ad77b8 Added cards and scroll styling 2022-04-05 20:17:50 -04:00
c4c4031e4c Login complete. 2022-04-05 19:14:11 -05:00
5c393cb73d Changed layout to a be a function component. 2022-04-05 18:47:06 -05:00
Sahni-Arjun
94d3369d4e admin page 2022-04-05 19:29:44 -04:00
4aced5ed2d Added "api/" prefix to api routes.
Client updated to reflect changes.
2022-04-05 17:24:41 -05:00
8a7fbd074b Began integrating dashboard.
Also fixed match controller populate calls.
2022-04-05 14:52:19 -05:00
e4db4ab403 Merge branch 'restructure' into login-page 2022-04-05 14:22:28 -05:00
67c1b9e821 Added route guards and login page template. 2022-04-05 14:20:50 -05:00
Piyush Sharma
d5a11d214c Updated Dashboard 2022-04-05 14:51:15 -04:00
Piyush Sharma
2877fc3fd7 Merge remote-tracking branch 'origin/restructure' into Dashboard 2022-04-05 13:19:19 -04:00
Piyush Sharma
879cbac17f Added Dashboard 2022-04-05 13:16:09 -04:00
a7885ecf53 Added padding to horizontal scrollers. 2022-04-05 03:44:04 -05:00