Commit Graph

174 Commits

Author SHA1 Message Date
Felix Hamme 91f7063887 Rename environment variable API_URL to TURNIERE_API_URL 2019-05-08 13:31:50 +02:00
Thor77 e858200a7a Fix envvar problem 2019-05-08 10:54:00 +02:00
Felix Hamme 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
betanummeric e76840de21
Merge pull request #21 from turniere/ticket/TURNIERE-156
Fix bug "Login and Register pages don't clear the errors after switching page / reloading"
2019-05-02 15:21:07 +02:00
Jonny b30a3a759e
Merge branch 'master' into ticket/TURNIERE-156 2019-05-02 08:52:18 +02:00
Jonny e5788281c2
Merge pull request #20 from turniere/ticket/TURNIERE-141
Ticket/turniere 141
2019-05-01 15:58:36 +02:00
Felix Hamme a1828c30c3 Review changes: code cleanup 2019-05-01 15:53:22 +02:00
Felix Hamme fd3085e1f1 Change code formatting to satisfy Hound 2019-04-28 04:27:41 +02:00
Felix Hamme b300049e1e Merge branch 'master' into ticket/TURNIERE-141 2019-04-28 04:22:14 +02:00
Felix Hamme 1af7ee413f Change the list of public tournaments to share some redundant code with the list of private tournaments 2019-04-28 04:21:01 +02:00
Felix Hamme dac0c33272 Implement page for displaying the list of private tournaments 2019-04-28 04:18:18 +02:00
Felix Hamme 6aeb97ae99 Remove unused code 2019-04-28 03:06:40 +02:00
Jonny e298fbfe40
Merge pull request #19 from turniere/ticket/TURNIERE-145
Greet the user with a toast notification when he logs in or out
2019-04-27 18:56:48 +02:00
Jonny 23ef3daaf8
Merge branch 'master' into ticket/TURNIERE-145 2019-04-27 18:49:26 +02:00
Felix Hamme 9b56b2eddb Merge branch 'master' into ticket/TURNIERE-141 2019-04-27 13:32:37 +02:00
Felix Hamme 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
Felix Hamme f243b69a5e Revert "Greet the user after login with a toast"
This reverts commit b85ce62b
2019-04-27 13:27:26 +02:00
Felix Hamme bf8a9431bf Revert "Say goodbye to the user when he logs out"
This reverts commit 7b38b503
2019-04-27 13:27:11 +02:00
betanummeric 0cc1127acc
Merge pull request #18 from turniere/ticket/TURNIERE-150
Add logic for creation of the data for group stages
2019-04-25 16:03:17 +02:00
JP1998 2217212a4a Refactoring the createTeamArray-method 2019-04-23 23:52:22 +02:00
Felix Hamme 7b38b503ef Say goodbye to the user when he logs out 2019-04-23 20:47:07 +02:00
Felix Hamme b85ce62b2f Greet the user after login with a toast 2019-04-23 15:41:43 +02:00
Jonny 6af5f9dc72 Add logic for creation of the data for group stages 2019-04-23 11:27:02 +02:00
betanummeric 662050d60b
Merge pull request #16 from turniere/ticket/TURNIERE-140
Format the errors after failed register or login
2019-04-22 16:44:33 +02:00
Felix Hamme 45d2b221eb Apply css files in the same order everywhere (eliminate warning by mini-css-extract-plugin) 2019-04-22 16:43:14 +02:00
Felix Hamme 6dce02ae83 Tweak Design 2019-04-22 16:41:37 +02:00
Jonny 80b0fe8243
Merge branch 'master' into ticket/TURNIERE-140 2019-04-18 14:47:47 +02:00
betanummeric 021c4243a8
Merge pull request #17 from turniere/ticket/TURNIERE-160
Remove the wrapping data object from the response of login
2019-04-18 11:07:54 +02:00
Jonny dfb709d37e Remove the wrapping data object from the response of login 2019-04-18 10:19:37 +02:00
Jonny 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
Jonny 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
Jonny 0643b4bb0e Format the errors for logging in 2019-04-17 16:32:49 +02:00
Jonny f97fc23a4c Format the error messages for registering 2019-04-17 16:30:00 +02:00
Jonny 4490cd0774
Merge pull request #15 from turniere/ticket/TURNIERE-138
Ticket/turniere 138
2019-04-17 10:35:01 +02:00
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