From 21d43ab6412280b8874d406ab150e150271fe2fa Mon Sep 17 00:00:00 2001 From: Felix Hamme Date: Tue, 11 Dec 2018 22:04:36 +0100 Subject: [PATCH] Minor design tweak for matches --- pages/tournament.js | 29 +++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/pages/tournament.js b/pages/tournament.js index f5c92ff..94d0da0 100644 --- a/pages/tournament.js +++ b/pages/tournament.js @@ -26,7 +26,7 @@ import {getRequest} from '../js/api'; function Tournament(props) { return ( -
+
Turnier bearbeiten

{props.tournament.description}

@@ -90,28 +90,32 @@ class Match extends React.Component { } render() { - let cardClass, team1Class, team2Class, smallMessage; + let cardClass, team1Class, team2Class, smallMessage, borderClass; //possible states: single_team not_ready not_started in_progress team1_won team2_won undecided switch (this.props.match.state) { case 'in_progress': - cardClass = 'table-warning border-warning'; + cardClass = 'table-warning'; + borderClass = 'border-warning'; smallMessage = 'Spiel läuft'; break; case 'team1_won': team1Class = 'font-weight-bold'; team2Class = 'lost-team'; - cardClass = 'table-success border-success'; + cardClass = 'table-success'; + borderClass = 'border-success'; smallMessage = 'Gewinner: ' + this.props.match.team1; break; case 'team2_won': team1Class = 'lost-team'; team2Class = 'font-weight-bold'; - cardClass = 'table-success border-success'; + cardClass = 'table-success'; + borderClass = 'border-success'; smallMessage = 'Gewinner: ' + this.props.match.team2; break; case 'single_team': team2Class = 'text-muted'; - cardClass = 'table-success border-success'; + cardClass = 'table-success'; + borderClass = 'border-success'; smallMessage = 'kein Gegner, Team kommt weiter'; break; case 'not_ready': @@ -121,15 +125,16 @@ class Match extends React.Component { smallMessage = 'Spiel kann gestartet werden'; break; case 'undecided': - cardClass = 'table-success border-success'; + cardClass = 'table-success'; + borderClass = 'border-success'; smallMessage = 'Spiel beendet, unentschieden'; break; } return (
- - + + {smallMessage} @@ -215,7 +220,7 @@ function MatchTable(props) { {props.match.team1} - kein Gegner + kein Gegner @@ -229,8 +234,8 @@ function MatchTable(props) { {props.match.team1} - {props.match.scoreTeam2} - {props.match.team2} + {props.match.scoreTeam2} + {props.match.team2}