Moving components out of a folder UI

src/App.js

@@ -12,7 +12,7 @@ import Home from "./pages/Home/Home";
 import Candidate from "./components/Candidate/Candidate";
 import Calendar from "./components/Calendar/Calendar";
 import ReportForm from "./components/ReportForm/ReportForm";
-import FreeDevelopers from "./components/UI/FreeDevelopers/FreeDevelopers";
+import FreeDevelopers from "./components/FreeDevelopers/FreeDevelopers";
 import { TicketFullScreen } from "./components/UI/TicketFullScreen/TicketFullScreen";
 import { ProfileCalendar } from "./components/ProfileCalendar/ProfileCalendar";
 import Article from "./pages/Article/Article";

src/components/Common/ModalLayout/modalLayout.scss

@@ -15,7 +15,6 @@
     position: relative;
     background: linear-gradient(180deg, #ffffff 0%, #ebebeb 100%);
     border-radius: 24px;
-
     padding: 60px 60px 30px 60px;
     display: flex;
     flex-direction: column;

src/components/FreeDevelopers/FreeDevelopers.jsx

@@ -1,15 +1,15 @@
 import React from "react";
 import { Link } from "react-router-dom";
 
-import AuthHeader from "../../AuthHeader/AuthHeader";
+import AuthHeader from "../AuthHeader/AuthHeader";
-import SideBar from "../../SideBar/SideBar";
+import SideBar from "../SideBar/SideBar";
-import { Footer } from "../../Footer/Footer";
+import { Footer } from "../Footer/Footer";
-import { scrollToForm } from "../../../helper";
+import { scrollToForm } from "../../helper";
-import { ProfileBreadcrumbs } from "../../ProfileBreadcrumbs/ProfileBreadcrumbs";
+import { ProfileBreadcrumbs } from "../ProfileBreadcrumbs/ProfileBreadcrumbs";
-import Button from "../../Common/Button/Button";
+import Button from "../Common/Button/Button";
 
-import mockWorker from "../../../assets/images/mock/mokPerson.png";
+import mockWorker from "../../assets/images/mock/mokPerson.png";
-import arrow from "../../../assets/icons/arrows/arrow_left.png";
+import arrow from "../../assets/icons/arrows/arrow_left.png";
 
 import "./freeDevelopers.scss";
 

src/components/UI/ModalAspirant/ModalAspirant.jsx

@@ -1,7 +1,8 @@
 import React, { useState } from "react";
 
 import { Link } from "react-router-dom";
-import ModalLayout from "../ModalLayout/ModalLayout";
+import ModalLayout from "../../Common/ModalLayout/ModalLayout";
+import Button from "../../Common/Button/Button";
 
 import avatar from "../../../assets/images/mock/mokPerson.png";
 import logoTg from "../../../assets/icons/tgLogo.svg";
@@ -26,23 +27,18 @@ export const ModalAspirant = ({ active, setActive, level }) => {
     }
   };
 
-  // TODO: Исправить стили тут, и заменить в модалках
   return (
-    <ModalLayout
+    <ModalLayout active={active} setActive={setActive} styles={"aspirant"}>
-      active={active}
+      <div className="aspirant-decs">
-      setActive={setActive}
-      styles={"modal-aspt__content"}
-    >
-      <div className="aspt-decs">
         <h1>Выбранный кандидат</h1>
-        <div className="aspt-decs__avatar">
+        <div className="aspirant-decs__avatar">
-          <div className="aspt-decs__avatar_title">
+          <div className="aspirant-decs__avatar_title">
             <img src={avatar}></img>
             <p>
               {level.spec} {level.skils}, {level.level}{" "}
             </p>
           </div>
-          <div className="aspt-decs__avatar_back">
+          <div className="aspirant-decs__avatar_back">
             <Link to={"/profile/catalog"}>
               <div>
                 <img src={arrow}></img>
@@ -52,9 +48,9 @@ export const ModalAspirant = ({ active, setActive, level }) => {
           </div>
         </div>
 
-        <div className="aspt-decs__telega">
+        <div className="aspirant-decs__telega">
           <h4>Есть вопросы?</h4>
-          <div className="aspt-decs__telega-logo">
+          <div className="aspirant-decs__telega-logo">
             <img src={logoTg}></img>
             <p>Напишите нам в Телеграм. Мы с удовольствием ответим!</p>
           </div>
@@ -78,11 +74,11 @@ export const ModalAspirant = ({ active, setActive, level }) => {
             onChange={(e) => setTime(e.target.value)}
           ></input>
         </div>
-
+        <Button onClick={send} styles="form-interview__submit">
-        <button onClick={send}>Отправить</button>
+          Отправить
+        </Button>
       </div>
       <span className="exit" onClick={() => setActive(false)}></span>
-
       <ModalLayout active={modalSend} setActive={setModalSend} styles={"send"}>
         <div className="send">
           <img src={interview}></img>

src/components/UI/ModalAspirant/modalAspirant.scss

@@ -1,173 +1,148 @@
-.modal-aspt {
+.aspirant {
-  z-index: 99;
-  height: 100%;
-  width: 100%;
-  background-color: rgba(0, 0, 0, 0.11);
-  position: fixed;
-  top: 0;
-  left: 0;
   display: flex;
-  align-items: center;
+  flex-direction: row;
-  justify-content: center;
+  background: #ffffff;
-  transform: scale(0);
+  border: 1px solid #dde2e4;
+  border-radius: 8px;
+  padding: 0;
 
-  &__content {
+  &-decs {
-    position: relative;
+    padding: 54px 25px 51px 61px;
-    display: flex;
+    border-right: 1px solid #f1f1f1;
-    flex-direction: row;
-    align-items: center;
-    justify-content: center;
-    background: #ffffff;
-    border: 1px solid #dde2e4;
-    border-radius: 8px;
 
-    .aspt-decs {
+    h1 {
-      padding: 54px 25px 51px 61px;
+      display: block;
-      border-right: 1px solid #f1f1f1;
+      font-weight: 500;
+      font-size: 30px;
+      line-height: 32px;
+      color: #000000;
+      text-align: left;
+    }
 
-      h1 {
+    &__avatar {
-        display: block;
+      margin-top: 76px;
-        font-weight: 500;
-        font-size: 30px;
-        line-height: 32px;
-        color: #000000;
-        text-align: left;
-      }
 
-      &__avatar {
+      &_title {
-        margin-top: 76px;
+        display: flex;
+        flex-direction: row;
+        align-items: center;
 
-        &_title {
+        img {
-          display: flex;
+          width: 48px;
-          flex-direction: row;
+          height: 48px;
-          align-items: center;
+          margin: 0 22px 0 0;
-
-          img {
-            width: 48px;
-            height: 48px;
-            margin: 0 22px 0 0;
-          }
-
-          p {
-            font-weight: 500;
-            font-size: 16px;
-            line-height: 24px;
-          }
-        }
-
-        &_back {
-          margin: 40px 0 0 0;
-
-          a {
-            display: flex;
-            align-items: center;
-            font-size: 12px;
-            line-height: 16px;
-            color: #5b6871;
-            text-decoration: none;
-          }
-
-          div {
-            background: #8dc63f;
-            opacity: 0.3;
-            width: 48px;
-            height: 48px;
-            border-radius: 44px;
-            display: flex;
-            align-items: center;
-            justify-content: center;
-            margin: 0 15px 0 0;
-
-            img {
-              margin: 0;
-              width: 50%;
-            }
-          }
-
-          p {
-            font-size: 12px;
-            line-height: 16px;
-            color: #5b6871;
-          }
-        }
-      }
-
-      &__telega {
-        text-align: left;
-
-        h4 {
-          color: #52b709;
-          font-size: 14px;
-          margin: 55px 0 34px 0;
-        }
-
-        p,
-        h4 {
-          font-weight: 900;
-          line-height: 24px;
         }
 
         p {
-          width: 50%;
+          font-weight: 500;
+          font-size: 16px;
+          line-height: 24px;
+        }
+      }
+
+      &_back {
+        margin: 40px 0 0 0;
+
+        a {
+          display: flex;
+          align-items: center;
           font-size: 12px;
+          line-height: 16px;
+          color: #5b6871;
+          text-decoration: none;
         }
 
-        &-logo {
+        div {
+          background: #8dc63f;
+          opacity: 0.3;
+          width: 48px;
+          height: 48px;
+          border-radius: 44px;
           display: flex;
-          flex-direction: row;
+          align-items: center;
+          justify-content: center;
+          margin: 0 15px 0 0;
 
           img {
-            margin: 0 19px 0 0;
+            margin: 0;
+            width: 50%;
           }
         }
+
+        p {
+          font-size: 12px;
+          line-height: 16px;
+          color: #5b6871;
+        }
       }
     }
 
-    .form-interview {
+    &__telega {
       text-align: left;
-      padding: 54px 61px 51px 72px;
+
+      h4 {
+        color: #52b709;
+        font-size: 14px;
+        margin: 55px 0 34px 0;
+      }
+
+      p,
+      h4 {
+        font-weight: 900;
+        line-height: 24px;
+      }
 
       p {
-        font-weight: 400;
+        width: 50%;
-        font-size: 15px;
+        font-size: 12px;
-        line-height: 18px;
-        margin-bottom: 10px;
       }
 
-      button {
+      &-logo {
-        width: 174px;
-        height: 46px;
-        color: white;
-        border: none;
-        font-size: 18px;
-        line-height: 32px;
-        background: #52b709;
-        border-radius: 44px;
-      }
-
-      .input {
-        background: #eff2f7;
-        border-radius: 8px;
         display: flex;
-        justify-content: center;
+        flex-direction: row;
-        width: 294px;
-        height: 35px;
-        margin: 0 0 36px 0;
 
-        input {
+        img {
-          background: #eff2f7;
+          margin: 0 19px 0 0;
-          width: 90%;
-          border: none;
-          outline: none;
-          font-size: 15px;
         }
       }
     }
   }
-}
 
-.modal-aspt.active {
+  .form-interview {
-  transform: scale(1);
+    text-align: left;
+    padding: 54px 61px 51px 72px;
+
+    p {
+      font-weight: 400;
+      font-size: 15px;
+      line-height: 18px;
+      margin-bottom: 10px;
+    }
+
+    &__submit {
+      width: 174px;
+      height: 46px;
+      font-size: 18px;
+    }
+
+    .input {
+      background: #eff2f7;
+      border-radius: 8px;
+      display: flex;
+      justify-content: center;
+      width: 294px;
+      height: 35px;
+      margin: 0 0 36px 0;
+
+      input {
+        background: #eff2f7;
+        width: 90%;
+        border: none;
+        outline: none;
+        font-size: 15px;
+      }
+    }
+  }
 }
 
 .send {

src/components/UI/ModalRegistration/ModalRegistration.jsx

@@ -1,5 +1,8 @@
 import React from "react";
 
+import ModalLayout from "../../Common/ModalLayout/ModalLayout";
+import Button from "../../Common/Button/Button";
+
 import telegramLogo from "../../../assets/icons/tgLogo.svg";
 import doc from "../../../assets/icons/doc.svg";
 import anyMoment from "../../../assets/icons/anyMoment.svg";
@@ -8,71 +11,68 @@ import "./modalRegistration.scss";
 
 export const ModalRegistration = ({ active, setActive }) => {
   return (
-    <div
+    <ModalLayout active={active} setActive={setActive} styles={"registration"}>
-      className={active ? "modal-registration active" : "modal-registration"}
+      <div className="registration-body__left">
-      onClick={() => setActive(false)}
+        <h2>
-    >
+          Подключайтесь к <p>itguild.</p>
-      <div
+        </h2>
-        className="modal-registration__content"
+        <p className="registration-body__left-desc">
-        onClick={(e) => e.stopPropagation()}
+          Зарегистрируйтесь и назначайте собеседования любым специалистам без
-      >
+          задержек
-        <div className="body-reg__left">
+        </p>
-          <h2>
-            Подключайтесь к <p>itguild.</p>
-          </h2>
-          <p className="body-reg__left-desc">
-            Зарегистрируйтесь и назначайте собеседования любым специалистам без
-            задержек
-          </p>
 
-          <div className="input-body">
+        <div className="input-body">
-            <div className="input-body__box">
+          <div className="input-body__box">
-              <h5>Ваше имя</h5>
+            <h5>Ваше имя</h5>
-              <input></input>
+            <input></input>
-              <h5>E-mail</h5>
+            <h5>E-mail</h5>
-              <input></input>
+            <input></input>
-            </div>
-
-            <div className="input-body__box">
-              <h5>Название компании</h5>
-              <input></input>
-              <h5>Пароль</h5>
-              <input></input>
-            </div>
           </div>
-          <div className="button-box">
+
-            <button onClick={(e) => e.preventDefault()}>Отправить</button>
+          <div className="input-body__box">
-            <h5>
+            <h5>Название компании</h5>
-              У вас уже есть аккаунт? <p>Войти</p>
+            <input></input>
-            </h5>
+            <h5>Пароль</h5>
+            <input></input>
           </div>
         </div>
-        <div className="body-reg__right">
+        <div className="button-box">
-          <h4>Отказ от специалиста в любой момент</h4>
+          <Button
-          <div className="body-reg__right-text">
+            onClick={(e) => e.preventDefault()}
-            <img src={anyMoment}></img>
+            styles={"button-box__submit"}
-            <p>
+          >
-              Поменяйте, откажитесь или возьмите еще специалиста в любой момент
+            Отправить
-              работы.
+          </Button>
-            </p>
+          <h5>
-          </div>
+            У вас уже есть аккаунт? <p>Войти</p>
-          <h4>100% постоплата</h4>
+          </h5>
-          <div className="body-reg__right-text">
-            <img src={doc}></img>
-            <p>
-              Договор не подразумевает какую‑либо оплату до того, как вы
-              арендовали специалиста
-            </p>
-          </div>
-          <h4>Есть вопросы?</h4>
-          <div className="body-reg__right-text">
-            <img src={telegramLogo}></img>
-            <p>Напишите нам в Телеграм. Мы с удовольствием ответим!</p>
-          </div>
         </div>
-        <span onClick={() => setActive(false)}></span>
       </div>
-    </div>
+      <div className="registration-body__right">
+        <h4>Отказ от специалиста в любой момент</h4>
+        <div className="registration-body__right-text">
+          <img src={anyMoment}></img>
+          <p>
+            Поменяйте, откажитесь или возьмите еще специалиста в любой момент
+            работы.
+          </p>
+        </div>
+        <h4>100% постоплата</h4>
+        <div className="registration-body__right-text">
+          <img src={doc}></img>
+          <p>
+            Договор не подразумевает какую‑либо оплату до того, как вы
+            арендовали специалиста
+          </p>
+        </div>
+        <h4>Есть вопросы?</h4>
+        <div className="registration-body__right-text">
+          <img src={telegramLogo}></img>
+          <p>Напишите нам в Телеграм. Мы с удовольствием ответим!</p>
+        </div>
+      </div>
+      <span onClick={() => setActive(false)} className="exit"></span>
+    </ModalLayout>
   );
 };
 

src/components/UI/ModalRegistration/modalRegistration.scss

@@ -1,174 +1,128 @@
-.modal-registration {
+.registration {
-  z-index: 9;
+  background: white;
-  height: 100%;
-  width: 100%;
-  background-color: rgba(0, 0, 0, 0.11);
-  position: fixed;
-  top: 0;
-  left: 0;
   display: flex;
-  align-items: center;
+  flex-direction: row;
-  justify-content: center;
+  padding: 0;
-  transform: scale(0);
+  justify-content: space-between;
+  border: 1px solid #dde2e4;
+  border-radius: 8px;
+  width: 1088px;
+  height: 529px;
 
-  &__content {
+  &-body {
-    position: relative;
+    &__left {
-    background: white;
+      padding: 60px 0 30px 77px;
-    display: flex;
-    flex-direction: row;
 
-    justify-content: space-between;
+      h2 {
-    border: 1px solid #dde2e4;
+        font-weight: 500;
-    border-radius: 8px;
+        font-size: 35px;
-    width: 1088px;
+        line-height: 32px;
-    height: 529px;
+        display: flex;
+        justify-content: space-between;
+        width: 405px;
+        margin: 0 auto;
+      }
 
-    .body-reg {
+      h2 > p {
-      &__left {
+        font-size: 35px;
-        padding: 60px 0 30px 77px;
+        color: #52b709;
+      }
 
-        h2 {
+      &-desc {
-          font-weight: 500;
+        text-align: center;
-          font-size: 35px;
+        width: 500px;
-          line-height: 32px;
+        font-weight: 500;
+        font-size: 16px;
+        line-height: 28px;
+        margin: 20px auto 0 auto;
+      }
+
+      .input-body {
+        margin-top: 44px;
+        display: flex;
+        flex-direction: row;
+
+        &__box {
+          margin-right: 25px;
           display: flex;
-          justify-content: space-between;
+          flex-direction: column;
-          width: 405px;
-          margin: 0 auto;
-        }
-
-        h2 > p {
-          font-size: 35px;
-          color: #52b709;
-        }
-
-        &-desc {
-          text-align: center;
-          width: 500px;
-          font-weight: 500;
-          font-size: 16px;
-          line-height: 28px;
-          margin: 20px auto 0 auto;
-        }
-
-        .input-body {
-          margin-top: 44px;
-          display: flex;
-          flex-direction: row;
-
-          &__box {
-            margin-right: 25px;
-            display: flex;
-            flex-direction: column;
-
-            h5 {
-              font-weight: 400;
-              font-size: 15px;
-              line-height: 18px;
-            }
-
-            input {
-              width: 294px;
-              height: 35px;
-              background: #eff2f7;
-              border-radius: 8px;
-              border: none;
-              margin-bottom: 35px;
-              padding-left: 20px;
-            }
-          }
-        }
-
-        .button-box {
-          display: flex;
-          flex-direction: row;
-          margin-top: 10px;
-
-          button {
-            width: 174px;
-            height: 46px;
-            background: #52b709;
-            border-radius: 44px;
-            border: none;
-            font-size: 18px;
-            line-height: 32px;
-            color: white;
-            margin-right: 55px;
-          }
 
           h5 {
-            display: flex;
+            font-weight: 400;
-            align-items: flex-end;
+            font-size: 15px;
-            font-size: 16px;
+            line-height: 18px;
-            line-height: 28px;
+          }
 
-            p {
+          input {
-              color: #406128;
+            width: 294px;
-              text-decoration: underline;
+            height: 35px;
-              margin: 0 0 0 5px;
+            background: #eff2f7;
-            }
+            border-radius: 8px;
+            border: none;
+            margin-bottom: 35px;
+            padding-left: 20px;
           }
         }
       }
 
-      &__right {
+      .button-box {
-        border-left: 1px solid #f1f1f1;
-        padding: 80px 32px 46px 25px;
         display: flex;
-        flex-direction: column;
+        flex-direction: row;
-        justify-content: space-between;
+        margin-top: 10px;
 
-        h4 {
+        &__submit {
-          font-weight: 900;
+          width: 174px;
-          font-size: 14px;
+          height: 46px;
-          line-height: 24px;
+          font-size: 18px;
-          color: #52b709;
+          margin-right: 55px;
-          margin-right: 100px;
-          width: 180px;
         }
 
-        &-text {
+        h5 {
           display: flex;
-          flex-direction: row;
+          align-items: flex-end;
+          font-size: 16px;
+          line-height: 28px;
 
           p {
-            font-weight: 400;
+            color: #406128;
-            font-size: 12px;
+            text-decoration: underline;
-            line-height: 22px;
+            margin: 0 0 0 5px;
-            width: 205px;
-          }
-
-          img {
-            margin: 0 18px 20px 0;
           }
         }
       }
     }
-    span {
-      cursor: pointer;
-      position: absolute;
-      top: 30px;
-      right: 36px;
 
-      &:before,
+    &__right {
-      &:after {
+      border-left: 1px solid #f1f1f1;
-        content: "";
+      padding: 80px 32px 46px 25px;
-        position: absolute;
+      display: flex;
-        width: 16px;
+      flex-direction: column;
-        height: 2px;
+      justify-content: space-between;
-        background: #263238;
+
+      h4 {
+        font-weight: 900;
+        font-size: 14px;
+        line-height: 24px;
+        color: #52b709;
+        margin-right: 100px;
+        width: 180px;
       }
 
-      &:before {
+      &-text {
-        transform: rotate(45deg);
+        display: flex;
-      }
+        flex-direction: row;
-      &:after {
+
-        transform: rotate(-45deg);
+        p {
+          font-weight: 400;
+          font-size: 12px;
+          line-height: 22px;
+          width: 205px;
+        }
+
+        img {
+          margin: 0 18px 20px 0;
+        }
       }
     }
   }
 }
-
-.modal-registration.active {
-  transform: scale(1);
-}

src/pages/PartnerBid/PartnerBid.jsx

@@ -13,11 +13,10 @@ import { ProfileBreadcrumbs } from "../../components/ProfileBreadcrumbs/ProfileB
 import { Footer } from "../../components/Footer/Footer";
 import { Navigation } from "../../components/Navigation/Navigation";
 import { Loader } from "../../components/Loader/Loader";
-import ModalLayout from "../../components/UI/ModalLayout/ModalLayout";
+import ModalLayout from "../../components/Common/ModalLayout/ModalLayout";
-
-import { apiRequest } from "../../api/request";
 import { getCorrectDate } from "../../components/Calendar/calendarHelper";
 
+import { apiRequest } from "../../api/request";
 import { urlForLocal } from "../../helper";
 
 import arrowSwitchDate from "../../assets/icons/arrows/arrowViewReport.png";