Merge pull request #434 from CodeForAfrica/latest_promises

Add Promises block and latest promises block

Author: kelvinkipruto

public/cms/latest-promises.png

@@ -0,0 +1,30 @@
+import { Block } from "payload";
+
+const LatestPromises: Block = {
+  slug: "latest-promises",
+  imageURL: "/cms/latest-promises.png",
+  labels: {
+    singular: "Latest Promise",
+    plural: "Latest Promises",
+  },
+  fields: [
+    {
+      name: "title",
+      type: "text",
+      required: true,
+      localized: true,
+    },
+    {
+      name: "seeAllLink",
+      type: "text",
+      required: false,
+      localized: true,
+      admin: {
+        description:
+          "Link to the page where all promises can be viewed. E.g. /promises",
+      },
+    },
+  ],
+};
+
+export default LatestPromises;

public/cms/promises-list.png

@@ -0,0 +1,71 @@
+import { Block } from "payload";
+
+const PromiseList: Block = {
+  slug: "promise-list",
+  imageURL: "/cms/promises-list.png",
+  labels: {
+    singular: "Promise List",
+    plural: "Promise Lists",
+  },
+  fields: [
+    {
+      name: "title",
+      type: "text",
+      required: false,
+      localized: false,
+    },
+    {
+      name: "filterByLabel",
+      type: "text",
+      required: false,
+      localized: true,
+      defaultValue: "Filter By",
+    },
+    {
+      name: "sortByLabel",
+      type: "text",
+      required: false,
+      localized: true,
+      defaultValue: "Sort By",
+    },
+    {
+      name: "filterBy",
+      type: "select",
+      hasMany: true,
+      options: [
+        {
+          label: "Status",
+          value: "status",
+        },
+        {
+          label: "Category",
+          value: "category",
+        },
+      ],
+      defaultValue: "status",
+      required: false,
+      localized: false,
+    },
+    {
+      name: "sortBy",
+      type: "select",
+      hasMany: true,
+
+      options: [
+        {
+          label: "Most Recent",
+          value: "mostRecent",
+        },
+        {
+          label: "Deadline",
+          value: "deadline",
+        },
+      ],
+      defaultValue: "mostRecent",
+      required: false,
+      localized: false,
+    },
+  ],
+};
+
+export default PromiseList;

src/assets/footer-social-fb.svg

@@ -3,6 +3,8 @@ import { ensureUniqueSlug } from "./hooks/ensureUniqueSlug";
 import newsletterSettingsToBlock from "./hooks/newsletterSettingsToBlock";
 import Partners from "@/blocks/Partners";
 import Newsletter from "@/blocks/Newsletter";
+import LatestPromises from "@/blocks/LatestPromises";
+import PromiseList from "@/blocks/PromiseList";
 import { slugField } from "@/fields/slug";
 import { KeyPromises } from "@/blocks/KeyPromises";
 import { ActNow } from "@/blocks/ActNow";
@@ -41,7 +43,15 @@ export const Pages: CollectionConfig = {
     {
       name: "blocks",
       type: "blocks",
-      blocks: [ActNow, Hero, Newsletter, Partners, KeyPromises],
+      blocks: [
+        ActNow,
+        Hero,
+        Newsletter,
+        Partners,
+        LatestPromises,
+        PromiseList,
+        KeyPromises,
+      ],
     },
   ],
   hooks: {

src/assets/footer-social-ln.svg

@@ -4,20 +4,25 @@ import { Fragment } from "react";
 import { KeyPromises } from "./KeyPromises";
 import Newsletter from "./Newsletter";
 import Partners from "./Partners";
+import LatestPromises from "./LatestPromises";
 import { Hero } from "./Hero";
+import Promises from "./Promises";
 
 type BlockProps = {
   blocks: Page["blocks"];
   entity?: PoliticalEntity;
 };
 
-const blockComponents = {
+const blockComponents: Record<string, React.FC<any>> = {
   "act-now": ActNow,
   hero: Hero,
   newsletter: Newsletter,
   partners: Partners,
+  "latest-promises": LatestPromises,
+  "promise-list": Promises,
   "key-promises": KeyPromises,
 };
+
 export const BlockRenderer = ({ blocks, entity }: BlockProps) => {
   const hasBlocks = blocks && Array.isArray(blocks) && blocks.length > 0;
 
@@ -31,7 +36,6 @@ export const BlockRenderer = ({ blocks, entity }: BlockProps) => {
             if (Block) {
               return (
                 <div key={index}>
-                  {/* @ts-expect-error there may be some mismatch between the expected types here */}
                   <Block {...block} entitySlug={entity?.slug} />
                 </div>
               );