From d857a4e1592cfe2184d2aa0746afe27edf698a38 Mon Sep 17 00:00:00 2001
From: Jonny <littlebigjonny06@gmail.com>
Date: Thu, 2 May 2019 08:42:50 +0200
Subject: [PATCH] Properly style the buttons on the tournament and its
 statistics

---
 pages/tournament-statistics.js |  3 ++-
 pages/tournament.js            | 44 ++++++++++++++++++++++++++++++----
 2 files changed, 41 insertions(+), 6 deletions(-)

diff --git a/pages/tournament-statistics.js b/pages/tournament-statistics.js
index ca651bd..e3d0580 100644
--- a/pages/tournament-statistics.js
+++ b/pages/tournament-statistics.js
@@ -2,6 +2,7 @@ import Head                   from 'next/head';
 import React                  from 'react';
 import { connect }            from 'react-redux';
 import {
+    Button,
     Card,
     CardBody,
     Container,
@@ -290,6 +291,6 @@ const TournamentInformationView = connect(
 class TournamentButton extends React.Component {
     render() {
         const { id } = this.props;
-        return <a href={'/t/' + id} className='btn btn-outline-secondary'>Zum Turnier</a>;
+        return <Button href={'/t/' + id} outline color='secondary'>Zum Turnier</Button>;
     }
 }
diff --git a/pages/tournament.js b/pages/tournament.js
index bd20953..ba65366 100644
--- a/pages/tournament.js
+++ b/pages/tournament.js
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 import Head from 'next/head';
 import React from 'react';
 import {connect} from 'react-redux';
@@ -9,6 +10,39 @@ import {TurniereNavigation} from '../js/components/Navigation';
 import {BigImage} from '../js/components/BigImage';
 import {getState} from '../js/api';
 import {getRequest} from '../js/redux/backendApi';
+=======
+import Head                   from 'next/head';
+import React                  from 'react';
+import { connect }            from 'react-redux';
+import {
+    Button,
+    ButtonGroup,
+    Card,
+    CardBody,
+    Col,
+    Container,
+    Input,
+    InputGroup,
+    InputGroupAddon,
+    ListGroup,
+    ListGroupItem,
+    Modal,
+    ModalBody,
+    ModalFooter,
+    ModalHeader,
+    Row,
+    Table
+} from 'reactstrap';
+
+import { ErrorPageComponent } from '../js/components/ErrorComponents';
+import { Footer }             from '../js/components/Footer';
+import { TurniereNavigation } from '../js/components/Navigation';
+import { BigImage }           from '../js/components/BigImage';
+import {
+    getRequest,
+    getState
+} from '../js/api';
+>>>>>>> Properly style the buttons on the tournament and its statistics
 
 import 'bootstrap/dist/css/bootstrap.min.css';
 
@@ -53,18 +87,18 @@ const TournamentPage = connect(mapStateToTournamentPageProperties)(PrivateTourna
 function ButtonsBadge(props) {
     const { id, ownerName, isSignedIn, username } = props;
     return (
-        <div>
+        <ButtonGroup>
             <EditButton id={id} ownerName={ownerName} isSignedIn={isSignedIn} username={username}/>
             <StatisticsButton id={id}/>
-        </div>
+        </ButtonGroup>
     );
 }
 
 function EditButton(props) {
     const {id, ownerName, isSignedIn, username} = props;
 
-    if (isSignedIn && ownerName === username) {
-        return (<a href={'/t/' + id + '/edit'} className='btn btn-outline-secondary'>Turnier bearbeiten</a>);
+    if(isSignedIn && ownerName === username) {
+        return (<Button href={'/t/' + id + '/edit'} outline color='secondary'>Turnier bearbeiten</Button>);
     } else {
         return null;
     }
@@ -72,7 +106,7 @@ function EditButton(props) {
 
 function StatisticsButton(props) {
     const { id } = props;
-    return <a href={'/t/' + id + '/statistics'} className='btn btn-outline-secondary'>Statistiken zum Turnier</a>;
+    return <Button href={'/t/' + id + '/statistics'} outline color='secondary'>Statistiken zum Turnier</Button>;
 }
 
 function getLevelName(levelNumber) {