PROD.2025/DataRush
1
0
Fork 0
mirror of https://gitlab.com/megazordpobeda/DataRush.git synced 2026-05-23 17:57:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: merge conflicts

Browse Source
This commit is contained in:
rngsurrounded
2025-03-01 20:14:52 +09:00
parent b8e83c43f8
commit da843adfe3
8 changed files with 26 additions and 291 deletions
Download Patch File Download Diff File Expand all files Collapse all files
services/frontend/src/App.tsx
+7 -7
View File
@@ -1,19 +1,19 @@
import { Routes, Route } from "react-router";
import "./styles/globals.css";
import CompetitionsPage from "./pages/Competitions";
import CompetitionPage from "./pages/Competition";
import CompetitionRunnerPage from "./pages/CompetitionSession";
import Competitions from "./pages/Competitions";
import CompetitionPreview from './pages/CompetitionPreview'
import CompetitionSession from "./pages/CompetitionSesssion";
import { NavbarLayout } from "./widgets/navbar-layout";
const App = () => {
return (
<Routes>
<Route element={<NavbarLayout />}>
<Route path="/" element={<CompetitionsPage />} />
<Route path="/competitions/:id" element={<CompetitionPage />} />
<Route path="/" element={<Competitions />} />
<Route path="/competition/:id" element={<CompetitionPreview />} />
<Route
path="/competitions/:id/tasks/:taskId"
element={<CompetitionRunnerPage />}
path="/competition/:id/tasks/:taskId"
element={<CompetitionSession />}
/>
</Route>
</Routes>