From 2e9d6353c42dee5090e9b79d5ab3f71ed7a38976 Mon Sep 17 00:00:00 2001 From: Felix Hamme Date: Mon, 3 Dec 2018 13:41:28 +0100 Subject: [PATCH 1/3] Design public tournament list --- pages/list.js | 69 ++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 66 insertions(+), 3 deletions(-) diff --git a/pages/list.js b/pages/list.js index 0425ab5..6e9574a 100644 --- a/pages/list.js +++ b/pages/list.js @@ -1,10 +1,73 @@ import Head from 'next/head' +import '../static/everypage.css' +import {Footer, TurniereNavigation} from "../js/CommonComponents"; +import React from "react"; +import {Card, CardBody, Container} from "reactstrap"; +import {getRequest} from "../js/api"; export default () => ( -
+
- Turnie.re - Turnierliste + Öffentliche Turniere: turnie.re -

Turnierliste

+ +
+ +
+
) + +class TournamentList extends React.Component { + constructor(props) { + super(props); + this.state = { + error: null, + isLoaded: false, + items: [] + }; + } + + componentDidMount() { + getRequest('/tournaments?type=public',{}) + .then( + response => { + console.log('response:'); + console.log(response); + this.setState({ + isLoaded: true, + items: response.data.data + }); + }, + error => { + this.setState({ + isLoaded: true, + error + }); + } + ) + } + + render() { + return ( + + + +

Öffentliche Turniere

+ {this.state.items.map(item => ( + + ))} + + + + ); + } +} + +function TournamentListEntry(props) { + return ( + + {props.name} + + ); +} \ No newline at end of file From 5c55ff025b1e52600852d390e218dc1c061944bb Mon Sep 17 00:00:00 2001 From: Felix Hamme Date: Wed, 12 Dec 2018 18:43:53 +0100 Subject: [PATCH 2/3] Update data processing in public tournament list due to changed api --- pages/list.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pages/list.js b/pages/list.js index 6e9574a..9b92722 100644 --- a/pages/list.js +++ b/pages/list.js @@ -36,7 +36,7 @@ class TournamentList extends React.Component { console.log(response); this.setState({ isLoaded: true, - items: response.data.data + items: response.data }); }, error => { @@ -55,7 +55,8 @@ class TournamentList extends React.Component {

Öffentliche Turniere

{this.state.items.map(item => ( - + //The code should be item.code but the api just supports it this way by now + ))} From 8612b88ff748252dacf163732078487e9e41c650 Mon Sep 17 00:00:00 2001 From: JP1998 Date: Wed, 12 Dec 2018 21:25:01 +0100 Subject: [PATCH 3/3] Resolve conflicts and style issues --- pages/list.js | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/pages/list.js b/pages/list.js index 1005258..8e03fa4 100644 --- a/pages/list.js +++ b/pages/list.js @@ -1,9 +1,9 @@ -import Head from 'next/head' -import '../static/everypage.css' -import {Footer, TurniereNavigation} from "../js/CommonComponents"; -import React from "react"; -import {Card, CardBody, Container} from "reactstrap"; -import {getRequest} from "../js/api"; +import Head from 'next/head'; +import '../static/everypage.css'; +import { Footer, TurniereNavigation } from '../js/CommonComponents'; +import React from 'react'; +import { Card, CardBody, Container } from 'reactstrap'; +import { getRequest, getState } from '../js/api'; export default () => (
@@ -16,7 +16,7 @@ export default () => (
-) +); class TournamentList extends React.Component { constructor(props) { @@ -29,11 +29,9 @@ class TournamentList extends React.Component { } componentDidMount() { - getRequest('/tournaments?type=public',{}) + getRequest(getState(), '/tournaments?type=public') .then( response => { - console.log('response:'); - console.log(response); this.setState({ isLoaded: true, items: response.data @@ -45,7 +43,7 @@ class TournamentList extends React.Component { error }); } - ) + ); } render() { @@ -67,7 +65,7 @@ class TournamentList extends React.Component { function TournamentListEntry(props) { return ( - + {props.name} );