From 0b35c6c84da0b55b23a60046a9a8fefc1a864037 Mon Sep 17 00:00:00 2001
From: Felix Hamme <gitlab@fj.hamme.net>
Date: Wed, 17 Apr 2019 09:59:09 +0200
Subject: [PATCH 1/7] Begin implementing page for private tournaments

---
 js/api.js        |  84 ++++++++++++++++++++++++++++--
 pages/private.js | 130 +++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 211 insertions(+), 3 deletions(-)
 create mode 100644 pages/private.js

diff --git a/js/api.js b/js/api.js
index a065064..0db5c10 100644
--- a/js/api.js
+++ b/js/api.js
@@ -32,7 +32,7 @@ const actiontypes_userinfo = {
     'STORE_AUTH_HEADERS'           : 'STORE_AUTH_HEADERS',
 
     'REHYDRATE'                    : 'USERINFO_REHYDRATE',
-    'CLEAR'                        : 'USERINFO_CLEAR',
+    'CLEAR'                        : 'USERINFO_CLEAR'
 };
 
 const defaultstate_userinfo = {
@@ -72,6 +72,17 @@ const defaultstate_tournamentinfo = {
     teams : []
 };
 
+const actiontypes_tournamentlist = {
+    'FETCH': 'FETCH',
+    'FETCH_SUCCESS': 'FETCH_SUCCESS',
+    'FETCH_ERROR': 'FETCH_ERROR',
+    'REHYDRATE': 'REHYDRATE'
+};
+
+const defaultstate_tournamentlist = {
+    tournaments: []
+};
+
 export function postRequest(state, url, data) {
     return axios.post(api_url + url, data, {
         headers : generateHeaders(state)
@@ -263,6 +274,27 @@ const reducer_userinfo = (state = defaultstate_userinfo, action) => {
             expiry : null,
             uid : null
         });
+    case actiontypes_userinfo.GET_TOURNAMENT_LIST:
+        getRequest(action.state, '/tournaments?type=' + action.parameters.type).then((resp) => {
+            __store.dispatch({
+                type: actiontypes_tournamentinfo.GET_TOURNAMENT_LIST_SUCCESS,
+                parameters: resp
+            });
+            storeOptionalToken(resp);
+            action.parameters.successCallback();
+        }).catch((error) => {
+            __store.dispatch({
+                type: actiontypes_tournamentinfo.GET_TOURNAMENT_LIST_ERROR,
+                parameters: {error: error}
+            });
+            storeOptionalToken(error.response);
+            action.parameters.errorCallback();
+        });
+        return Object.assign({}, state, {});
+    case actiontypes_userinfo.GET_TOURNAMENT_LIST_ERROR:
+        return Object.assign({}, state, {});
+    case actiontypes_userinfo.GET_TOURNAMENT_LIST_SUCCESS:
+        return Object.assign({}, state, {...action.parameters});
     default: return state;
     }
 };
@@ -329,14 +361,44 @@ const reducer_tournamentinfo = (state = defaultstate_tournamentinfo, action) =>
     }
 };
 
+const reducer_tournamentlist = (state = defaultstate_tournamentlist, action) => {
+    switch (action.type) {
+        case actiontypes_tournamentlist.FETCH:
+            getRequest(action.state, '/tournaments?type=' + action.parameters.type).then((resp) => {
+                __store.dispatch({
+                    type: actiontypes_tournamentlist.FETCH_SUCCESS,
+                    parameters: resp
+                });
+                storeOptionalToken(resp);
+                action.parameters.successCallback();
+            }).catch((error) => {
+                __store.dispatch({
+                    type: actiontypes_tournamentlist.FETCH_ERROR,
+                    parameters: {error: error}
+                });
+                storeOptionalToken(error.response);
+                action.parameters.errorCallback();
+            });
+            return state;
+        case actiontypes_tournamentlist.FETCH_SUCCESS:
+            return Object.assign({}, state, {...action.parameters});
+        case actiontypes_tournamentlist.FETCH_ERROR:
+            return state;
+        default:
+            return state;
+    }
+};
+
 const reducers = {
     userinfo: reducer_userinfo,
-    tournamentinfo: reducer_tournamentinfo
+    tournamentinfo: reducer_tournamentinfo,
+    tournamentlist: reducer_tournamentlist
 };
 
 const default_applicationstate = {
     userinfo : defaultstate_userinfo,
-    tournamentinfo: defaultstate_tournamentinfo
+    tournamentinfo: defaultstate_tournamentinfo,
+    tournamentlist: defaultstate_tournamentlist
 };
 
 var __store;
@@ -444,6 +506,18 @@ export function getState() {
     return __store.getState();
 }
 
+export function requestTournamentList(myType, successCallback, errorCallback) {
+    __store.dispatch({
+        type: actiontypes_tournamentlist.FETCH,
+        parameters: {
+            type: myType,
+            successCallback: successCallback,
+            errorCallback: errorCallback
+        },
+        state: __store.getState()
+    });
+}
+
 function rehydrateApplicationState() {
     const persistedState = localStorage.getItem('reduxState') ?
         JSON.parse(localStorage.getItem('reduxState')) :
@@ -458,6 +532,10 @@ function rehydrateApplicationState() {
             type : actiontypes_tournamentinfo.REHYDRATE,
             parameters : Object.assign({}, persistedState.tournamentinfo)
         });
+        __store.dispatch({
+            type : actiontypes_tournamentlist.REHYDRATE,
+            parameters : Object.assign({}, persistedState.tournamentlist)
+        });
         applicationHydrated = true;
     }
 }
diff --git a/pages/private.js b/pages/private.js
new file mode 100644
index 0000000..8d732b1
--- /dev/null
+++ b/pages/private.js
@@ -0,0 +1,130 @@
+import Head from 'next/head';
+import React from 'react';
+import {connect} from 'react-redux';
+
+import {Card, CardBody, Container,} from 'reactstrap';
+
+import {TurniereNavigation} from '../js/components/Navigation';
+import {Footer} from '../js/components/Footer';
+import {Option, UserRestrictor} from '../js/components/UserRestrictor';
+import {Login} from '../js/components/Login';
+import {requestTournamentList} from '../js/api';
+
+import '../static/everypage.css';
+
+class PrivateTournamentsPage extends React.Component {
+
+    render() {
+        const {isSignedIn} = this.props;
+
+        return (
+            <UserRestrictor>
+                <Option condition={isSignedIn}>
+                    <div className="main generic-fullpage-bg">
+                        <Head>
+                            <title>Private Turniere: turnie.re</title>
+                        </Head>
+                        <TurniereNavigation/>
+                        <div>
+                            <PrivateTournamentsListCard/>
+                        </div>
+                        <Footer/>
+                    </div>
+                </Option>
+                <Option condition={true}>
+                    <div className="main generic-fullpage-bg">
+                        <Head>
+                            <title>Anmeldung</title>
+                        </Head>
+                        <TurniereNavigation/>
+                        <div>
+                            <Login
+                                hint="Sie müssen angemeldet sein, um diesen Inhalt anzuzeigen!"/>
+                        </div>
+                        <Footer/>
+                    </div>
+                </Option>
+            </UserRestrictor>
+        );
+    }
+}
+
+function mapStateToCreatePageProperties(state) {
+    const {isSignedIn} = state.userinfo;
+    return {isSignedIn};
+}
+
+const CreatePage = connect(
+    mapStateToCreatePageProperties,
+)(PrivateTournamentsPage);
+
+export default CreatePage;
+
+
+
+class PrivateTournamentsListCard extends React.Component {
+    constructor(props) {
+        super(props);
+        this.state = {
+            error: null,
+            isLoaded: false,
+            items: []
+        };
+    }
+
+    componentDidMount() {
+        requestTournamentList('private', response => {
+                this.setState({
+                    isLoaded: true,
+                    items: response.data
+                });
+            },
+            error => {
+                this.setState({
+                    isLoaded: true,
+                    error
+                });
+            });
+        /*
+        getRequest(getState(), '/tournaments?type=private')
+            .then(
+                response => {
+                    this.setState({
+                        isLoaded: true,
+                        items: response.data
+                    });
+                },
+                error => {
+                    this.setState({
+                        isLoaded: true,
+                        error
+                    });
+                }
+            );
+         */
+    }
+
+    render() {
+        return (
+            <Container className="py-5">
+                <Card className="shadow">
+                    <CardBody>
+                        <h1 className="custom-font">Private Turniere</h1>
+                        {this.state.items.map(item => (
+                            //The code should be item.code but the api just supports it this way by now
+                            <TournamentListEntry name={item.name} code={item.id} key={item.id}/>
+                        ))}
+                    </CardBody>
+                </Card>
+            </Container>
+        );
+    }
+}
+
+function TournamentListEntry(props) {
+    return (
+        <a className="w-100 d-inline-block mt-2 text-left btn btn-outline-primary" href={ '/t/' + props.code }>
+            {props.name}
+        </a>
+    );
+}
\ No newline at end of file

From 0aa1660cd1c6c2cecb1c7080c1e863805f2021e4 Mon Sep 17 00:00:00 2001
From: Felix Hamme <gitlab@fj.hamme.net>
Date: Wed, 17 Apr 2019 09:59:51 +0200
Subject: [PATCH 2/7] Link private tournament list in navigation bar if the
 user is signed in

---
 js/components/Navigation.js | 25 ++++++++++++++++++-------
 1 file changed, 18 insertions(+), 7 deletions(-)

diff --git a/js/components/Navigation.js b/js/components/Navigation.js
index b9d0775..a58a33f 100644
--- a/js/components/Navigation.js
+++ b/js/components/Navigation.js
@@ -40,11 +40,7 @@ export class TurniereNavigation extends React.Component {
                 <Betabadge/>
                 <NavbarToggler onClick={this.toggle} />
                 <Collapse isOpen={!this.state.collapsed} navbar>
-                    <Nav navbar className="mr-auto">
-                        <Navlink target="/create" text="Turnier erstellen"/>
-                        <Navlink target="/list" text="Öffentliche Turniere"/>
-                        <Navlink target="/faq" text="FAQ"/>
-                    </Nav>
+                    <NavLinks/>
                     <LoginLogoutButtons/>
                 </Collapse>
             </Navbar>
@@ -60,6 +56,18 @@ function Navlink(props) {
     );
 }
 
+class SmartNavLinks extends React.Component {
+
+    render() {
+        return (<Nav navbar className="mr-auto">
+            <Navlink target="/create" text="Turnier erstellen"/>
+            <Navlink target="/list" text="Öffentliche Turniere"/>
+            {this.props.isSignedIn && <Navlink target="/private" text="Private Turniere"/>}
+            <Navlink target="/faq" text="FAQ"/>
+        </Nav>);
+    }
+}
+
 function Betabadge() {
     return (<Badge color="danger" className="mr-2">BETA</Badge>);
 }
@@ -87,12 +95,15 @@ class InvisibleLoginLogoutButtons extends React.Component {
     }
 }
 
-const mapStateToLoginLogoutButtonProperties = (state) => {
+const mapStateToUserinfo = (state) => {
     const { isSignedIn, username } = state.userinfo;
     return { isSignedIn, username };
 };
 
 const LoginLogoutButtons = connect(
-    mapStateToLoginLogoutButtonProperties
+    mapStateToUserinfo
 )(InvisibleLoginLogoutButtons);
 
+const NavLinks = connect(
+    mapStateToUserinfo
+)(SmartNavLinks);
\ No newline at end of file

From 6aeb97ae99868213c63139f4c2ebcd8cf6c70044 Mon Sep 17 00:00:00 2001
From: Felix Hamme <git@fj.hamme.net>
Date: Sun, 28 Apr 2019 02:33:36 +0200
Subject: [PATCH 3/7] Remove unused code

---
 js/api.js        | 21 ---------------------
 pages/private.js | 17 -----------------
 2 files changed, 38 deletions(-)

diff --git a/js/api.js b/js/api.js
index a4ab3d3..88a9795 100644
--- a/js/api.js
+++ b/js/api.js
@@ -274,27 +274,6 @@ const reducer_userinfo = (state = defaultstate_userinfo, action) => {
             expiry : null,
             uid : null
         });
-    case actiontypes_userinfo.GET_TOURNAMENT_LIST:
-        getRequest(action.state, '/tournaments?type=' + action.parameters.type).then((resp) => {
-            __store.dispatch({
-                type: actiontypes_tournamentinfo.GET_TOURNAMENT_LIST_SUCCESS,
-                parameters: resp
-            });
-            storeOptionalToken(resp);
-            action.parameters.successCallback();
-        }).catch((error) => {
-            __store.dispatch({
-                type: actiontypes_tournamentinfo.GET_TOURNAMENT_LIST_ERROR,
-                parameters: {error: error}
-            });
-            storeOptionalToken(error.response);
-            action.parameters.errorCallback();
-        });
-        return Object.assign({}, state, {});
-    case actiontypes_userinfo.GET_TOURNAMENT_LIST_ERROR:
-        return Object.assign({}, state, {});
-    case actiontypes_userinfo.GET_TOURNAMENT_LIST_SUCCESS:
-        return Object.assign({}, state, {...action.parameters});
     default: return state;
     }
 };
diff --git a/pages/private.js b/pages/private.js
index 8d732b1..1d6c20c 100644
--- a/pages/private.js
+++ b/pages/private.js
@@ -85,23 +85,6 @@ class PrivateTournamentsListCard extends React.Component {
                     error
                 });
             });
-        /*
-        getRequest(getState(), '/tournaments?type=private')
-            .then(
-                response => {
-                    this.setState({
-                        isLoaded: true,
-                        items: response.data
-                    });
-                },
-                error => {
-                    this.setState({
-                        isLoaded: true,
-                        error
-                    });
-                }
-            );
-         */
     }
 
     render() {

From dac0c3327254b723180ed5c38251c1e5e2804027 Mon Sep 17 00:00:00 2001
From: Felix Hamme <git@fj.hamme.net>
Date: Sun, 28 Apr 2019 04:18:18 +0200
Subject: [PATCH 4/7] Implement page for displaying the list of private
 tournaments

---
 js/api.js                       | 10 ++--
 js/components/TournamentList.js | 45 ++++++++++++++++++
 pages/private.js                | 82 +++++++++++----------------------
 3 files changed, 76 insertions(+), 61 deletions(-)
 create mode 100644 js/components/TournamentList.js

diff --git a/js/api.js b/js/api.js
index 88a9795..2e7d1a4 100644
--- a/js/api.js
+++ b/js/api.js
@@ -346,10 +346,10 @@ const reducer_tournamentlist = (state = defaultstate_tournamentlist, action) =>
             getRequest(action.state, '/tournaments?type=' + action.parameters.type).then((resp) => {
                 __store.dispatch({
                     type: actiontypes_tournamentlist.FETCH_SUCCESS,
-                    parameters: resp
+                    parameters: resp.data
                 });
                 storeOptionalToken(resp);
-                action.parameters.successCallback();
+                action.parameters.successCallback(resp.data);
             }).catch((error) => {
                 __store.dispatch({
                     type: actiontypes_tournamentlist.FETCH_ERROR,
@@ -360,7 +360,7 @@ const reducer_tournamentlist = (state = defaultstate_tournamentlist, action) =>
             });
             return state;
         case actiontypes_tournamentlist.FETCH_SUCCESS:
-            return Object.assign({}, state, {...action.parameters});
+            return Object.assign({}, state, {tournaments: action.parameters});
         case actiontypes_tournamentlist.FETCH_ERROR:
             return state;
         default:
@@ -485,11 +485,11 @@ export function getState() {
     return __store.getState();
 }
 
-export function requestTournamentList(myType, successCallback, errorCallback) {
+export function requestTournamentList(type, successCallback, errorCallback) {
     __store.dispatch({
         type: actiontypes_tournamentlist.FETCH,
         parameters: {
-            type: myType,
+            type: type,
             successCallback: successCallback,
             errorCallback: errorCallback
         },
diff --git a/js/components/TournamentList.js b/js/components/TournamentList.js
new file mode 100644
index 0000000..53055b8
--- /dev/null
+++ b/js/components/TournamentList.js
@@ -0,0 +1,45 @@
+import React from 'react';
+import {requestTournamentList} from '../api';
+
+export default class TournamentList extends React.Component {
+    constructor(props) {
+        super(props);
+        this.state = {
+            error: null,
+            tournaments: []
+        };
+    }
+
+    componentDidMount() {
+        requestTournamentList(this.props.type, tournaments => {
+                this.setState({
+                    tournaments: tournaments
+                });
+            },
+            error => {
+                this.setState({
+                    error
+                });
+            });
+    }
+
+    render() {
+        if (this.state.tournaments.length === 0) {
+            return <p className="text-center border-light font-italic text-secondary border-top border-bottom p-1">keine
+                Turniere vorhanden</p>;
+        } else {
+            return this.state.tournaments.map(item => (
+                //The code should be item.code but the api just supports it this way by now
+                <TournamentListEntry name={item.name} code={item.id} key={item.id}/>
+            ));
+        }
+    }
+}
+
+function TournamentListEntry(props) {
+    return (
+        <a className="w-100 d-inline-block mt-2 text-left btn btn-outline-primary" href={'/t/' + props.code}>
+            {props.name}
+        </a>
+    );
+}
\ No newline at end of file
diff --git a/pages/private.js b/pages/private.js
index 1d6c20c..63eaae0 100644
--- a/pages/private.js
+++ b/pages/private.js
@@ -8,9 +8,9 @@ import {TurniereNavigation} from '../js/components/Navigation';
 import {Footer} from '../js/components/Footer';
 import {Option, UserRestrictor} from '../js/components/UserRestrictor';
 import {Login} from '../js/components/Login';
-import {requestTournamentList} from '../js/api';
 
 import '../static/everypage.css';
+import TournamentList from '../js/components/TournamentList';
 
 class PrivateTournamentsPage extends React.Component {
 
@@ -25,9 +25,7 @@ class PrivateTournamentsPage extends React.Component {
                             <title>Private Turniere: turnie.re</title>
                         </Head>
                         <TurniereNavigation/>
-                        <div>
-                            <PrivateTournamentsListCard/>
-                        </div>
+                        <PrivateTournamentsPageContent/>
                         <Footer/>
                     </div>
                 </Option>
@@ -49,65 +47,37 @@ class PrivateTournamentsPage extends React.Component {
     }
 }
 
-function mapStateToCreatePageProperties(state) {
+function mapStateToProperties(state) {
     const {isSignedIn} = state.userinfo;
     return {isSignedIn};
 }
 
-const CreatePage = connect(
-    mapStateToCreatePageProperties,
+const PrivateTournamentListPage = connect(
+    mapStateToProperties,
 )(PrivateTournamentsPage);
 
-export default CreatePage;
+export default PrivateTournamentListPage;
 
-
-
-class PrivateTournamentsListCard extends React.Component {
-    constructor(props) {
-        super(props);
-        this.state = {
-            error: null,
-            isLoaded: false,
-            items: []
-        };
-    }
-
-    componentDidMount() {
-        requestTournamentList('private', response => {
-                this.setState({
-                    isLoaded: true,
-                    items: response.data
-                });
-            },
-            error => {
-                this.setState({
-                    isLoaded: true,
-                    error
-                });
-            });
-    }
-
-    render() {
-        return (
-            <Container className="py-5">
-                <Card className="shadow">
-                    <CardBody>
-                        <h1 className="custom-font">Private Turniere</h1>
-                        {this.state.items.map(item => (
-                            //The code should be item.code but the api just supports it this way by now
-                            <TournamentListEntry name={item.name} code={item.id} key={item.id}/>
-                        ))}
-                    </CardBody>
-                </Card>
-            </Container>
-        );
-    }
+function PrivateTournamentsPageContent() {
+    return (<div>
+        <Container className="pt-5">
+            <PrivateTournamentsCard/>
+        </Container>
+        <Container className="pb-5 pt-3">
+            <a href='/list' className="btn btn-success shadow">zu den öffentlichen Turnieren</a>
+        </Container>
+    </div>);
 }
 
-function TournamentListEntry(props) {
-    return (
-        <a className="w-100 d-inline-block mt-2 text-left btn btn-outline-primary" href={ '/t/' + props.code }>
-            {props.name}
-        </a>
-    );
+class PrivateTournamentsCard extends React.Component {
+    render() {
+        return (
+            <Card className="shadow">
+                <CardBody>
+                    <h1 className="custom-font">Private Turniere</h1>
+                    <TournamentList type='private'/>
+                </CardBody>
+            </Card>
+        );
+    }
 }
\ No newline at end of file

From 1af7ee413febea407b32f6392aa0f465320d6ef1 Mon Sep 17 00:00:00 2001
From: Felix Hamme <git@fj.hamme.net>
Date: Sun, 28 Apr 2019 04:21:01 +0200
Subject: [PATCH 5/7] Change the list of public tournaments to share some
 redundant code with the list of private tournaments

---
 pages/list.js | 99 ++++++++++++++++++++-------------------------------
 1 file changed, 38 insertions(+), 61 deletions(-)

diff --git a/pages/list.js b/pages/list.js
index 768b105..1cf8496 100644
--- a/pages/list.js
+++ b/pages/list.js
@@ -1,22 +1,16 @@
-import Head                   from 'next/head';
-import React                  from 'react';
-import {
-    Card,
-    CardBody,
-    Container
-} from 'reactstrap';
+import Head from 'next/head';
+import React from 'react';
+import {Card, CardBody, Container} from 'reactstrap';
 
-import { TurniereNavigation } from '../js/components/Navigation';
-import { Footer }             from '../js/components/Footer';
-import {
-    getRequest,
-    getState
-} from '../js/api';
+import {TurniereNavigation} from '../js/components/Navigation';
+import {Footer} from '../js/components/Footer';
 
 import '../static/everypage.css';
+import TournamentList from '../js/components/TournamentList';
+import {connect} from 'react-redux';
+
+export default class PublicTournamentsPage extends React.Component {
 
-export default class ListPage extends React.Component {
-  
     render() {
         return (
             <div className="main generic-fullpage-bg">
@@ -25,7 +19,7 @@ export default class ListPage extends React.Component {
                 </Head>
                 <TurniereNavigation/>
                 <div>
-                    <TournamentList/>
+                    <PublicTournamentPageContent/>
                 </div>
                 <Footer/>
             </div>
@@ -33,55 +27,38 @@ export default class ListPage extends React.Component {
     }
 }
 
-class TournamentList extends React.Component {
-    constructor(props) {
-        super(props);
-        this.state = {
-            error: null,
-            isLoaded: false,
-            items: []
-        };
-    }
+function mapStateToProperties(state) {
+    const {isSignedIn} = state.userinfo;
+    return {isSignedIn};
+}
 
-    componentDidMount() {
-        getRequest(getState(), '/tournaments?type=public')
-            .then(
-                response => {
-                    this.setState({
-                        isLoaded: true,
-                        items: response.data
-                    });
-                },
-                error => {
-                    this.setState({
-                        isLoaded: true,
-                        error
-                    });
-                }
-            );
-    }
+const PublicTournamentPageContent = connect(
+    mapStateToProperties,
+)(PublicTournaments);
 
-    render() {
-        return (
-            <Container className="py-5">
-                <Card className="shadow">
-                    <CardBody>
-                        <h1 className="custom-font">Öffentliche Turniere</h1>
-                        {this.state.items.map(item => (
-                            //The code should be item.code but the api just supports it this way by now
-                            <TournamentListEntry name={item.name} code={item.id} key={item.id}/>
-                        ))}
-                    </CardBody>
-                </Card>
+function PublicTournaments(props) {
+    if (props.isSignedIn) {
+        return (<div>
+            <Container className='pt-5'>
+                <PublicTournamentsCard/>
             </Container>
-        );
+            <Container className="pb-5 pt-3">
+                <a href='/private' className="btn btn-success shadow">zu den privaten Turnieren</a>
+            </Container>
+        </div>);
+
+    } else {
+        return (<Container className='py-5'>
+            <PublicTournamentsCard/>
+        </Container>);
     }
 }
 
-function TournamentListEntry(props) {
-    return (
-        <a className="w-100 d-inline-block mt-2 text-left btn btn-outline-primary" href={ '/t/' + props.code }>
-            {props.name}
-        </a>
-    );
+function PublicTournamentsCard() {
+    return (<Card className="shadow">
+        <CardBody>
+            <h1 className="custom-font">Öffentliche Turniere</h1>
+            <TournamentList type='public'/>
+        </CardBody>
+    </Card>);
 }

From fd3085e1f1a5e8c4a6bc3eb252b6ecf81b57bac1 Mon Sep 17 00:00:00 2001
From: Felix Hamme <git@fj.hamme.net>
Date: Sun, 28 Apr 2019 04:27:41 +0200
Subject: [PATCH 6/7] Change code formatting to satisfy Hound

---
 js/api.js                       | 44 ++++++++++++++++-----------------
 js/components/TournamentList.js | 16 ++++++------
 2 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/js/api.js b/js/api.js
index b0a94f9..6a70330 100644
--- a/js/api.js
+++ b/js/api.js
@@ -345,29 +345,29 @@ const reducer_tournamentinfo = (state = defaultstate_tournamentinfo, action) =>
 
 const reducer_tournamentlist = (state = defaultstate_tournamentlist, action) => {
     switch (action.type) {
-        case actiontypes_tournamentlist.FETCH:
-            getRequest(action.state, '/tournaments?type=' + action.parameters.type).then((resp) => {
-                __store.dispatch({
-                    type: actiontypes_tournamentlist.FETCH_SUCCESS,
-                    parameters: resp.data
-                });
-                storeOptionalToken(resp);
-                action.parameters.successCallback(resp.data);
-            }).catch((error) => {
-                __store.dispatch({
-                    type: actiontypes_tournamentlist.FETCH_ERROR,
-                    parameters: {error: error}
-                });
-                storeOptionalToken(error.response);
-                action.parameters.errorCallback();
+    case actiontypes_tournamentlist.FETCH:
+        getRequest(action.state, '/tournaments?type=' + action.parameters.type).then((resp) => {
+            __store.dispatch({
+                type: actiontypes_tournamentlist.FETCH_SUCCESS,
+                parameters: resp.data
             });
-            return state;
-        case actiontypes_tournamentlist.FETCH_SUCCESS:
-            return Object.assign({}, state, {tournaments: action.parameters});
-        case actiontypes_tournamentlist.FETCH_ERROR:
-            return state;
-        default:
-            return state;
+            storeOptionalToken(resp);
+            action.parameters.successCallback(resp.data);
+        }).catch((error) => {
+            __store.dispatch({
+                type: actiontypes_tournamentlist.FETCH_ERROR,
+                parameters: {error: error}
+            });
+            storeOptionalToken(error.response);
+            action.parameters.errorCallback();
+        });
+        return state;
+    case actiontypes_tournamentlist.FETCH_SUCCESS:
+        return Object.assign({}, state, {tournaments: action.parameters});
+    case actiontypes_tournamentlist.FETCH_ERROR:
+        return state;
+    default:
+        return state;
     }
 };
 
diff --git a/js/components/TournamentList.js b/js/components/TournamentList.js
index 53055b8..30ff6e3 100644
--- a/js/components/TournamentList.js
+++ b/js/components/TournamentList.js
@@ -12,15 +12,15 @@ export default class TournamentList extends React.Component {
 
     componentDidMount() {
         requestTournamentList(this.props.type, tournaments => {
-                this.setState({
-                    tournaments: tournaments
-                });
-            },
-            error => {
-                this.setState({
-                    error
-                });
+            this.setState({
+                tournaments: tournaments
             });
+        },
+        error => {
+            this.setState({
+                error
+            });
+        });
     }
 
     render() {

From a1828c30c3e0e7526a6f0c3b0a042582e899e9f6 Mon Sep 17 00:00:00 2001
From: Felix Hamme <git@fj.hamme.net>
Date: Wed, 1 May 2019 15:53:22 +0200
Subject: [PATCH 7/7] Review changes: code cleanup

---
 js/api.js                       | 11 +++--------
 js/components/TournamentList.js |  8 +-------
 2 files changed, 4 insertions(+), 15 deletions(-)

diff --git a/js/api.js b/js/api.js
index 6a70330..9808ca7 100644
--- a/js/api.js
+++ b/js/api.js
@@ -75,7 +75,6 @@ const defaultstate_tournamentinfo = {
 const actiontypes_tournamentlist = {
     'FETCH': 'FETCH',
     'FETCH_SUCCESS': 'FETCH_SUCCESS',
-    'FETCH_ERROR': 'FETCH_ERROR',
     'REHYDRATE': 'REHYDRATE'
 };
 
@@ -354,18 +353,14 @@ const reducer_tournamentlist = (state = defaultstate_tournamentlist, action) =>
             storeOptionalToken(resp);
             action.parameters.successCallback(resp.data);
         }).catch((error) => {
-            __store.dispatch({
-                type: actiontypes_tournamentlist.FETCH_ERROR,
-                parameters: {error: error}
-            });
-            storeOptionalToken(error.response);
+            if(error.response) {
+                storeOptionalToken(error.response);
+            }
             action.parameters.errorCallback();
         });
         return state;
     case actiontypes_tournamentlist.FETCH_SUCCESS:
         return Object.assign({}, state, {tournaments: action.parameters});
-    case actiontypes_tournamentlist.FETCH_ERROR:
-        return state;
     default:
         return state;
     }
diff --git a/js/components/TournamentList.js b/js/components/TournamentList.js
index 30ff6e3..9a0ac00 100644
--- a/js/components/TournamentList.js
+++ b/js/components/TournamentList.js
@@ -5,7 +5,6 @@ export default class TournamentList extends React.Component {
     constructor(props) {
         super(props);
         this.state = {
-            error: null,
             tournaments: []
         };
     }
@@ -15,12 +14,7 @@ export default class TournamentList extends React.Component {
             this.setState({
                 tournaments: tournaments
             });
-        },
-        error => {
-            this.setState({
-                error
-            });
-        });
+        }, () => {});
     }
 
     render() {