From c40268cb94d65cf2b6861b2802a50f38ca43eb49 Mon Sep 17 00:00:00 2001 From: Kevin Koech Date: Fri, 1 Dec 2023 09:04:24 +0300 Subject: [PATCH 01/18] Add column for collection to tools, organisation and contributors. --- .../data/common/processPageContributors.js | 20 ++++++++++- .../data/common/processPageOrganisations.js | 20 ++++++++++- .../src/lib/data/common/processPageTools.js | 21 ++++++++++- .../src/lib/ecosystem/airtable/processData.js | 9 +++++ .../src/payload/blocks/Contributors.js | 4 +++ .../src/payload/blocks/Organisations.js | 4 +++ .../charterafrica/src/payload/blocks/Tools.js | 4 +++ .../src/payload/collections/Contributors.js | 9 +++++ .../src/payload/collections/Organisations.js | 9 +++++ .../src/payload/collections/Tools.js | 9 +++++ .../src/payload/globals/Ecosystem.js | 36 +++++++++++++++++++ .../src/utils/translationConstants.js | 3 ++ 12 files changed, 145 insertions(+), 3 deletions(-) diff --git a/apps/charterafrica/src/lib/data/common/processPageContributors.js b/apps/charterafrica/src/lib/data/common/processPageContributors.js index 3eda7a1c5..e5ed88c6e 100644 --- a/apps/charterafrica/src/lib/data/common/processPageContributors.js +++ b/apps/charterafrica/src/lib/data/common/processPageContributors.js @@ -8,7 +8,7 @@ import formatDateTime from "@/charterafrica/utils/formatDate"; import labelsPerLocale from "@/charterafrica/utils/translationConstants"; const queryBuilder = (query) => { - const { search, location } = query; + const { search, location, contributorCollection } = query; const fields = ["description", "fullName", "location", "externalId"]; const where = {}; if (search) { @@ -17,6 +17,9 @@ const queryBuilder = (query) => { if (location) { where.location = { equals: location }; } + if (contributorCollection) { + where.contributorCollection = { equals: contributorCollection }; + } return where; }; @@ -128,6 +131,12 @@ async function processPageContributors(page, api, context) { } const { filters, title } = blocks[foundIndex]; const filterLabels = labelsPerLocale[locale]; + const collections = [ + ...new Set(results.map((item) => item.contributorCollection)), + ].map((value) => ({ + value: value ?? null, + label: value ?? null, + })); const filterOptions = filters?.map((filter) => { if (filter === "sort") { @@ -154,6 +163,15 @@ async function processPageContributors(page, api, context) { })), }; } + if (filter === "contributorCollection") { + return { + type: "select", + name: "contributorCollection", + label: filterLabels.collection, + multiple: true, + options: collections, + }; + } return null; }) ?? []; const people = { diff --git a/apps/charterafrica/src/lib/data/common/processPageOrganisations.js b/apps/charterafrica/src/lib/data/common/processPageOrganisations.js index bc6cdec7c..7556baa38 100644 --- a/apps/charterafrica/src/lib/data/common/processPageOrganisations.js +++ b/apps/charterafrica/src/lib/data/common/processPageOrganisations.js @@ -5,7 +5,7 @@ import formatDateTime from "@/charterafrica/utils/formatDate"; import labelsPerLocale from "@/charterafrica/utils/translationConstants"; const queryBuilder = (query) => { - const { search, location } = query; + const { search, location, organisationCollection } = query; const fields = ["description", "location", "name", "externalId", "slug"]; const where = {}; if (search) { @@ -14,6 +14,9 @@ const queryBuilder = (query) => { if (location) { where.location = { equals: location }; } + if (organisationCollection) { + where.organisationCollection = { equals: organisationCollection }; + } return where; }; @@ -117,6 +120,12 @@ async function processPageOrganisations(page, api, context) { } const { filters, title } = blocks[foundIndex]; const filterLabels = labelsPerLocale[locale]; + const collections = [ + ...new Set(results.map((item) => item.organisationCollection)), + ].map((value) => ({ + value: value ?? null, + label: value ?? null, + })); const filterOptions = filters?.map((filter) => { if (filter === "sort") { @@ -143,6 +152,15 @@ async function processPageOrganisations(page, api, context) { })), }; } + if (filter === "organisationCollection") { + return { + type: "select", + name: "organisationCollection", + label: filterLabels.collection, + multiple: true, + options: collections, + }; + } return null; }) ?? []; diff --git a/apps/charterafrica/src/lib/data/common/processPageTools.js b/apps/charterafrica/src/lib/data/common/processPageTools.js index 554bbc8a9..da39b1e83 100644 --- a/apps/charterafrica/src/lib/data/common/processPageTools.js +++ b/apps/charterafrica/src/lib/data/common/processPageTools.js @@ -8,7 +8,7 @@ import formatDateTime from "@/charterafrica/utils/formatDate"; import labelsPerLocale from "@/charterafrica/utils/translationConstants"; const queryBuilder = (query) => { - const { search, theme, homeCountry } = query; + const { search, theme, homeCountry, toolCollection } = query; const where = {}; if (search) { const fields = [ @@ -19,6 +19,7 @@ const queryBuilder = (query) => { "id", "slug", "homeCountry", + "toolCollection", ]; where.or = fields.map((field) => ({ [field]: { like: search } })); } @@ -30,6 +31,9 @@ const queryBuilder = (query) => { if (theme) { where.theme = { equals: theme }; } + if (toolCollection) { + where.toolCollection = { equals: toolCollection }; + } return where; }; @@ -159,6 +163,12 @@ async function processPageTools(page, api, context) { value, label: value, })); + const collections = [...new Set(docs.map((item) => item.toolCollection))].map( + (value) => ({ + value: value ?? null, + label: value ?? null, + }), + ); const filterLabels = labelsPerLocale[locale]; const filterOptions = filters.map((filter) => { if (filter === "sort") { @@ -197,6 +207,15 @@ async function processPageTools(page, api, context) { options: themes, }; } + if (filter === "toolCollection") { + return { + type: "select", + name: "toolCollection", + label: filterLabels.collection, + multiple: true, + options: collections, + }; + } return null; }); const tool = { diff --git a/apps/charterafrica/src/lib/ecosystem/airtable/processData.js b/apps/charterafrica/src/lib/ecosystem/airtable/processData.js index fd78b2de3..c0c0502ab 100644 --- a/apps/charterafrica/src/lib/ecosystem/airtable/processData.js +++ b/apps/charterafrica/src/lib/ecosystem/airtable/processData.js @@ -124,6 +124,7 @@ export function processTool(item, config, { partnersData }) { link: getValue(data, toolTableColumns.url), operatingCountries, contributors: getValue(data, toolTableColumns.contributors), + toolCollection: getValue(data, toolTableColumns.toolCollection), source, supporters, partners, @@ -168,6 +169,10 @@ export function processContributor(item, config) { ); return { airtableId: data.id, + contributorCollection: getValue( + data, + contributorTableColumns.contributorCollection, + ), externalId, repoLink, socialMedia, @@ -231,6 +236,10 @@ export function processOrganisation(item, config, { partnersData }) { externalId, type: getValue(data, organisationTableColumns.type)?.replace(/&/g, "and"), repoLink: getValue(data, organisationTableColumns.source.url), + organisationCollection: getValue( + data, + organisationTableColumns.organisationCollection, + ), supporters, partners, socialMedia, diff --git a/apps/charterafrica/src/payload/blocks/Contributors.js b/apps/charterafrica/src/payload/blocks/Contributors.js index a72f8f8b1..d10e77d5b 100644 --- a/apps/charterafrica/src/payload/blocks/Contributors.js +++ b/apps/charterafrica/src/payload/blocks/Contributors.js @@ -35,6 +35,10 @@ const Contributors = { fr: "Emplacement", }, }, + { + value: "contributorCollection", + label: { en: "Collection", fr: "Collection", pt: "Collection" }, + }, ], }, { diff --git a/apps/charterafrica/src/payload/blocks/Organisations.js b/apps/charterafrica/src/payload/blocks/Organisations.js index 5d022f04b..70e4d7148 100644 --- a/apps/charterafrica/src/payload/blocks/Organisations.js +++ b/apps/charterafrica/src/payload/blocks/Organisations.js @@ -35,6 +35,10 @@ const Contributors = { fr: "Emplacement", }, }, + { + value: "organisationCollection", + label: { en: "Collection", fr: "Collection", pt: "Collection" }, + }, ], }, { diff --git a/apps/charterafrica/src/payload/blocks/Tools.js b/apps/charterafrica/src/payload/blocks/Tools.js index 1cd7ca431..14fe92f11 100644 --- a/apps/charterafrica/src/payload/blocks/Tools.js +++ b/apps/charterafrica/src/payload/blocks/Tools.js @@ -51,6 +51,10 @@ const Tools = { fr: "Emplacement", }, }, + { + value: "toolCollection", + label: { en: "Collection", fr: "Collection", pt: "Collection" }, + }, ], }, ], diff --git a/apps/charterafrica/src/payload/collections/Contributors.js b/apps/charterafrica/src/payload/collections/Contributors.js index d2215920e..42dd50fc7 100644 --- a/apps/charterafrica/src/payload/collections/Contributors.js +++ b/apps/charterafrica/src/payload/collections/Contributors.js @@ -48,6 +48,15 @@ const Contributors = { readOnly: true, }, }, + { + name: "contributorCollection", + type: "text", + admin: { + readOnly: true, + }, + localized: true, + label: { en: "Collection", fr: "Collection", pt: "Collection" }, + }, { name: "description", type: "textarea", diff --git a/apps/charterafrica/src/payload/collections/Organisations.js b/apps/charterafrica/src/payload/collections/Organisations.js index 286ae7a6a..e45f97356 100644 --- a/apps/charterafrica/src/payload/collections/Organisations.js +++ b/apps/charterafrica/src/payload/collections/Organisations.js @@ -46,6 +46,15 @@ const Organisations = { readOnly: true, }, }, + { + name: "organisationCollection", + type: "text", + admin: { + readOnly: true, + }, + localized: true, + label: { en: "Collection", fr: "Collection", pt: "Collection" }, + }, // Can either be Non-Profit, For- Profit, Donor/ Investor, Charter Grantee { name: "type", diff --git a/apps/charterafrica/src/payload/collections/Tools.js b/apps/charterafrica/src/payload/collections/Tools.js index dcfaa3027..305731a29 100644 --- a/apps/charterafrica/src/payload/collections/Tools.js +++ b/apps/charterafrica/src/payload/collections/Tools.js @@ -113,6 +113,15 @@ const Tools = { localized: true, label: { en: "Theme", fr: "Thème", pt: "Tema" }, }, + { + name: "toolCollection", + type: "text", + admin: { + readOnly: true, + }, + localized: true, + label: { en: "Collection", fr: "Collection", pt: "Collection" }, + }, { name: "techSkills", type: "array", diff --git a/apps/charterafrica/src/payload/globals/Ecosystem.js b/apps/charterafrica/src/payload/globals/Ecosystem.js index 7e64e63b2..bd220e96a 100644 --- a/apps/charterafrica/src/payload/globals/Ecosystem.js +++ b/apps/charterafrica/src/payload/globals/Ecosystem.js @@ -296,6 +296,18 @@ const Ecosystem = { }, }, }), + airtableColumnSelect({ + schema, + tableField: "toolTableId", + overrides: { + name: "toolCollection", + label: { + en: "Collection", + fr: "Collection", + pt: "Coleção", + }, + }, + }), socialMediaColumns({ schema, tableField: "toolTableId" }), ], }, @@ -421,6 +433,18 @@ const Ecosystem = { hideGutter: true, }, }, + airtableColumnSelect({ + schema, + tableField: "contributorTableId", + overrides: { + name: "contributorCollection", + label: { + en: "Collection", + fr: "Collection", + pt: "Coleção", + }, + }, + }), socialMediaColumns({ schema, tableField: "contributorTableId", @@ -561,6 +585,18 @@ const Ecosystem = { }, }, }), + airtableColumnSelect({ + schema, + tableField: "organisationTableId", + overrides: { + name: "organisationCollection", + label: { + en: "Collection", + fr: "Collection", + pt: "Coleção", + }, + }, + }), socialMediaColumns({ schema, tableField: "organisationTableId", diff --git a/apps/charterafrica/src/utils/translationConstants.js b/apps/charterafrica/src/utils/translationConstants.js index 76a597df9..84e1ab165 100644 --- a/apps/charterafrica/src/utils/translationConstants.js +++ b/apps/charterafrica/src/utils/translationConstants.js @@ -30,6 +30,7 @@ const labelsPerLocale = { discussions: "Discussions", lastCommit: "Last Commit", forks: "Forks", + collection: "Collection", }, fr: { topic: "Sujet A-Z", @@ -62,6 +63,7 @@ const labelsPerLocale = { discussions: "Discussions", lastCommit: "Dernier Commit", forks: "Forks", + collection: "Collection", }, pt: { topic: "Tópico A-Z", @@ -94,6 +96,7 @@ const labelsPerLocale = { discussions: "Discussões", lastCommit: "Último Commit", forks: "Forks", + collection: "Collection", }, }; From 12b5853f7aebd1cd81d4e41a52da0b158a18c819 Mon Sep 17 00:00:00 2001 From: Kevin Koech Date: Mon, 4 Dec 2023 14:52:02 +0300 Subject: [PATCH 02/18] Update Tool filters designs --- .../src/components/EcosystemList/EcosystemFilter.js | 5 +++-- apps/charterafrica/src/components/Tool/Tool.js | 3 ++- apps/charterafrica/src/lib/data/common/processPageTools.js | 1 + 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/apps/charterafrica/src/components/EcosystemList/EcosystemFilter.js b/apps/charterafrica/src/components/EcosystemList/EcosystemFilter.js index eb218ad16..b88fef26a 100644 --- a/apps/charterafrica/src/components/EcosystemList/EcosystemFilter.js +++ b/apps/charterafrica/src/components/EcosystemList/EcosystemFilter.js @@ -8,6 +8,7 @@ import { ControlledSearchInput } from "@/charterafrica/components/SearchInput"; const EcosystemFilter = React.forwardRef(function EcosystemFilter(props, ref) { const { onChange, searchPlaceholder, values, filterOptions = [] } = props; + const spans = 12 / (filterOptions.length + 2); return ( @@ -18,7 +19,7 @@ const EcosystemFilter = React.forwardRef(function EcosystemFilter(props, ref) { columnGap={1.25} rowGap={1.25} > - + onChange({ search: e.target.value })} @@ -39,7 +40,7 @@ const EcosystemFilter = React.forwardRef(function EcosystemFilter(props, ref) { onChange({ [option.name]: v }); }; return ( - + @@ -145,7 +146,7 @@ const Tool = React.forwardRef(function Tool(props, ref) { Collection - Tool + {collection} Date: Mon, 4 Dec 2023 14:53:32 +0300 Subject: [PATCH 03/18] Update ecosystem filters --- .../src/components/EcosystemList/EcosystemFilter.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/charterafrica/src/components/EcosystemList/EcosystemFilter.js b/apps/charterafrica/src/components/EcosystemList/EcosystemFilter.js index b88fef26a..c7475c9df 100644 --- a/apps/charterafrica/src/components/EcosystemList/EcosystemFilter.js +++ b/apps/charterafrica/src/components/EcosystemList/EcosystemFilter.js @@ -8,7 +8,7 @@ import { ControlledSearchInput } from "@/charterafrica/components/SearchInput"; const EcosystemFilter = React.forwardRef(function EcosystemFilter(props, ref) { const { onChange, searchPlaceholder, values, filterOptions = [] } = props; - const spans = 12 / (filterOptions.length + 2); + const spans = 12 / (filterOptions.length + 1.25); return ( From 18046e2159ec03b844a0feb7e07eedb9e722250c Mon Sep 17 00:00:00 2001 From: Clemence Kyara Date: Mon, 4 Dec 2023 08:58:08 +0300 Subject: [PATCH 04/18] Remove margin top --- .../src/components/OpportunityCard/OpportunityCard.js | 4 ++-- .../src/components/OpportunityCard/OpportunityCard.snap.js | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/codeforafrica/src/components/OpportunityCard/OpportunityCard.js b/apps/codeforafrica/src/components/OpportunityCard/OpportunityCard.js index b2d176481..77a385309 100644 --- a/apps/codeforafrica/src/components/OpportunityCard/OpportunityCard.js +++ b/apps/codeforafrica/src/components/OpportunityCard/OpportunityCard.js @@ -36,11 +36,11 @@ const OpportunityCard = React.forwardRef(function OpportunityCard(props, ref) { {publishedOn} - + {tags.map((tag) => tag.name).join(", ")} diff --git a/apps/codeforafrica/src/components/OpportunityCard/OpportunityCard.snap.js b/apps/codeforafrica/src/components/OpportunityCard/OpportunityCard.snap.js index f77719632..d92573d55 100644 --- a/apps/codeforafrica/src/components/OpportunityCard/OpportunityCard.snap.js +++ b/apps/codeforafrica/src/components/OpportunityCard/OpportunityCard.snap.js @@ -27,7 +27,7 @@ exports[` renders unchanged 1`] = ` class="MuiBox-root css-k008qs" >
Data Journalism
From 2230cc100b0a507966eded5ba6d028a72ccb9d4a Mon Sep 17 00:00:00 2001 From: Clemence Kyara Date: Mon, 4 Dec 2023 08:59:23 +0300 Subject: [PATCH 05/18] Fix vertical spacing and add hr --- .../NewsAndStories/NewsAndStories.js | 82 ++++++++++--------- .../NewsAndStories/NewsAndStories.snap.js | 5 +- 2 files changed, 48 insertions(+), 39 deletions(-) diff --git a/apps/codeforafrica/src/components/NewsAndStories/NewsAndStories.js b/apps/codeforafrica/src/components/NewsAndStories/NewsAndStories.js index 075f9d6ac..dbe7d7948 100644 --- a/apps/codeforafrica/src/components/NewsAndStories/NewsAndStories.js +++ b/apps/codeforafrica/src/components/NewsAndStories/NewsAndStories.js @@ -1,6 +1,6 @@ import { Section } from "@commons-ui/core"; import { Link, RichTypography } from "@commons-ui/next"; -import { Box, Button } from "@mui/material"; +import { Box, Button, Divider } from "@mui/material"; import React from "react"; import ArticleCardList from "@/codeforafrica/components/ArticleCardList"; @@ -16,47 +16,53 @@ const NewsAndStories = React.forwardRef(function NewsAndStories(props, ref) { title, } = props; return ( -
- +
- - {title} - - - - - -
+ + {title} + + + + + +
+ + ); }); diff --git a/apps/codeforafrica/src/components/NewsAndStories/NewsAndStories.snap.js b/apps/codeforafrica/src/components/NewsAndStories/NewsAndStories.snap.js index 675dc76a5..52fc3831c 100644 --- a/apps/codeforafrica/src/components/NewsAndStories/NewsAndStories.snap.js +++ b/apps/codeforafrica/src/components/NewsAndStories/NewsAndStories.snap.js @@ -3,7 +3,7 @@ exports[` renders unchanged 1`] = `
renders unchanged 1`] = `
+
`; From 7d5ca0398bb0b5aa14ac42faeba42f970a80b438 Mon Sep 17 00:00:00 2001 From: Clemence Kyara Date: Mon, 4 Dec 2023 09:00:43 +0300 Subject: [PATCH 06/18] Ensure members are sorted by name --- apps/codeforafrica/src/components/TeamMembers/TeamMembers.js | 4 ++-- apps/codeforafrica/src/lib/data/utils/members.js | 1 + apps/codeforafrica/src/payload/collections/Members.js | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/apps/codeforafrica/src/components/TeamMembers/TeamMembers.js b/apps/codeforafrica/src/components/TeamMembers/TeamMembers.js index ada1c8365..f745f308b 100644 --- a/apps/codeforafrica/src/components/TeamMembers/TeamMembers.js +++ b/apps/codeforafrica/src/components/TeamMembers/TeamMembers.js @@ -4,13 +4,13 @@ import React from "react"; import TeamMemberCardList from "@/codeforafrica/components/TeamMemberCardList"; const TeamMembers = React.forwardRef(function TeamMembers(props, ref) { - const { team, title } = props; + const { sx, team, title } = props; if (!team?.length) { return null; } return ( -
+
Date: Mon, 4 Dec 2023 09:02:53 +0300 Subject: [PATCH 07/18] Ensure horizontal spacing in mobile --- apps/codeforafrica/src/components/OurMission/OurMission.js | 1 + apps/codeforafrica/src/components/OurMission/OurMission.snap.js | 2 +- apps/codeforafrica/src/components/OurPartners/OurPartners.js | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/apps/codeforafrica/src/components/OurMission/OurMission.js b/apps/codeforafrica/src/components/OurMission/OurMission.js index 78da91361..f3fa1cbd1 100644 --- a/apps/codeforafrica/src/components/OurMission/OurMission.js +++ b/apps/codeforafrica/src/components/OurMission/OurMission.js @@ -13,6 +13,7 @@ const OurMission = React.forwardRef(function OurMission(props, ref) { return (
renders unchanged 1`] = `
Date: Mon, 4 Dec 2023 10:24:25 +0300 Subject: [PATCH 08/18] Update the close icon --- apps/codeforafrica/src/assets/close-button.svg | 1 - .../src/assets/icons/Type=x, Size=24, Color=CurrentColor.svg | 4 ++++ 2 files changed, 4 insertions(+), 1 deletion(-) delete mode 100644 apps/codeforafrica/src/assets/close-button.svg create mode 100644 apps/codeforafrica/src/assets/icons/Type=x, Size=24, Color=CurrentColor.svg diff --git a/apps/codeforafrica/src/assets/close-button.svg b/apps/codeforafrica/src/assets/close-button.svg deleted file mode 100644 index 90abe6074..000000000 --- a/apps/codeforafrica/src/assets/close-button.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/apps/codeforafrica/src/assets/icons/Type=x, Size=24, Color=CurrentColor.svg b/apps/codeforafrica/src/assets/icons/Type=x, Size=24, Color=CurrentColor.svg new file mode 100644 index 000000000..93fbad2f7 --- /dev/null +++ b/apps/codeforafrica/src/assets/icons/Type=x, Size=24, Color=CurrentColor.svg @@ -0,0 +1,4 @@ + + + + From 5e38e3aa30854ffa9b2125593bc82d313dd4eed1 Mon Sep 17 00:00:00 2001 From: Clemence Kyara Date: Mon, 4 Dec 2023 10:39:34 +0300 Subject: [PATCH 09/18] Update Twitter/X icon --- .../public/icons/Type=twitter, Size=32, Color=White.svg | 4 +--- .../icons/Type=twitter, Size=24, Color=CurrentColor.svg | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/apps/codeforafrica/public/icons/Type=twitter, Size=32, Color=White.svg b/apps/codeforafrica/public/icons/Type=twitter, Size=32, Color=White.svg index d8009fd1a..be940a322 100644 --- a/apps/codeforafrica/public/icons/Type=twitter, Size=32, Color=White.svg +++ b/apps/codeforafrica/public/icons/Type=twitter, Size=32, Color=White.svg @@ -1,3 +1 @@ - - - + \ No newline at end of file diff --git a/apps/codeforafrica/src/assets/icons/Type=twitter, Size=24, Color=CurrentColor.svg b/apps/codeforafrica/src/assets/icons/Type=twitter, Size=24, Color=CurrentColor.svg index cc56e4097..c56259497 100644 --- a/apps/codeforafrica/src/assets/icons/Type=twitter, Size=24, Color=CurrentColor.svg +++ b/apps/codeforafrica/src/assets/icons/Type=twitter, Size=24, Color=CurrentColor.svg @@ -1,3 +1,3 @@ - + From 3e0e9854115fc8c31d889b7427a07e01ecfd0988 Mon Sep 17 00:00:00 2001 From: Clemence Kyara Date: Mon, 4 Dec 2023 10:40:38 +0300 Subject: [PATCH 10/18] Ensure Dialog closes & use updated Twitter/X icon --- .../src/components/ArticlePage/ArticlePage.js | 1 + .../ArticlePage/ArticlePage.snap.js | 2 +- .../components/MobileNavBar/MobileNavBar.js | 39 ++++++++++++------- .../components/NavBarNavList/NavBarNavList.js | 33 ++++++++++++---- .../NavBarNavList/NavBarNavList.snap.js | 32 +++++++-------- .../OpportunityCardList.snap.js | 2 +- 6 files changed, 69 insertions(+), 40 deletions(-) diff --git a/apps/codeforafrica/src/components/ArticlePage/ArticlePage.js b/apps/codeforafrica/src/components/ArticlePage/ArticlePage.js index 5c2036269..4b77d7970 100644 --- a/apps/codeforafrica/src/components/ArticlePage/ArticlePage.js +++ b/apps/codeforafrica/src/components/ArticlePage/ArticlePage.js @@ -48,6 +48,7 @@ function ArticlePage({ md: "912px", }, px: { xs: 2.5, sm: 0 }, + pt: { xs: 2.5, md: 7.5 }, }} /> renders unchanged 1`] = ` />
({ background: "transparent", }, "& .MuiDialogContent-root": { - padding: spacing(2), + padding: spacing(5), color: palette.text.secondary, background: palette.primary.main, }, @@ -74,7 +81,7 @@ const MobileNavBar = React.forwardRef(function MobileNavBar(props, ref) { id="mobile-navbar-dialog" sx={{ m: 0, - p: 2, + p: 0, display: "flex", color: "inherit", justifyContent: "space-between", @@ -82,18 +89,20 @@ const MobileNavBar = React.forwardRef(function MobileNavBar(props, ref) { }} onClose={handleClose} > - - + + + diff --git a/apps/codeforafrica/src/components/NavBarNavList/NavBarNavList.js b/apps/codeforafrica/src/components/NavBarNavList/NavBarNavList.js index 26690d473..d475cfc43 100644 --- a/apps/codeforafrica/src/components/NavBarNavList/NavBarNavList.js +++ b/apps/codeforafrica/src/components/NavBarNavList/NavBarNavList.js @@ -22,7 +22,7 @@ const platformToIconMap = { }; const NavBarNavList = React.forwardRef(function NavBarNavList(props, ref) { - const { direction, menus, socialLinks, ...other } = props; + const { NavListItemProps, direction, menus, socialLinks, ...other } = props; if (!menus?.length) { return null; @@ -30,18 +30,27 @@ const NavBarNavList = React.forwardRef(function NavBarNavList(props, ref) { return ( {menus.map((item) => ( - + {item.label} @@ -54,13 +63,21 @@ const NavBarNavList = React.forwardRef(function NavBarNavList(props, ref) { return null; } return ( - - + + @@ -72,6 +89,7 @@ const NavBarNavList = React.forwardRef(function NavBarNavList(props, ref) { }); NavBarNavList.propTypes = { + NavListItemProps: PropTypes.shape({}), direction: PropTypes.string, menus: PropTypes.arrayOf( PropTypes.shape({ @@ -82,6 +100,7 @@ NavBarNavList.propTypes = { }; NavBarNavList.defaultProps = { + NavListItemProps: undefined, direction: undefined, menus: undefined, }; diff --git a/apps/codeforafrica/src/components/NavBarNavList/NavBarNavList.snap.js b/apps/codeforafrica/src/components/NavBarNavList/NavBarNavList.snap.js index 04f92734f..f8a76af77 100644 --- a/apps/codeforafrica/src/components/NavBarNavList/NavBarNavList.snap.js +++ b/apps/codeforafrica/src/components/NavBarNavList/NavBarNavList.snap.js @@ -6,84 +6,84 @@ exports[` renders unchanged 1`] = ` class="css-f15emd" >
  • Our Work
  • About
  • Stories
  • Opportunity
  • Contact
  • -
    - Tool -
    • Date: Mon, 4 Dec 2023 17:19:53 +0300 Subject: [PATCH 14/18] FIx filter by collection --- apps/charterafrica/src/components/Articles/Articles.snap.js | 1 - .../src/components/EcosystemList/EcosystemFilter.js | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/apps/charterafrica/src/components/Articles/Articles.snap.js b/apps/charterafrica/src/components/Articles/Articles.snap.js index 3fc7dfa88..7df6bc079 100644 --- a/apps/charterafrica/src/components/Articles/Articles.snap.js +++ b/apps/charterafrica/src/components/Articles/Articles.snap.js @@ -81,7 +81,6 @@ exports[` renders unchanged 1`] = ` aria-hidden="true" aria-invalid="false" class="MuiSelect-nativeInput css-yf8vq0-MuiSelect-nativeInput" - name=":r1:" tabindex="-1" value="-publishedOn" /> diff --git a/apps/charterafrica/src/components/EcosystemList/EcosystemFilter.js b/apps/charterafrica/src/components/EcosystemList/EcosystemFilter.js index c7475c9df..83eec3831 100644 --- a/apps/charterafrica/src/components/EcosystemList/EcosystemFilter.js +++ b/apps/charterafrica/src/components/EcosystemList/EcosystemFilter.js @@ -8,8 +8,7 @@ import { ControlledSearchInput } from "@/charterafrica/components/SearchInput"; const EcosystemFilter = React.forwardRef(function EcosystemFilter(props, ref) { const { onChange, searchPlaceholder, values, filterOptions = [] } = props; - const spans = 12 / (filterOptions.length + 1.25); - + const spans = Math.floor(9 / filterOptions.length); return ( - + onChange({ search: e.target.value })} From a036f6c4db8678a02c56bb0c4fc39e781ec031d7 Mon Sep 17 00:00:00 2001 From: Kevin Koech Date: Mon, 4 Dec 2023 17:56:36 +0300 Subject: [PATCH 15/18] Rename Collection to classification --- .../EcosystemList/EcosystemFilter.js | 2 +- .../charterafrica/src/components/Tool/Tool.js | 4 ++-- .../data/common/processPageContributors.js | 12 +++++----- .../data/common/processPageOrganisations.js | 14 +++++------ .../src/lib/data/common/processPageTools.js | 16 ++++++------- .../src/lib/ecosystem/airtable/processData.js | 12 +++------- .../src/payload/blocks/Contributors.js | 8 +++++-- .../src/payload/blocks/Organisations.js | 8 +++++-- .../charterafrica/src/payload/blocks/Tools.js | 8 +++++-- .../src/payload/collections/Contributors.js | 8 +++++-- .../src/payload/collections/Organisations.js | 2 +- .../src/payload/collections/Tools.js | 8 +++++-- .../src/payload/globals/Ecosystem.js | 24 +++++++++---------- .../src/utils/translationConstants.js | 3 +++ 14 files changed, 73 insertions(+), 56 deletions(-) diff --git a/apps/charterafrica/src/components/EcosystemList/EcosystemFilter.js b/apps/charterafrica/src/components/EcosystemList/EcosystemFilter.js index 83eec3831..26bdfca1b 100644 --- a/apps/charterafrica/src/components/EcosystemList/EcosystemFilter.js +++ b/apps/charterafrica/src/components/EcosystemList/EcosystemFilter.js @@ -32,7 +32,7 @@ const EcosystemFilter = React.forwardRef(function EcosystemFilter(props, ref) { /> {filterOptions.map((option) => { - if (option.type === "select" && option.options.length) { + if (option?.type === "select" && option.options.length) { const value = values[option.name] || ""; const optValue = option.options.find((opt) => value === opt.value); diff --git a/apps/charterafrica/src/components/Tool/Tool.js b/apps/charterafrica/src/components/Tool/Tool.js index 3df4f3c26..8efebe559 100644 --- a/apps/charterafrica/src/components/Tool/Tool.js +++ b/apps/charterafrica/src/components/Tool/Tool.js @@ -34,7 +34,7 @@ const Tool = React.forwardRef(function Tool(props, ref) { tools, toolsTitle, externalLink, - collection, + classification, } = props; return ( @@ -146,7 +146,7 @@ const Tool = React.forwardRef(function Tool(props, ref) { Collection - {collection} + {classification} { - const { search, location, contributorCollection } = query; + const { search, location, classification } = query; const fields = ["description", "fullName", "location", "externalId"]; const where = {}; if (search) { @@ -17,8 +17,8 @@ const queryBuilder = (query) => { if (location) { where.location = { equals: location }; } - if (contributorCollection) { - where.contributorCollection = { equals: contributorCollection }; + if (classification) { + where.classification = { equals: classification }; } return where; }; @@ -132,7 +132,7 @@ async function processPageContributors(page, api, context) { const { filters, title } = blocks[foundIndex]; const filterLabels = labelsPerLocale[locale]; const collections = [ - ...new Set(results.map((item) => item.contributorCollection)), + ...new Set(results.map((item) => item.classification)), ].map((value) => ({ value: value ?? null, label: value ?? null, @@ -163,10 +163,10 @@ async function processPageContributors(page, api, context) { })), }; } - if (filter === "contributorCollection") { + if (filter === "classification") { return { type: "select", - name: "contributorCollection", + name: "classification", label: filterLabels.collection, multiple: true, options: collections, diff --git a/apps/charterafrica/src/lib/data/common/processPageOrganisations.js b/apps/charterafrica/src/lib/data/common/processPageOrganisations.js index 7556baa38..053b3a854 100644 --- a/apps/charterafrica/src/lib/data/common/processPageOrganisations.js +++ b/apps/charterafrica/src/lib/data/common/processPageOrganisations.js @@ -5,7 +5,7 @@ import formatDateTime from "@/charterafrica/utils/formatDate"; import labelsPerLocale from "@/charterafrica/utils/translationConstants"; const queryBuilder = (query) => { - const { search, location, organisationCollection } = query; + const { search, location, classification } = query; const fields = ["description", "location", "name", "externalId", "slug"]; const where = {}; if (search) { @@ -14,8 +14,8 @@ const queryBuilder = (query) => { if (location) { where.location = { equals: location }; } - if (organisationCollection) { - where.organisationCollection = { equals: organisationCollection }; + if (classification) { + where.classification = { equals: classification }; } return where; }; @@ -121,7 +121,7 @@ async function processPageOrganisations(page, api, context) { const { filters, title } = blocks[foundIndex]; const filterLabels = labelsPerLocale[locale]; const collections = [ - ...new Set(results.map((item) => item.organisationCollection)), + ...new Set(results.map((item) => item.classification)), ].map((value) => ({ value: value ?? null, label: value ?? null, @@ -152,11 +152,11 @@ async function processPageOrganisations(page, api, context) { })), }; } - if (filter === "organisationCollection") { + if (filter === "classification") { return { type: "select", - name: "organisationCollection", - label: filterLabels.collection, + name: "classification", + label: filterLabels.classification, multiple: true, options: collections, }; diff --git a/apps/charterafrica/src/lib/data/common/processPageTools.js b/apps/charterafrica/src/lib/data/common/processPageTools.js index 77951a881..78eb7538f 100644 --- a/apps/charterafrica/src/lib/data/common/processPageTools.js +++ b/apps/charterafrica/src/lib/data/common/processPageTools.js @@ -8,7 +8,7 @@ import formatDateTime from "@/charterafrica/utils/formatDate"; import labelsPerLocale from "@/charterafrica/utils/translationConstants"; const queryBuilder = (query) => { - const { search, theme, homeCountry, toolCollection } = query; + const { search, theme, homeCountry, classification } = query; const where = {}; if (search) { const fields = [ @@ -19,7 +19,7 @@ const queryBuilder = (query) => { "id", "slug", "homeCountry", - "toolCollection", + "classification", ]; where.or = fields.map((field) => ({ [field]: { like: search } })); } @@ -31,8 +31,8 @@ const queryBuilder = (query) => { if (theme) { where.theme = { equals: theme }; } - if (toolCollection) { - where.toolCollection = { equals: toolCollection }; + if (classification) { + where.classification = { equals: classification }; } return where; }; @@ -108,7 +108,7 @@ async function processPageSingleTool(page, api, context) { commitText: filterLabels.lastCommit, forksText: filterLabels.forks, starsText: filterLabels.stars, - collection: tool.toolCollection, + collection: tool.classification, externalLink: { href: tool.docLink ?? null, }, @@ -164,7 +164,7 @@ async function processPageTools(page, api, context) { value, label: value, })); - const collections = [...new Set(docs.map((item) => item.toolCollection))].map( + const collections = [...new Set(docs.map((item) => item.classification))].map( (value) => ({ value: value ?? null, label: value ?? null, @@ -208,10 +208,10 @@ async function processPageTools(page, api, context) { options: themes, }; } - if (filter === "toolCollection") { + if (filter === "classification") { return { type: "select", - name: "toolCollection", + name: "classification", label: filterLabels.collection, multiple: true, options: collections, diff --git a/apps/charterafrica/src/lib/ecosystem/airtable/processData.js b/apps/charterafrica/src/lib/ecosystem/airtable/processData.js index c0c0502ab..140e19fa6 100644 --- a/apps/charterafrica/src/lib/ecosystem/airtable/processData.js +++ b/apps/charterafrica/src/lib/ecosystem/airtable/processData.js @@ -124,7 +124,7 @@ export function processTool(item, config, { partnersData }) { link: getValue(data, toolTableColumns.url), operatingCountries, contributors: getValue(data, toolTableColumns.contributors), - toolCollection: getValue(data, toolTableColumns.toolCollection), + classification: getValue(data, toolTableColumns.classification), source, supporters, partners, @@ -169,10 +169,7 @@ export function processContributor(item, config) { ); return { airtableId: data.id, - contributorCollection: getValue( - data, - contributorTableColumns.contributorCollection, - ), + classification: getValue(data, contributorTableColumns.classification), externalId, repoLink, socialMedia, @@ -236,10 +233,7 @@ export function processOrganisation(item, config, { partnersData }) { externalId, type: getValue(data, organisationTableColumns.type)?.replace(/&/g, "and"), repoLink: getValue(data, organisationTableColumns.source.url), - organisationCollection: getValue( - data, - organisationTableColumns.organisationCollection, - ), + classification: getValue(data, organisationTableColumns.classification), supporters, partners, socialMedia, diff --git a/apps/charterafrica/src/payload/blocks/Contributors.js b/apps/charterafrica/src/payload/blocks/Contributors.js index d10e77d5b..8d9f66b29 100644 --- a/apps/charterafrica/src/payload/blocks/Contributors.js +++ b/apps/charterafrica/src/payload/blocks/Contributors.js @@ -36,8 +36,12 @@ const Contributors = { }, }, { - value: "contributorCollection", - label: { en: "Collection", fr: "Collection", pt: "Collection" }, + value: "classification", + label: { + en: "Classification", + fr: "Classification", + pt: "Classificação", + }, }, ], }, diff --git a/apps/charterafrica/src/payload/blocks/Organisations.js b/apps/charterafrica/src/payload/blocks/Organisations.js index 70e4d7148..b6273010c 100644 --- a/apps/charterafrica/src/payload/blocks/Organisations.js +++ b/apps/charterafrica/src/payload/blocks/Organisations.js @@ -36,8 +36,12 @@ const Contributors = { }, }, { - value: "organisationCollection", - label: { en: "Collection", fr: "Collection", pt: "Collection" }, + value: "classification", + label: { + en: "Classification", + fr: "Classification", + pt: "Classificação", + }, }, ], }, diff --git a/apps/charterafrica/src/payload/blocks/Tools.js b/apps/charterafrica/src/payload/blocks/Tools.js index 14fe92f11..3cf4a7861 100644 --- a/apps/charterafrica/src/payload/blocks/Tools.js +++ b/apps/charterafrica/src/payload/blocks/Tools.js @@ -52,8 +52,12 @@ const Tools = { }, }, { - value: "toolCollection", - label: { en: "Collection", fr: "Collection", pt: "Collection" }, + value: "classification", + label: { + en: "Classification", + fr: "Classification", + pt: "Classificação", + }, }, ], }, diff --git a/apps/charterafrica/src/payload/collections/Contributors.js b/apps/charterafrica/src/payload/collections/Contributors.js index 42dd50fc7..58aff7dbf 100644 --- a/apps/charterafrica/src/payload/collections/Contributors.js +++ b/apps/charterafrica/src/payload/collections/Contributors.js @@ -49,13 +49,17 @@ const Contributors = { }, }, { - name: "contributorCollection", + name: "classification", type: "text", admin: { readOnly: true, }, localized: true, - label: { en: "Collection", fr: "Collection", pt: "Collection" }, + label: { + en: "Classification", + fr: "Classification", + pt: "Classificação", + }, }, { name: "description", diff --git a/apps/charterafrica/src/payload/collections/Organisations.js b/apps/charterafrica/src/payload/collections/Organisations.js index e45f97356..ffbce3431 100644 --- a/apps/charterafrica/src/payload/collections/Organisations.js +++ b/apps/charterafrica/src/payload/collections/Organisations.js @@ -47,7 +47,7 @@ const Organisations = { }, }, { - name: "organisationCollection", + name: "classification", type: "text", admin: { readOnly: true, diff --git a/apps/charterafrica/src/payload/collections/Tools.js b/apps/charterafrica/src/payload/collections/Tools.js index 305731a29..9f997bd81 100644 --- a/apps/charterafrica/src/payload/collections/Tools.js +++ b/apps/charterafrica/src/payload/collections/Tools.js @@ -114,13 +114,17 @@ const Tools = { label: { en: "Theme", fr: "Thème", pt: "Tema" }, }, { - name: "toolCollection", + name: "classification", type: "text", admin: { readOnly: true, }, localized: true, - label: { en: "Collection", fr: "Collection", pt: "Collection" }, + label: { + en: "Classification", + fr: "Classification", + pt: "Classificação", + }, }, { name: "techSkills", diff --git a/apps/charterafrica/src/payload/globals/Ecosystem.js b/apps/charterafrica/src/payload/globals/Ecosystem.js index bd220e96a..fe487f162 100644 --- a/apps/charterafrica/src/payload/globals/Ecosystem.js +++ b/apps/charterafrica/src/payload/globals/Ecosystem.js @@ -300,11 +300,11 @@ const Ecosystem = { schema, tableField: "toolTableId", overrides: { - name: "toolCollection", + name: "classification", label: { - en: "Collection", - fr: "Collection", - pt: "Coleção", + en: "Classification", + fr: "Classification", + pt: "Classificação", }, }, }), @@ -437,11 +437,11 @@ const Ecosystem = { schema, tableField: "contributorTableId", overrides: { - name: "contributorCollection", + name: "classification", label: { - en: "Collection", - fr: "Collection", - pt: "Coleção", + en: "Classification", + fr: "Classification", + pt: "Classificação", }, }, }), @@ -589,11 +589,11 @@ const Ecosystem = { schema, tableField: "organisationTableId", overrides: { - name: "organisationCollection", + name: "classification", label: { - en: "Collection", - fr: "Collection", - pt: "Coleção", + en: "Classification", + fr: "Classification", + pt: "Classificação", }, }, }), diff --git a/apps/charterafrica/src/utils/translationConstants.js b/apps/charterafrica/src/utils/translationConstants.js index 84e1ab165..f4e5b7b4a 100644 --- a/apps/charterafrica/src/utils/translationConstants.js +++ b/apps/charterafrica/src/utils/translationConstants.js @@ -31,6 +31,7 @@ const labelsPerLocale = { lastCommit: "Last Commit", forks: "Forks", collection: "Collection", + classification: "Classification", }, fr: { topic: "Sujet A-Z", @@ -64,6 +65,7 @@ const labelsPerLocale = { lastCommit: "Dernier Commit", forks: "Forks", collection: "Collection", + classification: "Classification", }, pt: { topic: "Tópico A-Z", @@ -97,6 +99,7 @@ const labelsPerLocale = { lastCommit: "Último Commit", forks: "Forks", collection: "Collection", + classification: "classificação", }, }; From 0000924695c1169901c290ef863bdc24d09c4933 Mon Sep 17 00:00:00 2001 From: Kevin Koech Date: Mon, 4 Dec 2023 18:07:11 +0300 Subject: [PATCH 16/18] Fix failing tests --- apps/charterafrica/src/components/Articles/Articles.snap.js | 1 + 1 file changed, 1 insertion(+) diff --git a/apps/charterafrica/src/components/Articles/Articles.snap.js b/apps/charterafrica/src/components/Articles/Articles.snap.js index 7df6bc079..3fc7dfa88 100644 --- a/apps/charterafrica/src/components/Articles/Articles.snap.js +++ b/apps/charterafrica/src/components/Articles/Articles.snap.js @@ -81,6 +81,7 @@ exports[` renders unchanged 1`] = ` aria-hidden="true" aria-invalid="false" class="MuiSelect-nativeInput css-yf8vq0-MuiSelect-nativeInput" + name=":r1:" tabindex="-1" value="-publishedOn" /> From 75b1bf7aef9e5785d784d0f0391094a43552faa7 Mon Sep 17 00:00:00 2001 From: Kevin Koech Date: Tue, 5 Dec 2023 08:47:41 +0300 Subject: [PATCH 17/18] Add Ecosystem filter --- .../src/components/EcosystemList/EcosystemFilter.js | 1 + 1 file changed, 1 insertion(+) diff --git a/apps/charterafrica/src/components/EcosystemList/EcosystemFilter.js b/apps/charterafrica/src/components/EcosystemList/EcosystemFilter.js index 26bdfca1b..fc2330599 100644 --- a/apps/charterafrica/src/components/EcosystemList/EcosystemFilter.js +++ b/apps/charterafrica/src/components/EcosystemList/EcosystemFilter.js @@ -8,6 +8,7 @@ import { ControlledSearchInput } from "@/charterafrica/components/SearchInput"; const EcosystemFilter = React.forwardRef(function EcosystemFilter(props, ref) { const { onChange, searchPlaceholder, values, filterOptions = [] } = props; + // Search input field spans 3 columns, so divide 9 by the filter options const spans = Math.floor(9 / filterOptions.length); return ( From ea8ebf8849bc70c4c9cce2d54b46770328deb235 Mon Sep 17 00:00:00 2001 From: Kevin Koech Date: Tue, 5 Dec 2023 09:08:16 +0300 Subject: [PATCH 18/18] Use Collection as label --- .../data/common/processPageOrganisations.js | 2 +- .../src/lib/data/common/processPageTools.js | 2 +- .../src/payload/blocks/Contributors.js | 6 +++--- .../src/payload/blocks/Organisations.js | 6 +++--- apps/charterafrica/src/payload/blocks/Tools.js | 6 +++--- .../src/payload/collections/Contributors.js | 6 +++--- .../src/payload/collections/Tools.js | 6 +++--- .../src/payload/globals/Ecosystem.js | 18 +++++++++--------- 8 files changed, 26 insertions(+), 26 deletions(-) diff --git a/apps/charterafrica/src/lib/data/common/processPageOrganisations.js b/apps/charterafrica/src/lib/data/common/processPageOrganisations.js index 053b3a854..57fe7bf21 100644 --- a/apps/charterafrica/src/lib/data/common/processPageOrganisations.js +++ b/apps/charterafrica/src/lib/data/common/processPageOrganisations.js @@ -156,7 +156,7 @@ async function processPageOrganisations(page, api, context) { return { type: "select", name: "classification", - label: filterLabels.classification, + label: filterLabels.collection, multiple: true, options: collections, }; diff --git a/apps/charterafrica/src/lib/data/common/processPageTools.js b/apps/charterafrica/src/lib/data/common/processPageTools.js index 78eb7538f..e2e1ccfdf 100644 --- a/apps/charterafrica/src/lib/data/common/processPageTools.js +++ b/apps/charterafrica/src/lib/data/common/processPageTools.js @@ -232,7 +232,7 @@ async function processPageTools(page, api, context) { const { slugs, ...queryParams } = context.query; let swrKey = `/api/v1/resources/ecosystem`; - const qs = queryString({ ...queryParams, collection: "tools" }); + const qs = queryString({ ...queryParams }); if (qs) { swrKey = `${swrKey}?${qs}`; } diff --git a/apps/charterafrica/src/payload/blocks/Contributors.js b/apps/charterafrica/src/payload/blocks/Contributors.js index 8d9f66b29..23047d40b 100644 --- a/apps/charterafrica/src/payload/blocks/Contributors.js +++ b/apps/charterafrica/src/payload/blocks/Contributors.js @@ -38,9 +38,9 @@ const Contributors = { { value: "classification", label: { - en: "Classification", - fr: "Classification", - pt: "Classificação", + en: "Collection", + fr: "Collection", + pt: "Coleção", }, }, ], diff --git a/apps/charterafrica/src/payload/blocks/Organisations.js b/apps/charterafrica/src/payload/blocks/Organisations.js index b6273010c..e342ad70c 100644 --- a/apps/charterafrica/src/payload/blocks/Organisations.js +++ b/apps/charterafrica/src/payload/blocks/Organisations.js @@ -38,9 +38,9 @@ const Contributors = { { value: "classification", label: { - en: "Classification", - fr: "Classification", - pt: "Classificação", + en: "Collection", + fr: "Collection", + pt: "Coleção", }, }, ], diff --git a/apps/charterafrica/src/payload/blocks/Tools.js b/apps/charterafrica/src/payload/blocks/Tools.js index 3cf4a7861..db88dd729 100644 --- a/apps/charterafrica/src/payload/blocks/Tools.js +++ b/apps/charterafrica/src/payload/blocks/Tools.js @@ -54,9 +54,9 @@ const Tools = { { value: "classification", label: { - en: "Classification", - fr: "Classification", - pt: "Classificação", + en: "Collection", + fr: "Collection", + pt: "Coleção", }, }, ], diff --git a/apps/charterafrica/src/payload/collections/Contributors.js b/apps/charterafrica/src/payload/collections/Contributors.js index 58aff7dbf..62faec402 100644 --- a/apps/charterafrica/src/payload/collections/Contributors.js +++ b/apps/charterafrica/src/payload/collections/Contributors.js @@ -56,9 +56,9 @@ const Contributors = { }, localized: true, label: { - en: "Classification", - fr: "Classification", - pt: "Classificação", + en: "Collection", + fr: "Collection", + pt: "Coleção", }, }, { diff --git a/apps/charterafrica/src/payload/collections/Tools.js b/apps/charterafrica/src/payload/collections/Tools.js index 9f997bd81..65c800e52 100644 --- a/apps/charterafrica/src/payload/collections/Tools.js +++ b/apps/charterafrica/src/payload/collections/Tools.js @@ -121,9 +121,9 @@ const Tools = { }, localized: true, label: { - en: "Classification", - fr: "Classification", - pt: "Classificação", + en: "Collection", + fr: "Collection", + pt: "Coleção", }, }, { diff --git a/apps/charterafrica/src/payload/globals/Ecosystem.js b/apps/charterafrica/src/payload/globals/Ecosystem.js index fe487f162..191bb54dc 100644 --- a/apps/charterafrica/src/payload/globals/Ecosystem.js +++ b/apps/charterafrica/src/payload/globals/Ecosystem.js @@ -302,9 +302,9 @@ const Ecosystem = { overrides: { name: "classification", label: { - en: "Classification", - fr: "Classification", - pt: "Classificação", + en: "Collection", + fr: "Collection", + pt: "Coleção", }, }, }), @@ -439,9 +439,9 @@ const Ecosystem = { overrides: { name: "classification", label: { - en: "Classification", - fr: "Classification", - pt: "Classificação", + en: "Collection", + fr: "Collection", + pt: "Coleção", }, }, }), @@ -591,9 +591,9 @@ const Ecosystem = { overrides: { name: "classification", label: { - en: "Classification", - fr: "Classification", - pt: "Classificação", + en: "Collection", + fr: "Collection", + pt: "Coleção", }, }, }),