Skip to content

Commit

Permalink
Merge pull request #648 from CodeForAfrica/fix/feedback
Browse files Browse the repository at this point in the history
Feedback
  • Loading branch information
kilemensi authored Nov 27, 2023
2 parents 1c3d12a + d70569f commit 5df20a2
Show file tree
Hide file tree
Showing 81 changed files with 7,235 additions and 9,428 deletions.
2 changes: 1 addition & 1 deletion apps/charterafrica/contrib/dokku/Dockerfile
Original file line number Diff line number Diff line change
@@ -1 +1 @@
FROM codeforafrica/charterafrica-ui:0.1.13
FROM codeforafrica/charterafrica-ui:0.1.14
68 changes: 34 additions & 34 deletions apps/charterafrica/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "charterafrica",
"version": "0.1.13",
"version": "0.1.14",
"private": true,
"author": "Code for Africa <tech@codeforafrica.org>",
"description": "This is the official code for https://charter.africa site",
Expand Down Expand Up @@ -36,36 +36,36 @@
"db-rollback": "migrate-mongo down"
},
"dependencies": {
"@aws-sdk/client-s3": "^3.417.0",
"@aws-sdk/lib-storage": "^3.417.0",
"@aws-sdk/client-s3": "^3.458.0",
"@aws-sdk/lib-storage": "^3.458.0",
"@commons-ui/core": "workspace:*",
"@commons-ui/next": "workspace:*",
"@emotion/cache": "^11.11.0",
"@emotion/react": "^11.10.8",
"@emotion/server": "^11.10.0",
"@emotion/react": "^11.11.1",
"@emotion/server": "^11.11.0",
"@emotion/styled": "^11.11.0",
"@mui/material": "^5.14.0",
"@mui/utils": "^5.12.3",
"@next/env": "^13.5.2",
"@mui/material": "^5.14.18",
"@mui/utils": "^5.14.18",
"@next/env": "^14.0.3",
"@nivo/core": "^0.80.0",
"@nivo/pie": "^0.80.0",
"@nivo/tooltip": "^0.80.0",
"@nivo/waffle": "^0.80.0",
"@payloadcms/plugin-cloud-storage": "^1.0.16",
"@payloadcms/plugin-nested-docs": "^1.0.6",
"@payloadcms/plugin-seo": "^1.0.13",
"@sentry/nextjs": "^7.77.0",
"airtable": "^0.12.1",
"dotenv": "^16.0.3",
"@payloadcms/plugin-cloud-storage": "^1.1.1",
"@payloadcms/plugin-nested-docs": "^1.0.9",
"@payloadcms/plugin-seo": "^1.0.15",
"@sentry/nextjs": "^7.81.1",
"airtable": "^0.12.2",
"dotenv": "^16.3.1",
"express": "^4.18.2",
"leaflet": "^1.9.3",
"leaflet": "^1.9.4",
"migrate-mongo": "^10.0.0",
"monaco-editor": "^0.38.0",
"nanoid": "^4.0.2",
"next": "^13.5.2",
"next": "^14.0.3",
"next-seo": "^5.15.0",
"nodemailer-sendgrid": "^1.0.3",
"payload": "^1.11.8",
"payload": "^1.15.8",
"prop-types": "^15.8.1",
"qs": "^6.11.2",
"react": "^18.2.0",
Expand All @@ -77,36 +77,36 @@
"sharp": "^0.32.6",
"slate": "^0.94.1",
"swr": "^1.3.0",
"video.js": "^8.3.0",
"video.js": "^8.6.1",
"videojs-youtube": "^3.0.1"
},
"devDependencies": {
"@babel/core": "^7.22.9",
"@babel/preset-react": "^7.22.5",
"@babel/register": "^7.21.0",
"@babel/runtime": "^7.21.5",
"@babel/core": "^7.23.3",
"@babel/preset-react": "^7.23.3",
"@babel/register": "^7.22.15",
"@babel/runtime": "^7.23.4",
"@commons-ui/testing-library": "workspace:*",
"@playwright/test": "^1.33.0",
"@playwright/test": "^1.40.0",
"@svgr/webpack": "^6.5.1",
"@swc/core": "^1.3.56",
"@types/express": "^4.17.17",
"@types/node": "^18.11.9",
"@types/react": "^18.2.15",
"babel-jest": "^29.5.0",
"eslint": "^8.39.0",
"@swc/core": "^1.3.99",
"@types/express": "^4.17.21",
"@types/node": "^18.18.13",
"@types/react": "^18.2.38",
"babel-jest": "^29.7.0",
"eslint": "^8.54.0",
"eslint-config-commons-ui": "workspace:*",
"eslint-import-resolver-webpack": "^0.13.2",
"eslint-plugin-import": "^2.27.5",
"eslint-import-resolver-webpack": "^0.13.8",
"eslint-plugin-import": "^2.29.0",
"identity-obj-proxy": "^3.0.0",
"jest": "^29.5.0",
"jest": "^29.7.0",
"jest-config-commons-ui": "workspace:*",
"nodemon": "^2.0.22",
"playwright-config-commons-ui": "workspace:*",
"prettier": "^3.0.0",
"prettier": "^3.1.0",
"react-test-renderer": "^18.2.0",
"ts-node": "^10.9.1",
"typescript": "^4.9.5",
"webpack": "^5.82.0"
"webpack": "^5.89.0"
},
"engines": {
"node": "18.x"
Expand Down
3 changes: 2 additions & 1 deletion apps/charterafrica/src/components/Articles/Articles.snap.js
Original file line number Diff line number Diff line change
Expand Up @@ -67,11 +67,12 @@ exports[`<Articles /> renders unchanged 1`] = `
class="MuiInputBase-root MuiOutlinedInput-root MuiInputBase-colorPrimary css-a46zki-MuiInputBase-root-MuiOutlinedInput-root-MuiSelect-root"
>
<div
aria-controls=":r0:"
aria-expanded="false"
aria-haspopup="listbox"
aria-label="Without label"
class="MuiSelect-select MuiSelect-outlined MuiInputBase-input MuiOutlinedInput-input css-1mtwe1r-MuiSelect-select-MuiInputBase-input-MuiOutlinedInput-input"
role="button"
role="combobox"
tabindex="0"
>
Most recent
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ exports[`<CommunityPlatforms /> renders unchanged 1`] = `
</div>
</div>
<a
class="MuiTypography-root MuiTypography-inherit MuiLink-root MuiLink-underlineAlways MuiButtonBase-root MuiButton-root MuiButton-contained MuiButton-containedSecondary MuiButton-sizeSmall MuiButton-containedSizeSmall MuiButton-root MuiButton-contained MuiButton-containedSecondary MuiButton-sizeSmall MuiButton-containedSizeSmall active css-8kdj3b-MuiTypography-root-MuiLink-root-MuiButtonBase-root-MuiButton-root"
class="MuiTypography-root MuiTypography-inherit MuiLink-root MuiLink-underlineAlways MuiButtonBase-root MuiButton-root MuiButton-contained MuiButton-containedSecondary MuiButton-sizeSmall MuiButton-containedSizeSmall MuiButton-root MuiButton-contained MuiButton-containedSecondary MuiButton-sizeSmall MuiButton-containedSizeSmall active css-1mu9r82-MuiTypography-root-MuiLink-root-MuiButtonBase-root-MuiButton-root"
href="https://codeforafrica.org"
rel="noreferrer noopener"
tabindex="0"
Expand Down
10 changes: 5 additions & 5 deletions apps/charterafrica/src/components/Dataset/Dataset.snap.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ exports[`<Dataset /> renders unchanged 1`] = `
class="MuiTypography-root MuiTypography-p1 css-l6prdf-MuiTypography-root"
>
<span
class="MuiTypography-root MuiTypography-inherit css-1ruhe-MuiTypography-root"
class="MuiTypography-root MuiTypography-inherit css-dhy9gx-MuiTypography-root"
>
Created January 1, 2021
</span>
Expand All @@ -37,7 +37,7 @@ exports[`<Dataset /> renders unchanged 1`] = `
class="MuiGrid-root MuiGrid-container MuiGrid-item MuiGrid-grid-xs-12 MuiGrid-grid-md-4 css-1phk7xb-MuiGrid-root"
>
<div
class="MuiChip-root MuiChip-filled MuiChip-sizeMedium MuiChip-colorDefault MuiChip-filledDefault css-2n8s2x-MuiChip-root"
class="MuiChip-root MuiChip-filled MuiChip-sizeMedium MuiChip-colorDefault MuiChip-filledDefault css-1puf64w-MuiChip-root"
>
<span
class="MuiChip-label MuiChip-labelMedium css-6od3lo-MuiChip-label"
Expand All @@ -46,7 +46,7 @@ exports[`<Dataset /> renders unchanged 1`] = `
</span>
</div>
<div
class="MuiChip-root MuiChip-filled MuiChip-sizeMedium MuiChip-colorDefault MuiChip-filledDefault css-euezk3-MuiChip-root"
class="MuiChip-root MuiChip-filled MuiChip-sizeMedium MuiChip-colorDefault MuiChip-filledDefault css-1g3w73k-MuiChip-root"
>
<span
class="MuiChip-label MuiChip-labelMedium css-6od3lo-MuiChip-label"
Expand Down Expand Up @@ -83,15 +83,15 @@ exports[`<Dataset /> renders unchanged 1`] = `
Open Dataset
</button>
<div
class="MuiStack-root css-1fwy3an-MuiStack-root"
class="MuiStack-root css-1xe1uy8-MuiStack-root"
>
<div
class="MuiTypography-root MuiTypography-p3 css-1orwtxp-MuiTypography-root"
>
Share Via
</div>
<div
class="MuiStack-root css-b6wkik-MuiStack-root"
class="MuiStack-root css-6za6r5-MuiStack-root"
>
<button
aria-label="twitter"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ exports[`<DatasetCard /> renders unchanged 1`] = `
class="MuiGrid-root MuiGrid-container MuiGrid-item MuiGrid-grid-xs-12 MuiGrid-grid-md-4 css-6thyz8-MuiGrid-root"
>
<div
class="MuiChip-root MuiChip-filled MuiChip-sizeMedium MuiChip-colorDefault MuiChip-filledDefault css-2n8s2x-MuiChip-root"
class="MuiChip-root MuiChip-filled MuiChip-sizeMedium MuiChip-colorDefault MuiChip-filledDefault css-1puf64w-MuiChip-root"
>
<span
class="MuiChip-label MuiChip-labelMedium css-6od3lo-MuiChip-label"
Expand All @@ -67,7 +67,7 @@ exports[`<DatasetCard /> renders unchanged 1`] = `
</span>
</div>
<div
class="MuiChip-root MuiChip-filled MuiChip-sizeMedium MuiChip-colorDefault MuiChip-filledDefault css-euezk3-MuiChip-root"
class="MuiChip-root MuiChip-filled MuiChip-sizeMedium MuiChip-colorDefault MuiChip-filledDefault css-1g3w73k-MuiChip-root"
>
<span
class="MuiChip-label MuiChip-labelMedium css-6od3lo-MuiChip-label"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -312,7 +312,7 @@ exports[`<DatasetFilterBar /> renders unchanged 1`] = `
Datasets
</button>
<a
class="MuiTypography-root MuiTypography-inherit MuiLink-root MuiLink-underlineAlways MuiButtonBase-root MuiButton-root MuiButton-contained MuiButton-containedPrimary MuiButton-sizeMedium MuiButton-containedSizeMedium MuiButton-root MuiButton-contained MuiButton-containedPrimary MuiButton-sizeMedium MuiButton-containedSizeMedium css-1lrcfc-MuiTypography-root-MuiLink-root-MuiButtonBase-root-MuiButton-root"
class="MuiTypography-root MuiTypography-inherit MuiLink-root MuiLink-underlineAlways MuiButtonBase-root MuiButton-root MuiButton-contained MuiButton-containedPrimary MuiButton-sizeMedium MuiButton-containedSizeMedium MuiButton-root MuiButton-contained MuiButton-containedPrimary MuiButton-sizeMedium MuiButton-containedSizeMedium css-zehdzx-MuiTypography-root-MuiLink-root-MuiButtonBase-root-MuiButton-root"
href="/documents"
tabindex="0"
>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -317,7 +317,7 @@ exports[`<Datasets /> renders unchanged 1`] = `
Datasets
</button>
<a
class="MuiTypography-root MuiTypography-inherit MuiLink-root MuiLink-underlineAlways MuiButtonBase-root MuiButton-root MuiButton-contained MuiButton-containedPrimary MuiButton-sizeMedium MuiButton-containedSizeMedium MuiButton-root MuiButton-contained MuiButton-containedPrimary MuiButton-sizeMedium MuiButton-containedSizeMedium css-1lrcfc-MuiTypography-root-MuiLink-root-MuiButtonBase-root-MuiButton-root"
class="MuiTypography-root MuiTypography-inherit MuiLink-root MuiLink-underlineAlways MuiButtonBase-root MuiButton-root MuiButton-contained MuiButton-containedPrimary MuiButton-sizeMedium MuiButton-containedSizeMedium MuiButton-root MuiButton-contained MuiButton-containedPrimary MuiButton-sizeMedium MuiButton-containedSizeMedium css-zehdzx-MuiTypography-root-MuiLink-root-MuiButtonBase-root-MuiButton-root"
href="/documents"
tabindex="0"
>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ exports[`<DesktopNavBar /> renders unchanged 1`] = `
class="MuiGrid-root MuiGrid-item css-13i4rnv-MuiGrid-root"
>
<a
class="MuiTypography-root MuiTypography-inherit MuiLink-root MuiLink-underlineAlways MuiButtonBase-root active css-1eqh9fg-MuiTypography-root-MuiLink-root-MuiButtonBase-root"
class="MuiTypography-root MuiTypography-inherit MuiLink-root MuiLink-underlineAlways MuiButtonBase-root active css-ethxoc-MuiTypography-root-MuiLink-root-MuiButtonBase-root"
href="/"
tabindex="0"
>
Expand Down
6 changes: 3 additions & 3 deletions apps/charterafrica/src/components/Document/Document.snap.js
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ exports[`<Document /> renders unchanged 1`] = `
class="MuiGrid-root MuiGrid-container MuiGrid-item MuiGrid-direction-xs-[object Object] MuiGrid-grid-xs-12 MuiGrid-grid-md-4 css-19fdzmu-MuiGrid-root"
>
<a
class="MuiTypography-root MuiTypography-inherit MuiLink-root MuiLink-underlineAlways MuiButtonBase-root MuiButton-root MuiButton-contained MuiButton-containedPrimary MuiButton-sizeMedium MuiButton-containedSizeMedium MuiButton-root MuiButton-contained MuiButton-containedPrimary MuiButton-sizeMedium MuiButton-containedSizeMedium active css-1cjcswz-MuiTypography-root-MuiLink-root-MuiButtonBase-root-MuiButton-root"
class="MuiTypography-root MuiTypography-inherit MuiLink-root MuiLink-underlineAlways MuiButtonBase-root MuiButton-root MuiButton-contained MuiButton-containedPrimary MuiButton-sizeMedium MuiButton-containedSizeMedium MuiButton-root MuiButton-contained MuiButton-containedPrimary MuiButton-sizeMedium MuiButton-containedSizeMedium active css-1gwheos-MuiTypography-root-MuiLink-root-MuiButtonBase-root-MuiButton-root"
href="/"
tabindex="0"
>
Expand All @@ -56,15 +56,15 @@ exports[`<Document /> renders unchanged 1`] = `
class="MuiGrid-root MuiGrid-item MuiGrid-grid-xs-12 css-mqmitf-MuiGrid-root"
>
<div
class="MuiStack-root css-m2meqv-MuiStack-root"
class="MuiStack-root css-plcmrn-MuiStack-root"
>
<div
class="MuiTypography-root MuiTypography-p3 css-1orwtxp-MuiTypography-root"
>
Share this document
</div>
<div
class="MuiStack-root css-b6wkik-MuiStack-root"
class="MuiStack-root css-6za6r5-MuiStack-root"
>
<button
aria-label="twitter"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ exports[`<Documents /> renders unchanged 1`] = `
:
</p>
<a
class="MuiTypography-root MuiTypography-inherit MuiLink-root MuiLink-underlineAlways MuiButtonBase-root MuiButton-root MuiButton-contained MuiButton-containedPrimary MuiButton-sizeMedium MuiButton-containedSizeMedium MuiButton-root MuiButton-contained MuiButton-containedPrimary MuiButton-sizeMedium MuiButton-containedSizeMedium css-etikzf-MuiTypography-root-MuiLink-root-MuiButtonBase-root-MuiButton-root"
class="MuiTypography-root MuiTypography-inherit MuiLink-root MuiLink-underlineAlways MuiButtonBase-root MuiButton-root MuiButton-contained MuiButton-containedPrimary MuiButton-sizeMedium MuiButton-containedSizeMedium MuiButton-root MuiButton-contained MuiButton-containedPrimary MuiButton-sizeMedium MuiButton-containedSizeMedium css-17xaaej-MuiTypography-root-MuiLink-root-MuiButtonBase-root-MuiButton-root"
href="/datasets"
tabindex="0"
>
Expand Down
4 changes: 2 additions & 2 deletions apps/charterafrica/src/components/Entity/Entity.snap.js
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ exports[`<OrgAndContributor /> renders unchanged 1`] = `
class="MuiGrid-root MuiGrid-item css-13i4rnv-MuiGrid-root"
>
<a
class="MuiTypography-root MuiTypography-inherit MuiLink-root MuiLink-underlineAlways css-1sa2x3w-MuiTypography-root-MuiLink-root"
class="MuiTypography-root MuiTypography-inherit MuiLink-root MuiLink-underlineAlways css-rl8zr9-MuiTypography-root-MuiLink-root"
href="maito:johndoe@example.com"
>
<div
Expand All @@ -70,7 +70,7 @@ exports[`<OrgAndContributor /> renders unchanged 1`] = `
class="MuiGrid-root MuiGrid-item css-13i4rnv-MuiGrid-root"
>
<a
class="MuiTypography-root MuiTypography-inherit MuiLink-root MuiLink-underlineAlways css-j4i3qf-MuiTypography-root-MuiLink-root"
class="MuiTypography-root MuiTypography-inherit MuiLink-root MuiLink-underlineAlways css-4xpak5-MuiTypography-root-MuiLink-root"
href="https://github.com/johndoe"
rel="noreferrer noopener"
target="_blank"
Expand Down
2 changes: 1 addition & 1 deletion apps/charterafrica/src/components/Error/Error.snap.js
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ exports[`<Error /> renders unchanged 1`] = `
</p>
</div>
<a
class="MuiTypography-root MuiTypography-inherit MuiLink-root MuiLink-underlineAlways MuiButtonBase-root MuiButton-root MuiButton-contained MuiButton-containedSecondary MuiButton-sizeMedium MuiButton-containedSizeMedium MuiButton-root MuiButton-contained MuiButton-containedSecondary MuiButton-sizeMedium MuiButton-containedSizeMedium active css-z82s12-MuiTypography-root-MuiLink-root-MuiButtonBase-root-MuiButton-root"
class="MuiTypography-root MuiTypography-inherit MuiLink-root MuiLink-underlineAlways MuiButtonBase-root MuiButton-root MuiButton-contained MuiButton-containedSecondary MuiButton-sizeMedium MuiButton-containedSizeMedium MuiButton-root MuiButton-contained MuiButton-containedSecondary MuiButton-sizeMedium MuiButton-containedSizeMedium active css-x1hbuq-MuiTypography-root-MuiLink-root-MuiButtonBase-root-MuiButton-root"
href="/"
tabindex="0"
>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ exports[`<ErrorPage /> renders unchanged 1`] = `
</p>
</div>
<a
class="MuiTypography-root MuiTypography-inherit MuiLink-root MuiLink-underlineAlways MuiButtonBase-root MuiButton-root MuiButton-contained MuiButton-containedSecondary MuiButton-sizeMedium MuiButton-containedSizeMedium MuiButton-root MuiButton-contained MuiButton-containedSecondary MuiButton-sizeMedium MuiButton-containedSizeMedium active css-z82s12-MuiTypography-root-MuiLink-root-MuiButtonBase-root-MuiButton-root"
class="MuiTypography-root MuiTypography-inherit MuiLink-root MuiLink-underlineAlways MuiButtonBase-root MuiButton-root MuiButton-contained MuiButton-containedSecondary MuiButton-sizeMedium MuiButton-containedSizeMedium MuiButton-root MuiButton-contained MuiButton-containedSecondary MuiButton-sizeMedium MuiButton-containedSizeMedium active css-x1hbuq-MuiTypography-root-MuiLink-root-MuiButtonBase-root-MuiButton-root"
href="/"
tabindex="0"
>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ exports[`FeaturedPostCard should render 1`] = `
class="MuiCardContent-root css-cnb62q-MuiCardContent-root"
>
<div
class="MuiStack-root css-ki96yg-MuiStack-root"
class="MuiStack-root css-1nza621-MuiStack-root"
>
<div
class="MuiTypography-root MuiTypography-h2SemiBold css-1j0n21l-MuiTypography-root"
Expand All @@ -37,7 +37,7 @@ exports[`FeaturedPostCard should render 1`] = `
</h6>
</div>
<div
class="MuiStack-root css-11sh0dx-MuiStack-root"
class="MuiStack-root css-1262us1-MuiStack-root"
>
<div
class="MuiTypography-root MuiTypography-p1 css-iui9m1-MuiTypography-root"
Expand Down
Loading

0 comments on commit 5df20a2

Please sign in to comment.