From 307e9a5725ceb997a67635b4129822f4ec0378ea Mon Sep 17 00:00:00 2001 From: Shiv Bhonde Date: Mon, 26 Feb 2024 14:57:11 +0530 Subject: [PATCH 1/6] flex wrap + line-clamp and minor tweaks --- packages/nextjs/app/_components/CompletedGrants.tsx | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/nextjs/app/_components/CompletedGrants.tsx b/packages/nextjs/app/_components/CompletedGrants.tsx index db3f513..450220e 100644 --- a/packages/nextjs/app/_components/CompletedGrants.tsx +++ b/packages/nextjs/app/_components/CompletedGrants.tsx @@ -4,13 +4,13 @@ import { GrantData } from "~~/services/database/schema"; const CompletedGrantCard = ({ title, description, askAmount }: GrantData) => { return ( -
+
Learn more

{title}

-

{description}

+

{description}

Amounted Granted: {askAmount} ETH

@@ -21,8 +21,8 @@ export const CompletedGrants = async () => { return (
-
-
+
+

Completed grants

{ height={32} />
-
+
{completedGrants.map(grant => ( ))} From 51a656ec4477fffe2b372557bf308576f49340da Mon Sep 17 00:00:00 2001 From: Shiv Bhonde Date: Mon, 26 Feb 2024 15:06:11 +0530 Subject: [PATCH 2/6] update colors inline with figma --- .../nextjs/app/_components/CompletedGrants.tsx | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/packages/nextjs/app/_components/CompletedGrants.tsx b/packages/nextjs/app/_components/CompletedGrants.tsx index 450220e..1b17585 100644 --- a/packages/nextjs/app/_components/CompletedGrants.tsx +++ b/packages/nextjs/app/_components/CompletedGrants.tsx @@ -4,9 +4,9 @@ import { GrantData } from "~~/services/database/schema"; const CompletedGrantCard = ({ title, description, askAmount }: GrantData) => { return ( -
-
-
Learn more
+
+
+
Learn more

{title}

@@ -20,17 +20,11 @@ export const CompletedGrants = async () => { const completedGrants = await getAllCompletedGrants(); return ( -
+

Completed grants

- sparkle + sparkle
{completedGrants.map(grant => ( From 69bca900b0dbc5aad3dbee5f344c1fb613871e12 Mon Sep 17 00:00:00 2001 From: Shiv Bhonde Date: Mon, 26 Feb 2024 15:27:13 +0530 Subject: [PATCH 3/6] add builder address to card ad move Amount eth up --- .../app/_components/CompletedGrants.tsx | 20 +++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/packages/nextjs/app/_components/CompletedGrants.tsx b/packages/nextjs/app/_components/CompletedGrants.tsx index 1b17585..c5fb2a5 100644 --- a/packages/nextjs/app/_components/CompletedGrants.tsx +++ b/packages/nextjs/app/_components/CompletedGrants.tsx @@ -1,17 +1,21 @@ import Image from "next/image"; +import { Address } from "~~/components/scaffold-eth"; import { getAllCompletedGrants } from "~~/services/database/grants"; import { GrantData } from "~~/services/database/schema"; -const CompletedGrantCard = ({ title, description, askAmount }: GrantData) => { +const CompletedGrantCard = ({ title, description, askAmount, builder }: GrantData) => { return ( -
-
-
Learn more
+
+
+
Learn more

{title}

-
-

{description}

-

Amounted Granted: {askAmount} ETH

+
+
+

+ Amount granted: {askAmount} ETH +

+

{description}

); @@ -21,7 +25,7 @@ export const CompletedGrants = async () => { return (
-
+

Completed grants

sparkle From 1ee002a63d9236cbb87ba72c257bf62a497253ea Mon Sep 17 00:00:00 2001 From: Shiv Bhonde Date: Mon, 26 Feb 2024 15:30:24 +0530 Subject: [PATCH 4/6] decrease gap and increase cards width --- packages/nextjs/app/_components/CompletedGrants.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/nextjs/app/_components/CompletedGrants.tsx b/packages/nextjs/app/_components/CompletedGrants.tsx index c5fb2a5..e8a3afb 100644 --- a/packages/nextjs/app/_components/CompletedGrants.tsx +++ b/packages/nextjs/app/_components/CompletedGrants.tsx @@ -5,7 +5,7 @@ import { GrantData } from "~~/services/database/schema"; const CompletedGrantCard = ({ title, description, askAmount, builder }: GrantData) => { return ( -
+
Learn more

{title}

@@ -30,7 +30,7 @@ export const CompletedGrants = async () => {

Completed grants

sparkle
-
+
{completedGrants.map(grant => ( ))} From 483d3f2dcc21409433ba99bbf67c52314fc42540 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20S=C3=A1nchez?= Date: Mon, 26 Feb 2024 12:15:57 +0100 Subject: [PATCH 5/6] Card tweaks --- packages/nextjs/app/_components/CompletedGrants.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/nextjs/app/_components/CompletedGrants.tsx b/packages/nextjs/app/_components/CompletedGrants.tsx index e8a3afb..fd8c74e 100644 --- a/packages/nextjs/app/_components/CompletedGrants.tsx +++ b/packages/nextjs/app/_components/CompletedGrants.tsx @@ -13,9 +13,9 @@ const CompletedGrantCard = ({ title, description, askAmount, builder }: GrantDat

- Amount granted: {askAmount} ETH + {askAmount} ETH

-

{description}

+

{description}

); From 996af24d2b3563edfe8e36829717874a453cfe37 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20S=C3=A1nchez?= Date: Mon, 26 Feb 2024 12:19:36 +0100 Subject: [PATCH 6/6] Add link to card --- packages/nextjs/app/_components/CompletedGrants.tsx | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/packages/nextjs/app/_components/CompletedGrants.tsx b/packages/nextjs/app/_components/CompletedGrants.tsx index fd8c74e..0c39cdc 100644 --- a/packages/nextjs/app/_components/CompletedGrants.tsx +++ b/packages/nextjs/app/_components/CompletedGrants.tsx @@ -3,11 +3,18 @@ import { Address } from "~~/components/scaffold-eth"; import { getAllCompletedGrants } from "~~/services/database/grants"; import { GrantData } from "~~/services/database/schema"; -const CompletedGrantCard = ({ title, description, askAmount, builder }: GrantData) => { +const CompletedGrantCard = ({ title, description, askAmount, builder, link }: GrantData) => { return (
-
Learn more
+ + Learn more +

{title}