diff --git a/apps/charterafrica/package.json b/apps/charterafrica/package.json index 66da72969..c234af7a7 100644 --- a/apps/charterafrica/package.json +++ b/apps/charterafrica/package.json @@ -36,16 +36,16 @@ "db-rollback": "migrate-mongo down" }, "dependencies": { - "@aws-sdk/client-s3": "^3.461.0", - "@aws-sdk/lib-storage": "^3.461.0", + "@aws-sdk/client-s3": "^3.465.0", + "@aws-sdk/lib-storage": "^3.465.0", "@commons-ui/core": "workspace:*", "@commons-ui/next": "workspace:*", "@emotion/cache": "^11.11.0", "@emotion/react": "^11.11.1", "@emotion/server": "^11.11.0", "@emotion/styled": "^11.11.0", - "@mui/material": "^5.14.18", - "@mui/utils": "^5.14.18", + "@mui/material": "^5.14.19", + "@mui/utils": "^5.14.19", "@next/env": "^14.0.3", "@nivo/core": "^0.80.0", "@nivo/pie": "^0.80.0", @@ -54,7 +54,7 @@ "@payloadcms/plugin-cloud-storage": "^1.1.1", "@payloadcms/plugin-nested-docs": "^1.0.9", "@payloadcms/plugin-seo": "^1.0.15", - "@sentry/nextjs": "^7.83.0", + "@sentry/nextjs": "^7.84.0", "airtable": "^0.12.2", "dotenv": "^16.3.1", "express": "^4.18.2", @@ -87,12 +87,12 @@ "@commons-ui/testing-library": "workspace:*", "@playwright/test": "^1.40.1", "@svgr/webpack": "^8.1.0", - "@swc/core": "^1.3.99", + "@swc/core": "^1.3.100", "@types/express": "^4.17.21", - "@types/node": "^18.18.13", - "@types/react": "^18.2.39", + "@types/node": "^18.19.2", + "@types/react": "^18.2.41", "babel-jest": "^29.7.0", - "eslint": "^8.54.0", + "eslint": "^8.55.0", "eslint-config-commons-ui": "workspace:*", "eslint-import-resolver-webpack": "^0.13.8", "eslint-plugin-import": "^2.29.0", 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" /> diff --git a/apps/codeforafrica/contrib/dokku/Dockerfile b/apps/codeforafrica/contrib/dokku/Dockerfile index 992ac0267..0be59f169 100644 --- a/apps/codeforafrica/contrib/dokku/Dockerfile +++ b/apps/codeforafrica/contrib/dokku/Dockerfile @@ -1 +1 @@ -FROM codeforafrica/codeforafrica-ui:1.0.51 +FROM codeforafrica/codeforafrica-ui:1.0.52 diff --git a/apps/codeforafrica/package.json b/apps/codeforafrica/package.json index f97616291..94b5346eb 100644 --- a/apps/codeforafrica/package.json +++ b/apps/codeforafrica/package.json @@ -1,6 +1,6 @@ { "name": "codeforafrica", - "version": "1.0.51", + "version": "1.0.52", "private": true, "author": "Code for Africa ", "description": "This is the main CFA site.", @@ -40,8 +40,8 @@ "@emotion/server": "^11.11.0", "@emotion/styled": "^11.11.0", "@googlemaps/react-wrapper": "^1.1.35", - "@mui/material": "^5.14.18", - "@mui/utils": "^5.14.18", + "@mui/material": "^5.14.19", + "@mui/utils": "^5.14.19", "@next/env": "~14.0.3", "@payloadcms/plugin-cloud-storage": "^1.1.1", "@payloadcms/plugin-nested-docs": "^1.0.9", @@ -52,7 +52,7 @@ "fast-equals": "^5.0.1", "gray-matter": "^4.0.3", "js-yaml": "^4.1.0", - "jsdom": "^23.0.0", + "jsdom": "^23.0.1", "next": "^14.0.3", "next-seo": "^6.4.0", "nodemailer-sendgrid": "^1.0.3", @@ -73,10 +73,10 @@ "@playwright/test": "^1.40.1", "@svgr/webpack": "^8.1.0", "@types/express": "^4.17.21", - "@types/node": "^18.18.13", - "@types/react": "^18.2.39", + "@types/node": "^18.19.2", + "@types/react": "^18.2.41", "babel-jest": "^29.7.0", - "eslint": "^8.54.0", + "eslint": "^8.55.0", "eslint-config-commons-ui": "workspace:*", "eslint-import-resolver-webpack": "^0.13.8", "eslint-plugin-import": "^2.29.0", 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/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=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 @@ - + 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 @@ + + + + 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