diff --git a/client/src/App.tsx b/client/src/App.tsx index 369439c..7819e29 100644 --- a/client/src/App.tsx +++ b/client/src/App.tsx @@ -19,6 +19,7 @@ import AdminEmailConfig from "./pages/AdminEmailConfig"; import AdminCalendrier from "./pages/AdminCalendrier"; import AdminRappels from "./pages/AdminRappels"; import AdminAnalytics from "./pages/AdminAnalytics"; +import AdminEtablissements from "./pages/AdminEtablissements"; import Inscription from "./pages/Inscription"; import Login from "./pages/Login"; @@ -42,6 +43,7 @@ function Router() { + {/* Final fallback route */} diff --git a/client/src/components/DashboardLayout.tsx b/client/src/components/DashboardLayout.tsx index 59e91ae..96cb844 100644 --- a/client/src/components/DashboardLayout.tsx +++ b/client/src/components/DashboardLayout.tsx @@ -21,7 +21,7 @@ import { } from "@/components/ui/sidebar"; import { APP_LOGO, APP_TITLE, getLoginUrl } from "@/const"; import { useIsMobile } from "@/hooks/useMobile"; -import { LayoutDashboard, LogOut, PanelLeft, Users, GraduationCap, Calendar, CalendarDays, Bell, BarChart3, UserCog, Mail, Settings, TrendingUp } from "lucide-react"; +import { LayoutDashboard, LogOut, PanelLeft, Users, GraduationCap, Calendar, CalendarDays, Bell, BarChart3, UserCog, Mail, Settings, TrendingUp, Building2 } from "lucide-react"; import { CSSProperties, useEffect, useRef, useState } from "react"; import { useLocation } from "wouter"; import { DashboardLayoutSkeleton } from './DashboardLayoutSkeleton'; @@ -34,6 +34,7 @@ const menuItems = [ { icon: CalendarDays, label: "Calendrier", path: "/admin/calendrier" }, { icon: Bell, label: "Rappels", path: "/admin/rappels" }, { icon: Users, label: "Apprenants", path: "/admin/apprenants" }, + { icon: Building2, label: "Établissements", path: "/admin/etablissements" }, { icon: UserCog, label: "Utilisateurs", path: "/admin/users" }, { icon: Mail, label: "Templates d'emails", path: "/admin/email-templates" }, { icon: Settings, label: "Configuration SMTP", path: "/admin/email-config" }, diff --git a/client/src/pages/AdminApprenants.tsx b/client/src/pages/AdminApprenants.tsx index 32461d4..e93d15b 100644 --- a/client/src/pages/AdminApprenants.tsx +++ b/client/src/pages/AdminApprenants.tsx @@ -284,6 +284,7 @@ export default function AdminApprenants() { Email Code établissement Fonction + Statut Actions @@ -304,6 +305,15 @@ export default function AdminApprenants() { apprenant.fonction === "chef_service" ? "Chef de service" : "Autre"} + + 0 + ? "bg-green-100 text-green-800" + : "bg-gray-100 text-gray-800" + }`}> + {apprenant.inscriptions && apprenant.inscriptions.length > 0 ? "Actif" : "Inactif"} + +