fix navbar links and combine sponsor/partner pages (#1704)

* fix navbar links and combine sponsor/partner pages

* Update src/app/conf/2024/layout.tsx

Author: YassinEldeeb

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({
           </NextLink>
         }
         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: <span>FAQ</span>, href: "/conf/2024/faq" },
+          { children: <span>Speak</span>, href: "/conf/2024/speak" },
+          { children: <span>Register</span>, href: "/conf/2024#attend" },
+          { children: <span>Partner</span>, href: "/conf/2024/partner" },
           {
-            children: "Speakers",
-            href: "/conf/2024/speakers",
-            "aria-disabled": true,
-          },
-          {
-            children: "Schedule",
+            children: <span>Schedule</span>,
             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" },

src/app/conf/2024/page.tsx

@@ -46,21 +46,21 @@ export default function Page() {
           </div>
           <HostedByGraphQLFoundation className="shrink-0 h-8 lg:h-10 mt-5 mb-16 lg:mb-32 self-start" />
           <div className="flex items-center gap-12 max-md:flex-col">
-            <Button href="https://cvent.me/gk2dRw">Register Now!</Button>
+            <Button href="#attend">Get Your Ticket!</Button>
             <a
               href="/conf/2024/speak"
               className="whitespace-nowrap with-arrow w-40 hover:text-primary transition-colors"
             >
               Submit to Speak
             </a>
             <a
-              href="/conf/2024/sponsor"
+              href="/conf/2024/sponsor#sponsor"
               className="whitespace-nowrap with-arrow w-40 hover:text-primary transition-colors"
             >
               Join as a Sponsor
             </a>
             <a
-              href="/conf/2024/partner"
+              href="/conf/2024/partner#program"
               className="whitespace-nowrap with-arrow w-40 hover:text-primary transition-colors"
             >
               Join as a Partner

src/app/conf/2024/partner/index.mdx

@@ -1,6 +1,23 @@
 import { Button } from "@/app/conf/_components/button"
 
-# Partner with GraphQLConf
+<h1 id="sponsor">Sponsor GraphQLConf 2024</h1>
+
+<div className="flex flex-row justfiy-center">
+    <Button target="_blank" href="/conf/sponsor/sponsor_2024.pdf" className="!text-white !block">Sponsorship Details</Button>
+    <Button href="mailto:[email protected]?subject=Sponsorships" className="!text-white !block ml-3.5">Contact Us</Button>
+</div>
+Contact us at [email protected] 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.
+
+
+<h1 id="program">Partner with GraphQLConf</h1>
 
 We are pleased to offer a Media and Community Partner Program for
 our upcoming GraphQLConf 2024. Our program is designed to provide

src/app/conf/2024/sponsor/client-mdx.ts

@@ -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()

src/app/conf/2024/sponsor/index.mdx

@@ -28,7 +28,7 @@ export default function RootLayout({
   children: ReactNode
 }): ReactElement {
   return (
-    <html lang="en" className={font.className}>
+    <html lang="en" className={`scroll-smooth ${font.className}`}>
       <head>
         <style>{`html { scroll-padding-top: 5rem }`}</style>
       </head>

src/app/conf/2024/sponsor/page.tsx

@@ -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",