docs: Add comprehensive multi-child implementation plan

Added detailed implementation plan covering:
- Frontend: Dynamic UI, child selector, bulk activity logging, comparison analytics
- Backend: Bulk operations, multi-child queries, family statistics
- AI/Voice: Child name detection, context building, clarification flows
- Database: Schema enhancements, user preferences, bulk operation tracking
- State management, API enhancements, real-time sync updates
- Testing strategy: Unit, integration, and E2E tests
- Migration plan with feature flags for phased rollout
- Performance optimizations: Caching, indexes, code splitting

Also includes:
- Security fixes for multi-family data leakage in analytics pages
- ParentFlow branding updates
- Activity tracking navigation improvements
- Backend DTO and error handling fixes

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>

maternal-web/app/(auth)/onboarding/page.tsx

@@ -23,6 +23,9 @@ import {
   FormControlLabel,
   FormControl,
   Grid,
+  StepConnector,
+  stepConnectorClasses,
+  styled,
 } from '@mui/material';
 import { ArrowBack, ArrowForward, Check, Language, Straighten } from '@mui/icons-material';
 import { motion, AnimatePresence } from 'framer-motion';
@@ -33,9 +36,60 @@ import { useLocale, MeasurementSystem } from '@/hooks/useLocale';
 import { useTranslation } from '@/hooks/useTranslation';
 import { supportedLanguages } from '@/lib/i18n/config';
 import { usersApi } from '@/lib/api/users';
+import { useTheme } from '@mui/material/styles';
+import { StepIconProps } from '@mui/material/StepIcon';
 
 const steps = ['Welcome', 'Language', 'Measurements', 'Add Child', 'Complete'];
 
+// Custom connector for mobile-friendly stepper
+const CustomConnector = styled(StepConnector)(({ theme }) => ({
+  [`&.${stepConnectorClasses.active}`]: {
+    [`& .${stepConnectorClasses.line}`]: {
+      borderColor: theme.palette.primary.main,
+    },
+  },
+  [`&.${stepConnectorClasses.completed}`]: {
+    [`& .${stepConnectorClasses.line}`]: {
+      borderColor: theme.palette.primary.main,
+    },
+  },
+  [`& .${stepConnectorClasses.line}`]: {
+    borderColor: theme.palette.divider,
+    borderTopWidth: 2,
+    borderRadius: 1,
+  },
+}));
+
+// Custom step icon showing numbers
+const CustomStepIconRoot = styled('div')<{ ownerState: { active?: boolean; completed?: boolean } }>(
+  ({ theme, ownerState }) => ({
+    display: 'flex',
+    alignItems: 'center',
+    justifyContent: 'center',
+    width: 32,
+    height: 32,
+    borderRadius: '50%',
+    backgroundColor: ownerState.completed
+      ? theme.palette.primary.main
+      : ownerState.active
+      ? theme.palette.primary.main
+      : theme.palette.grey[300],
+    color: ownerState.active || ownerState.completed ? '#fff' : theme.palette.text.secondary,
+    fontWeight: 600,
+    fontSize: '0.875rem',
+  })
+);
+
+function CustomStepIcon(props: StepIconProps) {
+  const { active, completed, icon } = props;
+
+  return (
+    <CustomStepIconRoot ownerState={{ active, completed }}>
+      {completed ? <Check sx={{ fontSize: 18 }} /> : icon}
+    </CustomStepIconRoot>
+  );
+}
+
 export default function OnboardingPage() {
   const [activeStep, setActiveStep] = useState(0);
   const [selectedLanguage, setSelectedLanguage] = useState('en');
@@ -49,6 +103,7 @@ export default function OnboardingPage() {
   const { user, refreshUser } = useAuth();
   const { setLanguage, setMeasurementSystem } = useLocale();
   const { t } = useTranslation('onboarding');
+  const theme = useTheme();
 
   const handleNext = async () => {
     setError('');
@@ -154,7 +209,7 @@ export default function OnboardingPage() {
         flexDirection: 'column',
         px: 3,
         py: 4,
-        background: 'linear-gradient(135deg, #FFE4E1 0%, #FFDAB9 100%)',
+        background: `linear-gradient(135deg, ${theme.palette.primary.light} 0%, ${theme.palette.secondary.light} 100%)`,
       }}
     >
       <Paper
@@ -163,13 +218,18 @@ export default function OnboardingPage() {
           maxWidth: 600,
           mx: 'auto',
           width: '100%',
-          p: 4,
+          p: { xs: 3, sm: 4 },
           borderRadius: 4,
           background: 'rgba(255, 255, 255, 0.95)',
           backdropFilter: 'blur(10px)',
         }}
       >
-        <Stepper activeStep={activeStep} sx={{ mb: 4 }}>
+        <Stepper
+          activeStep={activeStep}
+          alternativeLabel
+          connector={<CustomConnector />}
+          sx={{ mb: 4 }}
+        >
           {steps.map((label, index) => {
             let stepLabel = label;
             if (index === 0) stepLabel = t('welcome.title').split('!')[0];
@@ -177,10 +237,24 @@ export default function OnboardingPage() {
             else if (index === 2) stepLabel = t('measurements.title');
             else if (index === 3) stepLabel = t('child.title');
             else if (index === 4) stepLabel = t('complete.title').split('!')[0];
-            
+
+            // Only show label for active step on mobile
+            const showLabel = activeStep === index;
+
             return (
               <Step key={label}>
-                <StepLabel>{stepLabel}</StepLabel>
+                <StepLabel
+                  StepIconComponent={CustomStepIcon}
+                  sx={{
+                    '& .MuiStepLabel-label': {
+                      display: { xs: showLabel ? 'block' : 'none', sm: 'block' },
+                      mt: 1,
+                      fontSize: { xs: '0.75rem', sm: '0.875rem' },
+                    },
+                  }}
+                >
+                  {stepLabel}
+                </StepLabel>
               </Step>
             );
           })}

maternal-web/app/activities/page.tsx

@@ -1,276 +0,0 @@
-'use client';
-
-import { useState, useEffect, useCallback } from 'react';
-import {
-  Box,
-  Typography,
-  Paper,
-  List,
-  ListItem,
-  ListItemIcon,
-  ListItemText,
-  Chip,
-  CircularProgress,
-  Snackbar,
-  Alert,
-} from '@mui/material';
-import {
-  Restaurant,
-  Hotel,
-  BabyChangingStation,
-  MedicalServices,
-  EmojiEvents,
-  Note,
-} from '@mui/icons-material';
-import { AppShell } from '@/components/layouts/AppShell/AppShell';
-import { ProtectedRoute } from '@/components/common/ProtectedRoute';
-import { useAuth } from '@/lib/auth/AuthContext';
-import { childrenApi, Child } from '@/lib/api/children';
-import { trackingApi, Activity } from '@/lib/api/tracking';
-import { useLocalizedDate } from '@/hooks/useLocalizedDate';
-import { useRealTimeActivities } from '@/hooks/useWebSocket';
-
-const activityIcons: Record<string, any> = {
-  feeding: <Restaurant />,
-  sleep: <Hotel />,
-  diaper: <BabyChangingStation />,
-  medication: <MedicalServices />,
-  milestone: <EmojiEvents />,
-  note: <Note />,
-};
-
-const activityColors: Record<string, string> = {
-  feeding: '#FFB6C1',
-  sleep: '#B6D7FF',
-  diaper: '#FFE4B5',
-  medication: '#FFB8B8',
-  milestone: '#FFD700',
-  note: '#E0E0E0',
-};
-
-export default function ActivitiesPage() {
-  const { user } = useAuth();
-  const { format } = useLocalizedDate();
-  const [children, setChildren] = useState<Child[]>([]);
-  const [selectedChild, setSelectedChild] = useState<Child | null>(null);
-  const [activities, setActivities] = useState<Activity[]>([]);
-  const [loading, setLoading] = useState(true);
-  const [notification, setNotification] = useState<string | null>(null);
-
-  const familyId = user?.families?.[0]?.familyId;
-
-  // Real-time activity handlers
-  const handleActivityCreated = useCallback((activity: Activity) => {
-    console.log('[ActivitiesPage] Real-time activity created:', activity);
-    setActivities((prev) => [activity, ...prev]);
-    setNotification('New activity added by family member');
-  }, []);
-
-  const handleActivityUpdated = useCallback((activity: Activity) => {
-    console.log('[ActivitiesPage] Real-time activity updated:', activity);
-    setActivities((prev) =>
-      prev.map((a) => (a.id === activity.id ? activity : a))
-    );
-    setNotification('Activity updated by family member');
-  }, []);
-
-  const handleActivityDeleted = useCallback((data: { activityId: string }) => {
-    console.log('[ActivitiesPage] Real-time activity deleted:', data);
-    setActivities((prev) => prev.filter((a) => a.id !== data.activityId));
-    setNotification('Activity deleted by family member');
-  }, []);
-
-  // Subscribe to real-time updates
-  useRealTimeActivities(
-    handleActivityCreated,
-    handleActivityUpdated,
-    handleActivityDeleted
-  );
-
-  useEffect(() => {
-    const loadData = async () => {
-      if (!familyId) {
-        setLoading(false);
-        return;
-      }
-
-      try {
-        const childrenData = await childrenApi.getChildren(familyId);
-        setChildren(childrenData);
-
-        if (childrenData.length > 0) {
-          const firstChild = childrenData[0];
-          setSelectedChild(firstChild);
-
-          // Load activities for the last 7 days
-          const endDate = format(new Date(), 'yyyy-MM-dd');
-          const startDate = format(
-            new Date(Date.now() - 7 * 24 * 60 * 60 * 1000),
-            'yyyy-MM-dd'
-          );
-
-          const activitiesData = await trackingApi.getActivities(
-            firstChild.id,
-            undefined,
-            startDate,
-            endDate
-          );
-          setActivities(activitiesData);
-        }
-      } catch (error) {
-        console.error('[ActivitiesPage] Failed to load data:', error);
-      } finally {
-        setLoading(false);
-      }
-    };
-
-    loadData();
-  }, [familyId]);
-
-  const formatActivityTime = (timestamp: string) => {
-    const date = new Date(timestamp);
-    const today = new Date();
-    const yesterday = new Date(today);
-    yesterday.setDate(yesterday.getDate() - 1);
-
-    const isToday = date.toDateString() === today.toDateString();
-    const isYesterday = date.toDateString() === yesterday.toDateString();
-
-    if (isToday) {
-      return `Today at ${format(date, 'h:mm a')}`;
-    } else if (isYesterday) {
-      return `Yesterday at ${format(date, 'h:mm a')}`;
-    } else {
-      return format(date, 'MMM d, h:mm a');
-    }
-  };
-
-  const getActivityDescription = (activity: Activity) => {
-    switch (activity.type) {
-      case 'feeding':
-        return activity.data?.amount
-          ? `${activity.data.amount} ${activity.data.unit || 'oz'}`
-          : 'Feeding';
-      case 'sleep':
-        if (activity.data?.endedAt) {
-          const duration = Math.floor(
-            (new Date(activity.data.endedAt).getTime() -
-              new Date(activity.timestamp).getTime()) /
-              60000
-          );
-          const hours = Math.floor(duration / 60);
-          const mins = duration % 60;
-          return hours > 0 ? `${hours}h ${mins}m` : `${mins}m`;
-        }
-        return 'Sleep';
-      case 'diaper':
-        return activity.data?.type || 'Diaper change';
-      case 'medication':
-        return activity.data?.name || 'Medication';
-      default:
-        return activity.type;
-    }
-  };
-
-  return (
-    <ProtectedRoute>
-      <AppShell>
-        <Box>
-          <Typography variant="h4" component="h1" gutterBottom fontWeight="600" sx={{ mb: 3 }}>
-            Recent Activities
-          </Typography>
-
-          {loading ? (
-            <Box sx={{ display: 'flex', justifyContent: 'center', py: 4 }}>
-              <CircularProgress />
-            </Box>
-          ) : activities.length === 0 ? (
-            <Paper sx={{ p: 4, textAlign: 'center' }}>
-              <Typography variant="body1" color="text.secondary">
-                No activities recorded yet
-              </Typography>
-            </Paper>
-          ) : (
-            <Paper>
-              <List>
-                {activities.map((activity, index) => (
-                  <ListItem
-                    key={activity.id}
-                    sx={{
-                      borderBottom:
-                        index < activities.length - 1 ? '1px solid' : 'none',
-                      borderColor: 'divider',
-                    }}
-                  >
-                    <ListItemIcon>
-                      <Box
-                        sx={{
-                          width: 48,
-                          height: 48,
-                          borderRadius: 2,
-                          bgcolor: activityColors[activity.type] || '#E0E0E0',
-                          display: 'flex',
-                          alignItems: 'center',
-                          justifyContent: 'center',
-                          color: 'white',
-                        }}
-                      >
-                        {activityIcons[activity.type] || <Note />}
-                      </Box>
-                    </ListItemIcon>
-                    <ListItemText
-                      primary={
-                        <Box sx={{ display: 'flex', alignItems: 'center', gap: 1 }}>
-                          <Typography variant="body1" fontWeight="500">
-                            {getActivityDescription(activity)}
-                          </Typography>
-                          <Chip
-                            label={activity.type}
-                            size="small"
-                            sx={{ textTransform: 'capitalize' }}
-                          />
-                        </Box>
-                      }
-                      secondary={
-                        <Box>
-                          <Typography variant="body2" color="text.secondary">
-                            {formatActivityTime(activity.timestamp)}
-                          </Typography>
-                          {activity.notes && (
-                            <Typography
-                              variant="body2"
-                              color="text.secondary"
-                              sx={{ mt: 0.5 }}
-                            >
-                              {activity.notes}
-                            </Typography>
-                          )}
-                        </Box>
-                      }
-                    />
-                  </ListItem>
-                ))}
-              </List>
-            </Paper>
-          )}
-        </Box>
-
-        {/* Real-time update notification */}
-        <Snackbar
-          open={!!notification}
-          autoHideDuration={3000}
-          onClose={() => setNotification(null)}
-          anchorOrigin={{ vertical: 'bottom', horizontal: 'center' }}
-        >
-          <Alert
-            onClose={() => setNotification(null)}
-            severity="info"
-            sx={{ width: '100%' }}
-          >
-            {notification}
-          </Alert>
-        </Snackbar>
-      </AppShell>
-    </ProtectedRoute>
-  );
-}

maternal-web/app/analytics/page.tsx

@@ -40,6 +40,7 @@ import PredictionsCard from '@/components/features/analytics/PredictionsCard';
 import GrowthSpurtAlert from '@/components/features/analytics/GrowthSpurtAlert';
 import WeeklyReportCard from '@/components/features/analytics/WeeklyReportCard';
 import MonthlyReportCard from '@/components/features/analytics/MonthlyReportCard';
+import { useAuth } from '@/lib/auth/AuthContext';
 
 interface TabPanelProps {
   children?: React.ReactNode;
@@ -65,6 +66,7 @@ function TabPanel(props: TabPanelProps) {
 
 export default function AnalyticsPage() {
   const theme = useTheme();
+  const { user } = useAuth();
   const [children, setChildren] = useState<Child[]>([]);
   const [selectedChildId, setSelectedChildId] = useState<string>('');
   const [tabValue, setTabValue] = useState(0);
@@ -74,27 +76,54 @@ export default function AnalyticsPage() {
   const [insightsLoading, setInsightsLoading] = useState(false);
   const [predictionsLoading, setPredictionsLoading] = useState(false);
   const [days, setDays] = useState<number>(7);
+  const [error, setError] = useState<string>('');
+
+  const familyId = user?.families?.[0]?.familyId;
 
   useEffect(() => {
-    loadChildren();
-  }, []);
-
-  useEffect(() => {
-    if (selectedChildId) {
-      loadInsights();
-      loadPredictions();
+    if (familyId) {
+      loadChildren();
     }
-  }, [selectedChildId, days]);
+  }, [familyId]);
+
+  useEffect(() => {
+    if (selectedChildId && children.length > 0) {
+      // Validate that selectedChildId belongs to current user's children
+      const childExists = children.some(child => child.id === selectedChildId);
+      if (childExists) {
+        loadInsights();
+        loadPredictions();
+      } else {
+        console.warn('[AnalyticsPage] Selected child not found in user\'s children, resetting');
+        setSelectedChildId(children[0].id);
+        setError('Selected child not found. Showing data for your first child.');
+      }
+    }
+  }, [selectedChildId, days, children]);
 
   const loadChildren = async () => {
+    if (!familyId) {
+      setLoading(false);
+      setError('No family found');
+      return;
+    }
+
     try {
-      const data = await childrenApi.getChildren();
+      console.log('[AnalyticsPage] Loading children for familyId:', familyId);
+      const data = await childrenApi.getChildren(familyId);
+      console.log('[AnalyticsPage] Loaded children:', data);
       setChildren(data);
-      if (data.length > 0 && !selectedChildId) {
-        setSelectedChildId(data[0].id);
+
+      if (data.length > 0) {
+        const existingChildStillValid = data.some(child => child.id === selectedChildId);
+        if (!selectedChildId || !existingChildStillValid) {
+          setSelectedChildId(data[0].id);
+        }
       }
+      setError('');
     } catch (error) {
-      console.error('Failed to load children:', error);
+      console.error('[AnalyticsPage] Failed to load children:', error);
+      setError('Failed to load children');
     } finally {
       setLoading(false);
     }

maternal-web/app/page.tsx

@@ -124,7 +124,7 @@ export default function HomePage() {
     { icon: <Hotel />, label: t('quickActions.sleep'), color: theme.palette.secondary.main, path: '/track/sleep' },
     { icon: <BabyChangingStation />, label: t('quickActions.diaper'), color: theme.palette.warning.main, path: '/track/diaper' },
     { icon: <MedicalServices />, label: t('quickActions.medical'), color: theme.palette.error.main, path: '/track/medicine' },
-    { icon: <Insights />, label: t('quickActions.activities'), color: theme.palette.success.main, path: '/activities' },
+    { icon: <Insights />, label: t('quickActions.activities'), color: theme.palette.success.main, path: '/track/activity' },
     { icon: <SmartToy />, label: t('quickActions.aiAssistant'), color: theme.palette.info.main, path: '/ai-assistant' },
   ];
 

maternal-web/components/features/analytics/InsightsDashboard.tsx

@@ -44,6 +44,7 @@ import { useLocalizedDate } from '@/hooks/useLocalizedDate';
 import { useTranslation } from '@/hooks/useTranslation';
 import { useFormatting } from '@/hooks/useFormatting';
 import { BarChart, Bar, LineChart, Line, PieChart, Pie, Cell, XAxis, YAxis, CartesianGrid, Tooltip, Legend, ResponsiveContainer } from 'recharts';
+import { useAuth } from '@/lib/auth/AuthContext';
 
 type DateRange = '7days' | '30days' | '3months';
 
@@ -100,6 +101,7 @@ const getActivityColor = (type: ActivityType) => {
 
 export const InsightsDashboard: React.FC = () => {
   const router = useRouter();
+  const { user } = useAuth();
   const { format, formatDistanceToNow } = useLocalizedDate();
   const { t } = useTranslation('insights');
   const { formatNumber } = useFormatting();
@@ -110,30 +112,55 @@ export const InsightsDashboard: React.FC = () => {
   const [loading, setLoading] = useState(true);
   const [error, setError] = useState<string | null>(null);
 
+  const familyId = user?.families?.[0]?.familyId;
+
   // Fetch children on mount
   useEffect(() => {
     const fetchChildren = async () => {
+      if (!familyId) {
+        setError('No family found');
+        return;
+      }
+
       try {
-        const childrenData = await childrenApi.getChildren();
+        console.log('[InsightsDashboard] Loading children for familyId:', familyId);
+        const childrenData = await childrenApi.getChildren(familyId);
+        console.log('[InsightsDashboard] Loaded children:', childrenData);
         setChildren(childrenData);
+
         if (childrenData.length > 0) {
-          setSelectedChild(childrenData[0].id);
+          // Validate selected child or pick first one
+          const validChild = childrenData.find(c => c.id === selectedChild);
+          if (!validChild) {
+            setSelectedChild(childrenData[0].id);
+          }
         }
       } catch (err: any) {
+        console.error('[InsightsDashboard] Failed to load children:', err);
         setError(err.response?.data?.message || t('errors.loadChildren'));
       }
     };
     fetchChildren();
-  }, []);
+  }, [familyId]);
 
   // Fetch activities when child or date range changes
   useEffect(() => {
-    if (!selectedChild) return;
+    if (!selectedChild || children.length === 0) return;
+
+    // Validate that selectedChild belongs to current user's children
+    const childExists = children.some(child => child.id === selectedChild);
+    if (!childExists) {
+      console.warn('[InsightsDashboard] Selected child not found in user\'s children, resetting');
+      setSelectedChild(children[0].id);
+      setError('Selected child not found. Showing data for your first child.');
+      return;
+    }
 
     const fetchActivities = async () => {
       setLoading(true);
       setError(null);
       try {
+        console.log('[InsightsDashboard] Fetching activities for child:', selectedChild);
         const days = dateRange === '7days' ? 7 : dateRange === '30days' ? 30 : 90;
         const endDate = endOfDay(new Date());
         const startDate = startOfDay(subDays(new Date(), days - 1));
@@ -144,8 +171,10 @@ export const InsightsDashboard: React.FC = () => {
           startDate.toISOString(),
           endDate.toISOString()
         );
+        console.log('[InsightsDashboard] Fetched activities:', activitiesData.length);
         setActivities(activitiesData);
       } catch (err: any) {
+        console.error('[InsightsDashboard] Failed to load activities:', err);
         setError(err.response?.data?.message || t('errors.loadActivities'));
       } finally {
         setLoading(false);
@@ -153,7 +182,7 @@ export const InsightsDashboard: React.FC = () => {
     };
 
     fetchActivities();
-  }, [selectedChild, dateRange]);
+  }, [selectedChild, dateRange, children]);
 
   // Calculate statistics
   const calculateStats = () => {

maternal-web/components/features/analytics/UnifiedInsightsDashboard.tsx

@@ -21,6 +21,7 @@ import { InsightsDashboard } from './InsightsDashboard';
 import PredictionsCard from './PredictionsCard';
 import GrowthSpurtAlert from './GrowthSpurtAlert';
 import { motion } from 'framer-motion';
+import { useAuth } from '@/lib/auth/AuthContext';
 
 interface TabPanelProps {
   children?: React.ReactNode;
@@ -45,6 +46,7 @@ function TabPanel(props: TabPanelProps) {
 }
 
 export function UnifiedInsightsDashboard() {
+  const { user } = useAuth();
   const [children, setChildren] = useState<Child[]>([]);
   const [selectedChildId, setSelectedChildId] = useState<string>('');
   const [tabValue, setTabValue] = useState(0);
@@ -54,27 +56,56 @@ export function UnifiedInsightsDashboard() {
   const [insightsLoading, setInsightsLoading] = useState(false);
   const [predictionsLoading, setPredictionsLoading] = useState(false);
   const [days, setDays] = useState<number>(7);
+  const [error, setError] = useState<string>('');
+
+  const familyId = user?.families?.[0]?.familyId;
 
   useEffect(() => {
-    loadChildren();
-  }, []);
-
-  useEffect(() => {
-    if (selectedChildId) {
-      loadInsights();
-      loadPredictions();
+    if (familyId) {
+      loadChildren();
     }
-  }, [selectedChildId, days]);
+  }, [familyId]);
+
+  useEffect(() => {
+    if (selectedChildId && children.length > 0) {
+      // Validate that selectedChildId belongs to current user's children
+      const childExists = children.some(child => child.id === selectedChildId);
+      if (childExists) {
+        loadInsights();
+        loadPredictions();
+      } else {
+        // Invalid child ID - reset to first child
+        console.warn('[UnifiedInsightsDashboard] Selected child not found in user\'s children, resetting');
+        setSelectedChildId(children[0].id);
+        setError('Selected child not found. Showing data for your first child.');
+      }
+    }
+  }, [selectedChildId, days, children]);
 
   const loadChildren = async () => {
+    if (!familyId) {
+      setLoading(false);
+      setError('No family found');
+      return;
+    }
+
     try {
-      const data = await childrenApi.getChildren();
+      console.log('[UnifiedInsightsDashboard] Loading children for familyId:', familyId);
+      const data = await childrenApi.getChildren(familyId);
+      console.log('[UnifiedInsightsDashboard] Loaded children:', data);
       setChildren(data);
-      if (data.length > 0 && !selectedChildId) {
-        setSelectedChildId(data[0].id);
+
+      // Only set selectedChildId if we don't have one or if it's not in the new list
+      if (data.length > 0) {
+        const existingChildStillValid = data.some(child => child.id === selectedChildId);
+        if (!selectedChildId || !existingChildStillValid) {
+          setSelectedChildId(data[0].id);
+        }
       }
+      setError('');
     } catch (error) {
-      console.error('Failed to load children:', error);
+      console.error('[UnifiedInsightsDashboard] Failed to load children:', error);
+      setError('Failed to load children');
     } finally {
       setLoading(false);
     }
@@ -141,6 +172,13 @@ export function UnifiedInsightsDashboard() {
           </Typography>
         </Box>
 
+        {/* Error Alert */}
+        {error && (
+          <Alert severity="warning" sx={{ mb: 3 }} onClose={() => setError('')}>
+            {error}
+          </Alert>
+        )}
+
         {/* Child Selector */}
         {children.length > 1 && (
           <Box sx={{ mb: 3 }}>

maternal-web/components/layouts/AppShell/AppShell.tsx

@@ -19,10 +19,11 @@ import { TabBar } from '../TabBar/TabBar';
 import { useMediaQuery } from '@/hooks/useMediaQuery';
 import { ReactNode } from 'react';
 import { useWebSocket } from '@/hooks/useWebSocket';
-import { Wifi, WifiOff, People, AccountCircle, Settings, ChildCare, Group, Logout, Gavel } from '@mui/icons-material';
+import { Wifi, WifiOff, People, AccountCircle, Settings, ChildCare, Group, Logout, Gavel, Favorite } from '@mui/icons-material';
 import { useTranslation } from '@/hooks/useTranslation';
 import { useRouter } from 'next/navigation';
 import { useAuth } from '@/lib/auth/AuthContext';
+import Link from 'next/link';
 
 interface AppShellProps {
   children: ReactNode;
@@ -93,7 +94,7 @@ export const AppShell = ({ children }: AppShellProps) => {
         }}
       >
         {/* Left Side - Family Members Online Indicator */}
-        <Box>
+        <Box sx={{ width: 80, display: 'flex', justifyContent: 'flex-start' }}>
           {isConnected && presence.count > 1 && (
             <Tooltip title={t('connection.familyMembersOnline', { count: presence.count })}>
               <Chip
@@ -109,7 +110,47 @@ export const AppShell = ({ children }: AppShellProps) => {
           )}
         </Box>
 
+        {/* Center - Logo */}
+        <Box
+          component={Link}
+          href="/"
+          sx={{
+            display: 'flex',
+            alignItems: 'center',
+            gap: 1,
+            textDecoration: 'none',
+            '&:hover': {
+              opacity: 0.8,
+            },
+            cursor: 'pointer',
+          }}
+        >
+          <Box
+            component="img"
+            src="/icon-192x192.png"
+            alt="ParentFlow logo"
+            sx={{
+              width: 32,
+              height: 32,
+              borderRadius: 1,
+            }}
+          />
+          <Box
+            component="span"
+            sx={{
+              fontWeight: 700,
+              fontSize: { xs: '0.95rem', sm: '1.1rem' },
+              background: (theme) => `linear-gradient(135deg, ${theme.palette.primary.main} 0%, ${theme.palette.secondary.main} 100%)`,
+              WebkitBackgroundClip: 'text',
+              WebkitTextFillColor: 'transparent',
+            }}
+          >
+            ParentFlow
+          </Box>
+        </Box>
+
         {/* Right Side - User Menu Button with Status Indicator */}
+        <Box sx={{ width: 80, display: 'flex', justifyContent: 'flex-end' }}>
         <Tooltip title={isConnected ? t('connection.syncActive') : t('connection.syncDisconnected')}>
           <IconButton
             onClick={handleMenuOpen}
@@ -207,6 +248,7 @@ export const AppShell = ({ children }: AppShellProps) => {
             <ListItemText>{t('navigation.logout')}</ListItemText>
           </MenuItem>
         </Menu>
+        </Box>
       </Box>
 
       <Container