fix: Résolution du conflit de merge dans le router
- 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
This commit is contained in:
parent
d4b4bc8ee5
commit
aaf5e412a9
@ -1,15 +1,7 @@
|
|||||||
import React from 'react'
|
import React, { lazy, Suspense } from 'react'
|
||||||
import { Routes, Route } from 'react-router-dom'
|
import { createBrowserRouter, RouterProvider } from 'react-router-dom'
|
||||||
import UploadView from '../views/UploadView'
|
import { Box, CircularProgress, Typography } from '@mui/material'
|
||||||
|
|
||||||
<<<<<<< HEAD
|
|
||||||
export const AppRouter: React.FC = () => {
|
|
||||||
return (
|
|
||||||
<Routes>
|
|
||||||
<Route path="/" element={<UploadView />} />
|
|
||||||
</Routes>
|
|
||||||
)
|
|
||||||
=======
|
|
||||||
const UploadView = lazy(() => import('../views/UploadView'))
|
const UploadView = lazy(() => import('../views/UploadView'))
|
||||||
const ExtractionView = lazy(() => import('../views/ExtractionView'))
|
const ExtractionView = lazy(() => import('../views/ExtractionView'))
|
||||||
const ContexteView = lazy(() => import('../views/ContexteView'))
|
const ContexteView = lazy(() => import('../views/ContexteView'))
|
||||||
@ -31,5 +23,4 @@ const router = createBrowserRouter([
|
|||||||
|
|
||||||
export const AppRouter = () => {
|
export const AppRouter = () => {
|
||||||
return <RouterProvider router={router} />
|
return <RouterProvider router={router} />
|
||||||
>>>>>>> 43a0ad607071d3d73ef984c26fe63991aeef352e
|
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user