Skip to content

Commit

Permalink
Merge pull request #668 from CodeForAfrica/fix/charterafrica_consulta…
Browse files Browse the repository at this point in the history 
…tion_page

Fix @charterafrica consultation page spacing
  • Loading branch information
@kilemensi
kilemensi authored Dec 12, 2023
2 parents f6adb6b + c7731af commit 7b8431d
Show file tree
Hide file tree
Showing 18 changed files with 1,717 additions and 1,711 deletions.
2 changes: 1 addition & 1 deletion apps/charterafrica/contrib/dokku/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
FROM codeforafrica/charterafrica-ui:0.1.15
FROM codeforafrica/charterafrica-ui:0.1.16
24 changes: 12 additions & 12 deletions apps/charterafrica/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "charterafrica",
"version": "0.1.15",
"version": "0.1.16",
"private": true,
"author": "Code for Africa <[email protected]>",
"description": "This is the official code for https://charter.africa site",
Expand Down Expand Up @@ -36,8 +36,8 @@
"db-rollback": "migrate-mongo down"
},
"dependencies": {
"@aws-sdk/client-s3": "^3.468.0",
"@aws-sdk/lib-storage": "^3.468.0",
"@aws-sdk/client-s3": "^3.470.0",
"@aws-sdk/lib-storage": "^3.470.0",
"@commons-ui/core": "workspace:*",
"@commons-ui/next": "workspace:*",
"@emotion/cache": "^11.11.0",
Expand All @@ -46,7 +46,7 @@
"@emotion/styled": "^11.11.0",
"@mui/material": "^5.14.20",
"@mui/utils": "^5.14.20",
"@next/env": "^14.0.3",
"@next/env": "^14.0.4",
"@nivo/core": "^0.84.0",
"@nivo/pie": "^0.84.0",
"@nivo/tooltip": "^0.84.0",
Expand All @@ -55,14 +55,14 @@
"@payloadcms/plugin-nested-docs": "^1.0.9",
"@payloadcms/plugin-seo": "^1.0.15",
"@react-spring/web": "^9.7.3",
"@sentry/nextjs": "^7.85.0",
"@sentry/nextjs": "^7.86.0",
"airtable": "^0.12.2",
"dotenv": "^16.3.1",
"express": "^4.18.2",
"leaflet": "^1.9.4",
"migrate-mongo": "^11.0.0",
"monaco-editor": "^0.44.0",
"next": "^14.0.3",
"next": "^14.0.4",
"next-seo": "^6.4.0",
"nodemailer-sendgrid": "^1.0.3",
"payload": "^1.15.8",
Expand All @@ -81,17 +81,17 @@
"videojs-youtube": "^3.0.1"
},
"devDependencies": {
"@babel/core": "^7.23.5",
"@babel/core": "^7.23.6",
"@babel/preset-react": "^7.23.3",
"@babel/register": "^7.22.15",
"@babel/runtime": "^7.23.5",
"@babel/runtime": "^7.23.6",
"@commons-ui/testing-library": "workspace:*",
"@playwright/test": "^1.40.1",
"@svgr/webpack": "^8.1.0",
"@swc/core": "^1.3.100",
"@types/express": "^4.17.21",
"@types/node": "^18.19.2",
"@types/react": "^18.2.42",
"@types/node": "^18.19.3",
"@types/react": "^18.2.43",
"babel-jest": "^29.7.0",
"eslint": "^8.55.0",
"eslint-config-commons-ui": "workspace:*",
Expand All @@ -101,9 +101,9 @@
"jest": "^29.7.0",
"jest-config-commons-ui": "workspace:*",
"playwright-config-commons-ui": "workspace:*",
"prettier": "^3.1.0",
"prettier": "^3.1.1",
"react-test-renderer": "^18.2.0",
"ts-node": "^10.9.1",
"ts-node": "^10.9.2",
"typescript": "^5.3.3",
"webpack": "^5.89.0"
},
Expand Down
7 changes: 3 additions & 4 deletions apps/charterafrica/src/components/Documents/Documents.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -102,9 +102,8 @@ const Documents = React.forwardRef(function Documents(props, ref) {
<Section
sx={{
borderTop: `1px solid ${neutral[200]}`,
px: { xs: 2.5, sm: 0 },
py: { xs: 5, md: 0 },
pb: { md: 5 },
px: { xs: 5, sm: 0 },
py: { xs: 5, md: 10 },
}}
>
<RichTypography color="neutral.dark" variant="h2">
Expand Down Expand Up @@ -150,7 +149,7 @@ const Documents = React.forwardRef(function Documents(props, ref) {
}}
/>
))}
<Divider sx={{ my: 2 }} />
<Divider sx={{ my: 5 }} />
{documents?.map((document) => (
<DocumentCard
{...document}
Expand Down
4 changes: 2 additions & 2 deletions apps/charterafrica/src/components/Documents/Documents.snap.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ exports[`<Documents /> renders unchanged 1`] = `
class="MuiBox-root css-1k9ek97"
>
<div
class="MuiContainer-root MuiContainer-maxWidthLg MuiContainer-fixed MuiContainer-disableGutters css-pnz2mz-MuiContainer-root"
class="MuiContainer-root MuiContainer-maxWidthLg MuiContainer-fixed MuiContainer-disableGutters css-27tpcc-MuiContainer-root"
>
<div
class="MuiBox-root css-blp6vs"
Expand Down Expand Up @@ -162,7 +162,7 @@ exports[`<Documents /> renders unchanged 1`] = `
</div>
</div>
<hr
class="MuiDivider-root MuiDivider-fullWidth css-ctpjxq-MuiDivider-root"
class="MuiDivider-root MuiDivider-fullWidth css-1i2odet-MuiDivider-root"
/>
</div>
</div>
Expand Down
5 changes: 5 additions & 0 deletions apps/charterafrica/src/components/PageDescription/PageDescription.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,11 @@ const PageDescription = React.forwardRef(function PageDescription(props, ref) {
<LongFormRichText
color="neutral.dark"
richTextBlockFields={{ content: description }}
sx={{
"& :first-child": {
mt: 0,
},
}}
/>
</Section>
</Box>
Expand Down
2 changes: 1 addition & 1 deletion apps/charterafrica/src/components/PageDescription/PageDescription.snap.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ exports[`<PageDescription/> renders unchanged 1`] = `
class="MuiContainer-root MuiContainer-maxWidthLg MuiContainer-fixed MuiContainer-disableGutters css-ydzulf-MuiContainer-root"
>
<div
class="MuiBox-root css-142s5v6"
class="MuiBox-root css-3zjynb"
>
<p
class="MuiTypography-root MuiTypography-p1 css-fabev4-MuiTypography-root"
Expand Down
14 changes: 7 additions & 7 deletions apps/codeforafrica/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
"@googlemaps/react-wrapper": "^1.1.35",
"@mui/material": "^5.14.20",
"@mui/utils": "^5.14.20",
"@next/env": "~14.0.3",
"@next/env": "~14.0.4",
"@payloadcms/plugin-cloud-storage": "^1.1.1",
"@payloadcms/plugin-nested-docs": "^1.0.9",
"@payloadcms/plugin-seo": "^1.0.15",
Expand All @@ -53,7 +53,7 @@
"gray-matter": "^4.0.3",
"js-yaml": "^4.1.0",
"jsdom": "^23.0.1",
"next": "^14.0.3",
"next": "^14.0.4",
"next-seo": "^6.4.0",
"nodemailer-sendgrid": "^1.0.3",
"payload": "^1.15.8",
Expand All @@ -67,14 +67,14 @@
"swr": "^2.2.4"
},
"devDependencies": {
"@babel/core": "^7.23.5",
"@babel/core": "^7.23.6",
"@babel/preset-react": "^7.23.3",
"@commons-ui/testing-library": "workspace:*",
"@playwright/test": "^1.40.1",
"@svgr/webpack": "^8.1.0",
"@types/express": "^4.17.21",
"@types/node": "^18.19.2",
"@types/react": "^18.2.42",
"@types/node": "^18.19.3",
"@types/react": "^18.2.43",
"babel-jest": "^29.7.0",
"eslint": "^8.55.0",
"eslint-config-commons-ui": "workspace:*",
Expand All @@ -84,9 +84,9 @@
"jest": "^29.7.0",
"jest-config-commons-ui": "workspace:*",
"playwright-config-commons-ui": "workspace:*",
"prettier": "^3.1.0",
"prettier": "^3.1.1",
"react-test-renderer": "^18.2.0",
"ts-node": "^10.9.1",
"ts-node": "^10.9.2",
"typescript": "^5.3.3",
"webpack": "^5.89.0"
},
Expand Down
28 changes: 14 additions & 14 deletions apps/commons-ui-docs/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,31 +36,31 @@
"@emotion/styled": "^11.11.0",
"@mui/material": "^5.14.20",
"@mui/utils": "^5.14.20",
"@next/env": "^14.0.3",
"next": "^14.0.3",
"@next/env": "^14.0.4",
"next": "^14.0.4",
"prop-types": "^15.8.1",
"react": "^18.2.0",
"react-dom": "^18.2.0"
},
"devDependencies": {
"@babel/core": "^7.23.5",
"@babel/core": "^7.23.6",
"@babel/preset-react": "^7.23.3",
"@storybook/addon-essentials": "^7.6.3",
"@storybook/addon-interactions": "^7.6.3",
"@storybook/addon-links": "^7.6.3",
"@storybook/blocks": "^7.6.3",
"@storybook/cli": "^7.6.3",
"@storybook/nextjs": "^7.6.3",
"@storybook/react": "^7.6.3",
"@storybook/addon-essentials": "^7.6.4",
"@storybook/addon-interactions": "^7.6.4",
"@storybook/addon-links": "^7.6.4",
"@storybook/blocks": "^7.6.4",
"@storybook/cli": "^7.6.4",
"@storybook/nextjs": "^7.6.4",
"@storybook/react": "^7.6.4",
"@storybook/testing-library": "^0.2.2",
"@types/node": "^18.19.2",
"@types/react": "^18.2.42",
"@types/node": "^18.19.3",
"@types/react": "^18.2.43",
"eslint": "^8.55.0",
"eslint-config-commons-ui": "workspace:*",
"eslint-import-resolver-webpack": "^0.13.8",
"eslint-plugin-import": "^2.29.0",
"prettier": "^3.1.0",
"storybook": "^7.6.3",
"prettier": "^3.1.1",
"storybook": "^7.6.4",
"typescript": "^5.3.3",
"webpack": "^5.89.0"
},
Expand Down
32 changes: 16 additions & 16 deletions apps/pesayetu/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,13 +41,13 @@
"@mui/styles": "^5.14.20",
"@mui/utils": "^5.14.20",
"@reactour/tour": "^3.6.1",
"aws-sdk": "^2.1513.0",
"aws-sdk": "^2.1516.0",
"clsx": "^2.0.0",
"d3-format": "^3.1.0",
"deepmerge": "^4.3.1",
"leaflet": "^1.9.4",
"lodash": "^4.17.21",
"next": "^14.0.3",
"next": "^14.0.4",
"next-images": "^1.8.5",
"next-seo": "^6.4.0",
"papaparse": "^5.4.1",
Expand All @@ -73,25 +73,25 @@
"xlsx": "^0.18.5"
},
"devDependencies": {
"@babel/core": "^7.23.5",
"@babel/core": "^7.23.6",
"@babel/eslint-parser": "^7.23.3",
"@babel/preset-env": "^7.23.5",
"@babel/preset-env": "^7.23.6",
"@babel/preset-react": "^7.23.3",
"@commons-ui/testing-library": "workspace:*",
"@material-ui/codemod": "^4.5.1",
"@playwright/test": "^1.40.1",
"@storybook/addon-actions": "^7.6.3",
"@storybook/addon-essentials": "^7.6.3",
"@storybook/addon-links": "^7.6.3",
"@storybook/addons": "^7.6.3",
"@storybook/client-api": "^7.6.3",
"@storybook/components": "^7.6.3",
"@storybook/core-events": "^7.6.3",
"@storybook/react": "^7.6.3",
"@storybook/theming": "^7.6.3",
"@storybook/addon-actions": "^7.6.4",
"@storybook/addon-essentials": "^7.6.4",
"@storybook/addon-links": "^7.6.4",
"@storybook/addons": "^7.6.4",
"@storybook/client-api": "^7.6.4",
"@storybook/components": "^7.6.4",
"@storybook/core-events": "^7.6.4",
"@storybook/react": "^7.6.4",
"@storybook/theming": "^7.6.4",
"@svgr/webpack": "^8.1.0",
"@types/node": "^18.19.2",
"@types/react": "^18.2.42",
"@types/node": "^18.19.3",
"@types/react": "^18.2.43",
"apollo-link-rest": "^0.9.0",
"babel-jest": "^29.7.0",
"babel-loader": "^9.1.3",
Expand All @@ -111,7 +111,7 @@
"jscodeshift": "^0.15.1",
"next-sitemap": "^1.9.12",
"playwright-config-commons-ui": "workspace:*",
"prettier": "^3.1.0",
"prettier": "^3.1.1",
"react-test-renderer": "^18.2.0",
"svg-url-loader": "^8.0.0",
"typescript": "^5.3.3"
Expand Down
14 changes: 7 additions & 7 deletions apps/promisetracker/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"@mui/material": "^5.14.20",
"@mui/styles": "^5.14.20",
"@mui/utils": "^5.14.20",
"@sentry/nextjs": "^7.85.0",
"@sentry/nextjs": "^7.86.0",
"clsx": "^2.0.0",
"date-fns": "^2.30.0",
"form-data": "^4.0.0",
Expand All @@ -40,7 +40,7 @@
"formik-mui-lab": "^1.0.0",
"jwt-decode": "^4.0.0",
"lodash": "^4.17.21",
"next": "^14.0.3",
"next": "^14.0.4",
"next-auth": "^4.24.5",
"next-seo": "^6.4.0",
"papaparse": "^5.4.1",
Expand All @@ -55,14 +55,14 @@
"victory": "^36.7.0"
},
"devDependencies": {
"@babel/core": "^7.23.5",
"@babel/preset-env": "^7.23.5",
"@babel/core": "^7.23.6",
"@babel/preset-env": "^7.23.6",
"@babel/preset-react": "^7.23.3",
"@commons-ui/testing-library": "workspace:*",
"@playwright/test": "^1.40.1",
"@svgr/webpack": "^8.1.0",
"@types/node": "^18.19.2",
"@types/react": "^18.2.42",
"@types/node": "^18.19.3",
"@types/react": "^18.2.43",
"babel-jest": "^29.7.0",
"eslint": "^8.55.0",
"eslint-config-commons-ui": "workspace:*",
Expand All @@ -72,7 +72,7 @@
"jest": "^29.7.0",
"jest-config-commons-ui": "workspace:*",
"playwright-config-commons-ui": "workspace:*",
"prettier": "^3.1.0",
"prettier": "^3.1.1",
"react-test-renderer": "^18.2.0",
"typescript": "^5.3.3",
"webpack": "^5.89.0"
Expand Down
4 changes: 2 additions & 2 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@
"husky": "^8.0.3",
"lint-staged": "^15.2.0",
"playwright-config-commons-ui": "workspace:*",
"prettier": "^3.1.0",
"turbo": "^1.11.0"
"prettier": "^3.1.1",
"turbo": "^1.11.1"
},
"engines": {
"node": "18.x",
Expand Down
6 changes: 3 additions & 3 deletions packages/commons-ui-core/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,21 +28,21 @@
"clean": "rm -rf .turbo node_modules dist"
},
"devDependencies": {
"@babel/core": "^7.23.5",
"@babel/core": "^7.23.6",
"@babel/preset-react": "^7.23.3",
"@commons-ui/testing-library": "workspace:*",
"@emotion/react": "^11.11.1",
"@emotion/styled": "^11.11.0",
"@mui/material": "^5.14.20",
"@mui/utils": "^5.14.20",
"@types/react": "^18.2.42",
"@types/react": "^18.2.43",
"babel-loader": "^9.1.3",
"eslint": "^8.55.0",
"eslint-config-commons-ui": "workspace:*",
"identity-obj-proxy": "^3.0.0",
"jest": "^29.7.0",
"jest-config-commons-ui": "workspace:*",
"prettier": "^3.1.0",
"prettier": "^3.1.1",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-test-renderer": "^18.2.0",
Expand Down
4 changes: 2 additions & 2 deletions packages/commons-ui-next/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"clean": "rm -rf .turbo node_modules dist"
},
"devDependencies": {
"@babel/core": "^7.23.5",
"@babel/core": "^7.23.6",
"@babel/preset-react": "^7.23.3",
"@commons-ui/core": "workspace:*",
"@commons-ui/testing-library": "workspace:*",
Expand All @@ -40,7 +40,7 @@
"eslint-config-commons-ui": "workspace:*",
"jest": "^29.7.0",
"jest-config-commons-ui": "workspace:*",
"next": "^14.0.3",
"next": "^14.0.4",
"prop-types": "^15.8.1",
"react": "^18.2.0",
"react-dom": "^18.2.0",
Expand Down
Loading

0 comments on commit 7b8431d

Please sign in to comment.