Merge branch 'develop' into ft/codeforafrica-contact-form

Signed-off-by: Kipruto <[email protected]>
CodeForAfrica · Sep 20, 2023 · 842011d · 842011d
2 parents 6565464 + 35caf0d
commit 842011d
Show file tree

Hide file tree

Showing 55 changed files with 57 additions and 3,894 deletions.
diff --git a/.github/workflows/codeforafrica-deploy-review-app.yml b/.github/workflows/codeforafrica-deploy-review-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_KEY }}
-            GHOST_URL=${{ secrets.GHOST_URL }}
-            GHOST_API_KEY=${{ secrets.GHOST_API_KEY }}
             NEXT_PUBLIC_APP_LOGO_URL=${{ secrets.NEXT_PUBLIC_APP_CFA_LOGO_URL }}
             NEXT_PUBLIC_APP_NAME=${{ secrets.NEXT_PUBLIC_APP_CFA_NAME }}
           cache-from: type=local,src=/tmp/.buildx-cache

diff --git a/Dockerfile.codeforafrica b/Dockerfile.codeforafrica
@@ -33,9 +33,7 @@ RUN pnpm install --recursive --offline --frozen-lockfile
 ARG PORT=3000 \
     MONGODB_URL \
     PAYLOAD_SECRET \
-    NEXT_PUBLIC_APP_URL=http://localhost:3000 \
-    GHOST_URL \
-    GHOST_API_KEY
+    NEXT_PUBLIC_APP_URL=http://localhost:3000
 
 RUN pnpm build-next --filter=codeforafrica
 
@@ -62,8 +60,6 @@ ENV NODE_ENV=production \
     PAYLOAD_CONFIG_PATH=${PAYLOAD_CONFIG_PATH} \
     PAYLOAD_SECRET=${PAYLOAD_SECRET} \
     MONGODB_URL=${MONGODB_URL} \
-    GHOST_URL=${GHOST_URL} \
-    GHOST_API_KEY=${GHOST_API_KEY} \
     NEXT_PUBLIC_APP_LOGO_URL=${NEXT_PUBLIC_APP_LOGO_URL} \
     NEXT_PUBLIC_APP_NAME=${NEXT_PUBLIC_APP_NAME} \
     NEXT_PUBLIC_APP_URL=${NEXT_PUBLIC_APP_URL}

diff --git a/apps/codeforafrica/public/images/cms/blocks/get_in_touch.jpg b/apps/codeforafrica/public/images/cms/blocks/get_in_touch.jpg
diff --git a/apps/codeforafrica/src/components/GetInTouch/GetInTouch.js b/apps/codeforafrica/src/components/GetInTouch/GetInTouch.js
@@ -8,7 +8,7 @@ import TwoToneBackground from "@/codeforafrica/components/TwoToneBackground";
 
 const GetInTouch = React.forwardRef(function GetInTouch(props, ref) {
   const {
-    action: { href, content },
+    action: { href, label },
     subtitle,
     title,
     sx,
@@ -59,7 +59,7 @@ const GetInTouch = React.forwardRef(function GetInTouch(props, ref) {
               },
             }}
           >
-            {content}
+            {label}
           </Button>
         </Stack>
       </Section>

diff --git a/apps/codeforafrica/src/components/GetInTouch/GetInTouch.snap.js b/apps/codeforafrica/src/components/GetInTouch/GetInTouch.snap.js
@@ -36,6 +36,7 @@ exports[`<GetInTouch /> renders unchanged 1`] = `
               viewbox="0 0 24 24"
             />
           </span>
+          Get in touch
         </a>
       </div>
     </div>

diff --git a/apps/codeforafrica/src/components/TeamMembers/TeamMembers.snap.js b/apps/codeforafrica/src/components/TeamMembers/TeamMembers.snap.js
@@ -1,128 +1,3 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`<TeamMembers /> renders unchanged 1`] = `
-<div>
-  <div
-    class="MuiContainer-root MuiContainer-maxWidthLg MuiContainer-fixed MuiContainer-disableGutters css-eoqn3z-MuiContainer-root"
-  >
-    <div
-      class="MuiTypography-root MuiTypography-h5Small css-1qwjj5w-MuiTypography-root"
-    >
-      Team
-    </div>
-    <div
-      class="MuiBox-root css-n6p80u"
-    >
-      <div
-        class="MuiGrid-root MuiGrid-container css-1p3emjt-MuiGrid-root"
-      >
-        <div
-          class="MuiGrid-root MuiGrid-item css-13i4rnv-MuiGrid-root"
-        >
-          <div
-            class="MuiPaper-root MuiPaper-elevation MuiPaper-elevation0 MuiCard-root css-wixki0-MuiPaper-root-MuiCard-root"
-          >
-            <a
-              class="MuiTypography-root MuiTypography-inherit MuiLink-root MuiLink-underlineAlways MuiButtonBase-root MuiCardActionArea-root css-mfu8qg-MuiTypography-root-MuiLink-root-MuiButtonBase-root-MuiCardActionArea-root"
-              href="/about/members/allan-cheboi"
-              tabindex="0"
-            >
-              <img
-                class="MuiCardMedia-root MuiCardMedia-media MuiCardMedia-img css-ys68yq-MuiCardMedia-root"
-                src="/images/image16.png"
-              />
-              <div
-                class="MuiCardContent-root css-1bqtlyx-MuiCardContent-root"
-              >
-                <div
-                  class="MuiTypography-root MuiTypography-body1SemiBold css-1nw8xqn-MuiTypography-root"
-                >
-                  Allan Cheboi
-                </div>
-                <div
-                  class="MuiTypography-root MuiTypography-body1 css-17e24dh-MuiTypography-root"
-                >
-                  Senior investigations manager
-                </div>
-              </div>
-              <span
-                class="MuiCardActionArea-focusHighlight css-1v2exvi-MuiCardActionArea-focusHighlight"
-              />
-            </a>
-          </div>
-        </div>
-        <div
-          class="MuiGrid-root MuiGrid-item css-13i4rnv-MuiGrid-root"
-        >
-          <div
-            class="MuiPaper-root MuiPaper-elevation MuiPaper-elevation0 MuiCard-root css-wixki0-MuiPaper-root-MuiCard-root"
-          >
-            <a
-              class="MuiTypography-root MuiTypography-inherit MuiLink-root MuiLink-underlineAlways MuiButtonBase-root MuiCardActionArea-root css-mfu8qg-MuiTypography-root-MuiLink-root-MuiButtonBase-root-MuiCardActionArea-root"
-              href="/about/members/amanda-strydom"
-              tabindex="0"
-            >
-              <img
-                class="MuiCardMedia-root MuiCardMedia-media MuiCardMedia-img css-ys68yq-MuiCardMedia-root"
-                src="/images/amanda.jpg"
-              />
-              <div
-                class="MuiCardContent-root css-1bqtlyx-MuiCardContent-root"
-              >
-                <div
-                  class="MuiTypography-root MuiTypography-body1SemiBold css-1nw8xqn-MuiTypography-root"
-                >
-                  Amanda Strydom
-                </div>
-                <div
-                  class="MuiTypography-root MuiTypography-body1 css-17e24dh-MuiTypography-root"
-                >
-                  Senior programme manager
-                </div>
-              </div>
-              <span
-                class="MuiCardActionArea-focusHighlight css-1v2exvi-MuiCardActionArea-focusHighlight"
-              />
-            </a>
-          </div>
-        </div>
-        <div
-          class="MuiGrid-root MuiGrid-item css-13i4rnv-MuiGrid-root"
-        >
-          <div
-            class="MuiPaper-root MuiPaper-elevation MuiPaper-elevation0 MuiCard-root css-wixki0-MuiPaper-root-MuiCard-root"
-          >
-            <a
-              class="MuiTypography-root MuiTypography-inherit MuiLink-root MuiLink-underlineAlways MuiButtonBase-root MuiCardActionArea-root css-mfu8qg-MuiTypography-root-MuiLink-root-MuiButtonBase-root-MuiCardActionArea-root"
-              href="/about/members/anita-igbine"
-              tabindex="0"
-            >
-              <img
-                class="MuiCardMedia-root MuiCardMedia-media MuiCardMedia-img css-ys68yq-MuiCardMedia-root"
-                src="/images/image1.jpg"
-              />
-              <div
-                class="MuiCardContent-root css-1bqtlyx-MuiCardContent-root"
-              >
-                <div
-                  class="MuiTypography-root MuiTypography-body1SemiBold css-1nw8xqn-MuiTypography-root"
-                >
-                  Anita Igbine
-                </div>
-                <div
-                  class="MuiTypography-root MuiTypography-body1 css-17e24dh-MuiTypography-root"
-                >
-                  Investigative data analyst
-                </div>
-              </div>
-              <span
-                class="MuiCardActionArea-focusHighlight css-1v2exvi-MuiCardActionArea-focusHighlight"
-              />
-            </a>
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
-</div>
-`;
+exports[`<TeamMembers /> renders unchanged 1`] = `<div />`;
diff --git a/apps/codeforafrica/src/components/TeamMembers/TeamMembers.test.js b/apps/codeforafrica/src/components/TeamMembers/TeamMembers.test.js
@@ -3,15 +3,13 @@ import React from "react";
 
 import TeamMembers from "./TeamMembers";
 
-import { team } from "@/codeforafrica/lib";
 import theme from "@/codeforafrica/theme";
 
 // eslint-disable-next-line testing-library/render-result-naming-convention
 const render = createRender({ theme });
 
 const defaultProps = {
   title: "Team",
-  team: team.slice(0, 3),
 };
 
 describe("<TeamMembers />", () => {

diff --git a/apps/codeforafrica/src/lib/api.ghost/ghost.js b/apps/codeforafrica/src/lib/api.ghost/ghost.js
diff --git a/apps/codeforafrica/src/lib/api.ghost/index.js b/apps/codeforafrica/src/lib/api.ghost/index.js
-Original file line number
+Diff line change
@@ Expand Up / @@ -36,6 +36,7 @@ exports[`<GetInTouch /> renders unchanged 1`] = ` @@
                   viewbox="0 0 24 24"
                 />
               </span>
+              Get in touch
             </a>
           </div>
         </div>
@@ Expand Down @@