X-Git-Url: https://git.localhorst.tv/?a=blobdiff_plain;f=resources%2Fjs%2Fcomponents%2Fepisodes%2FItem.js;h=adb710916a088ba8730f89912ba3e643918a06d5;hb=a5d038197b7a31c2d354fed242985cb604c4f8a8;hp=d7c4bab4ff7d68245e87ff84f5a3cabe243fb554;hpb=0a2bb2069cee683d525596dfe0141cac60f0f977;p=alttp.git

diff --git a/resources/js/components/episodes/Item.js b/resources/js/components/episodes/Item.js
index d7c4bab..adb7109 100644
--- a/resources/js/components/episodes/Item.js
+++ b/resources/js/components/episodes/Item.js
@@ -1,4 +1,3 @@
-import moment from 'moment';
 import PropTypes from 'prop-types';
 import React from 'react';
 import { Button } from 'react-bootstrap';
@@ -10,24 +9,15 @@ import Crew from './Crew';
 import MultiLink from './MultiLink';
 import Players from './Players';
 import Icon from '../common/Icon';
+import { hasPassed, hasSGRestream, isActive } from '../../helpers/Episode';
 import { canApplyForEpisode, canRestreamEpisode } from '../../helpers/permissions';
 import { withUser } from '../../helpers/UserContext';
 
-const isActive = episode => {
-	if (!episode.start) return false;
-	const now = moment();
-	const start = moment(episode.start).subtract(10, 'minutes');
-	const end = moment(episode.start).add(episode.estimate, 'seconds');
-	return start.isBefore(now) && end.isAfter(now);
-};
-
 const Item = ({ episode, onAddRestream, onApply, onEditRestream, user }) => {
 	const { t } = useTranslation();
 
 	const classNames = [
 		'episodes-item',
-		'd-flex',
-		'align-items-stretch',
 		'my-3',
 		'p-2',
 		'border',
@@ -50,62 +40,68 @@ const Item = ({ episode, onAddRestream, onApply, onEditRestream, user }) => {
 	const hasPlayers = episode.players && episode.players.length;
 
 	return <div className={classNames.join(' ')} style={style}>
-		<div className="episode-start me-3 fs-4 text-end">
-			{t('schedule.startTime', { date: new Date(episode.start) })}
-		</div>
-		<div className="d-flex flex-column flex-fill">
-			<div className="d-flex align-items-start justify-content-between">
-				<div>
-					{episode.title || episode.event ?
-						<div className="episode-title fs-4">
-							{episode.title || episode.event.title}
-						</div>
-					: null}
-					{episode.comment ?
-						<div className="episode-comment">
-							{episode.comment}
-						</div>
-					: null}
-				</div>
-				<div className="episode-channel-links text-end">
-					{hasChannels ?
-						<Channels
-							channels={episode.channels}
-							episode={episode}
-							onEditRestream={onEditRestream}
-						/>
-					: null}
-					{!hasChannels && hasPlayers ?
-						<MultiLink players={episode.players} />
-					: null}
-					{onAddRestream && canRestreamEpisode(user, episode) ?
-						<div>
-							<Button
-								onClick={() => onAddRestream(episode)}
-								title={t('episodes.addRestream')}
-								variant="outline-secondary"
-							>
-								<Icon.ADD title="" />
-							</Button>
-						</div>
-					: null}
-				</div>
+		<div className="d-flex align-items-stretch">
+			<div className="episode-start me-3 fs-5 fs-md-4 text-end">
+				{t('schedule.startTime', { date: new Date(episode.start) })}
+			</div>
+			<div className="episode-titlebar">
+				{episode.title || episode.event ?
+					<div className="episode-title fs-5 fs-md-4">
+						{episode.title || episode.event.title}
+					</div>
+				: null}
+				{episode.comment ?
+					<div className="episode-comment">
+						{episode.comment}
+					</div>
+				: null}
 			</div>
+			<div className="episode-channel-links ms-auto text-end">
+				{hasChannels ?
+					<Channels
+						channels={episode.channels}
+						episode={episode}
+						onEditRestream={onEditRestream}
+					/>
+				: null}
+				{!hasChannels && hasPlayers ?
+					<MultiLink players={episode.players} />
+				: null}
+				{onAddRestream && canRestreamEpisode(user, episode) ?
+					<div>
+						<Button
+							onClick={() => onAddRestream(episode)}
+							title={t('episodes.addRestream')}
+							variant="outline-secondary"
+						>
+							<Icon.ADD title="" />
+						</Button>
+					</div>
+				: null}
+			</div>
+		</div>
+		<div className="episode-body d-flex flex-column flex-fill">
 			{hasPlayers ?
 				<Players players={episode.players} />
 			: null}
-			{(episode.crew && episode.crew.length)
+			{(episode.crew && episode.crew.length) || (!hasPassed(episode) && (
+					hasSGRestream(episode)
 					|| canApplyForEpisode(user, episode, 'commentary')
-					|| canApplyForEpisode(user, episode, 'tracking') ?
+					|| canApplyForEpisode(user, episode, 'tracking')
+			)) ?
 				<div className="mb-3">
 					<Crew episode={episode} onApply={onApply} />
 				</div>
 			: null}
 			{episode.event ?
 				<div className="episode-event mt-auto">
-					<Link className="event-link" to={`/events/${episode.event.name}`}>
-						{episode.event.title}
-					</Link>
+					{episode.event.description_id ?
+						<Link className="event-link" to={`/events/${episode.event.name}`}>
+							{episode.event.title}
+						</Link>
+					:
+						episode.event.title
+					}
 				</div>
 			: null}
 		</div>
@@ -121,6 +117,7 @@ Item.propTypes = {
 		})),
 		event: PropTypes.shape({
 			corner: PropTypes.string,
+			description_id: PropTypes.number,
 			name: PropTypes.string,
 			title: PropTypes.string,
 		}),