diff --git a/maternal-web/app/ai-assistant/page.tsx b/maternal-web/app/ai-assistant/page.tsx
index e60eeb1..94876d1 100644
--- a/maternal-web/app/ai-assistant/page.tsx
+++ b/maternal-web/app/ai-assistant/page.tsx
@@ -4,6 +4,8 @@ import { lazy, Suspense } from 'react';
import { AppShell } from '@/components/layouts/AppShell/AppShell';
import { ProtectedRoute } from '@/components/common/ProtectedRoute';
import { LoadingFallback } from '@/components/common/LoadingFallback';
+import { ErrorBoundary } from '@/components/common/ErrorBoundary';
+import { ComponentErrorFallback } from '@/components/common/ErrorFallbacks';
// Lazy load the AI chat interface component
const AIChatInterface = lazy(() =>
@@ -16,9 +18,14 @@ export default function AIAssistantPage() {
return (
- }>
-
-
+ }
+ >
+ }>
+
+
+
);
diff --git a/maternal-web/app/analytics/page.tsx b/maternal-web/app/analytics/page.tsx
index 238d0ee..7dce600 100644
--- a/maternal-web/app/analytics/page.tsx
+++ b/maternal-web/app/analytics/page.tsx
@@ -16,6 +16,8 @@ import {
} from '@mui/material';
import { AppShell } from '@/components/layouts/AppShell/AppShell';
import { ProtectedRoute } from '@/components/common/ProtectedRoute';
+import { ErrorBoundary } from '@/components/common/ErrorBoundary';
+import { ChartErrorFallback } from '@/components/common/ErrorFallbacks';
import {
TrendingUp,
Hotel,
@@ -232,21 +234,27 @@ export default function AnalyticsPage() {
-
-
-
+ }>
+
+
+
+
-
-
-
+ }>
+
+
+
+
-
-
-
+ }>
+
+
+
+
diff --git a/maternal-web/app/layout.tsx b/maternal-web/app/layout.tsx
index cbdd359..6f2a289 100644
--- a/maternal-web/app/layout.tsx
+++ b/maternal-web/app/layout.tsx
@@ -1,6 +1,7 @@
import type { Metadata } from 'next';
import { Inter } from 'next/font/google';
import { ThemeRegistry } from '@/components/ThemeRegistry';
+import { ErrorBoundary } from '@/components/common/ErrorBoundary';
// import { PerformanceMonitor } from '@/components/common/PerformanceMonitor'; // Temporarily disabled
import './globals.css';
@@ -37,10 +38,12 @@ export default function RootLayout({
-
- {/* */}
- {children}
-
+
+
+ {/* */}
+ {children}
+
+