Merge branch 'dev-comp' into dev
All checks were successful
Deploy Production Server / if_merged (pull_request) Successful in 10m20s

This commit is contained in:
2025-12-19 14:43:46 +01:00
342 changed files with 7551 additions and 141 deletions

View File

@@ -1,4 +1,4 @@
import {useEffect, useRef} from 'react'
import {lazy, Suspense, useEffect, useRef} from 'react'
import {Nav} from "./components/Nav.jsx";
import {createBrowserRouter, Outlet, RouterProvider, useLocation, useRouteError} from "react-router-dom";
import {Home} from "./pages/Homepage.jsx";
@@ -15,6 +15,7 @@ import {DemandeAff, DemandeAffOk} from "./pages/DemandeAff.jsx";
import {MePage} from "./pages/MePage.jsx";
import {CompetitionRoot, getCompetitionChildren} from "./pages/competition/CompetitionRoot.jsx";
import {FallingLines} from "react-loader-spinner";
import {getResultChildren, ResultRoot} from "./pages/result/ResultRoot.jsx";
const router = createBrowserRouter([
{
@@ -54,6 +55,16 @@ const router = createBrowserRouter([
element: <CompetitionRoot/>,
children: getCompetitionChildren()
},
{
path: 'result',
element: <ResultRoot/>,
children: getResultChildren()
},
{
path: 'competition-manager/*',
element: <GetCompetitionMangerLazy/>,
//children: getCompetitionManagerChildren()
},
{
path: 'me',
element: <MePage/>
@@ -66,6 +77,17 @@ const router = createBrowserRouter([
}
])
function GetCompetitionMangerLazy() {
const CMLazy = lazy(() => import('./pages/competition/editor/CompetitionManagerRoot.jsx'))
return <Suspense
fallback={<div>
<h1>Compétition manager</h1>
<p>Chargement...</p>
</div>}>
<CMLazy/>
</Suspense>
}
function PageError() {
const error = useRouteError()
return <div style={{textAlign: 'center'}}>