diff --git a/app/dashboard/layout.tsx b/app/dashboard/layout.tsx
new file mode 100644
index 0000000..85e11b1
--- /dev/null
+++ b/app/dashboard/layout.tsx
@@ -0,0 +1,35 @@
+"use client"// app/dashboard/layout.tsx
+import Sidebar from "@/components/dashboard/sidebar";
+import Navbar from "@/components/dashboard/navbar";
+import { Sparkles } from "lucide-react";
+
+export default function DashboardLayout({
+ children,
+}: {
+ children: React.ReactNode;
+}) {
+ return (
+
+ {/* Shared Sidebar */}
+
+
+
+ {/* Shared Navbar */}
+
+
+ {/* The active page content renders here */}
+
+ {children}
+
+
+
+ {/* Shared Ask AI Floating Button */}
+
+
+ );
+}
\ No newline at end of file
diff --git a/app/dashboard/overview/buildingOwner/page.tsx b/app/dashboard/overview/buildingOwner/page.tsx
new file mode 100644
index 0000000..e69de29
diff --git a/app/dashboard/overview/dashboard/page.tsx b/app/dashboard/overview/dashboard/page.tsx
new file mode 100644
index 0000000..d044991
--- /dev/null
+++ b/app/dashboard/overview/dashboard/page.tsx
@@ -0,0 +1,18 @@
+"use client";
+
+import Sidebar from "@/components/dashboard/sidebar";
+
+import OperationsDashboard from "@/components/dashboard/dashboard";
+
+
+export default function OverViewDashboardPage() {
+ return (
+
+
+
+
+
+
+
+ );
+}
\ No newline at end of file
diff --git a/app/dashboard/overview/engagement/page.tsx b/app/dashboard/overview/engagement/page.tsx
new file mode 100644
index 0000000..007736b
--- /dev/null
+++ b/app/dashboard/overview/engagement/page.tsx
@@ -0,0 +1,19 @@
+"use client";
+
+import EngagementPage from "@/components/dashboard/engagement";
+
+
+
+
+
+export default function EngagementDashboard() {
+ return (
+
+
+
+
+
+
+
+ );
+}
\ No newline at end of file
diff --git a/app/dashboard/overview/propertyManager/page.tsx b/app/dashboard/overview/propertyManager/page.tsx
new file mode 100644
index 0000000..e69de29
diff --git a/app/dashboard/overview/serviceEngineer/page.tsx b/app/dashboard/overview/serviceEngineer/page.tsx
new file mode 100644
index 0000000..e69de29
diff --git a/app/dashboard/page.tsx b/app/dashboard/page.tsx
index c60266d..a02c0f1 100644
--- a/app/dashboard/page.tsx
+++ b/app/dashboard/page.tsx
@@ -1,21 +1,7 @@
-"use client";
+// app/dashboard/page.tsx
+import { redirect } from "next/navigation";
-import Sidebar from "@/components/dashboard/sidebar";
-
-import OperationsDashboard from "@/components/dashboard/dashboard";
-
-export default function DashboardPage() {
- return (
-
-
-
-
-
-
-
-
-
-
-
- );
+export default function DashboardBasePage() {
+ // Automatically redirect the user to the actual overview dashboard page
+ redirect("/dashboard/overview/dashboard");
}
\ No newline at end of file
diff --git a/components/dashboard/dashboard.tsx b/components/dashboard/dashboard.tsx
index b45f361..a5ac918 100644
--- a/components/dashboard/dashboard.tsx
+++ b/components/dashboard/dashboard.tsx
@@ -14,10 +14,11 @@ export default function Dashboard() {
return (
-
+ );
+}
\ No newline at end of file
diff --git a/components/dashboard/navbar.tsx b/components/dashboard/navbar.tsx
index f85fc41..fad6250 100644
--- a/components/dashboard/navbar.tsx
+++ b/components/dashboard/navbar.tsx
@@ -2,36 +2,39 @@ import { Search, HelpCircle, Globe, Sun, Bell, ChevronDown, MapPin } from 'lucid
export default function Navbar() {
return (
-
+ /*
+ - 'fixed top-0 right-0 left-64' anchors the navbar to the top of the screen,
+ leaving room exactly for your 64-width sidebar.
+ - 'bg-[#071321]' matches your master UI background.
+ - 'h-16' gives it a consistent height.
+ */
+
{/* Left Group */}
{/* Company Selector */}
-
-
- Apple One
-
-
+
+
+ Apple One
+
+
{/* Location Selector */}
-
-
-
- Apple One — HQ Tower
-
-
-
+
+
+
+ Apple One — HQ Tower
+
+
+
{/* Search Bar */}
-
+
diff --git a/components/dashboard/sideBarItem.tsx b/components/dashboard/sideBarItem.tsx
index f61b515..f142b20 100644
--- a/components/dashboard/sideBarItem.tsx
+++ b/components/dashboard/sideBarItem.tsx
@@ -4,15 +4,14 @@ import Link from "next/link";
import { useState } from "react";
import { ChevronDown } from "lucide-react";
import {Props} from "@/constants/types";
-
-
+import Button from "@/utils/button";
export default function SidebarItem({ item }: Props) {
const [open, setOpen] = useState(item.title === "Overview");
return (
-