improved user context

[alttp.git] / resources / js / components / episodes / Item.js

diff --git a/resources/js/components/episodes/Item.js b/resources/js/components/episodes/Item.js
index 03cb6febd827301ff7d0a8442a11044b3e95f23a..612c5ea85f6f76db13ca777f85a93fbebae70bf2 100644 (file)
--- a/resources/js/components/episodes/Item.js
+++ b/resources/js/components/episodes/Item.js
@@ -10,16 +10,16 @@ import MultiLink from './MultiLink';
 import Players from './Players';
 import Icon from '../common/Icon';
 import { hasPassed, hasSGRestream, isActive } from '../../helpers/Episode';
+import { getLink } from '../../helpers/Event';
 import { canApplyForEpisode, canRestreamEpisode } from '../../helpers/permissions';
-import { withUser } from '../../helpers/UserContext';
+import { useUser } from '../../hooks/user';
 
-const Item = ({ episode, onAddRestream, onApply, onEditRestream, user }) => {
+const Item = ({ episode, onAddRestream, onApply, onEditRestream }) => {
        const { t } = useTranslation();
+       const { user } = useUser();
 
        const classNames = [
                'episodes-item',
-               'd-flex',
-               'align-items-stretch',
                'my-3',
                'p-2',
                'border',
@@ -42,47 +42,61 @@ 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}
+                               {episode.raceroom ?
+                                       <div>
+                                               <Button
+                                                       href={episode.raceroom}
+                                                       target="_blank"
+                                                       title={t('episodes.raceroom')}
+                                                       variant="outline-secondary"
+                                               >
+                                                       <Icon.RACETIME title="" />
+                                                       {' '}
+                                                       {t('episodes.raceroom')}
+                                               </Button>
+                                       </div>
+                               : 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}
@@ -98,7 +112,7 @@ const Item = ({ episode, onAddRestream, onApply, onEditRestream, user }) => {
                        {episode.event ?
                                <div className="episode-event mt-auto">
                                        {episode.event.description_id ?
-                                               <Link className="event-link" to={`/events/${episode.event.name}`}>
+                                               <Link className="event-link" to={getLink(episode.event)}>
                                                        {episode.event.title}
                                                </Link>
                                        :
@@ -125,14 +139,13 @@ Item.propTypes = {
                }),
                players: PropTypes.arrayOf(PropTypes.shape({
                })),
+               raceroom: PropTypes.string,
                start: PropTypes.string,
                title: PropTypes.string,
        }),
        onAddRestream: PropTypes.func,
        onApply: PropTypes.func,
        onEditRestream: PropTypes.func,
-       user: PropTypes.shape({
-       }),
 };
 
-export default withUser(Item);
+export default Item;