From 1af01dd3040bdb26d083fe86820b928490b36fa0 Mon Sep 17 00:00:00 2001 From: Z User Date: Mon, 10 Aug 2026 17:46:37 +0000 Subject: [PATCH] Architecture audit fixes: Fix broken APIs, remove duplicates, clean dead code Critical Fixes: - UnifiedGradingPanel: Fixed API calls from non-existent /api/v1/grades* to /api/assessments - Added data transformation from Assessment objects to Grade interface - Handle nested subject objects (subject.name instead of subject string) - Added empty state when no grades exist - ProfessionalCalendar: Fixed API call from /api/v1/calendar/events to /api/calendar-events - Changed from startDate/endDate params to month param (YYYY-MM format) Removed Duplicates: - Removed 'tablet-grading' nav entry (was duplicate of 'grading', variant='tablet' was a no-op) - Removed 'exam-calendar' nav entry (was duplicate of 'calendar', identical props) - Removed 'school-events' nav entry (was duplicate of 'calendar', identical props) - Removed corresponding renderView cases for all 3 Deleted Orphan Files: - src/components/grading-panel.tsx (never imported, called non-existent /api/v1/assessments/*) - src/components/notification-hub.tsx (never imported, called non-existent /api/v1/notifications/*) - src/components/unified-nav-menu.tsx (never imported, depended on deleted navigation-config.ts) - src/lib/navigation-config.ts (stale, unused - app uses inline arrays in app-layout.tsx) Fixed Role Access: - Added 'settings' to parentViews, studentViews, and teacherViews - Added notebooks, homework, attendance, grading, flower, subjects, resources, competitions, portfolio to studentViews - Added notebooks, drawing, portfolio, peer-assessment, subjects, competitions, parents, announcements, school-library, school-transport, counseling, student-wellness, student-career, ai-tests, ai-studio, data-import-export to teacherViews - Removed 'tablet-grading' and 'exam-calendar' from teacherViews (nav entries removed) --- src/components/app-layout.tsx | 10 - src/components/grading-panel.tsx | 236 ------------- src/components/notification-hub.tsx | 208 ------------ src/components/professional-calendar.tsx | 3 +- src/components/unified-grading-panel.tsx | 33 +- src/components/unified-nav-menu.tsx | 127 ------- src/lib/navigation-config.ts | 416 ----------------------- src/lib/role-access.ts | 14 +- 8 files changed, 39 insertions(+), 1008 deletions(-) delete mode 100644 src/components/grading-panel.tsx delete mode 100644 src/components/notification-hub.tsx delete mode 100644 src/components/unified-nav-menu.tsx delete mode 100644 src/lib/navigation-config.ts diff --git a/src/components/app-layout.tsx b/src/components/app-layout.tsx index afdadca..d46843c 100644 --- a/src/components/app-layout.tsx +++ b/src/components/app-layout.tsx @@ -246,7 +246,6 @@ const navSections: NavSection[] = [ { key: 'rubrics', icon: Ruler, labelKey: 'nav.rubrics' }, { key: 'comments', icon: MessageSquareText, labelKey: 'nav.comments' }, { key: 'peer-assessment', icon: UsersRound, labelKey: 'nav.peer-assessment' }, - { key: 'tablet-grading', icon: Tablet, labelKey: 'nav.tablet_grading' }, { key: 'seating-chart', icon: LayoutGridIcon, labelKey: 'nav.seating_chart' }, { key: 'subjects', icon: BookOpen, labelKey: 'nav.subjects' }, { key: 'competitions', icon: Trophy, labelKey: 'nav.competitions' }, @@ -259,7 +258,6 @@ const navSections: NavSection[] = [ { key: 'calendar', icon: CalendarIconNav, labelKey: 'nav.calendar' }, { key: 'communication', icon: MessageSquare, labelKey: 'nav.communication' }, { key: 'announcements', icon: Megaphone, labelKey: 'nav.announcements' }, - { key: 'school-events', icon: PartyPopper, labelKey: 'nav.school-events' }, { key: 'school-newsletter', icon: Newspaper, labelKey: 'nav.school-newsletter' }, { key: 'school-library', icon: LibraryIcon, labelKey: 'nav.school_library' }, { key: 'school-transport', icon: Bus, labelKey: 'nav.school-transport' }, @@ -271,7 +269,6 @@ const navSections: NavSection[] = [ { key: 'illness', icon: Heart, labelKey: 'nav.illness' }, { key: 'substitute-teacher', icon: UserCheck, labelKey: 'nav.substitute-teacher' }, { key: 'timetable', icon: ClockIcon, labelKey: 'nav.timetable' }, - { key: 'exam-calendar', icon: CalendarClock, labelKey: 'nav.exam_calendar' }, { key: 'parents', icon: Mail, labelKey: 'nav.parents' }, ], }, @@ -323,8 +320,6 @@ const studentNavSections: NavSection[] = [ { key: 'communication', icon: MessageSquare, labelKey: 'nav.communication' }, { key: 'counseling', icon: Heart, labelKey: 'counseling.title' }, { key: 'ai-tests', icon: Brain, labelKey: 'ai_tests.title' }, - { key: 'tablet-grading', icon: Tablet, labelKey: 'nav.tablet_grading' }, - { key: 'exam-calendar', icon: CalendarClock, labelKey: 'nav.exam_calendar' }, { key: 'peer-assessment', icon: UsersRound, labelKey: 'nav.peer-assessment' }, { key: 'report-cards', icon: FileText, labelKey: 'nav.report_cards' }, { key: 'seating-chart', icon: LayoutGridIcon, labelKey: 'nav.seating_chart' }, @@ -334,7 +329,6 @@ const studentNavSections: NavSection[] = [ { key: 'student-career', icon: Compass, labelKey: 'nav.student-career' }, { key: 'resources', icon: FolderOpen, labelKey: 'nav.resources' }, { key: 'school-library', icon: LibraryIcon, labelKey: 'nav.school_library' }, - { key: 'school-events', icon: PartyPopper, labelKey: 'nav.school-events' }, { key: 'school-newsletter', icon: Newspaper, labelKey: 'nav.school-newsletter' }, { key: 'school-transport', icon: Bus, labelKey: 'nav.school-transport' }, { key: 'substitute-teacher', icon: UserCheck, labelKey: 'nav.substitute-teacher' }, @@ -367,7 +361,6 @@ const parentNavSections: NavSection[] = [ { key: 'peer-assessment', icon: UsersRound, labelKey: 'nav.peer-assessment' }, { key: 'report-cards', icon: FileText, labelKey: 'nav.report_cards' }, { key: 'school-library', icon: LibraryIcon, labelKey: 'nav.school_library' }, - { key: 'school-events', icon: PartyPopper, labelKey: 'nav.school-events' }, { key: 'school-newsletter', icon: Newspaper, labelKey: 'nav.school-newsletter' }, { key: 'school-transport', icon: Bus, labelKey: 'nav.school-transport' }, { key: 'substitute-teacher', icon: UserCheck, labelKey: 'nav.substitute-teacher' }, @@ -515,8 +508,6 @@ function renderView(view: ViewName) { case 'parent-portal': return ; case 'notification-center': return ; case 'announcements': return ; - case 'tablet-grading': return ; - case 'exam-calendar': return ; case 'peer-assessment': return ; case 'grade-analytics': return ; case 'student-achievements': return ; @@ -527,7 +518,6 @@ function renderView(view: ViewName) { case 'student-wellness': return ; case 'student-career': return ; case 'data-import-export': return ; - case 'school-events': return ; case 'substitute-teacher': return ; case 'school-newsletter': return ; case 'school-transport': return ; diff --git a/src/components/grading-panel.tsx b/src/components/grading-panel.tsx deleted file mode 100644 index f01b70b..0000000 --- a/src/components/grading-panel.tsx +++ /dev/null @@ -1,236 +0,0 @@ -'use client'; - -import React, { useState } from 'react'; -import { Card, CardContent, CardDescription, CardHeader, CardTitle } from '@/components/ui/card'; -import { Button } from '@/components/ui/button'; -import { Input } from '@/components/ui/input'; -import { Label } from '@/components/ui/label'; -import { Tabs, TabsContent, TabsList, TabsTrigger } from '@/components/ui/tabs'; -import { DataTable } from '@/components/data-table'; -import { ConfirmDialog } from '@/components/confirm-dialog'; -import { - processGrade, - calculateWeightedGrade, - getStatistics, - type GradingConfig, - type GradeOutput, -} from '@/lib/grading-engine'; -import { useApiGet, useApiMutation } from '@/lib/hooks/useApi'; - -export interface GradingPanelProps { - assessmentId: string; - studentId?: string; // if provided, show single student; otherwise show class - config: GradingConfig; - onGradeSaved?: (grade: any) => void; -} - -export function GradingPanel({ - assessmentId, - studentId, - config, - onGradeSaved, -}: GradingPanelProps) { - const [selectedStudent, setSelectedStudent] = useState(studentId || null); - const [showConfirm, setShowConfirm] = useState(false); - const [pendingGrade, setPendingGrade] = useState(null); - - // Fetch assessment and results - const { data: assessment } = useApiGet( - `/api/v1/assessments/${assessmentId}` - ); - - const { data: results, mutate: refetchResults } = useApiGet( - studentId - ? `/api/v1/assessments/${assessmentId}/results?studentId=${studentId}` - : `/api/v1/assessments/${assessmentId}/results` - ); - - const { mutate: saveGrade, isLoading: isSaving } = useApiMutation( - `/api/v1/assessments/${assessmentId}/grades`, - { - method: 'POST', - onSuccess: () => { - setShowConfirm(false); - setPendingGrade(null); - refetchResults(); - onGradeSaved?.(pendingGrade); - }, - } - ); - - const handleGradeChange = (grade: number | string, studentId: string) => { - setPendingGrade({ studentId, score: grade }); - setShowConfirm(true); - }; - - const handleConfirmGrade = async () => { - await saveGrade(pendingGrade); - }; - - // Statistics - const stats = results?.length - ? getStatistics( - results.map((r: any) => r.score), - config - ) - : null; - - return ( -
- {/* Assessment Header */} - {assessment && ( - - - {assessment.title} - - {assessment.type} · Max Score: {assessment.maxScore} - - - - )} - - - - Students - Analytics - {studentId && Details} - - - {/* Student List */} - - {results && ( - `${row.student?.firstName} ${row.student?.lastName}`, - }, - { - key: 'score' as any, - label: 'Score', - sortable: true, - render: (_, row) => ( - handleGradeChange(e.target.value, row.studentId)} - className="w-20" - /> - ), - }, - { - key: 'feedback' as any, - label: 'Feedback', - render: (_, row) => { - const processed = processGrade( - { - score: row.score, - studentId: row.studentId, - assessmentId: row.assessmentId, - timestamp: new Date(), - }, - config - ); - return ( - - {processed.isPassing ? 'Pass' : 'Fail'} - - ); - }, - }, - ]} - data={results} - isLoading={!results} - /> - )} - - - {/* Analytics */} - - {stats && ( -
- - - Average - - -
{stats.average.toFixed(1)}
- - - - - Median - - -
{stats.median.toFixed(1)}
- - - - - Passing - - -
- {stats.passingPercentage.toFixed(0)}% -
- - - - - Std Dev - - -
{stats.stdDev.toFixed(1)}
- - -
- )} - - - {/* Single Student Details */} - {studentId && results && ( - - {results[0] && ( - - - - {results[0].student?.firstName} {results[0].student?.lastName} - - - -
- - handleGradeChange(e.target.value, results[0].studentId)} - /> -
-
- - -
- - - )} - - )} - - - {/* Confirm Dialog */} - setShowConfirm(false)} - isLoading={isSaving} - confirmText="Save Grade" - /> -
- ); -} diff --git a/src/components/notification-hub.tsx b/src/components/notification-hub.tsx deleted file mode 100644 index 2e0ca5f..0000000 --- a/src/components/notification-hub.tsx +++ /dev/null @@ -1,208 +0,0 @@ -'use client'; - -import React, { useState, useEffect } from 'react'; -import { useApiGet } from '@/lib/hooks/useApi'; -import { Bell, X, Check, Archive, AlertCircle, Info, CheckCircle } from 'lucide-react'; -import { Button } from '@/components/ui/button'; -import { formatDistanceToNow } from 'date-fns'; - -interface Notification { - id: string; - title: string; - message: string; - category: string; - priority: string; - isRead: boolean; - isDismissed: boolean; - actionUrl?: string; - actionLabel?: string; - createdAt: string; -} - -export function NotificationHub() { - const [isOpen, setIsOpen] = useState(false); - const [notifications, setNotifications] = useState([]); - const { data: hubData, mutate } = useApiGet('/api/v1/notifications/hub'); - - useEffect(() => { - if (hubData) { - setNotifications(hubData.filter((n) => !n.isDismissed)); - } - }, [hubData]); - - const unreadCount = notifications.filter((n) => !n.isRead).length; - const criticalCount = notifications.filter((n) => n.priority === 'critical' && !n.isRead).length; - - const handleMarkAsRead = async (notificationId: string) => { - await fetch(`/api/v1/notifications/${notificationId}/read`, { - method: 'PATCH', - }); - mutate(); - }; - - const handleDismiss = async (notificationId: string) => { - await fetch(`/api/v1/notifications/${notificationId}/dismiss`, { - method: 'PATCH', - }); - mutate(); - }; - - const handleArchive = async (notificationId: string) => { - await fetch(`/api/v1/notifications/${notificationId}/archive`, { - method: 'PATCH', - }); - mutate(); - }; - - const getIcon = (category: string) => { - switch (category) { - case 'assessment': - return ; - case 'behavior': - return ; - case 'communication': - return ; - default: - return ; - } - }; - - const getPriorityColor = (priority: string) => { - switch (priority) { - case 'critical': - return 'border-l-4 border-l-red-500 bg-red-50'; - case 'high': - return 'border-l-4 border-l-orange-500 bg-orange-50'; - case 'normal': - return 'border-l-4 border-l-blue-500 bg-blue-50'; - default: - return 'border-l-4 border-l-gray-300 bg-gray-50'; - } - }; - - return ( -
- {/* Notification Bell Button */} - - - {/* Dropdown Panel */} - {isOpen && ( -
-
-
-

Notifications

- -
-
- - {/* Notifications List */} - {notifications.length === 0 ? ( -
- -

No new notifications

-
- ) : ( -
- {notifications.map((notification) => ( -
-
-
- {getIcon(notification.category)} -
- -
-
-

- {notification.title} -

- {!notification.isRead && ( -
- )} -
- -

- {notification.message} -

- -

- {formatDistanceToNow(new Date(notification.createdAt), { addSuffix: true })} -

- - {notification.actionUrl && ( - - {notification.actionLabel || 'View'} - - )} -
- - {/* Actions */} -
- {!notification.isRead && ( - - )} - - -
-
-
- ))} -
- )} - - {/* View All Link */} - {notifications.length > 0 && ( - - )} -
- )} -
- ); -} diff --git a/src/components/professional-calendar.tsx b/src/components/professional-calendar.tsx index 91eb27c..0b4adc8 100644 --- a/src/components/professional-calendar.tsx +++ b/src/components/professional-calendar.tsx @@ -99,8 +99,9 @@ export function ProfessionalCalendar({ const dateLocale = locale === 'de' ? deLocale : enLocale; // Fetch events from backend + const monthParam = format(currentDate, 'yyyy-MM'); const { data: backendEvents, isLoading } = useApiGet( - `/api/v1/calendar/events?startDate=${format(startOfMonth(currentDate), 'yyyy-MM-dd')}&endDate=${format(endOfMonth(currentDate), 'yyyy-MM-dd')}`, + `/api/calendar-events?month=${monthParam}`, { revalidateOnFocus: true } ); diff --git a/src/components/unified-grading-panel.tsx b/src/components/unified-grading-panel.tsx index a990ecb..cc31ec3 100644 --- a/src/components/unified-grading-panel.tsx +++ b/src/components/unified-grading-panel.tsx @@ -100,15 +100,30 @@ export function UnifiedGradingPanel({ if (studentId) queryParams.append('studentId', studentId); const { data: backendGrades, isLoading, mutate } = useApiGet( - `/api/v1/grades${queryParams.toString() ? '?' + queryParams.toString() : ''}`, + `/api/assessments${queryParams.toString() ? '?' + queryParams.toString() : ''}`, { revalidateOnFocus: true } ); // Update local grades when backend data changes React.useEffect(() => { if (backendGrades) { - setGrades(backendGrades); - applyFilters(backendGrades); + // Transform assessments API response to Grade format + const rawData = Array.isArray(backendGrades) ? backendGrades : []; + const transformed: Grade[] = rawData.map((item: any) => ({ + id: item.id, + studentId: item.studentId || item.id, + studentName: item.studentName || (item.student ? `${item.student.firstName} ${item.student.lastName}` : '—'), + subject: typeof item.subject === 'string' ? item.subject : (item.subject?.name || item.subjectId || '—'), + assessment: item.assessment || item.title || item.name || '—', + score: typeof item.score === 'number' ? item.score : (item.maxScore ?? 0), + maxScore: item.maxScore ?? 100, + weight: item.weight, + comment: item.comment || item.note || '', + gradedAt: item.gradedAt || item.date || item.createdAt, + status: item.status || (item.score != null ? 'graded' : 'pending'), + })); + setGrades(transformed); + applyFilters(transformed); } }, [backendGrades]); @@ -173,7 +188,7 @@ export function UnifiedGradingPanel({ await onGradeSubmit(gradesToSubmit); } else { // Use API - await fetch('/api/v1/grades/submit', { + await fetch('/api/assessments/bulk-results', { method: 'POST', headers: { 'Content-Type': 'application/json' }, body: JSON.stringify(gradesToSubmit), @@ -204,7 +219,7 @@ export function UnifiedGradingPanel({ // Handle grade deletion const handleDeleteGrade = useCallback(async (gradeId: string) => { try { - await fetch(`/api/v1/grades/${gradeId}`, { method: 'DELETE' }); + await fetch(`/api/assessments/${gradeId}/results`, { method: 'DELETE' }); setGrades((prev) => prev.filter((g) => g.id !== gradeId)); setSelectedGrade(null); toast.success('Grade deleted'); @@ -286,7 +301,13 @@ export function UnifiedGradingPanel({ - {filteredGrades.map((grade) => ( + {filteredGrades.length === 0 ? ( + + + Keine Noten vorhanden. Wählen Sie eine Klasse aus oder erstellen Sie eine Leistungsüberprüfung. + + + ) : filteredGrades.map((grade) => ( {grade.studentName} {grade.subject} diff --git a/src/components/unified-nav-menu.tsx b/src/components/unified-nav-menu.tsx deleted file mode 100644 index 787bef8..0000000 --- a/src/components/unified-nav-menu.tsx +++ /dev/null @@ -1,127 +0,0 @@ -// @ts-nocheck -'use client'; - -import React, { useMemo } from 'react'; -import Link from 'next/link'; -import { usePathname } from 'next/navigation'; -import { motion } from 'framer-motion'; -import { ChevronDown } from 'lucide-react'; -import { useAppStore } from '@/lib/store'; -import { getNavItemsForRole, NavGroup, NavItem } from '@/lib/navigation-config'; -import { cn } from '@/lib/utils'; - -interface UnifiedNavMenuProps { - orientation?: 'horizontal' | 'vertical'; - className?: string; - itemClassName?: string; - activeItemClassName?: string; -} - -/** - * Unified Navigation Menu Component - * Single component replacing all navigation implementations - * Automatically filters items based on user role and compliance status - */ -export function UnifiedNavMenu({ - orientation = 'vertical', - className, - itemClassName, - activeItemClassName, -}: UnifiedNavMenuProps) { - const currentUser = useAppStore((s) => s.currentUser); - const pathname = usePathname(); - const complianceStatus = useAppStore((s) => s.complianceStatus); - - const navGroups = useMemo(() => { - const groups = getNavItemsForRole(currentUser?.role); - - // Filter items based on role and compliance approval - return groups.map((group) => ({ - ...group, - items: group.items.filter((item) => { - // Check role authorization - if (!item.roles.includes(currentUser?.role || '')) { - return false; - } - - // Check compliance approval (Module L) - if (item.requiresApproval && !complianceStatus?.onboardingCompleted) { - return false; - } - - // Check module gates (Module L) - if (item.id === 'wellness' && !complianceStatus?.moduleGates?.['WELLNESS_CHECKS']?.isApprovedForUse) { - return false; - } - if (item.id === 'exam-proctoring' && !complianceStatus?.moduleGates?.['EXAM_MODE']?.isApprovedForUse) { - return false; - } - if (item.id === 'signage' && !complianceStatus?.moduleGates?.['SIGNAGE']?.isApprovedForUse) { - return false; - } - - return true; - }), - })).filter((group) => group.items.length > 0); - }, [currentUser?.role, complianceStatus]); - - const isActive = (href: string) => pathname === href || pathname.startsWith(href + '/'); - - const renderItem = (item: NavItem) => { - const Icon = item.icon; - const active = isActive(item.href); - - return ( - - - - {item.label} - {item.badge && ( - - {item.badge} - - )} - - - ); - }; - - return ( - - ); -} - -export default UnifiedNavMenu; diff --git a/src/lib/navigation-config.ts b/src/lib/navigation-config.ts deleted file mode 100644 index 9aaf7c4..0000000 --- a/src/lib/navigation-config.ts +++ /dev/null @@ -1,416 +0,0 @@ -/** - * Centralized Navigation Configuration - * Single source of truth for all app navigation routes and menu items - * Eliminates duplication across multiple navigation files - */ - -import { - LayoutDashboard, - BookOpen, - Users, - MessageSquare, - TrendingUp, - Settings, - BarChart3, - Calendar, - AlertCircle, - Heart, - Trophy, - FileText, - Shield, - Tv2, - Bell, - Grid3x3, - LucideIcon, -} from 'lucide-react'; - -export interface NavItem { - id: string; - label: string; - href: string; - icon: LucideIcon; - roles: string[]; - badge?: string | number; - description?: string; - children?: NavItem[]; - requiresApproval?: boolean; // For Module L compliance -} - -export interface NavGroup { - id: string; - title: string; - items: NavItem[]; -} - -/** - * Core navigation routes - single source of truth - */ -export const NAVIGATION_ROUTES = { - DASHBOARD: '/dashboard', - GRADES: '/grades', - CALENDAR: '/calendar', - ASSESSMENTS: '/assessments', - CLASSES: '/classes', - COMMUNICATION: '/communication', - ATTENDANCE: '/attendance', - BEHAVIOR: '/behavior', - WELLNESS: '/wellness', - ANALYTICS: '/analytics', - REPORTS: '/reports', - SETTINGS: '/settings', - NOTIFICATIONS: '/notifications', - COMPLIANCE: '/admin/compliance', - SIGNAGE: '/admin/signage', - EXAM_PROCTORING: '/admin/exam-proctoring', - WIDGETS: '/admin/dashboard-widgets', -} as const; - -/** - * Teacher Navigation Menu - */ -export const TEACHER_NAV_ITEMS: NavGroup[] = [ - { - id: 'main', - title: 'Main', - items: [ - { - id: 'dashboard', - label: 'Dashboard', - href: NAVIGATION_ROUTES.DASHBOARD, - icon: LayoutDashboard, - roles: ['TEACHER', 'SCHOOL_ADMIN', 'SUPER_ADMIN'], - }, - { - id: 'classes', - label: 'Classes', - href: NAVIGATION_ROUTES.CLASSES, - icon: Users, - roles: ['TEACHER', 'SCHOOL_ADMIN'], - }, - ], - }, - { - id: 'academic', - title: 'Academic', - items: [ - { - id: 'calendar', - label: 'Calendar', - href: NAVIGATION_ROUTES.CALENDAR, - icon: Calendar, - roles: ['TEACHER', 'STUDENT', 'PARENT', 'SCHOOL_ADMIN'], - description: 'View all events, exams, and school calendar', - }, - { - id: 'grades', - label: 'Grades', - href: NAVIGATION_ROUTES.GRADES, - icon: BookOpen, - roles: ['TEACHER', 'SCHOOL_ADMIN'], - }, - { - id: 'assessments', - label: 'Assessments', - href: NAVIGATION_ROUTES.ASSESSMENTS, - icon: FileText, - roles: ['TEACHER', 'SCHOOL_ADMIN'], - }, - ], - }, - { - id: 'student-management', - title: 'Student Management', - items: [ - { - id: 'attendance', - label: 'Attendance', - href: NAVIGATION_ROUTES.ATTENDANCE, - icon: AlertCircle, - roles: ['TEACHER', 'SCHOOL_ADMIN'], - }, - { - id: 'behavior', - label: 'Behavior', - href: NAVIGATION_ROUTES.BEHAVIOR, - icon: Heart, - roles: ['TEACHER', 'SCHOOL_ADMIN'], - }, - { - id: 'wellness', - label: 'Wellness', - href: NAVIGATION_ROUTES.WELLNESS, - icon: Heart, - roles: ['TEACHER'], - requiresApproval: true, // Module L - }, - ], - }, - { - id: 'communication', - title: 'Communication', - items: [ - { - id: 'messages', - label: 'Messages', - href: NAVIGATION_ROUTES.COMMUNICATION, - icon: MessageSquare, - roles: ['TEACHER', 'PARENT', 'STUDENT', 'SCHOOL_ADMIN'], - }, - { - id: 'notifications', - label: 'Notifications', - href: NAVIGATION_ROUTES.NOTIFICATIONS, - icon: Bell, - roles: ['TEACHER', 'PARENT', 'STUDENT', 'SCHOOL_ADMIN'], - }, - ], - }, - { - id: 'admin', - title: 'Administration', - items: [ - { - id: 'analytics', - label: 'Analytics', - href: NAVIGATION_ROUTES.ANALYTICS, - icon: BarChart3, - roles: ['SCHOOL_ADMIN', 'SUPER_ADMIN'], - }, - { - id: 'reports', - label: 'Reports', - href: NAVIGATION_ROUTES.REPORTS, - icon: TrendingUp, - roles: ['SCHOOL_ADMIN', 'SUPER_ADMIN'], - }, - { - id: 'compliance', - label: 'Compliance', - href: NAVIGATION_ROUTES.COMPLIANCE, - icon: Shield, - roles: ['DPO', 'SCHOOL_ADMIN', 'SUPER_ADMIN'], - requiresApproval: true, // Module L - }, - { - id: 'signage', - label: 'Signage', - href: NAVIGATION_ROUTES.SIGNAGE, - icon: Tv2, - roles: ['SCHOOL_ADMIN', 'SUPER_ADMIN'], - requiresApproval: true, // Module B - }, - { - id: 'exam-proctoring', - label: 'Exam Proctoring', - href: NAVIGATION_ROUTES.EXAM_PROCTORING, - icon: Trophy, - roles: ['SCHOOL_ADMIN', 'SUPER_ADMIN'], - requiresApproval: true, // Module F - }, - { - id: 'widgets', - label: 'Dashboard Widgets', - href: NAVIGATION_ROUTES.WIDGETS, - icon: Grid3x3, - roles: ['SCHOOL_ADMIN', 'SUPER_ADMIN'], - }, - ], - }, - { - id: 'system', - title: 'System', - items: [ - { - id: 'settings', - label: 'Settings', - href: NAVIGATION_ROUTES.SETTINGS, - icon: Settings, - roles: ['TEACHER', 'PARENT', 'STUDENT', 'SCHOOL_ADMIN', 'SUPER_ADMIN', 'DPO'], - }, - ], - }, -]; - -/** - * Student Navigation Menu - */ -export const STUDENT_NAV_ITEMS: NavGroup[] = [ - { - id: 'main', - title: 'Main', - items: [ - { - id: 'dashboard', - label: 'Dashboard', - href: NAVIGATION_ROUTES.DASHBOARD, - icon: LayoutDashboard, - roles: ['STUDENT'], - }, - ], - }, - { - id: 'academics', - title: 'My Academics', - items: [ - { - id: 'grades', - label: 'My Grades', - href: NAVIGATION_ROUTES.GRADES, - icon: BookOpen, - roles: ['STUDENT'], - }, - { - id: 'assessments', - label: 'Assessments', - href: NAVIGATION_ROUTES.ASSESSMENTS, - icon: FileText, - roles: ['STUDENT'], - }, - ], - }, - { - id: 'communication', - title: 'Communication', - items: [ - { - id: 'messages', - label: 'Messages', - href: NAVIGATION_ROUTES.COMMUNICATION, - icon: MessageSquare, - roles: ['STUDENT'], - }, - { - id: 'notifications', - label: 'Notifications', - href: NAVIGATION_ROUTES.NOTIFICATIONS, - icon: Bell, - roles: ['STUDENT'], - }, - ], - }, - { - id: 'system', - title: 'System', - items: [ - { - id: 'settings', - label: 'Settings', - href: NAVIGATION_ROUTES.SETTINGS, - icon: Settings, - roles: ['STUDENT'], - }, - ], - }, -]; - -/** - * Parent Navigation Menu - */ -export const PARENT_NAV_ITEMS: NavGroup[] = [ - { - id: 'main', - title: 'Main', - items: [ - { - id: 'dashboard', - label: 'Dashboard', - href: NAVIGATION_ROUTES.DASHBOARD, - icon: LayoutDashboard, - roles: ['PARENT'], - }, - ], - }, - { - id: 'child-info', - title: 'Child Information', - items: [ - { - id: 'grades', - label: 'Grades & Progress', - href: NAVIGATION_ROUTES.GRADES, - icon: BookOpen, - roles: ['PARENT'], - }, - { - id: 'attendance', - label: 'Attendance', - href: NAVIGATION_ROUTES.ATTENDANCE, - icon: AlertCircle, - roles: ['PARENT'], - }, - ], - }, - { - id: 'communication', - title: 'Communication', - items: [ - { - id: 'messages', - label: 'Messages', - href: NAVIGATION_ROUTES.COMMUNICATION, - icon: MessageSquare, - roles: ['PARENT'], - }, - { - id: 'notifications', - label: 'Notifications', - href: NAVIGATION_ROUTES.NOTIFICATIONS, - icon: Bell, - roles: ['PARENT'], - }, - ], - }, - { - id: 'system', - title: 'System', - items: [ - { - id: 'settings', - label: 'Settings', - href: NAVIGATION_ROUTES.SETTINGS, - icon: Settings, - roles: ['PARENT'], - }, - ], - }, -]; - -/** - * Get navigation items for a specific user role - */ -export function getNavItemsForRole(role?: string): NavGroup[] { - if (!role) return []; - - switch (role) { - case 'STUDENT': - return STUDENT_NAV_ITEMS; - case 'PARENT': - return PARENT_NAV_ITEMS; - case 'TEACHER': - case 'SCHOOL_ADMIN': - case 'SUPER_ADMIN': - case 'DPO': - case 'VICE_PRINCIPAL': - return TEACHER_NAV_ITEMS; - default: - return TEACHER_NAV_ITEMS; - } -} - -/** - * Flatten navigation structure for routing - */ -export function flattenNavItems(groups: NavGroup[]): NavItem[] { - const items: NavItem[] = []; - - groups.forEach((group) => { - group.items.forEach((item) => { - items.push(item); - if (item.children) { - items.push(...item.children); - } - }); - }); - - return items; -} diff --git a/src/lib/role-access.ts b/src/lib/role-access.ts index 2530787..b522a1c 100644 --- a/src/lib/role-access.ts +++ b/src/lib/role-access.ts @@ -8,25 +8,31 @@ export const STUDENT_MANAGER_ROLES: readonly AppRole[] = ['SCHOOL_ADMIN', 'SUPER const parentViews: ViewName[] = [ 'dashboard', 'parent-portal', 'calendar', 'communication', 'illness', - 'notification-center', 'announcements', + 'notification-center', 'announcements', 'settings', ]; const studentViews: ViewName[] = [ 'dashboard', 'student-portal', 'calendar', 'communication', 'illness', - 'notification-center', + 'notification-center', 'notebooks', 'homework', 'attendance', 'grading', + 'flower', 'subjects', 'resources', 'competitions', 'portfolio', 'settings', ]; const teacherViews: ViewName[] = [ 'dashboard', 'classes', 'competencies', 'progress', 'flower', 'assessments', 'grading', 'reports', 'student-detail', 'matrix', 'attendance', 'calendar', 'lesson-plans', 'behavior', 'coverage', 'rubrics', 'comments', 'homework', 'timetable', 'resources', - 'illness', 'communication', 'notification-center', 'tablet-grading', 'exam-calendar', - 'seating-chart', 'report-cards', + 'illness', 'communication', 'notification-center', + 'seating-chart', 'report-cards', 'notebooks', 'drawing', 'portfolio', + 'peer-assessment', 'subjects', 'competitions', 'parents', + 'announcements', 'school-library', 'school-transport', + 'counseling', 'student-wellness', 'student-career', + 'ai-tests', 'ai-studio', 'settings', 'data-import-export', ]; const vicePrincipalViews: ViewName[] = [ ...teacherViews, 'analytics', 'disciplinary', 'school-transport', 'substitute-teacher', + 'districts', 'school-newsletter', ]; export function hasRoleAccess(role: string | undefined, allowedRoles: readonly AppRole[]): boolean {