Commit Graph

317 Commits

Author SHA1 Message Date
Felix Hamme 2f9c801890 Add loading page 2019-06-20 15:39:49 +02:00
betanummeric f95e85991f
Merge pull request #22 from turniere/ticket/TURNIERE-148
Create statistics page for a tournament
2019-06-19 19:12:13 +02:00
Felix Hamme 778d017302 Continuing merge: link tournament view, edit and statistics pages between each other, use new design from merged branch 2019-06-19 18:55:04 +02:00
Felix Hamme ecc1401042 Continuing merge: add Statistics button to tournament page 2019-06-19 17:53:56 +02:00
Felix Hamme bd994c9d04 Continuing merge: add api.js changes from ticket/TURNIERE-148 2019-06-19 17:52:03 +02:00
Felix Hamme 3df9f44c92 Merge remote-tracking branch 'origin/master' into ticket/TURNIERE-148
# Conflicts:
#	js/api.js
#	pages/tournament.js
2019-06-19 16:39:48 +02:00
Jonny d5ab0e8faf
Merge pull request #47 from turniere/feature/tournament-page-redesign
Redesign tournament header/properties
2019-06-19 02:36:07 +02:00
Jonny 6dac3f2bcb
Merge branch 'master' into feature/tournament-page-redesign 2019-06-19 02:35:47 +02:00
Jonny fcc4d729a9
Merge pull request #43 from turniere/ticket/TURNIERE-247
Update next stage (fetching from backend) after a match in the preced…
2019-06-19 02:35:12 +02:00
Jonny 6afd692dbc
Merge branch 'master' into ticket/TURNIERE-247 2019-06-19 02:34:45 +02:00
Felix Hamme 9897257748 Redesign tournament header/properties 2019-06-18 22:29:33 +02:00
betanummeric 57b8da675f
Merge pull request #44 from turniere/ticket/TURNIERE-236
Add notifications and redirect after trying to register
2019-06-18 22:02:39 +02:00
betanummeric 34f4eb9fb2
Merge branch 'master' into ticket/TURNIERE-236 2019-06-18 21:27:26 +02:00
betanummeric a67038e4c6
Merge pull request #46 from turniere/ticket/TURNIERE-237
Add redirect to the tournament after successful creation
2019-06-18 21:22:35 +02:00
betanummeric 46bb62bf87
Merge branch 'master' into ticket/TURNIERE-237 2019-06-18 20:21:48 +02:00
Jonny 7695b6b3ee
Merge pull request #45 from turniere/ticket/TURNIERE-238
Add link to create-tournament-page on private and public tournament list
2019-06-18 16:13:45 +02:00
Jonny f99492c809 Add redirect to the tournament after successful creation 2019-06-18 16:09:35 +02:00
Jonny 8baa6fe9f0 Add modal to describe registration process instead of a toast 2019-06-18 16:06:53 +02:00
Felix Hamme 4068c7c621 Add link to create-tournament-page on private and public tournament list 2019-06-18 14:07:11 +02:00
Jonny 70047a2e55 Add notifications and redirect after trying to register 2019-06-18 13:49:12 +02:00
Felix Hamme afca9fa224 Update next stage (fetching from backend) after a match in the preceding playoff stage changes to finished (after successful backend update) 2019-06-18 13:41:58 +02:00
betanummeric 4f9942e242
Merge pull request #42 from turniere/ticket/TURNIERE-222
Fix The Production Setup Doesn't Remember It's State
2019-06-18 11:29:29 +02:00
Jonny 33301ba4a0 Set hydrated flag if state does not exist 2019-06-18 10:41:03 +02:00
Jonny cc3d27b0f6
Merge pull request #40 from turniere/ticket/TURNIERE-239
Make tournament variables independent of each other
2019-06-17 22:52:27 +02:00
Felix Hamme d421cb2974 Add error message and prevent submit on tournament creation if not all groups are 100% full 2019-06-17 22:42:51 +02:00
Felix Hamme 0c1f896360 Make group advance input error message more verbose 2019-06-17 22:28:24 +02:00
Felix Hamme 682db6f832 Cleanup: Use reactstrap components instead of buggy "self-coded" stuff 2019-06-17 22:26:58 +02:00
Felix Hamme 5230b0b52b Bugfix: don't sign out if the tournament creation backend call fails 2019-06-17 21:23:15 +02:00
Felix Hamme 59153eca7a Merge remote-tracking branch 'origin/master' into ticket/TURNIERE-239 2019-06-17 20:28:46 +02:00
Felix Hamme 4cc2660551 Code style fixes 2019-06-17 19:40:53 +02:00
Jonny 40ccc87d9d
Merge pull request #39 from turniere/ticket/TURNIERE-119
Create group view (Ticket/turniere 119)
2019-06-17 16:36:27 +02:00
Jonny 39164053ff Add warning popup for invalid values 2019-06-16 19:17:40 +02:00
Jonny 932cefff7b Make sanity check before sending create request to backend 2019-06-16 18:28:37 +02:00
Jonny 5b64dc6c0e Remove upper bounds for numeric inputs 2019-06-16 18:25:13 +02:00
Felix Hamme 815065099b Use the actual group number for group titles 2019-06-15 23:22:10 +02:00
Felix Hamme 8185a7b4b5 Update group after a match score changes 2019-06-15 23:20:30 +02:00
Felix Hamme 99ca99ea38 Add a collapse button for all matches in a group stage
The button defaults to show if the playoff hasn't started, otherwise to hide.
2019-06-14 22:56:52 +02:00
Felix Hamme 5a9d543a01 Implement group stage 2019-06-14 22:23:58 +02:00
Felix Hamme 112e5b7a81 Refactoring: Move Stage, playoff stages out of tournament.js 2019-06-14 22:03:38 +02:00
Felix Hamme fed0516334 Refactoring: Move api call and conversion out of tournament.js 2019-06-14 21:51:51 +02:00
betanummeric 0fe6e9e196
Merge pull request #38 from turniere/ticket/TURNIERE-239
Ticket/turniere 239
2019-06-14 21:32:36 +02:00
Jonny 71d66fdb74 Extract the numeric input as single component 2019-06-14 14:26:36 +02:00
Jonny e8c78539ae Make consistent style with the second number selection 2019-06-14 14:26:36 +02:00
Jonny e58cfdc288 Add new input, which increases the group advance exponentially 2019-06-14 14:26:36 +02:00
Jonny 8c6304fac7 Actually send the playoff_teams_amount parameter 2019-06-14 14:26:36 +02:00
betanummeric fef441d091
Merge pull request #37 from turniere/ticket/TURNIERE-240
Update all dependency versions to avoid security vulnerabilities
2019-06-12 09:52:42 +02:00
JP1998 06b20465a6 Update all dependency versions to avoid security vulnerabilities 2019-06-12 00:05:18 +02:00
betanummeric a716f27dc8
Merge pull request #36 from turniere/ticket/TURNIERE-135
Create User Profile Page (Ticket/turniere 135)
2019-06-10 21:06:04 +02:00
betanummeric e18cfcd9ea
Merge branch 'master' into ticket/TURNIERE-135 2019-06-10 20:54:47 +02:00
Jonny bb8c0be72c
Merge pull request #35 from turniere/ticket/TURNIERE-243
Simplify the default usecase of UserRestrictor
2019-06-10 18:14:47 +02:00