Merge branch 'master' of gitlab.prodcontest.ru:team-15/project

img/postman_e2e.json

@@ -0,0 +1,768 @@
+{
+	"info": {
+		"_postman_id": "fd33ed4f-84b5-4045-b926-22d989876fb0",
+		"name": "Datarush tests",
+		"schema": "https://schema.getpostman.com/json/collection/v2.0.0/collection.json",
+		"_exporter_id": "29887339"
+	},
+	"item": [
+		{
+			"name": "User",
+			"item": [
+				{
+					"name": "Correct registration",
+					"event": [
+						{
+							"listen": "prerequest",
+							"script": {
+								"exec": [
+									"// Генерация случайных данных\r",
+									"const randomNamePrefix = `company_${Math.random().toString(36).substring(2, 8)}`;\r",
+									"const randomUsername = `${Math.random().toString(36).substring(3, 9)}`\r",
+									"const randomEmail = `${Math.random().toString(36).substring(2, 8)}@timka.test`;\r",
+									"const randomPassword = `${Math.random().toString(36).substring(2, 12)}!A1`;\r",
+									"\r",
+									"// Формирование тела запроса\r",
+									"const requestData = {\r",
+									"    username: randomUsername,\r",
+									"    email: randomEmail,\r",
+									"    password: randomPassword\r",
+									"};\r",
+									"\r",
+									"// Сохранение данных в переменные окружения\r",
+									"pm.environment.set(\"randomNamePrefix\", randomNamePrefix);\r",
+									"pm.environment.set(\"randomEmail\", randomEmail);\r",
+									"pm.environment.set(\"randomPassword\", randomPassword);\r",
+									"pm.environment.set(\"randomUsername\", randomUsername)\r",
+									"\r",
+									"// Сохранение JSON-объекта в переменную для дальнейшего использования\r",
+									"pm.environment.set(\"requestData\", JSON.stringify(requestData));\r",
+									"pm.environment.set(\"requestNameREGISTRATION\", JSON.stringify(randomNamePrefix));\r",
+									"pm.environment.set(\"requestEmailREGISTRATION\", JSON.stringify(randomEmail));\r",
+									"pm.environment.set(\"requestusernameREGISTRATION\", JSON.stringify(randomUsername))\r",
+									"pm.environment.set(\"requestPasswordREGISTRATION\", JSON.stringify(randomPassword));"
+								],
+								"type": "text/javascript",
+								"packages": {}
+							}
+						},
+						{
+							"listen": "test",
+							"script": {
+								"exec": [
+									"pm.test('Status code is 201', function () {\r",
+									"    pm.response.to.have.status(201);\r",
+									"});\r",
+									"\r",
+									"pm.test('Response has token', function () {\r",
+									"    const jsonData = pm.response.json();\r",
+									"    pm.expect(jsonData.token).to.be.a('string');\r",
+									"});"
+								],
+								"type": "text/javascript",
+								"packages": {}
+							}
+						}
+					],
+					"request": {
+						"method": "POST",
+						"header": [],
+						"body": {
+							"mode": "raw",
+							"raw": "{{requestData}}",
+							"options": {
+								"raw": {
+									"language": "json"
+								}
+							}
+						},
+						"url": "{{BASE_HOST}}/v1/sign-up"
+					},
+					"response": []
+				},
+				{
+					"name": "Correct sign in",
+					"event": [
+						{
+							"listen": "prerequest",
+							"script": {
+								"exec": [
+									"const email = pm.environment.get(\"randomEmail\")\r",
+									"const password = pm.environment.get(\"randomPassword\")\r",
+									"\r",
+									"const requestData = {\r",
+									"    email: email,\r",
+									"    password: password\r",
+									"}\r",
+									"pm.environment.set(\"requestData\", JSON.stringify(requestData));\r",
+									""
+								],
+								"type": "text/javascript",
+								"packages": {}
+							}
+						},
+						{
+							"listen": "test",
+							"script": {
+								"exec": [
+									"pm.test('Status code is 200', function () {\r",
+									"    pm.response.to.have.status(200);\r",
+									"});\r",
+									"\r",
+									"pm.test('Response has token', function () {\r",
+									"    const jsonData = pm.response.json();\r",
+									"    pm.expect(jsonData.token).to.be.a('string');\r",
+									"    pm.environment.set(\"token\", jsonData.token)\r",
+									"});"
+								],
+								"type": "text/javascript",
+								"packages": {}
+							}
+						}
+					],
+					"request": {
+						"method": "POST",
+						"header": [],
+						"body": {
+							"mode": "raw",
+							"raw": "{{requestData}}",
+							"options": {
+								"raw": {
+									"language": "json"
+								}
+							}
+						},
+						"url": "{{BASE_HOST}}/v1/sign-in"
+					},
+					"response": []
+				},
+				{
+					"name": "Duplicated reg data",
+					"event": [
+						{
+							"listen": "prerequest",
+							"script": {
+								"exec": [
+									"const email = pm.environment.get(\"randomEmail\")\r",
+									"const password = pm.environment.get(\"randomPassword\")\r",
+									"const username = pm.environment.get(\"randomUsername\")\r",
+									"\r",
+									"const requestData = {\r",
+									"    email: email,\r",
+									"    password: password,\r",
+									"    username: username\r",
+									"}\r",
+									"pm.environment.set(\"requestData\", JSON.stringify(requestData));\r",
+									""
+								],
+								"type": "text/javascript",
+								"packages": {}
+							}
+						},
+						{
+							"listen": "test",
+							"script": {
+								"exec": [
+									"pm.test('Status code is 409', function () {\r",
+									"    pm.response.to.have.status(409);\r",
+									"});\r",
+									""
+								],
+								"type": "text/javascript",
+								"packages": {}
+							}
+						}
+					],
+					"request": {
+						"method": "POST",
+						"header": [],
+						"body": {
+							"mode": "raw",
+							"raw": "{{requestData}}",
+							"options": {
+								"raw": {
+									"language": "json"
+								}
+							}
+						},
+						"url": "{{BASE_HOST}}/v1/sign-up"
+					},
+					"response": []
+				},
+				{
+					"name": "Reg without username",
+					"event": [
+						{
+							"listen": "prerequest",
+							"script": {
+								"exec": [
+									"const email = pm.environment.get(\"randomEmail\")\r",
+									"const password = pm.environment.get(\"randomPassword\")\r",
+									"\r",
+									"const requestData = {\r",
+									"    email: email,\r",
+									"    password: password\r",
+									"}\r",
+									"pm.environment.set(\"requestData\", JSON.stringify(requestData));\r",
+									""
+								],
+								"type": "text/javascript",
+								"packages": {}
+							}
+						},
+						{
+							"listen": "test",
+							"script": {
+								"exec": [
+									"pm.test('Status code is 400', function () {\r",
+									"    pm.response.to.have.status(400);\r",
+									"});\r",
+									""
+								],
+								"type": "text/javascript",
+								"packages": {}
+							}
+						}
+					],
+					"request": {
+						"method": "POST",
+						"header": [],
+						"body": {
+							"mode": "raw",
+							"raw": "{{requestData}}",
+							"options": {
+								"raw": {
+									"language": "json"
+								}
+							}
+						},
+						"url": "{{BASE_HOST}}/v1/sign-up"
+					},
+					"response": []
+				}
+			]
+		},
+		{
+			"name": "Competitions",
+			"item": [
+				{
+					"name": "Get competition with no partipication",
+					"event": [
+						{
+							"listen": "test",
+							"script": {
+								"exec": [
+									"pm.test('Status code is 200', function () {\r",
+									"    pm.response.to.have.status(200);\r",
+									"});\r",
+									"\r",
+									"pm.test('Response has only 2 elements', function () {\r",
+									"    const jsonData = pm.response.json();\r",
+									"    pm.expect(jsonData).to.has.length(2,\"Response has non-2 length, try to reset to only test data state\");\r",
+									"    pm.environment.set(\"competition_id\", jsonData[0].id)\r",
+									"});"
+								],
+								"type": "text/javascript",
+								"packages": {}
+							}
+						}
+					],
+					"request": {
+						"auth": {
+							"type": "bearer",
+							"bearer": {
+								"token": "{{token}}"
+							}
+						},
+						"method": "GET",
+						"header": [],
+						"url": {
+							"raw": "{{BASE_HOST}}/v1/competitions?is_participating=false",
+							"host": [
+								"{{BASE_HOST}}"
+							],
+							"path": [
+								"v1",
+								"competitions"
+							],
+							"query": [
+								{
+									"key": "is_participating",
+									"value": "false"
+								}
+							]
+						}
+					},
+					"response": []
+				},
+				{
+					"name": "Get competition with partipication",
+					"event": [
+						{
+							"listen": "test",
+							"script": {
+								"exec": [
+									"pm.test('Status code is 200', function () {\r",
+									"    pm.response.to.have.status(200);\r",
+									"});\r",
+									"\r",
+									"pm.test('Response has only 2 elements', function () {\r",
+									"    const jsonData = pm.response.json();\r",
+									"    pm.expect(jsonData).to.has.length(0,\"Response has non-0 length, try to reset to only test data state\");\r",
+									"});"
+								],
+								"type": "text/javascript",
+								"packages": {}
+							}
+						}
+					],
+					"request": {
+						"auth": {
+							"type": "bearer",
+							"bearer": {
+								"token": "{{token}}"
+							}
+						},
+						"method": "GET",
+						"header": [],
+						"url": {
+							"raw": "{{BASE_HOST}}/v1/competitions?is_participating=true",
+							"host": [
+								"{{BASE_HOST}}"
+							],
+							"path": [
+								"v1",
+								"competitions"
+							],
+							"query": [
+								{
+									"key": "is_participating",
+									"value": "true"
+								}
+							]
+						}
+					},
+					"response": []
+				},
+				{
+					"name": "Get tasks without partipicating in test",
+					"event": [
+						{
+							"listen": "test",
+							"script": {
+								"exec": [
+									"pm.test('Status code is 403', function () {\r",
+									"    pm.response.to.have.status(403);\r",
+									"});"
+								],
+								"type": "text/javascript",
+								"packages": {}
+							}
+						}
+					],
+					"request": {
+						"auth": {
+							"type": "bearer",
+							"bearer": {
+								"token": "{{token}}"
+							}
+						},
+						"method": "GET",
+						"header": [],
+						"url": "{{BASE_HOST}}/v1/competitions/{{competition_id}}/tasks"
+					},
+					"response": []
+				},
+				{
+					"name": "Submit task sol without partipicaating",
+					"event": [
+						{
+							"listen": "test",
+							"script": {
+								"exec": [
+									"pm.test('Status code is 403', function () {\r",
+									"    pm.response.to.have.status(403);\r",
+									"});\r",
+									""
+								],
+								"type": "text/javascript",
+								"packages": {}
+							}
+						}
+					],
+					"request": {
+						"auth": {
+							"type": "bearer",
+							"bearer": {
+								"token": "{{token}}"
+							}
+						},
+						"method": "POST",
+						"header": [],
+						"body": {
+							"mode": "formdata",
+							"formdata": [
+								{
+									"key": "file",
+									"type": "file",
+									"src": "/C:/Users/timka/AppData/Local/Postman/app-11.33.4/libGLESv2.dll"
+								}
+							]
+						},
+						"url": "{{BASE_HOST}}/v1/competitions/{{competition_id}}/tasks/{{task_id}}/submit"
+					},
+					"response": []
+				},
+				{
+					"name": "Partipicate in competition",
+					"event": [
+						{
+							"listen": "test",
+							"script": {
+								"exec": [
+									"pm.test('Status code is 200', function () {\r",
+									"    pm.response.to.have.status(200);\r",
+									"});"
+								],
+								"type": "text/javascript",
+								"packages": {}
+							}
+						}
+					],
+					"request": {
+						"auth": {
+							"type": "bearer",
+							"bearer": {
+								"token": "{{token}}"
+							}
+						},
+						"method": "POST",
+						"header": [],
+						"url": "{{BASE_HOST}}/v1/competitions/{{competition_id}}/start"
+					},
+					"response": []
+				},
+				{
+					"name": "Get competition tasks",
+					"event": [
+						{
+							"listen": "test",
+							"script": {
+								"exec": [
+									"pm.test('Status code is 200', function () {\r",
+									"    pm.response.to.have.status(200);\r",
+									"});\r",
+									"\r",
+									"pm.test('Response has tasks', function () {\r",
+									"    const jsonData = pm.response.json();\r",
+									"    pm.environment.set(\"task_id\", jsonData[0].id)\r",
+									"    pm.expect(jsonData).to.has.length(9)\r",
+									"});"
+								],
+								"type": "text/javascript",
+								"packages": {}
+							}
+						}
+					],
+					"request": {
+						"auth": {
+							"type": "bearer",
+							"bearer": {
+								"token": "{{token}}"
+							}
+						},
+						"method": "GET",
+						"header": [],
+						"url": "{{BASE_HOST}}/v1/competitions/{{competition_id}}/tasks"
+					},
+					"response": []
+				},
+				{
+					"name": "Get task history",
+					"event": [
+						{
+							"listen": "test",
+							"script": {
+								"exec": [
+									"pm.test('Status code is 200', function () {\r",
+									"    pm.response.to.have.status(200);\r",
+									"});\r",
+									"\r",
+									"pm.test('Response has token', function () {\r",
+									"    const jsonData = pm.response.json();\r",
+									"    pm.expect(jsonData).to.has.length(0);\r",
+									"});"
+								],
+								"type": "text/javascript",
+								"packages": {}
+							}
+						}
+					],
+					"request": {
+						"auth": {
+							"type": "bearer",
+							"bearer": {
+								"token": "{{token}}"
+							}
+						},
+						"method": "GET",
+						"header": [],
+						"url": "{{BASE_HOST}}/v1/competitions/{{competition_id}}/tasks/{{task_id}}/history"
+					},
+					"response": []
+				},
+				{
+					"name": "Submit task sol",
+					"event": [
+						{
+							"listen": "test",
+							"script": {
+								"exec": [
+									"pm.test('Status code is 200', function () {\r",
+									"    pm.response.to.have.status(200);\r",
+									"});\r",
+									"\r",
+									"pm.test('Response has submission id', function () {\r",
+									"    const jsonData = pm.response.json();\r",
+									"    pm.expect(jsonData.submission_id).to.be.a('string');\r",
+									"    pm.environment.set(\"sub_id\", jsonData.submission_id)\r",
+									"});"
+								],
+								"type": "text/javascript",
+								"packages": {}
+							}
+						}
+					],
+					"request": {
+						"auth": {
+							"type": "bearer",
+							"bearer": {
+								"token": "{{token}}"
+							}
+						},
+						"method": "POST",
+						"header": [],
+						"body": {
+							"mode": "formdata",
+							"formdata": [
+								{
+									"key": "file",
+									"type": "file",
+									"src": "/C:/Users/timka/AppData/Local/Postman/app-11.33.4/libGLESv2.dll"
+								}
+							]
+						},
+						"url": "{{BASE_HOST}}/v1/competitions/{{competition_id}}/tasks/{{task_id}}/submit"
+					},
+					"response": []
+				},
+				{
+					"name": "Get task attachments",
+					"event": [
+						{
+							"listen": "test",
+							"script": {
+								"exec": [
+									"pm.test('Status code is 200', function () {\r",
+									"    pm.response.to.have.status(200);\r",
+									"});\r",
+									"\r",
+									"pm.test('Response has empty array', function () {\r",
+									"    const jsonData = pm.response.json();\r",
+									"    pm.expect(jsonData).to.has.length(0);\r",
+									"});"
+								],
+								"type": "text/javascript",
+								"packages": {}
+							}
+						}
+					],
+					"request": {
+						"auth": {
+							"type": "bearer",
+							"bearer": {
+								"token": "{{token}}"
+							}
+						},
+						"method": "GET",
+						"header": [],
+						"url": "{{BASE_HOST}}/v1/competitions/{{competition_id}}/tasks/{{task_id}}/attachments"
+					},
+					"response": []
+				}
+			]
+		},
+		{
+			"name": "Revieews",
+			"item": [
+				{
+					"name": "Get reviewer profile",
+					"event": [
+						{
+							"listen": "test",
+							"script": {
+								"exec": [
+									"pm.test('Status code is 200', function () {\r",
+									"    pm.response.to.have.status(200);\r",
+									"});\r",
+									"\r",
+									"pm.test('Response has correct data', function () {\r",
+									"    const jsonData = pm.response.json();\r",
+									"    pm.expect(jsonData.name).to.eq(pm.environment.get(\"reviewer_name\"));\r",
+									"    pm.expect(jsonData.surname).to.eq(pm.environment.get(\"reviewer_surname\"))\r",
+									"});\r",
+									""
+								],
+								"type": "text/javascript",
+								"packages": {}
+							}
+						}
+					],
+					"request": {
+						"method": "GET",
+						"header": [],
+						"url": "{{BASE_HOST}}/v1/review/{{reviewer_key}}"
+					},
+					"response": []
+				},
+				{
+					"name": "Get submissions",
+					"event": [
+						{
+							"listen": "test",
+							"script": {
+								"exec": [
+									"pm.test('Status code is 200', function () {\r",
+									"    pm.response.to.have.status(200);\r",
+									"});\r",
+									"\r",
+									"pm.test('Response has correct data', function () {\r",
+									"    const jsonData = pm.response.json();\r",
+									"    pm.expect(jsonData).to.has.length(0)\r",
+									"});\r",
+									"\r",
+									""
+								],
+								"type": "text/javascript",
+								"packages": {}
+							}
+						}
+					],
+					"request": {
+						"method": "GET",
+						"header": [],
+						"url": "{{BASE_HOST}}/v1/review/{{reviewer_key}}/submissions/{{sub_id}}"
+					},
+					"response": []
+				}
+			]
+		},
+		{
+			"name": "Healthcheck",
+			"event": [
+				{
+					"listen": "test",
+					"script": {
+						"exec": [
+							"pm.test('Status code is 200', function () {\r",
+							"    pm.response.to.have.status(200);\r",
+							"});\r",
+							""
+						],
+						"type": "text/javascript",
+						"packages": {}
+					}
+				}
+			],
+			"request": {
+				"method": "GET",
+				"header": [],
+				"url": {
+					"raw": "{{BASE_HOST}}/health?format=json",
+					"host": [
+						"{{BASE_HOST}}"
+					],
+					"path": [
+						"health"
+					],
+					"query": [
+						{
+							"key": "format",
+							"value": "json"
+						}
+					]
+				}
+			},
+			"response": []
+		}
+	],
+	"event": [
+		{
+			"listen": "prerequest",
+			"script": {
+				"type": "text/javascript",
+				"packages": {},
+				"exec": [
+					""
+				]
+			}
+		},
+		{
+			"listen": "test",
+			"script": {
+				"type": "text/javascript",
+				"packages": {},
+				"exec": [
+					""
+				]
+			}
+		}
+	],
+	"variable": [
+		{
+			"key": "BASE_HOST",
+			"value": "https://prod-team-15-2pc0i3lc.final.prodcontest.ru/api",
+			"type": "string"
+		},
+		{
+			"key": "requestData",
+			"value": "",
+			"type": "string"
+		},
+		{
+			"key": "token",
+			"value": "",
+			"type": "string"
+		},
+		{
+			"key": "competition_id",
+			"value": "",
+			"type": "string"
+		},
+		{
+			"key": "task_id",
+			"value": "",
+			"type": "string"
+		},
+		{
+			"key": "reviewer_key",
+			"value": "",
+			"type": "string"
+		},
+		{
+			"key": "reviewer_name",
+			"value": "",
+			"type": "string"
+		},
+		{
+			"key": "reviewer_surname",
+			"value": "",
+			"type": "string"
+		},
+		{
+			"key": "sub_id",
+			"value": "",
+			"type": "string"
+		}
+	]
+}

services/backend/apps/task/models.py

@@ -1,7 +1,9 @@
+from sys import stdout
 from uuid import uuid4
 
 from django.db import models
 from django.db.models import Count, Q
+from django.core.exceptions import ValidationError
 from mdeditor.fields import MDTextField
 
 from apps.competition.models import Competition
@@ -78,6 +80,36 @@ class CompetitionTask(BaseModel):
         verbose_name="кол-во проверяющих для зачета задачи",
     )
 
+    def clean(self):
+        super().clean()
+        if self.correct_answer_file and self.type not in ["checker", "input"]:
+            raise ValidationError({
+                "type": "Если загружен файл правильного ответа, то тип проверки не может быть ручным"
+            })
+        elif not self.correct_answer_file and self.type == "review":
+            raise ValidationError({
+                "correct_answer_file": "Загрузите правильный ответ"
+            })
+        
+        if self.answer_file_path and not self.type == "checker":
+            raise ValidationError({
+                "type": "Укажите другой тип задания: этот не совместим с путем правильного ответа"
+            })
+        elif not self.answer_file_path and self.type == "checker":
+            raise ValidationError({
+                "answer_file_path": "Введите путь правильного ответа - это нужно для корректной работы чекера"
+            })
+        
+        if not self.reviewers and self.type == "review":
+            raise ValidationError({
+                "reviewers": "Загрузите ревьюверов - кто будет проверять задания, если не они?"
+            })
+        elif self.reviewers and not self.type == "review":
+            raise ValidationError({
+                "type": "Проверьте тип - вы ввели ревьюверов, но задание не является ручным"
+            })
+
+
     def __str__(self):
         return self.title
 

services/backend/apps/task/tasks.py

@@ -15,6 +15,7 @@ def analyze_data_task(self, submission_id):
     submission = CompetitionTaskSubmission.objects.get(id=submission_id)
     try:
         code = submission.content.read()
+        print("YA SSF")
         files = [
             {
                 "url": (
@@ -42,6 +43,7 @@ def analyze_data_task(self, submission_id):
         )
         response.raise_for_status()
         result = response.json()
+        print("HOHOHO")
 
         submission.stdout.save("output.txt", ContentFile(result["output"]))
         submission.result = {

services/frontend/src/components/layout/header.tsx

@@ -32,9 +32,10 @@ export const Header = () => {
         <div className="flex items-center gap-4">
           <a 
             href="/docs/"
-          className="text-sm font-medium text-gray-700 hover:text-gray-900 transition-colors flex items-center gap-1"
+            className="hidden md:flex text-sm font-medium text-gray-700 hover:text-gray-900 transition-colors items-center gap-1"
           >
             <FileText className="h-4 w-4" />
+            Материалы
           </a>
           
           <DropdownMenu>
@@ -50,6 +51,16 @@ export const Header = () => {
               <Link to="/profile">
                 <DropdownMenuItem>Аккаунт</DropdownMenuItem>
               </Link>
+              
+              <div className="md:hidden">
+                <Link to="/docs">
+                  <DropdownMenuItem>
+                    <FileText className="h-4 w-4 mr-2" />
+                    Материалы
+                  </DropdownMenuItem>
+                </Link>
+              </div>
+              
               <DropdownMenuSeparator />
               <DropdownMenuItem
                 variant="destructive"

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

@@ -1,3 +1,4 @@
+// src/components/competition/CompetitionResultsModal.tsx
 import React from 'react';
 import {
   Dialog,
@@ -33,13 +34,58 @@ export const CompetitionResultsModal: React.FC<CompetitionResultsModalProps> = (
 }) => {
   const renderResultValue = (result: number, maxPoints: number) => {
     if (result === -1) {
-      return <span className="text-yellow-600">На проверке</span>;
+      return (
+        <span className="font-semibold" style={{ 
+          color: 'var(--color-task-text-checking)',
+          backgroundColor: 'var(--color-task-checking)',
+          padding: '4px 8px',
+          borderRadius: '4px'
+        }}>
+          На проверке
+        </span>
+      );
     } else if (result === -2) {
-      return <span className="text-gray-500">Нет ответа</span>;
+      return (
+        <span className="font-semibold" style={{ 
+          color: 'var(--color-task-text-uncleared)',
+          backgroundColor: 'var(--color-task-uncleared)',
+          padding: '4px 8px',
+          borderRadius: '4px'
+        }}>
+          Нет ответа
+        </span>
+      );
+    } else if (result === 0) {
+      return (
+        <span className="font-semibold" style={{ 
+          color: 'var(--color-task-text-wrong)',
+          backgroundColor: 'var(--color-task-wrong)',
+          padding: '4px 8px',
+          borderRadius: '4px'
+        }}>
+          Неверно (0/{maxPoints})
+        </span>
+      );
+    } else if (result < maxPoints) {
+      return (
+        <span className="font-semibold" style={{ 
+          color: 'var(--color-task-text-partial)',
+          backgroundColor: 'var(--color-task-partial)',
+          padding: '4px 8px',
+          borderRadius: '4px'
+        }}>
+          Частично верно ({result}/{maxPoints})
+        </span>
+      );
     } else {
       return (
-        <span className="text-green-600">
-          Зачтено {result}/{maxPoints} баллов
+        <span className="font-semibold" style={{ 
+          color: 'var(--color-task-text-correct)',
+          backgroundColor: 'var(--color-task-correct)',
+          padding: '4px 8px',
+          borderRadius: '4px'
+        }}>
+          Верно ({result}/{maxPoints})
         </span>
       );
     }
@@ -71,7 +117,7 @@ export const CompetitionResultsModal: React.FC<CompetitionResultsModalProps> = (
                 className="flex flex-col md:flex-row justify-between items-start md:items-center p-4 bg-gray-50 rounded-lg border"
               >
                 <div className="font-medium mb-2 md:mb-0">{result.task_name}</div>
-                <div className="text-right font-semibold">
+                <div className="text-right">
                   {renderResultValue(result.result, result.max_points)}
                 </div>
               </div>

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

@@ -93,7 +93,6 @@ const CompetitionPage = () => {
     return now < startDate;
   };
   
-  // Check if competition has ended
   const isCompetitionEnded = () => {
     if (!competition?.end_date) return false;
     
@@ -212,7 +211,6 @@ const CompetitionPage = () => {
               <Button 
                 size={"lg"} 
                 onClick={() => setIsResultsModalOpen(true)}
-                className="bg-indigo-600 hover:bg-indigo-700"
               >
                 <BarChart2 size={18} className="mr-2" />
                 Посмотреть результаты
@@ -221,7 +219,7 @@ const CompetitionPage = () => {
             
             {competitionEnded && !hasResults && competition.type === CompetitionType.COMPETITIVE && !resultsQuery.isLoading && (
               <div className="text-center p-4 border rounded-md bg-gray-50">
-                <p className="text-gray-600">Соревнование завершено. Результаты пока не доступны.</p>
+                <p className="text-gray-600">Соревнование завершено. Увы</p>
               </div>
             )}
           </div>

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

@@ -1,8 +1,9 @@
 import React, { useState, useEffect } from 'react';
-import { Link, useNavigate } from 'react-router-dom';
+import { Link, useNavigate, useParams } from 'react-router-dom';
 import { Task } from '@/shared/types/task';
-import { ArrowLeft, Clock } from 'lucide-react'; 
+import { ArrowLeft } from 'lucide-react'; 
 import { CompetitionType } from '@/shared/types/competition';
+import { CompetitionResult } from '@/shared/types/competition';
 
 interface CompetitionHeaderProps {
   title: string;
@@ -11,8 +12,9 @@ interface CompetitionHeaderProps {
   setAnswer: (value: string) => void;
   setSelectedFile: (file: File | null) => void;
   competitionType?: CompetitionType;
-  startDate?: Date;
-  endDate?: Date;
+  startDate?: Date | string;
+  endDate?: Date | string;
+  taskResults?: CompetitionResult[];
 }
 
 const CompetitionHeader: React.FC<CompetitionHeaderProps> = ({ 
@@ -23,9 +25,11 @@ const CompetitionHeader: React.FC<CompetitionHeaderProps> = ({
   setSelectedFile,
   competitionType,
   startDate,
-  endDate
+  endDate,
+  taskResults = []
 }) => {
   const navigate = useNavigate();
+  const { taskId } = useParams<{ taskId?: string }>();
   const [timeLeft, setTimeLeft] = useState<string>('');
   
   const handleTaskSelect = (taskId: string) => {
@@ -34,7 +38,7 @@ const CompetitionHeader: React.FC<CompetitionHeaderProps> = ({
     navigate(`/competition/${competitionId}/tasks/${taskId}`);
   }
   
-  const formatDate = (date?: Date) => {
+  const formatDate = (date?: Date | string) => {
     if (!date) return '';
     
     const dateObj = typeof date === 'string' ? new Date(date) : date;
@@ -74,6 +78,42 @@ const CompetitionHeader: React.FC<CompetitionHeaderProps> = ({
     return () => clearInterval(timerInterval);
   }, [endDate, competitionId, navigate, competitionType]);
   
+  const getTaskStatus = (task: Task) => {
+    const result = taskResults.find(r => r.task_name === task.title);
+    
+    let bgColor = 'var(--color-task-uncleared)';
+    let textColor = 'var(--color-task-text-uncleared)';
+    
+    if (result) {
+      if (result.result === -1) {
+        bgColor = 'var(--color-task-checking)';
+        textColor = 'var(--color-task-text-checking)';
+      } else if (result.result === -2) {
+        bgColor = 'var(--color-task-uncleared)';
+        textColor = 'var(--color-task-text-uncleared)';
+      } else if (result.result === 0) {
+        bgColor = 'var(--color-task-wrong)';
+        textColor = 'var(--color-task-text-wrong)';
+      } else if (result.result < result.max_points) {
+        bgColor = 'var(--color-task-partial)';
+        textColor = 'var(--color-task-text-partial)';
+      } else if (result.result === result.max_points) {
+        bgColor = 'var(--color-task-correct)';
+        textColor = 'var(--color-task-text-correct)';
+      }
+    }
+    
+    const isActive = task.id === taskId;
+    const activeBorder = isActive ? 'border-2 border-blue-500' : '';
+    
+    return {
+      backgroundColor: bgColor,
+      color: textColor,
+      className: `rounded-lg px-3 py-1.5 font-medium text-sm font-hse-sans cursor-pointer 
+                transition-all hover:brightness-95 flex-shrink-0 ${activeBorder}`
+    };
+  };
+  
   const showTimeSection = competitionType === CompetitionType.COMPETITIVE && (startDate || endDate);
   
   return (
@@ -120,18 +160,19 @@ const CompetitionHeader: React.FC<CompetitionHeaderProps> = ({
         </div>
         
         <div className="flex items-center justify-center gap-4 pb-4 overflow-x-auto no-scrollbar">
-          {tasks.map((task) => (
+          {tasks.map((task) => {
+            const { backgroundColor, color, className } = getTaskStatus(task);
+            return (
               <button
                 key={task.id}
-            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
-              `}
+                style={{ backgroundColor, color }}
+                className={className}
                 onClick={() => handleTaskSelect(task.id)}
               >
                 {task.in_competition_position}
               </button>
-          ))}
+            );
+          })}
         </div>
       </div>
     </header>

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

@@ -1,10 +1,10 @@
 import { useState, useEffect } from "react";
-import { useParams, Navigate, useNavigate } from "react-router-dom";
+import { useParams, Navigate   } from "react-router-dom";
 import CompetitionHeader from "./components/CompetitionHeader";
 import TaskContent from "./components/TaskContent";
 import TaskSolution from "./modules/TaskSolution";
 import { getCompetitionTasks, submitTaskSolution } from "@/shared/api/session";
-import { getCompetition } from "@/shared/api/competitions";
+import { getCompetition, getCompetitionResults } from "@/shared/api/competitions";
 import { Loader2 } from "lucide-react";
 import { useQuery, useMutation, useQueryClient } from "@tanstack/react-query";
 import { TaskType } from "@/shared/types/task";
@@ -16,7 +16,6 @@ const CompetitionSession = () => {
   const [isReloading, setIsReloading] = useState(false);
   const competitionId = id || "";
   const queryClient = useQueryClient();
-  const navigate = useNavigate();
 
   const competitionQuery = useQuery({
     queryKey: ["competition", competitionId],
@@ -30,6 +29,12 @@ const CompetitionSession = () => {
     enabled: !!competitionId,
   });
 
+  const resultsQuery = useQuery({
+    queryKey: ["competitionResults", competitionId],
+    queryFn: () => getCompetitionResults(competitionId),
+    enabled: !!competitionId,
+  });
+
   const submitMutation = useMutation({
     mutationFn: () => {
       if (!currentTask || !competitionId) throw new Error("Missing task or competition ID");
@@ -47,10 +52,14 @@ const CompetitionSession = () => {
         queryKey: ['solutionHistory', competitionId, taskId] 
       });
       
+      queryClient.invalidateQueries({
+        queryKey: ['competitionResults', competitionId]
+      });
+      
       setIsReloading(true);
       
       setTimeout(() => {
-        window.location.reload()
+        window.location.reload();
         setIsReloading(false);
       }, 2500);
     },
@@ -61,6 +70,7 @@ const CompetitionSession = () => {
 
   const competition = competitionQuery.data;
   const tasks = tasksQuery.data || [];
+  const results = resultsQuery.data || [];
   const isLoading = tasksQuery.isLoading || competitionQuery.isLoading;
   const error = tasksQuery.error || competitionQuery.error 
     ? "Не удалось загрузить данные. Пожалуйста, попробуйте позже." 
@@ -113,6 +123,7 @@ const CompetitionSession = () => {
         competitionType={competition?.type}
         startDate={competition?.start_date}
         endDate={competition?.end_date}
+        taskResults={results}
       />
 
       <main className="flex-1 bg-[#F8F8F8] pb-8">
@@ -138,6 +149,16 @@ const CompetitionSession = () => {
                 onSubmit={handleSubmit}
                 isSubmitting={isSubmitting}
               />
+              {isReloading && (
+                <div className="fixed inset-0 flex items-center justify-center bg-black bg-opacity-50 z-50">
+                  <div className="bg-white p-6 rounded-lg shadow-xl text-center">
+                    <Loader2 className="h-8 w-8 animate-spin mx-auto mb-4" />
+                    <p className="font-hse-sans text-gray-700">
+                      Решение отправлено! Пожалуйста, подождите...
+                    </p>
+                  </div>
+                </div>
+              )}
             </div>
           ) : (
             <div className="flex h-40 items-center justify-center rounded-lg bg-white">

services/frontend/src/pages/CompetitionSession/modules/TaskSolution/components/ActionButtons/index.tsx

@@ -30,10 +30,9 @@ const ActionButtons: React.FC<ActionButtonsProps> = ({
       
       {isCleared ? (
         <Button 
-          className="font-hse-sans flex-grow bg-green-600 hover:bg-green-700" 
+          className="font-hse-sans flex-grow" 
           disabled={true}
         >
-          <CheckCircle className="mr-2 h-4 w-4" />
           Задача сдана!
         </Button>
       ) : hasSubmissionsLeft ? (

services/frontend/src/pages/Profile/widgets/user-stats.tsx

@@ -24,7 +24,7 @@ export const UserStatsSections = () => {
           />
           <UserStatBlock
             value={stats.total_attempts}
-            description="Попыток выполнено"
+            description="Решений отправлено"
           />
         </div>
       ) : (