From af29ec2a48b40a8a28273c23558568c6250c4bec Mon Sep 17 00:00:00 2001 From: iamkiddy Date: Thu, 6 Nov 2025 12:56:20 +0000 Subject: [PATCH] Refactor navigation and component structure by updating import paths for SideNav and Notifications components. Remove unused Login component and notifications.tsx file. Add Navbar component to the Home page and adjust package.json to specify pnpm as the package manager. --- {components => app/(admin)/_components}/notifications.tsx | 0 {components => app/(admin)/_components}/side-nav.tsx | 0 app/(admin)/booking/page.tsx | 2 +- app/(admin)/dashboard/page.tsx | 2 +- app/(admin)/notifications/page.tsx | 4 ++-- app/(auth)/layout.tsx | 7 +++++++ app/{(admin) => (auth)}/login/page.tsx | 0 app/page.tsx | 3 +++ app/providers.tsx | 2 -- components/Navbar.tsx | 2 +- package.json | 3 ++- 11 files changed, 17 insertions(+), 8 deletions(-) rename {components => app/(admin)/_components}/notifications.tsx (100%) rename {components => app/(admin)/_components}/side-nav.tsx (100%) create mode 100644 app/(auth)/layout.tsx rename app/{(admin) => (auth)}/login/page.tsx (100%) diff --git a/components/notifications.tsx b/app/(admin)/_components/notifications.tsx similarity index 100% rename from components/notifications.tsx rename to app/(admin)/_components/notifications.tsx diff --git a/components/side-nav.tsx b/app/(admin)/_components/side-nav.tsx similarity index 100% rename from components/side-nav.tsx rename to app/(admin)/_components/side-nav.tsx diff --git a/app/(admin)/booking/page.tsx b/app/(admin)/booking/page.tsx index 3e40f07..99b5c1c 100644 --- a/app/(admin)/booking/page.tsx +++ b/app/(admin)/booking/page.tsx @@ -1,6 +1,6 @@ "use client"; -import SideNav from "@/components/side-nav"; +import SideNav from "@/app/(admin)/_components/side-nav"; export default function Booking() { return ( diff --git a/app/(admin)/dashboard/page.tsx b/app/(admin)/dashboard/page.tsx index 5de5e31..93f8a4a 100644 --- a/app/(admin)/dashboard/page.tsx +++ b/app/(admin)/dashboard/page.tsx @@ -1,6 +1,6 @@ "use client"; -import SideNav from "@/components/side-nav"; +import SideNav from "@/app/(admin)/_components/side-nav"; export default function Dashboard() { return ( diff --git a/app/(admin)/notifications/page.tsx b/app/(admin)/notifications/page.tsx index 6ac1d97..d8b1822 100644 --- a/app/(admin)/notifications/page.tsx +++ b/app/(admin)/notifications/page.tsx @@ -1,8 +1,8 @@ "use client"; import { useState } from "react"; -import SideNav from "@/components/side-nav"; -import { Notifications, Notification } from "@/components/notifications"; +import SideNav from "@/app/(admin)/_components/side-nav"; +import { Notifications, Notification } from "@/app/(admin)/_components/notifications"; export default function NotificationsPage() { const [notifications, setNotifications] = useState([ diff --git a/app/(auth)/layout.tsx b/app/(auth)/layout.tsx new file mode 100644 index 0000000..937e74a --- /dev/null +++ b/app/(auth)/layout.tsx @@ -0,0 +1,7 @@ +export default function AuthLayout({ children }: { children: React.ReactNode }) { + return ( +
+ {children} +
+ ) +} \ No newline at end of file diff --git a/app/(admin)/login/page.tsx b/app/(auth)/login/page.tsx similarity index 100% rename from app/(admin)/login/page.tsx rename to app/(auth)/login/page.tsx diff --git a/app/page.tsx b/app/page.tsx index fced93b..273b8b5 100644 --- a/app/page.tsx +++ b/app/page.tsx @@ -4,10 +4,13 @@ import { HeroSection } from "@/components/Hero"; import { About } from "@/components/About"; import { Services } from "@/components/Services"; import { ContactSection } from "@/components/ContactSection"; +import { Navbar } from "../components/Navbar"; + export default function Home() { return (
+ diff --git a/app/providers.tsx b/app/providers.tsx index e759ace..9707b40 100644 --- a/app/providers.tsx +++ b/app/providers.tsx @@ -1,13 +1,11 @@ "use client"; import { ThemeProvider } from "../components/ThemeProvider"; -import { Navbar } from "../components/Navbar"; import { type ReactNode } from "react"; export function Providers({ children }: { children: ReactNode }) { return ( - {children} ); diff --git a/components/Navbar.tsx b/components/Navbar.tsx index 9d340a5..31803e3 100644 --- a/components/Navbar.tsx +++ b/components/Navbar.tsx @@ -80,7 +80,7 @@ export function Navbar() {