Commit Graph

175 Commits

Author SHA1 Message Date
Felix Hamme 5589e8c97e Use loading page for tournament edit page 2019-06-20 16:10:17 +02:00
Felix Hamme 8b773d5067 Use loading page for tournament statistics page 2019-06-20 15:57:39 +02:00
Felix Hamme c380c2ae80 Use loading page for tournament page 2019-06-20 15:40:36 +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 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
Felix Hamme 9897257748 Redesign tournament header/properties 2019-06-18 22:29:33 +02:00
betanummeric 34f4eb9fb2
Merge branch 'master' into ticket/TURNIERE-236 2019-06-18 21:27:26 +02:00
betanummeric 46bb62bf87
Merge branch 'master' into ticket/TURNIERE-237 2019-06-18 20:21:48 +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 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 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 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 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
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 e18cfcd9ea
Merge branch 'master' into ticket/TURNIERE-135 2019-06-10 20:54:47 +02:00
Jonny ba701f675a
Merge branch 'master' into ticket/TURNIERE-243 2019-06-10 18:13:40 +02:00
Felix Hamme 39a8de0d21 Replace the profile page with a login mask if the user is not signed in 2019-06-06 18:31:00 +02:00
Felix Hamme 4854847454 Merge branch 'ticket/TURNIERE-243' into ticket/TURNIERE-135 2019-06-06 18:26:56 +02:00
Felix Hamme 0172625387 Simplify the default usecase of UserRestrictor by creating RequireLogin and applying it to the create and private pages 2019-06-06 18:23:58 +02:00
Felix Hamme f2af9fac12 Add mail address change form with corresponding backend calls 2019-06-06 15:46:32 +02:00
Felix Hamme 9ff387cced Create a profile page that displays the username and e-mail 2019-06-06 14:39:39 +02:00
Felix Hamme 4e8a690d2a Make calls to api for changing match scores 2019-06-06 12:06:09 +02:00
Felix Hamme 78e511f228 Disable end-match-button if the scores are equal and the match is in playoff stage 2019-06-06 12:06:09 +02:00
Jonny 38e24a2ec1 Fix some code issues from eslint 2019-05-29 09:42:03 +02:00
Jonny 7f28252ae8 Fix bug preventing the edit match modal from showing to the owner 2019-05-29 08:32:42 +02:00
Jonny 3286120f26 Add detection of empty statistics and show according message 2019-05-29 08:13:20 +02:00
Jonny f1ca2d3d82
Merge branch 'master' into ticket/TURNIERE-148 2019-05-29 04:43:38 +02:00
JP1998 54cca0f1d1 Add actual API call to retrieve the statistics 2019-05-29 04:42:26 +02:00
JP1998 d24e464f8e Adjust the title and image header to new API data 2019-05-29 04:06:06 +02:00
JP1998 da4b5ac2e5 Adjust DominanceShower to the actually implemented API data 2019-05-29 04:03:32 +02:00
Jonny abfded9e0f Adjust names of the used data to the (expected) backend names 2019-05-29 00:23:40 +02:00
Jonny 2ea9668f38 Extract the dominance shower view 2019-05-29 00:23:40 +02:00
Jonny beffd24855 Extract the standings table view 2019-05-29 00:23:39 +02:00
Jonny 3e9307a79d Remove custom css and replace it with bootstrap classes 2019-05-29 00:19:27 +02:00
Jonny e07378ba92 Extract the findTeam-function 2019-05-29 00:19:27 +02:00