From aaf5e412a94b800cca7d4dc5a1937a23939fc261 Mon Sep 17 00:00:00 2001 From: Nicolas Cantu Date: Tue, 16 Sep 2025 05:26:17 +0200 Subject: [PATCH] =?UTF-8?q?fix:=20R=C3=A9solution=20du=20conflit=20de=20me?= =?UTF-8?q?rge=20dans=20le=20router?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Suppression des marqueurs de conflit Git - Implémentation du router avec lazy loading - Ajout des imports manquants (lazy, Suspense, Material-UI) - Configuration des routes avec fallback de chargement Fixes: Erreur 500 sur src/router/index.tsx Fixes: Conflit de merge non résolu --- src/router/index.tsx | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/src/router/index.tsx b/src/router/index.tsx index 07eed8e..f6bbe6d 100644 --- a/src/router/index.tsx +++ b/src/router/index.tsx @@ -1,15 +1,7 @@ -import React from 'react' -import { Routes, Route } from 'react-router-dom' -import UploadView from '../views/UploadView' +import React, { lazy, Suspense } from 'react' +import { createBrowserRouter, RouterProvider } from 'react-router-dom' +import { Box, CircularProgress, Typography } from '@mui/material' -<<<<<<< HEAD -export const AppRouter: React.FC = () => { - return ( - - } /> - - ) -======= const UploadView = lazy(() => import('../views/UploadView')) const ExtractionView = lazy(() => import('../views/ExtractionView')) const ContexteView = lazy(() => import('../views/ContexteView')) @@ -31,5 +23,4 @@ const router = createBrowserRouter([ export const AppRouter = () => { return ->>>>>>> 43a0ad607071d3d73ef984c26fe63991aeef352e }