merge from main

Author: shtukas

dotcom-rendering/.storybook/modes.ts

@@ -25,6 +25,10 @@ export const allModes = {
 		globalColourScheme: 'horizontal',
 		viewport: breakpoints.tablet,
 	},
+	'horizontal leftCol': {
+		globalColourScheme: 'horizontal',
+		viewport: breakpoints.leftCol,
+	},
 	'vertical mobile': {
 		globalColourScheme: 'vertical',
 		viewport: breakpoints.mobile,

dotcom-rendering/cdk/bin/cdk.ts

@@ -28,8 +28,8 @@ new RenderingCDKStack(cdkApp, 'ArticleRendering-PROD', {
 	stage: 'PROD',
 	domainName: 'article-rendering.guardianapis.com',
 	scaling: {
-		minimumInstances: 30,
-		maximumInstances: 300,
+		minimumInstances: 27,
+		maximumInstances: 270,
 		policies: {
 			step: {
 				cpu: cpuScalingSteps,

dotcom-rendering/fixtures/manual/footballData.ts

@@ -0,0 +1,126 @@
+import type { Nations } from '../../src/components/FootballCompetitionSelect';
+import type { FootballMatches } from '../../src/footballMatches';
+
+export const nations: Nations = [
+	{
+		name: 'England',
+		competitions: [
+			{ tag: 'football/premierleague', name: 'Premier League' },
+			{ tag: 'football/championship', name: 'Championship' },
+		],
+	},
+	{
+		name: 'Scotland',
+		competitions: [
+			{
+				tag: 'football/scottish-premiership',
+				name: 'Scottish Premiership',
+			},
+		],
+	},
+];
+
+export const initialDays: FootballMatches = [
+	{
+		date: new Date('2022-01-01T00:00:00Z'),
+		competitions: [
+			{
+				competitionId: '635',
+				tag: 'football/serieafootball',
+				name: 'Serie A',
+				nation: 'European',
+				matches: [
+					{
+						kind: 'Live',
+						dateTime: new Date('2022-01-01T11:11:00Z'),
+						paId: '4482093',
+						homeTeam: {
+							name: 'Torino',
+							score: 10,
+						},
+						awayTeam: {
+							name: 'Cagliari',
+							score: 0,
+						},
+						status: '1st',
+					},
+					{
+						kind: 'Fixture',
+						dateTime: new Date('2022-01-01T19:45:00Z'),
+						paId: '4482890',
+						homeTeam: 'Auxerre',
+						awayTeam: 'St Etienne',
+					},
+				],
+			},
+			{
+				competitionId: '650',
+				tag: 'football/laligafootball',
+				name: 'La Liga',
+				nation: 'European',
+				matches: [
+					{
+						kind: 'Result',
+						dateTime: new Date('2022-01-01T20:00:00Z'),
+						paId: '4482835',
+						homeTeam: {
+							name: 'Las Palmas',
+							score: 2,
+						},
+						awayTeam: {
+							name: 'Osasuna',
+							score: 3,
+						},
+						comment: 'AET',
+					},
+				],
+			},
+			{
+				competitionId: '651',
+				tag: 'football/fa-cup',
+				name: 'FA Cup',
+				nation: 'European',
+				matches: [
+					{
+						kind: 'Result',
+						dateTime: new Date('2022-01-01T20:00:00Z'),
+						paId: '4482836',
+						homeTeam: {
+							name: 'Brighton & Hove Albion Women',
+							score: 1,
+						},
+						awayTeam: {
+							name: 'Crystal Palace Women',
+							score: 1,
+						},
+						comment:
+							'Brighton & Hove Albion Women won 4 - 3 on penalties...',
+					},
+				],
+			},
+		],
+	},
+];
+
+export const moreDays: FootballMatches = [
+	{
+		date: new Date('2022-01-05T00:00:00Z'),
+		competitions: [
+			{
+				competitionId: '635',
+				tag: 'football/serieafootball',
+				name: 'Serie A',
+				nation: 'European',
+				matches: [
+					{
+						kind: 'Fixture',
+						dateTime: new Date('2022-01-05T19:45:00Z'),
+						paId: '4482890',
+						homeTeam: 'Juventus',
+						awayTeam: 'Roma',
+					},
+				],
+			},
+		],
+	},
+];