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

diff --git a/resources/js/components/episodes/Item.js b/resources/js/components/episodes/Item.js
index 19760ee..d7c4bab 100644
--- a/resources/js/components/episodes/Item.js
+++ b/resources/js/components/episodes/Item.js
@@ -3,13 +3,14 @@ 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 { canRestreamEpisode } from '../../helpers/permissions';
+import { canApplyForEpisode, canRestreamEpisode } from '../../helpers/permissions';
 import { withUser } from '../../helpers/UserContext';
 
 const isActive = episode => {
@@ -20,13 +21,13 @@ const isActive = episode => {
 	return start.isBefore(now) && end.isAfter(now);
 };
 
-const Item = ({ episode, onAddRestream, onEditRestream, user }) => {
+const Item = ({ episode, onAddRestream, onApply, onEditRestream, user }) => {
 	const { t } = useTranslation();
 
 	const classNames = [
 		'episodes-item',
 		'd-flex',
-		'align-items-start',
+		'align-items-stretch',
 		'my-3',
 		'p-2',
 		'border',
@@ -52,17 +53,17 @@ const Item = ({ episode, onAddRestream, onEditRestream, user }) => {
 		<div className="episode-start me-3 fs-4 text-end">
 			{t('schedule.startTime', { date: new Date(episode.start) })}
 		</div>
-		<div className="flex-fill">
+		<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.event ?
-						<div className="episode-event">
-							{episode.event.title}
+					{episode.comment ?
+						<div className="episode-comment">
+							{episode.comment}
 						</div>
 					: null}
 				</div>
@@ -93,8 +94,19 @@ const Item = ({ episode, onAddRestream, onEditRestream, user }) => {
 			{hasPlayers ?
 				<Players players={episode.players} />
 			: null}
-			{episode.crew && episode.crew.length ?
-				<Crew crew={episode.crew} />
+			{(episode.crew && episode.crew.length)
+					|| canApplyForEpisode(user, episode, 'commentary')
+					|| 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>
+				</div>
 			: null}
 		</div>
 	</div>;
@@ -104,10 +116,12 @@ Item.propTypes = {
 	episode: PropTypes.shape({
 		channels: PropTypes.arrayOf(PropTypes.shape({
 		})),
+		comment: PropTypes.string,
 		crew: PropTypes.arrayOf(PropTypes.shape({
 		})),
 		event: PropTypes.shape({
 			corner: PropTypes.string,
+			name: PropTypes.string,
 			title: PropTypes.string,
 		}),
 		players: PropTypes.arrayOf(PropTypes.shape({
@@ -116,6 +130,7 @@ Item.propTypes = {
 		title: PropTypes.string,
 	}),
 	onAddRestream: PropTypes.func,
+	onApply: PropTypes.func,
 	onEditRestream: PropTypes.func,
 	user: PropTypes.shape({
 	}),