Commit Graph

315 Commits

Author SHA1 Message Date
5de7ab0daa Conditional rendering for countdown 2022-04-22 09:21:53 +02:00
8641500414 Fix login-url 2022-04-21 16:39:35 +02:00
a025aaee06 finished search bar 2022-04-21 15:27:40 +02:00
f13129350f Error display, minor details 2022-04-21 15:11:37 +02:00
54f98beb40 search bar in progress 2022-04-21 15:09:01 +02:00
dd83b1f8f8 Rebuild setWinner() and install passport for google login 2022-04-21 15:05:19 +02:00
34d93095af removed duplicate showError 2022-04-21 14:54:32 +02:00
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
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
51a41ab2b7 Lines working, time to merge 2022-04-21 14:47:13 +02:00
e572d64160 Added countdown timers to tournaments 2022-04-21 13:35:06 +02:00
eb8019d22e fixed submit buttons on manage teams page, including autoscroll 2022-04-21 11:52:55 +02:00
4e7ccde40a Brackets being funky 2022-04-21 11:48:51 +02:00
6deead1260 rounded seconds and milliseconds of new tournament dates to 0 2022-04-21 11:05:50 +02:00
a283ae90b0 disabled editing of archived tournaments 2022-04-21 10:34:57 +02:00
e3a81b9236 More minor changes to brackets 2022-04-20 22:43:40 +02:00
3c9c4f70c0 minor changes 2022-04-20 19:41:36 +02:00
24dcdd9c0a Vizualisation done, now to fix bugs 2022-04-20 19:00:08 +02:00
340beb9aa4 fixed dates for this branch 2022-04-20 18:59:55 +02:00
3f1b13cc16 revert api url 2022-04-20 16:01:00 +02:00
21e16b09dc Dev session: login + design 2022-04-20 16:00:23 +02:00
72628e06a6 Added some pages 2022-04-20 15:40:39 +02:00
4bae1b3e20 Minor cleanup 2022-04-20 15:20:10 +02:00
2475495206 Update dependency 2022-04-20 14:37:04 +02:00
5cfed3a3bf Timezone compensation 2022-04-20 14:34:57 +02:00
93b5946ffe Timezone compensation 2022-04-20 14:34:28 +02:00
9e17129c6b Rendering implemented 2022-04-20 12:53:03 +02:00
7f8ac6d345 Almost brackets working 2022-04-20 10:54:56 +02:00
ac71748bb3 Minor updates to rendering 2022-04-16 08:50:46 +02:00
cdaef9426c Starting reformatting for brackets 2022-04-13 12:51:45 +02:00
9cb0b1b55b limited max team limit 2022-04-13 11:11:13 +02:00
8db810f160 Date inputs mostly finished 2022-04-09 14:03:10 +02:00
3f6b62eef6 Added a real loading icon 2022-04-09 14:02:59 +02:00
9a27ca4a51 Fix for creation issues (maybe temp) 2022-04-09 11:24:57 +02:00
155d477007 Merge branch 'client' of gitlab.stud.idi.ntnu.no:felixalb/dcst1008-2022-group1 into client 2022-04-09 11:06:05 +02:00
3d34acc77a More date input updates 2022-04-09 11:05:26 +02:00
7849f8c0ca filtered out old tournaments from front page 2022-04-09 11:05:11 +02:00
6774868dfc Date Picker functional 2022-04-07 16:41:09 +02:00
fa15dbd364 added new date inputs, not fully functional 2022-04-06 22:44:05 +02:00
30637a158d Added time to inputs 2022-04-06 20:32:58 +02:00
d790ed3df7 Added temp date pickers, we love fns 2022-04-06 17:03:32 +02:00
61f053ef6d Merge branch 'client' of gitlab.stud.idi.ntnu.no:felixalb/dcst1008-2022-group1 into client 2022-04-06 15:18:55 +02:00
68cc3f3b82 Mostly completed appbar, waiting for login 2022-04-06 15:18:51 +02:00
15a27262ef Added delete icon to delete tournament button 2022-04-06 14:31:19 +02:00
f8b376768d AsuraBar React.state fix 2022-04-06 14:23:20 +02:00
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
3d837822e9 Updated AppBar to new name and functionality 2022-04-06 14:15:30 +02:00
6be3966bab Created SnackBar
Co-authored-by: SgtPodding <SgtPodding@users.noreply.github.com>
2022-04-06 14:13:46 +02:00
cd6d00279e Created History Page
Co-authored-by: krloer <krloer@users.noreply.github.com>
2022-04-06 14:13:27 +02:00
21a007c532 Imported AsuraBar and ErrorSnackBar 2022-04-06 14:12:56 +02:00