ft/Removed hard coded content

apps/codeforafrica/content/pages/contact-us-join-us.md

@@ -0,0 +1,8 @@
+---
+join-us:
+  title: " We are on Slack!"
+  subtitle: " Join us"
+  action:
+    label: Join Our Slack
+    href: https://docs.google.com/forms/d/e/1FAIpQLSdkfLU2yi2S1_7D27Z0I1TumkWy5brlam809Od9cc6CnXGA-A/viewform
+---

apps/codeforafrica/content/pages/contact.md

@@ -60,19 +60,6 @@ contact-form:
 
 
     <!--End mc_embed_signup-->
-join-us:
-  icon:
-    href: https://docs.google.com/forms/d/e/1FAIpQLSdkfLU2yi2S1_7D27Z0I1TumkWy5brlam809Od9cc6CnXGA-A/viewform
-    src: /images/type-slack-size-64-color-currentcolor.svg
-  title: We are on Slack!
-  subtitle: Join us
-  action: JOIN OUR SLACK
-  offices-addresses:
-    - f80da5cc-a72c-4573-abe4-cf0432f1dd87
-    - 309d67f8-6bb8-46fd-873f-d0475ddee974
-    - 54814d5a-d844-425d-aa3d-f466a2e71afd
-    - a57c5c5a-32ab-4e00-a57f-f8b050b58e63
-    - 4f079340-a9b1-464a-801a-4edabb67b6e8
 seo:
   title: Contact Us
   description: Let’s start something together!

apps/codeforafrica/src/lib/api.netlify-cms/getGetInTouch.js

@@ -1,7 +1,9 @@
 import { getCollectionBySlug } from "./utils";
 
 export default function getGetInTouch() {
-  return getCollectionBySlug("content/pages", "about", ["get-in-touch"]).items[
-    "get-in-touch"
-  ];
+  const getInTouch = getCollectionBySlug("content/pages", "about", [
+    "get-in-touch",
+  ]).items["get-in-touch"];
+
+  return { ...getInTouch, slug: "get-in-touch" };
 }

apps/codeforafrica/src/lib/api.netlify-cms/getJoinUs.js

@@ -0,0 +1,13 @@
+import { getCollectionBySlug } from "./utils";
+
+function getJoinUs() {
+  const { "join-us": joinUs } = getCollectionBySlug(
+    "content/pages",
+    "contact-us-join-us",
+    ["join-us"]
+  ).data;
+
+  return { ...joinUs, slug: "join-our-slack" };
+}
+
+export default getJoinUs;

apps/codeforafrica/src/lib/api.netlify-cms/getOurGuidingPrinciples.js

@@ -20,7 +20,7 @@ function getOurGuidingPrinciples() {
 
   const list =
     principleIds?.map((id) => allPrinciples.find((p) => p.id === id)) ?? null;
-  return { title, list };
+  return { title, list, slug: "guiding-principles" };
 }
 
 export default getOurGuidingPrinciples;

apps/codeforafrica/src/lib/api.netlify-cms/getOurImpact.js

@@ -13,5 +13,5 @@ export default function geOurImpact(page = "index") {
   // Need to maintain order of how impact were selected in ourImpact
   const list = impactIds?.map((id) => impact.find((i) => i.id === id)) ?? null;
 
-  return { action, list, title };
+  return { action, list, title, slug: "our-impact" };
 }

apps/codeforafrica/src/lib/api.netlify-cms/getOurMission.js

@@ -11,6 +11,7 @@ export default function getOurMission() {
     "our-mission",
   ]).items;
   ourMission.description = marked(ourMission.description);
+  ourMission.slug = "our-mission";
 
   return ourMission;
 }

apps/codeforafrica/src/lib/api.netlify-cms/getOurTeam.js

@@ -5,5 +5,5 @@ export default function geOurPartners() {
     "our-team": { title },
   } = getCollectionBySlug("content/pages", "about", ["our-team"]).items;
 
-  return { title };
+  return { title, slug: "our-team" };
 }

apps/codeforafrica/src/lib/api.netlify-cms/index.js

@@ -1,6 +1,7 @@
 import getBody from "./getBody";
 import getContactForm from "./getContactForm";
 import getGetInTouch from "./getGetInTouch";
+import getJoinUs from "./getJoinUs";
 import getNewsAndStories from "./getNewsAndStories";
 import getOffices from "./getOffices";
 import getOurGuidingPrinciples from "./getOurGuidingPrinciples";
@@ -25,6 +26,7 @@ export {
   getHeader,
   getHero,
   getGetInTouch,
+  getJoinUs,
   getMeetOurTeam,
   getNewsAndStories,
   getOffices,

apps/codeforafrica/src/lib/api.netlify-cms/sections/getHero.js

@@ -9,6 +9,7 @@ const indexPageDir = join(process.cwd(), "content/pages");
 export default function getHero(page, fields = ["hero"]) {
   const { hero } = getCollectionBySlug(indexPageDir, page, fields).items;
   hero.title = marked.parseInline(hero.title);
+  hero.slug = "hero";
 
   return hero;
 }

apps/codeforafrica/src/lib/api.netlify-cms/sections/getMeetOurTeam.js

@@ -15,5 +15,6 @@ export default function getMeetOurTeam(
   ];
   meetOurTeam.logo = meetOurTeam.image?.src;
   meetOurTeam.description = marked(meetOurTeam.description);
+  meetOurTeam.slug = "meet-our-team";
   return meetOurTeam;
 }

apps/codeforafrica/src/lib/index.js

@@ -7,6 +7,7 @@ import {
   getGetInTouch,
   getHeader,
   getHero,
+  getJoinUs,
   getMeetOurTeam,
   getNewsAndStories,
   getOffices,
@@ -156,7 +157,7 @@ async function getProcessedNewsAndStories() {
   const allStories = await getAllStories();
   const articles = prioritiseFeaturedStory(allStories).slice(0, count);
 
-  return { title, articles };
+  return { title, articles, slug: "news-stories" };
 }
 
 async function getHomePageStaticProps() {
@@ -167,25 +168,22 @@ async function getHomePageStaticProps() {
       sections: [
         {
           ...getHero("index"),
-          slug: "hero",
         },
         {
           slug: "projects",
           projects,
           tags: getProjectTags({ includeAll: false }),
         },
-        { ...meetOurTeam, slug: "meet-our-team" },
+        { ...meetOurTeam },
         {
           ...(await getProcessedNewsAndStories()),
-          slug: "news-stories",
         },
         {
           slug: "our-partners",
           partners: getOurPartners(),
         },
         {
           ...getOurImpact(),
-          slug: "our-impact",
         },
       ],
       footer,
@@ -242,7 +240,6 @@ async function getOpportunitiesPageStaticProps() {
       seo,
       sections: [
         {
-          slug: "hero",
           ...getHero("opportunities"),
         },
         {
@@ -288,7 +285,6 @@ function getImprintPageStaticProps() {
       sections: [
         {
           ...getHero("imprint"),
-          slug: "hero",
         },
       ],
       footer,
@@ -308,7 +304,6 @@ function getPrivacyPageStaticProps() {
       sections: [
         {
           ...getHero("privacy-policy"),
-          slug: "hero",
         },
       ],
       footer,
@@ -371,7 +366,6 @@ function getProjectsPageStaticProps() {
       seo,
       sections: [
         {
-          slug: "hero",
           ...getHero("our-work"),
         },
         {
@@ -491,15 +485,12 @@ function getAboutImpactPageStaticProps() {
       sections: [
         {
           ...getHero("about"),
-          slug: "hero",
         },
         {
-          slug: "our-impact",
           ...getOurImpact("about"),
         },
         {
           ...getGetInTouch(),
-          slug: "get-in-touch",
         },
       ],
       footer,
@@ -549,18 +540,15 @@ function getAboutMembersPageStaticProps() {
       sections: [
         {
           ...getHero("about"),
-          slug: "hero",
         },
         {
           ...getOurTeam(),
           pathname: "/about/members",
           tags: getMembersFieldTags(),
           team: getMembers(),
-          slug: "our-team",
         },
         {
           ...getGetInTouch(),
-          slug: "get-in-touch",
         },
       ],
       footer,
@@ -579,34 +567,28 @@ function getAboutPageStaticProps() {
       sections: [
         {
           ...getHero("about"),
-          slug: "hero",
         },
         {
           ...getOurMission(),
-          slug: "our-mission",
         },
         {
           ...getOurGuidingPrinciples(),
-          slug: "guiding-principles",
         },
 
         {
           ...getOurTeam(),
           tags: getMembersFieldTags(),
           team: getMembers(),
-          slug: "our-team",
         },
         {
           slug: "our-partners",
           partners: getOurPartners("about"),
         },
         {
           ...getOurImpact("about"),
-          slug: "our-impact",
         },
         {
           ...getGetInTouch(),
-          slug: "get-in-touch",
         },
       ],
       footer,
@@ -659,15 +641,13 @@ function getAboutPartnersPageStaticProps() {
       sections: [
         {
           ...getHero("about"),
-          slug: "hero",
         },
         {
           slug: "our-partners",
           partners: getOurPartners("about"),
         },
         {
           ...getGetInTouch(),
-          slug: "get-in-touch",
         },
       ],
       footer,
@@ -685,21 +665,14 @@ function getContactPageStaticProps() {
       seo,
       sections: [
         {
-          slug: "hero",
           ...getHero("contact"),
         },
         {
           ...getContactForm(),
           slug: "contact-form",
         },
         {
-          slug: "join-our-slack",
-          title: "We are on Slack!",
-          subtitle: "Join us",
-          action: {
-            label: "Join our Slack",
-            href: "https://docs.google.com/forms/d/e/1FAIpQLSdkfLU2yi2S1_7D27Z0I1TumkWy5brlam809Od9cc6CnXGA-A/viewform",
-          },
+          ...getJoinUs(),
         },
         {
           slug: "office-addresses",
@@ -728,7 +701,7 @@ async function getProcessedRecentStories(page) {
   const allStories = await getAllStories();
   const { title, count = 3 } = getNewsAndStories(page);
   const articles = allStories.slice(0, count);
-  return { title, articles };
+  return { title, articles, slug: "news-stories" };
 }
 
 async function getErrorPageStaticProps() {
@@ -740,11 +713,9 @@ async function getErrorPageStaticProps() {
       sections: [
         {
           ...getHero("error"),
-          slug: "hero",
         },
         {
           ...(await getProcessedRecentStories("error")),
-          slug: "news-stories",
         },
       ],
       footer,
@@ -763,11 +734,9 @@ async function get404PageStaticProps() {
       sections: [
         {
           ...getHero("404"),
-          slug: "hero",
         },
         {
           ...(await getProcessedRecentStories("404")),
-          slug: "news-stories",
           title: "Recent Stories",
         },
       ],