Merge branch 'main' into trackerTask

# Conflicts:
#	src/pages/Quiz/QuizPage.js

src/pages/Quiz/QuizPage.js

@@ -137,7 +137,8 @@ export const QuizPage = () => {
             {/*</div>*/}
             <div className="quiz-page__block">Доступные тесты</div>
             <div className="quiz-page__cards-test">
-              {questionnaires.length ? (
+              {questionnaires &&
+                questionnaires.length > 0 &&
                 questionnaires.map((item, index) => (
                   <CardAvailableTest
                     description={item.description}
@@ -147,9 +148,9 @@ export const QuizPage = () => {
                     passedTest={item.passedTest}
                     key={index}
                   />
-                ))
-              ) : (
-                <h1>Анкет нет</h1>
+                ))}
+              {questionnaires && questionnaires.length === 0 && (
+                <h1>Нет доступных тестов</h1>
               )}
             </div>
             {/*<div className="block-text">*/}

src/pages/Quiz/quiz-page.scss

@@ -5,6 +5,7 @@
   font-family: "LabGrotesque", sans-serif;
   display: flex;
   flex-direction: column;
+
   &__container {
     max-width: 1160px;
     margin: 23px auto 42px auto;
@@ -12,9 +13,11 @@
     width: 100%;
     padding: 0 15px;
   }
+
   &__title {
     margin: 0 0 39px 0;
   }
+
   &__block {
     background: #e1fccf;
     border-radius: 12px;
@@ -25,21 +28,26 @@
     padding: 20px;
     margin: 0 0 16px 0;
   }
+
   &__cards-test {
     display: grid;
     grid-gap: 29px;
     grid-template-columns: 1fr 1fr 1fr;
     margin-bottom: 29px;
+
     @media (max-width: 955px) {
       grid-template-columns: 1fr 1fr;
     }
+
     @media (max-width: 668px) {
       grid-template-columns: 1fr;
     }
   }
+
   &__specialization {
     margin: 0 0 26px 0;
   }
+
   &__categories-items {
     display: grid;
     grid-gap: 24px;
@@ -53,6 +61,7 @@
     }
   }
 }
+
 .interjacent-page-quiz {
   background: #f1f1f1;
   height: 100%;
@@ -60,12 +69,15 @@
   font-family: "LabGrotesque", sans-serif;
   display: flex;
   flex-direction: column;
+
   &__title {
     margin: 0 0 39px 0;
   }
+
   &__passing-information {
     margin: 0 0 32px 0;
   }
+
   &__container {
     max-width: 1160px;
     margin: 23px auto 42px auto;
@@ -73,6 +85,7 @@
     width: 100%;
     padding: 0 15px;
   }
+
   &__introduction-items {
     display: flex;
     flex-wrap: wrap;
@@ -88,6 +101,7 @@
   font-family: "LabGrotesque", sans-serif;
   display: flex;
   flex-direction: column;
+
   &__container {
     max-width: 1160px;
     margin: 23px auto 42px auto;
@@ -95,12 +109,15 @@
     width: 100%;
     padding: 0 15px;
   }
+
   &__title {
     margin: 0 0 39px 0;
   }
+
   &__passing-information {
     margin: 0 0 29px 0;
   }
+
   &__block-green {
     font-weight: 400;
     font-size: 18px;
@@ -110,6 +127,7 @@
     border-radius: 12px 12px 0px 0px;
     padding: 20px 51px;
   }
+
   &__introduction {
     display: flex;
     flex-wrap: wrap;
@@ -123,6 +141,7 @@
   font-family: "LabGrotesque", sans-serif;
   display: flex;
   flex-direction: column;
+
   &__container {
     max-width: 1160px;
     margin: 23px auto 42px auto;
@@ -130,9 +149,11 @@
     width: 100%;
     padding: 0 15px;
   }
+
   &__title {
     margin: 0 0 39px 0;
   }
+
   &__report-quiz {
     margin: 0 0 28px 0;
   }