diff --git a/app/[page]/page.tsx b/app/[page]/page.tsx index aa0c15603..089a558af 100644 --- a/app/[page]/page.tsx +++ b/app/[page]/page.tsx @@ -1,16 +1,16 @@ -import type { Metadata } from 'next'; +import type { Metadata } from 'next' -import Prose from 'components/prose'; -import { getPage } from 'lib/shopify'; -import { notFound } from 'next/navigation'; +import Prose from 'components/prose' +import { getPage } from 'lib/shopify' +import { notFound } from 'next/navigation' export async function generateMetadata(props: { - params: Promise<{ page: string }>; + params: Promise<{ page: string }> }): Promise { - const params = await props.params; - const page = await getPage(params.page); + const params = await props.params + const page = await getPage(params.page) - if (!page) return notFound(); + if (!page) return notFound() return { title: page.seo?.title || page.title, @@ -18,28 +18,34 @@ export async function generateMetadata(props: { openGraph: { publishedTime: page.createdAt, modifiedTime: page.updatedAt, - type: 'article' - } - }; + type: 'article', + }, + } } -export default async function Page(props: { params: Promise<{ page: string }> }) { - const params = await props.params; - const page = await getPage(params.page); +export default async function Page(props: { + params: Promise<{ page: string }> +}) { + const params = await props.params + const page = await getPage(params.page) - if (!page) return notFound(); + console.log('page', params) + if (!page) return notFound() return ( <>

{page.title}

- {`This document was last updated on ${new Intl.DateTimeFormat(undefined, { - year: 'numeric', - month: 'long', - day: 'numeric' - }).format(new Date(page.updatedAt))}.`} + {`This document was last updated on ${new Intl.DateTimeFormat( + undefined, + { + year: 'numeric', + month: 'long', + day: 'numeric', + }, + ).format(new Date(page.updatedAt))}.`}

- ); + ) } diff --git a/app/assets/base.css b/app/assets/base.css index 85c0277c5..df69928e5 100644 --- a/app/assets/base.css +++ b/app/assets/base.css @@ -30,8 +30,9 @@ --accent-7: #333333; --accent-8: #111111; --accent-9: #000; - --font-sans: -apple-system, system-ui, BlinkMacSystemFont, 'Helvetica Neue', - 'Helvetica', sans-serif; + --font-sans: + -apple-system, system-ui, BlinkMacSystemFont, 'Helvetica Neue', 'Helvetica', + sans-serif; } [data-theme='dark'] { diff --git a/app/assets/main.css b/app/assets/main.css index 4d7dae339..15c157ee0 100644 --- a/app/assets/main.css +++ b/app/assets/main.css @@ -1,3 +1,2 @@ @import './base.css'; @import './components.css'; -@import './utilities.css'; diff --git a/app/layout.tsx b/app/layout.tsx index 5e3355ce9..bfaf9f5f3 100644 --- a/app/layout.tsx +++ b/app/layout.tsx @@ -1,40 +1,45 @@ -import { CartProvider } from 'components/cart/cart-context'; -import { Navbar } from 'components/layout/navbar'; -import { WelcomeToast } from 'components/welcome-toast'; -import { GeistSans } from 'geist/font/sans'; -import { getCart } from 'lib/shopify'; -import { ReactNode } from 'react'; -import { Toaster } from 'sonner'; -import './globals.css'; -import { baseUrl } from 'lib/utils'; +import { CartProvider } from 'components/cart/cart-context' +// import { Navbar } from 'components/layout/navbar' +import NavbarV2 from 'components/layout/navbar/NavbarV2' +import { WelcomeToast } from 'components/welcome-toast' +import { GeistSans } from 'geist/font/sans' +import { getCart } from 'lib/shopify' +import { ReactNode } from 'react' +import { Toaster } from 'sonner' +import './globals.css' +import './assets/main.css' +import '../components/layout/navbar/Navbar.css' -const { SITE_NAME } = process.env; +import { baseUrl } from 'lib/utils' + +const { SITE_NAME } = process.env export const metadata = { metadataBase: new URL(baseUrl), title: { default: SITE_NAME!, - template: `%s | ${SITE_NAME}` + template: `%s | ${SITE_NAME}`, }, robots: { follow: true, - index: true - } -}; + index: true, + }, +} export default async function RootLayout({ - children + children, }: { - children: ReactNode; + children: ReactNode }) { // Don't await the fetch, pass the Promise to the context provider - const cart = getCart(); + const cart = getCart() return ( - + {/* */} +
{children} @@ -43,5 +48,5 @@ export default async function RootLayout({ - ); + ) } diff --git a/app/page.tsx b/app/page.tsx index 86ff52f45..000eb7be8 100644 --- a/app/page.tsx +++ b/app/page.tsx @@ -13,9 +13,9 @@ export const metadata = { export default function HomePage() { return ( <> - {/* */} - {/* */} - {/*