diff --git a/src/components/BroadcastGraphics/Chyrons/Driver/ChyronDriver.tsx b/src/components/BroadcastGraphics/Chyrons/Driver/ChyronDriver.tsx
index 18404a2..61b94ba 100644
--- a/src/components/BroadcastGraphics/Chyrons/Driver/ChyronDriver.tsx
+++ b/src/components/BroadcastGraphics/Chyrons/Driver/ChyronDriver.tsx
@@ -17,8 +17,12 @@ import {
TeamName,
TextContainer,
FlagContainer,
+ PortraitDiv,
+ BaseContainer,
} from "./styles";
+const driverPortraits = require.context("../../../../public/images/drivers/front", true);
+
type ChyronDriverProps = {
chyronData: BGChyronDriver,
subMode: BGChyronSubMode,
@@ -28,52 +32,61 @@ export function ChyronDriver({ chyronData, subMode }: ChyronDriverProps) {
: subMode === "large" ? [638, 98]
: [0, 0];
- const { car, flagMode, showPosFlag, showDriverNumber } = chyronData;
+ const { car, flagMode, showPosFlag, showDriverNumber, showPortrait } = chyronData;
const flagProps = flagMode === "country"
? { flagMode, flag: car.driver.nationality }
: flagMode === "team" ? { flagMode, flag: car.driver.team.id } : undefined;
return (
-
-
- {showPosFlag && (
-
-
- {car.position}
-
-
- )}
-
-
-
-
-
- {car.driver.firstName}
- {car.driver.lastName}
- {showDriverNumber && (
-
-
-
- )}
-
- {car.driver.team.shortName}
-
-
- {flagProps != null && (
-
+
+
+
+ {showPosFlag && (
+
+
+ {car.position}
+
+
)}
-
-
+
+
+
+
+
+ {car.driver.firstName}
+ {car.driver.lastName}
+ {showDriverNumber && (
+
+
+
+ )}
+
+ {car.driver.team.shortName}
+
+
+ {flagProps != null && (
+
+ )}
+
+
+ {showPortrait && (
+
+ )}
+
);
}
diff --git a/src/components/BroadcastGraphics/Chyrons/Driver/styles.ts b/src/components/BroadcastGraphics/Chyrons/Driver/styles.ts
index 48b46c3..97ca527 100644
--- a/src/components/BroadcastGraphics/Chyrons/Driver/styles.ts
+++ b/src/components/BroadcastGraphics/Chyrons/Driver/styles.ts
@@ -1,14 +1,21 @@
import styled from "styled-components";
import { Px } from "../../../../types/style";
-type BaseBackgroundProps = {
+type BaseContainerProps = {
width: Px,
height: Px,
};
-export const BaseBackground = styled.div`
+export const BaseContainer = styled.div`
position: relative;
width: ${({ width }) => `${width}px`};
height: ${({ height }) => `${height}px`};
+`;
+BaseContainer.displayName = "BaseContainer";
+
+export const BaseBackground = styled.div`
+ position: relative;
+ height: 100%;
+ width: 100%;
display: flex;
align-items: center;
@@ -107,7 +114,6 @@ export const TeamName = styled.div`
`;
TeamName.displayName = "TeamName";
-
type SpacerProps = {
width?: string,
height?: string;
@@ -137,3 +143,24 @@ export const FlagContainer = styled.div`
overflow: hidden;
`;
FlagContainer.displayName = "FlagContainer";
+
+type PortraitDivProps = {
+ src: string,
+ height: Px,
+ rightMargin: Px,
+};
+export const PortraitDiv = styled.div`
+ position: absolute;
+
+ height: ${({ height }) => `${height}px`};
+ width: ${({ height }) => `${height * 1.4}px`};
+
+ bottom: 0;
+ right: ${({ rightMargin }) => `${rightMargin}px`};
+
+ background-image: url(${({ src }) => src});
+ background-size: contain;
+ background-repeat: no-repeat;
+ background-position: center ${({ height }) => `${height * .18}px`};
+`;
+PortraitDiv.displayName = "PortraitDiv";
diff --git a/src/domain/data/teams.ts b/src/domain/data/teams.ts
index 53ae5db..bee40f2 100644
--- a/src/domain/data/teams.ts
+++ b/src/domain/data/teams.ts
@@ -173,7 +173,7 @@ export const drivers: {[lastName: string]: Driver} = {
team: teams.haas,
yellowTCam: false,
initials: "MAZ",
- nationality: "RUS", // RAF SUPPORT MAYBE LATER...
+ nationality: "RAF",
},
norris: {
id: "norris",
diff --git a/src/domain/data/workspaces.ts b/src/domain/data/workspaces.ts
index 5839e35..603ae51 100644
--- a/src/domain/data/workspaces.ts
+++ b/src/domain/data/workspaces.ts
@@ -7,18 +7,19 @@ export const workspaces: WorkspaceObject = {
chyron: {
name: "Chyron",
overlayIds: [
- "chyron-driver-medium-full-ham.png",
"chyron-driver-medium-full-alo.png",
"chyron-driver-medium-full-lec.png",
"chyron-driver-medium-full-rai.png",
"chyron-driver-medium-full-vet.png",
"chyron-driver-medium-full-per.png",
"chyron-driver-medium-full-msc.png",
+ "chyron-driver-medium-op1-ham.png",
+ "chyron-driver-medium-op2-ham.png",
+ "chyron-driver-medium-full-ham.png",
+ "chyron-driver-portrait-maz.png",
"chyron-driver-medium-full-gas-weird.png",
"chyron-driver-medium-full-nor-weird.png",
"chyron-driver-medium-full-lat-no-pos.png",
- "chyron-driver-medium-op1-ham.png",
- "chyron-driver-medium-op2-ham.png",
"chyron-driver-large-np-tsu.png",
"chyron-driver-large-dnf-ver.png",
],
@@ -34,7 +35,7 @@ export const workspaces: WorkspaceObject = {
],
previewWindowDimensions: {
width: 1200,
- height: 150,
+ height: 250,
},
},
angledFlagCountry: {
diff --git a/src/public/images/drivers/front/albon.png b/src/public/images/drivers/front/albon.png
new file mode 100644
index 0000000..ee72551
Binary files /dev/null and b/src/public/images/drivers/front/albon.png differ
diff --git a/src/public/images/drivers/front/alonso.png b/src/public/images/drivers/front/alonso.png
new file mode 100644
index 0000000..1826655
Binary files /dev/null and b/src/public/images/drivers/front/alonso.png differ
diff --git a/src/public/images/drivers/front/bottas.png b/src/public/images/drivers/front/bottas.png
new file mode 100644
index 0000000..2e66a4c
Binary files /dev/null and b/src/public/images/drivers/front/bottas.png differ
diff --git a/src/public/images/drivers/front/gasly.png b/src/public/images/drivers/front/gasly.png
new file mode 100644
index 0000000..77e1199
Binary files /dev/null and b/src/public/images/drivers/front/gasly.png differ
diff --git a/src/public/images/drivers/front/giovinazzi.png b/src/public/images/drivers/front/giovinazzi.png
new file mode 100644
index 0000000..968cbc5
Binary files /dev/null and b/src/public/images/drivers/front/giovinazzi.png differ
diff --git a/src/public/images/drivers/front/hamilton.png b/src/public/images/drivers/front/hamilton.png
new file mode 100644
index 0000000..15835a2
Binary files /dev/null and b/src/public/images/drivers/front/hamilton.png differ
diff --git a/src/public/images/drivers/front/kubica.png b/src/public/images/drivers/front/kubica.png
new file mode 100644
index 0000000..f52d9ab
Binary files /dev/null and b/src/public/images/drivers/front/kubica.png differ
diff --git a/src/public/images/drivers/front/latifi.png b/src/public/images/drivers/front/latifi.png
new file mode 100644
index 0000000..5764373
Binary files /dev/null and b/src/public/images/drivers/front/latifi.png differ
diff --git a/src/public/images/drivers/front/leclerc.png b/src/public/images/drivers/front/leclerc.png
new file mode 100644
index 0000000..0396a31
Binary files /dev/null and b/src/public/images/drivers/front/leclerc.png differ
diff --git a/src/public/images/drivers/front/mazepin.png b/src/public/images/drivers/front/mazepin.png
new file mode 100644
index 0000000..3836881
Binary files /dev/null and b/src/public/images/drivers/front/mazepin.png differ
diff --git a/src/public/images/drivers/front/norris.png b/src/public/images/drivers/front/norris.png
new file mode 100644
index 0000000..068ee5b
Binary files /dev/null and b/src/public/images/drivers/front/norris.png differ
diff --git a/src/public/images/drivers/front/ocon.png b/src/public/images/drivers/front/ocon.png
new file mode 100644
index 0000000..771bcd5
Binary files /dev/null and b/src/public/images/drivers/front/ocon.png differ
diff --git a/src/public/images/drivers/front/perez.png b/src/public/images/drivers/front/perez.png
new file mode 100644
index 0000000..96065ef
Binary files /dev/null and b/src/public/images/drivers/front/perez.png differ
diff --git a/src/public/images/drivers/front/raikkonen.png b/src/public/images/drivers/front/raikkonen.png
new file mode 100644
index 0000000..53bd6d6
Binary files /dev/null and b/src/public/images/drivers/front/raikkonen.png differ
diff --git a/src/public/images/drivers/front/ricciardo.png b/src/public/images/drivers/front/ricciardo.png
new file mode 100644
index 0000000..7b083c7
Binary files /dev/null and b/src/public/images/drivers/front/ricciardo.png differ
diff --git a/src/public/images/drivers/front/russell.png b/src/public/images/drivers/front/russell.png
new file mode 100644
index 0000000..a961840
Binary files /dev/null and b/src/public/images/drivers/front/russell.png differ
diff --git a/src/public/images/drivers/front/sainz.png b/src/public/images/drivers/front/sainz.png
new file mode 100644
index 0000000..81520e1
Binary files /dev/null and b/src/public/images/drivers/front/sainz.png differ
diff --git a/src/public/images/drivers/front/schumacher.png b/src/public/images/drivers/front/schumacher.png
new file mode 100644
index 0000000..e73dbb0
Binary files /dev/null and b/src/public/images/drivers/front/schumacher.png differ
diff --git a/src/public/images/drivers/front/stroll.png b/src/public/images/drivers/front/stroll.png
new file mode 100644
index 0000000..9905af1
Binary files /dev/null and b/src/public/images/drivers/front/stroll.png differ
diff --git a/src/public/images/drivers/front/tsunoda.png b/src/public/images/drivers/front/tsunoda.png
new file mode 100644
index 0000000..5cfed15
Binary files /dev/null and b/src/public/images/drivers/front/tsunoda.png differ
diff --git a/src/public/images/drivers/front/verstappen.png b/src/public/images/drivers/front/verstappen.png
new file mode 100644
index 0000000..3ef19cf
Binary files /dev/null and b/src/public/images/drivers/front/verstappen.png differ
diff --git a/src/public/images/drivers/front/vettel.png b/src/public/images/drivers/front/vettel.png
new file mode 100644
index 0000000..a3769bf
Binary files /dev/null and b/src/public/images/drivers/front/vettel.png differ
diff --git a/src/public/images/drivers/front/zhou.png b/src/public/images/drivers/front/zhou.png
new file mode 100644
index 0000000..4f508ab
Binary files /dev/null and b/src/public/images/drivers/front/zhou.png differ
diff --git a/src/public/images/overlays/chyron-driver-portrait-maz.png b/src/public/images/overlays/chyron-driver-portrait-maz.png
new file mode 100644
index 0000000..f72f2a4
Binary files /dev/null and b/src/public/images/overlays/chyron-driver-portrait-maz.png differ