Merge pull request #650 from CodeForAfrica/chore/qol

Quality of life
CodeForAfrica · Nov 30, 2023 · 3da3d01 · 3da3d01
2 parents 5df20a2 + 72290f8
commit 3da3d01
Show file tree

Hide file tree

Showing 152 changed files with 2,845 additions and 6,265 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -17,7 +17,6 @@ jobs:
     timeout-minutes: 15
     runs-on: ${{ matrix.os }}
     env:
-      GHOST_API_KEY: ${{ secrets.GHOST_API_KEY }}
       GOOGLE_API_KEY: ${{ secrets.GOOGLE_API_KEY }}
       MONGO_URL: ${{ secrets.MONGO_URL }}
       PROMISE_TRACKER_SENTRY_DSN: ${{ secrets.PROMISE_TRACKER_SENTRY_DSN }}

diff --git a/.github/workflows/codeforafrica-deploy-dev-app.yml b/.github/workflows/codeforafrica-deploy-dev-app.yml
@@ -57,8 +57,6 @@ jobs:
             MONGODB_URL=${{ secrets.CODEFORAFRICA_MONGO_URL }}/${{ env.APP_NAME }}
             NEXT_PUBLIC_APP_URL=${{ env.NEXT_PUBLIC_APP_URL }}
             PAYLOAD_SECRET=${{ secrets.CODEFORAFRICA_PAYLOAD_SECRET }}
-            GHOST_URL=${{ secrets.GHOST_URL }}
-            GHOST_API_KEY=${{ secrets.GHOST_API_KEY }}
             NEXT_PUBLIC_APP_LOGO_URL=${{ secrets.NEXT_PUBLIC_CODEFORAFRICA_APP_LOGO_URL }}
             NEXT_PUBLIC_APP_NAME=${{ secrets.NEXT_PUBLIC_CODEFORAFRICA_APP_NAME }}
           cache-from: type=local,src=/tmp/.buildx-cache

diff --git a/.github/workflows/codeforafrica-deploy-prod.yml b/.github/workflows/codeforafrica-deploy-prod.yml
@@ -76,10 +76,10 @@ jobs:
         with:
           build-args: |
             MONGODB_URL=${{ secrets.CODEFORAFRICA_MONGODB_URL }}
-            NEXT_PUBLIC_APP_URL=${{ env.NEXT_PUBLIC_APP_URL }}
-            PAYLOAD_SECRET=${{ secrets.CODEFORAFRICA_PAYLOAD_SECRET }}
             NEXT_PUBLIC_APP_LOGO_URL=${{ secrets.NEXT_PUBLIC_CODEFORAFRICA_APP_LOGO_URL }}
             NEXT_PUBLIC_APP_NAME=${{ secrets.NEXT_PUBLIC_CODEFORAFRICA_APP_NAME }}
+            NEXT_PUBLIC_APP_URL=${{ env.NEXT_PUBLIC_APP_URL }}
+            PAYLOAD_SECRET=${{ secrets.CODEFORAFRICA_PAYLOAD_SECRET }}
           cache-from: type=local,src=/tmp/.buildx-cache
           cache-to: type=local,dest=/tmp/.buildx-cache-new
           context: .

diff --git a/.github/workflows/codeforafrica-deploy-review-app.yml b/.github/workflows/codeforafrica-deploy-review-app.yml
@@ -55,10 +55,10 @@ jobs:
         with:
           build-args: |
             MONGODB_URL=${{ secrets.CODEFORAFRICA_MONGO_URL }}/${{ env.APP_NAME }}
-            NEXT_PUBLIC_APP_URL=${{ env.NEXT_PUBLIC_APP_URL }}
-            PAYLOAD_SECRET=${{ secrets.CODEFORAFRICA_PAYLOAD_SECRET }}
             NEXT_PUBLIC_APP_LOGO_URL=${{ secrets.NEXT_PUBLIC_CODEFORAFRICA_APP_LOGO_URL }}
             NEXT_PUBLIC_APP_NAME=${{ secrets.NEXT_PUBLIC_CODEFORAFRICA_APP_NAME }}
+            NEXT_PUBLIC_APP_URL=${{ env.NEXT_PUBLIC_APP_URL }}
+            PAYLOAD_SECRET=${{ secrets.CODEFORAFRICA_PAYLOAD_SECRET }}
           cache-from: type=local,src=/tmp/.buildx-cache
           cache-to: type=local,dest=/tmp/.buildx-cache-new
           context: .

diff --git a/Dockerfile b/Dockerfile
@@ -29,7 +29,6 @@ ARG NEXT_TELEMETRY_DISABLED=1 \
     # Since some pages are completely rendered during build, we need
     # these secret ARGs defined in the builder
     GOOGLE_API_KEY="" \
-    GHOST_API_KEY \
     # APP is build time arg only. Shouldn't be used in the image.
     APP
 

diff --git a/apps/charterafrica/package.json b/apps/charterafrica/package.json
@@ -36,8 +36,8 @@
     "db-rollback": "migrate-mongo down"
   },
   "dependencies": {
-    "@aws-sdk/client-s3": "^3.458.0",
-    "@aws-sdk/lib-storage": "^3.458.0",
+    "@aws-sdk/client-s3": "^3.461.0",
+    "@aws-sdk/lib-storage": "^3.461.0",
     "@commons-ui/core": "workspace:*",
     "@commons-ui/next": "workspace:*",
     "@emotion/cache": "^11.11.0",
@@ -54,44 +54,43 @@
     "@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",
+    "@sentry/nextjs": "^7.83.0",
     "airtable": "^0.12.2",
     "dotenv": "^16.3.1",
     "express": "^4.18.2",
     "leaflet": "^1.9.4",
-    "migrate-mongo": "^10.0.0",
-    "monaco-editor": "^0.38.0",
-    "nanoid": "^4.0.2",
+    "migrate-mongo": "^11.0.0",
+    "monaco-editor": "^0.44.0",
     "next": "^14.0.3",
-    "next-seo": "^5.15.0",
+    "next-seo": "^6.4.0",
     "nodemailer-sendgrid": "^1.0.3",
     "payload": "^1.15.8",
     "prop-types": "^15.8.1",
     "qs": "^6.11.2",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "react-leaflet": "^4.2.1",
-    "react-share": "^4.4.1",
+    "react-share": "^5.0.3",
     "react-swipeable-views-react-18-fix": "^0.14.1",
     "scheduler": "^0.23.0",
-    "sharp": "^0.32.6",
-    "slate": "^0.94.1",
-    "swr": "^1.3.0",
+    "sharp": "^0.33.0",
+    "slate": "^0.101.1",
+    "swr": "^2.2.4",
     "video.js": "^8.6.1",
     "videojs-youtube": "^3.0.1"
   },
   "devDependencies": {
-    "@babel/core": "^7.23.3",
+    "@babel/core": "^7.23.5",
     "@babel/preset-react": "^7.23.3",
     "@babel/register": "^7.22.15",
-    "@babel/runtime": "^7.23.4",
+    "@babel/runtime": "^7.23.5",
     "@commons-ui/testing-library": "workspace:*",
-    "@playwright/test": "^1.40.0",
-    "@svgr/webpack": "^6.5.1",
+    "@playwright/test": "^1.40.1",
+    "@svgr/webpack": "^8.1.0",
     "@swc/core": "^1.3.99",
     "@types/express": "^4.17.21",
     "@types/node": "^18.18.13",
-    "@types/react": "^18.2.38",
+    "@types/react": "^18.2.39",
     "babel-jest": "^29.7.0",
     "eslint": "^8.54.0",
     "eslint-config-commons-ui": "workspace:*",
@@ -100,12 +99,11 @@
     "identity-obj-proxy": "^3.0.0",
     "jest": "^29.7.0",
     "jest-config-commons-ui": "workspace:*",
-    "nodemon": "^2.0.22",
     "playwright-config-commons-ui": "workspace:*",
     "prettier": "^3.1.0",
     "react-test-renderer": "^18.2.0",
     "ts-node": "^10.9.1",
-    "typescript": "^4.9.5",
+    "typescript": "^5.3.2",
     "webpack": "^5.89.0"
   },
   "engines": {

diff --git a/apps/charterafrica/src/components/Dataset/Dataset.snap.js b/apps/charterafrica/src/components/Dataset/Dataset.snap.js
@@ -94,7 +94,6 @@ exports[`<Dataset /> renders unchanged 1`] = `
               class="MuiStack-root css-6za6r5-MuiStack-root"
             >
               <button
-                aria-label="twitter"
                 class="react-share__ShareButton"
                 medium="twitter"
                 style="background-color: transparent; padding: 0px; cursor: pointer;"
@@ -107,7 +106,6 @@ exports[`<Dataset /> renders unchanged 1`] = `
                 />
               </button>
               <button
-                aria-label="facebook"
                 class="react-share__ShareButton"
                 medium="facebook"
                 style="background-color: transparent; padding: 0px; cursor: pointer;"
@@ -120,7 +118,6 @@ exports[`<Dataset /> renders unchanged 1`] = `
                 />
               </button>
               <button
-                aria-label="linkedin"
                 class="react-share__ShareButton"
                 medium="linkedin"
                 style="background-color: transparent; padding: 0px; cursor: pointer;"

diff --git a/apps/charterafrica/src/components/Document/Document.snap.js b/apps/charterafrica/src/components/Document/Document.snap.js
@@ -67,7 +67,6 @@ exports[`<Document /> renders unchanged 1`] = `
                 class="MuiStack-root css-6za6r5-MuiStack-root"
               >
                 <button
-                  aria-label="twitter"
                   class="react-share__ShareButton"
                   medium="twitter"
                   style="background-color: transparent; padding: 0px; cursor: pointer;"
@@ -80,7 +79,6 @@ exports[`<Document /> renders unchanged 1`] = `
                   />
                 </button>
                 <button
-                  aria-label="facebook"
                   class="react-share__ShareButton"
                   medium="facebook"
                   style="background-color: transparent; padding: 0px; cursor: pointer;"
@@ -93,7 +91,6 @@ exports[`<Document /> renders unchanged 1`] = `
                   />
                 </button>
                 <button
-                  aria-label="linkedin"
                   class="react-share__ShareButton"
                   medium="linkedin"
                   style="background-color: transparent; padding: 0px; cursor: pointer;"

diff --git a/apps/charterafrica/src/components/ShareThisPage/ShareThisPage.snap.js b/apps/charterafrica/src/components/ShareThisPage/ShareThisPage.snap.js
@@ -14,7 +14,6 @@ exports[`<ShareThisPage /> renders unchanged 1`] = `
       class="MuiStack-root css-6za6r5-MuiStack-root"
     >
       <button
-        aria-label="twitter"
         class="react-share__ShareButton"
         medium="twitter"
         style="background-color: transparent; padding: 0px; cursor: pointer;"
@@ -27,7 +26,6 @@ exports[`<ShareThisPage /> renders unchanged 1`] = `
         />
       </button>
       <button
-        aria-label="facebook"
         class="react-share__ShareButton"
         medium="facebook"
         style="background-color: transparent; padding: 0px; cursor: pointer;"
@@ -40,7 +38,6 @@ exports[`<ShareThisPage /> renders unchanged 1`] = `
         />
       </button>
       <button
-        aria-label="linkedin"
         class="react-share__ShareButton"
         medium="linkedin"
         style="background-color: transparent; padding: 0px; cursor: pointer;"

diff --git a/apps/charterafrica/src/components/Tool/Tool.snap.js b/apps/charterafrica/src/components/Tool/Tool.snap.js
@@ -138,7 +138,6 @@ exports[`<Tool /> renders unchanged 1`] = `
                     class="MuiStack-root css-6za6r5-MuiStack-root"
                   >
                     <button
-                      aria-label="twitter"
                       class="react-share__ShareButton"
                       medium="twitter"
                       style="background-color: transparent; padding: 0px; cursor: pointer;"
@@ -151,7 +150,6 @@ exports[`<Tool /> renders unchanged 1`] = `
                       />
                     </button>
                     <button
-                      aria-label="facebook"
                       class="react-share__ShareButton"
                       medium="facebook"
                       style="background-color: transparent; padding: 0px; cursor: pointer;"
@@ -164,7 +162,6 @@ exports[`<Tool /> renders unchanged 1`] = `
                       />
                     </button>
                     <button
-                      aria-label="linkedin"
                       class="react-share__ShareButton"
                       medium="linkedin"
                       style="background-color: transparent; padding: 0px; cursor: pointer;"

diff --git a/apps/charterafrica/tsconfig.json b/apps/charterafrica/tsconfig.json
@@ -22,5 +22,7 @@
   },
   "include": ["next-env.d.ts", "**/*.ts", "**/*.tsx"],
   "exclude": ["build", "dist", "node_modules"],
-  "ts-node": {}
+  "ts-node": {
+    "swc": true
+  }
 }
diff --git a/apps/codeforafrica/.env b/apps/codeforafrica/.env
@@ -6,8 +6,3 @@ NEXT_PUBLIC_IMAGE_UNOPTIMIZED="true"
 NEXT_PUBLIC_VERCEL_URL=${VERCEL_URL}
 NEXT_PUBLIC_APP_DIRECTORY="apps/codeforafrica/"
 NEXT_PUBLIC_GOOGLE_ANALYTICS_ID="G-QVY4THBKNT"
-GHOST_URL="https://longform.codeforafrica.org"
-GITHUB_BACKEND_REPO="codeforafrica/ui"
-GITHUB_BACKEND_BRANCH="main"
-GITHUB_AUTH_ENDPOINT="api/oauth/auth"
-GIT_REPO_DIRECTORY=../../
diff --git a/apps/codeforafrica/content/badges/the-best-award.md b/apps/codeforafrica/content/badges/the-best-award.md
diff --git a/apps/codeforafrica/content/badges/the-news-award.md b/apps/codeforafrica/content/badges/the-news-award.md
diff --git a/apps/codeforafrica/content/badges/the-press-award.md b/apps/codeforafrica/content/badges/the-press-award.md
diff --git a/apps/codeforafrica/content/donors/drone-deployed.md b/apps/codeforafrica/content/donors/drone-deployed.md
diff --git a/apps/codeforafrica/content/donors/innovateafrica.md b/apps/codeforafrica/content/donors/innovateafrica.md
diff --git a/apps/codeforafrica/content/donors/world-bank.md b/apps/codeforafrica/content/donors/world-bank.md
diff --git a/apps/codeforafrica/content/guiding-principles/partnering-for-excellence.md b/apps/codeforafrica/content/guiding-principles/partnering-for-excellence.md
diff --git a/apps/codeforafrica/content/guiding-principles/we-are-action-oriented.md b/apps/codeforafrica/content/guiding-principles/we-are-action-oriented.md
diff --git a/apps/codeforafrica/content/guiding-principles/we-empower-citizens.md b/apps/codeforafrica/content/guiding-principles/we-empower-citizens.md
diff --git a/apps/codeforafrica/content/guiding-principles/we-help-build-ecosystems.md b/apps/codeforafrica/content/guiding-principles/we-help-build-ecosystems.md
diff --git a/apps/codeforafrica/content/guiding-principles/we-operate-in-public.md b/apps/codeforafrica/content/guiding-principles/we-operate-in-public.md
diff --git a/apps/codeforafrica/content/guiding-principles/we-show-what’s-possible.md b/apps/codeforafrica/content/guiding-principles/we-show-what’s-possible.md
diff --git a/apps/codeforafrica/content/impact/beneficiaries-trained.md b/apps/codeforafrica/content/impact/beneficiaries-trained.md
diff --git a/apps/codeforafrica/content/impact/countries-we-operate-in.md b/apps/codeforafrica/content/impact/countries-we-operate-in.md
diff --git a/apps/codeforafrica/content/impact/datasets-produced.md b/apps/codeforafrica/content/impact/datasets-produced.md
diff --git a/apps/codeforafrica/content/impact/initiatives.md b/apps/codeforafrica/content/impact/initiatives.md
diff --git a/apps/codeforafrica/content/impact/international-partners.md b/apps/codeforafrica/content/impact/international-partners.md