fix: merge conflicts

services/frontend/src/App.tsx

@@ -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>

services/frontend/src/pages/CompetitionPreview/index.tsx

@@ -1,16 +1,29 @@
+
 import { useState } from "react";
-import { useParams, Link } from "react-router-dom";
+import { useParams, Link, useNavigate } from "react-router-dom";
 import { Button } from "@/components/ui/button";
 import { ArrowLeft } from "lucide-react";
 import { Competition } from "@/shared/types";
-import { mockCompetitions } from "@/shared/mocks/mocks";
+import { mockCompetitions, mockTasks } from "@/shared/mocks/mocks";
 
 const CompetitionPage = () => {
   const { id } = useParams<{ id: string }>();
+  const navigate = useNavigate();
   const [competition] = useState<Competition>(
     mockCompetitions.find((comp) => comp.id === id)!,
   );
 
+  const handleContinue = () => {
+    if (competition?.id) {      
+      if (mockTasks && mockTasks.length > 0) {
+        const firstTaskId = mockTasks[0].id;
+        navigate(`/competition/${competition.id}/tasks/${firstTaskId}`);
+      } else {
+        navigate(`/competition/${competition.id}/tasks`);
+      }
+    }
+  };
+
   return (
     <div className="flex flex-col gap-4">
       <Link
@@ -42,7 +55,7 @@ const CompetitionPage = () => {
             </div>
           </div>
           <div className="w-96 *:w-full">
-            <Button>Продолжить</Button>
+            <Button onClick={handleContinue}>Продолжить</Button>
           </div>
         </div>
       </div>

services/frontend/src/pages/CompetitionPreviewPage/index.tsx

@@ -1,106 +0,0 @@
-import { useEffect, useState } from "react";
-import { useParams, useNavigate } from "react-router-dom";
-import Navbar from "@/widgets/Navbar";
-import { Button } from "@/components/ui/button";
-import { ArrowLeft } from "lucide-react";
-import { Competition } from "@/shared/types";
-import { mockCompetitions, mockTasks } from "@/shared/mocks/mocks";
-
-const CompetitionPreview = () => {
-  const { id } = useParams<{ id: string }>();
-  const navigate = useNavigate();
-  const [competition, setCompetition] = useState<Competition | null>(null);
-  const [isLoading, setIsLoading] = useState(true);
-
-  useEffect(() => {
-    const fetchCompetition = async () => {
-      try {
-        setTimeout(() => {
-          const found = mockCompetitions.find((comp) => comp.id === id);
-          setCompetition(found || null);
-          setIsLoading(false);
-        }, 500);
-      } catch (error) {
-        console.error("Error fetching competition:", error);
-        setIsLoading(false);
-      }
-    };
-
-    fetchCompetition();
-  }, [id]);
-
-  const handleBack = () => {
-    navigate(-1);
-  };
-
-  const handleContinue = () => {
-    if (competition?.id) {      
-      if (mockTasks && mockTasks.length > 0) {
-        const firstTaskId = mockTasks[0].id;
-        navigate(`/competition/${competition.id}/tasks/${firstTaskId}`);
-      } else {
-        navigate(`/competition/${competition.id}/tasks`);
-      }
-    }
-  };
-
-  return (
-    <>
-      <Navbar />
-      <div className="container mx-auto mt-16 px-4 py-8">
-        <button
-          onClick={handleBack}
-          className="font-hse-sans mb-8 flex items-center text-gray-600"
-        >
-          <ArrowLeft size={16} className="mr-2" />
-          Назад к соревнованиям
-        </button>
-
-        {isLoading ? (
-          <div className="flex h-64 items-center justify-center">
-            <p className="font-hse-sans text-gray-500">Загрузка...</p>
-          </div>
-        ) : competition ? (
-          <div className="mx-auto max-w-5xl overflow-hidden rounded-lg bg-white shadow-lg">
-            <div className="h-80 w-full overflow-hidden">
-              <img
-                src={competition.imageUrl}
-                alt={competition.name}
-                className="h-full w-full object-cover"
-              />
-            </div>
-
-            <div className="p-8">
-              <div className="mb-8 flex items-center justify-between">
-                <h1 className="font-hse-sans mr-6 flex-1 text-3xl font-semibold">
-                  {competition.name}
-                </h1>
-                <Button
-                  className="font-hse-sans min-w-[180px] bg-yellow-400 px-12 text-base text-black hover:bg-yellow-500"
-                  onClick={handleContinue}
-                >
-                  Продолжить
-                </Button>
-              </div>
-
-              <div className="font-hse-sans text-lg leading-relaxed text-gray-700">
-                <p>{competition.description}</p>
-              </div>
-            </div>
-          </div>
-        ) : (
-          <div className="py-12 text-center">
-            <h2 className="font-hse-sans mb-2 text-2xl font-bold">
-              Соревнование не найдено
-            </h2>
-            <p className="font-hse-sans text-gray-600">
-              Запрошенное соревнование не существует или было удалено.
-            </p>
-          </div>
-        )}
-      </div>
-    </>
-  );
-};
-
-export default CompetitionPreview;

services/frontend/src/pages/CompetitionSession/index.tsx

@@ -1,164 +0,0 @@
-import { useState, useEffect } from "react";
-import { useParams, useNavigate } from "react-router-dom";
-import { Task } from "@/shared/types";
-import { getTaskBgColor, getTaskTextColor } from "./utils/utils";
-import { mockTasks } from "@/shared/mocks/mocks";
-import { Button } from "@/components/ui/button";
-import { Calendar } from "lucide-react";
-
-const CompetitionRunnerPage = () => {
-  const { id, taskId } = useParams<{ id: string; taskId?: string }>();
-  const navigate = useNavigate();
-  const [competitionTitle, setCompetitionTitle] = useState(
-    "Олимпиада DANO 2025. Индивидуальный этап",
-  );
-  const [tasks] = useState<Task[]>(mockTasks);
-  const [selectedTaskId, setSelectedTaskId] = useState<string | null>(
-    taskId || null,
-  );
-  const [answer, setAnswer] = useState("");
-
-  useEffect(() => {
-    if (taskId) {
-      setSelectedTaskId(taskId);
-    } else if (tasks.length > 0) {
-      navigate(`/competition/${id}/tasks/${tasks[0].id}`, { replace: true });
-    }
-  }, [taskId, tasks, id, navigate]);
-
-  const handleTaskClick = (taskId: string) => {
-    if (selectedTaskId !== taskId) {
-      setSelectedTaskId(taskId);
-      navigate(`/competition/${id}/tasks/${taskId}`);
-    }
-  };
-
-  const currentTask = tasks.find((t) => t.id === selectedTaskId);
-
-  const handleSubmit = () => {
-    console.log("Submitting answer:", answer);
-    // Submit logic here
-  };
-
-  const handleHistoryClick = () => {
-    console.log("View history");
-  };
-
-  return (
-<<<<<<< HEAD:services/frontend/src/pages/CompetitionRunnerPage/index.tsx
-    <>      
-      <div className="sticky top-0 z-10 bg-white">
-        <div className="max-w-6xl mx-auto px-4">
-          <div className="py-3 text-center">
-            <h1 className="text-lg font-semibold font-hse-sans">{competitionTitle}</h1>
-=======
-    <>
-      <div className="sticky top-16 z-10 border-b border-gray-200 bg-white shadow-sm">
-        <div className="container mx-auto px-4">
-          <div className="py-4">
-            <h1 className="font-hse-sans text-xl font-semibold">
-              {competitionTitle}
-            </h1>
->>>>>>> 58f493250150ba62ac4f325a0708b96eb88661e9:services/frontend/src/pages/CompetitionSession/index.tsx
-          </div>
-
-          <div className="no-scrollbar flex items-center justify-center gap-2 overflow-x-auto pb-3">
-            {tasks.map((task) => (
-              <div 
-                key={task.id}
-                className={`${getTaskBgColor(task.status)} ${getTaskTextColor(task.status)} font-hse-sans flex-shrink-0 cursor-pointer rounded-lg px-3 py-1.5 text-sm font-medium transition-all hover:brightness-95 ${selectedTaskId === task.id ? "scale-105 transform shadow-md" : ""}`}
-                onClick={() => handleTaskClick(task.id)}
-              >
-                {task.number}
-              </div>
-            ))}
-          </div>
-        </div>
-      </div>
-
-      <div className="min-h-screen bg-[#F8F8F8] pb-8">
-        <div className="mx-auto max-w-6xl px-4 py-6">
-          {currentTask ? (
-            <div className="font-hse-sans flex flex-col gap-6 md:flex-row">
-              {/* Left Container - Task Description */}
-              <div className="flex-1 rounded-lg bg-white p-6">
-                <h2 className="mb-4 text-xl font-medium">
-                  Задача {currentTask.number}
-                </h2>
-
-                <div className="prose max-w-none text-gray-700">
-                  <p>
-                    Рассмотрим последовательность чисел 2, 3, 5, 9, 17, 33, 65,
-                    129, ... Каждый член этой последовательности, начиная с
-                    третьего, равен сумме двух предыдущих членов.
-                  </p>
-                  <p className="mt-4">
-                    Найдите сумму первых 15 членов этой последовательности.
-                  </p>
-                  <p className="mt-4">В ответе укажите целое число.</p>
-                </div>
-              </div>
-
-              {/* Right Container - Solution Area */}
-              <div className="flex flex-col gap-4 md:w-[350px]">
-                {/* Solution Status Card */}
-                <div
-                  className={`${getTaskBgColor(currentTask.status)} relative rounded-lg p-4`}
-                >
-                  <div className="flex flex-col">
-                    <span
-                      className={`${getTaskTextColor(currentTask.status)} font-medium`}
-                    >
-                      Решение 12345
-                    </span>
-                    <span
-                      className={`${getTaskTextColor(currentTask.status)} mt-1`}
-                    >
-                      Зачтено 5/10 баллов
-                    </span>
-                  </div>
-                  <div className="absolute right-3 bottom-2 text-xs text-gray-600">
-                    1 марта, 08:41
-                  </div>
-                </div>
-
-                {/* Answer Input */}
-                <div className="rounded-lg bg-white p-4">
-                  <textarea
-                    className="font-hse-sans h-32 w-full rounded-md border border-gray-300 p-3 text-sm focus:ring-2 focus:ring-blue-500 focus:outline-none"
-                    placeholder="Введите ответ"
-                    value={answer}
-                    onChange={(e) => setAnswer(e.target.value)}
-                  />
-                </div>
-
-                {/* Action Buttons */}
-                <div className="flex justify-between gap-3">
-                  <Button
-                    variant="outline"
-                    className="font-hse-sans"
-                    onClick={handleHistoryClick}
-                  >
-                    История
-                  </Button>
-                  <Button
-                    className="font-hse-sans bg-yellow-400 text-black hover:bg-yellow-500"
-                    onClick={handleSubmit}
-                  >
-                    Отправить решение
-                  </Button>
-                </div>
-              </div>
-            </div>
-          ) : (
-            <div className="flex h-40 items-center justify-center rounded-lg bg-white">
-              <p className="font-hse-sans text-gray-500">Загрузка задания...</p>
-            </div>
-          )}
-        </div>
-      </div>
-    </>
-  );
-};
-
-export default CompetitionRunnerPage;

services/frontend/src/pages/CompetitionSesssion/index.tsx

@@ -4,9 +4,8 @@ import { Task } from "@/shared/types";
 import { getTaskBgColor, getTaskTextColor } from "./utils/utils";
 import { mockTasks } from "@/shared/mocks/mocks";
 import { Button } from "@/components/ui/button";
-import { Calendar } from "lucide-react";
 
-const CompetitionRunnerPage = () => {
+const CompetitionSessionPage = () => {
   const { id, taskId } = useParams<{ id: string; taskId?: string }>();
   const navigate = useNavigate();
   const [competitionTitle, setCompetitionTitle] = useState("Олимпиада DANO 2025. Индивидуальный этап");
@@ -147,4 +146,4 @@ const CompetitionRunnerPage = () => {
   );
 };
 
-export default CompetitionRunnerPage;
+export default CompetitionSessionPage;

services/frontend/src/pages/Competitions/components/CompetitionCard/index.tsx

@@ -1,7 +1,6 @@
 import { Competition, CompetitionStatus } from "@/shared/types";
 import { cn } from "@/shared/lib/utils";
 import { Card, CardContent } from "@/components/ui/card";
-import { useNavigate } from "react-router";
 
 interface CompetitionCardProps {
   competition: Competition;
@@ -12,11 +11,6 @@ export function CompetitionCard({
   competition,
   className,
 }: CompetitionCardProps) {
-  const navigate = useNavigate();
-
-  const handleClick = () => {
-    navigate(`/competition/${competition.id}`);
-  };
 
   return (
     <Card
@@ -24,7 +18,6 @@ export function CompetitionCard({
         "aspect-square h-full max-h-80 w-auto overflow-hidden",
         className,
       )}
-      onClick={handleClick}
     >
       <div className="relative h-full overflow-hidden">
         <img

services/frontend/src/pages/Competitions/modules/CompetitionGrid/index.tsx

@@ -10,7 +10,7 @@ export function CompetitionGrid({ competitions }: CompetitionGridProps) {
   return (
     <div className="grid grid-cols-3 gap-9">
       {competitions.map((competition) => (
-        <Link key={competition.id} to={`/competitions/${competition.id}`}>
+        <Link key={competition.id} to={`/competition/${competition.id}`}>
           <CompetitionCard competition={competition} />
         </Link>
       ))}