csc309-team58

ydeng/csc309-team58

Fork 0

Commit Graph

Select branches

Hide Pull Requests

Dashboard

add-user-dashboard-page-

admin

admin_page

authentication

bigger-carousel

carousel

carousel-image-change

chat

develop

login-page

main

match-info

match-search-queries

restructure

signup-page

static-interfaces

userdash-fixes

#1

#10

#2

#3

#4

#5

#6

#7

#8

#9

8e1ead37e6 Allowing proxying for secure cookies. main Harrison Deng 2022-04-09 18:28:59 -05:00
450fcfeb5a Server start command fixed. Harrison Deng 2022-04-09 15:56:31 -05:00
f65fbd70aa Fixed unset mongodb uri environment variable. Harrison Deng 2022-04-08 13:26:31 -05:00
1c704cb606

Merge pull request #10 from csc309-winter-2022/develop Arjun Sahni 2022-04-07 23:01:46 -04:00
eee941ffcc

Merge pull request #9 from csc309-winter-2022/rentals develop Arjun Sahni 2022-04-07 22:21:43 -04:00
0d5e9351ab merge Sahni-Arjun 2022-04-07 22:21:05 -04:00
a01b9a0f48 added rentals page Sahni-Arjun 2022-04-07 22:16:48 -04:00
88c0de660e Start of profile page. Harrison Deng 2022-04-07 20:59:30 -05:00
5948ed561c Removed extra pardon button for matches. Harrison Deng 2022-04-07 20:51:32 -05:00
753669c0af If the user session has expired, update context appropriately. Harrison Deng 2022-04-07 20:47:12 -05:00
90040f9049 Admin display connected to backend. Harrison Deng 2022-04-07 20:43:31 -05:00
9c4696b797 Fixed date issue with models. Harrison Deng 2022-04-07 20:23:32 -05:00
5d2528da5f Fixed database check. Harrison Deng 2022-04-07 19:22:35 -05:00
a0a347e0c2 Authentication guard will now always refresh user identity. Harrison Deng 2022-04-07 18:00:14 -05:00
e7d689cdde Finished sign up page. Harrison Deng 2022-04-07 17:59:55 -05:00
f9fef07b9a Made change to api call to reflect server-side changes. Harrison Deng 2022-04-07 17:59:12 -05:00
eb4e4b2444 Added suspension mechanism. Harrison Deng 2022-04-07 17:56:04 -05:00
2e8ba9c5b1 Separated public recent matches and user recent matches endpoints. Harrison Deng 2022-04-07 17:36:57 -05:00
92289c87b3 Auth. guard now only renders child if authenticated. Harrison Deng 2022-04-07 15:37:45 -05:00
525c2b6d5a Authentication guard now takes in a access level prop. Harrison Deng 2022-04-07 13:51:38 -05:00
0e218750f8 Removed unecessary async declaration. Harrison Deng 2022-04-07 13:38:29 -05:00
fa8552d488 Fixed login route and authentication guards. Harrison Deng 2022-04-07 13:36:49 -05:00
687d6d8a63 Deleting and readding signup signup-page Hansi Xu 2022-04-07 00:14:31 -04:00
9d982abe07 Update SIgnup.js Hansi Xu 2022-04-07 00:08:45 -04:00
da6f5c8265 Fixed signup page routing Hansi Xu 2022-04-06 23:56:39 -04:00
ef66904c60 Merge branch 'develop' of https://github.com/csc309-winter-2022/team58 into develop Harrison Deng 2022-04-06 22:54:22 -05:00
b575fc7fde Login endpoint now returns the user profile. Harrison Deng 2022-04-06 22:53:20 -05:00
da3dc6fdad

Merge pull request #8 from csc309-winter-2022/admin_page Arjun Sahni 2022-04-06 23:00:08 -04:00
26abdd6aa5 comment admin_page Sahni-Arjun 2022-04-06 22:57:53 -04:00
f98b003808 Implemented component version of authentication guard. Harrison Deng 2022-04-06 21:18:48 -05:00
468f1cfa31 Merge branch 'develop' into admin_page Sahni-Arjun 2022-04-06 22:15:09 -04:00
6856cd3b71 Eslint no longer complains about linebreaks. Harrison Deng 2022-04-06 21:14:40 -05:00
7c8e37aea8 finished admin frontend Sahni-Arjun 2022-04-06 22:09:03 -04:00
c738e8044a eslint no fails compiles due to unused imports. Harrison Deng 2022-04-06 21:03:30 -05:00
499cbf3409 Fixed api client url error. Harrison Deng 2022-04-06 20:35:41 -05:00
884c79e18d update admin Sahni-Arjun 2022-04-06 19:39:06 -04:00
54b01f81c5 Admin page Sahni-Arjun 2022-04-06 19:34:21 -04:00
24f085e17a

Update README.md Arjun Sahni 2022-04-05 21:59:20 -04:00
fdbd372430 Merge branch 'main' of https://github.com/csc309-winter-2022/team58 Harrison Deng 2022-04-05 20:54:46 -05:00
30894c59c4 Merge branch 'develop' of https://github.com/csc309-winter-2022/team58 into develop Harrison Deng 2022-04-05 20:54:29 -05:00
34bbfb3d5d Final changes. Harrison Deng 2022-04-05 20:54:26 -05:00
9f1df7f7f4 Merge branch 'restructure' into develop Hansi Xu 2022-04-05 21:48:51 -04:00
f6a8cebbec Merge branch 'signup-page' into restructure restructure Hansi Xu 2022-04-05 21:48:32 -04:00
5a49a1e4f8 Moved signup to pages Hansi Xu 2022-04-05 21:48:08 -04:00
096eadce13

Update README.md Piyush Sharma 2022-04-05 21:45:01 -04:00
1fd60e39d4 Merge branch 'restructure' into develop Hansi Xu 2022-04-05 21:40:49 -04:00
332e4e94d8 Merge branch 'signup-page' into restructure Hansi Xu 2022-04-05 21:40:21 -04:00
d86570996e updating the signup page Hansi Xu 2022-04-05 21:39:48 -04:00
c691b710b7 Merge branch 'restructure' into develop Hansi Xu 2022-04-05 21:18:15 -04:00
6c79a4e9b3 Merge branch 'signup-page' into restructure Hansi Xu 2022-04-05 21:16:49 -04:00
559973de5a Create signup.js Hansi Xu 2022-04-05 21:15:39 -04:00
6cd421ba01 Fixed sport display. Harrison Deng 2022-04-05 20:13:55 -05:00
0a2d513d3c Merge branch 'main' of https://github.com/csc309-winter-2022/team58 Harrison Deng 2022-04-05 20:04:49 -05:00
bb911173ec Merge branch 'develop' Harrison Deng 2022-04-05 20:03:30 -05:00
911e5a2c79 Merge branch 'Dashboard' into restructure Harrison Deng 2022-04-05 20:00:28 -05:00
999f884694 Login now displays an error message on a failed login. Harrison Deng 2022-04-05 19:51:13 -05:00
8f46ad77b8 Added cards and scroll styling Dashboard Piyush Sharma 2022-04-05 20:17:50 -04:00
c4c4031e4c Login complete. login-page Harrison Deng 2022-04-05 19:14:11 -05:00
5c393cb73d Changed layout to a be a function component. Harrison Deng 2022-04-05 18:47:06 -05:00
94d3369d4e admin page Sahni-Arjun 2022-04-05 19:29:44 -04:00
4aced5ed2d Added "api/" prefix to api routes. Harrison Deng 2022-04-05 17:24:41 -05:00
b2c4178482 Fixed broken recent matches endpoint. Harrison Deng 2022-04-05 16:19:05 -05:00
8a7fbd074b Began integrating dashboard. Harrison Deng 2022-04-05 14:52:19 -05:00
e4db4ab403 Merge branch 'restructure' into login-page Harrison Deng 2022-04-05 14:22:28 -05:00
67c1b9e821 Added route guards and login page template. Harrison Deng 2022-04-05 14:20:50 -05:00
fe3039b4f3

Merge pull request #7 from csc309-winter-2022/Dashboard Piyush Sharma 2022-04-05 15:19:46 -04:00
d5a11d214c Updated Dashboard Piyush Sharma 2022-04-05 14:51:15 -04:00
2877fc3fd7 Merge remote-tracking branch 'origin/restructure' into Dashboard Piyush Sharma 2022-04-05 13:19:19 -04:00
879cbac17f Added Dashboard Piyush Sharma 2022-04-05 13:16:09 -04:00
0b42dde699 Added mongo starts scripts. Harrison Deng 2022-04-05 12:11:06 -05:00
b447dcd985 Fixed broken import. Harrison Deng 2022-04-05 12:00:55 -05:00
98ea02b56c Added rental controller to server routes. Harrison Deng 2022-04-05 11:54:06 -05:00
8f96a2e5c9 Multiple changes, basic rental CRUD backend implemented. Harrison Deng 2022-04-05 11:50:35 -05:00
a7885ecf53 Added padding to horizontal scrollers. match-search-queries Harrison Deng 2022-04-05 03:44:04 -05:00
6cedd74473 Recent match endpoint now populates all references. Harrison Deng 2022-04-05 03:41:20 -05:00
d17fe1d912 Fixed extra comma on stringified items. Harrison Deng 2022-04-05 03:30:59 -05:00
c1589b9758 Welcome page now shows current matches. Harrison Deng 2022-04-05 03:28:12 -05:00
859147ea3d comment Sahni-Arjun 2022-04-05 03:50:11 -04:00
2831e2a39e Added route Piyush Sharma 2022-04-05 02:19:17 -04:00
f38867598e Setup Dashboard Page Piyush Sharma 2022-04-05 02:19:08 -04:00
f8abf7cd48 Changed carousel images to be more fitting. carousel-image-change Harrison Deng 2022-04-05 01:06:54 -05:00
8464c4debc Changed carousel images to larger images and restyled. bigger-carousel Harrison Deng 2022-04-05 01:00:25 -05:00
dd6dc787e9 Match controller now returns user recents if authenticated. Harrison Deng 2022-04-05 00:21:34 -05:00
0f480af1f0 Merge branch 'restructure' of https://github.com/csc309-winter-2022/team58 into restructure Harrison Deng 2022-04-04 22:50:29 -05:00
7dd862e134 Added U and D endpoints. Harrison Deng 2022-04-04 22:50:26 -05:00
489387ec9f

Merge pull request #6 from csc309-winter-2022/carousel Piyush Sharma 2022-04-04 23:30:36 -04:00
900f98615d Change indicator colour carousel Piyush Sharma 2022-04-04 23:28:23 -04:00
3124f05544 Added New Carousel Piyush Sharma 2022-04-04 23:06:59 -04:00
ba566040b1 Rewrite phase 1. Harrison Deng 2022-04-04 20:15:43 -05:00
eea74dab09 Began mass reorganizing of project and code structure. Harrison Deng 2022-03-07 21:09:52 -06:00
8492c82e4f Merge branch 'main' of https://github.com/csc309-winter-2022/team58 Harrison Deng 2022-03-07 21:05:15 -06:00
1e62ba70d1 Changed to showing visible participate button. userdash-fixes Harrison Deng 2022-03-07 20:51:25 -06:00
fba8212aeb Fixed access to dashboard page. Harrison Deng 2022-03-07 20:49:43 -06:00
5c7e26a1a9 Added package-lock.json to .gitignore. Harrison Deng 2022-03-07 20:37:10 -06:00
df2071439d changes Sahni-Arjun 2022-03-06 21:59:05 -05:00
e773477fb0

Merge pull request #5 from csc309-winter-2022/develop Arjun Sahni 2022-03-06 21:51:05 -05:00
196c36444d

Update README.md Arjun Sahni 2022-03-06 21:50:24 -05:00
6a9e677043 Created user dashboard. add-user-dashboard-page- Harrison Deng 2022-03-06 20:49:13 -06:00
329cc7c74f Merge branch 'main' of https://github.com/csc309-winter-2022/team58 Hansi Xu 2022-03-06 21:37:58 -05:00
30c407563d Fixed chat Hansi Xu 2022-03-06 21:37:30 -05:00