Skip to content

Commit

Permalink
✨ adding bar info for GG05 & GG03 (not GG04)
Browse files Browse the repository at this point in the history
  • Loading branch information
jlandure committed Oct 17, 2024
1 parent d9f1aa3 commit 3fc24ee
Show file tree
Hide file tree
Showing 5 changed files with 68 additions and 2 deletions.
4 changes: 4 additions & 0 deletions src/components/composant-ecran.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import {AffichageZoneRemotion} from "src/remotion/components/affichage-zone-remo
import {ScaryElevatorRemotion} from "src/remotion/components/scary-elevator-remotion.tsx";
import {PlanningCitd} from "src/remotion/components/planning-citd.tsx";
import {PlanningCitdSalleE} from "src/remotion/components/planning-citd-salle-e.tsx";
import {PlanningBar} from "src/remotion/components/bar-afterparty.tsx";

export const ComposantEcran: React.FC<{ planning?: Talk[] } & ConfigEcran> = ({planning, ...configEcran}) => {

Expand Down Expand Up @@ -56,6 +57,9 @@ export const ComposantEcran: React.FC<{ planning?: Talk[] } & ConfigEcran> = ({p
if (configEcran.directions) {
return <DirectionRemotion directions={configEcran.directions} portrait={isPortrait}/>
}
if (estPremierJour && configEcran.tags?.includes("vin") && (heure > "18:30") && (heure < "21:30")) {
return <PlanningBar portrait={isPortrait}/>
}
if (configEcran.tags?.includes("vestiaire")) {
return EcranVestiaire(estPremierJour, currentDate, isPortrait, estDeuxiemeJour);
}
Expand Down
4 changes: 2 additions & 2 deletions src/data/Ecrans.ts
Original file line number Diff line number Diff line change
Expand Up @@ -445,7 +445,7 @@ export const ECRANS_VESTIAIRE: ConfigEcran[] = [
ratio: '16_9',
resolution: '1920x1080',
orientation: 'landscape',
tags: ['vestiaire'],
tags: ['vestiaire', 'vin'],
},
{
id: 'GG04',
Expand Down Expand Up @@ -489,7 +489,7 @@ export const ECRANS_BARS: ConfigEcran[] = [
ratio: '16_9',
resolution: '1920x1080',
orientation: 'landscape',
tags: [],
tags: ['vestiaire', 'vin'],
},
{
id: 'GA05',
Expand Down
3 changes: 3 additions & 0 deletions src/data/configsAffichagesZones.ts
Original file line number Diff line number Diff line change
Expand Up @@ -47,5 +47,8 @@ export const AFFICHES_ZONE: Record<typesAffiches, ConfigAfficheShortVid> = { //
"date": "17 Octobre",
"time": "22h",
"location": "Bars Partenaires",
},
vin: {

Check failure on line 51 in src/data/configsAffichagesZones.ts

View workflow job for this annotation

GitHub Actions / deploy

Object literal may only specify known properties, and 'vin' does not exist in type 'Record<typesAffiches, ConfigAfficheShortVid>'.
"title": "Afterparty : bar et vin",
}
};
58 changes: 58 additions & 0 deletions src/remotion/components/bar-afterparty.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
import React from "react";
import {Player} from "@remotion/player";
import {
DevfestNantesCustomContent
} from "src/remotion/compositions/showcases/devfestNantes/DevfestNantesCustomContent.tsx";
import {TalkTitle} from "src/remotion/compositions/showcases/devfestNantes/TalkTitle.tsx";
import {AiOutlineArrowDown} from "react-icons/ai";

export const PlanningBar: React.FC<{ portrait?: boolean}> = ({portrait}) => {

Check failure on line 9 in src/remotion/components/bar-afterparty.tsx

View workflow job for this annotation

GitHub Actions / deploy

'portrait' is declared but its value is never read.

const currentTemplate = {
compositionName: 'DevfestNantesBar',
component: DevfestNantesBar,
width: 1280,
height: 720,
durationInFrames: 350,
};
return <Player
autoPlay
controls={false}
loop
style={{
width: '100%',
aspectRatio: '16/9',
}}
durationInFrames={currentTemplate.durationInFrames}
compositionWidth={currentTemplate.width}
compositionHeight={currentTemplate.height}
fps={30}
component={currentTemplate.component as never}
/>
}

const DevfestNantesBar = () => {
return <DevfestNantesCustomContent>
<TalkTitle title={"Afterparty : Soft, bière et vin"} style={{bottom: "unset", top: "200px", fontSize: "30px"}}
isTotemDisplayMode={true}/>
<>
<div
style={{
width: "100%",
display: "flex",
flexDirection: "row",
justifyContent: "flex-start",
alignItems: "center",
position: "relative",
paddingLeft: "600px",
bottom: "-250px",
}}
>
<AiOutlineArrowDown size={"5rem"}
style={{
filter: "drop-shadow(2px 2px 2px #1B2C2C)",
}}/>
</div>
</>
</DevfestNantesCustomContent>
}
1 change: 1 addition & 0 deletions src/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -141,3 +141,4 @@ export type Tag =
| 'titan'
| 'vestiaire'
| 'direction'
| 'vin'

0 comments on commit 3fc24ee

Please sign in to comment.