.

Author: faikit

app/layout.tsx

@@ -1,14 +1,10 @@
 import * as React from "react"
 import type { Metadata } from "next";
-import Link from "next/link"
-import Image from 'next/image'
 
 
 
-import { Button } from "@/components/ui/button"
 import { SidebarProvider } from "@/components/ui/sidebar"
-import { AppSidebar } from "@/components/app-sidebar"
-import { CustomTrigger } from "@/components/ui/sidebartrigger"
+import { Header } from "@/components/header"
 
 
 
@@ -59,48 +55,7 @@ export default function RootLayout({
 
 
 
-                    <header>
-
-
-
-                        <AppSidebar />
-
-
-
-                        <div className="fixed flex flex-row gap-3 p-6 z-20 flex-wrap w-full justify-between md:w-fit md:justify-start">
-
-                            <Button asChild className="bg-background text-foreground hover:bg-white group">
-                                <Link href="/" className="select-none">
-                                    <Image
-                                        src="/logo/OpenDriveLab/D.png"
-                                        alt="OpenDriveLab"
-                                        width={24}
-                                        height={24}
-                                        className="group-hover:scale-125 transition delay-100 duration-200"
-                                    />
-                                </Link>
-                            </Button>
-
-                            <CustomTrigger />
-
-                        </div>
-
-
-
-                        <div className="fixed right-0 bottom-0 m-6 z-20">
-                            <Link href="#" className="bg-background text-foreground hover:bg-o-blue hover:text-background rounded-full flex justify-center items-center p-2 select-none">
-                                <span>
-                                    <svg fill="none" viewBox="0 0 24 24" strokeWidth="1.5" stroke="currentColor" className="size-6">
-                                        <path strokeLinecap="round" strokeLinejoin="round" d="m4.5 18.75 7.5-7.5 7.5 7.5" />
-                                        <path strokeLinecap="round" strokeLinejoin="round" d="m4.5 12.75 7.5-7.5 7.5 7.5" />
-                                    </svg>
-                                </span>
-                            </Link>
-                        </div>
-
-
-
-                    </header>
+                    <Header/>
 
 
 

app/not-found.tsx

@@ -5,12 +5,12 @@ export const metadata: Metadata = {
 
 
 
-import NotFound404 from '@/components/404'
+import Redirect from '@/components/redirect'
 
 
 
 export default function NotFound() {
     return (
-        <NotFound404/>
+        <Redirect/>
     )
 }

components/header.tsx

@@ -0,0 +1,70 @@
+"use client"
+
+
+
+import * as React from "react"
+import Link from "next/link"
+import Image from 'next/image'
+import { usePathname } from 'next/navigation';
+
+
+
+import { Button } from "@/components/ui/button"
+import { AppSidebar } from "@/components/app-sidebar"
+import { CustomTrigger } from "@/components/ui/sidebartrigger"
+
+
+
+export function Header() {
+
+
+
+    const pathname = usePathname()
+
+
+
+    return (
+        <header key={pathname}>
+
+
+
+            <AppSidebar />
+
+
+
+            <div className="fixed flex flex-row gap-3 p-6 z-20 flex-wrap w-full justify-between md:w-fit md:justify-start">
+
+                <Button asChild className="bg-background text-foreground hover:bg-white group">
+                    <Link href="/" className="select-none">
+                        <Image
+                            src="/logo/OpenDriveLab/D.png"
+                            alt="OpenDriveLab"
+                            width={24}
+                            height={24}
+                            className="group-hover:scale-125 transition delay-100 duration-200"
+                        />
+                    </Link>
+                </Button>
+
+                <CustomTrigger />
+
+            </div>
+
+
+
+            <div className="fixed right-0 bottom-0 m-6 z-20">
+                <Link href="#" className="bg-background text-foreground hover:bg-o-blue hover:text-background rounded-full flex justify-center items-center p-2 select-none">
+                    <span>
+                        <svg fill="none" viewBox="0 0 24 24" strokeWidth="1.5" stroke="currentColor" className="size-6">
+                            <path strokeLinecap="round" strokeLinejoin="round" d="m4.5 18.75 7.5-7.5 7.5 7.5" />
+                            <path strokeLinecap="round" strokeLinejoin="round" d="m4.5 12.75 7.5-7.5 7.5 7.5" />
+                        </svg>
+                    </span>
+                </Link>
+            </div>
+
+
+
+        </header>
+    )
+}

components/404.tsx components/redirect.tsxcomponents/404.tsx renamed to components/redirect.tsx

@@ -6,7 +6,7 @@ import { redirect, usePathname } from 'next/navigation'
 
 
 
-export default function NotFound404() {
+export default function Redirect() {