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] 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