498e0353c1
Resolve conflicts and fix style issues
2018-12-12 21:54:07 +01:00
e77e3f6dc8
Merge branch 'master' into ticket/TURNIERE-105
2018-12-12 21:32:02 +01:00
fe5098d1df
Merge pull request #4 from turniere/ticket/TURNIERE-104
...
Ticket/turniere 104
2018-12-12 21:29:42 +01:00
8612b88ff7
Resolve conflicts and style issues
2018-12-12 21:25:01 +01:00
4dd5298176
Merge branch 'master' into ticket/TURNIERE-104
2018-12-12 21:12:36 +01:00
e66638dcc0
Fix code style issues
2018-12-12 20:59:37 +01:00
cbaa1b8270
Fix issue with order of mounting of components
...
Since the credentials were checked in the componentDidMount of the App
but the tournamen was loaded in the componentDidMount of the EditTournament component,
which was done first. Thus the auth headers were cleared, and the user was logged out.
2018-12-12 20:47:45 +01:00
5c55ff025b
Update data processing in public tournament list due to changed api
2018-12-12 18:43:53 +01:00
ec0a75e5df
Implement editing of team names
2018-12-12 17:50:03 +01:00
30b2891b72
Add display of team names
2018-12-12 16:23:23 +01:00
68aeade599
Fix footer spacing on tournament edit page
2018-12-12 16:02:16 +01:00
909faff65c
Create a first draft of the edit-tournament-page
2018-12-12 15:43:34 +01:00
21d43ab641
Minor design tweak for matches
2018-12-11 22:04:36 +01:00
0eb4df58cf
Write the name of the tournament owner in the tournament view
2018-12-11 16:05:44 +01:00
115df26572
Make code for MatchTable in tournament view more readable (fFix react error message)
2018-12-11 16:01:25 +01:00
b30971385f
Fetch single tournaments from the api in tournament view
2018-12-11 15:56:56 +01:00
a9f38ce6f6
In tournament view: Iterate over stages and write method for level name
2018-12-11 13:52:39 +01:00
d81a8f8cc6
Change the way the request methods get the current state
...
Since the state cannot be retrieved while the store has changes to be dispatched
the actual state (which is used for building the auth headers for requests) has
to be retrieved beforehand and given to the action as parameter.
2018-12-11 13:34:18 +01:00
d46062f453
Merge pull request #2 from turniere/ticket/TURNIERE-111
...
Ticket/turniere 111
2018-12-11 08:44:04 +01:00
7205e0b65b
Change eslint rule to only accept unix linebreaks
2018-12-11 08:42:35 +01:00
504746934c
Add proper name for eslint config file
2018-12-11 08:38:56 +01:00
9124edc3f2
Fix all the styling issues in all the files
2018-12-09 23:46:21 +01:00
8cc2647258
Design score edit input fields in tournament view
2018-12-09 00:48:35 +01:00
0bbaaa4d3b
Change match hover design
2018-12-08 00:44:49 +01:00
7bbeee9e25
Design matches on the tournament page
2018-12-07 14:49:47 +01:00
5aa97e162d
Add actually functioning style check and fix style in api.js
2018-12-06 09:57:51 +01:00
4b99c4b2dd
Add proper config for eslint
2018-12-06 09:11:52 +01:00
1b5bb473c5
Add a proper linter for style checks
2018-12-03 16:09:52 +01:00
88f14b29e3
Add config file for hound
2018-12-03 15:59:43 +01:00
ba12956abc
Add verification of credentials after loading page
2018-12-03 15:48:05 +01:00
13f7373f6f
Add a functioning registration
2018-12-03 15:29:26 +01:00
df75387164
Fix login and logout to actually work
...
Because of several issues the auth token has not been stored,
which lead to severe errors when trying to log out.
This issue has now been solved.
2018-12-03 15:20:14 +01:00
f85863d965
Remove header, that is no longer being transmitted
2018-12-03 14:41:59 +01:00
d0337fb640
Add actually working login and logout
2018-12-03 14:33:32 +01:00
2e9d6353c4
Design public tournament list
2018-12-03 13:41:28 +01:00
0de789b7e3
Begin designing tournament page
2018-12-03 13:04:39 +01:00
9dd2466e10
Export request methods in api.js and include the api url in them
2018-12-03 12:46:02 +01:00
fdfcd5087d
Add saving and sending of authentication headers
...
The actual authentication headers are now able to be easily sent
and saved for and after every request to the api.
2018-11-30 16:41:28 +01:00
a927f97e32
Solve a bug with the error messages of unknown errors when logging in
2018-11-30 13:22:40 +01:00
91b532b6cd
Add api calls with persistent user data
...
Added login and registration api calls to the function pool,
while the application state is persistet through localStorage.
Also (if signed in) the username will be displayed in the
navigation bar of the website.
2018-11-29 16:19:02 +01:00
f19b2d399c
Update README.md
2018-11-20 14:00:18 +01:00
f7d532dc21
Implement team names editor for tournament creation
2018-11-15 15:46:46 +01:00
27e118041e
Add dependency for API-calls
...
This commit adds the axios-dependency, which is used
to call the API-functions. Moreover the README.md has
been updated accordingly.
2018-11-13 15:36:23 +01:00
6207049fa1
Design static part of create-tournament page; generify the full page background design (previously login.css)
2018-11-12 23:37:11 +01:00
354e364e1d
Design FAQ page
2018-11-12 18:18:16 +01:00
5acee296ca
Design error pages
2018-11-12 16:41:25 +01:00
b176c6ce65
Design imprint page and generify and remove privacy.css
2018-11-11 13:57:32 +01:00
36f4d400f5
Design privacy page
2018-11-11 13:45:43 +01:00
7091d735c2
Design the register page and set links to it on the login page
2018-11-11 13:33:34 +01:00
923fef795c
Design login page (not functional!)
2018-11-11 01:32:07 +01:00
JP1998
Felix Hamme
Felix Hamme