X-Git-Url: https://git.localhorst.tv/?a=blobdiff_plain;f=resources%2Fjs%2Fcomponents%2Fresults%2FItem.js;h=2e29d752afd2bd6938e82a5123c3b607bdea7308;hb=147c5f43c5d41fa18e82edb6651fe5a37c789353;hp=0d0d34e81a11553f7535be8a883d1fabb7df378d;hpb=878ceac3fc16d0c611c5002ae5d0605f1a07a8b4;p=alttp.git

diff --git a/resources/js/components/results/Item.js b/resources/js/components/results/Item.js
index 0d0d34e..2e29d75 100644
--- a/resources/js/components/results/Item.js
+++ b/resources/js/components/results/Item.js
@@ -1,71 +1,110 @@
 import PropTypes from 'prop-types';
-import React from 'react';
-import { withTranslation } from 'react-i18next';
+import React, { useState } from 'react';
+import { Button } from 'react-bootstrap';
+import { useTranslation } from 'react-i18next';
 
+import DetailDialog from './DetailDialog';
 import Icon from '../common/Icon';
 import Box from '../users/Box';
-import { formatTime } from '../../helpers/Result';
-import { findResult } from '../../helpers/Participant';
+import { getIcon, getTime } from '../../helpers/Result';
 import { maySeeResults } from '../../helpers/permissions';
-import { withUser } from '../../helpers/UserContext';
+import { findResult } from '../../helpers/User';
+import { useUser } from '../../hooks/user';
 
-const getIcon = (result, index) => {
-	if (!result || !result.has_finished) {
-		return <Icon.PENDING className="text-muted" size="lg" />;
+const getClassName = result => {
+	const classNames = ['status'];
+	if (result && result.has_finished) {
+		classNames.push('finished');
+		if (result.comment) {
+			classNames.push('has-comment');
+		}
+	} else {
+		classNames.push('pending');
 	}
-	if (result.forfeit) {
-		return <Icon.FORFEIT className="text-danger" size="lg" />;
-	}
-	if (index === 0) {
-		return <Icon.FIRST_PLACE className="text-gold" size="lg" />;
-	}
-	if (index === 1) {
-		return <Icon.SECOND_PLACE className="text-silver" size="lg" />;
+	return classNames.join(' ');
+};
+
+const twitchReg = /^https?:\/\/(www\.)?twitch\.tv/;
+const youtubeReg = /^https?:\/\/(www\.)?youtu(\.be|be\.)/;
+
+const getVoDVariant = result => {
+	if (!result || !result.vod) return 'outline-secondary';
+	if (twitchReg.test(result.vod)) {
+		return 'twitch';
 	}
-	if (index === 2) {
-		return <Icon.THIRD_PLACE className="text-bronze" size="lg" />;
+	if (youtubeReg.test(result.vod)) {
+		return 'outline-youtube';
 	}
-	return <Icon.FINISHED className="text-success" size="lg" />;
+	return 'outline-secondary';
 };
 
-const getTime = (user, tournament, round, result) => {
-	if (!result || !maySeeResults(user, tournament, round)) {
-		return null;
+const getVoDIcon = result => {
+	const variant = getVoDVariant(result);
+	if (variant === 'twitch') {
+		return <Icon.TWITCH title="" />;
 	}
-	if (result.time) {
-		return formatTime(result);
+	if (variant === 'outline-youtube') {
+		return <Icon.YOUTUBE title="" />;
 	}
-	if (result.forfeit) {
-		return 'DNF';
-	}
-	return '?';
+	return <Icon.VIDEO title="" />;
 };
 
 const Item = ({
-	index,
-	participant,
 	round,
 	tournament,
 	user,
 }) => {
-	const result = findResult(participant, round);
+	const [showDialog, setShowDialog] = useState(false);
+
+	const { t } = useTranslation();
+	const { user: authUser } = useUser();
+
+	const result = React.useMemo(
+		() => findResult(user, round),
+		[round, user],
+	);
+	const maySee = React.useMemo(
+		() => maySeeResults(authUser, tournament, round),
+		[authUser, round, tournament],
+	);
+
 	return <div className="result">
-		<Box user={participant.user} />
-		<div className="status">
-			<span className="time">
-				{getTime(user, tournament, round, result)}
-			</span>
-			{getIcon(result, index)}
+		<Box user={user} />
+		<div className="d-flex align-items-center justify-content-between">
+			<Button
+				className={getClassName(result)}
+				onClick={() => setShowDialog(true)}
+				title={maySee && result && result.comment ? result.comment : null}
+			>
+				<span className="time">
+					{getTime(result, maySee)}
+				</span>
+				{getIcon(result, maySee)}
+			</Button>
+			{maySee && result && result.vod ?
+				<Button
+					className="vod-link"
+					href={result.vod}
+					size="sm"
+					target="_blank"
+					title={t('results.vod')}
+					variant={getVoDVariant(result)}
+				>
+					{getVoDIcon(result)}
+				</Button>
+			: null}
 		</div>
+		<DetailDialog
+			onHide={() => setShowDialog(false)}
+			round={round}
+			show={showDialog}
+			tournament={tournament}
+			user={user}
+		/>
 	</div>;
 };
 
 Item.propTypes = {
-	index: PropTypes.number,
-	participant: PropTypes.shape({
-		user: PropTypes.shape({
-		}),
-	}),
 	round: PropTypes.shape({
 	}),
 	tournament: PropTypes.shape({
@@ -74,4 +113,4 @@ Item.propTypes = {
 	}),
 };
 
-export default withTranslation()(withUser(Item));
+export default Item;