Commit Graph

340 Commits

Author SHA1 Message Date
Felix Hamme 4f079d75ec Merge branch 'master' into ticket/TURNIERE-138 2019-04-17 10:02:08 +02:00
Felix Hamme 0aa1660cd1 Link private tournament list in navigation bar if the user is signed in 2019-04-17 09:59:51 +02:00
Felix Hamme 0b35c6c84d Begin implementing page for private tournaments 2019-04-17 09:59:09 +02:00
betanummeric 75b4733662
Merge pull request #14 from turniere/ticket/TURNIERE-139
Adjustment of the `/create` page
2019-04-17 08:39:21 +02:00
JP1998 75f7186ca7 Fix a bug logging the user out when calling certain sites
This has happened because the store was being updated before
it was rehydrated, and thus first saving an empty state, which
is thereafter being loaded when rehydrating the application state.
2019-04-16 23:20:51 +02:00
JP1998 dc3b1a2cac Fix design with white borders being visible while dragging teams 2019-04-16 19:17:28 +02:00
Felix Hamme b0b6fb84e0 Use smaller scope for variables 2019-04-16 14:25:42 +02:00
Felix Hamme 303f774989 Use strong typed comparison expressions 2019-04-16 14:17:33 +02:00
Jonny 23447c7afe Merge branch 'master' into ticket/TURNIERE-139 2019-04-16 14:16:51 +02:00
Felix Hamme 47b4c4602b Replace disgusting code with beautiful code 2019-04-16 14:13:01 +02:00
Jonny 11d607c08b Implement actual swapping on drag and drop 2019-04-16 13:51:23 +02:00
Jonny 88408b7543 Implement drag and drop for teams in groups 2019-04-16 13:40:12 +02:00
Jonny e877cf1a7f Add detection and handling of changes of max group sizes 2019-04-16 13:05:24 +02:00
Jonny 6890ecc7fb Fix a bug with the adding of teams to groups
Due to the equals one could fill up one group, decrease the max size of it
and then add indefinitely many teams to the last group without a new group being created.
2019-04-16 12:50:41 +02:00
Jonny e50dc7d293 Add proper logic for removing teams with the group stage 2019-04-16 12:38:35 +02:00
Jonny 89f2fa79c5 Properly format the groups and the teams in them 2019-04-16 11:41:13 +02:00
Felix Hamme 8b32604f7e Merge branch 'master' into ticket/TURNIERE-138 2019-04-16 11:23:11 +02:00
betanummeric 317b48e438
Merge pull request #13 from turniere/ticket/TURNIERE-121
Fix a bug with the errors persisting after reloading
2019-04-16 11:17:19 +02:00
Jonny 6962f50ac6 Remove unused import 2019-04-16 10:54:25 +02:00
Jonny 8aad4d614d Make groups visible and add the teams to the groups 2019-04-16 10:51:48 +02:00
betanummeric c2dcd5946c
Merge branch 'master' into ticket/TURNIERE-121 2019-04-16 10:34:40 +02:00
betanummeric 450befe615
Merge pull request #12 from turniere/ticket/TURNIERE-130
Send tournament creation data
2019-04-16 10:32:20 +02:00
Jonny 0bd92b2ada Create / Rename properties needed for the group view 2019-04-16 09:50:13 +02:00
JP1998 f0aa1af2a1 Create rational bounds for the group size and number of advancing teams 2019-04-16 09:50:13 +02:00
JP1998 b0949f28d5 Create proper animation for the group phase section
The appearance and disappearance of the group phase section will now be animated.
The animation will have to be adjusted at some point, since currently the height
is hardcoded.
The reason for the library is, that react-bootstrap doesn't support
animations anymore as of
https://github.com/react-bootstrap/react-overlays/issues/146#issuecomment-282036734
2019-04-16 09:47:50 +02:00
JP1998 d957ad417d Rename property 'fadeIn' to 'groupPhaseEnabled'
I think this name is much more descriptive of what this property actually represents.
2019-04-16 08:55:33 +02:00
JP1998 148686b7c1 Fix bug preventing the owner of a tournament from starting / editing matches 2019-04-11 16:25:24 +02:00
JP1998 980d2eac3d Fix a bug, which causes the tournament site to crash
Whenever a match in the play off stage of a tournament has not had a team determined
yet the tournament site would crash on it since it expected two team objects attached.
2019-04-11 16:19:17 +02:00
JP1998 2e93076d79 Fix a bug where you are logged out after reloading the /create page 2019-04-11 15:53:27 +02:00
JP1998 9525aa68d5 Correctly format the sent data 2019-04-11 15:35:37 +02:00
JP1998 2cd4f77f22 Make the commands in the README uniform 2019-04-11 15:12:09 +02:00
JP1998 f3c429692c Make the login and register components clear errors as soon as they are mounted 2019-04-11 14:13:43 +02:00
JP1998 5a34b415f2 Add API method for clearing existing errors 2019-04-11 14:07:59 +02:00
JP1998 4964040ad8 Fix bug showing public tournaments as private 2019-04-11 13:00:02 +02:00
JP1998 0a1678ed51 Make the create-page actually send the data to the api 2019-04-11 12:57:40 +02:00
JP1998 e2569b30c8 Add API method for creating a tournament 2019-04-11 12:57:40 +02:00
Jonny e473c9af3e
Merge pull request #11 from turniere/ticket/TURNIERE-126
redirect to / after login
2019-04-11 10:17:24 +02:00
Felix Hamme 99df57ecf1 Remove unused import 2019-04-11 09:37:10 +02:00
Jonny dbd267b938
Merge branch 'master' into ticket/TURNIERE-126 2019-04-11 09:26:28 +02:00
betanummeric 9eabd42bfe
Merge pull request #10 from turniere/ticket/TURNIERE-131
Hide Match update Dialog when unauthorized
2019-04-11 09:04:45 +02:00
Jonny 74aa5c67fd
Merge branch 'master' into ticket/TURNIERE-131 2019-04-11 08:17:08 +02:00
Felix Hamme 22c7e1384c Remove one line of nonsense 2019-04-10 23:56:57 +02:00
Felix Hamme 62eb563739 redirect to / after login 2019-04-10 19:53:53 +02:00
JP1998 45136aa1d6 Fix a bug which crashes the site when there is no internet connection
In case there is no internet connection axios will not return a response object
with the error after a request. Since we still tried to access said object the
website crashed when there was no internet connection.
2019-04-09 17:03:04 +02:00
JP1998 6035da058e Restrict access to the modal for users that are not the owner of the tournament 2019-04-09 17:00:49 +02:00
JP1998 2b1d7b084e Pull up signed in and username properties from EditButton to TournamentPage
This makes us able to provide these fields in lower components without having to
rebind the state to the properties of this component.
This will be needed to restrct access to the modal allowing the user to modify scores.
2019-04-09 16:58:56 +02:00
betanummeric ae56a4d58c
Merge pull request #9 from turniere/ticket/TURNIERE-134
Add the favicon to all pages
2019-04-09 11:01:09 +02:00
betanummeric 0ae54f5f61
Merge branch 'master' into ticket/TURNIERE-134 2019-04-09 10:53:08 +02:00
betanummeric 264629b24f
Merge pull request #8 from turniere/ticket/TURNIERE-133
Create own files for common components
2019-04-09 10:47:07 +02:00
JP1998 73fa9213b8 Add the favicon to all pages 2019-04-09 10:18:55 +02:00