Files
maternal-app/maternal-web/app/activities/page.tsx
Andrei 7f9226b943
Some checks failed
CI/CD Pipeline / Lint and Test (push) Has been cancelled
CI/CD Pipeline / E2E Tests (push) Has been cancelled
CI/CD Pipeline / Build Application (push) Has been cancelled
feat: Complete Real-Time Sync implementation 🔄
BACKEND:
- Fix JWT authentication in FamiliesGateway
  * Configure JwtModule with ConfigService in FamiliesModule
  * Load JWT_SECRET from environment variables
  * Enable proper token verification for WebSocket connections
- Fix circular dependency in TrackingModule
  * Use forwardRef pattern for FamiliesGateway injection
  * Make FamiliesGateway optional in TrackingService
  * Emit WebSocket events when activities are created/updated/deleted

FRONTEND:
- Create WebSocket service (336 lines)
  * Socket.IO client with auto-reconnection (exponential backoff 1s → 30s)
  * Family room join/leave management
  * Presence tracking (online users per family)
  * Event handlers for activities, children, members
  * Connection recovery with auto-rejoin
- Create useWebSocket hook (187 lines)
  * Auto-connect on user authentication
  * Auto-join user's family room
  * Connection status tracking
  * Presence indicators
  * Hooks: useRealTimeActivities, useRealTimeChildren, useRealTimeFamilyMembers
- Expose access token in AuthContext
  * Add token property to AuthContextType interface
  * Load token from tokenStorage on initialization
  * Update token state on login/register/logout
  * Enable WebSocket authentication
- Integrate real-time sync across app
  * AppShell: Connection status indicator + online count badge
  * Activities page: Auto-refresh on family activity events
  * Home page: Auto-refresh daily summary on activity changes
  * Family page: Real-time member updates
- Fix accessibility issues
  * Remove deprecated legacyBehavior from Link components (Next.js 15)
  * Fix color contrast in EmailVerificationBanner (WCAG AA)
  * Add missing aria-labels to IconButtons
  * Fix React key warnings in family member list

DOCUMENTATION:
- Update implementation-gaps.md
  * Mark Real-Time Sync as COMPLETED 
  * Document WebSocket room management implementation
  * Document connection recovery and presence indicators
  * Update summary statistics (49 features completed)

FILES CREATED:
- maternal-web/hooks/useWebSocket.ts (187 lines)
- maternal-web/lib/websocket.ts (336 lines)

FILES MODIFIED (14):
Backend (4):
- families.gateway.ts (JWT verification fix)
- families.module.ts (JWT config with ConfigService)
- tracking.module.ts (forwardRef for FamiliesModule)
- tracking.service.ts (emit WebSocket events)

Frontend (9):
- lib/auth/AuthContext.tsx (expose access token)
- components/layouts/AppShell/AppShell.tsx (connection status + presence)
- app/activities/page.tsx (real-time activity updates)
- app/page.tsx (real-time daily summary refresh)
- app/family/page.tsx (accessibility fixes)
- app/(auth)/login/page.tsx (remove legacyBehavior)
- components/common/EmailVerificationBanner.tsx (color contrast fix)

Documentation (1):
- docs/implementation-gaps.md (updated status)

IMPACT:
 Real-time family collaboration achieved
 Activities sync instantly across all family members' devices
 Presence tracking shows who's online
 Connection recovery handles poor network conditions
 Accessibility improvements (WCAG AA compliance)

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

Co-Authored-By: Claude <noreply@anthropic.com>
2025-10-02 22:06:24 +00:00

276 lines
8.6 KiB
TypeScript

'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 { format } from 'date-fns';
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 [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>
);
}