From 124d45db7a580025345e584ef3a3668368174757 Mon Sep 17 00:00:00 2001 From: Kalidou Diagne Date: Sun, 10 Nov 2024 02:29:31 +0100 Subject: [PATCH 1/5] d7 page review --- app/[lang]/devcon-7/page.tsx | 2 +- app/[lang]/devcon-7/sections/Devcon7Booths.tsx | 6 +++--- app/[lang]/devcon-7/sections/Devcon7Section.tsx | 6 ++---- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/app/[lang]/devcon-7/page.tsx b/app/[lang]/devcon-7/page.tsx index ae1bc4be..48da469b 100644 --- a/app/[lang]/devcon-7/page.tsx +++ b/app/[lang]/devcon-7/page.tsx @@ -24,7 +24,7 @@ export default async function DevconPage() { <>
-
+
diff --git a/app/[lang]/devcon-7/sections/Devcon7Booths.tsx b/app/[lang]/devcon-7/sections/Devcon7Booths.tsx index 43c231d6..95919196 100644 --- a/app/[lang]/devcon-7/sections/Devcon7Booths.tsx +++ b/app/[lang]/devcon-7/sections/Devcon7Booths.tsx @@ -17,9 +17,9 @@ export const Devcon7Booths = () => { return (
-
+
{`booth { priority />
-
+
BOOTH diff --git a/app/[lang]/devcon-7/sections/Devcon7Section.tsx b/app/[lang]/devcon-7/sections/Devcon7Section.tsx index c9ff40f7..0a676873 100644 --- a/app/[lang]/devcon-7/sections/Devcon7Section.tsx +++ b/app/[lang]/devcon-7/sections/Devcon7Section.tsx @@ -105,16 +105,14 @@ const EventCard = ({ event = {}, speakers = [], location = "" }: any) => {
-
- -
+
) } export const Devcon7Section = () => { return ( -
+
Date: Sun, 10 Nov 2024 02:31:34 +0100 Subject: [PATCH 2/5] fix font size --- app/[lang]/devcon-7/sections/Devcon7Booths.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/[lang]/devcon-7/sections/Devcon7Booths.tsx b/app/[lang]/devcon-7/sections/Devcon7Booths.tsx index 95919196..98a6c8a7 100644 --- a/app/[lang]/devcon-7/sections/Devcon7Booths.tsx +++ b/app/[lang]/devcon-7/sections/Devcon7Booths.tsx @@ -35,7 +35,7 @@ export const Devcon7Booths = () => { {booth?.title} - + {booth?.description}
From 78aa659d0aaebda0d443e266b3de05f5a1ed6662 Mon Sep 17 00:00:00 2001 From: Kalidou Diagne Date: Sun, 10 Nov 2024 02:41:03 +0100 Subject: [PATCH 3/5] fix layout and styling --- .../devcon-7/sections/Devcon7Booths.tsx | 19 ++++++++++++++++--- .../devcon-7/sections/Devcon7Section.tsx | 2 +- data/events/devcon-7.ts | 4 ++++ 3 files changed, 21 insertions(+), 4 deletions(-) diff --git a/app/[lang]/devcon-7/sections/Devcon7Booths.tsx b/app/[lang]/devcon-7/sections/Devcon7Booths.tsx index 98a6c8a7..3fe8541f 100644 --- a/app/[lang]/devcon-7/sections/Devcon7Booths.tsx +++ b/app/[lang]/devcon-7/sections/Devcon7Booths.tsx @@ -1,4 +1,5 @@ import Image from "next/image" +import Link from "next/link" import { booths } from "@/data/events/devcon-7" import { AppContent } from "@/components/ui/app-content" @@ -28,7 +29,7 @@ export const Devcon7Booths = () => { priority />
-
+
BOOTH @@ -37,17 +38,29 @@ export const Devcon7Booths = () => { {booth?.description} + {booth?.learMore && ( + + {` Learn more at: `}{" "} + + {booth?.learMore?.label} + + + )}
- + {booth?.date}
- + {booth?.location}
diff --git a/app/[lang]/devcon-7/sections/Devcon7Section.tsx b/app/[lang]/devcon-7/sections/Devcon7Section.tsx index 0a676873..22926f5b 100644 --- a/app/[lang]/devcon-7/sections/Devcon7Section.tsx +++ b/app/[lang]/devcon-7/sections/Devcon7Section.tsx @@ -8,7 +8,7 @@ import { cva } from "class-variance-authority" import { cn } from "@/lib/utils" import { Icons } from "@/components/icons" -const tableSection = cva("lg:grid lg:grid-cols-[200px_1fr_80px_20px] lg:gap-8") +const tableSection = cva("lg:grid lg:grid-cols-[200px_1fr_160px_20px] lg:gap-8") const tableSectionTitle = cva( "text-anakiwa-500 text-base lg:text-xs font-sans leading-5 tracking-[2.5px] uppercase font-bold lg:pb-3" ) diff --git a/data/events/devcon-7.ts b/data/events/devcon-7.ts index dcf75d5c..d8f550bc 100644 --- a/data/events/devcon-7.ts +++ b/data/events/devcon-7.ts @@ -236,5 +236,9 @@ export const booths = [ "Throughout history, humans have used patterns, symbols, and codes to forge meaningful connections. This exhibit by Cursive explores cryptography not just as mathematical formulas, but as a deeply human art form.", date: "Nov 12 - 15", location: "Near Devcon Entrance", + learMore: { + label: "cursive.team", + url: "https://www.cursive.team/", + }, }, ] From 9b813998cdfe574f0fd7e06dc329304f625c6420 Mon Sep 17 00:00:00 2001 From: Kalidou Diagne Date: Sun, 10 Nov 2024 03:00:18 +0100 Subject: [PATCH 4/5] banner in homepage --- app/[lang]/page.tsx | 39 +++++++++++++++++++ .../images/devcon-7-banner-title-desktop.svg | 4 ++ .../images/devcon-7-banner-title-mobile.svg | 4 ++ 3 files changed, 47 insertions(+) create mode 100644 public/images/devcon-7-banner-title-desktop.svg create mode 100644 public/images/devcon-7-banner-title-mobile.svg diff --git a/app/[lang]/page.tsx b/app/[lang]/page.tsx index b055972a..6465866f 100644 --- a/app/[lang]/page.tsx +++ b/app/[lang]/page.tsx @@ -6,6 +6,7 @@ import PSELogo from "@/public/icons/archstar.webp" import { motion } from "framer-motion" import { siteConfig } from "@/config/site" +import { AppContent } from "@/components/ui/app-content" import { Button } from "@/components/ui/button" import { Label } from "@/components/ui/label" import { Banner } from "@/components/banner" @@ -18,12 +19,50 @@ import { WhatWeDo } from "@/components/sections/WhatWeDo" import { useTranslation } from "../i18n/client" +const Devcon7Banner = () => { + return ( +
+ +
+ Devcon 7 Banner + + Devcon 7 Banner + + BANGKOK, THAILAND // NOVEMBER 2024 + + + SEE THE SCHEDULE + + +
+
+
+ ) +} + export default function IndexPage({ params: { lang } }: any) { const { t } = useTranslation(lang, "homepage") const { t: common } = useTranslation(lang, "common") return (
+ + + + diff --git a/public/images/devcon-7-banner-title-mobile.svg b/public/images/devcon-7-banner-title-mobile.svg new file mode 100644 index 00000000..b2ce5365 --- /dev/null +++ b/public/images/devcon-7-banner-title-mobile.svg @@ -0,0 +1,4 @@ + + + + From 9f12402ebd1cb2d422c70a1567b2d1b13b48d4f0 Mon Sep 17 00:00:00 2001 From: Kalidou Diagne Date: Sun, 10 Nov 2024 03:01:43 +0100 Subject: [PATCH 5/5] update cursive link --- app/[lang]/devcon-7/sections/Devcon7Booths.tsx | 2 +- data/events/devcon-7.ts | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/[lang]/devcon-7/sections/Devcon7Booths.tsx b/app/[lang]/devcon-7/sections/Devcon7Booths.tsx index 3fe8541f..fe5a452d 100644 --- a/app/[lang]/devcon-7/sections/Devcon7Booths.tsx +++ b/app/[lang]/devcon-7/sections/Devcon7Booths.tsx @@ -44,7 +44,7 @@ export const Devcon7Booths = () => { target="_blank" className="block pt-2" > - {` Learn more at: `}{" "} + {`${booth.learMore.description}: `}{" "} {booth?.learMore?.label} diff --git a/data/events/devcon-7.ts b/data/events/devcon-7.ts index d8f550bc..d25c94d5 100644 --- a/data/events/devcon-7.ts +++ b/data/events/devcon-7.ts @@ -237,8 +237,9 @@ export const booths = [ date: "Nov 12 - 15", location: "Near Devcon Entrance", learMore: { + description: "Learn more here:", label: "cursive.team", - url: "https://www.cursive.team/", + url: "https://x.com/cursive_team/status/1853780464512946589?s=46", }, }, ]