From 2ca684e803eb190911889a04af0210fd7239f823 Mon Sep 17 00:00:00 2001 From: Piotr Monwid-Olechnowicz Date: Thu, 8 May 2025 11:50:51 +0200 Subject: [PATCH 01/16] Supress hydration warning from next-themes --- src/app/layout.tsx | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/app/layout.tsx b/src/app/layout.tsx index 2e2ad5a2fb..15d63115b0 100644 --- a/src/app/layout.tsx +++ b/src/app/layout.tsx @@ -23,7 +23,12 @@ export default function RootLayout({ children: ReactNode }): ReactElement { return ( - + From 1e9a83660c1a0930318a136b2944ca1de88a180e Mon Sep 17 00:00:00 2001 From: Piotr Monwid-Olechnowicz Date: Thu, 8 May 2025 11:51:03 +0200 Subject: [PATCH 02/16] Make the FAQ work better on medium screens --- src/app/conf/2025/faq.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/conf/2025/faq.tsx b/src/app/conf/2025/faq.tsx index 90e55d3c9b..fa44c9c6bd 100644 --- a/src/app/conf/2025/faq.tsx +++ b/src/app/conf/2025/faq.tsx @@ -200,7 +200,7 @@ export function FAQ({ className }: { className?: string }) {
@@ -215,7 +215,7 @@ export function FAQ({ className }: { className?: string }) {

-
+
{FAQS.map((faq, index) => (
Date: Thu, 8 May 2025 11:55:55 +0200 Subject: [PATCH 03/16] Fix the CallForProposals on mobile --- src/app/conf/2025/components/call-for-proposals.tsx | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/app/conf/2025/components/call-for-proposals.tsx b/src/app/conf/2025/components/call-for-proposals.tsx index 8d4471642d..cc80c8934d 100644 --- a/src/app/conf/2025/components/call-for-proposals.tsx +++ b/src/app/conf/2025/components/call-for-proposals.tsx @@ -444,15 +444,17 @@ function TabButton({ "gql-focus-visible flex items-center justify-between px-3 py-4 typography-body-lg hover:bg-sec-light focus:outline-none max-md:border-b max-md:border-sec-dark max-md:first:border-t md:[--collapsible:1] md:aria-selected:bg-sec-light", className, )} - onFocus={event => { - console.log("focus") + onFocus={() => { + setActiveTab(tab) + }} + onPointerDown={() => { setActiveTab(tab) }} onKeyDown={arrowsMoveSideways} {...props} > {tab.charAt(0).toUpperCase() + tab.slice(1)} - + ) } From 2bb377bcd90c03433255f9c9441cf1b96ac42371 Mon Sep 17 00:00:00 2001 From: Piotr Monwid-Olechnowicz Date: Thu, 8 May 2025 11:59:49 +0200 Subject: [PATCH 04/16] Take a random shot at fixing the stripes glitch --- src/app/conf/2025/components/hero/index.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/conf/2025/components/hero/index.tsx b/src/app/conf/2025/components/hero/index.tsx index 2c8f990701..8ab6f068d9 100644 --- a/src/app/conf/2025/components/hero/index.tsx +++ b/src/app/conf/2025/components/hero/index.tsx @@ -12,7 +12,7 @@ import heroPhoto from "./hero-photo.jpeg" export function Hero() { return ( -
+
@@ -42,7 +42,7 @@ export function Hero() {
-
+
Date: Thu, 8 May 2025 12:33:29 +0200 Subject: [PATCH 05/16] Fix the navbar root link --- src/app/conf/2025/components/navbar.tsx | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/app/conf/2025/components/navbar.tsx b/src/app/conf/2025/components/navbar.tsx index 673ab017cc..dc1540c93f 100644 --- a/src/app/conf/2025/components/navbar.tsx +++ b/src/app/conf/2025/components/navbar.tsx @@ -36,7 +36,7 @@ export function Navbar({ links, year }: NavbarProps): ReactElement { />
-
- - - + + / GraphQLConf {year} -
+

From 524aa06f7690aa4c3d88bba5d4b3ebc08d121f5e Mon Sep 17 00:00:00 2001 From: Piotr Monwid-Olechnowicz Date: Thu, 8 May 2025 12:38:08 +0200 Subject: [PATCH 06/16] Make the logo link to / and the text to conf root --- src/app/conf/2025/components/navbar.tsx | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/src/app/conf/2025/components/navbar.tsx b/src/app/conf/2025/components/navbar.tsx index dc1540c93f..feda24913e 100644 --- a/src/app/conf/2025/components/navbar.tsx +++ b/src/app/conf/2025/components/navbar.tsx @@ -46,13 +46,18 @@ export function Navbar({ links, year }: NavbarProps): ReactElement { >

- - - / GraphQLConf {year} - +
+ + + + / + + GraphQLConf {year} + +

From ad40376861b3bec87c1c01744b64b9f4e56916b4 Mon Sep 17 00:00:00 2001 From: Piotr Monwid-Olechnowicz Date: Thu, 8 May 2025 12:40:56 +0200 Subject: [PATCH 07/16] Remove the old Register section --- src/app/conf/2025/page.tsx | 8 ++--- src/app/conf/2025/register.tsx | 63 ---------------------------------- 2 files changed, 2 insertions(+), 69 deletions(-) delete mode 100644 src/app/conf/2025/register.tsx diff --git a/src/app/conf/2025/page.tsx b/src/app/conf/2025/page.tsx index 3104035d36..b9e822f5de 100644 --- a/src/app/conf/2025/page.tsx +++ b/src/app/conf/2025/page.tsx @@ -1,10 +1,7 @@ import { Metadata } from "next" -import { HostedByGraphQLFoundation } from "@/icons" -import { GridButton } from "../_components/grid-button" import { Sponsor } from "./sponsorship" import { Venue } from "./venue" import { FAQ } from "./faq" -import { Register } from "./register" import { CallForProposals } from "./components/call-for-proposals" import { RegisterToday } from "./components/register-today" import { Hero } from "./components/hero" @@ -22,7 +19,7 @@ export default function Page() { return (

-
+
@@ -30,13 +27,12 @@ export default function Page() {
-
+
-
diff --git a/src/app/conf/2025/register.tsx b/src/app/conf/2025/register.tsx deleted file mode 100644 index c15c105ae7..0000000000 --- a/src/app/conf/2025/register.tsx +++ /dev/null @@ -1,63 +0,0 @@ -import { InfoGrid } from "../_components/info-grid" - -export function Register() { - return ( -
- cfp@linuxfoundation.org for more details.`, - }, - { - title: "Sponsors", - description: `A registration link was shared in an email to your company's sponsorship contact. Please reach out to your company’s sponsorship contact if you need to register as a Sponsor. For further questions, please email graphql_events@linuxfoundation.org.`, - }, - { - title: "Media", - description: `If you are a member of the media interested in attending this event and have not received a complimentary access code to attend, contact us at graphql_events@linuxfoundation.org.`, - }, - ]} - /> - -
-

Rates

-

The registraion deadlines is 23:59 on the respective date.

-
- {[ - { title: "Early Bird", dates: "Through 13 July", price: "$599" }, - { title: "Standard", dates: "14 July - 31 August", price: "$799" }, - { - title: "Late", - dates: "1 September - 10 September", - price: "$899", - }, - ].map((item, index) => ( -
-

{item.title}

- -

{item.price}

-
- ))} -
-
- - -
- ) -} From 2c1f5afa25c42f8224188bba3956795fb5448162 Mon Sep 17 00:00:00 2001 From: Piotr Monwid-Olechnowicz Date: Thu, 8 May 2025 13:14:48 +0200 Subject: [PATCH 08/16] Update old sections to new typography styles --- src/app/conf/2025/page.tsx | 6 +-- src/app/conf/2025/sponsorship.tsx | 10 ++--- src/app/conf/2025/venue.tsx | 55 ++++++++++++-------------- src/app/conf/_components/info-grid.tsx | 13 +++--- 4 files changed, 38 insertions(+), 46 deletions(-) diff --git a/src/app/conf/2025/page.tsx b/src/app/conf/2025/page.tsx index b9e822f5de..bf23c8318c 100644 --- a/src/app/conf/2025/page.tsx +++ b/src/app/conf/2025/page.tsx @@ -31,10 +31,8 @@ export default function Page() { -
- - -
+ +
diff --git a/src/app/conf/2025/sponsorship.tsx b/src/app/conf/2025/sponsorship.tsx index 720e40e735..64608abdb5 100644 --- a/src/app/conf/2025/sponsorship.tsx +++ b/src/app/conf/2025/sponsorship.tsx @@ -1,10 +1,11 @@ import { InfoGrid } from "../_components/info-grid" +import { Button } from "../_design-system/button" export function Sponsor() { return ( -
+
) diff --git a/src/app/conf/2025/venue.tsx b/src/app/conf/2025/venue.tsx index 07478f21f9..99cd595692 100644 --- a/src/app/conf/2025/venue.tsx +++ b/src/app/conf/2025/venue.tsx @@ -10,17 +10,17 @@ const HOTELS = [ { name: "Mövenpick Hotel Amsterdam City Centre", link: "https://movenpick.accor.com/en/europe/netherlands/amsterdam/hotel-amsterdam.html?utm_source=google&utm_medium=local&utm_campaign=hotel-MHR-Amsterdam-city-center&y_source=1_MTUzNjI2OTgtNzE1LWxvY2F0aW9uLndlYnNpdGU%3D", - description: `Piet Heinkade 11\n1019 BR Amsterdam, Netherlands\nPhone: +31 20 519 1200`, + description: `Piet Heinkade 11\n1019 BR Amsterdam, Netherlands\nPhone: +31 20 519 1200`, }, { name: "Inntel Hotels Amsterdam Landmark", link: "https://www.inntelhotelsamsterdamlandmark.nl/", - description: `VOC-kade 600\n1018 LG Amsterdam, Netherlands\n Phone: +31 20 227 2550`, + description: `VOC-kade 600\n1018 LG Amsterdam, Netherlands\nPhone: +31 20 227 2550`, }, { name: "DoubleTree by Hilton Amsterdam Central Station", link: "https://www.hilton.com/en/hotels/amscsdi-doubletree-amsterdam-centraal-station/?SEO_id=GMB-EMEA-DI-AMSCSDI", - description: `Oosterdoksstraat 4 \n1011 DK Amsterdam, Netherlands\nPhone: +31 20 530 0800`, + description: `Oosterdoksstraat 4 \n1011 DK Amsterdam, Netherlands\nPhone: +31 20 530 0800`, }, ] @@ -29,53 +29,50 @@ const HOW_TO_GET_TO_VENUE = [ title: "Public Transportation", description: 'Take tram 26 from Amsterdam Central Station to the "Kattenburgerstraat" stop. The venue is in front of the tram stop.', - icon: , + icon: , }, { title: "Airport Information", description: "Amsterdam Airport Schiphol is about 20 km from the venue. Take a direct train to Amsterdam Central Station, then follow the public transportation instructions.", - icon: , + icon: , }, { title: "Parking at venue", - description: `Limited parking is available at the venue. We recommend using public transportation when possible. Learn more about parking at Pakhuis de Zwijger. If you require an accessible parking spot, park at Vriesseveem 4 or Withoedenveem 16 where you can park if you have a Disability Parking Card.`, - icon: , + description: `Limited parking is available at the venue. We recommend using public transportation when possible. Learn more about parking at Pakhuis de Zwijger. If you require an accessible parking spot, park at Vriesseveem 4 or Withoedenveem 16 where you can park if you have a Disability Parking Card.`, + icon: , }, ] export function Venue() { return ( -
-

Venue

+
-
-

Conference

+
+

Venue

- - - Pakhuis De Zwijger - - + + Pakhuis De Zwijger +
Piet Heinkade 179, 1019 HC
Amsterdam, Netherlands
-
-

+
+

How to get to the venue?

{HOW_TO_GET_TO_VENUE.map(({ title, description, icon }) => (
- {icon} -
{title}
+
{icon}
+
{title}

-

Hotel Information

-

+

Hotel Information

+

The Linux Foundation has not contracted rooms at these properties and cannot guarantee rates or availability.

{HOTELS.map(hotel => (
- +
diff --git a/src/app/conf/_components/info-grid.tsx b/src/app/conf/_components/info-grid.tsx index 2483cffc4a..e74d6056d7 100644 --- a/src/app/conf/_components/info-grid.tsx +++ b/src/app/conf/_components/info-grid.tsx @@ -14,8 +14,8 @@ export const InfoGrid: React.FC = ({ id, }) => (
-

{title}

-

{subtitle}

+

{title}

+

{subtitle}

{/* Horizontal Scrollable Grid */}
= ({ className="scroll-snap-x flex snap-mandatory gap-6 overflow-x-auto lg:grid lg:grid-cols-3 lg:overflow-visible" > {listItems.map(({ title, description }, index) => ( -
-

{title}

+
+

{title}

From f16af5226cc2a3b4d6dcbce8f83f278213f52caa Mon Sep 17 00:00:00 2001 From: Piotr Monwid-Olechnowicz Date: Thu, 8 May 2025 13:16:34 +0200 Subject: [PATCH 09/16] Fix Tyk logo --- public/img/conf/Sponsors/Tyk.svg | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/public/img/conf/Sponsors/Tyk.svg b/public/img/conf/Sponsors/Tyk.svg index fa93f6756b..06fa8b1397 100644 --- a/public/img/conf/Sponsors/Tyk.svg +++ b/public/img/conf/Sponsors/Tyk.svg @@ -1,14 +1,7 @@ - - - - - - - - + + + + + From a0ca86c6a43c55e6281f4e87f2b32a31740ca93d Mon Sep 17 00:00:00 2001 From: Piotr Monwid-Olechnowicz Date: Thu, 8 May 2025 13:41:02 +0200 Subject: [PATCH 10/16] Add shrink-0 to arrows --- src/app/conf/2025/faq.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/conf/2025/faq.tsx b/src/app/conf/2025/faq.tsx index fa44c9c6bd..37b4e47baf 100644 --- a/src/app/conf/2025/faq.tsx +++ b/src/app/conf/2025/faq.tsx @@ -226,7 +226,7 @@ export function FAQ({ className }: { className?: string }) { {faq.question} - +
{faq.answer}
From f35f352f7ec92c9fa6e839c7b2d78d01a288ce0c Mon Sep 17 00:00:00 2001 From: Piotr Monwid-Olechnowicz Date: Thu, 8 May 2025 18:01:53 +0200 Subject: [PATCH 11/16] Update navbar icons to pixelarticons --- src/app/conf/2025/components/navbar.tsx | 15 ++++++++------- src/app/conf/2025/pixelarticons/close.svg | 3 +++ src/app/conf/2025/pixelarticons/menu.svg | 3 +++ 3 files changed, 14 insertions(+), 7 deletions(-) create mode 100644 src/app/conf/2025/pixelarticons/close.svg create mode 100644 src/app/conf/2025/pixelarticons/menu.svg diff --git a/src/app/conf/2025/components/navbar.tsx b/src/app/conf/2025/components/navbar.tsx index feda24913e..7e9fd6edb4 100644 --- a/src/app/conf/2025/components/navbar.tsx +++ b/src/app/conf/2025/components/navbar.tsx @@ -5,10 +5,11 @@ import NextLink from "next/link" import { clsx } from "clsx" import { usePathname } from "next/navigation" -import { HamburgerIcon, CrossIcon } from "@/icons" - import { Badge } from "../../_components/badge" +import MenuIcon from "../pixelarticons/menu.svg?svgr" +import CloseIcon from "../pixelarticons/close.svg?svgr" + export interface NavbarProps { links: { href: string; children: React.ReactNode; "aria-disabled"?: true }[] year: number @@ -40,8 +41,8 @@ export function Navbar({ links, year }: NavbarProps): ReactElement { />
@@ -73,7 +74,7 @@ export function Navbar({ links, year }: NavbarProps): ReactElement { {mobileDrawerOpen && (
)} @@ -113,10 +114,10 @@ export function Navbar({ links, year }: NavbarProps): ReactElement {
diff --git a/src/app/conf/2025/pixelarticons/close.svg b/src/app/conf/2025/pixelarticons/close.svg new file mode 100644 index 0000000000..d48de61287 --- /dev/null +++ b/src/app/conf/2025/pixelarticons/close.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/app/conf/2025/pixelarticons/menu.svg b/src/app/conf/2025/pixelarticons/menu.svg new file mode 100644 index 0000000000..c87a5135c7 --- /dev/null +++ b/src/app/conf/2025/pixelarticons/menu.svg @@ -0,0 +1,3 @@ + + + From be09cf56423ac35759d1eee9dfa5a22bb65ada6d Mon Sep 17 00:00:00 2001 From: Piotr Monwid-Olechnowicz Date: Thu, 8 May 2025 18:02:03 +0200 Subject: [PATCH 12/16] Make CallForProposals better on tablet screens --- .../2025/components/call-for-proposals.tsx | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/app/conf/2025/components/call-for-proposals.tsx b/src/app/conf/2025/components/call-for-proposals.tsx index cc80c8934d..3073122cd0 100644 --- a/src/app/conf/2025/components/call-for-proposals.tsx +++ b/src/app/conf/2025/components/call-for-proposals.tsx @@ -328,8 +328,8 @@ export function CallForProposals() { // todo: the part with `dark:` here is temporary until we have a dark mode version of this section className="gql-conf-section gql-conf-container dark:text-neu-0" > -
-
+
+

Call for Proposals

Putting on an amazing conference depends on great content, which is @@ -378,7 +378,7 @@ export function CallForProposals() {

{tabsInOrder.map((tab, i) => ( ))}
-
+
{tabsInOrder.map(tab => (
{ @@ -454,7 +454,7 @@ function TabButton({ {...props} > {tab.charAt(0).toUpperCase() + tab.slice(1)} - + ) } @@ -475,8 +475,8 @@ function arrowsMoveSideways(event: React.KeyboardEvent) { function DefinitionListBox({ children }: { children: React.ReactNode }) { return ( -
-
+
+
{children}
@@ -494,7 +494,7 @@ function Stripes() { return (
Date: Thu, 8 May 2025 18:04:30 +0200 Subject: [PATCH 13/16] Fix border colors --- src/app/conf/2025/components/navbar.tsx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/app/conf/2025/components/navbar.tsx b/src/app/conf/2025/components/navbar.tsx index 7e9fd6edb4..914b7edcb8 100644 --- a/src/app/conf/2025/components/navbar.tsx +++ b/src/app/conf/2025/components/navbar.tsx @@ -42,7 +42,9 @@ export function Navbar({ links, year }: NavbarProps): ReactElement {
From 8796373f9185d38854888e4fcbef483a5b28cd9e Mon Sep 17 00:00:00 2001 From: Piotr Monwid-Olechnowicz Date: Thu, 8 May 2025 18:07:31 +0200 Subject: [PATCH 14/16] Tweak spacing --- src/app/conf/2025/sponsorship.tsx | 2 +- src/app/conf/_components/info-grid.tsx | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/app/conf/2025/sponsorship.tsx b/src/app/conf/2025/sponsorship.tsx index 64608abdb5..b5651bf918 100644 --- a/src/app/conf/2025/sponsorship.tsx +++ b/src/app/conf/2025/sponsorship.tsx @@ -40,7 +40,7 @@ export function Sponsor() { ]} /> -
+