X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=resources%2Fjs%2Fcomponents%2Ftournament%2FDetail.js;h=1afcc29f10611a1e434c13f3a035dcfad3da9cee;hb=33cc4da565ffb07ee4f8d9cbafb248629b85e65a;hp=60c9d245716439653296fea58decc6659f4b8ae8;hpb=edd0e97bfdc544114f30bf4c13a929631c44a555;p=alttp.git

diff --git a/resources/js/components/tournament/Detail.js b/resources/js/components/tournament/Detail.js
index 60c9d24..1afcc29 100644
--- a/resources/js/components/tournament/Detail.js
+++ b/resources/js/components/tournament/Detail.js
@@ -1,44 +1,92 @@
 import PropTypes from 'prop-types';
 import React from 'react';
-import { Button, Container } from 'react-bootstrap';
+import { Button, Col, Container, Row } from 'react-bootstrap';
 import { withTranslation } from 'react-i18next';
 
-import Participants from '../participants/List';
+import Scoreboard from './Scoreboard';
+import Protocol from '../protocol/Protocol';
 import Rounds from '../rounds/List';
-import { mayAddRounds } from '../../helpers/permissions';
+import Box from '../users/Box';
+import {
+	isRunner,
+	mayAddRounds,
+	mayViewProtocol,
+} from '../../helpers/permissions';
+import {
+	getTournamentAdmins,
+	hasRunners,
+	hasTournamentAdmins,
+} from '../../helpers/Tournament';
 import { withUser } from '../../helpers/UserContext';
 import i18n from '../../i18n';
 
+const getClassName = (tournament, user) => {
+	const classNames = ['tournament'];
+	if (tournament.locked) {
+		classNames.push('is-locked');
+	} else {
+		classNames.push('is-active');
+	}
+	if (isRunner(user, tournament)) {
+		classNames.push('is-runner');
+	}
+	return classNames.join(' ');
+};
+
 const Detail = ({
 	addRound,
 	tournament,
 	user,
-}) => <Container>
-	<div className="d-flex align-items-center justify-content-between">
-		<h1>{tournament.title}</h1>
-	</div>
-	<div className="d-flex align-items-center justify-content-between">
-		<h2>{i18n.t('participants.heading')}</h2>
-	</div>
-	{tournament.participants ?
-		<Participants participants={tournament.participants} tournament={tournament} />
-	: null}
-	<div className="d-flex align-items-center justify-content-between">
-		<h2>{i18n.t('rounds.heading')}</h2>
-		{addRound && mayAddRounds(user, tournament) ?
-			<Button onClick={addRound}>
-				{i18n.t('rounds.new')}
-			</Button>
-		: null}
-	</div>
-	{tournament.rounds ?
-		<Rounds rounds={tournament.rounds} tournament={tournament} />
-	: null}
+}) => <Container className={getClassName(tournament, user)} fluid>
+	<Row>
+		<Col lg={8} xl={9}>
+			<div className="d-flex align-items-center justify-content-between">
+				<h1>{tournament.title}</h1>
+				{mayViewProtocol(user, tournament) ?
+					<Protocol id={tournament.id} />
+				: null}
+			</div>
+		</Col>
+	</Row>
+	<Row>
+		<Col lg={{ order: 2, span: 4 }} xl={{ order: 2, span: 3 }}>
+			<div className="d-flex align-items-center justify-content-between">
+				<h2>{i18n.t('tournaments.scoreboard')}</h2>
+			</div>
+			{hasRunners(tournament) ?
+				<Scoreboard tournament={tournament} />
+			: null}
+			{hasTournamentAdmins(tournament) ?
+				<>
+					<div className="d-flex align-items-center justify-content-between">
+						<h2>{i18n.t('tournaments.admins')}</h2>
+					</div>
+					{getTournamentAdmins(tournament).map(p =>
+						<p key={p.id}><Box user={p.user} /></p>
+					)}
+				</>
+			: null}
+		</Col>
+		<Col lg={{ order: 1, span: 8 }} xl={{ order: 1, span: 9 }}>
+			<div className="d-flex align-items-center justify-content-between">
+				<h2>{i18n.t('rounds.heading')}</h2>
+				{addRound && mayAddRounds(user, tournament) ?
+					<Button onClick={addRound}>
+						{i18n.t('rounds.new')}
+					</Button>
+				: null}
+			</div>
+			{tournament.rounds ?
+				<Rounds rounds={tournament.rounds} tournament={tournament} />
+			: null}
+		</Col>
+	</Row>
 </Container>;
 
 Detail.propTypes = {
 	addRound: PropTypes.func,
 	tournament: PropTypes.shape({
+		id: PropTypes.number,
 		participants: PropTypes.arrayOf(PropTypes.shape({
 		})),
 		rounds: PropTypes.arrayOf(PropTypes.shape({