Skip to content

Commit

Permalink
Merge pull request #236 from privacy-scaling-explorations/d7-page-review
Browse files Browse the repository at this point in the history
d7 page review
  • Loading branch information
kalidiagne authored Nov 10, 2024
2 parents a869790 + 9f12402 commit f2d79bd
Show file tree
Hide file tree
Showing 7 changed files with 75 additions and 12 deletions.
2 changes: 1 addition & 1 deletion app/[lang]/devcon-7/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ export default async function DevconPage() {
<>
<div className="flex flex-col lg:pb-[120px]">
<Devcon7Header />
<div className="flex flex-col gap-10 lg:gap-14 pt-8 lg:pt-[60px]">
<div className="flex flex-col gap-10 lg:gap-14 pt-8 lg:pt-[60px] mx-auto max-w-[950px]">
<Devcon7Booths />
<Devcon7Section />
</div>
Expand Down
25 changes: 19 additions & 6 deletions app/[lang]/devcon-7/sections/Devcon7Booths.tsx
Original file line number Diff line number Diff line change
@@ -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"
Expand All @@ -17,9 +18,9 @@ export const Devcon7Booths = () => {
return (
<div
key={index}
className="lg:grid lg:grid-cols-[1.5fr_1fr] flex flex-col rounded-lg overflow-hidden border border-[rgba(8, 27, 26, 0.15)]"
className="flex flex-col bg-anakiwa-50 rounded-lg overflow-hidden border border-[rgba(8, 27, 26, 0.15)]"
>
<div className="min-h-[160px] bg-slate-50 relative order-1 lg:order-2 bg-[lightgray 50% / cover no-repeat]">
<div className="h-[160px] lg:h-[240px] bg-slate-50 relative bg-[lightgray 50% / cover no-repeat]">
<Image
src={booth.image}
alt={`booth image ${index + 1}`}
Expand All @@ -28,26 +29,38 @@ export const Devcon7Booths = () => {
priority
/>
</div>
<div className="flex flex-col gap-3 bg-anakiwa-50 p-4 lg:p-7 order-2 lg:order-1">
<div className="flex flex-col gap-3 p-4 lg:p-6">
<span className="text-anakiwa-500 text-xs font-sans leading-5 tracking-[2.5px] uppercase font-bold">
BOOTH
</span>
<span className="text-[22px] leading-[24px] text-tuatara-950 font-display font-bold">
{booth?.title}
</span>
<span className="text-xs lg:text-base lg:leading-6 text-tuatara-950 font-sans font-normal">
<span className="text-xs text-tuatara-950 font-sans font-normal">
{booth?.description}
{booth?.learMore && (
<Link
href={booth?.learMore?.url ?? "#"}
target="_blank"
className="block pt-2"
>
{`${booth.learMore.description}: `}{" "}
<span className="underline">
{booth?.learMore?.label}
</span>
</Link>
)}
</span>
<div className="flex flex-col">
<div className="flex items-center gap-[6px]">
<Icons.time className="text-tuatara-500" />
<span className="font-sans text-tuatara-500 text-xs lg:text-sm leading-5 font-normal">
<span className="font-sans text-tuatara-500 text-[10px] font-normal">
{booth?.date}
</span>
</div>
<div className="flex gap-[6px] items-center">
<Icons.eventLocation className="text-tuatara-500" />
<span className="font-sans text-tuatara-500 text-xs lg:text-sm leading-5 font-normal">
<span className="font-sans text-tuatara-500 text-[10px] font-normal">
{booth?.location}
</span>
</div>
Expand Down
8 changes: 3 additions & 5 deletions app/[lang]/devcon-7/sections/Devcon7Section.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down Expand Up @@ -105,16 +105,14 @@ const EventCard = ({ event = {}, speakers = [], location = "" }: any) => {
</button>
</div>

<div className="order-4 lg:flex hidden">
<Icons.line />
</div>
<div className="order-4 lg:flex hidden"></div>
</div>
)
}

export const Devcon7Section = () => {
return (
<div className="flex flex-col gap-10 relative lg:px-[60px]">
<div className="flex flex-col gap-10 relative">
<div className="flex flex-col lg:container">
<div
className={cn(tableSection(), "lg:border-b lg:border-anakiwa-200")}
Expand Down
39 changes: 39 additions & 0 deletions app/[lang]/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -18,12 +19,50 @@ import { WhatWeDo } from "@/components/sections/WhatWeDo"

import { useTranslation } from "../i18n/client"

const Devcon7Banner = () => {
return (
<div className="bg-[#FFDE17] relative py-6">
<AppContent>
<div className="flex flex-col lg:flex-row items-center gap-4 justify-between">
<Image
src="/images/devcon-7-banner-title-mobile.svg"
alt="Devcon 7 Banner"
className="block object-cover md:hidden"
width={204}
height={54}
/>

<Image
src="/images/devcon-7-banner-title-desktop.svg"
alt="Devcon 7 Banner"
width={559}
height={38}
className="hidden object-cover md:block"
priority
/>
<span className="hidden lg:flex font-sans font-bold text-[#006838] tracking-[2.5px]">
BANGKOK, THAILAND // NOVEMBER 2024
</span>
<Link
href="/en/devcon-7"
className="bg-[#EC008C] cursor-pointer hover:scale-105 duration-200 flex items-center py-0.5 px-4 min-h-8 gap-2 rounded-[6px] text-[#FFDE17] text-sm font-medium font-sans"
>
<span>SEE THE SCHEDULE</span>
<Icons.arrowRight />
</Link>
</div>
</AppContent>
</div>
)
}

export default function IndexPage({ params: { lang } }: any) {
const { t } = useTranslation(lang, "homepage")
const { t: common } = useTranslation(lang, "common")

return (
<section className="flex flex-col">
<Devcon7Banner />
<Divider.Section>
<PageHeader
title={
Expand Down
5 changes: 5 additions & 0 deletions data/events/devcon-7.ts
Original file line number Diff line number Diff line change
Expand Up @@ -236,5 +236,10 @@ 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: {
description: "Learn more here:",
label: "cursive.team",
url: "https://x.com/cursive_team/status/1853780464512946589?s=46",
},
},
]
4 changes: 4 additions & 0 deletions public/images/devcon-7-banner-title-desktop.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions public/images/devcon-7-banner-title-mobile.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit f2d79bd

Please sign in to comment.