Commit Graph

239 Commits

Author SHA1 Message Date
Felix Albrigtsen 6119a7cadf Updated login logic 2022-04-23 14:56:33 +02:00
Felix Albrigtsen 52514e9e68 Renamed id to asuraId 2022-04-23 14:51:58 +02:00
Felix Albrigtsen a9848ae0ad Delete .env 2022-04-23 14:39:13 +02:00
Felix Albrigtsen a0dfb7a5eb Updated gitignore 2022-04-23 14:38:13 +02:00
Felix Albrigtsen 5c4130d3e4 Continued session, admin page 2022-04-23 14:37:18 +02:00
Felix Albrigtsen 8f78f3672e cookie fix 2022-04-23 14:02:01 +02:00
Felix Albrigtsen cf303eb6c9 cookie-related typos 2022-04-23 13:39:24 +02:00
Felix Albrigtsen 176c0b5ad4 Dev session, graphics, prizes, login 2022-04-23 13:34:00 +02:00
Felix Albrigtsen 8c6b5e8326 Added prize field 2022-04-23 13:08:03 +02:00
Felix Albrigtsen cd83a4944a Removed excess logging, allowed tournament create 2022-04-23 12:42:29 +02:00
Felix Albrigtsen eb70ef67b5 Minor bugfix 2022-04-23 11:53:50 +02:00
Felix Albrigtsen 9f58f902b8 Added unsetContestantAndWinner 2022-04-23 11:46:39 +02:00
Felix Albrigtsen d69b3a1b2c Start LoginManager 2022-04-23 10:20:36 +02:00
Kristoffer Juelsenn 10476cd415 Conditional rendering for components 2022-04-23 10:19:26 +02:00
Felix Albrigtsen 61e4193455 Fix bug in getUsers 2022-04-23 08:36:21 +02:00
Felix Albrigtsen 2793e591e6 Finish session / cookie setup 2022-04-22 22:26:07 +02:00
Felix Albrigtsen 63618245e2 User system expanded 2022-04-22 19:32:25 +02:00
Jonas Haugland 779393e1af minor revert 2022-04-22 17:29:19 +02:00
Kristoffer Longva Eriksen 18bc7d9561 fixed getting tournament props in match component in overview 2022-04-22 16:13:57 +02:00
Jonas Haugland 29502e4111 showError minor fix 2022-04-22 16:10:17 +02:00
Jonas Haugland 539f31ea96 Changed from alert to snackbar most places, unstable version 2022-04-22 15:56:51 +02:00
Jonas Haugland 53f44ed5a0 Clean up 2022-04-22 14:14:45 +02:00
Kristoffer Juelsenn fdb1a32aa3 Additions to button rendering 2022-04-22 14:08:07 +02:00
Felix Albrigtsen 0ff1db6fb4 Started login system 2022-04-22 11:16:41 +02:00
Kristoffer Juelsenn 617d42b957 Merge branch 'client' of gitlab.stud.idi.ntnu.no:felixalb/dcst1008-2022-group1 into client 2022-04-22 10:12:59 +02:00
Kristoffer Juelsenn 5431f9496c Created delete dialog 2022-04-22 10:12:42 +02:00
Kristoffer Longva Eriksen 7b7d94fa94 Kind of added prizes frontend 2022-04-22 09:50:03 +02:00
Kristoffer Juelsenn af22c56aa4 Fixed countdown 2022-04-22 09:46:36 +02:00
Kristoffer Juelsenn 5de7ab0daa Conditional rendering for countdown 2022-04-22 09:21:53 +02:00
Felix Albrigtsen 8641500414 Fix login-url 2022-04-21 16:39:35 +02:00
Kristoffer Longva Eriksen a025aaee06 finished search bar 2022-04-21 15:27:40 +02:00
Felix Albrigtsen f13129350f Error display, minor details 2022-04-21 15:11:37 +02:00
Kristoffer Longva Eriksen 54f98beb40 search bar in progress 2022-04-21 15:09:01 +02:00
Felix Albrigtsen dd83b1f8f8 Rebuild setWinner() and install passport for google login 2022-04-21 15:05:19 +02:00
Kristoffer Juelsenn 34d93095af removed duplicate showError 2022-04-21 14:54:32 +02:00
Kristoffer Juelsenn 7865e97c28 Merge branch 'client' into 'client-kristofferTournament'
# Conflicts:
#   src/client/src/TournamentCreator.js
#   src/client/src/TournamentOverview.js
2022-04-21 12:51:18 +00:00
Kristoffer Juelsenn 51a41ab2b7 Lines working, time to merge 2022-04-21 14:47:13 +02:00
Kristoffer Longva Eriksen e572d64160 Added countdown timers to tournaments 2022-04-21 13:35:06 +02:00
Kristoffer Longva Eriksen eb8019d22e fixed submit buttons on manage teams page, including autoscroll 2022-04-21 11:52:55 +02:00
Kristoffer Juelsenn 4e7ccde40a Brackets being funky 2022-04-21 11:48:51 +02:00
Kristoffer Longva Eriksen 6deead1260 rounded seconds and milliseconds of new tournament dates to 0 2022-04-21 11:05:50 +02:00
Kristoffer Longva Eriksen a283ae90b0 disabled editing of archived tournaments 2022-04-21 10:34:57 +02:00
Kristoffer Juelsenn e3a81b9236 More minor changes to brackets 2022-04-20 22:43:40 +02:00
Kristoffer Juelsenn 3c9c4f70c0 minor changes 2022-04-20 19:41:36 +02:00
Kristoffer Juelsenn 24dcdd9c0a Vizualisation done, now to fix bugs 2022-04-20 19:00:08 +02:00
Kristoffer Juelsenn 340beb9aa4 fixed dates for this branch 2022-04-20 18:59:55 +02:00
Felix Albrigtsen 3f1b13cc16 revert api url 2022-04-20 16:01:00 +02:00
Felix Albrigtsen 21e16b09dc Dev session: login + design 2022-04-20 16:00:23 +02:00
Kristoffer Juelsenn 72628e06a6 Added some pages 2022-04-20 15:40:39 +02:00
Felix Albrigtsen 4bae1b3e20 Minor cleanup 2022-04-20 15:20:10 +02:00
Felix Albrigtsen 2475495206 Update dependency 2022-04-20 14:37:04 +02:00
Felix Albrigtsen 5cfed3a3bf Timezone compensation 2022-04-20 14:34:57 +02:00
Felix Albrigtsen 93b5946ffe Timezone compensation 2022-04-20 14:34:28 +02:00
Kristoffer Juelsenn 9e17129c6b Rendering implemented 2022-04-20 12:53:03 +02:00
Kristoffer Juelsenn 7f8ac6d345 Almost brackets working 2022-04-20 10:54:56 +02:00
Kristoffer Juelsenn ac71748bb3 Minor updates to rendering 2022-04-16 08:50:46 +02:00
Kristoffer Juelsenn cdaef9426c Starting reformatting for brackets 2022-04-13 12:51:45 +02:00
Kristoffer Juelsenn 9cb0b1b55b limited max team limit 2022-04-13 11:11:13 +02:00
Kristoffer Juelsenn 8db810f160 Date inputs mostly finished 2022-04-09 14:03:10 +02:00
Kristoffer Juelsenn 3f6b62eef6 Added a real loading icon 2022-04-09 14:02:59 +02:00
Kristoffer Juelsenn 9a27ca4a51 Fix for creation issues (maybe temp) 2022-04-09 11:24:57 +02:00
Kristoffer Juelsenn 155d477007 Merge branch 'client' of gitlab.stud.idi.ntnu.no:felixalb/dcst1008-2022-group1 into client 2022-04-09 11:06:05 +02:00
Kristoffer Juelsenn 3d34acc77a More date input updates 2022-04-09 11:05:26 +02:00
Kristoffer Longva Eriksen 7849f8c0ca filtered out old tournaments from front page 2022-04-09 11:05:11 +02:00
Kristoffer Juelsenn 6774868dfc Date Picker functional 2022-04-07 16:41:09 +02:00
Kristoffer Juelsenn fa15dbd364 added new date inputs, not fully functional 2022-04-06 22:44:05 +02:00
Kristoffer Juelsenn 30637a158d Added time to inputs 2022-04-06 20:32:58 +02:00
Kristoffer Juelsenn d790ed3df7 Added temp date pickers, we love fns 2022-04-06 17:03:32 +02:00
Kristoffer Juelsenn 61f053ef6d Merge branch 'client' of gitlab.stud.idi.ntnu.no:felixalb/dcst1008-2022-group1 into client 2022-04-06 15:18:55 +02:00
Kristoffer Juelsenn 68cc3f3b82 Mostly completed appbar, waiting for login 2022-04-06 15:18:51 +02:00
Kristoffer Longva Eriksen 15a27262ef Added delete icon to delete tournament button 2022-04-06 14:31:19 +02:00
Kristoffer Juelsenn f8b376768d AsuraBar React.state fix 2022-04-06 14:23:20 +02:00
Kristoffer Juelsenn 25ffeeeff3 Added SnackBar
Co-authored-by: SgtPodding <SgtPodding@users.noreply.github.com>
Co-authored-by: Felix Albrigtsen <felixalbrigtsen@gmail.com>
2022-04-06 14:15:58 +02:00
Kristoffer Juelsenn 3d837822e9 Updated AppBar to new name and functionality 2022-04-06 14:15:30 +02:00
Kristoffer Juelsenn 6be3966bab Created SnackBar
Co-authored-by: SgtPodding <SgtPodding@users.noreply.github.com>
2022-04-06 14:13:46 +02:00
Kristoffer Juelsenn cd6d00279e Created History Page
Co-authored-by: krloer <krloer@users.noreply.github.com>
2022-04-06 14:13:27 +02:00
Kristoffer Juelsenn 21a007c532 Imported AsuraBar and ErrorSnackBar 2022-04-06 14:12:56 +02:00
Kristoffer Juelsenn 144ec89273 Imported new "AsuraBar" 2022-04-06 14:12:38 +02:00
Kristoffer Juelsenn 5400d03da5 Updated style for links and icon 2022-04-06 14:11:28 +02:00
Kristoffer Juelsenn 8eb6d00bfa updated links 2022-04-06 14:11:10 +02:00
Kristoffer Juelsenn e51e7607c0 installed some dependencies for date input 2022-04-06 14:10:52 +02:00
Felix Albrigtsen 184ed8413b Undo timezone change 2022-04-06 10:31:56 +02:00
Felix Albrigtsen 3a4cd2c922 Change demo data 2022-04-06 10:19:24 +02:00
Felix Albrigtsen f1bb45ee81 Change timezone on mysql connection 2022-04-06 10:17:29 +02:00
Kristoffer Juelsenn 924664d5c2 Appbar Update 2022-04-06 09:48:22 +02:00
Kristoffer Juelsenn ddbe1f21c3 Changed icon size css 2022-04-06 09:22:24 +02:00
Kristoffer Juelsenn eb5a4ca665 Changed lower team limit 2022-04-06 09:22:17 +02:00
Felix Albrigtsen a56ef5a0f1 Auto restart database connection 2022-04-05 10:58:54 +02:00
Felix Albrigtsen ab472c3875 Slight collapse change 2022-03-30 01:35:22 +02:00
Felix Albrigtsen 009760cd33 Clean mistakes 2022-03-30 00:58:15 +02:00
Felix Albrigtsen b2d3f322ec Collapse buttons for description 2022-03-30 00:47:38 +02:00
Felix Albrigtsen 62636775eb Multiline create 2022-03-30 00:31:41 +02:00
Felix Albrigtsen f423614ae5 Clickable description 2022-03-30 00:30:39 +02:00
Felix Albrigtsen a62b245752 Short description 2022-03-30 00:25:34 +02:00
Felix Albrigtsen 2a3abb9bf3 Code Refactoring, design iteration 2022-03-30 00:11:11 +02:00
Felix Albrigtsen a95a2f6ea8 Delete tournaments, clean up 2022-03-30 00:10:10 +02:00
Kristoffer Longva Eriksen c6ebbf1890 Fixed spelling mistake in tournament creator 2022-03-29 20:46:02 +02:00
Felix Albrigtsen 12199d5f12 Team linking 2022-03-29 20:08:31 +02:00
Felix Albrigtsen 25513c31e8 Delete teams 2022-03-29 20:08:03 +02:00
Felix Albrigtsen b1d55783f4 Change from HTTP POST to HTTP DELETE 2022-03-29 16:10:00 +02:00