fix: correction des refresh des protected routes [#36]

.vscode/launch.json

@@ -0,0 +1,13 @@
+
+{
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "name": "Next.js: debug client-side",
+      "type": "chrome",
+      "request": "launch",
+      "webRoot": "${workspaceFolder}/Front-End/",
+      "url": "http://localhost:3000",
+    },
+  ]
+}

.vscode/tasks.json

@@ -0,0 +1,13 @@
+{
+	"version": "2.0.0",
+	"tasks": [
+		{
+			"type": "npm",
+			"script": "dev",
+			"path": "Front-End",
+			"problemMatcher": [],
+			"label": "npm: dev - Front-End",
+			"detail": "next dev"
+		}
+	]
+}

Front-End/next.config.mjs

@@ -1,5 +1,8 @@
 import createNextIntlPlugin from 'next-intl/plugin';
-import  pkg  from "./package.json" assert { type: "json" };
+import { createRequire } from "module";
+const require = createRequire(import.meta.url);
+const pkg = require("./package.json")
+
 
 const withNextIntl = createNextIntlPlugin();
 

Front-End/src/app/[locale]/admin/layout.js

@@ -43,7 +43,12 @@ export default function Layout({
 }) {
   const t = useTranslations('sidebar');
   const [isSidebarOpen, setIsSidebarOpen] = useState(false);
+  const { data: session } = useSession();
+  const { selectedEstablishmentId, setSelectedEstablishmentId, profileRole, setProfileRole, establishments, user } = useEstablishment();
 
+
+
+  // Déplacer le reste du code ici...
   const sidebarItems = {
     "admin": { "id": "admin", "name": t('dashboard'), "url": FE_ADMIN_HOME_URL, "icon": LayoutDashboard },
     "subscriptions": { "id": "subscriptions", "name": t('subscriptions'), "url": FE_ADMIN_SUBSCRIPTIONS_URL, "icon": FileText },
@@ -56,8 +61,6 @@ export default function Layout({
 
   const [isLoading, setIsLoading] = useState(false);
   const [isPopupVisible, setIsPopupVisible] = useState(false);
-  const { data: session } = useSession();
-  const { selectedEstablishmentId, setSelectedEstablishmentId, profileRole, setProfileRole, establishments, user } = useEstablishment();
 
   const pathname = usePathname();
   const currentPage = pathname.split('/').pop();
@@ -109,8 +112,8 @@ export default function Layout({
 
   return (
     <ProtectedRoute requiredRight={RIGHTS.ADMIN}>
-      {!isLoading && (
       <div className="flex min-h-screen bg-gray-50 relative">
+        {/* Retirer la condition !isLoading car on gère déjà le chargement au début */}
         {/* Sidebar avec hauteur forcée */}
         <div
           className={`md:block ${isSidebarOpen ? 'block' : 'hidden'} fixed md:relative inset-y-0 left-0 z-30 h-full`}
@@ -177,7 +180,6 @@ export default function Layout({
           </div>
         </div>
       </div>
-      )}
       <Popup
         visible={isPopupVisible}
         message="Êtes-vous sûr(e) de vouloir vous déconnecter ?"

Front-End/src/app/[locale]/admin/page.js

@@ -9,6 +9,7 @@ import StatCard from '@/components/StatCard';
 import logger from '@/utils/logger';
 import { fetchRegisterForms } from '@/app/actions/subscriptionAction';
 import { fetchUpcomingEvents } from '@/app/actions/planningAction';
+import { getSession } from 'next-auth/react';
 
 
 // Composant EventCard pour afficher les événements
@@ -27,7 +28,7 @@ const EventCard = ({ title, date, description, type }) => (
 
 export default function DashboardPage() {
   const t = useTranslations('dashboard');
-  const [isLoading, setIsLoading] = useState(true);
+  const [isLoading, setIsLoading] = useState(false);
   const [totalStudents, setTotalStudents] = useState(0);
   const [pendingRegistration, setPendingRegistration] = useState(0);
   const [structureCapacity, setStructureCapacity] = useState(0);

Front-End/src/app/[locale]/users/login/page.js

@@ -39,16 +39,18 @@ export default function Page() {
 
     function handleFormLogin(formData) {
         setIsLoading(true);
+        setErrorMessage("");
 
         login({
             email: formData.get('login'),
             password: formData.get('password'),
-            role_type: selectedProfile // Utilisez le profil sélectionné
+            role_type: selectedProfile
         }).then(result => {
             logger.debug('Sign In Result', result);
-            setIsLoading(false);
+
             if (result.error) {
                 setErrorMessage(result.error);
+                setIsLoading(false);
             } else {
                 getSession().then(session => {
                     if (!session || !session.user) {
@@ -59,30 +61,30 @@ export default function Page() {
 
                     const roles = user.roles.filter(role => role.role_type === selectedProfile);
                     if (roles.length > 0) {
-                        // const establishment = roles[0].establishment;
-                        // localStorage.setItem('establishment_id', establishment);
-
                         // Redirection en fonction du rôle
+                        // Ne pas désactiver le loader avant la redirection
                         if (roles[0].role_type === 1) {
                             router.push(FE_ADMIN_SUBSCRIPTIONS_URL);
                         } else if (roles[0].role_type === 2) {
                             router.push(FE_PARENTS_HOME_URL);
                         } else {
-                            // Cas anormal
+                            setIsLoading(false);
+                            setErrorMessage('Type de rôle non géré');
                         }
                     } else {
-                        setErrorMessage('No roles found for the specified role type.');
+                        setIsLoading(false);
+                        setErrorMessage('Aucun rôle trouvé pour le profil sélectionné.');
                     }
                 }).catch(error => {
-                    logger.error('Error during session retrieval:', error);
+                    logger.error('Erreur lors de la récupération de la session:', error);
                     setIsLoading(false);
-                    setErrorMessage('An error occurred during session retrieval.');
+                    setErrorMessage('Une erreur est survenue lors de la récupération de la session.');
                 });
             }
         }).catch(error => {
-            logger.error('Error during sign in:', error);
+            logger.error('Erreur lors de la connexion:', error);
             setIsLoading(false);
-            setErrorMessage('An error occurred during sign in.');
+            setErrorMessage('Une erreur est survenue lors de la connexion.');
         });
     }