mirror of
https://github.com/mroxso/zelo-news.git
synced 2026-06-05 18:11:10 +02:00
dev2main (#25)
* refactor: rename BlogHeader to Header and BlogLayout to Layout for consistency * feat: implement Header and Layout components for improved site structure * refactor: rename BlogLayoutProps to LayoutProps for consistency --------- Co-authored-by: highperfocused <highperfocused@pm.me>
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
import { BrowserRouter, Route, Routes } from "react-router-dom";
|
||||
import { ScrollToTop } from "./components/ScrollToTop";
|
||||
import { BlogLayout } from "./components/BlogLayout";
|
||||
import { Layout } from "./components/Layout";
|
||||
import CreatePostPage from "./pages/CreatePostPage";
|
||||
import EditPostPage from "./pages/EditPostPage";
|
||||
import SearchResultsPage from "./pages/SearchResultsPage";
|
||||
@@ -16,7 +16,7 @@ export function AppRouter() {
|
||||
return (
|
||||
<BrowserRouter>
|
||||
<ScrollToTop />
|
||||
<BlogLayout>
|
||||
<Layout>
|
||||
<Routes>
|
||||
<Route path="/" element={<HomePage />} />
|
||||
<Route path="/create" element={<CreatePostPage />} />
|
||||
@@ -33,7 +33,7 @@ export function AppRouter() {
|
||||
{/* ADD ALL CUSTOM ROUTES ABOVE THE CATCH-ALL "*" ROUTE */}
|
||||
<Route path="*" element={<NotFound />} />
|
||||
</Routes>
|
||||
</BlogLayout>
|
||||
</Layout>
|
||||
</BrowserRouter>
|
||||
);
|
||||
}
|
||||
|
||||
@@ -7,7 +7,7 @@ import { Sheet, SheetContent, SheetTrigger } from '@/components/ui/sheet';
|
||||
import { ThemeToggle } from '@/components/ThemeToggle';
|
||||
import { useState } from 'react';
|
||||
|
||||
export function BlogHeader() {
|
||||
export function Header() {
|
||||
const { user } = useCurrentUser();
|
||||
const [isMenuOpen, setIsMenuOpen] = useState(false);
|
||||
|
||||
@@ -1,15 +1,15 @@
|
||||
import { ReactNode } from 'react';
|
||||
import { BlogHeader } from './BlogHeader';
|
||||
import { Header } from './Header';
|
||||
import packageJson from '../../package.json';
|
||||
|
||||
interface BlogLayoutProps {
|
||||
interface LayoutProps {
|
||||
children: ReactNode;
|
||||
}
|
||||
|
||||
export function BlogLayout({ children }: BlogLayoutProps) {
|
||||
export function Layout({ children }: LayoutProps) {
|
||||
return (
|
||||
<div className="min-h-screen flex flex-col">
|
||||
<BlogHeader />
|
||||
<Header />
|
||||
<main className="flex-1">
|
||||
{children}
|
||||
</main>
|
||||
Reference in New Issue
Block a user