Merge remote-tracking branch 'origin/parthners-area-fix-tracker-modal' into candidate-area

# Conflicts:
#	src/App.js
#	src/pages/Tracker/Tracker.js

src/pages/AuthForDevelopers/AuthForDevelopers.js

@@ -41,7 +41,11 @@ const AuthForDevelopers = () => {
   return (
     <section className="auth-developers">
       <AuthHeader />
-      <SliderWorkers title={"Свободные разработчики"} titleInfo={"для Вашей команды"} subTitle={true} />
+      <SliderWorkers
+        title={"Свободные разработчики"}
+        titleInfo={"для Вашей команды"}
+        subTitle={true}
+      />
       <div className="auth-developers__background">
         <img className="auth-developers__vector" src={vector} alt="" />
         <img

src/pages/PartnerSettings/partnerSettings.scss

@@ -2,7 +2,7 @@
   background: #f1f1f1;
   height: 100%;
   min-height: 100vh;
-  font-family: 'LabGrotesque', sans-serif;
+  font-family: "LabGrotesque", sans-serif;
 
   .infoPersonal__title {
     color: #000000;
@@ -92,6 +92,19 @@
     }
   }
 
+  @media (max-width: 1200px) {
+    &__input {
+      width: 100%;
+    }
+
+    &__buttons {
+      &-cancel,
+      &-save {
+        width: 120px;
+      }
+    }
+  }
+
   @media (max-width: 570px) {
     &__input {
       width: 95%;
@@ -191,15 +204,54 @@
   @media (max-width: 1200px) {
     margin-bottom: 15px;
 
+    &__logo {
+      flex-direction: column;
+      align-items: flex-start;
+    }
+
+    &__body {
+      margin-bottom: 100px;
+    }
+
+    &__report,
+    &__login {
+      width: 45%;
+      height: auto;
+    }
+
+    &__label {
+      &-second,
+      &-first {
+        flex-direction: row;
+      }
+    }
+  }
+
+  @media (max-width: 950px) {
     &__body {
       flex-direction: column;
+      margin-bottom: 20px;
+      align-items: center;
     }
+
+    &__report,
+    &__login {
+      width: 60%;
+    }
+
     &__report {
-      margin-top: 50px;
+      margin-top: 55px;
+      margin-bottom: 55px;
     }
   }
 
   @media (max-width: 570px) {
+    &__body {
+      flex-direction: column;
+      margin-bottom: 20px;
+      align-items: center;
+    }
+
     &__report,
     &__login {
       width: 100%;
@@ -207,6 +259,10 @@
       padding: 20px 30px;
     }
 
+    &__report {
+      margin-top: 55px;
+    }
+
     &__logo {
       flex-direction: column;
       align-items: flex-start;
@@ -218,6 +274,7 @@
         flex-direction: row;
       }
     }
+
     .checkbox {
       &__second {
         margin: 0px 0 0 20px;

src/pages/Tracker/Tracker.js

@@ -492,6 +492,12 @@ export const Tracker = () => {
   function createTiket() {
     tabTaskMok.filter((item) => {
       if (item.name == selectedTab.name) {
+        let idItem = 0;
+
+        item.tasks.forEach((item) => {
+          idItem = item.id;
+        });
+
         let newTiket = {
           task: valueTiket,
           description: "Сверстать часть таблицы. Сверстать часть таблицы",
@@ -499,7 +505,7 @@ export const Tracker = () => {
           files: 0,
           avatarCreated: avatarTest,
           avatarDo: avatarTest,
-          id: item.tasks.length + 1,
+          id: idItem + 1,
         };
 
         item.tasks.push(newTiket);