diff --git a/src/components/Workspaces/CustomWorkSpaces/AngledFlagWorkSpace.tsx b/src/components/Workspaces/CustomWorkSpaces/AngledFlagWorkSpace.tsx
index cfcc591..033fbb8 100644
--- a/src/components/Workspaces/CustomWorkSpaces/AngledFlagWorkSpace.tsx
+++ b/src/components/Workspaces/CustomWorkSpaces/AngledFlagWorkSpace.tsx
@@ -11,17 +11,18 @@ type AngledFlagWorkSpaceProps = {
};
export function AngledFlagWorkSpace({ flagMode }: AngledFlagWorkSpaceProps) {
const { prototypeState } = useSelector(workspaceSelector);
+ const defaultFlag = flagMode === "country" ? "GBR" : flagMode === "team" ? "alpine" : "";
return (
diff --git a/src/components/Workspaces/PrototypingControls/AngledFlagPrototype/AngledFlagPrototypeControls.tsx b/src/components/Workspaces/PrototypingControls/AngledFlagPrototype/AngledFlagPrototypeControls.tsx
index 38c3cd6..a1c826b 100644
--- a/src/components/Workspaces/PrototypingControls/AngledFlagPrototype/AngledFlagPrototypeControls.tsx
+++ b/src/components/Workspaces/PrototypingControls/AngledFlagPrototype/AngledFlagPrototypeControls.tsx
@@ -4,6 +4,7 @@ import { useDispatch, useSelector } from "react-redux";
import { workspaceSelector } from "../../../../features/workspace/workspaceSelector";
import { setPrototypeState } from "../../../../features/workspace/workspaceSlice";
+import { FlagMode, TeamId } from "../../../../types/state";
import { SlotSelector } from "../../../Common/Inputs/SlotSelector";
@@ -11,23 +12,31 @@ const countries = [
"GBR", "NLD", "FIN", "JPN", "FRA", "DEU", "MEX", "POL", "MCO", "CHN", "THA",
"CAN", "RUS", "RAF", "AUS", "ESP", "ITA",
];
+const teams: Array = [
+ "alpine", "alfaRomeo", "alphaTauri", "astonMartin", "haas", "ferrari",
+ "mclaren", "mercedes", "redBull", "williams",
+];
-export function AngledFlagPrototypeControls() {
+type AngledFlagPrototypeControlsProps = {
+ flagMode: FlagMode,
+};
+export function AngledFlagPrototypeControls({ flagMode }: AngledFlagPrototypeControlsProps) {
const dispatch = useDispatch();
const { prototypeState } = useSelector(workspaceSelector);
+ const flagList = flagMode === "country" ? countries : flagMode === "team" ? teams : [];
const onChange = (flag: "flagA" | "flagB") => (index: number) => {
dispatch(setPrototypeState({
angledFlag: {
- flagA: flag === "flagA" ? countries[index] : prototypeState?.angledFlag?.flagA ?? "GBR",
- flagB: flag === "flagB" ? countries[index] : prototypeState?.angledFlag?.flagB ?? "GBR",
+ flagA: flag === "flagA" ? flagList[index] : prototypeState?.angledFlag?.flagA ?? "GBR",
+ flagB: flag === "flagB" ? flagList[index] : prototypeState?.angledFlag?.flagB ?? "GBR",
},
}));
};
return (
-
-
+
+
);
}
diff --git a/src/components/Workspaces/WorkspacesRoute.tsx b/src/components/Workspaces/WorkspacesRoute.tsx
index 8660810..59c3686 100644
--- a/src/components/Workspaces/WorkspacesRoute.tsx
+++ b/src/components/Workspaces/WorkspacesRoute.tsx
@@ -67,7 +67,14 @@ export default function Workspaces() {
}
- prototypeControls={}
+ prototypeControls={}
+ />
+ } />
+ }
+ prototypeControls={}
/>
} />
Unknown Workspace} />
diff --git a/src/domain/data/workspaces.ts b/src/domain/data/workspaces.ts
index a1132f9..a0319a1 100644
--- a/src/domain/data/workspaces.ts
+++ b/src/domain/data/workspaces.ts
@@ -47,4 +47,14 @@ export const workspaces: WorkspaceObject = {
height: 500,
},
},
+ angledFlagTeam: {
+ name: "Angled Flag (Team)",
+ overlayIds: [
+ "angled-flag-ferrari.png",
+ ],
+ previewWindowDimensions: {
+ width: 800,
+ height: 500,
+ },
+ },
};
diff --git a/src/public/images/overlays/angled-flag-alfaRomeo.png b/src/public/images/overlays/angled-flag-alfaRomeo.png
new file mode 100644
index 0000000..9b54bcf
Binary files /dev/null and b/src/public/images/overlays/angled-flag-alfaRomeo.png differ
diff --git a/src/public/images/overlays/angled-flag-alphaTauri.png b/src/public/images/overlays/angled-flag-alphaTauri.png
new file mode 100644
index 0000000..518ed0d
Binary files /dev/null and b/src/public/images/overlays/angled-flag-alphaTauri.png differ
diff --git a/src/public/images/overlays/angled-flag-alpine.png b/src/public/images/overlays/angled-flag-alpine.png
new file mode 100644
index 0000000..d69ccd5
Binary files /dev/null and b/src/public/images/overlays/angled-flag-alpine.png differ
diff --git a/src/public/images/overlays/angled-flag-astonMartin.png b/src/public/images/overlays/angled-flag-astonMartin.png
new file mode 100644
index 0000000..877b56a
Binary files /dev/null and b/src/public/images/overlays/angled-flag-astonMartin.png differ
diff --git a/src/public/images/overlays/angled-flag-ferrari.png b/src/public/images/overlays/angled-flag-ferrari.png
new file mode 100644
index 0000000..f2e40e3
Binary files /dev/null and b/src/public/images/overlays/angled-flag-ferrari.png differ
diff --git a/src/public/images/overlays/angled-flag-haas.png b/src/public/images/overlays/angled-flag-haas.png
new file mode 100644
index 0000000..8918489
Binary files /dev/null and b/src/public/images/overlays/angled-flag-haas.png differ
diff --git a/src/public/images/overlays/angled-flag-mclaren.png b/src/public/images/overlays/angled-flag-mclaren.png
new file mode 100644
index 0000000..6d3e5ca
Binary files /dev/null and b/src/public/images/overlays/angled-flag-mclaren.png differ
diff --git a/src/public/images/overlays/angled-flag-mercedes.png b/src/public/images/overlays/angled-flag-mercedes.png
new file mode 100644
index 0000000..f5d1981
Binary files /dev/null and b/src/public/images/overlays/angled-flag-mercedes.png differ
diff --git a/src/public/images/overlays/angled-flag-redBull.png b/src/public/images/overlays/angled-flag-redBull.png
new file mode 100644
index 0000000..dcca776
Binary files /dev/null and b/src/public/images/overlays/angled-flag-redBull.png differ
diff --git a/src/public/images/overlays/angled-flag-williams.png b/src/public/images/overlays/angled-flag-williams.png
new file mode 100644
index 0000000..421bfca
Binary files /dev/null and b/src/public/images/overlays/angled-flag-williams.png differ