X-Git-Url: https://git.localhorst.tv/?a=blobdiff_plain;f=resources%2Fjs%2Fcomponents%2Ftournament%2FScoreboard.js;h=27bb0873a4d7c75d4de6a3b15f25f1d514a07713;hb=90922f8595a8d4fd7780a0b137eed66eaf7d6c49;hp=ea6a6668727385e2165dcc44ab1d2f853e1940d0;hpb=6c3125ca01833f7cec3659353840dbe1ddfb0fc6;p=alttp.git

diff --git a/resources/js/components/tournament/Scoreboard.js b/resources/js/components/tournament/Scoreboard.js
index ea6a666..27bb087 100644
--- a/resources/js/components/tournament/Scoreboard.js
+++ b/resources/js/components/tournament/Scoreboard.js
@@ -1,77 +1,106 @@
 import PropTypes from 'prop-types';
 import React from 'react';
 import { Button, Table } from 'react-bootstrap';
-import { withTranslation } from 'react-i18next';
+import { useTranslation } from 'react-i18next';
 
 import Icon from '../common/Icon';
 import Box from '../users/Box';
-import { calculateScores } from '../../helpers/Tournament';
-import { withUser } from '../../helpers/UserContext';
-import i18n from '../../i18n';
+import { comparePlacement } from '../../helpers/Participant';
+import { getRunners } from '../../helpers/Tournament';
+import { useUser } from '../../hooks/user';
 
-const getRowClassName = (tournament, score, user) => {
+const getRowClassName = (tournament, participant, user) => {
 	const classNames = ['score'];
-	if (score && user && score.participant && score.participant.user_id == user.id) {
+	if (participant && user && participant.user_id == user.id) {
 		classNames.push('is-self');
 	}
 	return classNames.join(' ');
 };
 
-const getPlacementDisplay = score => {
-	if (score.placement === 1) {
+const getPlacementDisplay = participant => {
+	if (participant.placement === 1) {
 		return <Icon.FIRST_PLACE className="text-gold" size="lg" />;
 	}
-	if (score.placement === 2) {
+	if (participant.placement === 2) {
 		return <Icon.SECOND_PLACE className="text-silver" size="lg" />;
 	}
-	if (score.placement === 3) {
+	if (participant.placement === 3) {
 		return <Icon.THIRD_PLACE className="text-bronze" size="lg" />;
 	}
-	return score.placement;
+	return participant.placement;
 };
 
-const Scoreboard = ({ tournament, user }) =>
-<Table striped className="scoreboard align-middle">
-	<thead>
-		<tr>
-			<th>{i18n.t('participants.placementShort')}</th>
-			<th>{i18n.t('participants.participant')}</th>
-			<th className="text-end">{i18n.t('participants.scoreShort')}</th>
-		</tr>
-	</thead>
-	<tbody>
-	{calculateScores(tournament).map(score =>
-		<tr className={getRowClassName(tournament, score, user)} key={score.participant.id}>
-			<td className="text-center">
-				{getPlacementDisplay(score)}
-			</td>
-			<td>
-				<div className="d-flex align-items-center justify-content-between">
-					<Box user={score.participant.user} />
-					{score.participant.user.stream_link ?
-						<Button
-							href={score.participant.user.stream_link}
-							size="sm"
-							target="_blank"
-							title={i18n.t('users.stream')}
-							variant="outline-twitch"
-						>
-							<Icon.STREAM title="" />
-						</Button>
-					: null}
-				</div>
-			</td>
-			<td className="text-end">{score.score}</td>
-		</tr>
-	)}
-	</tbody>
-</Table>;
+const twitchReg = /^https?:\/\/(www\.)?twitch\.tv/;
+const youtubeReg = /^https?:\/\/(www\.)?youtu(\.be|be\.)/;
+
+const getStreamVariant = participant => {
+	if (!participant || !participant.user || !participant.user.stream_link) {
+		return 'outline-secondary';
+	}
+	if (twitchReg.test(participant.user.stream_link)) {
+		return 'outline-twitch';
+	}
+	if (youtubeReg.test(participant.user.stream_link)) {
+		return 'outline-youtube';
+	}
+	return 'outline-secondary';
+};
+
+const getStreamIcon = participant => {
+	const variant = getStreamVariant(participant);
+	if (variant === 'outline-twitch') {
+		return <Icon.TWITCH title="" />;
+	}
+	if (variant === 'outline-youtube') {
+		return <Icon.YOUTUBE title="" />;
+	}
+	return <Icon.VIDEO title="" />;
+};
+
+const Scoreboard = ({ tournament }) => {
+	const { t } = useTranslation();
+	const { user } = useUser();
+
+	return <Table striped className="scoreboard align-middle">
+		<thead>
+			<tr>
+				<th className="text-center">{t('participants.placementShort')}</th>
+				<th>{t('participants.participant')}</th>
+				<th className="text-end">{t('participants.scoreShort')}</th>
+			</tr>
+		</thead>
+		<tbody>
+		{getRunners(tournament).sort(comparePlacement).map(participant =>
+			<tr className={getRowClassName(tournament, participant, user)} key={participant.id}>
+				<td className="text-center">
+					{getPlacementDisplay(participant)}
+				</td>
+				<td>
+					<div className="d-flex align-items-center justify-content-between">
+						<Box user={participant.user} />
+						{participant.user.stream_link ?
+							<Button
+								href={participant.user.stream_link}
+								size="sm"
+								target="_blank"
+								title={t('users.stream')}
+								variant={getStreamVariant(participant)}
+							>
+								{getStreamIcon(participant)}
+							</Button>
+						: null}
+					</div>
+				</td>
+				<td className="text-end">{participant.score}</td>
+			</tr>
+		)}
+		</tbody>
+	</Table>;
+};
 
 Scoreboard.propTypes = {
 	tournament: PropTypes.shape({
 	}),
-	user: PropTypes.shape({
-	}),
 };
 
-export default withTranslation()(withUser(Scoreboard));
+export default Scoreboard;