From 5889f057d464e41f518cf940919fb162a4222d37 Mon Sep 17 00:00:00 2001 From: Clemence Kyara Date: Mon, 4 Dec 2023 08:58:08 +0300 Subject: [PATCH 1/9] 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 35f842cb635db768e595f51f08d0a2e0cc28788c Mon Sep 17 00:00:00 2001 From: Clemence Kyara Date: Mon, 4 Dec 2023 08:59:23 +0300 Subject: [PATCH 2/9] 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 ea5a94604f4a856aa6ea81deaa5f82897d24fb7a Mon Sep 17 00:00:00 2001 From: Clemence Kyara Date: Mon, 4 Dec 2023 09:00:43 +0300 Subject: [PATCH 3/9] 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 4/9] 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 5/9] 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 12dfc4edac205d0ff2dc3eb18b39bc0c7e4bbb82 Mon Sep 17 00:00:00 2001 From: Clemence Kyara Date: Mon, 4 Dec 2023 10:39:34 +0300 Subject: [PATCH 6/9] 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 95054860409f4871a5798c8bffd93b0c3f4db628 Mon Sep 17 00:00:00 2001 From: Clemence Kyara Date: Mon, 4 Dec 2023 10:40:38 +0300 Subject: [PATCH 7/9] 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