From f558be2bcdf2f39758a6c82bad8206b4e2b882b7 Mon Sep 17 00:00:00 2001 From: tobias Date: Mon, 24 Jun 2024 08:47:53 +0200 Subject: [PATCH] Use base layout and style --- src/app/(app)/layout.tsx | 21 ++++++--------------- src/app/(app)/page.tsx | 22 +++++++++------------- src/app/(app)/posts/[[...path]]/page.tsx | 2 +- src/components/Blocks/Author.tsx | 6 +++--- src/components/PostPage.tsx | 4 ++++ src/utils/generateMeta.ts | 4 ++-- 6 files changed, 25 insertions(+), 34 deletions(-) diff --git a/src/app/(app)/layout.tsx b/src/app/(app)/layout.tsx index b936db4..d0d3a9c 100644 --- a/src/app/(app)/layout.tsx +++ b/src/app/(app)/layout.tsx @@ -1,25 +1,16 @@ import React from 'react' import './global.css' -/* import { Inter } from 'next/font/google' -const inter = Inter({ - subsets: ['latin'], - display: 'swap', -}) - */ -/* Our app sits here to not cause any conflicts with payload's root layout */ +import Header from '@/components/Header' +import Footer from '@/components/Footer' + const Layout: React.FC<{ children: React.ReactNode }> = ({ children }) => { - { - /* - {children} - - */ - } - return ( - {children} +
+
{children}
+