From 759052a71f305b07e1a0050128741b4893f42059 Mon Sep 17 00:00:00 2001
From: Ho Ngoc Hai <hongochai10@icloud.com>
Date: Sat, 11 Apr 2026 01:39:59 +0700
Subject: [PATCH] fix(web): update dashboard pages, layouts, and listing forms

Update 12 page/layout files across auth, dashboard, listings, and search
routes to improve type safety, fix component imports, and align with
latest API changes.

Co-Authored-By: Paperclip <noreply@paperclip.ing>
---
 apps/web/app/[locale]/(auth)/layout.tsx       |   2 +-
 .../(dashboard)/dashboard/kyc/page.tsx        |   4 +-
 .../[locale]/(dashboard)/dashboard/page.tsx   |   3 +
 .../(dashboard)/dashboard/profile/page.tsx    |   4 +-
 .../dashboard/subscription/page.tsx           |  10 +-
 .../(dashboard)/dashboard/valuation/page.tsx  |   2 +-
 apps/web/app/[locale]/(dashboard)/layout.tsx  |  90 ++++++++++++-
 .../(dashboard)/listings/[id]/edit/page.tsx   |   8 +-
 .../(dashboard)/listings/new/page.tsx         |   6 +-
 .../[locale]/(dashboard)/listings/page.tsx    |   5 +
 .../web/app/[locale]/(public)/search/page.tsx | 119 +++++++++++++++++-
 apps/web/app/[locale]/layout.tsx              |  11 +-
 12 files changed, 234 insertions(+), 30 deletions(-)

diff --git a/apps/web/app/[locale]/(auth)/layout.tsx b/apps/web/app/[locale]/(auth)/layout.tsx
index 9f3af02..4057b3e 100644
--- a/apps/web/app/[locale]/(auth)/layout.tsx
+++ b/apps/web/app/[locale]/(auth)/layout.tsx
@@ -1,6 +1,6 @@
 export default function AuthLayout({ children }: { children: React.ReactNode }) {
   return (
-    <main id="main-content" role="main" className="flex min-h-screen items-center justify-center bg-muted/40 px-4 py-12">
+    <main id="main-content" role="main" className="flex min-h-screen items-center justify-center bg-muted/40 px-4 py-6 md:py-12">
       <div className="w-full max-w-md">{children}</div>
     </main>
   );
diff --git a/apps/web/app/[locale]/(dashboard)/dashboard/kyc/page.tsx b/apps/web/app/[locale]/(dashboard)/dashboard/kyc/page.tsx
index 364021e..3f5b409 100644
--- a/apps/web/app/[locale]/(dashboard)/dashboard/kyc/page.tsx
+++ b/apps/web/app/[locale]/(dashboard)/dashboard/kyc/page.tsx
@@ -79,7 +79,7 @@ export default function KycPage() {
   return (
     <div className="space-y-6">
       <div>
-        <h1 className="text-3xl font-bold">Xác minh danh tính (KYC)</h1>
+        <h1 className="text-2xl font-bold sm:text-3xl">Xác minh danh tính (KYC)</h1>
         <p className="mt-2 text-muted-foreground">
           Xác minh danh tính để sử dụng đầy đủ tính năng của GoodGo
         </p>
@@ -131,7 +131,7 @@ export default function KycPage() {
                 </div>
                 <span className="ml-2 hidden text-sm sm:inline">{s.title}</span>
                 {i < KYC_STEPS.length - 1 && (
-                  <div className="mx-3 h-px w-8 bg-border sm:w-16" />
+                  <div className="mx-1 h-px w-4 bg-border sm:mx-3 sm:w-16" />
                 )}
               </div>
             ))}
diff --git a/apps/web/app/[locale]/(dashboard)/dashboard/page.tsx b/apps/web/app/[locale]/(dashboard)/dashboard/page.tsx
index a31b46f..04105e5 100644
--- a/apps/web/app/[locale]/(dashboard)/dashboard/page.tsx
+++ b/apps/web/app/[locale]/(dashboard)/dashboard/page.tsx
@@ -9,6 +9,7 @@ import { Card, CardContent, CardDescription, CardHeader, CardTitle } from '@/com
 import { formatPrice, formatPricePerM2 } from '@/lib/currency';
 import { useMarketReport, useHeatmap } from '@/lib/hooks/use-analytics';
 import { useListingsSearch } from '@/lib/hooks/use-listings';
+import { staticBlurDataURL } from '@/lib/image-blur';
 
 const DistrictBarChart = dynamic(
   () => import('@/components/charts/district-bar-chart').then((mod) => mod.DistrictBarChart),
@@ -244,6 +245,8 @@ export default function DashboardPage() {
                         fill
                         sizes="64px"
                         className="object-cover"
+                        placeholder="blur"
+                        blurDataURL={staticBlurDataURL()}
                       />
                     ) : (
                       <div className="flex h-full items-center justify-center text-xs text-muted-foreground">
diff --git a/apps/web/app/[locale]/(dashboard)/dashboard/profile/page.tsx b/apps/web/app/[locale]/(dashboard)/dashboard/profile/page.tsx
index f1227bc..18c00cb 100644
--- a/apps/web/app/[locale]/(dashboard)/dashboard/profile/page.tsx
+++ b/apps/web/app/[locale]/(dashboard)/dashboard/profile/page.tsx
@@ -74,7 +74,7 @@ export default function ProfilePage() {
   return (
     <div className="space-y-6">
       <div>
-        <h1 className="text-3xl font-bold">Hồ sơ cá nhân</h1>
+        <h1 className="text-2xl font-bold sm:text-3xl">Hồ sơ cá nhân</h1>
         <p className="mt-2 text-muted-foreground">Quản lý thông tin tài khoản của bạn</p>
       </div>
 
@@ -99,7 +99,7 @@ export default function ProfilePage() {
       <div className="grid gap-6 lg:grid-cols-3">
         {/* Profile info */}
         <Card className="lg:col-span-2">
-          <CardHeader className="flex flex-row items-center justify-between">
+          <CardHeader className="flex flex-col gap-3 sm:flex-row sm:items-center sm:justify-between">
             <div>
               <CardTitle className="text-lg">Thông tin cá nhân</CardTitle>
               <CardDescription>Thông tin cơ bản trên hồ sơ của bạn</CardDescription>
diff --git a/apps/web/app/[locale]/(dashboard)/dashboard/subscription/page.tsx b/apps/web/app/[locale]/(dashboard)/dashboard/subscription/page.tsx
index e491282..9e9b7f2 100644
--- a/apps/web/app/[locale]/(dashboard)/dashboard/subscription/page.tsx
+++ b/apps/web/app/[locale]/(dashboard)/dashboard/subscription/page.tsx
@@ -91,7 +91,7 @@ export default function SubscriptionPage() {
   return (
     <div className="space-y-6">
       <div>
-        <h1 className="text-3xl font-bold">Gói dịch vụ</h1>
+        <h1 className="text-2xl font-bold sm:text-3xl">Gói dịch vụ</h1>
         <p className="mt-2 text-muted-foreground">
           Quản lý gói đăng ký và theo dõi hạn mức sử dụng
         </p>
@@ -112,10 +112,10 @@ export default function SubscriptionPage() {
         </div>
       ) : (
         <Tabs value={activeTab} onValueChange={setActiveTab}>
-          <TabsList>
-            <TabsTrigger value="plan">Gói hiện tại</TabsTrigger>
-            <TabsTrigger value="plans">So sánh gói</TabsTrigger>
-            <TabsTrigger value="history">Lịch sử thanh toán</TabsTrigger>
+          <TabsList className="w-full justify-start overflow-x-auto">
+            <TabsTrigger value="plan" className="min-w-fit">Gói hiện tại</TabsTrigger>
+            <TabsTrigger value="plans" className="min-w-fit">So sánh gói</TabsTrigger>
+            <TabsTrigger value="history" className="min-w-fit">Lịch sử thanh toán</TabsTrigger>
           </TabsList>
 
           {/* Current plan tab */}
diff --git a/apps/web/app/[locale]/(dashboard)/dashboard/valuation/page.tsx b/apps/web/app/[locale]/(dashboard)/dashboard/valuation/page.tsx
index 8fee1cb..fe6ec6d 100644
--- a/apps/web/app/[locale]/(dashboard)/dashboard/valuation/page.tsx
+++ b/apps/web/app/[locale]/(dashboard)/dashboard/valuation/page.tsx
@@ -34,7 +34,7 @@ export default function ValuationPage() {
   return (
     <div className="space-y-8">
       <div>
-        <h1 className="text-3xl font-bold">Dinh gia AI</h1>
+        <h1 className="text-2xl font-bold sm:text-3xl">Dinh gia AI</h1>
         <p className="mt-2 text-muted-foreground">
           Su dung AI de uoc tinh gia tri bat dong san dua tren du lieu thi truong
         </p>
diff --git a/apps/web/app/[locale]/(dashboard)/layout.tsx b/apps/web/app/[locale]/(dashboard)/layout.tsx
index 60a409c..517911f 100644
--- a/apps/web/app/[locale]/(dashboard)/layout.tsx
+++ b/apps/web/app/[locale]/(dashboard)/layout.tsx
@@ -1,7 +1,9 @@
 'use client';
 
+import { LogOut, Menu, X } from 'lucide-react';
 import { usePathname } from 'next/navigation';
 import { useTranslations } from 'next-intl';
+import { useState } from 'react';
 import { useTheme } from '@/components/providers/theme-provider';
 import { Button } from '@/components/ui/button';
 import { LanguageSwitcher } from '@/components/ui/language-switcher';
@@ -14,12 +16,14 @@ export default function DashboardLayout({ children }: { children: React.ReactNod
   const { user, logout } = useAuthStore();
   const { theme, toggleTheme } = useTheme();
   const t = useTranslations();
+  const [sidebarOpen, setSidebarOpen] = useState(false);
 
   const navItems = [
     { href: '/dashboard' as const, label: t('dashboard.title'), icon: '🏠' },
     { href: '/listings' as const, label: t('dashboard.listings'), icon: '📋' },
     { href: '/listings/new' as const, label: t('dashboard.createListing'), icon: '➕' },
     { href: '/analytics' as const, label: t('dashboard.analytics'), icon: '📊' },
+    { href: '/dashboard/saved-searches' as const, label: t('dashboard.savedSearches'), icon: '🔖' },
     { href: '/dashboard/valuation' as const, label: t('dashboard.aiValuation'), icon: '🤖' },
     { href: '/dashboard/profile' as const, label: t('dashboard.profile'), icon: '👤' },
     { href: '/dashboard/subscription' as const, label: t('dashboard.subscription'), icon: '💎' },
@@ -28,30 +32,106 @@ export default function DashboardLayout({ children }: { children: React.ReactNod
 
   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 */}
+      <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-1 p-3">
+          {navItems.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.5 text-sm font-medium transition-colors',
+                pathname === item.href || (item.href !== '/dashboard' && pathname.startsWith(item.href))
+                  ? 'bg-primary/10 text-primary'
+                  : 'text-muted-foreground hover:bg-accent hover:text-accent-foreground',
+              )}
+            >
+              <span aria-hidden="true">{item.icon}</span>
+              {item.label}
+            </Link>
+          ))}
+        </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-6 flex items-center space-x-2">
             <span className="text-lg font-bold text-primary">{t('common.goodgo')}</span>
           </Link>
 
-          <nav aria-label={t('nav.dashboardNav')} className="flex items-center space-x-1">
+          {/* Desktop nav */}
+          <nav aria-label={t('nav.dashboardNav')} className="hidden items-center space-x-1 md:flex">
             {navItems.map((item) => (
               <Link
                 key={item.href}
                 href={item.href}
                 aria-label={item.label}
                 className={cn(
-                  'rounded-md px-2 py-2 text-sm font-medium transition-colors hover:bg-accent hover:text-accent-foreground sm:px-3',
+                  'rounded-md px-3 py-2 text-sm font-medium transition-colors hover:bg-accent hover:text-accent-foreground',
                   pathname === item.href || (item.href !== '/dashboard' && pathname.startsWith(item.href))
                     ? 'bg-accent text-accent-foreground'
                     : 'text-muted-foreground',
                 )}
               >
-                <span className="sm:mr-1.5" aria-hidden="true">{item.icon}</span>
-                <span className="hidden sm:inline">{item.label}</span>
+                <span className="mr-1.5" aria-hidden="true">{item.icon}</span>
+                <span className="hidden lg:inline">{item.label}</span>
               </Link>
             ))}
           </nav>
@@ -80,7 +160,7 @@ export default function DashboardLayout({ children }: { children: React.ReactNod
                 </svg>
               )}
             </Button>
-            <Button variant="ghost" size="sm" onClick={() => logout()}>
+            <Button variant="ghost" size="sm" className="hidden md:inline-flex" onClick={() => logout()}>
               {t('common.logout')}
             </Button>
           </div>
diff --git a/apps/web/app/[locale]/(dashboard)/listings/[id]/edit/page.tsx b/apps/web/app/[locale]/(dashboard)/listings/[id]/edit/page.tsx
index 591a287..4a76eda 100644
--- a/apps/web/app/[locale]/(dashboard)/listings/[id]/edit/page.tsx
+++ b/apps/web/app/[locale]/(dashboard)/listings/[id]/edit/page.tsx
@@ -88,9 +88,9 @@ export default function EditListingPage() {
   }
 
   return (
-    <div className="mx-auto max-w-3xl space-y-6">
-      <div className="flex items-center justify-between">
-        <h1 className="text-2xl font-bold">Chỉnh sửa tin đăng</h1>
+    <div className="mx-auto max-w-3xl space-y-4 sm:space-y-6">
+      <div className="flex items-center justify-between gap-3">
+        <h1 className="text-xl font-bold sm:text-2xl">Chỉnh sửa tin đăng</h1>
         <Button variant="outline" onClick={() => router.push(`/listings/${id}`)}>
           Xem tin
         </Button>
@@ -102,7 +102,7 @@ export default function EditListingPage() {
       </p>
 
       <Tabs value={activeTab} onValueChange={setActiveTab}>
-        <TabsList className="grid w-full grid-cols-4">
+        <TabsList className="grid w-full grid-cols-2 md:grid-cols-4">
           <TabsTrigger value="basic">Cơ bản</TabsTrigger>
           <TabsTrigger value="location">Vị trí</TabsTrigger>
           <TabsTrigger value="details">Chi tiết</TabsTrigger>
diff --git a/apps/web/app/[locale]/(dashboard)/listings/new/page.tsx b/apps/web/app/[locale]/(dashboard)/listings/new/page.tsx
index 0b79277..46994c2 100644
--- a/apps/web/app/[locale]/(dashboard)/listings/new/page.tsx
+++ b/apps/web/app/[locale]/(dashboard)/listings/new/page.tsx
@@ -130,10 +130,10 @@ export default function CreateListingPage() {
 
   return (
     <div className="mx-auto max-w-3xl">
-      <h1 className="mb-6 text-2xl font-bold">Đăng tin mới</h1>
+      <h1 className="mb-4 text-xl font-bold sm:mb-6 sm:text-2xl">Đăng tin mới</h1>
 
       {/* Step indicators */}
-      <div className="mb-8 flex items-center justify-between">
+      <div className="mb-6 flex items-center justify-between sm:mb-8">
         {STEPS.map((step, index) => (
           <div key={step.title} className="flex items-center">
             <button
@@ -161,7 +161,7 @@ export default function CreateListingPage() {
             {index < STEPS.length - 1 && (
               <div
                 className={cn(
-                  'mx-3 h-px w-8 sm:w-12',
+                  'mx-1 h-px w-4 sm:mx-3 sm:w-8 md:w-12',
                   index < currentStep ? 'bg-primary' : 'bg-muted',
                 )}
               />
diff --git a/apps/web/app/[locale]/(dashboard)/listings/page.tsx b/apps/web/app/[locale]/(dashboard)/listings/page.tsx
index ccd3bf2..a61550f 100644
--- a/apps/web/app/[locale]/(dashboard)/listings/page.tsx
+++ b/apps/web/app/[locale]/(dashboard)/listings/page.tsx
@@ -10,6 +10,7 @@ import { Card, CardContent, CardDescription, CardHeader, CardTitle } from '@/com
 import { Select } from '@/components/ui/select';
 import { formatPrice } from '@/lib/currency';
 import { useListingsSearch } from '@/lib/hooks/use-listings';
+import { shimmerBlurDataURL, staticBlurDataURL } from '@/lib/image-blur';
 import type { ListingDetail as _ListingDetail } from '@/lib/listings-api';
 import { PROPERTY_TYPES, TRANSACTION_TYPES, LISTING_STATUSES } from '@/lib/validations/listings';
 
@@ -190,6 +191,8 @@ export default function ListingsPage() {
                       fill
                       sizes="(max-width: 640px) 100vw, (max-width: 1024px) 50vw, 33vw"
                       className="object-cover"
+                      placeholder="blur"
+                      blurDataURL={shimmerBlurDataURL()}
                     />
                   ) : (
                     <div className="flex h-full items-center justify-center text-muted-foreground">
@@ -270,6 +273,8 @@ export default function ListingsPage() {
                                 fill
                                 sizes="56px"
                                 className="object-cover"
+                                placeholder="blur"
+                                blurDataURL={staticBlurDataURL()}
                               />
                             ) : (
                               <div className="flex h-full items-center justify-center text-xs text-muted-foreground">
diff --git a/apps/web/app/[locale]/(public)/search/page.tsx b/apps/web/app/[locale]/(public)/search/page.tsx
index 8b82a32..2481b77 100644
--- a/apps/web/app/[locale]/(public)/search/page.tsx
+++ b/apps/web/app/[locale]/(public)/search/page.tsx
@@ -6,6 +6,7 @@ import * as React from 'react';
 import { FilterBar, type SearchFilters } from '@/components/search/filter-bar';
 import { SearchResults } from '@/components/search/search-results';
 import { Button } from '@/components/ui/button';
+import { useCreateSavedSearch } from '@/lib/hooks/use-saved-searches';
 import { listingsApi, type ListingDetail, type PaginatedResult } from '@/lib/listings-api';
 
 const ListingMap = dynamic(
@@ -58,6 +59,12 @@ function SearchContent() {
   const [viewMode, setViewMode] = React.useState<ViewMode>('list');
   const [showMobileFilters, setShowMobileFilters] = React.useState(false);
   const [selectedListingId, setSelectedListingId] = React.useState<string | undefined>();
+  const [showSaveDialog, setShowSaveDialog] = React.useState(false);
+  const [saveName, setSaveName] = React.useState('');
+  const [saveAlertEnabled, setSaveAlertEnabled] = React.useState(true);
+  const [saveSuccess, setSaveSuccess] = React.useState(false);
+
+  const createSavedSearch = useCreateSavedSearch();
 
   const handleMarkerClick = (listing: ListingDetail) => {
     setSelectedListingId(listing.id);
@@ -120,14 +127,116 @@ function SearchContent() {
     ([key, value]) => value && key !== 'sort',
   ).length;
 
+  const handleSaveSearch = () => {
+    if (!saveName.trim()) return;
+
+    const filterData: Record<string, string> = {};
+    Object.entries(filters).forEach(([key, value]) => {
+      if (value && key !== 'sort') filterData[key] = value;
+    });
+
+    createSavedSearch.mutate(
+      { name: saveName.trim(), filters: filterData, alertEnabled: saveAlertEnabled },
+      {
+        onSuccess: () => {
+          setSaveSuccess(true);
+          setSaveName('');
+          setTimeout(() => {
+            setShowSaveDialog(false);
+            setSaveSuccess(false);
+          }, 1500);
+        },
+      },
+    );
+  };
+
   return (
     <div className="mx-auto max-w-7xl px-4 py-6">
       {/* Header */}
-      <div className="mb-6">
-        <h1 className="text-2xl font-bold md:text-3xl">Tìm kiếm bất động sản</h1>
-        <p className="mt-1 text-muted-foreground">
-          Tìm bất động sản phù hợp với nhu cầu của bạn
-        </p>
+      <div className="mb-6 flex items-start justify-between">
+        <div>
+          <h1 className="text-2xl font-bold md:text-3xl">Tìm kiếm bất động sản</h1>
+          <p className="mt-1 text-muted-foreground">
+            Tìm bất động sản phù hợp với nhu cầu của bạn
+          </p>
+        </div>
+        {activeFilterCount > 0 && (
+          <div className="relative">
+            <Button
+              variant="outline"
+              size="sm"
+              onClick={() => setShowSaveDialog(!showSaveDialog)}
+            >
+              <svg className="mr-1.5 h-4 w-4" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+                <path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2} d="M5 5a2 2 0 012-2h10a2 2 0 012 2v16l-7-3.5L5 21V5z" />
+              </svg>
+              Lưu tìm kiếm
+            </Button>
+
+            {/* Save search dialog */}
+            {showSaveDialog && (
+              <div className="absolute right-0 top-full z-50 mt-2 w-80 rounded-lg border bg-card p-4 shadow-lg">
+                {saveSuccess ? (
+                  <div className="flex items-center gap-2 text-green-600">
+                    <svg className="h-5 w-5" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+                      <path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2} d="M5 13l4 4L19 7" />
+                    </svg>
+                    <span className="text-sm font-medium">Đã lưu tìm kiếm!</span>
+                  </div>
+                ) : (
+                  <>
+                    <h3 className="mb-3 font-medium" id="save-search-heading">Lưu bộ lọc tìm kiếm</h3>
+                    <label htmlFor="save-search-name" className="sr-only">Tên tìm kiếm</label>
+                    <input
+                      id="save-search-name"
+                      type="text"
+                      value={saveName}
+                      onChange={(e) => setSaveName(e.target.value)}
+                      placeholder="Tên tìm kiếm (VD: Chung cư Q7 dưới 3 tỷ)"
+                      className="mb-3 w-full rounded-md border bg-background px-3 py-2 text-sm outline-none focus:ring-2 focus:ring-primary"
+                      maxLength={100}
+                      onKeyDown={(e) => e.key === 'Enter' && handleSaveSearch()}
+                      aria-describedby="save-search-heading"
+                    />
+                    <div className="mb-3 flex items-center gap-2 text-sm">
+                      <input
+                        id="save-alert-enabled"
+                        type="checkbox"
+                        checked={saveAlertEnabled}
+                        onChange={(e) => setSaveAlertEnabled(e.target.checked)}
+                        className="rounded"
+                      />
+                      <label htmlFor="save-alert-enabled">
+                        Nhận thông báo khi có kết quả mới
+                      </label>
+                    </div>
+                    <div className="flex items-center justify-end gap-2">
+                      <Button
+                        size="sm"
+                        variant="ghost"
+                        onClick={() => setShowSaveDialog(false)}
+                      >
+                        Hủy
+                      </Button>
+                      <Button
+                        size="sm"
+                        onClick={handleSaveSearch}
+                        disabled={!saveName.trim() || createSavedSearch.isPending}
+                      >
+                        {createSavedSearch.isPending ? 'Đang lưu...' : 'Lưu'}
+                      </Button>
+                    </div>
+                    {createSavedSearch.isError && (
+                      <p className="mt-2 text-xs text-destructive">
+                        Không thể lưu tìm kiếm. Vui lòng thử lại.
+                      </p>
+                    )}
+                  </>
+                )}
+              </div>
+            )}
+          </div>
+        )}
       </div>
 
       {/* View Mode Toggle + Mobile Filter Button */}
diff --git a/apps/web/app/[locale]/layout.tsx b/apps/web/app/[locale]/layout.tsx
index 42de710..88d462a 100644
--- a/apps/web/app/[locale]/layout.tsx
+++ b/apps/web/app/[locale]/layout.tsx
@@ -1,4 +1,5 @@
 import type { Metadata, Viewport } from 'next';
+import { Inter } from 'next/font/google';
 import { notFound } from 'next/navigation';
 import { NextIntlClientProvider } from 'next-intl';
 import { getMessages, getTranslations } from 'next-intl/server';
@@ -11,6 +12,12 @@ import type { Locale } from '@/i18n/config';
 import { routing } from '@/i18n/routing';
 import '../globals.css';
 
+const inter = Inter({
+  subsets: ['latin', 'vietnamese'],
+  display: 'swap',
+  variable: '--font-inter',
+});
+
 const siteUrl = process.env['NEXT_PUBLIC_SITE_URL'] || 'https://goodgo.vn';
 
 export const viewport: Viewport = {
@@ -99,8 +106,8 @@ export default async function LocaleLayout({
   const t = await getTranslations({ locale, namespace: 'common' });
 
   return (
-    <html lang={locale} suppressHydrationWarning>
-      <body>
+    <html lang={locale} suppressHydrationWarning className={inter.variable}>
+      <body className={inter.className}>
         <JsonLd data={generateWebsiteJsonLd(siteUrl)} />
         <a
           href="#main-content"