Skip to content

Commit

Permalink
Merge branch 'dev' into Add-an-open-blank-icon
Browse files Browse the repository at this point in the history
  • Loading branch information
TalBenAvi authored May 9, 2024
2 parents 8bf4261 + 546e843 commit 26c6820
Show file tree
Hide file tree
Showing 3 changed files with 27 additions and 9 deletions.
5 changes: 5 additions & 0 deletions _data/pages/grant.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
13 changes: 10 additions & 3 deletions workspaces/cms-config/src/blocks.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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[];
Expand Down
18 changes: 12 additions & 6 deletions workspaces/website/src/components/Card/DisplayCard.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ 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"
Expand All @@ -25,7 +26,12 @@ const images = {
"Post Grant Check-in": <GrantDeliverables />,
};

export const DisplayCard = (props: Props) => {
export const DisplayCard = ({
title,
icon = "Application",
description,
index,
}: Props) => {
return (
<Box
as="li"
Expand Down Expand Up @@ -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">
Expand All @@ -71,7 +77,7 @@ export const DisplayCard = (props: Props) => {
_dark={{ bg: "white", color: "black" }}
color="white"
>
{props.index}
{index}
</Circle>
<Heading
variant="h4"
Expand All @@ -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>
Expand Down

0 comments on commit 26c6820

Please sign in to comment.