ft/Removed hard coded content

apps/codeforafrica/content/pages/about-members-individual.md

@@ -1,4 +1,6 @@
 ---
+related-projects:
+  title: Projects
 seo:
   title-template: "%s | Members | About | Code for Africa"
 ---

apps/codeforafrica/content/pages/about-partners-individual.md

@@ -1,4 +1,6 @@
 ---
+related-projects:
+  title: Related Projects
 seo:
   title-template: "%s | Partners | About | Code for Africa"
 ---

apps/codeforafrica/content/pages/contact.md

@@ -60,19 +60,14 @@ contact-form:
 
 
     <!--End mc_embed_signup-->
-join-us:
-  icon:
+join-our-slack:
+  action:
     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!
+    label: Join Our 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
+  title: We are on Slack!
+our-offices:
+  title: Our Offices
 seo:
   title: Contact Us
   description: Let’s start something together!

apps/codeforafrica/content/pages/index.md

@@ -11,11 +11,7 @@ hero:
   image:
     src: /images/group-4429.png
 projects:
-  - 14fdf60f-2928-4776-b208-6641e8413f74
-  - 7e3a1ef1-576d-4428-824d-a12fa774519d
-  - afcfdec9-99d7-4f2c-8bdb-964159c0676d
-  - 07f3259e-2379-4850-83b8-85cacde0fcb8
-  - 31626677-0bc8-49cb-a2e6-1d7e5504d1fe
+  title: Projects
 meet-our-team:
   title: Our pan-African team is spread across the continent
   description: >-

apps/codeforafrica/content/pages/opportunities.md

@@ -2,6 +2,8 @@
 hero:
   title: Opportunities
   subtitle: Come build digital democracies with Code for Africa
+opportunities:
+  title: Opportunities
 seo:
   title: Opportunities
   description: Come build digital democracies with Code for Africa

apps/codeforafrica/content/pages/our-work-individual.md

@@ -1,4 +1,11 @@
 ---
+team:
+  title: Team
+news-stories:
+  title: Related stories
+  articles-count: 3
+related-projects:
+  title: Explore other projects
 seo:
   title-template: "%s | Our Work | Code for Africa"
 ---

apps/codeforafrica/content/pages/our-work.md

@@ -2,6 +2,8 @@
 hero:
   title: Our Work
   subtitle: We launch data-driven initiatives to achieve impactful results
+projects:
+  title: Projects
 seo:
   meta:
     title: Our Work

apps/codeforafrica/content/pages/stories-individual.md

@@ -1,4 +1,7 @@
 ---
+news-stories:
+  title: Recent stories
+  articles-count: 3
 seo:
   title-template: "%s | Stories | Code for Africa"
 ---

apps/codeforafrica/content/pages/stories.md

@@ -1,4 +1,6 @@
 ---
+stories:
+  title: Stories
 seo:
-  title: "Stories"
+  title: Stories
 ---

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

@@ -1,13 +1,15 @@
 import { getCollectionBySlug } from "./utils";
 
+const FIELD_NAME = "contact-form";
+
 function getContactForm() {
-  const { "contact-form": contactForm } = getCollectionBySlug(
-    "content/pages",
-    "contact",
-    ["contact-form"]
-  ).items;
-  const { "embed-code": embedCode } = contactForm || {};
-  return { embedCode };
+  const contactForm = getCollectionBySlug("content/pages", "contact", [
+    FIELD_NAME,
+    "slug",
+  ]).items[FIELD_NAME];
+  const { "embed-code": embedCode, slug } = contactForm || {};
+
+  return { embedCode, slug };
 }
 
 export default getContactForm;

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

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

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

@@ -0,0 +1,10 @@
+import { getCollectionBySlug } from "./utils";
+
+function getJoinUs() {
+  return getCollectionBySlug("content/pages", "contact", [
+    "join-our-slack",
+    "slug",
+  ]).items["join-our-slack"];
+}
+
+export default getJoinUs;

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

@@ -3,13 +3,15 @@ import { getCollectionBySlug } from "./utils";
 const FIELD_NAME = "news-stories";
 
 function getNewsAndStories(page) {
-  const { "articles-count": count, title } = getCollectionBySlug(
-    "content/pages",
-    page,
-    [FIELD_NAME]
-  ).items[FIELD_NAME];
+  const {
+    "articles-count": count,
+    title,
+    slug,
+  } = getCollectionBySlug("content/pages", page, [FIELD_NAME, "slug"]).items[
+    FIELD_NAME
+  ];
 
-  return { count, title };
+  return { count, title, slug };
 }
 
 export default getNewsAndStories;

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

@@ -6,11 +6,12 @@ import { getCollectionBySlug } from "./utils";
 const pagesDir = join(process.cwd(), "content/pages");
 
 function getOurGuidingPrinciples() {
-  const { title, "guiding-principle-list": principleIds } = getCollectionBySlug(
-    pagesDir,
-    "about",
-    ["guiding-principles"]
-  ).items["guiding-principles"];
+  const {
+    title,
+    "guiding-principle-list": principleIds,
+    slug,
+  } = getCollectionBySlug(pagesDir, "about", ["guiding-principles", "slug"])
+    .items["guiding-principles"];
   const allPrinciples = getGuidingPrinciples([
     "id",
     "title",
@@ -20,7 +21,7 @@ function getOurGuidingPrinciples() {
 
   const list =
     principleIds?.map((id) => allPrinciples.find((p) => p.id === id)) ?? null;
-  return { title, list };
+  return { title, list, slug };
 }
 
 export default getOurGuidingPrinciples;

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

@@ -7,11 +7,16 @@ const pageDir = join(process.cwd(), "content/pages");
 
 export default function geOurImpact(page = "index") {
   const {
-    "our-impact": { action = null, "impact-list": impactIds, title = null },
-  } = getCollectionBySlug(pageDir, page, ["our-impact"]).items;
+    "our-impact": {
+      action = null,
+      "impact-list": impactIds,
+      title = null,
+      slug = null,
+    },
+  } = getCollectionBySlug(pageDir, page, ["our-impact", "slug"]).items;
   const impact = getImpactList();
   // 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 };
 }

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

@@ -9,6 +9,7 @@ const pagesDir = join(process.cwd(), "content/pages");
 export default function getOurMission() {
   const { "our-mission": ourMission } = getCollectionBySlug(pagesDir, "about", [
     "our-mission",
+    "slug",
   ]).items;
   ourMission.description = marked(ourMission.description);
 

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

@@ -0,0 +1,9 @@
+import { getCollectionBySlug } from "./utils";
+
+const FIELD_NAME = "our-offices";
+
+export default function getOurOffices(page = "contact") {
+  return getCollectionBySlug("content/pages", page, [FIELD_NAME, "slug"]).items[
+    FIELD_NAME
+  ];
+}

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

@@ -0,0 +1,12 @@
+import { getCollectionBySlug } from "./utils";
+
+const FIELD_NAME = "opportunities";
+
+export default function getOurOpportunities(page = "opportunities") {
+  const { slug } = getCollectionBySlug("content/pages", page, [
+    FIELD_NAME,
+    "slug",
+  ]).items[FIELD_NAME];
+
+  return { slug };
+}

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

@@ -10,11 +10,12 @@ const pageDir = join(process.cwd(), "content/pages");
 export default function geOurPartners(page = "index") {
   const {
     "our-partners": {
+      slug,
       title: originalTitle,
       "partners-list": partnersIds,
       action = null,
     },
-  } = getCollectionBySlug(pageDir, page, ["our-partners"]).items;
+  } = getCollectionBySlug(pageDir, page, ["our-partners", "slug"]).items;
   const title = marked.parseInline(originalTitle);
   const allPartners = getPartners([
     "id",
@@ -31,5 +32,5 @@ export default function geOurPartners(page = "index") {
       ? partnersIds?.map((id) => allPartners.find((p) => p.id === id)) ?? null
       : allPartners;
 
-  return { title, list, action };
+  return { slug, partners: { title, list, action } };
 }

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

@@ -0,0 +1,12 @@
+import { getCollectionBySlug } from "./utils";
+
+const FIELD_NAME = "projects";
+
+export default function geOurProjects(page = "index") {
+  const { slug } = getCollectionBySlug("content/pages", page, [
+    FIELD_NAME,
+    "slug",
+  ]).items[FIELD_NAME];
+
+  return { slug };
+}

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

@@ -0,0 +1,9 @@
+import { getCollectionBySlug } from "./utils";
+
+const FIELD_NAME = "stories";
+
+export default function getOurStories(page = "stories") {
+  return getCollectionBySlug("content/pages", page, [FIELD_NAME, "slug"]).items[
+    FIELD_NAME
+  ];
+}

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

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

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

@@ -0,0 +1,9 @@
+import { getCollectionBySlug } from "./utils";
+
+const FIELD_NAME = "team";
+
+export default function getProjectTeam(page = "our-work-individual") {
+  return getCollectionBySlug("content/pages", page, [FIELD_NAME, "slug"]).items[
+    FIELD_NAME
+  ];
+}

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

@@ -0,0 +1,11 @@
+import { getCollectionBySlug } from "./utils";
+
+const FIELD_NAME = "related-projects";
+
+function getRelatedProjects(page) {
+  return getCollectionBySlug("content/pages", page, [FIELD_NAME, "slug"]).items[
+    FIELD_NAME
+  ];
+}
+
+export default getRelatedProjects;

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

@@ -1,15 +1,22 @@
 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";
 import getOurImpact from "./getOurImpact";
 import getOurMission from "./getOurMission";
+import getOurOffices from "./getOurOffices";
+import getOurOpportunities from "./getOurOpportunities";
 import getOurPartners from "./getOurPartners";
+import getOurProjects from "./getOurProjects";
+import getOurStories from "./getOurStories";
 import getOurTeam from "./getOurTeam";
 import getPartners from "./getPartners";
 import getCmsProjects from "./getProjects";
+import getProjectTeam from "./getProjectTeam";
+import getRelatedProjects from "./getRelatedProjects";
 import getTeam from "./getTeam";
 import getFooter from "./sections/getFooter";
 import getHeader from "./sections/getHeader";
@@ -25,15 +32,22 @@ export {
   getHeader,
   getHero,
   getGetInTouch,
+  getJoinUs,
   getMeetOurTeam,
   getNewsAndStories,
   getOffices,
   getOurGuidingPrinciples,
   getOurImpact,
   getOurMission,
+  getOurOffices,
+  getOurOpportunities,
   getOurPartners,
+  getOurProjects,
+  getOurStories,
   getSeo,
+  getRelatedProjects,
   getOurTeam,
   getPartners,
+  getProjectTeam,
   getTeam,
 };

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

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

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

@@ -8,7 +8,7 @@ const indexPageDir = join(process.cwd(), "content/pages");
 
 export default function getMeetOurTeam(
   page = "index",
-  fields = ["meet-our-team"]
+  fields = ["meet-our-team", "slug"]
 ) {
   const meetOurTeam = getCollectionBySlug(indexPageDir, page, fields).items[
     "meet-our-team"