From db3b12507e0f182eb2ed049e9305f654f8734b4a Mon Sep 17 00:00:00 2001
From: pradeepkumar <kongupradeep@live.com>
Date: Mon, 19 Jan 2026 09:20:48 +0530
Subject: [PATCH] refactor: Replace custom user layout header and sidebar with
 shared components and remove negative margin from user profile page.

---
 src/app/(user)/layout.tsx                | 114 ++++-------------------
 src/app/(user)/user/userprofile/page.tsx |   2 +-
 2 files changed, 18 insertions(+), 98 deletions(-)

diff --git a/src/app/(user)/layout.tsx b/src/app/(user)/layout.tsx
index 69e0daf..4d2bdf0 100644
--- a/src/app/(user)/layout.tsx
+++ b/src/app/(user)/layout.tsx
@@ -1,52 +1,10 @@
 'use client';
 
-import { useSession, signOut } from 'next-auth/react';
-import { useRouter, usePathname } from 'next/navigation';
-import { useEffect, ReactElement } from 'react';
-import Link from 'next/link';
-
-const userNavItems = [
-  { href: '/user/userprofile', label: 'Dashboard', icon: 'home' },
-  { href: '/user/properties', label: 'Browse Properties', icon: 'building' },
-  { href: '/user/favorites', label: 'Favorites', icon: 'heart' },
-  { href: '/user/inquiries', label: 'My Inquiries', icon: 'message' },
-  { href: '/user/appointments', label: 'Appointments', icon: 'calendar' },
-  { href: '/user/settings', label: 'Settings', icon: 'settings' },
-];
-
-const icons: Record<string, ReactElement> = {
-  home: (
-    <svg className="w-5 h-5" fill="none" stroke="currentColor" viewBox="0 0 24 24">
-      <path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2} d="M3 12l2-2m0 0l7-7 7 7M5 10v10a1 1 0 001 1h3m10-11l2 2m-2-2v10a1 1 0 01-1 1h-3m-6 0a1 1 0 001-1v-4a1 1 0 011-1h2a1 1 0 011 1v4a1 1 0 001 1m-6 0h6" />
-    </svg>
-  ),
-  building: (
-    <svg className="w-5 h-5" fill="none" stroke="currentColor" viewBox="0 0 24 24">
-      <path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2} d="M19 21V5a2 2 0 00-2-2H7a2 2 0 00-2 2v16m14 0h2m-2 0h-5m-9 0H3m2 0h5M9 7h1m-1 4h1m4-4h1m-1 4h1m-5 10v-5a1 1 0 011-1h2a1 1 0 011 1v5m-4 0h4" />
-    </svg>
-  ),
-  heart: (
-    <svg className="w-5 h-5" fill="none" stroke="currentColor" viewBox="0 0 24 24">
-      <path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2} d="M4.318 6.318a4.5 4.5 0 000 6.364L12 20.364l7.682-7.682a4.5 4.5 0 00-6.364-6.364L12 7.636l-1.318-1.318a4.5 4.5 0 00-6.364 0z" />
-    </svg>
-  ),
-  message: (
-    <svg className="w-5 h-5" fill="none" stroke="currentColor" viewBox="0 0 24 24">
-      <path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2} d="M8 12h.01M12 12h.01M16 12h.01M21 12c0 4.418-4.03 8-9 8a9.863 9.863 0 01-4.255-.949L3 20l1.395-3.72C3.512 15.042 3 13.574 3 12c0-4.418 4.03-8 9-8s9 3.582 9 8z" />
-    </svg>
-  ),
-  calendar: (
-    <svg className="w-5 h-5" fill="none" stroke="currentColor" viewBox="0 0 24 24">
-      <path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2} d="M8 7V3m8 4V3m-9 8h10M5 21h14a2 2 0 002-2V7a2 2 0 00-2-2H5a2 2 0 00-2 2v12a2 2 0 002 2z" />
-    </svg>
-  ),
-  settings: (
-    <svg className="w-5 h-5" fill="none" stroke="currentColor" viewBox="0 0 24 24">
-      <path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2} d="M10.325 4.317c.426-1.756 2.924-1.756 3.35 0a1.724 1.724 0 002.573 1.066c1.543-.94 3.31.826 2.37 2.37a1.724 1.724 0 001.065 2.572c1.756.426 1.756 2.924 0 3.35a1.724 1.724 0 00-1.066 2.573c.94 1.543-.826 3.31-2.37 2.37a1.724 1.724 0 00-2.572 1.065c-.426 1.756-2.924 1.756-3.35 0a1.724 1.724 0 00-2.573-1.066c-1.543.94-3.31-.826-2.37-2.37a1.724 1.724 0 00-1.065-2.572c-1.756-.426-1.756-2.924 0-3.35a1.724 1.724 0 001.066-2.573c-.94-1.543.826-3.31 2.37-2.37.996.608 2.296.07 2.572-1.065z" />
-      <path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2} d="M15 12a3 3 0 11-6 0 3 3 0 016 0z" />
-    </svg>
-  ),
-};
+import { useSession } from 'next-auth/react';
+import { useRouter } from 'next/navigation';
+import { useEffect } from 'react';
+import { Footer } from '@/components/layout/Footer';
+import { CommonHeader } from '@/components/layout/CommonHeader';
 
 export default function UserLayout({
   children,
@@ -55,7 +13,6 @@ export default function UserLayout({
 }) {
   const { data: session, status } = useSession();
   const router = useRouter();
-  const pathname = usePathname();
 
   useEffect(() => {
     if (status === 'loading') return;
@@ -74,63 +31,26 @@ export default function UserLayout({
 
   if (status === 'loading' || !session) {
     return (
-      <div className="min-h-screen bg-gradient-to-b from-[#c4d9d4] to-[#f0f5fc] flex items-center justify-center">
+      <div className="min-h-screen bg-white flex items-center justify-center">
         <div className="animate-spin rounded-full h-8 w-8 border-b-2 border-[#00293d]"></div>
       </div>
     );
   }
 
   return (
-    <div className="min-h-screen bg-gradient-to-b from-[#c4d9d4] to-[#f0f5fc]">
+    <div className="min-h-screen bg-white flex flex-col">
       {/* Header */}
-      <header className="bg-white/80 backdrop-blur-sm shadow-sm fixed top-0 left-0 right-0 z-50">
-        <div className="px-4 sm:px-6 lg:px-8">
-          <div className="flex justify-between items-center h-16">
-            <Link href="/user/userprofile">
-              <img src="/assets/logo.svg" alt="RE-QuestN" className="h-8" />
-            </Link>
-            <div className="flex items-center gap-4">
-              <span className="text-sm text-[#00293d]">
-                {session?.user?.name || session?.user?.email}
-              </span>
-              <button
-                onClick={() => signOut({ callbackUrl: '/login' })}
-                className="px-4 py-2 bg-[#e58625] hover:bg-[#d47a1f] text-white text-sm font-medium rounded-lg transition-colors"
-              >
-                Sign Out
-              </button>
-            </div>
-          </div>
-        </div>
-      </header>
-
-      <div className="flex pt-16">
-        {/* Sidebar */}
-        <aside className="w-64 bg-white/80 backdrop-blur-sm shadow-sm min-h-[calc(100vh-4rem)] fixed left-0 top-16">
-          <nav className="p-4 space-y-1">
-            {userNavItems.map((item) => {
-              const isActive = pathname === item.href;
-              return (
-                <Link
-                  key={item.href}
-                  href={item.href}
-                  className={`flex items-center gap-3 px-4 py-3 rounded-lg transition-colors ${
-                    isActive
-                      ? 'bg-[#00293d] text-white'
-                      : 'text-[#00293d] hover:bg-[#f0f5fc]'
-                  }`}
-                >
-                  {icons[item.icon]}
-                  <span className="font-medium">{item.label}</span>
-                </Link>
-              );
-            })}
-          </nav>
-        </aside>
-
-        {/* Main Content */}
-        <main className="flex-1 ml-64 p-6">{children}</main>
+      <div className="max-w-7xl mx-auto px-4 sm:px-6 lg:px-8 py-6 w-full">
+        <CommonHeader />
       </div>
+
+      {/* Main Content */}
+      <main className="flex-1">
+        {children}
+      </main>
+
+      {/* Footer */}
+      <Footer />
     </div>
   );
 }
diff --git a/src/app/(user)/user/userprofile/page.tsx b/src/app/(user)/user/userprofile/page.tsx
index 8308d8a..ab9875d 100644
--- a/src/app/(user)/user/userprofile/page.tsx
+++ b/src/app/(user)/user/userprofile/page.tsx
@@ -8,7 +8,7 @@ import { TestimonialsSection } from '@/components/home/TestimonialsSection';
 
 export default function UserDashboard() {
   return (
-    <div className="-m-6">
+    <div>
       <HeroSection />
       <FeaturesSection />
       <FeaturedAgents />