feat(poster): "HubblePosterScreenHandler" and colors (pt. 2)

src/HandlerSwitcher.tsx

@@ -17,7 +17,7 @@ import RoomResponsibleLegacyView from './handlers/room-responsible-legacy';
 export enum Handlers {
   SPOTIFY = 'CurrentlyPlayingTrackHandler',
   CENTURION = 'CenturionScreenHandler',
-  GEWIS_POSTER = 'PosterScreenHandler',
+  GEWIS_POSTER = 'GewisPosterScreenHandler',
   HUBBLE_POSTER = 'HubblePosterScreenHandler',
   STAGE_EFFECTS = 'StageEffectsHandler',
   TIME_TRAIL_RACE = 'TimeTrailRaceScreenHandler',

src/handlers/poster/gewis/index.tsx

@@ -1,12 +1,19 @@
-import PosterBaseView from '../index.tsx';
-import { PhotoPoster as ClientPhotoPoster, Poster } from '../../../api';
-import OverlayGewis from './components/OverlayGewis.tsx';
-import BorrelLogoPoster from './components/types/BorrelLogoPoster.tsx';
-import BorrelWallOfShamePoster from './components/types/BorrelWallOfShame.tsx';
-import BorrelPriceListPoster from './components/types/BorrelPriceListPoster.tsx';
-import TrainPoster from './components/types/TrainPoster.tsx';
-import OlympicsPoster from './components/types/OlympicsPoster.tsx';
-import PhotoPoster from './components/types/PhotoPoster.tsx';
+import { RequestResult } from '@hey-api/client-fetch';
+import PosterBaseView from '../';
+import {
+  PhotoPoster as ClientPhotoPoster,
+  getGewisPosters,
+  Poster,
+  BasePosterResponse,
+  GewisPosterResponse,
+} from '../../../api';
+import OverlayGewis from './components/OverlayGewis';
+import BorrelLogoPoster from './components/types/BorrelLogoPoster';
+import BorrelWallOfShamePoster from './components/types/BorrelWallOfShame';
+import BorrelPriceListPoster from './components/types/BorrelPriceListPoster';
+import TrainPoster from './components/types/TrainPoster';
+import OlympicsPoster from './components/types/OlympicsPoster';
+import PhotoPoster from './components/types/PhotoPoster';
 
 export default function PosterGewisView() {
   const localPosterRenderer = (poster: Poster, visible: boolean, setTitle: (title: string) => void) => {
@@ -28,5 +35,11 @@ export default function PosterGewisView() {
     }
   };
 
-  return <PosterBaseView overlay={OverlayGewis} localPosterRenderer={localPosterRenderer} />;
+  return (
+    <PosterBaseView
+      overlay={OverlayGewis}
+      localPosterRenderer={localPosterRenderer}
+      getPosters={getGewisPosters as unknown as () => Promise<RequestResult<BasePosterResponse | GewisPosterResponse>>}
+    />
+  );
 }

src/handlers/poster/hubble/components/OverlayHubble.tsx

@@ -2,21 +2,14 @@ import { OverlayProps } from '../../index.tsx';
 import HubbleProgressBar from './HubbleProgressBar.tsx';
 import HubbleOrderView from './HubbleOrderView.tsx';
 
-export default function OverlayHubble({
-  // poster,
-  seconds,
-  posterIndex,
-  nextPoster,
-  pausePoster,
-}: OverlayProps) {
+export default function OverlayHubble({ poster, seconds, posterIndex, nextPoster, pausePoster }: OverlayProps) {
   return (
     <>
       <HubbleProgressBar
         seconds={seconds}
         posterIndex={posterIndex}
         hideClock={false}
-        // color={poster.color}
-        color={'#ffffff'}
+        color={poster?.color}
         nextPoster={nextPoster}
         pausePoster={pausePoster}
       />

src/handlers/poster/hubble/index.tsx

@@ -1,7 +1,14 @@
 import './components/index.scss';
-import PosterBaseView from '../index.tsx';
+import { RequestResult } from '@hey-api/client-fetch';
+import PosterBaseView from '../';
+import { BasePosterResponse, getHubblePosters } from '../../../api';
 import OverlayHubble from './components/OverlayHubble.tsx';
 
 export default function PosterHubbleView() {
-  return <PosterBaseView overlay={OverlayHubble} />;
+  return (
+    <PosterBaseView
+      overlay={OverlayHubble}
+      getPosters={getHubblePosters as unknown as () => Promise<RequestResult<BasePosterResponse>>}
+    />
+  );
 }

src/handlers/poster/index.tsx

@@ -1,6 +1,7 @@
 import './gewis/components/index.scss';
 import { ReactNode, useEffect, useState } from 'react';
-import { getPosters, Poster } from '../../api';
+import { RequestResult } from '@hey-api/client-fetch';
+import { BasePosterResponse, GewisPosterResponse, Poster } from '../../api';
 import PosterCarousel from './components/Carousel';
 
 export interface OverlayProps {
@@ -16,9 +17,10 @@ export interface OverlayProps {
 interface Props {
   overlay: (overlayProps: OverlayProps) => ReactNode;
   localPosterRenderer?: (poster: Poster, visible: boolean, setTitle: (title: string) => void) => ReactNode;
+  getPosters: () => Promise<RequestResult<BasePosterResponse | GewisPosterResponse>>;
 }
 
-export default function PosterBaseView({ overlay, localPosterRenderer }: Props) {
+export default function PosterBaseView({ overlay, localPosterRenderer, getPosters }: Props) {
   const [posters, setPosters] = useState<Poster[]>();
   const [borrelMode, setBorrelMode] = useState(false);
   const [posterIndex, setPosterIndex] = useState<number>();
@@ -32,7 +34,8 @@ export default function PosterBaseView({ overlay, localPosterRenderer }: Props)
     // TODO what to do if poster cannot be fetched?
     const newPosters = await getPosters();
     setPosters(newPosters.data!.posters);
-    setBorrelMode(newPosters.data!.borrelMode);
+    if ((newPosters.data! as GewisPosterResponse).borrelMode)
+      setBorrelMode((newPosters.data! as GewisPosterResponse).borrelMode);
     setLoading(false);
   };