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
6afd692dbc
Merge branch 'master' into ticket/TURNIERE-247
2019-06-19 02:34:45 +02:00
34f4eb9fb2
Merge branch 'master' into ticket/TURNIERE-236
2019-06-18 21:27:26 +02:00
f99492c809
Add redirect to the tournament after successful creation
2019-06-18 16:09:35 +02:00
70047a2e55
Add notifications and redirect after trying to register
2019-06-18 13:49:12 +02:00
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
33301ba4a0
Set hydrated flag if state does not exist
2019-06-18 10:41:03 +02:00
682db6f832
Cleanup: Use reactstrap components instead of buggy "self-coded" stuff
2019-06-17 22:26:58 +02:00
5230b0b52b
Bugfix: don't sign out if the tournament creation backend call fails
2019-06-17 21:23:15 +02:00
59153eca7a
Merge remote-tracking branch 'origin/master' into ticket/TURNIERE-239
2019-06-17 20:28:46 +02:00
4cc2660551
Code style fixes
2019-06-17 19:40:53 +02:00
39164053ff
Add warning popup for invalid values
2019-06-16 19:17:40 +02:00
815065099b
Use the actual group number for group titles
2019-06-15 23:22:10 +02:00
8185a7b4b5
Update group after a match score changes
2019-06-15 23:20:30 +02:00
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
5a9d543a01
Implement group stage
2019-06-14 22:23:58 +02:00
112e5b7a81
Refactoring: Move Stage, playoff stages out of tournament.js
2019-06-14 22:03:38 +02:00
fed0516334
Refactoring: Move api call and conversion out of tournament.js
2019-06-14 21:51:51 +02:00
71d66fdb74
Extract the numeric input as single component
2019-06-14 14:26:36 +02:00
e18cfcd9ea
Merge branch 'master' into ticket/TURNIERE-135
2019-06-10 20:54:47 +02:00
ba701f675a
Merge branch 'master' into ticket/TURNIERE-243
2019-06-10 18:13:40 +02:00
4854847454
Merge branch 'ticket/TURNIERE-243' into ticket/TURNIERE-135
2019-06-06 18:26:56 +02:00
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
f2af9fac12
Add mail address change form with corresponding backend calls
2019-06-06 15:46:32 +02:00
ba38864a1c
Update the Match when the scores are submitted
2019-06-06 12:06:09 +02:00
4e8a690d2a
Make calls to api for changing match scores
2019-06-06 12:06:09 +02:00
85a36a02c9
Add change score button (no functionality yet)
2019-06-06 12:06:09 +02:00
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
5826a06ab6
Split up Match into more files
2019-06-06 12:06:09 +02:00
38e24a2ec1
Fix some code issues from eslint
2019-05-29 09:42:03 +02:00
4a444babd4
Bugfix: match scores weren't editable
2019-05-29 08:40:11 +02:00
3286120f26
Add detection of empty statistics and show according message
2019-05-29 08:13:20 +02:00
a0bcd328e6
Fix bug preventing the request for the actual statistics to come through
2019-05-29 08:05:22 +02:00
f1ca2d3d82
Merge branch 'master' into ticket/TURNIERE-148
2019-05-29 04:43:38 +02:00
e813726f50
Adjust the StandingsTable to the new API data format
2019-05-29 04:24:39 +02:00
da4b5ac2e5
Adjust DominanceShower to the actually implemented API data
2019-05-29 04:03:32 +02:00
3aab76972b
Add redux state and api calls for the statistics
2019-05-29 03:58:29 +02:00
abfded9e0f
Adjust names of the used data to the (expected) backend names
2019-05-29 00:23:40 +02:00
a05cc768fd
Fix a bug which resets the striping after the last element that has not been hidden
2019-05-29 00:23:40 +02:00
74a1052e25
Change for-loop in findTeam to make it more readable
2019-05-29 00:23:40 +02:00
2ea9668f38
Extract the dominance shower view
2019-05-29 00:23:40 +02:00
beffd24855
Extract the standings table view
2019-05-29 00:23:39 +02:00
e07378ba92
Extract the findTeam-function
2019-05-29 00:19:27 +02:00
d557a21d90
Extract the ranged map function
2019-05-29 00:19:27 +02:00
a38624fd5b
Adjust style of the tournament information view
2019-05-29 00:19:26 +02:00
9fc909e257
Extract the tournament information view for more consisten looks
2019-05-29 00:19:26 +02:00
7976d8b0f3
Sort the teams accordings to match and point differential
2019-05-29 00:01:03 +02:00
134844973e
Implement ending a match: make backend calls, replace match states {team1_won, team2_won, undecided} with {finished}, hold the match data in Match.js in state instead of in props, reorder internal match data storage
2019-05-29 00:00:54 +02:00
7848d3d81d
Implement starting a match, make backend calls
2019-05-28 22:03:17 +02:00
97ba7726ed
Move Match and belongings out of tournament.js to new file Match.js
2019-05-12 12:21:24 +02:00
a40ecd56e9
Move axios wrapper methods to new file backendApi
2019-05-12 12:21:24 +02:00
6bea32b08a
Move actionType and defaultState definitions from api.js to own files
2019-05-12 12:21:24 +02:00
501cc7a208
Refactor ErrorComponents
2019-05-12 12:21:24 +02:00
fb4b380407
Refactor Footer and update copyright year
2019-05-12 12:21:24 +02:00
7b5e18cc9e
Move everypage.css into css directory
2019-05-12 12:21:24 +02:00
a4b1506d41
Replace for-in-loop with for-of-loop (suggested by eslint)
2019-05-09 14:48:43 +02:00
b3243f6a5c
Format every js file to comply with the new eslint rules
2019-05-09 14:48:43 +02:00
d12af2731f
use camleCase identifiers in api.js
2019-05-09 14:48:43 +02:00
b40c0382a8
Automatically apply eslint rules
2019-05-09 14:48:43 +02:00
f4cf04ad25
Formatting: satisfy Hound
2019-05-08 13:59:11 +02:00
Thor77
e858200a7a
Fix envvar problem
2019-05-08 10:54:00 +02:00
0a2c180d6a
Replace hardcoded backend url with environment variable (works only server-side) (required client-side tough, so it doesn't work (wait till next commit, Thor77 has a lovely fix for that))
...
(This commit was definitely not changed because I nagged about it wasn't working...)
2019-05-08 09:40:00 +02:00
b30a3a759e
Merge branch 'master' into ticket/TURNIERE-156
2019-05-02 08:52:18 +02:00
a1828c30c3
Review changes: code cleanup
2019-05-01 15:53:22 +02:00
fd3085e1f1
Change code formatting to satisfy Hound
2019-04-28 04:27:41 +02:00
b300049e1e
Merge branch 'master' into ticket/TURNIERE-141
2019-04-28 04:22:14 +02:00
dac0c33272
Implement page for displaying the list of private tournaments
2019-04-28 04:18:18 +02:00
6aeb97ae99
Remove unused code
2019-04-28 03:06:40 +02:00
9b56b2eddb
Merge branch 'master' into ticket/TURNIERE-141
2019-04-27 13:32:37 +02:00
60c8bff55d
Greet the user with a toast notification when he logs in or out [now done with success callback methods]
2019-04-27 13:30:34 +02:00
f243b69a5e
Revert "Greet the user after login with a toast"
...
This reverts commit b85ce62b
2019-04-27 13:27:26 +02:00
bf8a9431bf
Revert "Say goodbye to the user when he logs out"
...
This reverts commit 7b38b503
2019-04-27 13:27:11 +02:00
7b38b503ef
Say goodbye to the user when he logs out
2019-04-23 20:47:07 +02:00
b85ce62b2f
Greet the user after login with a toast
2019-04-23 15:41:43 +02:00
80b0fe8243
Merge branch 'master' into ticket/TURNIERE-140
2019-04-18 14:47:47 +02:00
dfb709d37e
Remove the wrapping data object from the response of login
2019-04-18 10:19:37 +02:00
2bc3fe24b3
Remove manual clearing of errors
...
Since the errors are now always cleared upon rehydration of the
application state, we can now safely remove the api method
clearErrors() and also remove calls to this method.
2019-04-18 00:03:28 +02:00
a8c5586a34
Disable rehydration of error messages
...
Since errors are cleared before the state is rehydrated the
clearing of the errors are dismissed when rehydrating. Thus
we'll have to clear the errors whenever the state is being
rehydrated.
2019-04-17 23:58:10 +02:00
0643b4bb0e
Format the errors for logging in
2019-04-17 16:32:49 +02:00
4f079d75ec
Merge branch 'master' into ticket/TURNIERE-138
2019-04-17 10:02:08 +02:00
0aa1660cd1
Link private tournament list in navigation bar if the user is signed in
2019-04-17 09:59:51 +02:00
0b35c6c84d
Begin implementing page for private tournaments
2019-04-17 09:59:09 +02:00
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
dc3b1a2cac
Fix design with white borders being visible while dragging teams
2019-04-16 19:17:28 +02:00
23447c7afe
Merge branch 'master' into ticket/TURNIERE-139
2019-04-16 14:16:51 +02:00
47b4c4602b
Replace disgusting code with beautiful code
2019-04-16 14:13:01 +02:00
11d607c08b
Implement actual swapping on drag and drop
2019-04-16 13:51:23 +02:00
88408b7543
Implement drag and drop for teams in groups
2019-04-16 13:40:12 +02:00
e877cf1a7f
Add detection and handling of changes of max group sizes
2019-04-16 13:05:24 +02:00
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
e50dc7d293
Add proper logic for removing teams with the group stage
2019-04-16 12:38:35 +02:00
89f2fa79c5
Properly format the groups and the teams in them
2019-04-16 11:41:13 +02:00
8aad4d614d
Make groups visible and add the teams to the groups
2019-04-16 10:51:48 +02:00
c2dcd5946c
Merge branch 'master' into ticket/TURNIERE-121
2019-04-16 10:34:40 +02:00
0bd92b2ada
Create / Rename properties needed for the group view
2019-04-16 09:50:13 +02:00
f3c429692c
Make the login and register components clear errors as soon as they are mounted
2019-04-11 14:13:43 +02:00
5a34b415f2
Add API method for clearing existing errors
2019-04-11 14:07:59 +02:00
4964040ad8
Fix bug showing public tournaments as private
2019-04-11 13:00:02 +02:00
0a1678ed51
Make the create-page actually send the data to the api
2019-04-11 12:57:40 +02:00
e2569b30c8
Add API method for creating a tournament
2019-04-11 12:57:40 +02:00
Felix Hamme
Jonny
betanummeric
Felix Hamme
Thor77