Skip to content

Commit 57bec3a

Browse files
hasparushasparus
committed
Merge branch 'source' into new-conf-design--speakers
2 parents 865cf80 + fd2e903 commit 57bec3a

File tree

22 files changed

+244
-139
lines changed

22 files changed

+244
-139
lines changed

‎src/app/conf/2024/venue.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { TrainIcon, AroundIcon, ParkingIcon, BusIcon } from "@/icons"
1+
import { TrainIcon, AroundIcon, ParkingIcon } from "@/icons"
22
import NextImage from "next-image-export-optimizer"
33
import cityViewImage from "./sf-city-view.jpeg"
44

‎src/app/conf/2025/components/call-for-proposals.tsx

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
"use client"
2-
import clsx from "clsx"
32

4-
import { useState, useEffect, ReactNode, Fragment } from "react"
3+
import clsx from "clsx"
4+
import { useState, useEffect, Fragment } from "react"
55
import Link from "next/link"
6-
import { Button } from "../../_design-system/button"
7-
import ArrowDownIcon from "../pixelarticons/arrow-down.svg?svgr"
6+
7+
import ArrowDownIcon from "@/app/conf/_design-system/pixelarticons/arrow-down.svg?svgr"
8+
import { Button } from "@/app/conf/_design-system/button"
89

910
function DatesTab() {
1011
return (

‎src/app/conf/2025/components/hero/index.tsx

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
import { CalendarIcon } from "../../pixelarticons/calendar-icon"
2-
import { PinIcon } from "../../pixelarticons/pin-icon"
1+
import { CalendarIcon } from "@/app/conf/_design-system/pixelarticons/calendar-icon"
2+
import { PinIcon } from "@/app/conf/_design-system/pixelarticons/pin-icon"
3+
34
import GraphQLFoundationWordmark from "../../assets/graphql-foundation-wordmark.svg?svgr"
45

56
import { ImageLoaded } from "../image-loaded"

‎src/app/conf/2025/components/marquee-rows/index.tsx

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
1+
import { clsx } from "clsx"
12
import { Fragment, ReactNode } from "react"
23

34
import { Marquee } from "@/app/conf/_design-system/marquee"
4-
5-
import CodeIcon from "../../pixelarticons/code.svg?svgr"
5+
import CodeIcon from "@/app/conf/_design-system/pixelarticons/code.svg?svgr"
6+
import { StripesDecoration } from "@/app/conf/_design-system/stripes-decoration"
67

78
import blurWave from "./blur.webp"
8-
import { StripesDecoration } from "@/app/conf/_design-system/stripes-decoration"
9-
import { clsx } from "clsx"
109

1110
export interface MarqueeRowsProps extends React.HTMLAttributes<HTMLDivElement> {
1211
items: ReactNode[][]

‎src/app/conf/2025/components/navbar.tsx

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
"use client"
22

33
import { ReactElement, useCallback, useEffect, useState } from "react"
4-
import NextLink from "next/link"
54
import { clsx } from "clsx"
65
import { usePathname } from "next/navigation"
76

87
import { Badge } from "../../_components/badge"
98

10-
import MenuIcon from "../pixelarticons/menu.svg?svgr"
11-
import CloseIcon from "../pixelarticons/close.svg?svgr"
9+
import MenuIcon from "@/app/conf/_design-system/pixelarticons/menu.svg?svgr"
10+
import CloseIcon from "@/app/conf/_design-system/pixelarticons/close.svg?svgr"
1211
import { GraphQLConfLogoLink } from "./graphql-conf-logo-link"
1312
import { Anchor } from "../../_design-system/anchor"
1413

‎src/app/conf/2025/components/sponsors.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import Grafbase from "public/img/conf/Sponsors/Grafbase.svg?svgr"
22

33
import { clsx } from "clsx"
4-
import { ChevronRight } from "../pixelarticons/chevron-right"
4+
import { ChevronRight } from "../../_design-system/pixelarticons/chevron-right"
55

66
interface Sponsor {
77
icon: React.FC<React.SVGProps<SVGElement>>

‎src/app/conf/2025/components/venue/index.tsx

Lines changed: 152 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,152 @@
1+
import { clsx } from "clsx"
2+
3+
import { Button } from "@/app/conf/_design-system/button"
4+
import { Accordion } from "@/app/conf/_design-system/accordion"
5+
6+
import locationPhoto from "./location-photo.webp"
7+
8+
export interface VenueProps extends React.HTMLAttributes<HTMLElement> {}
9+
10+
export function Venue(props: VenueProps) {
11+
return (
12+
<section
13+
{...props}
14+
style={{
15+
...({ "--photo": `url(${locationPhoto.src})` } as {}),
16+
...props.style,
17+
backgroundBlendMode: "overlay, normal",
18+
}}
19+
className={clsx(
20+
"gql-conf-section relative bg-[linear-gradient(0deg,hsl(var(--color-sec-light))_0%,hsl(var(--color-sec-light))_100%),var(--photo)] dark:bg-[linear-gradient(180deg,#344303_0%,#344303_120%),var(--photo)] md:bg-cover",
21+
props.className,
22+
)}
23+
>
24+
<div className="relative flex gap-x-12 gap-y-10 bg-white/10 p-4 dark:bg-blk/10 max-lg:flex-col lg:p-16 xl:*:flex-1">
25+
<div
26+
className="absolute inset-0 backdrop-blur-3xl"
27+
style={{
28+
maskImage:
29+
"radial-gradient(circle at center, #fff 65%, rgb(255 0 0/.8) 99%)",
30+
WebkitMaskImage:
31+
"radial-gradient(circle at center, #fff 65%, rgb(255 0 0/.8) 99%)",
32+
}}
33+
/>
34+
<article className="relative flex shrink-0 flex-col gap-6 max-xl:max-w-[476px]">
35+
<h2 className="typography-h2">
36+
A place of innovation &&nbsp;creation
37+
</h2>
38+
<p className="typography-body-lg">
39+
A former warehouse, located in an industrial area near the Amsterdam
40+
city centre, changed into a place of culture & business.
41+
</p>
42+
<div className="flex-1" />
43+
<p className="typography-body-lg">
44+
Pakhuis De Zwijger <br />
45+
Piet Heinkade 179, 1019 HC <br />
46+
Amsterdam, Netherlands
47+
</p>
48+
<Button href="https://maps.app.goo.gl/W7nX1NejhWw9PqxF7">
49+
Google Maps
50+
</Button>
51+
</article>
52+
<div className="relative flex-1">
53+
<h3 className="mb-6 typography-h3">How to get to the venue?</h3>
54+
<Accordion
55+
className="[&_svg]:fill-neu-900"
56+
items={[
57+
{
58+
title: "Public Transportation",
59+
description: (
60+
<>
61+
Take tram 26 from Amsterdam Central Station to the
62+
"Kattenburgerstraat" stop.
63+
<br />
64+
The venue is in front of the tram stop.
65+
</>
66+
),
67+
},
68+
{
69+
title: "Airport Information",
70+
description:
71+
"Amsterdam Airport Schiphol is about 20 km from the venue. Take a direct train to Amsterdam Central Station, then follow the public transportation instructions.",
72+
},
73+
{
74+
title: "Parking at venue",
75+
description: (
76+
<>
77+
Limited parking is available at the venue. We recommend
78+
using public transportation when possible. Learn more about
79+
parking at{" "}
80+
<a
81+
className="typography-link"
82+
href="https://dezwijger.nl/about-us-en/contact"
83+
target="_blank"
84+
>
85+
Pakhuis de Zwijger
86+
</a>
87+
. If&nbsp;you require an accessible parking spot, park at
88+
Vriesseveem 4 or Withoedenveem 16 where you can park if you
89+
have a Disability Parking Card.
90+
</>
91+
),
92+
},
93+
]}
94+
/>
95+
<h3 className="my-6 typography-h3">Where to stay?</h3>
96+
<Accordion
97+
className="[&_svg]:fill-neu-900"
98+
items={[
99+
{
100+
title: "Mövenpick Hotel Amsterdam City Centre",
101+
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",
102+
description: (
103+
<>
104+
Piet Heinkade 11
105+
<br />
106+
1019 BR Amsterdam, Netherlands
107+
<br />
108+
Phone:{" "}
109+
<a className="typography-link" href="tel:+31 20 519 1200">
110+
+31 20 519 1200
111+
</a>
112+
</>
113+
),
114+
},
115+
{
116+
title: "Inntel Hotels Amsterdam Landmark",
117+
link: "https://www.inntelhotelsamsterdamlandmark.nl/",
118+
description: (
119+
<>
120+
VOC-kade 600
121+
<br />
122+
1018 LG Amsterdam, Netherlands
123+
<br />
124+
Phone:{" "}
125+
<a className="typography-link" href="tel:+31 20 227 2550">
126+
+31 20 227 2550
127+
</a>
128+
</>
129+
),
130+
},
131+
{
132+
title: "DoubleTree by Hilton Amsterdam Central Station",
133+
link: "https://www.hilton.com/en/hotels/amscsdi-doubletree-amsterdam-centraal-station/?SEO_id=GMB-EMEA-DI-AMSCSDI",
134+
description: (
135+
<>
136+
Oosterdoksstraat 4 <br />
137+
1011 DK Amsterdam, Netherlands
138+
<br />
139+
Phone:{" "}
140+
<a className="typography-link" href="tel:+31 20 530 0800">
141+
+31 20 530 0800
142+
</a>
143+
</>
144+
),
145+
},
146+
]}
147+
/>
148+
</div>
149+
</div>
150+
</section>
151+
)
152+
}

‎src/app/conf/2025/components/venue/location-photo.webp

458 KB
Binary file not shown.

‎src/app/conf/2025/faq.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import clsx from "clsx"
2-
import ArrowDown from "./pixelarticons/arrow-down.svg?svgr"
2+
3+
import ArrowDown from "@/app/conf/_design-system/pixelarticons/arrow-down.svg?svgr"
34

45
const FAQS = [
56
{

‎src/app/conf/2025/page.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { Metadata } from "next"
22
import { BecomeASponsor } from "./components/become-a-sponsor"
3-
import { Venue } from "./venue"
3+
import { Venue } from "./components/venue"
44
import { FAQ } from "./faq"
55
import { CallForProposals } from "./components/call-for-proposals"
66
import { RegisterToday } from "./components/register-today"

‎src/app/conf/2025/pixelarticons/external-link.svg

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎src/app/conf/2025/venue.tsx

Lines changed: 0 additions & 116 deletions
This file was deleted.

0 commit comments

Comments
 (0)