From f6173218d93f2114bf7f77f2522a7795be2ba672 Mon Sep 17 00:00:00 2001 From: Jonathan Brennan Date: Thu, 6 Nov 2025 18:35:15 -0600 Subject: [PATCH 01/17] relocate css file intended only for conf/2025 --- src/{ => app/conf/2025}/conf.css | 0 src/app/conf/2025/layout.tsx | 1 + src/app/layout.tsx | 1 - 3 files changed, 1 insertion(+), 1 deletion(-) rename src/{ => app/conf/2025}/conf.css (100%) diff --git a/src/conf.css b/src/app/conf/2025/conf.css similarity index 100% rename from src/conf.css rename to src/app/conf/2025/conf.css diff --git a/src/app/conf/2025/layout.tsx b/src/app/conf/2025/layout.tsx index ed8b28059e..8d56a91539 100644 --- a/src/app/conf/2025/layout.tsx +++ b/src/app/conf/2025/layout.tsx @@ -3,6 +3,7 @@ import { Metadata } from "next" import { NewFontsStyleTag } from "../../fonts" import "../../colors.css" +import "./conf.css" import { Navbar } from "./components/navbar" import { Footer } from "./components/footer" diff --git a/src/app/layout.tsx b/src/app/layout.tsx index 8a10151189..09aa01ab6f 100644 --- a/src/app/layout.tsx +++ b/src/app/layout.tsx @@ -2,7 +2,6 @@ import { ReactElement, ReactNode } from "react" import { Metadata } from "next" import GoogleAnalytics from "@/app/ga" -import "../conf.css" import "../globals.css" export const metadata: Metadata = { From 25008324409dce0ef916d9ad96d8975375e0ec5f Mon Sep 17 00:00:00 2001 From: Jonathan Brennan Date: Thu, 6 Nov 2025 19:00:05 -0600 Subject: [PATCH 02/17] relocate index page, add "use client", refactor layout --- src/app/(main)/layout.tsx | 29 ------------------- src/app/(main)/page.tsx | 10 +++++++ src/app/layout.tsx | 20 ++++++++++++- src/app/not-found.tsx | 5 ++-- .../index-page/data-colocation/index.tsx | 2 ++ .../graphql-advantages/consistency.tsx | 2 ++ .../graphql-advantages/precision.tsx | 2 ++ .../graphql-advantages/versionless.tsx | 2 ++ .../index-page/how-it-works/index.tsx | 2 ++ .../how-it-works/interactive-editor.tsx | 6 ++-- .../index-page/what-is-graphql/wires.tsx | 2 ++ src/pages/index.mdx | 5 ---- 12 files changed, 47 insertions(+), 40 deletions(-) delete mode 100644 src/app/(main)/layout.tsx create mode 100644 src/app/(main)/page.tsx delete mode 100644 src/pages/index.mdx diff --git a/src/app/(main)/layout.tsx b/src/app/(main)/layout.tsx deleted file mode 100644 index fefeb27741..0000000000 --- a/src/app/(main)/layout.tsx +++ /dev/null @@ -1,29 +0,0 @@ -// @ts-expect-error: we want to import the same version as Nextra for the main page -import { ThemeProvider } from "next-themes" - -import { Footer } from "../../components/footer" -import { NewFontsStyleTag } from "../fonts" -import { Navbar } from "../../components/navbar/navbar" -import { topLevelNavbarItems } from "../../components/navbar/top-level-items" -import { MenuProvider } from "./menu-provider" - -export default function MainLayout({ - children, -}: { - children: React.ReactNode -}) { - return ( - <> - - - - -
- {children} -
-