From 26f8fceb3d7f3cd88319f6b896d0f4d0d9f81c30 Mon Sep 17 00:00:00 2001 From: YassinEldeeb Date: Tue, 21 May 2024 13:16:03 +0300 Subject: [PATCH 1/2] fix navbar links and combine sponsor/partner pages --- src/app/conf/2024/layout.tsx | 23 +++++++++-------------- src/app/conf/2024/page.tsx | 6 +++--- src/app/conf/2024/partner/index.mdx | 19 ++++++++++++++++++- src/app/conf/2024/sponsor/client-mdx.ts | 3 --- src/app/conf/2024/sponsor/index.mdx | 17 ----------------- src/app/conf/2024/sponsor/page.tsx | 22 ---------------------- src/app/conf/_components/header.tsx | 2 +- src/app/layout.tsx | 2 +- vercel.json | 5 +++++ 9 files changed, 37 insertions(+), 62 deletions(-) delete mode 100644 src/app/conf/2024/sponsor/client-mdx.ts delete mode 100644 src/app/conf/2024/sponsor/index.mdx delete mode 100644 src/app/conf/2024/sponsor/page.tsx diff --git a/src/app/conf/2024/layout.tsx b/src/app/conf/2024/layout.tsx index 93437d5501..42f01fcafc 100644 --- a/src/app/conf/2024/layout.tsx +++ b/src/app/conf/2024/layout.tsx @@ -4,6 +4,7 @@ import { Header } from "../_components/header" import { Footer } from "../_components/footer" import { GraphQLConf, HostedByGraphQLFoundation } from "@/icons" import NextLink from "next/link" +import { Button } from "../_components/button" export const metadata = { description: @@ -41,22 +42,15 @@ export default function Layout({ } links={[ - { children: "FAQ", href: "/conf/2024/faq" }, - { children: "Speak", href: "/conf/2024/speak" }, - { children: "Register", href: "https://cvent.me/gk2dRw" }, - { children: "Sponsor", href: "/conf/2024/sponsor" }, - { children: "Partner", href: "/conf/2024/partner" }, + { children: FAQ, href: "/conf/2024/faq" }, + { children: Speak, href: "/conf/2024/speak" }, + { children: Register, href: "#attend" }, + { children: Partner, href: "/conf/2024/partner" }, { - children: "Speakers", - href: "/conf/2024/speakers", - "aria-disabled": true, - }, - { - children: "Schedule", + children: Schedule, href: "/conf/2024/schedule", "aria-disabled": true, }, - { children: "GraphQLConf 2023", href: "/conf/2023" }, ]} /> {children} @@ -74,8 +68,8 @@ export default function Layout({ [ { children: "Speak", href: "/conf/2024/speak" }, { children: "Register", href: "https://cvent.me/gk2dRw" }, - { children: "Sponsor", href: "/conf/2024/sponsor" }, - { children: "Partner", href: "/conf/2024/partner" }, + { children: "Sponsor", href: "/conf/2024/partner" }, + { children: "Partner", href: "/conf/2024/partner#program" }, { children: "Speakers", href: "/conf/2024/speakers", @@ -86,6 +80,7 @@ export default function Layout({ href: "/conf/2024/schedule", "aria-disabled": true, }, + { children: "GraphQLConf 2023", href: "/conf/2023" }, ], [ { children: "FAQ", href: "/conf/2024/faq" }, diff --git a/src/app/conf/2024/page.tsx b/src/app/conf/2024/page.tsx index 953d21ac58..3b550bebd0 100644 --- a/src/app/conf/2024/page.tsx +++ b/src/app/conf/2024/page.tsx @@ -46,7 +46,7 @@ export default function Page() {
- + Join as a Sponsor Join as a Partner diff --git a/src/app/conf/2024/partner/index.mdx b/src/app/conf/2024/partner/index.mdx index 259101d95e..231c7468f0 100644 --- a/src/app/conf/2024/partner/index.mdx +++ b/src/app/conf/2024/partner/index.mdx @@ -1,6 +1,23 @@ import { Button } from "@/app/conf/_components/button" -# Partner with GraphQLConf +

Sponsor GraphQLConf 2024

+ +
+ + +
+Contact us at graphqlconf@graphql.org to reserve your sponsorship, ask questions or talk about different options. + +GraphQLConf is the official GraphQL conference hosted by the GraphQL Foundation. It is a premier event by the community for the community to promote education, adoption, and advancement of GraphQL. + +Help make this event one to remember by becoming a sponsor. + +GraphQLConf will attract members of the GraphQL community from around the world. Developers, users, architects, and technology leaders from multiple industries will gather in San Francisco to meet, collaborate and build. GraphQLConf 2024 is the flagship event in the GraphQL Foundation’s official event series. + +Investing in GraphQLConf provides the opportunity to build awareness and loyalty with leaders and decision makers in organizations across the GraphQL and open source community. + + +

Partner with GraphQLConf

We are pleased to offer a Media and Community Partner Program for our upcoming GraphQLConf 2024. Our program is designed to provide diff --git a/src/app/conf/2024/sponsor/client-mdx.ts b/src/app/conf/2024/sponsor/client-mdx.ts deleted file mode 100644 index fc086077e4..0000000000 --- a/src/app/conf/2024/sponsor/client-mdx.ts +++ /dev/null @@ -1,3 +0,0 @@ -"use client" - -export { default } from "./index.mdx" diff --git a/src/app/conf/2024/sponsor/index.mdx b/src/app/conf/2024/sponsor/index.mdx deleted file mode 100644 index 1e29bec69f..0000000000 --- a/src/app/conf/2024/sponsor/index.mdx +++ /dev/null @@ -1,17 +0,0 @@ -import { Button } from '@/app/conf/_components/button' - -# Sponsor GraphQLConf 2024 - -
- - -
-Contact us at graphqlconf@graphql.org to reserve your sponsorship, ask questions or talk about different options. - -GraphQLConf is the official GraphQL conference hosted by the GraphQL Foundation. It is a premier event by the community for the community to promote education, adoption, and advancement of GraphQL. - -Help make this event one to remember by becoming a sponsor. - -GraphQLConf will attract members of the GraphQL community from around the world. Developers, users, architects, and technology leaders from multiple industries will gather in San Francisco to meet, collaborate and build. GraphQLConf 2024 is the flagship event in the GraphQL Foundation’s official event series. - -Investing in GraphQLConf provides the opportunity to build awareness and loyalty with leaders and decision makers in organizations across the GraphQL and open source community. diff --git a/src/app/conf/2024/sponsor/page.tsx b/src/app/conf/2024/sponsor/page.tsx deleted file mode 100644 index adca419e2e..0000000000 --- a/src/app/conf/2024/sponsor/page.tsx +++ /dev/null @@ -1,22 +0,0 @@ -import MDXPage from "./client-mdx" -import { Sponsors } from "../sponsors" -import { Metadata } from "next" - -export const metadata: Metadata = { - title: "Sponsor", -} - -export default function Page() { - return ( - <> -
-
-
- -
-
-
- - - ) -} diff --git a/src/app/conf/_components/header.tsx b/src/app/conf/_components/header.tsx index 3c6acc9cfe..72c24fd5ea 100644 --- a/src/app/conf/_components/header.tsx +++ b/src/app/conf/_components/header.tsx @@ -17,7 +17,7 @@ export function Header({ links, logo, }: { - links: { href: string; children: string; "aria-disabled"?: true }[] + links: { href: string; children: React.ReactNode; "aria-disabled"?: true }[] logo: ReactNode }): ReactElement { const pathname = usePathname() diff --git a/src/app/layout.tsx b/src/app/layout.tsx index 1677d9080a..574cde150d 100644 --- a/src/app/layout.tsx +++ b/src/app/layout.tsx @@ -28,7 +28,7 @@ export default function RootLayout({ children: ReactNode }): ReactElement { return ( - + diff --git a/vercel.json b/vercel.json index 41f7ed32ee..02e0efad71 100644 --- a/vercel.json +++ b/vercel.json @@ -5,6 +5,11 @@ "destination": "https://graphql-conf-attendee-nextjs.vercel.app/:path*", "statusCode": 200 }, + { + "source": "/conf/sponsor", + "destination": "/conf/partner", + "permanent": false + }, { "source": "/conf/program", "destination": "/conf/2023/schedule", From 6334be317cf5f61dd64d72114badd6af8f480bbe Mon Sep 17 00:00:00 2001 From: Yassin Eldeeb Date: Thu, 23 May 2024 16:41:19 +0300 Subject: [PATCH 2/2] Update src/app/conf/2024/layout.tsx --- src/app/conf/2024/layout.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/conf/2024/layout.tsx b/src/app/conf/2024/layout.tsx index 42f01fcafc..a606eced2d 100644 --- a/src/app/conf/2024/layout.tsx +++ b/src/app/conf/2024/layout.tsx @@ -44,7 +44,7 @@ export default function Layout({ links={[ { children: FAQ, href: "/conf/2024/faq" }, { children: Speak, href: "/conf/2024/speak" }, - { children: Register, href: "#attend" }, + { children: Register, href: "/conf/2024#attend" }, { children: Partner, href: "/conf/2024/partner" }, { children: Schedule,