From 622c324d61a1e51676dce29784ef325f79c3d44c Mon Sep 17 00:00:00 2001
From: semantics <mihail323i21@gmail.com>
Date: Mon, 18 Dec 2023 16:21:17 +0500
Subject: [PATCH] =?UTF-8?q?=D0=BF=D0=BE=D0=BF=D1=80=D0=B0=D0=B2=D0=B8?=
 =?UTF-8?q?=D0=BB=20=D1=88=D1=80=D0=B8=D1=84=D1=82=D1=8B=20=D0=B4=D0=BB?=
 =?UTF-8?q?=D1=8F=20=D1=84=D0=BE=D1=80=D0=BC=20=D0=B8=20=D0=BE=D1=81=D1=82?=
 =?UTF-8?q?=D0=B0=D0=BB=D1=8C=D0=BD=D0=BE=D0=B3=D0=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CustomProgressBar/customProgressBar.scss        |  1 +
 .../mapMenu/UIMapMenu/Level/ModalLevelBody.tsx      | 13 +++++++++----
 .../UIMapMenu/Level/TaskOpenQuestionEditor.tsx      |  5 ++---
 .../mapMenu/UIMapMenu/Level/modalLevelBody.scss     |  3 ---
 frontend/src/index.css                              |  4 +---
 frontend/src/styles/mapMenu.scss                    |  5 ++++-
 6 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/frontend/src/UIComponents/CustomProgressBar/customProgressBar.scss b/frontend/src/UIComponents/CustomProgressBar/customProgressBar.scss
index 250ad39..6f6593e 100644
--- a/frontend/src/UIComponents/CustomProgressBar/customProgressBar.scss
+++ b/frontend/src/UIComponents/CustomProgressBar/customProgressBar.scss
@@ -8,6 +8,7 @@
 }
 
 .progressPercent {
+  font-family: Montserrat, sans-serif;
   font-weight: 600;
   position: absolute;
   left: 50%;
diff --git a/frontend/src/components/mapMenu/UIMapMenu/Level/ModalLevelBody.tsx b/frontend/src/components/mapMenu/UIMapMenu/Level/ModalLevelBody.tsx
index 84f0e5b..bde4b92 100644
--- a/frontend/src/components/mapMenu/UIMapMenu/Level/ModalLevelBody.tsx
+++ b/frontend/src/components/mapMenu/UIMapMenu/Level/ModalLevelBody.tsx
@@ -62,9 +62,15 @@ const ModalLevelBody: React.FC<IModalLevelProps> = ({level}) => {
         for (let i = 0; i < menuItems.length; i++) {
             for (let j = 0; j < menuItems[i].length; j++) {
                 index++
-                taskBlocks.push(<MenuItem indexType={i} index={index} key={index} indexSelectedItem={levelIndex}
-                                          setLevelIndex={setLevelIndex}/>)
-
+                taskBlocks.push(
+                    <MenuItem
+                        indexType={i}
+                        index={index}
+                        key={index}
+                        indexSelectedItem={levelIndex}
+                        setLevelIndex={setLevelIndex}
+                    />
+                )
             }
         }
         return taskBlocks
@@ -131,7 +137,6 @@ const ModalLevelBody: React.FC<IModalLevelProps> = ({level}) => {
                                         <div className="question" key={question.id}>
                                             <div className="question-title">{question.question}</div>
                                             <TaskOpenQuestionEditor
-                                                text={textOpenQuestion}
                                                 setText={setTextOpenQuestion}
                                             />
                                         </div>
diff --git a/frontend/src/components/mapMenu/UIMapMenu/Level/TaskOpenQuestionEditor.tsx b/frontend/src/components/mapMenu/UIMapMenu/Level/TaskOpenQuestionEditor.tsx
index 708480a..d2632d6 100644
--- a/frontend/src/components/mapMenu/UIMapMenu/Level/TaskOpenQuestionEditor.tsx
+++ b/frontend/src/components/mapMenu/UIMapMenu/Level/TaskOpenQuestionEditor.tsx
@@ -1,14 +1,13 @@
-import {convertToRaw, EditorState} from "draft-js";
+import {EditorState} from "draft-js";
 import React, {useState} from "react";
 import {Editor} from "react-draft-wysiwyg";
 import "react-draft-wysiwyg/dist/react-draft-wysiwyg.css";
 
 interface ITaskOpenQuestionEditor {
-    text: string,
     setText: (text: string) => void
 }
 
-const TaskOpenQuestionEditor: React.FC<ITaskOpenQuestionEditor> = ({text, setText}) => {
+const TaskOpenQuestionEditor: React.FC<ITaskOpenQuestionEditor> = ({setText}) => {
     const [editorState, setEditorState] = useState(EditorState.createEmpty());
     const onEditorStateChange = function (editorState: EditorState) {
         setEditorState(editorState);
diff --git a/frontend/src/components/mapMenu/UIMapMenu/Level/modalLevelBody.scss b/frontend/src/components/mapMenu/UIMapMenu/Level/modalLevelBody.scss
index 96045c3..1135f09 100644
--- a/frontend/src/components/mapMenu/UIMapMenu/Level/modalLevelBody.scss
+++ b/frontend/src/components/mapMenu/UIMapMenu/Level/modalLevelBody.scss
@@ -30,7 +30,6 @@
 
 .level-title {
   color: #2B2A29;
-  font-family: Golos, sans-serif;
   font-size: 1.75rem;
   font-style: normal;
   font-weight: 700;
@@ -43,7 +42,6 @@
 .level-name {
   color: #F5F5F5;
   text-align: center;
-  font-family: Golos, sans-serif;
   font-size: 1.5rem;
   font-style: normal;
   font-weight: 700;
@@ -53,7 +51,6 @@
 
 .level-body {
   color: #000;
-  font-family: Golos, sans-serif;
   font-size: 1.125rem;
   font-style: normal;
   font-weight: 700;
diff --git a/frontend/src/index.css b/frontend/src/index.css
index f824bdc..9465157 100644
--- a/frontend/src/index.css
+++ b/frontend/src/index.css
@@ -1,6 +1,6 @@
 :root {
     background-color: black;
-    font-family: Golos, serif;
+    font-family: Montserrat, sans-serif;
     font-size: 12px;
     font-weight: 400;
     line-height: 14px;
@@ -24,7 +24,6 @@ body {
 }
 
 h1 {
-    font-family: Golos, sans-serif;
     font-size: 26px;
     font-weight: 700;
     line-height: 31px;
@@ -32,7 +31,6 @@ h1 {
 }
 
 h2 {
-    font-family: Golos, sans-serif;
     font-size: 18px;
     font-weight: 600;
     line-height: 22px;
diff --git a/frontend/src/styles/mapMenu.scss b/frontend/src/styles/mapMenu.scss
index 8665858..55fd212 100644
--- a/frontend/src/styles/mapMenu.scss
+++ b/frontend/src/styles/mapMenu.scss
@@ -46,7 +46,6 @@
   color: #F5F5F5;
   text-align: center;
   text-shadow: 0 4px 4px rgba(0, 0, 0, 0.25);
-  font-family: Golos, sans-serif;
   font-size: 1.125rem;
   font-style: normal;
   font-weight: 700;
@@ -186,3 +185,7 @@
   top: 5%;
 }
 
+.editorClassName {
+  border: 1px solid #F1F1F1;
+  letter-spacing: 0;
+}