Resolve conflicts and style issues

This commit is contained in:
JP1998 2018-12-12 21:25:01 +01:00
parent 4dd5298176
commit 8612b88ff7
1 changed files with 10 additions and 12 deletions

View File

@ -1,9 +1,9 @@
import Head from 'next/head' import Head from 'next/head';
import '../static/everypage.css' import '../static/everypage.css';
import {Footer, TurniereNavigation} from "../js/CommonComponents"; import { Footer, TurniereNavigation } from '../js/CommonComponents';
import React from "react"; import React from 'react';
import {Card, CardBody, Container} from "reactstrap"; import { Card, CardBody, Container } from 'reactstrap';
import {getRequest} from "../js/api"; import { getRequest, getState } from '../js/api';
export default () => ( export default () => (
<div className="main generic-fullpage-bg"> <div className="main generic-fullpage-bg">
@ -16,7 +16,7 @@ export default () => (
</div> </div>
<Footer/> <Footer/>
</div> </div>
) );
class TournamentList extends React.Component { class TournamentList extends React.Component {
constructor(props) { constructor(props) {
@ -29,11 +29,9 @@ class TournamentList extends React.Component {
} }
componentDidMount() { componentDidMount() {
getRequest('/tournaments?type=public',{}) getRequest(getState(), '/tournaments?type=public')
.then( .then(
response => { response => {
console.log('response:');
console.log(response);
this.setState({ this.setState({
isLoaded: true, isLoaded: true,
items: response.data items: response.data
@ -45,7 +43,7 @@ class TournamentList extends React.Component {
error error
}); });
} }
) );
} }
render() { render() {
@ -67,7 +65,7 @@ class TournamentList extends React.Component {
function TournamentListEntry(props) { function TournamentListEntry(props) {
return ( return (
<a className="w-100 d-inline-block mt-2 text-left btn btn-outline-primary" href={"/t/"+props.code}> <a className="w-100 d-inline-block mt-2 text-left btn btn-outline-primary" href={ '/t/' + props.code }>
{props.name} {props.name}
</a> </a>
); );