From 069d56dbda5a60fd78c96ce9ffa8f57890e1753e Mon Sep 17 00:00:00 2001 From: "marta.pancaldi" Date: Sat, 8 Jul 2023 13:07:58 +0200 Subject: [PATCH] feat: restructure pages to Sanity folder --- sanity/env.ts | 8 +- src/app/(admin)/layout.tsx | 14 +++ .../studio/[[...index]]/page.tsx | 2 +- src/app/(public)/layout-client.tsx | 19 ++++ src/app/(public)/layout.tsx | 29 ++++++ src/app/(public)/page.tsx | 19 ++++ src/components/Seo.tsx | 10 ++- src/components/layout/Header.tsx | 2 - src/components/layout/Layout.tsx | 16 ---- src/pages/404.tsx | 36 +++----- src/pages/_app.tsx | 19 ---- src/pages/_document.tsx | 21 ----- src/pages/index.tsx | 89 ------------------- src/styles/globals.css | 4 + 14 files changed, 110 insertions(+), 178 deletions(-) create mode 100644 src/app/(admin)/layout.tsx rename src/app/{ => (admin)}/studio/[[...index]]/page.tsx (90%) create mode 100644 src/app/(public)/layout-client.tsx create mode 100644 src/app/(public)/layout.tsx create mode 100644 src/app/(public)/page.tsx delete mode 100644 src/components/layout/Layout.tsx delete mode 100644 src/pages/_app.tsx delete mode 100644 src/pages/_document.tsx delete mode 100644 src/pages/index.tsx diff --git a/sanity/env.ts b/sanity/env.ts index 330b247..8cabb2c 100644 --- a/sanity/env.ts +++ b/sanity/env.ts @@ -2,13 +2,13 @@ export const apiVersion = process.env.NEXT_PUBLIC_SANITY_API_VERSION || '2023-07-06'; export const dataset = assertValue( - process.env.SANITY_STUDIO_DATASET, - 'Missing environment variable: SANITY_STUDIO_DATASET' + process.env.NEXT_PUBLIC_SANITY_DATASET, + 'Missing environment variable: NEXT_PUBLIC_SANITY_DATASET' ); export const projectId = assertValue( - process.env.SANITY_STUDIO_PROJECT_ID, - 'Missing environment variable: SANITY_STUDIO_PROJECT_ID' + process.env.NEXT_PUBLIC_SANITY_PROJECT_ID, + 'Missing environment variable: NEXT_PUBLIC_SANITY_PROJECT_ID' ); export const useCdn = false; diff --git a/src/app/(admin)/layout.tsx b/src/app/(admin)/layout.tsx new file mode 100644 index 0000000..e569095 --- /dev/null +++ b/src/app/(admin)/layout.tsx @@ -0,0 +1,14 @@ +import { ReactNode } from 'react'; + +export const metadata = { + title: 'Next.js', + description: 'Generated by Next.js', +}; + +export default function RootLayout({ children }: { children: ReactNode }) { + return ( + + {children} + + ); +} diff --git a/src/app/studio/[[...index]]/page.tsx b/src/app/(admin)/studio/[[...index]]/page.tsx similarity index 90% rename from src/app/studio/[[...index]]/page.tsx rename to src/app/(admin)/studio/[[...index]]/page.tsx index c87599a..108df9e 100644 --- a/src/app/studio/[[...index]]/page.tsx +++ b/src/app/(admin)/studio/[[...index]]/page.tsx @@ -11,7 +11,7 @@ import { NextStudio } from 'next-sanity/studio'; -import config from '../../../../sanity.config'; +import config from '../../../../../sanity.config'; export default function StudioPage() { return ; diff --git a/src/app/(public)/layout-client.tsx b/src/app/(public)/layout-client.tsx new file mode 100644 index 0000000..7054401 --- /dev/null +++ b/src/app/(public)/layout-client.tsx @@ -0,0 +1,19 @@ +'use client'; + +import { ThemeProvider } from 'next-themes'; +import type { PropsWithChildren } from 'react'; + +import Footer from '@/components/layout/Footer'; +import Header from '@/components/layout/Header'; + +export default function LayoutClient({ children }: PropsWithChildren) { + return ( + +
+ +
{children}
+ +