turniere
/
turniere-frontend
mirror of https://github.com/turniere/turniere-frontend.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'master' into ticket/TURNIERE-237

This commit is contained in:
betanummeric 2019-06-18 20:21:48 +02:00 committed by GitHub
parent f99492c809 7695b6b3ee
commit 46bb62bf87
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pages/list.js
View File

@ -38,7 +38,8 @@ function PublicTournaments(props) {
<PublicTournamentsCard/> <PublicTournamentsCard/>
</Container> </Container>
<Container className="pb-5 pt-3"> <Container className="pb-5 pt-3">
<a href='/private' className="btn btn-success shadow">zu den privaten Turnieren</a> <a href='/private' className="btn btn-primary shadow">zu den privaten Turnieren</a>
<a href='/create' className="ml-3 btn btn-success shadow">neues Turnier erstellen</a>
</Container> </Container>
</div>); </div>);
} else { } else {

7
pages/private.js
View File

@ -19,7 +19,7 @@ class PrivateTournamentsPage extends React.Component {
<title>Private Turniere: turnie.re</title> <title>Private Turniere: turnie.re</title>
</Head> </Head>
<TurniereNavigation/> <TurniereNavigation/>
<PrivateTournamentsPageContent/> <PrivateTournamentsPageContent isSignedIn={this.props.isSignedIn}/>
<Footer/> <Footer/>
</div> </div>
</RequireLogin>); </RequireLogin>);
@ -35,13 +35,14 @@ const PrivateTournamentListPage = connect(mapStateToProperties)(PrivateTournamen
export default PrivateTournamentListPage; export default PrivateTournamentListPage;
function PrivateTournamentsPageContent() { function PrivateTournamentsPageContent(props) {
return (<div> return (<div>
<Container className="pt-5"> <Container className="pt-5">
<PrivateTournamentsCard/> <PrivateTournamentsCard/>
</Container> </Container>
<Container className="pb-5 pt-3"> <Container className="pb-5 pt-3">
<a href='/list' className="btn btn-success shadow">zu den öffentlichen Turnieren</a> <a href='/list' className="btn btn-primary shadow">zu den öffentlichen Turnieren</a>
{props.isSignedIn && <a href='/create' className="ml-3 btn btn-success shadow">neues Turnier erstellen</a>}
</Container> </Container>
</div>); </div>);
} }