X-Git-Url: https://git.localhorst.tv/?a=blobdiff_plain;f=resources%2Fjs%2Fcomponents%2Fepisodes%2FItem.js;h=03cb6febd827301ff7d0a8442a11044b3e95f23a;hb=a0bca4306e882d77ba192eed889bd7ed52896dad;hp=3545e7734586a1f3006ad761621df9061fb15d10;hpb=4fc3b543c9be9d045d7b9ea91dcaab46270131a9;p=alttp.git

diff --git a/resources/js/components/episodes/Item.js b/resources/js/components/episodes/Item.js
index 3545e77..03cb6fe 100644
--- a/resources/js/components/episodes/Item.js
+++ b/resources/js/components/episodes/Item.js
@@ -1,25 +1,18 @@
-import moment from 'moment';
 import PropTypes from 'prop-types';
 import React from 'react';
 import { Button } from 'react-bootstrap';
 import { useTranslation } from 'react-i18next';
+import { Link } from 'react-router-dom';
 
 import Channels from './Channels';
 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();
 
@@ -55,9 +48,9 @@ const Item = ({ episode, onAddRestream, onApply, onEditRestream, user }) => {
 		<div className="d-flex flex-column flex-fill">
 			<div className="d-flex align-items-start justify-content-between">
 				<div>
-					{episode.title ?
+					{episode.title || episode.event ?
 						<div className="episode-title fs-4">
-							{episode.title}
+							{episode.title || episode.event.title}
 						</div>
 					: null}
 					{episode.comment ?
@@ -93,16 +86,24 @@ const Item = ({ episode, onAddRestream, onApply, onEditRestream, user }) => {
 			{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">
-					{episode.event.title}
+					{episode.event.description_id ?
+						<Link className="event-link" to={`/events/${episode.event.name}`}>
+							{episode.event.title}
+						</Link>
+					:
+						episode.event.title
+					}
 				</div>
 			: null}
 		</div>
@@ -118,6 +119,8 @@ Item.propTypes = {
 		})),
 		event: PropTypes.shape({
 			corner: PropTypes.string,
+			description_id: PropTypes.number,
+			name: PropTypes.string,
 			title: PropTypes.string,
 		}),
 		players: PropTypes.arrayOf(PropTypes.shape({