Some checks failed
CI / Lint → Typecheck → Test → Build (22) (push) Failing after 5s
CI / E2E Tests (push) Has been skipped
CodeQL Analysis / CodeQL (javascript-typescript) (push) Failing after 1m0s
Deploy / Build API Image (push) Failing after 11s
Deploy / Build Web Image (push) Failing after 9s
Deploy / Build AI Services Image (push) Failing after 9s
E2E Tests / Playwright E2E (push) Failing after 7s
Security Scanning / Dependency Audit (pnpm) (push) Failing after 2s
Security Scanning / Trivy Scan — Web Image (push) Failing after 25s
Security Scanning / Trivy Scan — AI Services Image (push) Failing after 24s
Security Scanning / Trivy Filesystem Scan (push) Failing after 35s
Deploy / Deploy to Staging (push) Has been skipped
Security Scanning / Security Gate (push) Failing after 0s
Deploy / Rollback Staging (push) Has been skipped
Security Scanning / Trivy Scan — API Image (push) Failing after 26s
Deploy / Smoke Test Staging (push) Has been skipped
Deploy / Deploy to Production (push) Has been skipped
Deploy / Smoke Test Production (push) Has been skipped
Deploy / Rollback Production (push) Has been skipped
Three asks after a walk-through of the dashboard: 1. Dashboard navigation was missing direct entry points to the two catalog surfaces (Dự án, Khu Công Nghiệp) even though both exist at /du-an and /khu-cong-nghiep. Users landing in the dashboard had to go back out to the public header to reach them. 2. The "Tin đăng" (dashboard listings) page defaulted to a 3-column grid which shows only a handful of properties per viewport. Scanning many listings at once is easier as a vertical list of horizontal rows. 3. The public /search results used the same 3-column grid via PropertyCard. Asked to flip to list there too. Changes - (dashboard)/layout.tsx: new `catalogs` nav group with Building2 + Factory icons pointing at /du-an and /khu-cong-nghiep. Primary desktop nav also exposes both so they're reachable without opening the hamburger. Uses existing `nav.projects` / `nav.industrialParks` i18n keys plus a new `dashboard.catalogs` label in vi/en. - (dashboard)/listings/page.tsx: default viewMode flipped from 'grid' to 'list'. The list mode renders a horizontal row per listing (thumbnail + title/location + price + badges + engagement counters) inside an <ul>. Toggle button relabelled "Danh sách". - components/search/search-results.tsx + property-card.tsx: add a `layout?: 'card' | 'list'` prop to PropertyCard. When `list`, the card renders as a horizontal row with 224px thumbnail on sm+, stacked on mobile. SearchResults wraps items in a <ul><li> and asks for list layout. Default card layout preserved so other callers (compare, related, etc.) keep their vertical card view. No API / DB changes. Typecheck clean for the touched surfaces. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
314 lines
11 KiB
TypeScript
314 lines
11 KiB
TypeScript
'use client';
|
|
|
|
import {
|
|
BarChart3,
|
|
Bookmark,
|
|
Bot,
|
|
Building2,
|
|
CreditCard,
|
|
Factory,
|
|
FileText,
|
|
Gem,
|
|
Home,
|
|
List,
|
|
LogOut,
|
|
Menu,
|
|
MessageSquare,
|
|
Moon,
|
|
Plus,
|
|
Sun,
|
|
Target,
|
|
User,
|
|
X,
|
|
type LucideIcon,
|
|
} from 'lucide-react';
|
|
import { usePathname } from 'next/navigation';
|
|
import { useTranslations } from 'next-intl';
|
|
import { useEffect, useState } from 'react';
|
|
import { useRouter } from '@/i18n/navigation';
|
|
import { NotificationBell } from '@/components/notifications/notification-bell';
|
|
import { useTheme } from '@/components/providers/theme-provider';
|
|
import { Button } from '@/components/ui/button';
|
|
import { LanguageSwitcher } from '@/components/ui/language-switcher';
|
|
import { Link } from '@/i18n/navigation';
|
|
import { useAuthStore } from '@/lib/auth-store';
|
|
import { cn } from '@/lib/utils';
|
|
|
|
interface NavItem {
|
|
href: string;
|
|
label: string;
|
|
icon: LucideIcon;
|
|
}
|
|
|
|
interface NavGroup {
|
|
label: string;
|
|
items: NavItem[];
|
|
}
|
|
|
|
export default function DashboardLayout({ children }: { children: React.ReactNode }) {
|
|
const pathname = usePathname();
|
|
const router = useRouter();
|
|
const { user, isAuthenticated, isInitialized, logout } = useAuthStore();
|
|
const { theme, toggleTheme } = useTheme();
|
|
const t = useTranslations();
|
|
const [sidebarOpen, setSidebarOpen] = useState(false);
|
|
|
|
// Auth guard — redirect unauthenticated users to /login once the auth store
|
|
// has finished its cookie→profile probe. Without this, protected queries
|
|
// inside the dashboard fire against the API and flood the console with
|
|
// 401 ApiErrors before the user even sees the sign-in screen.
|
|
useEffect(() => {
|
|
if (isInitialized && !isAuthenticated) {
|
|
const next = encodeURIComponent(pathname);
|
|
router.replace(`/login?next=${next}`);
|
|
}
|
|
}, [isInitialized, isAuthenticated, pathname, router]);
|
|
|
|
// While the auth store initialises, OR right after we've decided to redirect,
|
|
// render a lightweight skeleton rather than the full dashboard so no queries
|
|
// mount and fire.
|
|
if (!isInitialized || !isAuthenticated) {
|
|
return (
|
|
<div className="flex min-h-screen items-center justify-center text-sm text-muted-foreground">
|
|
{t('common.loading')}
|
|
</div>
|
|
);
|
|
}
|
|
|
|
const navGroups: NavGroup[] = [
|
|
{
|
|
label: t('dashboard.title'),
|
|
items: [
|
|
{ href: '/dashboard', label: t('dashboard.title'), icon: Home },
|
|
{ href: '/listings', label: t('dashboard.listings'), icon: List },
|
|
{ href: '/listings/new', label: t('dashboard.createListing'), icon: Plus },
|
|
],
|
|
},
|
|
{
|
|
label: t('dashboard.catalogs'),
|
|
items: [
|
|
{ href: '/du-an', label: t('nav.projects'), icon: Building2 },
|
|
{ href: '/khu-cong-nghiep', label: t('nav.industrialParks'), icon: Factory },
|
|
],
|
|
},
|
|
{
|
|
label: 'CRM',
|
|
items: [
|
|
{ href: '/inquiries', label: t('dashboard.inquiries'), icon: MessageSquare },
|
|
{ href: '/leads', label: t('dashboard.leads'), icon: Target },
|
|
],
|
|
},
|
|
{
|
|
label: t('dashboard.analytics'),
|
|
items: [
|
|
{ href: '/analytics', label: t('dashboard.analytics'), icon: BarChart3 },
|
|
{ href: '/dashboard/reports', label: t('dashboard.reports'), icon: FileText },
|
|
{ href: '/dashboard/saved-searches', label: t('dashboard.savedSearches'), icon: Bookmark },
|
|
{ href: '/dashboard/valuation', label: t('dashboard.aiValuation'), icon: Bot },
|
|
],
|
|
},
|
|
{
|
|
label: t('dashboard.profile'),
|
|
items: [
|
|
{ href: '/dashboard/profile', label: t('dashboard.profile'), icon: User },
|
|
{ href: '/dashboard/subscription', label: t('dashboard.subscription'), icon: Gem },
|
|
{ href: '/dashboard/payments', label: t('dashboard.payments'), icon: CreditCard },
|
|
],
|
|
},
|
|
];
|
|
|
|
// Flat list for desktop nav (only primary items shown inline)
|
|
const primaryNav: NavItem[] = [
|
|
{ href: '/dashboard', label: t('dashboard.title'), icon: Home },
|
|
{ href: '/listings', label: t('dashboard.listings'), icon: List },
|
|
{ href: '/du-an', label: t('nav.projects'), icon: Building2 },
|
|
{ href: '/khu-cong-nghiep', label: t('nav.industrialParks'), icon: Factory },
|
|
{ href: '/inquiries', label: t('dashboard.inquiries'), icon: MessageSquare },
|
|
{ href: '/analytics', label: t('dashboard.analytics'), icon: BarChart3 },
|
|
];
|
|
|
|
const secondaryNav: NavItem[] = [
|
|
{ href: '/dashboard/reports', label: t('dashboard.reports'), icon: FileText },
|
|
{ href: '/dashboard/saved-searches', label: t('dashboard.savedSearches'), icon: Bookmark },
|
|
{ href: '/dashboard/valuation', label: t('dashboard.aiValuation'), icon: Bot },
|
|
{ href: '/dashboard/profile', label: t('dashboard.profile'), icon: User },
|
|
{ href: '/dashboard/subscription', label: t('dashboard.subscription'), icon: Gem },
|
|
{ href: '/dashboard/payments', label: t('dashboard.payments'), icon: CreditCard },
|
|
];
|
|
|
|
const isActive = (href: string) =>
|
|
pathname === href || (href !== '/dashboard' && pathname.startsWith(href));
|
|
|
|
return (
|
|
<div className="min-h-screen bg-background">
|
|
{/* Mobile overlay */}
|
|
{sidebarOpen && (
|
|
<div
|
|
className="fixed inset-0 z-40 bg-black/50 md:hidden"
|
|
onClick={() => setSidebarOpen(false)}
|
|
aria-hidden="true"
|
|
/>
|
|
)}
|
|
|
|
{/* Mobile sidebar — grouped nav */}
|
|
<aside
|
|
role="navigation"
|
|
aria-label={t('nav.dashboardNav')}
|
|
className={cn(
|
|
'fixed inset-y-0 left-0 z-50 w-64 border-r bg-card transition-transform md:hidden',
|
|
sidebarOpen ? 'translate-x-0' : '-translate-x-full',
|
|
)}
|
|
>
|
|
<div className="flex h-14 items-center border-b px-4">
|
|
<Link href="/" className="flex items-center space-x-2">
|
|
<span className="text-lg font-bold text-primary">{t('common.goodgo')}</span>
|
|
</Link>
|
|
<button
|
|
aria-label={t('nav.closeMenu')}
|
|
className="ml-auto"
|
|
onClick={() => setSidebarOpen(false)}
|
|
>
|
|
<X className="h-5 w-5" />
|
|
</button>
|
|
</div>
|
|
|
|
<nav className="flex flex-col gap-4 overflow-y-auto p-3">
|
|
{navGroups.map((group) => (
|
|
<div key={group.label}>
|
|
<p className="mb-1 px-3 text-xs font-semibold uppercase tracking-wider text-muted-foreground/60">
|
|
{group.label}
|
|
</p>
|
|
<div className="flex flex-col gap-0.5">
|
|
{group.items.map((item) => (
|
|
<Link
|
|
key={item.href}
|
|
href={item.href}
|
|
onClick={() => setSidebarOpen(false)}
|
|
className={cn(
|
|
'flex items-center gap-3 rounded-md px-3 py-2 text-sm font-medium transition-colors',
|
|
isActive(item.href)
|
|
? 'bg-primary/10 text-primary'
|
|
: 'text-muted-foreground hover:bg-accent hover:text-accent-foreground',
|
|
)}
|
|
>
|
|
<item.icon className="h-4 w-4 shrink-0" aria-hidden="true" />
|
|
{item.label}
|
|
</Link>
|
|
))}
|
|
</div>
|
|
</div>
|
|
))}
|
|
</nav>
|
|
|
|
<div className="mt-auto border-t p-3">
|
|
{user && (
|
|
<p className="mb-2 truncate px-3 text-xs text-muted-foreground">{user.fullName}</p>
|
|
)}
|
|
<Button
|
|
variant="ghost"
|
|
size="sm"
|
|
className="w-full justify-start gap-2"
|
|
onClick={() => logout()}
|
|
>
|
|
<LogOut className="h-4 w-4" aria-hidden="true" />
|
|
{t('common.logout')}
|
|
</Button>
|
|
</div>
|
|
</aside>
|
|
|
|
<header
|
|
role="banner"
|
|
className="sticky top-0 z-50 border-b bg-background/95 backdrop-blur supports-[backdrop-filter]:bg-background/60"
|
|
>
|
|
<div className="mx-auto flex h-14 max-w-7xl items-center px-4">
|
|
{/* Mobile hamburger */}
|
|
<button
|
|
aria-label={t('nav.openMenu')}
|
|
className="mr-3 inline-flex items-center justify-center rounded-md p-2 text-muted-foreground hover:bg-accent hover:text-accent-foreground md:hidden"
|
|
onClick={() => setSidebarOpen(true)}
|
|
>
|
|
<Menu className="h-5 w-5" />
|
|
</button>
|
|
|
|
<Link href="/" className="mr-4 flex items-center space-x-2">
|
|
<span className="text-lg font-bold text-primary">{t('common.goodgo')}</span>
|
|
</Link>
|
|
|
|
{/* Desktop nav — primary items with labels, secondary icon-only */}
|
|
<nav aria-label={t('nav.dashboardNav')} className="hidden items-center md:flex">
|
|
<div className="flex items-center">
|
|
{primaryNav.map((item) => (
|
|
<Link
|
|
key={item.href}
|
|
href={item.href}
|
|
aria-label={item.label}
|
|
title={item.label}
|
|
className={cn(
|
|
'inline-flex items-center gap-1.5 rounded-md px-2.5 py-1.5 text-sm font-medium transition-colors hover:bg-accent hover:text-accent-foreground',
|
|
isActive(item.href)
|
|
? 'bg-accent text-accent-foreground'
|
|
: 'text-muted-foreground',
|
|
)}
|
|
>
|
|
<item.icon className="h-4 w-4 shrink-0" aria-hidden="true" />
|
|
<span className="hidden xl:inline">{item.label}</span>
|
|
</Link>
|
|
))}
|
|
</div>
|
|
|
|
<div className="mx-2 h-5 w-px bg-border" aria-hidden="true" />
|
|
|
|
<div className="flex items-center">
|
|
{secondaryNav.map((item) => (
|
|
<Link
|
|
key={item.href}
|
|
href={item.href}
|
|
aria-label={item.label}
|
|
title={item.label}
|
|
className={cn(
|
|
'inline-flex items-center justify-center rounded-md p-2 transition-colors hover:bg-accent hover:text-accent-foreground',
|
|
isActive(item.href)
|
|
? 'bg-accent text-accent-foreground'
|
|
: 'text-muted-foreground',
|
|
)}
|
|
>
|
|
<item.icon className="h-4 w-4" aria-hidden="true" />
|
|
</Link>
|
|
))}
|
|
</div>
|
|
</nav>
|
|
|
|
<div className="ml-auto flex items-center space-x-1">
|
|
{user && (
|
|
<span className="hidden text-sm text-muted-foreground lg:inline">
|
|
{user.fullName}
|
|
</span>
|
|
)}
|
|
{user && <NotificationBell />}
|
|
<LanguageSwitcher />
|
|
<Button
|
|
variant="ghost"
|
|
size="sm"
|
|
onClick={toggleTheme}
|
|
aria-label={theme === 'light' ? t('dashboard.darkMode') : t('dashboard.lightMode')}
|
|
className="h-9 w-9 p-0"
|
|
>
|
|
{theme === 'light' ? (
|
|
<Moon className="h-4 w-4" aria-hidden="true" />
|
|
) : (
|
|
<Sun className="h-4 w-4" aria-hidden="true" />
|
|
)}
|
|
</Button>
|
|
<Button variant="ghost" size="sm" className="hidden gap-1.5 md:inline-flex" onClick={() => logout()}>
|
|
<LogOut className="h-4 w-4" aria-hidden="true" />
|
|
<span className="hidden lg:inline">{t('common.logout')}</span>
|
|
</Button>
|
|
</div>
|
|
</div>
|
|
</header>
|
|
|
|
<main id="main-content" role="main" className="mx-auto max-w-7xl px-4 py-6">{children}</main>
|
|
</div>
|
|
);
|
|
}
|