From b04b85535d935499c07dbee3564c47fd106f7d40 Mon Sep 17 00:00:00 2001 From: Natassja Blore Date: Thu, 10 Oct 2024 09:30:21 +0100 Subject: [PATCH 1/4] chore: add cooking subject icon to map --- src/image-map.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/image-map.ts b/src/image-map.ts index 70782e30..482bc0f2 100644 --- a/src/image-map.ts +++ b/src/image-map.ts @@ -70,6 +70,7 @@ export const icons = { "subject-computing": "subject-icons/computing.svg", "subject-computer-science": "subject-icons/computing.svg", "subject-core-computing": "subject-icons/computing.svg", + "subject-cooking-nutrition": "subject-icons/cooking-nutrition.svg", "subject-computing-non-gcse": "subject-icons/computing.svg", "subject-creative-arts": "subject-icons/creative-arts.svg", "subject-design-technology": "subject-icons/design-technology.svg", From 31885b1c332ee3fa90196a802295dbc1a8a1d3ec Mon Sep 17 00:00:00 2001 From: Natassja Blore Date: Thu, 10 Oct 2024 11:22:07 +0100 Subject: [PATCH 2/4] chore: add swimming icon to map --- src/image-map.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/image-map.ts b/src/image-map.ts index 482bc0f2..3b0296f9 100644 --- a/src/image-map.ts +++ b/src/image-map.ts @@ -119,6 +119,7 @@ export const icons = { "subject-occupational-therapy": "subject-icons/therapy.svg", "subject-understanding-the-world": "subject-icons/understanding-the-world.svg", + swimming: "subject-icons/swimming.svg", "homepage-robot-waving": "v1725896980/homepage/robot_waving_malpc3.svg", "homepage-three-pupils": "v1725877472/homepage/image-students_g0jtxe.svg", "homepage-teacher": "v1725882091/homepage/teacher-carrying-stuff_gab2ec.svg", From e989ce5c66933575f6c896358180235fc04b75dc Mon Sep 17 00:00:00 2001 From: Natassja Blore Date: Thu, 10 Oct 2024 11:33:42 +0100 Subject: [PATCH 3/4] test: update tests --- .../OakCloudinaryImage/OakCloudinaryImage.test.tsx | 12 ++++++------ .../__snapshots__/OakCloudinaryImage.test.tsx.snap | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/components/atoms/OakCloudinaryImage/OakCloudinaryImage.test.tsx b/src/components/atoms/OakCloudinaryImage/OakCloudinaryImage.test.tsx index 899a91c4..99da1158 100644 --- a/src/components/atoms/OakCloudinaryImage/OakCloudinaryImage.test.tsx +++ b/src/components/atoms/OakCloudinaryImage/OakCloudinaryImage.test.tsx @@ -34,7 +34,7 @@ describe(OakCloudinaryImage, () => { ); expect(getByRole("img").getAttribute("src")).toMatch( - "https://res.cloudinary.com/mock-cloudinary-cloud/image/upload/c_limit,w_3840/fl_keep_attribution/f_auto/q_auto/v1608635688/image.jpg?_a=BAVAfVDW0", + "https://res.cloudinary.com/mock-cloudinary-cloud/image/upload/c_limit,w_3840/fl_keep_attribution/f_auto/q_auto/v1608635688/image.jpg?_a=BAVAfVAO0", ); }); @@ -47,7 +47,7 @@ describe(OakCloudinaryImage, () => { ); expect(getByRole("img").getAttribute("src")).toMatch( - "https://res.cloudinary.com/mock-cloudinary-cloud/image/upload/c_limit,w_3840/fl_keep_attribution/f_auto/q_auto/v1608635688/image.jpg?_a=BAVAfVDW0", + "https://res.cloudinary.com/mock-cloudinary-cloud/image/upload/c_limit,w_3840/fl_keep_attribution/f_auto/q_auto/v1608635688/image.jpg?_a=BAVAfVAO0", ); }); @@ -60,7 +60,7 @@ describe(OakCloudinaryImage, () => { ); expect(getByRole("img").getAttribute("src")).toMatch( - "https://res.cloudinary.com/mock-cloudinary-cloud/image/upload/c_limit,w_3840/fl_keep_attribution/f_auto/q_auto/v1608635688/image?_a=BAVAfVDW0", + "https://res.cloudinary.com/mock-cloudinary-cloud/image/upload/c_limit,w_3840/fl_keep_attribution/f_auto/q_auto/v1608635688/image?_a=BAVAfVAO0", ); }); @@ -73,7 +73,7 @@ describe(OakCloudinaryImage, () => { ); expect(getByRole("img").getAttribute("src")).toMatch( - "https://res.cloudinary.com/mock-cloudinary-cloud/image/upload/v1608635688/image?_a=BAVAfVDW0", + "https://res.cloudinary.com/mock-cloudinary-cloud/image/upload/v1608635688/image?_a=BAVAfVAO0", ); }); @@ -98,7 +98,7 @@ describe(OakCloudinaryImage, () => { ); expect(getByRole("img").getAttribute("src")).toMatch( - "https://private-cloudinary-cloud-res.cloudinary.com/image/upload/c_limit,w_3840/fl_keep_attribution/f_auto/q_auto/v1608635688/image.jpg?_a=BAVAfVDW0", + "https://private-cloudinary-cloud-res.cloudinary.com/image/upload/c_limit,w_3840/fl_keep_attribution/f_auto/q_auto/v1608635688/image.jpg?_a=BAVAfVAO0", ); }); @@ -122,7 +122,7 @@ describe(OakCloudinaryImage, () => { ); expect(getByRole("img").getAttribute("src")).toMatch( - "https://private-cloudinary-cloud-res.cloudinary.com/image/upload/c_limit,w_3840/fl_keep_attribution/f_auto/q_auto/v1608635688/image.jpg?_a=BAVAfVDW0", + "https://private-cloudinary-cloud-res.cloudinary.com/image/upload/c_limit,w_3840/fl_keep_attribution/f_auto/q_auto/v1608635688/image.jpg?_a=BAVAfVAO0", ); }); }); diff --git a/src/components/atoms/OakCloudinaryImage/__snapshots__/OakCloudinaryImage.test.tsx.snap b/src/components/atoms/OakCloudinaryImage/__snapshots__/OakCloudinaryImage.test.tsx.snap index 782b1b6d..7ae84d89 100644 --- a/src/components/atoms/OakCloudinaryImage/__snapshots__/OakCloudinaryImage.test.tsx.snap +++ b/src/components/atoms/OakCloudinaryImage/__snapshots__/OakCloudinaryImage.test.tsx.snap @@ -23,8 +23,8 @@ exports[`OakCloudinaryImage matches snapshot 1`] = ` onError={[Function]} onLoad={[Function]} sizes="100vw" - src="https://res.cloudinary.com/mock-cloudinary-cloud/image/upload/c_limit,w_3840/fl_keep_attribution/f_auto/q_auto/v1688316547/xqvnpdqx9u2awiykyb8s.jpg?_a=BAVAfVDW0" - srcSet="https://res.cloudinary.com/mock-cloudinary-cloud/image/upload/c_limit,w_640/fl_keep_attribution/f_auto/q_auto/v1688316547/xqvnpdqx9u2awiykyb8s.jpg?_a=BAVAfVDW0 640w, https://res.cloudinary.com/mock-cloudinary-cloud/image/upload/c_limit,w_750/fl_keep_attribution/f_auto/q_auto/v1688316547/xqvnpdqx9u2awiykyb8s.jpg?_a=BAVAfVDW0 750w, https://res.cloudinary.com/mock-cloudinary-cloud/image/upload/c_limit,w_828/fl_keep_attribution/f_auto/q_auto/v1688316547/xqvnpdqx9u2awiykyb8s.jpg?_a=BAVAfVDW0 828w, https://res.cloudinary.com/mock-cloudinary-cloud/image/upload/c_limit,w_1080/fl_keep_attribution/f_auto/q_auto/v1688316547/xqvnpdqx9u2awiykyb8s.jpg?_a=BAVAfVDW0 1080w, https://res.cloudinary.com/mock-cloudinary-cloud/image/upload/c_limit,w_1200/fl_keep_attribution/f_auto/q_auto/v1688316547/xqvnpdqx9u2awiykyb8s.jpg?_a=BAVAfVDW0 1200w, https://res.cloudinary.com/mock-cloudinary-cloud/image/upload/c_limit,w_1920/fl_keep_attribution/f_auto/q_auto/v1688316547/xqvnpdqx9u2awiykyb8s.jpg?_a=BAVAfVDW0 1920w, https://res.cloudinary.com/mock-cloudinary-cloud/image/upload/c_limit,w_2048/fl_keep_attribution/f_auto/q_auto/v1688316547/xqvnpdqx9u2awiykyb8s.jpg?_a=BAVAfVDW0 2048w, https://res.cloudinary.com/mock-cloudinary-cloud/image/upload/c_limit,w_3840/fl_keep_attribution/f_auto/q_auto/v1688316547/xqvnpdqx9u2awiykyb8s.jpg?_a=BAVAfVDW0 3840w" + src="https://res.cloudinary.com/mock-cloudinary-cloud/image/upload/c_limit,w_3840/fl_keep_attribution/f_auto/q_auto/v1688316547/xqvnpdqx9u2awiykyb8s.jpg?_a=BAVAfVAO0" + srcSet="https://res.cloudinary.com/mock-cloudinary-cloud/image/upload/c_limit,w_640/fl_keep_attribution/f_auto/q_auto/v1688316547/xqvnpdqx9u2awiykyb8s.jpg?_a=BAVAfVAO0 640w, https://res.cloudinary.com/mock-cloudinary-cloud/image/upload/c_limit,w_750/fl_keep_attribution/f_auto/q_auto/v1688316547/xqvnpdqx9u2awiykyb8s.jpg?_a=BAVAfVAO0 750w, https://res.cloudinary.com/mock-cloudinary-cloud/image/upload/c_limit,w_828/fl_keep_attribution/f_auto/q_auto/v1688316547/xqvnpdqx9u2awiykyb8s.jpg?_a=BAVAfVAO0 828w, https://res.cloudinary.com/mock-cloudinary-cloud/image/upload/c_limit,w_1080/fl_keep_attribution/f_auto/q_auto/v1688316547/xqvnpdqx9u2awiykyb8s.jpg?_a=BAVAfVAO0 1080w, https://res.cloudinary.com/mock-cloudinary-cloud/image/upload/c_limit,w_1200/fl_keep_attribution/f_auto/q_auto/v1688316547/xqvnpdqx9u2awiykyb8s.jpg?_a=BAVAfVAO0 1200w, https://res.cloudinary.com/mock-cloudinary-cloud/image/upload/c_limit,w_1920/fl_keep_attribution/f_auto/q_auto/v1688316547/xqvnpdqx9u2awiykyb8s.jpg?_a=BAVAfVAO0 1920w, https://res.cloudinary.com/mock-cloudinary-cloud/image/upload/c_limit,w_2048/fl_keep_attribution/f_auto/q_auto/v1688316547/xqvnpdqx9u2awiykyb8s.jpg?_a=BAVAfVAO0 2048w, https://res.cloudinary.com/mock-cloudinary-cloud/image/upload/c_limit,w_3840/fl_keep_attribution/f_auto/q_auto/v1688316547/xqvnpdqx9u2awiykyb8s.jpg?_a=BAVAfVAO0 3840w" style={ { "bottom": 0, From ca5171f30830ac6535c5bcd29e61b8835600cc27 Mon Sep 17 00:00:00 2001 From: Natassja Blore Date: Thu, 10 Oct 2024 13:12:49 +0100 Subject: [PATCH 4/4] Revert "test: update tests" This reverts commit e989ce5c66933575f6c896358180235fc04b75dc. --- .../OakCloudinaryImage/OakCloudinaryImage.test.tsx | 12 ++++++------ .../__snapshots__/OakCloudinaryImage.test.tsx.snap | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/components/atoms/OakCloudinaryImage/OakCloudinaryImage.test.tsx b/src/components/atoms/OakCloudinaryImage/OakCloudinaryImage.test.tsx index 99da1158..899a91c4 100644 --- a/src/components/atoms/OakCloudinaryImage/OakCloudinaryImage.test.tsx +++ b/src/components/atoms/OakCloudinaryImage/OakCloudinaryImage.test.tsx @@ -34,7 +34,7 @@ describe(OakCloudinaryImage, () => { ); expect(getByRole("img").getAttribute("src")).toMatch( - "https://res.cloudinary.com/mock-cloudinary-cloud/image/upload/c_limit,w_3840/fl_keep_attribution/f_auto/q_auto/v1608635688/image.jpg?_a=BAVAfVAO0", + "https://res.cloudinary.com/mock-cloudinary-cloud/image/upload/c_limit,w_3840/fl_keep_attribution/f_auto/q_auto/v1608635688/image.jpg?_a=BAVAfVDW0", ); }); @@ -47,7 +47,7 @@ describe(OakCloudinaryImage, () => { ); expect(getByRole("img").getAttribute("src")).toMatch( - "https://res.cloudinary.com/mock-cloudinary-cloud/image/upload/c_limit,w_3840/fl_keep_attribution/f_auto/q_auto/v1608635688/image.jpg?_a=BAVAfVAO0", + "https://res.cloudinary.com/mock-cloudinary-cloud/image/upload/c_limit,w_3840/fl_keep_attribution/f_auto/q_auto/v1608635688/image.jpg?_a=BAVAfVDW0", ); }); @@ -60,7 +60,7 @@ describe(OakCloudinaryImage, () => { ); expect(getByRole("img").getAttribute("src")).toMatch( - "https://res.cloudinary.com/mock-cloudinary-cloud/image/upload/c_limit,w_3840/fl_keep_attribution/f_auto/q_auto/v1608635688/image?_a=BAVAfVAO0", + "https://res.cloudinary.com/mock-cloudinary-cloud/image/upload/c_limit,w_3840/fl_keep_attribution/f_auto/q_auto/v1608635688/image?_a=BAVAfVDW0", ); }); @@ -73,7 +73,7 @@ describe(OakCloudinaryImage, () => { ); expect(getByRole("img").getAttribute("src")).toMatch( - "https://res.cloudinary.com/mock-cloudinary-cloud/image/upload/v1608635688/image?_a=BAVAfVAO0", + "https://res.cloudinary.com/mock-cloudinary-cloud/image/upload/v1608635688/image?_a=BAVAfVDW0", ); }); @@ -98,7 +98,7 @@ describe(OakCloudinaryImage, () => { ); expect(getByRole("img").getAttribute("src")).toMatch( - "https://private-cloudinary-cloud-res.cloudinary.com/image/upload/c_limit,w_3840/fl_keep_attribution/f_auto/q_auto/v1608635688/image.jpg?_a=BAVAfVAO0", + "https://private-cloudinary-cloud-res.cloudinary.com/image/upload/c_limit,w_3840/fl_keep_attribution/f_auto/q_auto/v1608635688/image.jpg?_a=BAVAfVDW0", ); }); @@ -122,7 +122,7 @@ describe(OakCloudinaryImage, () => { ); expect(getByRole("img").getAttribute("src")).toMatch( - "https://private-cloudinary-cloud-res.cloudinary.com/image/upload/c_limit,w_3840/fl_keep_attribution/f_auto/q_auto/v1608635688/image.jpg?_a=BAVAfVAO0", + "https://private-cloudinary-cloud-res.cloudinary.com/image/upload/c_limit,w_3840/fl_keep_attribution/f_auto/q_auto/v1608635688/image.jpg?_a=BAVAfVDW0", ); }); }); diff --git a/src/components/atoms/OakCloudinaryImage/__snapshots__/OakCloudinaryImage.test.tsx.snap b/src/components/atoms/OakCloudinaryImage/__snapshots__/OakCloudinaryImage.test.tsx.snap index 7ae84d89..782b1b6d 100644 --- a/src/components/atoms/OakCloudinaryImage/__snapshots__/OakCloudinaryImage.test.tsx.snap +++ b/src/components/atoms/OakCloudinaryImage/__snapshots__/OakCloudinaryImage.test.tsx.snap @@ -23,8 +23,8 @@ exports[`OakCloudinaryImage matches snapshot 1`] = ` onError={[Function]} onLoad={[Function]} sizes="100vw" - src="https://res.cloudinary.com/mock-cloudinary-cloud/image/upload/c_limit,w_3840/fl_keep_attribution/f_auto/q_auto/v1688316547/xqvnpdqx9u2awiykyb8s.jpg?_a=BAVAfVAO0" - srcSet="https://res.cloudinary.com/mock-cloudinary-cloud/image/upload/c_limit,w_640/fl_keep_attribution/f_auto/q_auto/v1688316547/xqvnpdqx9u2awiykyb8s.jpg?_a=BAVAfVAO0 640w, https://res.cloudinary.com/mock-cloudinary-cloud/image/upload/c_limit,w_750/fl_keep_attribution/f_auto/q_auto/v1688316547/xqvnpdqx9u2awiykyb8s.jpg?_a=BAVAfVAO0 750w, https://res.cloudinary.com/mock-cloudinary-cloud/image/upload/c_limit,w_828/fl_keep_attribution/f_auto/q_auto/v1688316547/xqvnpdqx9u2awiykyb8s.jpg?_a=BAVAfVAO0 828w, https://res.cloudinary.com/mock-cloudinary-cloud/image/upload/c_limit,w_1080/fl_keep_attribution/f_auto/q_auto/v1688316547/xqvnpdqx9u2awiykyb8s.jpg?_a=BAVAfVAO0 1080w, https://res.cloudinary.com/mock-cloudinary-cloud/image/upload/c_limit,w_1200/fl_keep_attribution/f_auto/q_auto/v1688316547/xqvnpdqx9u2awiykyb8s.jpg?_a=BAVAfVAO0 1200w, https://res.cloudinary.com/mock-cloudinary-cloud/image/upload/c_limit,w_1920/fl_keep_attribution/f_auto/q_auto/v1688316547/xqvnpdqx9u2awiykyb8s.jpg?_a=BAVAfVAO0 1920w, https://res.cloudinary.com/mock-cloudinary-cloud/image/upload/c_limit,w_2048/fl_keep_attribution/f_auto/q_auto/v1688316547/xqvnpdqx9u2awiykyb8s.jpg?_a=BAVAfVAO0 2048w, https://res.cloudinary.com/mock-cloudinary-cloud/image/upload/c_limit,w_3840/fl_keep_attribution/f_auto/q_auto/v1688316547/xqvnpdqx9u2awiykyb8s.jpg?_a=BAVAfVAO0 3840w" + src="https://res.cloudinary.com/mock-cloudinary-cloud/image/upload/c_limit,w_3840/fl_keep_attribution/f_auto/q_auto/v1688316547/xqvnpdqx9u2awiykyb8s.jpg?_a=BAVAfVDW0" + srcSet="https://res.cloudinary.com/mock-cloudinary-cloud/image/upload/c_limit,w_640/fl_keep_attribution/f_auto/q_auto/v1688316547/xqvnpdqx9u2awiykyb8s.jpg?_a=BAVAfVDW0 640w, https://res.cloudinary.com/mock-cloudinary-cloud/image/upload/c_limit,w_750/fl_keep_attribution/f_auto/q_auto/v1688316547/xqvnpdqx9u2awiykyb8s.jpg?_a=BAVAfVDW0 750w, https://res.cloudinary.com/mock-cloudinary-cloud/image/upload/c_limit,w_828/fl_keep_attribution/f_auto/q_auto/v1688316547/xqvnpdqx9u2awiykyb8s.jpg?_a=BAVAfVDW0 828w, https://res.cloudinary.com/mock-cloudinary-cloud/image/upload/c_limit,w_1080/fl_keep_attribution/f_auto/q_auto/v1688316547/xqvnpdqx9u2awiykyb8s.jpg?_a=BAVAfVDW0 1080w, https://res.cloudinary.com/mock-cloudinary-cloud/image/upload/c_limit,w_1200/fl_keep_attribution/f_auto/q_auto/v1688316547/xqvnpdqx9u2awiykyb8s.jpg?_a=BAVAfVDW0 1200w, https://res.cloudinary.com/mock-cloudinary-cloud/image/upload/c_limit,w_1920/fl_keep_attribution/f_auto/q_auto/v1688316547/xqvnpdqx9u2awiykyb8s.jpg?_a=BAVAfVDW0 1920w, https://res.cloudinary.com/mock-cloudinary-cloud/image/upload/c_limit,w_2048/fl_keep_attribution/f_auto/q_auto/v1688316547/xqvnpdqx9u2awiykyb8s.jpg?_a=BAVAfVDW0 2048w, https://res.cloudinary.com/mock-cloudinary-cloud/image/upload/c_limit,w_3840/fl_keep_attribution/f_auto/q_auto/v1688316547/xqvnpdqx9u2awiykyb8s.jpg?_a=BAVAfVDW0 3840w" style={ { "bottom": 0,