From a24dd3d6268c8d9dac3b494c289c551264cd67f8 Mon Sep 17 00:00:00 2001 From: Tal-Ben-Avi Date: Mon, 6 May 2024 10:05:21 +0300 Subject: [PATCH 1/7] remove Icon --- _data/pages/online-communities.yml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/_data/pages/online-communities.yml b/_data/pages/online-communities.yml index 3e476d490d..bd897b72b1 100644 --- a/_data/pages/online-communities.yml +++ b/_data/pages/online-communities.yml @@ -198,3 +198,21 @@ blocks: hasIcon: true custom_title: Starknet China custom_external_link: https://www.youtube.com/@starknetzh + - type: link_list + randomize: false + heading: Research & Education Resources + blocks: + - link: + 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 + custom_title: Starknet Edu Blog + - link: + hasIcon: true + custom_external_link: https://starknet.substack.com/ + custom_title: Starknet Edu Newsletter From c562ec215701c559e47171ffa784720ca3feb453 Mon Sep 17 00:00:00 2001 From: Tal-Ben-Avi Date: Mon, 6 May 2024 15:06:48 +0300 Subject: [PATCH 2/7] update code --- _data/pages/online-communities.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/_data/pages/online-communities.yml b/_data/pages/online-communities.yml index aeb32ea60d..626c85d240 100644 --- 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 From adff7c8e9056585ef4410fa7d1c478ab96f564e0 Mon Sep 17 00:00:00 2001 From: Tal-Ben-Avi Date: Tue, 7 May 2024 11:22:12 +0300 Subject: [PATCH 3/7] changing title name to Post Grant check-in --- workspaces/website/src/components/Card/DisplayCard.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/workspaces/website/src/components/Card/DisplayCard.tsx b/workspaces/website/src/components/Card/DisplayCard.tsx index 10dcc5a424..bab0fe78df 100644 --- a/workspaces/website/src/components/Card/DisplayCard.tsx +++ b/workspaces/website/src/components/Card/DisplayCard.tsx @@ -12,7 +12,7 @@ type Props = { | "Internal Evaluation" | "Results" | "Onboarding" - | "Grant Deliverables"; + | "Post Grant check-in"; readonly description?: string; readonly index: number; } & BoxProps; @@ -22,7 +22,7 @@ const images = { "Internal Evaluation": , Results: , Onboarding: , - "Grant Deliverables": , + "Post Grant check-in": , }; export const DisplayCard = (props: Props) => { From b3f7a6edddea62db8e90ae0e286665a23bf56256 Mon Sep 17 00:00:00 2001 From: Tal-Ben-Avi Date: Tue, 7 May 2024 11:52:03 +0300 Subject: [PATCH 4/7] fixing icons to have dropdown --- _data/pages/grant.yml | 5 +++++ workspaces/cms-config/src/blocks.ts | 13 ++++++++--- workspaces/cms-data/src/pages.ts | 5 +++-- .../src/components/Card/DisplayCard.tsx | 22 ++++++++++++------- 4 files changed, 32 insertions(+), 13 deletions(-) diff --git a/_data/pages/grant.yml b/_data/pages/grant.yml index a272b0bb02..fde98f7052 100644 --- 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/workspaces/cms-config/src/blocks.ts b/workspaces/cms-config/src/blocks.ts index 19a2832dcc..dcbfdfa401 100644 --- 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 index 2e19aef0cd..ac89cf521d 100644 --- 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; + selectedIcon?: | "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 index 10dcc5a424..681007f764 100644 --- 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": , Results: , Onboarding: , - "Grant Deliverables": , + "Post Grant Check-in": , }; -export const DisplayCard = (props: Props) => { +export const DisplayCard = ({ + title, + icon = "Application", + description, + index, +}: Props) => { return ( { _dark={{ color: "white" }} marginBottom={{ base: "16px", md: "0" }} > - {images[props?.title]} + {images[icon]} @@ -71,7 +77,7 @@ export const DisplayCard = (props: Props) => { _dark={{ bg: "white", color: "black" }} color="white" > - {props.index} + {index} { color: "button-nav-fg", }} > - {props.title} + {title} - {props.description} + {description} From b0e0ccc503839ac3b43758b6b9fdd44ae4506ba9 Mon Sep 17 00:00:00 2001 From: Tal-Ben-Avi Date: Tue, 7 May 2024 12:13:07 +0300 Subject: [PATCH 5/7] fixing icon --- workspaces/cms-data/src/pages.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/workspaces/cms-data/src/pages.ts b/workspaces/cms-data/src/pages.ts index ac89cf521d..9392ad7da6 100644 --- a/workspaces/cms-data/src/pages.ts +++ b/workspaces/cms-data/src/pages.ts @@ -68,7 +68,7 @@ export interface ListCardItems { export interface DisplayCardItems { title: string; - selectedIcon?: + icon?: | "Application" | "Internal Evaluation" | "Results" From 51dc5b19c3db4b7607bab26564626fa72c71c7b1 Mon Sep 17 00:00:00 2001 From: Tal-Ben-Avi Date: Tue, 7 May 2024 12:13:54 +0300 Subject: [PATCH 6/7] fixing code --- workspaces/cms-data/src/pages.ts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/workspaces/cms-data/src/pages.ts b/workspaces/cms-data/src/pages.ts index 2e19aef0cd..9392ad7da6 100644 --- 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; } From b771cf81939f225b82493cac20c95fc5b2d93b4d Mon Sep 17 00:00:00 2001 From: Tal-Ben-Avi Date: Tue, 7 May 2024 12:15:34 +0300 Subject: [PATCH 7/7] fixing text to caps --- workspaces/website/src/components/Card/DisplayCard.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/workspaces/website/src/components/Card/DisplayCard.tsx b/workspaces/website/src/components/Card/DisplayCard.tsx index bab0fe78df..7ab34a1757 100644 --- a/workspaces/website/src/components/Card/DisplayCard.tsx +++ b/workspaces/website/src/components/Card/DisplayCard.tsx @@ -12,7 +12,7 @@ type Props = { | "Internal Evaluation" | "Results" | "Onboarding" - | "Post Grant check-in"; + | "Post Grant Check-in"; readonly description?: string; readonly index: number; } & BoxProps; @@ -22,7 +22,7 @@ const images = { "Internal Evaluation": , Results: , Onboarding: , - "Post Grant check-in": , + "Post Grant Check-in": , }; export const DisplayCard = (props: Props) => {