Commit Graph

296 Commits

Author SHA1 Message Date
Felix Albrigtsen c9bf8b4f8f minor typo 2022-04-23 15:18:42 +02:00
Felix Albrigtsen 2677793b28 ny klæbb 2022-04-23 15:17:07 +02:00
Felix Albrigtsen c20cea953d klæbb 2022-04-23 15:06:23 +02:00
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 ffe708ae47 Merge branch 'client-kristofferTournament' into 'client'
Merging brackets into client

See merge request felixalb/dcst1008-2022-group1!1
2022-04-21 14:52:13 +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