Merge branch 'dev' into Fix-top-banner-text

starknet-io · May 9, 2024 · a6ebc70 · a6ebc70
2 parents 8b91627 + 546e843
commit a6ebc70
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 15 deletions.
diff --git a/_data/pages/grant.yml b/_data/pages/grant.yml
@@ -19,20 +19,25 @@ blocks:
       - title: Application
         description: "Applicants will submit proposals via an Questbook application form
           provided by the Starknet Foundation team. "
+        icon: Application
       - title: Internal Evaluation
         description: " Each application will be assessed by members of the Starknet
           Foundation and Starkware team based on criteria such as potential
           impact, innovation, milestones, community engagement & track record,
           and embeddedness with the Starknet ecosystem."
+        icon: Internal Evaluation
       - title: Results
         description: We plan to communicate decisions on your application within an
           approximate two week timeframe.
+        icon: Results
       - title: Onboarding
         description: "Upon signing a grant agreement and completing KYC, the Starknet
           Foundation will send funds. "
+        icon: Onboarding
       - title: Grant Deliverables
         description: "After completion of the work, the Foundation will assess results
           and share deliverables (blog post, video, AMA) with the team.  "
+        icon: Post Grant Check-in
   - type: container
     blocks:
       - type: flex_layout

diff --git a/_data/pages/online-communities.yml b/_data/pages/online-communities.yml
@@ -212,8 +212,6 @@ blocks:
           hasIcon: true
           custom_external_link: https://starknet-research.beehiiv.com/
           custom_title: Starknet research hub
-        avatar:
-          displayTitle: false
       - link:
           hasIcon: true
           custom_external_link: https://medium.com/starknet-edu

diff --git a/workspaces/cms-config/src/blocks.ts b/workspaces/cms-config/src/blocks.ts
@@ -263,10 +263,17 @@ export const cardDisplayItem = [
     crowdin: false,
   },
   {
-    label: "Image",
+    label: "Icon",
     required: false,
-    name: "image",
-    widget: "image",
+    name: "icon",
+    widget: "select",
+    options: [
+      "Application",
+      "Internal Evaluation",
+      "Results",
+      "Onboarding",
+      "Post Grant Check-in",
+    ],
     crowdin: false,
   },
 ] satisfies CmsField[];

diff --git a/workspaces/cms-data/src/pages.ts b/workspaces/cms-data/src/pages.ts
@@ -67,12 +67,13 @@ export interface ListCardItems {
 }
 
 export interface DisplayCardItems {
-  title:
+  title: string;
+  icon?:
     | "Application"
     | "Internal Evaluation"
     | "Results"
     | "Onboarding"
-    | "Grant Deliverables";
+    | "Post Grant Check-in";
   description: string;
   image?: string;
 }

diff --git a/workspaces/website/src/components/Card/DisplayCard.tsx b/workspaces/website/src/components/Card/DisplayCard.tsx
@@ -7,12 +7,13 @@ import { Results } from "@ui/Icons/DisplayCardIcons/Results";
 import { Heading } from "@ui/Typography/Heading";
 
 type Props = {
-  readonly title:
+  readonly title: string;
+  readonly icon?:
     | "Application"
     | "Internal Evaluation"
     | "Results"
     | "Onboarding"
-    | "Grant Deliverables";
+    | "Post Grant Check-in";
   readonly description?: string;
   readonly index: number;
 } & BoxProps;
@@ -22,10 +23,15 @@ const images = {
   "Internal Evaluation": <InternalEvaluation />,
   Results: <Results />,
   Onboarding: <Onboarding />,
-  "Grant Deliverables": <GrantDeliverables />,
+  "Post Grant Check-in": <GrantDeliverables />,
 };
 
-export const DisplayCard = (props: Props) => {
+export const DisplayCard = ({
+  title,
+  icon = "Application",
+  description,
+  index,
+}: Props) => {
   return (
     <Box
       as="li"
@@ -56,7 +62,7 @@ export const DisplayCard = (props: Props) => {
             _dark={{ color: "white" }}
             marginBottom={{ base: "16px", md: "0" }}
           >
-            {images[props?.title]}
+            {images[icon]}
           </Box>
         </Stack>
         <Box flex="1">
@@ -71,7 +77,7 @@ export const DisplayCard = (props: Props) => {
               _dark={{ bg: "white", color: "black" }}
               color="white"
             >
-              {props.index}
+              {index}
             </Circle>
             <Heading
               variant="h4"
@@ -81,10 +87,10 @@ export const DisplayCard = (props: Props) => {
                 color: "button-nav-fg",
               }}
             >
-              {props.title}
+              {title}
             </Heading>
           </Stack>
-          <Text>{props.description}</Text>
+          <Text>{description}</Text>
         </Box>
       </Stack>
     </Box>