Merge remote-tracking branch 'origin/master'

services/backend/apps/task/models.py

@@ -3,6 +3,7 @@ from uuid import uuid4
 from django.db import models
 from django.db.models import Count, Q
 from tinymce.models import HTMLField
+from martor.models import MartorField
 
 from apps.competition.models import Competition
 from apps.core.models import BaseModel
@@ -24,7 +25,7 @@ class CompetitionTask(BaseModel):
     )
     competition = models.ForeignKey(Competition, on_delete=models.CASCADE)
     title = models.CharField(verbose_name="заголовок", max_length=50)
-    description = HTMLField(verbose_name="описание")
+    description = MartorField(verbose_name="описание")
     max_attempts = models.PositiveSmallIntegerField(null=True, blank=True)
     type = models.CharField(
         choices=CompetitionTaskType, max_length=8, verbose_name="тип проверки"

services/backend/config/settings.py

@@ -442,6 +442,7 @@ INSTALLED_APPS = [
     "ninja",
     "minio_storage",
     "tinymce",
+    "martor",
     # Internal apps
     "apps.core",
     "apps.user",
@@ -459,15 +460,49 @@ TINYMCE_DEFAULT_CONFIG = {
     "menubar": False,
     "plugins": "advlist,autolink,lists,link,image,charmap,print,preview,anchor,"
     "searchreplace,visualblocks,code,fullscreen,insertdatetime,media,table,paste,"
-    "code,help,wordcount",
+    "code,help,wordcount,markdown",
     "toolbar": "undo redo | formatselect | "
     "bold italic backcolor | alignleft aligncenter "
     "alignright alignjustify | bullist numlist outdent indent | "
     "removeformat | help",
     "skin": "oxide-dark",
     "content_css": "dark",
+    "textpattern_patterns": [
+        {"start": "*", "end": "*", "format": "italic"},
+        {"start": "**", "end": "**", "format": "bold"},
+        {"start": "#", "format": "h1"},
+        {"start": "##", "format": "h2"},
+        {"start": "###", "format": "h3"},
+        {"start": "####", "format": "h4"},
+        {"start": "#####", "format": "h5"},
+        {"start": "######", "format": "h6"},
+        {"start": "1. ", "cmd": "InsertOrderedList"},
+        {"start": "* ", "cmd": "InsertUnorderedList"},
+        {"start": "- ", "cmd": "InsertUnorderedList"}
+    ]
 }
 
+# martor
+
+MARTOR_THEME = 'bootstrap'
+
+MARTOR_ENABLE_CONFIGS = {
+    'emoji': 'true',        # to enable/disable emoji icons.
+    'imgur': 'true',        # to enable/disable imgur/custom uploader.
+    'mention': 'false',     # to enable/disable mention
+    'jquery': 'true',       # to include/revoke jquery (require for admin default django)
+    'living': 'false',      # to enable/disable live updates in preview
+    'spellcheck': 'false',  # to enable/disable spellcheck in form textareas
+    'hljs': 'true',         # to enable/disable hljs highlighting in preview
+}
+
+MARTOR_TOOLBAR_BUTTONS = [
+    'bold', 'italic', 'horizontal', 'heading', 'pre-code',
+    'blockquote', 'unordered-list', 'ordered-list',
+    'link', 'emoji',
+    'direct-mention', 'toggle-maximize', 'help'
+]
+
 # GUID
 
 DJANGO_GUID = {

services/backend/config/urls.py

@@ -14,6 +14,8 @@ admin.site.index_title = "DataRush"
 urlpatterns = [
     # tinymce
     path("tinymce/", include("tinymce.urls")),
+    # martor
+    path('martor/', include('martor.urls')),
     # Admin urls
     path("admin/", admin.site.urls),
     # API urls

services/backend/pyproject.toml

@@ -19,6 +19,7 @@ dependencies = [
  "django-tinymce>=4.1.0",
  "gunicorn>=23.0.0",
  "httpx>=0.28.1",
+ "martor>=1.6.45",
  "pillow>=11.1.0",
  "psycopg2-binary>=2.9.10",
  "pydantic>=2.10.5",

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

@@ -64,15 +64,13 @@ const CompetitionPage = () => {
       </Link>
 
       <div className="flex flex-col gap-6">
-        {competition.image_url && (
-          <div className="aspect-2 h-auto w-full overflow-hidden rounded-xl">
-            <img
-              src={competition.image_url}
-              alt={competition.title}
-              className="h-full w-full object-cover object-center"
-            />
-          </div>
-        )}
+        <div className="aspect-2 h-auto w-full overflow-hidden rounded-xl">
+          <img
+            src={competition.image_url ? competition.image_url : '/DANO.png'}
+            alt={competition.title}
+            className="h-full w-full object-cover object-center"
+          />
+        </div>
 
         <div className="flex flex-col-reverse gap-8 md:flex-row">
           <div className="flex flex-1 flex-col gap-5">
@@ -89,7 +87,7 @@ const CompetitionPage = () => {
               onClick={handleStart} 
               disabled={startMutation.isPending}
             >
-              {startMutation.isPending ? "Загрузка..." : "Начать"}
+              {startMutation.isPending ? "Загрузка..." : "Приступить к выполнению"}
             </Button>
           </div>
         </div>

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

@@ -1,6 +1,6 @@
 import React from 'react';
 import { Link } from 'react-router-dom';
-import { Task } from "@/shared/types";
+import { Task } from '@/shared/types/task';
 import { getTaskBgColor, getTaskTextColor } from '../../utils/utils';
 
 interface CompetitionHeaderProps {
@@ -28,12 +28,12 @@ const CompetitionHeader: React.FC<CompetitionHeaderProps> = ({
             <Link
               key={task.id}
               to={`/competition/${competitionId}/tasks/${task.id}`}
-              className={`${getTaskBgColor(task.status)} ${getTaskTextColor(task.status)} 
+              className={`text-[var(--color-task-text-uncleared)] bg-[var(--color-task-uncleared)]
                 rounded-lg px-3 py-1.5 font-medium text-sm font-hse-sans cursor-pointer 
                 transition-all hover:brightness-95 flex-shrink-0
                 `}
             >
-              {task.number}
+              {task.in_competition_position}
             </Link>
           ))}
         </div>

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

@@ -10,30 +10,6 @@ interface TaskContentProps {
 }
 
 const TaskContent: React.FC<TaskContentProps> = ({ task }) => {
-  const markdownContent = `
-## Задача на числовую последовательность
-
-Рассмотрим последовательность чисел: 
-\`2, 3, 5, 9, 17, 33, 65, 129, ...\`
-
-Каждый член этой последовательности, **начиная с третьего**, равен сумме двух предыдущих членов:
-- $a_1 = 2$
-- $a_2 = 3$
-- $a_n = a_{n-1} + a_{n-2}$ для всех $n ≥ 3$
-
-### Задание:
-Найдите сумму первых 15 членов этой последовательности.
-
-*Примечание:* Для решения задачи вам может быть полезно записать несколько первых членов последовательности:
-1. $a_1 = 2$
-2. $a_2 = 3$
-3. $a_3 = 3 + 2 = 5$
-4. $a_4 = 5 + 3 = 8$
-5. $a_5 = 8 + 5 = 13$
-
-**В ответе укажите целое число.**
-  `;
-
   return (
     <div className="flex-1 bg-white rounded-lg p-6">
       <h2 className="text-3xl font-semibold mb-6 font-hse-sans">
@@ -45,7 +21,7 @@ const TaskContent: React.FC<TaskContentProps> = ({ task }) => {
           remarkPlugins={[remarkMath]}
           rehypePlugins={[rehypeKatex]}
         >
-          {markdownContent}
+          {task.description}
         </ReactMarkdown>
       </div>
     </div>

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

@@ -1,45 +1,32 @@
-import { useState, useEffect } from "react";
+import { useState } from "react";
 import { useParams, Navigate } from "react-router-dom";
-import { Task, TaskStatus } from "@/shared/types";
-import { mockSolutions } from "@/shared/mocks/mocks"; // Keep mocks for solutions for now
+import { mockSolutions } from "@/shared/mocks/mocks";
 import CompetitionHeader from "./components/CompetitionHeader";
 import TaskContent from "./components/TaskContent";
 import TaskSolution from "./modules/TaskSolution";
 import { getCompetitionTasks } from "@/shared/api/session";
 import { Loader2 } from "lucide-react";
+import { useQuery } from "@tanstack/react-query";
 
 const CompetitionSession = () => {
   const { id, taskId } = useParams<{ id: string; taskId?: string }>();
-  const [tasks, setTasks] = useState<Task[]>([]);
   const [answer, setAnswer] = useState("");
-  const [loading, setLoading] = useState(true);
-  const [error, setError] = useState<string | null>(null);
-
   const competitionId = id || "";
 
-  useEffect(() => {
-    const fetchTasks = async () => {
-      try {
-        setLoading(true);
-        const fetchedTasks = await getCompetitionTasks(competitionId);
-        setTasks(fetchedTasks);
-        setError(null);
-      } catch (err) {
-        console.error("Failed to fetch tasks:", err);
-        setError("Не удалось загрузить задания. Пожалуйста, попробуйте позже.");
-      } finally {
-        setLoading(false);
-      }
-    };
+  const tasksQuery = useQuery({
+    queryKey: ["competitionTasks", competitionId],
+    queryFn: () => getCompetitionTasks(competitionId),
+    enabled: !!competitionId,
+    // refetchOnWindowFocus: false, 
+  });
 
-    if (competitionId) {
-      fetchTasks();
-    }
-  }, [competitionId]);
+  const tasks = tasksQuery.data || [];
+  const isLoading = tasksQuery.isLoading;
+  const error = tasksQuery.error ? "Не удалось загрузить задания. Пожалуйста, попробуйте позже." : null;
 
   const currentTask = tasks.find((t) => t.id === taskId) || null;
 
-  if (!taskId && tasks.length > 0 && !loading) {
+  if (!taskId && tasks.length > 0 && !isLoading) {
     return (
       <Navigate
         to={`/competition/${competitionId}/tasks/${tasks[0].id}`}
@@ -68,7 +55,7 @@ const CompetitionSession = () => {
 
       <main className="flex-1 bg-[#F8F8F8] pb-8">
         <div className="mx-auto max-w-6xl px-4 py-6">
-          {loading ? (
+          {isLoading ? (
             <div className="flex h-40 flex-col items-center justify-center rounded-lg bg-white">
               <Loader2 className="mb-2 h-8 w-8 animate-spin text-gray-400" />
               <p className="font-hse-sans text-gray-500">Загрузка заданий...</p>
@@ -82,7 +69,7 @@ const CompetitionSession = () => {
               <TaskContent task={currentTask} />
               <TaskSolution
                 task={currentTask}
-                solutions={mockSolutions} // Still using mock solutions
+                solutions={mockSolutions}
                 answer={answer}
                 setAnswer={setAnswer}
                 onSubmit={handleSubmit}
@@ -99,4 +86,4 @@ const CompetitionSession = () => {
   );
 };
 
-export default CompetitionSession;
+export default CompetitionSession;

services/frontend/src/shared/types/task.ts

@@ -2,7 +2,7 @@ export interface Task {
   id: string;
   title: string;
   description: string;
-  type: 'input' | 'file' | 'code';
+  type: TaskType;
   in_competition_position: number;
   points: number;
 }