From a590a41e73f165d7ce1981005787d6d2db0e7d33 Mon Sep 17 00:00:00 2001
From: Ho Ngoc Hai <hongochai10@icloud.com>
Date: Wed, 8 Apr 2026 13:48:33 +0700
Subject: [PATCH] feat(web): add loading skeletons, error boundaries, and
 accessibility improvements

- Add segment-level loading.tsx for dashboard, search, admin, and auth routes
- Add segment-level error.tsx with Vietnamese error messages for all route groups
- Add skip-to-content navigation link in root layout
- Add id="main-content" to all layout main elements
- Add aria-label to nav elements and mobile menu buttons
- Improve dashboard nav responsiveness (icon-only on mobile)
- Hide user name on small screens in dashboard layout

Co-Authored-By: Paperclip <noreply@paperclip.ing>
---
 apps/web/app/(admin)/error.tsx           | 58 +++++++++++++++++++
 apps/web/app/(admin)/layout.tsx          |  7 ++-
 apps/web/app/(admin)/loading.tsx         | 60 ++++++++++++++++++++
 apps/web/app/(auth)/error.tsx            | 58 +++++++++++++++++++
 apps/web/app/(auth)/layout.tsx           |  4 +-
 apps/web/app/(auth)/loading.tsx          | 40 +++++++++++++
 apps/web/app/(dashboard)/error.tsx       | 58 +++++++++++++++++++
 apps/web/app/(dashboard)/layout.tsx      | 13 +++--
 apps/web/app/(dashboard)/loading.tsx     | 71 +++++++++++++++++++++++
 apps/web/app/(public)/layout.tsx         |  4 +-
 apps/web/app/(public)/search/error.tsx   | 60 ++++++++++++++++++++
 apps/web/app/(public)/search/loading.tsx | 72 ++++++++++++++++++++++++
 apps/web/app/layout.tsx                  |  6 ++
 13 files changed, 498 insertions(+), 13 deletions(-)
 create mode 100644 apps/web/app/(admin)/error.tsx
 create mode 100644 apps/web/app/(admin)/loading.tsx
 create mode 100644 apps/web/app/(auth)/error.tsx
 create mode 100644 apps/web/app/(auth)/loading.tsx
 create mode 100644 apps/web/app/(dashboard)/error.tsx
 create mode 100644 apps/web/app/(dashboard)/loading.tsx
 create mode 100644 apps/web/app/(public)/search/error.tsx
 create mode 100644 apps/web/app/(public)/search/loading.tsx

diff --git a/apps/web/app/(admin)/error.tsx b/apps/web/app/(admin)/error.tsx
new file mode 100644
index 0000000..e32333a
--- /dev/null
+++ b/apps/web/app/(admin)/error.tsx
@@ -0,0 +1,58 @@
+'use client';
+
+import { useEffect } from 'react';
+
+export default function AdminError({
+  error,
+  reset,
+}: {
+  error: Error & { digest?: string };
+  reset: () => void;
+}) {
+  useEffect(() => {
+    console.error('Admin error:', error);
+  }, [error]);
+
+  return (
+    <div className="flex min-h-[400px] flex-col items-center justify-center px-4">
+      <div className="mx-auto max-w-md text-center">
+        <div className="mx-auto flex h-14 w-14 items-center justify-center rounded-full bg-destructive/10">
+          <svg
+            className="h-7 w-7 text-destructive"
+            fill="none"
+            stroke="currentColor"
+            viewBox="0 0 24 24"
+          >
+            <path
+              strokeLinecap="round"
+              strokeLinejoin="round"
+              strokeWidth={2}
+              d="M12 15v2m-6 4h12a2 2 0 002-2v-6a2 2 0 00-2-2H6a2 2 0 00-2 2v6a2 2 0 002 2zm10-10V7a4 4 0 00-8 0v4h8z"
+            />
+          </svg>
+        </div>
+        <h2 className="mt-4 text-xl font-semibold">Lỗi trang quản trị</h2>
+        <p className="mt-2 text-sm text-muted-foreground">
+          Không thể tải trang quản trị. Vui lòng thử lại sau.
+        </p>
+        {error.digest && (
+          <p className="mt-1 text-xs text-muted-foreground">Mã lỗi: {error.digest}</p>
+        )}
+        <div className="mt-6 flex justify-center gap-3">
+          <button
+            onClick={reset}
+            className="inline-flex h-9 items-center rounded-md bg-primary px-4 text-sm font-medium text-primary-foreground shadow transition-colors hover:bg-primary/90"
+          >
+            Thử lại
+          </button>
+          <a
+            href="/admin"
+            className="inline-flex h-9 items-center rounded-md border border-input bg-background px-4 text-sm font-medium shadow-sm transition-colors hover:bg-accent hover:text-accent-foreground"
+          >
+            Tải lại trang
+          </a>
+        </div>
+      </div>
+    </div>
+  );
+}
diff --git a/apps/web/app/(admin)/layout.tsx b/apps/web/app/(admin)/layout.tsx
index 0d99eb4..d55c5a2 100644
--- a/apps/web/app/(admin)/layout.tsx
+++ b/apps/web/app/(admin)/layout.tsx
@@ -72,6 +72,7 @@ export default function AdminLayout({ children }: { children: React.ReactNode })
             </span>
           </Link>
           <button
+            aria-label="Đóng menu"
             className="ml-auto lg:hidden"
             onClick={() => setSidebarOpen(false)}
           >
@@ -79,7 +80,7 @@ export default function AdminLayout({ children }: { children: React.ReactNode })
           </button>
         </div>
 
-        <nav className="flex flex-col gap-1 p-3">
+        <nav aria-label="Quản trị" className="flex flex-col gap-1 p-3">
           {adminNavItems.map((item) => {
             const Icon = item.icon;
             const isActive =
@@ -124,13 +125,13 @@ export default function AdminLayout({ children }: { children: React.ReactNode })
       {/* Main content */}
       <div className="flex flex-1 flex-col">
         <header className="sticky top-0 z-30 flex h-14 items-center border-b bg-background/95 px-4 backdrop-blur lg:hidden">
-          <button onClick={() => setSidebarOpen(true)}>
+          <button aria-label="Mở menu" onClick={() => setSidebarOpen(true)}>
             <Menu className="h-5 w-5" />
           </button>
           <span className="ml-3 text-sm font-semibold">GoodGo Admin</span>
         </header>
 
-        <main className="flex-1 p-4 md:p-6">{children}</main>
+        <main id="main-content" className="flex-1 p-4 md:p-6">{children}</main>
       </div>
     </div>
   );
diff --git a/apps/web/app/(admin)/loading.tsx b/apps/web/app/(admin)/loading.tsx
new file mode 100644
index 0000000..59e7fe3
--- /dev/null
+++ b/apps/web/app/(admin)/loading.tsx
@@ -0,0 +1,60 @@
+export default function AdminLoading() {
+  return (
+    <div className="space-y-6">
+      {/* Header skeleton */}
+      <div className="flex items-center justify-between">
+        <div>
+          <div className="h-7 w-36 animate-pulse rounded bg-muted" />
+          <div className="mt-2 h-4 w-48 animate-pulse rounded bg-muted" />
+        </div>
+        <div className="h-9 w-24 animate-pulse rounded-md bg-muted" />
+      </div>
+
+      {/* Stats grid skeleton */}
+      <div className="grid gap-4 sm:grid-cols-2 lg:grid-cols-4">
+        {Array.from({ length: 4 }).map((_, i) => (
+          <div key={i} className="rounded-lg border bg-card p-6 shadow-sm">
+            <div className="flex items-center justify-between">
+              <div className="h-4 w-24 animate-pulse rounded bg-muted" />
+              <div className="h-4 w-4 animate-pulse rounded bg-muted" />
+            </div>
+            <div className="mt-3 h-7 w-20 animate-pulse rounded bg-muted" />
+            <div className="mt-2 h-3 w-28 animate-pulse rounded bg-muted" />
+          </div>
+        ))}
+      </div>
+
+      <div className="grid gap-4 sm:grid-cols-2 lg:grid-cols-3">
+        {Array.from({ length: 3 }).map((_, i) => (
+          <div key={i} className="rounded-lg border bg-card p-6 shadow-sm">
+            <div className="flex items-center justify-between">
+              <div className="h-4 w-24 animate-pulse rounded bg-muted" />
+              <div className="h-4 w-4 animate-pulse rounded bg-muted" />
+            </div>
+            <div className="mt-3 h-7 w-20 animate-pulse rounded bg-muted" />
+          </div>
+        ))}
+      </div>
+
+      {/* Revenue chart skeleton */}
+      <div className="rounded-lg border bg-card shadow-sm">
+        <div className="p-6">
+          <div className="h-5 w-48 animate-pulse rounded bg-muted" />
+        </div>
+        <div className="px-6 pb-6">
+          <div className="space-y-4">
+            {Array.from({ length: 6 }).map((_, i) => (
+              <div key={i} className="space-y-2">
+                <div className="flex items-center justify-between">
+                  <div className="h-3 w-20 animate-pulse rounded bg-muted" />
+                  <div className="h-3 w-28 animate-pulse rounded bg-muted" />
+                </div>
+                <div className="h-2 w-full animate-pulse rounded-full bg-muted" />
+              </div>
+            ))}
+          </div>
+        </div>
+      </div>
+    </div>
+  );
+}
diff --git a/apps/web/app/(auth)/error.tsx b/apps/web/app/(auth)/error.tsx
new file mode 100644
index 0000000..dac87eb
--- /dev/null
+++ b/apps/web/app/(auth)/error.tsx
@@ -0,0 +1,58 @@
+'use client';
+
+import { useEffect } from 'react';
+
+export default function AuthError({
+  error,
+  reset,
+}: {
+  error: Error & { digest?: string };
+  reset: () => void;
+}) {
+  useEffect(() => {
+    console.error('Auth error:', error);
+  }, [error]);
+
+  return (
+    <div className="rounded-lg border bg-card p-8 shadow-sm">
+      <div className="text-center">
+        <div className="mx-auto flex h-14 w-14 items-center justify-center rounded-full bg-destructive/10">
+          <svg
+            className="h-7 w-7 text-destructive"
+            fill="none"
+            stroke="currentColor"
+            viewBox="0 0 24 24"
+          >
+            <path
+              strokeLinecap="round"
+              strokeLinejoin="round"
+              strokeWidth={2}
+              d="M12 9v2m0 4h.01m-6.938 4h13.856c1.54 0 2.502-1.667 1.732-2.5L13.732 4c-.77-.833-1.964-.833-2.732 0L4.082 16.5c-.77.833.192 2.5 1.732 2.5z"
+            />
+          </svg>
+        </div>
+        <h2 className="mt-4 text-xl font-semibold">Lỗi xác thực</h2>
+        <p className="mt-2 text-sm text-muted-foreground">
+          Đã xảy ra lỗi trong quá trình xác thực. Vui lòng thử lại.
+        </p>
+        {error.digest && (
+          <p className="mt-1 text-xs text-muted-foreground">Mã lỗi: {error.digest}</p>
+        )}
+        <div className="mt-6 flex justify-center gap-3">
+          <button
+            onClick={reset}
+            className="inline-flex h-9 items-center rounded-md bg-primary px-4 text-sm font-medium text-primary-foreground shadow transition-colors hover:bg-primary/90"
+          >
+            Thử lại
+          </button>
+          <a
+            href="/login"
+            className="inline-flex h-9 items-center rounded-md border border-input bg-background px-4 text-sm font-medium shadow-sm transition-colors hover:bg-accent hover:text-accent-foreground"
+          >
+            Về trang đăng nhập
+          </a>
+        </div>
+      </div>
+    </div>
+  );
+}
diff --git a/apps/web/app/(auth)/layout.tsx b/apps/web/app/(auth)/layout.tsx
index 33d8912..ff4dbd5 100644
--- a/apps/web/app/(auth)/layout.tsx
+++ b/apps/web/app/(auth)/layout.tsx
@@ -1,7 +1,7 @@
 export default function AuthLayout({ children }: { children: React.ReactNode }) {
   return (
-    <div className="flex min-h-screen items-center justify-center bg-muted/40 px-4 py-12">
+    <main id="main-content" className="flex min-h-screen items-center justify-center bg-muted/40 px-4 py-12">
       <div className="w-full max-w-md">{children}</div>
-    </div>
+    </main>
   );
 }
diff --git a/apps/web/app/(auth)/loading.tsx b/apps/web/app/(auth)/loading.tsx
new file mode 100644
index 0000000..9bef2a0
--- /dev/null
+++ b/apps/web/app/(auth)/loading.tsx
@@ -0,0 +1,40 @@
+export default function AuthLoading() {
+  return (
+    <div className="rounded-lg border bg-card p-8 shadow-sm">
+      <div className="space-y-6">
+        {/* Logo / title skeleton */}
+        <div className="text-center">
+          <div className="mx-auto h-8 w-24 animate-pulse rounded bg-muted" />
+          <div className="mx-auto mt-3 h-5 w-40 animate-pulse rounded bg-muted" />
+          <div className="mx-auto mt-2 h-4 w-56 animate-pulse rounded bg-muted" />
+        </div>
+
+        {/* Form fields skeleton */}
+        <div className="space-y-4">
+          <div>
+            <div className="h-4 w-16 animate-pulse rounded bg-muted" />
+            <div className="mt-2 h-10 w-full animate-pulse rounded-md bg-muted" />
+          </div>
+          <div>
+            <div className="h-4 w-20 animate-pulse rounded bg-muted" />
+            <div className="mt-2 h-10 w-full animate-pulse rounded-md bg-muted" />
+          </div>
+        </div>
+
+        {/* Submit button skeleton */}
+        <div className="h-10 w-full animate-pulse rounded-md bg-muted" />
+
+        {/* OAuth buttons skeleton */}
+        <div className="space-y-3">
+          <div className="flex items-center gap-3">
+            <div className="h-px flex-1 bg-muted" />
+            <div className="h-3 w-12 animate-pulse rounded bg-muted" />
+            <div className="h-px flex-1 bg-muted" />
+          </div>
+          <div className="h-10 w-full animate-pulse rounded-md bg-muted" />
+          <div className="h-10 w-full animate-pulse rounded-md bg-muted" />
+        </div>
+      </div>
+    </div>
+  );
+}
diff --git a/apps/web/app/(dashboard)/error.tsx b/apps/web/app/(dashboard)/error.tsx
new file mode 100644
index 0000000..cbdada6
--- /dev/null
+++ b/apps/web/app/(dashboard)/error.tsx
@@ -0,0 +1,58 @@
+'use client';
+
+import { useEffect } from 'react';
+
+export default function DashboardError({
+  error,
+  reset,
+}: {
+  error: Error & { digest?: string };
+  reset: () => void;
+}) {
+  useEffect(() => {
+    console.error('Dashboard error:', error);
+  }, [error]);
+
+  return (
+    <div className="flex min-h-[400px] flex-col items-center justify-center px-4">
+      <div className="mx-auto max-w-md text-center">
+        <div className="mx-auto flex h-14 w-14 items-center justify-center rounded-full bg-destructive/10">
+          <svg
+            className="h-7 w-7 text-destructive"
+            fill="none"
+            stroke="currentColor"
+            viewBox="0 0 24 24"
+          >
+            <path
+              strokeLinecap="round"
+              strokeLinejoin="round"
+              strokeWidth={2}
+              d="M12 9v2m0 4h.01m-6.938 4h13.856c1.54 0 2.502-1.667 1.732-2.5L13.732 4c-.77-.833-1.964-.833-2.732 0L4.082 16.5c-.77.833.192 2.5 1.732 2.5z"
+            />
+          </svg>
+        </div>
+        <h2 className="mt-4 text-xl font-semibold">Không thể tải bảng điều khiển</h2>
+        <p className="mt-2 text-sm text-muted-foreground">
+          Đã xảy ra lỗi khi tải dữ liệu. Vui lòng thử lại sau.
+        </p>
+        {error.digest && (
+          <p className="mt-1 text-xs text-muted-foreground">Mã lỗi: {error.digest}</p>
+        )}
+        <div className="mt-6 flex justify-center gap-3">
+          <button
+            onClick={reset}
+            className="inline-flex h-9 items-center rounded-md bg-primary px-4 text-sm font-medium text-primary-foreground shadow transition-colors hover:bg-primary/90"
+          >
+            Thử lại
+          </button>
+          <a
+            href="/dashboard"
+            className="inline-flex h-9 items-center rounded-md border border-input bg-background px-4 text-sm font-medium shadow-sm transition-colors hover:bg-accent hover:text-accent-foreground"
+          >
+            Tải lại trang
+          </a>
+        </div>
+      </div>
+    </div>
+  );
+}
diff --git a/apps/web/app/(dashboard)/layout.tsx b/apps/web/app/(dashboard)/layout.tsx
index 673da52..548cc19 100644
--- a/apps/web/app/(dashboard)/layout.tsx
+++ b/apps/web/app/(dashboard)/layout.tsx
@@ -25,27 +25,28 @@ export default function DashboardLayout({ children }: { children: React.ReactNod
             <span className="text-lg font-bold text-primary">GoodGo</span>
           </Link>
 
-          <nav className="flex items-center space-x-1">
+          <nav aria-label="Bảng điều khiển" className="flex items-center space-x-1">
             {navItems.map((item) => (
               <Link
                 key={item.href}
                 href={item.href}
+                aria-label={item.label}
                 className={cn(
-                  'rounded-md px-3 py-2 text-sm font-medium transition-colors hover:bg-accent hover:text-accent-foreground',
+                  'rounded-md px-2 py-2 text-sm font-medium transition-colors hover:bg-accent hover:text-accent-foreground sm:px-3',
                   pathname === item.href
                     ? 'bg-accent text-accent-foreground'
                     : 'text-muted-foreground',
                 )}
               >
-                <span className="mr-1.5">{item.icon}</span>
-                {item.label}
+                <span className="sm:mr-1.5">{item.icon}</span>
+                <span className="hidden sm:inline">{item.label}</span>
               </Link>
             ))}
           </nav>
 
           <div className="ml-auto flex items-center space-x-3">
             {user && (
-              <span className="text-sm text-muted-foreground">
+              <span className="hidden text-sm text-muted-foreground sm:inline">
                 {user.fullName}
               </span>
             )}
@@ -56,7 +57,7 @@ export default function DashboardLayout({ children }: { children: React.ReactNod
         </div>
       </header>
 
-      <main className="mx-auto max-w-7xl px-4 py-6">{children}</main>
+      <main id="main-content" className="mx-auto max-w-7xl px-4 py-6">{children}</main>
     </div>
   );
 }
diff --git a/apps/web/app/(dashboard)/loading.tsx b/apps/web/app/(dashboard)/loading.tsx
new file mode 100644
index 0000000..cc75a34
--- /dev/null
+++ b/apps/web/app/(dashboard)/loading.tsx
@@ -0,0 +1,71 @@
+export default function DashboardLoading() {
+  return (
+    <div className="space-y-8">
+      {/* Header skeleton */}
+      <div className="flex items-center justify-between">
+        <div>
+          <div className="h-8 w-48 animate-pulse rounded bg-muted" />
+          <div className="mt-2 h-4 w-72 animate-pulse rounded bg-muted" />
+        </div>
+        <div className="h-10 w-28 animate-pulse rounded-md bg-muted" />
+      </div>
+
+      {/* Stats grid skeleton */}
+      <div className="grid gap-4 sm:grid-cols-2 lg:grid-cols-4">
+        {Array.from({ length: 4 }).map((_, i) => (
+          <div key={i} className="rounded-lg border bg-card p-6 shadow-sm">
+            <div className="h-4 w-24 animate-pulse rounded bg-muted" />
+            <div className="mt-3 h-7 w-16 animate-pulse rounded bg-muted" />
+            <div className="mt-2 h-3 w-32 animate-pulse rounded bg-muted" />
+          </div>
+        ))}
+      </div>
+
+      {/* Chart + sidebar skeleton */}
+      <div className="grid gap-6 lg:grid-cols-3">
+        <div className="rounded-lg border bg-card p-6 shadow-sm lg:col-span-2">
+          <div className="h-5 w-40 animate-pulse rounded bg-muted" />
+          <div className="mt-2 h-4 w-56 animate-pulse rounded bg-muted" />
+          <div className="mt-6 h-64 animate-pulse rounded bg-muted" />
+        </div>
+        <div className="rounded-lg border bg-card p-6 shadow-sm">
+          <div className="h-5 w-36 animate-pulse rounded bg-muted" />
+          <div className="mt-2 h-4 w-28 animate-pulse rounded bg-muted" />
+          <div className="mt-6 space-y-4">
+            {Array.from({ length: 4 }).map((_, i) => (
+              <div key={i} className="flex items-center justify-between">
+                <div className="h-4 w-24 animate-pulse rounded bg-muted" />
+                <div className="h-4 w-16 animate-pulse rounded bg-muted" />
+              </div>
+            ))}
+          </div>
+        </div>
+      </div>
+
+      {/* Recent listings skeleton */}
+      <div className="rounded-lg border bg-card shadow-sm">
+        <div className="p-6">
+          <div className="h-5 w-36 animate-pulse rounded bg-muted" />
+          <div className="mt-2 h-4 w-56 animate-pulse rounded bg-muted" />
+        </div>
+        <div className="px-6 pb-6">
+          <div className="space-y-3">
+            {Array.from({ length: 5 }).map((_, i) => (
+              <div key={i} className="flex items-center gap-4 rounded-lg border p-3">
+                <div className="h-12 w-16 flex-shrink-0 animate-pulse rounded bg-muted" />
+                <div className="min-w-0 flex-1">
+                  <div className="h-4 w-3/4 animate-pulse rounded bg-muted" />
+                  <div className="mt-2 h-3 w-1/2 animate-pulse rounded bg-muted" />
+                </div>
+                <div className="text-right">
+                  <div className="h-4 w-20 animate-pulse rounded bg-muted" />
+                  <div className="mt-1 h-5 w-16 animate-pulse rounded bg-muted" />
+                </div>
+              </div>
+            ))}
+          </div>
+        </div>
+      </div>
+    </div>
+  );
+}
diff --git a/apps/web/app/(public)/layout.tsx b/apps/web/app/(public)/layout.tsx
index 490f5c5..b7a24c4 100644
--- a/apps/web/app/(public)/layout.tsx
+++ b/apps/web/app/(public)/layout.tsx
@@ -18,7 +18,7 @@ export default function PublicLayout({ children }: { children: React.ReactNode }
             <span className="text-lg font-bold text-primary">GoodGo</span>
           </Link>
 
-          <nav className="flex items-center space-x-1">
+          <nav aria-label="Điều hướng chính" className="flex items-center space-x-1">
             <Link
               href="/"
               className={cn(
@@ -67,7 +67,7 @@ export default function PublicLayout({ children }: { children: React.ReactNode }
         </div>
       </header>
 
-      <main>{children}</main>
+      <main id="main-content">{children}</main>
 
       <footer className="border-t bg-muted/40">
         <div className="mx-auto max-w-7xl px-4 py-8">
diff --git a/apps/web/app/(public)/search/error.tsx b/apps/web/app/(public)/search/error.tsx
new file mode 100644
index 0000000..61d3054
--- /dev/null
+++ b/apps/web/app/(public)/search/error.tsx
@@ -0,0 +1,60 @@
+'use client';
+
+import { useEffect } from 'react';
+
+export default function SearchError({
+  error,
+  reset,
+}: {
+  error: Error & { digest?: string };
+  reset: () => void;
+}) {
+  useEffect(() => {
+    console.error('Search error:', error);
+  }, [error]);
+
+  return (
+    <div className="mx-auto max-w-7xl px-4 py-6">
+      <div className="flex min-h-[400px] flex-col items-center justify-center">
+        <div className="mx-auto max-w-md text-center">
+          <div className="mx-auto flex h-14 w-14 items-center justify-center rounded-full bg-destructive/10">
+            <svg
+              className="h-7 w-7 text-destructive"
+              fill="none"
+              stroke="currentColor"
+              viewBox="0 0 24 24"
+            >
+              <path
+                strokeLinecap="round"
+                strokeLinejoin="round"
+                strokeWidth={2}
+                d="M21 21l-6-6m2-5a7 7 0 11-14 0 7 7 0 0114 0z"
+              />
+            </svg>
+          </div>
+          <h2 className="mt-4 text-xl font-semibold">Lỗi tìm kiếm</h2>
+          <p className="mt-2 text-sm text-muted-foreground">
+            Không thể thực hiện tìm kiếm. Vui lòng thử lại hoặc thay đổi bộ lọc.
+          </p>
+          {error.digest && (
+            <p className="mt-1 text-xs text-muted-foreground">Mã lỗi: {error.digest}</p>
+          )}
+          <div className="mt-6 flex justify-center gap-3">
+            <button
+              onClick={reset}
+              className="inline-flex h-9 items-center rounded-md bg-primary px-4 text-sm font-medium text-primary-foreground shadow transition-colors hover:bg-primary/90"
+            >
+              Thử lại
+            </button>
+            <a
+              href="/"
+              className="inline-flex h-9 items-center rounded-md border border-input bg-background px-4 text-sm font-medium shadow-sm transition-colors hover:bg-accent hover:text-accent-foreground"
+            >
+              Về trang chủ
+            </a>
+          </div>
+        </div>
+      </div>
+    </div>
+  );
+}
diff --git a/apps/web/app/(public)/search/loading.tsx b/apps/web/app/(public)/search/loading.tsx
new file mode 100644
index 0000000..7cd33f2
--- /dev/null
+++ b/apps/web/app/(public)/search/loading.tsx
@@ -0,0 +1,72 @@
+export default function SearchLoading() {
+  return (
+    <div className="mx-auto max-w-7xl px-4 py-6">
+      {/* Header skeleton */}
+      <div className="mb-6">
+        <div className="h-8 w-64 animate-pulse rounded bg-muted" />
+        <div className="mt-2 h-4 w-80 animate-pulse rounded bg-muted" />
+      </div>
+
+      {/* View mode toggle skeleton */}
+      <div className="mb-4 flex items-center justify-between">
+        <div className="flex gap-1 rounded-lg border p-1">
+          <div className="h-8 w-24 animate-pulse rounded bg-muted" />
+          <div className="h-8 w-24 animate-pulse rounded bg-muted" />
+          <div className="hidden h-8 w-24 animate-pulse rounded bg-muted lg:block" />
+        </div>
+        <div className="h-8 w-20 animate-pulse rounded bg-muted lg:hidden" />
+      </div>
+
+      {/* Filter bar skeleton (desktop) */}
+      <div className="mb-4 hidden lg:block">
+        <div className="flex gap-3 rounded-lg border p-4">
+          {Array.from({ length: 5 }).map((_, i) => (
+            <div key={i} className="h-9 w-36 animate-pulse rounded bg-muted" />
+          ))}
+          <div className="h-9 w-24 animate-pulse rounded-md bg-muted" />
+        </div>
+      </div>
+
+      {/* Content area skeleton */}
+      <div className="flex gap-6">
+        {/* Sidebar skeleton (desktop) */}
+        <aside className="hidden w-64 shrink-0 lg:block">
+          <div className="rounded-lg border bg-card p-4">
+            <div className="space-y-4">
+              {Array.from({ length: 6 }).map((_, i) => (
+                <div key={i}>
+                  <div className="h-4 w-20 animate-pulse rounded bg-muted" />
+                  <div className="mt-2 h-9 w-full animate-pulse rounded bg-muted" />
+                </div>
+              ))}
+            </div>
+          </div>
+        </aside>
+
+        {/* Results grid skeleton */}
+        <div className="min-w-0 flex-1">
+          <div className="mb-4 flex items-center justify-between">
+            <div className="h-4 w-32 animate-pulse rounded bg-muted" />
+            <div className="h-9 w-40 animate-pulse rounded bg-muted" />
+          </div>
+          <div className="grid gap-4 sm:grid-cols-2 xl:grid-cols-3">
+            {Array.from({ length: 6 }).map((_, i) => (
+              <div key={i} className="rounded-lg border bg-card shadow-sm">
+                <div className="aspect-[16/10] animate-pulse rounded-t-lg bg-muted" />
+                <div className="p-4">
+                  <div className="h-5 w-3/4 animate-pulse rounded bg-muted" />
+                  <div className="mt-2 h-4 w-1/2 animate-pulse rounded bg-muted" />
+                  <div className="mt-3 flex gap-2">
+                    <div className="h-6 w-16 animate-pulse rounded bg-muted" />
+                    <div className="h-6 w-16 animate-pulse rounded bg-muted" />
+                  </div>
+                  <div className="mt-3 h-5 w-24 animate-pulse rounded bg-muted" />
+                </div>
+              </div>
+            ))}
+          </div>
+        </div>
+      </div>
+    </div>
+  );
+}
diff --git a/apps/web/app/layout.tsx b/apps/web/app/layout.tsx
index 44ce3b0..e31d5b0 100644
--- a/apps/web/app/layout.tsx
+++ b/apps/web/app/layout.tsx
@@ -72,6 +72,12 @@ export default function RootLayout({ children }: { children: React.ReactNode })
   return (
     <html lang="vi">
       <body>
+        <a
+          href="#main-content"
+          className="fixed left-2 top-2 z-[100] -translate-y-16 rounded-md bg-primary px-4 py-2 text-sm font-medium text-primary-foreground shadow-lg transition-transform focus:translate-y-0"
+        >
+          Chuyển đến nội dung chính
+        </a>
         <AuthProvider>{children}</AuthProvider>
       </body>
     </html>