From 94672a6fdb3862c4e84c7a6e4ebd43a19b7c89f0 Mon Sep 17 00:00:00 2001
From: rngsurrounded <kircore970@gmail.com>
Date: Tue, 4 Mar 2025 05:32:29 +0900
Subject: [PATCH 1/4] fix

---
 .../CompetitionSession/components/TaskContent/index.tsx  | 9 +--------
 services/frontend/src/pages/CompetitionSession/index.tsx | 4 +++-
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/services/frontend/src/pages/CompetitionSession/components/TaskContent/index.tsx b/services/frontend/src/pages/CompetitionSession/components/TaskContent/index.tsx
index 634a7a0..7909578 100644
--- a/services/frontend/src/pages/CompetitionSession/components/TaskContent/index.tsx
+++ b/services/frontend/src/pages/CompetitionSession/components/TaskContent/index.tsx
@@ -25,14 +25,7 @@ const TaskContent: React.FC<TaskContentProps> = ({ task }) => {
 
   const attachments = attachmentsQuery.data || [];
 
-  const convertToMarkdown = (text: string): string => {
-    if (!text) return '';
-    
-    let markdown = text.replace(/\n/g, '\n\n');
-    return markdown;
-  };
 
-  const markdownText = convertToMarkdown(task.description);
 
   return (
     <div className="flex-1 bg-white rounded-lg p-6">
@@ -45,7 +38,7 @@ const TaskContent: React.FC<TaskContentProps> = ({ task }) => {
           remarkPlugins={[remarkMath, remarkGfm]}
           rehypePlugins={[rehypeKatex]}
         >
-          {markdownText}
+          {task.description}
         </ReactMarkdown>
       </div>
 
diff --git a/services/frontend/src/pages/CompetitionSession/index.tsx b/services/frontend/src/pages/CompetitionSession/index.tsx
index 4f92cae..9208099 100644
--- a/services/frontend/src/pages/CompetitionSession/index.tsx
+++ b/services/frontend/src/pages/CompetitionSession/index.tsx
@@ -69,7 +69,9 @@ const CompetitionSession = () => {
   });
 
   const competition = competitionQuery.data;
-  const tasks = tasksQuery.data || [];
+  const tasks = [...(tasksQuery.data || [])].sort((a, b) => {
+    return a.in_competition_position - b.in_competition_position;
+  });
   const results = resultsQuery.data || [];
   const isLoading = tasksQuery.isLoading || competitionQuery.isLoading;
   const error = tasksQuery.error || competitionQuery.error 

From 8de84c82d17ead7eea563c04aaa8c6cb2034f3c2 Mon Sep 17 00:00:00 2001
From: rngsurrounded <kircore970@gmail.com>
Date: Tue, 4 Mar 2025 05:35:51 +0900
Subject: [PATCH 2/4] fix

---
 services/frontend/src/components/layout/header.tsx     |  1 -
 .../Competitions/components/CompetitionCard/index.tsx  | 10 +++++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/services/frontend/src/components/layout/header.tsx b/services/frontend/src/components/layout/header.tsx
index 0563f7d..3bc9470 100644
--- a/services/frontend/src/components/layout/header.tsx
+++ b/services/frontend/src/components/layout/header.tsx
@@ -55,7 +55,6 @@ export const Header = () => {
               <div className="md:hidden">
                 <Link to="/docs">
                   <DropdownMenuItem>
-                    <FileText className="h-4 w-4 mr-2" />
                     Материалы
                   </DropdownMenuItem>
                 </Link>
diff --git a/services/frontend/src/pages/Competitions/components/CompetitionCard/index.tsx b/services/frontend/src/pages/Competitions/components/CompetitionCard/index.tsx
index ddbc19b..8f257b8 100644
--- a/services/frontend/src/pages/Competitions/components/CompetitionCard/index.tsx
+++ b/services/frontend/src/pages/Competitions/components/CompetitionCard/index.tsx
@@ -32,9 +32,9 @@ export function CompetitionCard({
 
   return (
     <Card
-      className={cn("aspect-square h-full w-auto overflow-hidden", className)}
+      className={cn("h-full w-full overflow-hidden flex flex-col", className)}
     >
-      <div className="relative h-full overflow-hidden">
+      <div className="h-48 overflow-hidden">
         <img
           src={competition.image_url ? competition.image_url : '/DANO.png'}
           alt={competition.title}
@@ -42,8 +42,8 @@ export function CompetitionCard({
         />
       </div>
 
-      <CardContent className="p-4">
-        <div className="flex flex-col gap-2.5">
+      <CardContent className="p-4 flex-1 flex flex-col">
+        <div className="flex flex-col gap-2.5 h-full">
           <div className="text-muted-foreground flex items-center gap-2 *:text-sm *:font-semibold">
             <span>
               {competition.type === CompetitionType.COMPETITIVE
@@ -67,7 +67,7 @@ export function CompetitionCard({
           </h3>
           
           {competition.type === CompetitionType.COMPETITIVE && (
-            <div className="text-gray-500 text-sm mt-1">
+            <div className="text-gray-500 text-sm mt-auto pt-2">
               {competition.start_date && (
                 <div className="flex items-center gap-1.5">
                   <Clock size={14} />

From edfa6f9ec822c6f4ea1caea92d42b45d951e7a1f Mon Sep 17 00:00:00 2001
From: rngsurrounded <kircore970@gmail.com>
Date: Tue, 4 Mar 2025 05:50:58 +0900
Subject: [PATCH 3/4] minor fixes

---
 services/frontend/src/pages/CompetitionSession/index.tsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/services/frontend/src/pages/CompetitionSession/index.tsx b/services/frontend/src/pages/CompetitionSession/index.tsx
index 9208099..15cf56f 100644
--- a/services/frontend/src/pages/CompetitionSession/index.tsx
+++ b/services/frontend/src/pages/CompetitionSession/index.tsx
@@ -60,7 +60,6 @@ const CompetitionSession = () => {
       
       setTimeout(() => {
         window.location.reload();
-        setIsReloading(false);
       }, 2500);
     },
     onError: (error) => {

From bd33559745287cf190ee84f41af78411bf4446d4 Mon Sep 17 00:00:00 2001
From: ITQ <itq.dev@ya.ru>
Date: Mon, 3 Mar 2025 23:53:40 +0300
Subject: [PATCH 4/4] <type>(scope): <description>

[body]

[footer(s)]
---
 services/backend/apps/task/tasks.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/backend/apps/task/tasks.py b/services/backend/apps/task/tasks.py
index b217cce..522bf3a 100644
--- a/services/backend/apps/task/tasks.py
+++ b/services/backend/apps/task/tasks.py
@@ -18,7 +18,7 @@ def analyze_data_task(self, submission_id):
         files = [
             {
                 "url": (
-                    f"{settings.MINIO_DEFAULT_CUSTOM_ENDPOINT_URL}/"
+                    f"{settings.MINIO_DEFAULT_CUSTOM_ENDPOINT_URL}"
                     f"{urlparse(attachment.file.url).path}"
                 ),
                 "bind_path": attachment.bind_at,