partner request design

src/assets/icons/arrows/tableArrow.svg

@@ -0,0 +1,3 @@
+<svg width="9" height="6" viewBox="0 0 9 6" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M4.11629 5.8584L8.07227 0.858398H0.160323L4.11629 5.8584Z" fill="#2E3A59"/>
+</svg>

src/components/Calendar/calendarComponent.scss

@@ -299,7 +299,7 @@
 }
 
 .pass {
-  background-color: #f7d7c9 !important;
+  background-color: #ba5c33 !important;
 }
 
 .today {
@@ -308,7 +308,7 @@
 }
 
 .selected {
-  background-color: #f9f9c3 !important;
+  background-color: #cbcbb4 !important;
 }
 
 .block {

src/components/Modal/Tracker/ModalTicket/ModalTicket.jsx

@@ -664,11 +664,8 @@ export const ModalTiсket = ({
                       "EasyImage",
                       "Image",
                       "ImageCaption",
-                      "ImageStyle",
-                      "ImageToolbar",
                       "ImageUpload",
-                      "MediaEmbed",
+                      "MediaEmbed"
-                      "BlockQuote"
                     ]
                   }}
                   onChange={(event, editor) => {

src/components/Modal/Tracker/TicketFullScreen/TicketFullScreen.jsx

@@ -683,11 +683,8 @@ export const TicketFullScreen = () => {
                             "EasyImage",
                             "Image",
                             "ImageCaption",
-                            "ImageStyle",
-                            "ImageToolbar",
                             "ImageUpload",
-                            "MediaEmbed",
+                            "MediaEmbed"
-                            "BlockQuote"
                           ]
                         }}
                         onChange={(event, editor) => {

src/components/Modal/Tracker/TrackerModal/TrackerModal.jsx

@@ -624,7 +624,15 @@ export const TrackerModal = ({
                       "bulletedList",
                       "numberedList"
                     ],
-                    removePlugins: ["BlockQuote"],
+                    removePlugins: [
+                      "CKFinderUploadAdapter",
+                      "CKFinder",
+                      "EasyImage",
+                      "Image",
+                      "ImageCaption",
+                      "ImageUpload",
+                      "MediaEmbed"
+                    ],
                     placeholder: "Описание задачи"
                   }}
                   onChange={(event, editor) => {

src/components/ReportForm/reportForm.scss

@@ -34,11 +34,15 @@
       display: flex;
       align-items: center;
       grid-column-gap: 30px;
-      column-gap: 30px;
+      column-gap: 10px;
       margin-top: 20px;
       cursor: pointer;
       text-decoration: none;
 
+      img {
+        width: 23px;
+      }
+
       p {
         margin-bottom: 0;
         font-size: 14px;

src/components/TrackerTaskComment/TrackerTaskComment.jsx

@@ -127,11 +127,8 @@ export const TrackerTaskComment = ({
               "EasyImage",
               "Image",
               "ImageCaption",
-              "ImageStyle",
-              "ImageToolbar",
               "ImageUpload",
-              "MediaEmbed",
+              "MediaEmbed"
-              "BlockQuote"
             ]
           }}
           onChange={(event, editor) => {

src/pages/PartnerAddRequest/PartnerAddRequest.jsx

@@ -34,17 +34,20 @@ export const PartnerAddRequest = () => {
   const [specializationList, setSpecializationList] = useState([]);
   const [levelList, setLevelList] = useState([]);
   const [countList] = useState([1, 2, 3, 4, 5]);
+  const [locationList] = useState(["РФ", "Беларусь"]);
   const [openSkillsSelect, setOpenSkillsSelect] = useState(false);
   const [openSpecializationList, setOpenSpecializationListOpen] =
     useState(false);
   const [openLevelList, setOpenLevelList] = useState(false);
   const [openCountList, setOpenCountList] = useState(false);
+  const [openLocationList, setOpenLocationList] = useState(false);
   const [editRequest, setEditRequest] = useState(false);
   const [selectedSkills, setSelectedSkills] = useState([]);
   const [selectedSpecialization, setSelectedSpecialization] = useState(
     "Выберите специализацию"
   );
   const [selectedLevel, setSelectedLevel] = useState("Выберите уровень");
+  const [selectedLocation, setSelectedLocation] = useState("Выберите локацию");
   const [selectedCount, setSelectedCount] = useState(
     "Выберите кол-во сотрудников"
   );
@@ -177,6 +180,7 @@ export const PartnerAddRequest = () => {
       setOpenSpecializationListOpen(false);
       setOpenLevelList(false);
       setOpenCountList(false);
+      setOpenLocationList(false);
     }
   };
 
@@ -202,6 +206,7 @@ export const PartnerAddRequest = () => {
             ? "Страница редактирования заявки"
             : "Страница добавления заявки"}
         </h2>
+        <div className="partner-add-request__main">
           <div className="partner-add-request__section">
             <div className="partner-add-request__form">
               <div className="partner-add-request__form__block form__block">
@@ -357,7 +362,8 @@ export const PartnerAddRequest = () => {
                       src={arrowDown}
                     />
                   </div>
-                {openLevelList && Boolean(Object.values(levelList).length) && (
+                  {openLevelList &&
+                    Boolean(Object.values(levelList).length) && (
                       <div className="form__block__dropDown">
                         {Object.values(levelList).map((level, index) => {
                           return (
@@ -365,7 +371,10 @@ export const PartnerAddRequest = () => {
                               key={level}
                               onClick={() => {
                                 setOpenLevelList(false);
-                            setSelectedLevel({ name: level, id: index + 1 });
+                                setSelectedLevel({
+                                  name: level,
+                                  id: index + 1
+                                });
                               }}
                             >
                               {level}
@@ -417,21 +426,6 @@ export const PartnerAddRequest = () => {
                     </div>
                   )}
                 </div>
-              <div className="form__block__buttons">
-                <Link to="/profile/requests" className="form__block__cancel">
-                  Отмена
-                </Link>
-                <button
-                  onClick={() => handler()}
-                  className={
-                    disableBtn()
-                      ? "form__block__save"
-                      : "form__block__save disable"
-                  }
-                >
-                  Сохранить
-                </button>
-              </div>
               </div>
             </div>
             <div className="partner-add-request__info">
@@ -441,8 +435,8 @@ export const PartnerAddRequest = () => {
                   <h4>Процесс:</h4>
                 </div>
                 <p>
-                При аутстаффе мы предоставляем вам IT-специалистов при этом они
+                  При аутстаффе мы предоставляем вам IT-специалистов при этом
-                находятся в нашем штате.
+                  они находятся в нашем штате.
                   <br />
                   <br />
                   Вы сможете прособеседовать наших специалистов, посмотреть
@@ -474,8 +468,67 @@ export const PartnerAddRequest = () => {
                   </h4>
                 </div>
                 <p>
-                В Личном кабинете платформы получайте отчеты выполненных работ и
+                  В Личном кабинете платформы получайте отчеты выполненных работ
-                счеты на согласование и оплату
+                  и счеты на согласование и оплату
+                </p>
+              </div>
+            </div>
+          </div>
+          <div className="partner-add-request__special">
+            <h4>Основные требования по вакансии</h4>
+            <div className="form__block__section special__select">
+              <h3>Локация</h3>
+              <div
+                className="form__block__section__select"
+                onClick={() => setOpenLocationList(true)}
+              >
+                <span>{selectedLocation}</span>
+                <img
+                  className={openLocationList ? "rotate" : ""}
+                  src={arrowDown}
+                />
+              </div>
+              {openLocationList && (
+                <div className="form__block__dropDown">
+                  {locationList.map((location, index) => {
+                    return (
+                      <p
+                        key={index}
+                        onClick={() => {
+                          setOpenLocationList(false);
+                          setSelectedLocation(location);
+                        }}
+                      >
+                        {location}
+                      </p>
+                    );
+                  })}
+                </div>
+              )}
+            </div>
+            <div className="form__block__section">
+              <h3>Ставка</h3>
+              <div className="form__block__section__input special__select">
+                <input type="text" placeholder="Оплата" />
+              </div>
+            </div>
+            <div className="form__block__buttons">
+              <Link to="/profile/requests" className="form__block__cancel">
+                Отмена
+              </Link>
+              <button
+                onClick={() => handler()}
+                className={
+                  disableBtn()
+                    ? "form__block__save"
+                    : "form__block__save disable"
+                }
+              >
+                Сохранить
+              </button>
+              <p>
+                Нажимая "Сохранить", вы соглашаетесь с Правилами обработки и
+                использования персональных данных
               </p>
             </div>
           </div>

src/pages/PartnerAddRequest/partnerAddRequest.scss

@@ -23,6 +23,31 @@
     line-height: 32px;
   }
 
+  &__main {
+    display: flex;
+    flex-direction: column;
+    row-gap: 30px;
+  }
+
+  &__special {
+    background: rgba(255, 255, 255, 1);
+    border-radius: 12px;
+    padding: 41px 45px 35px 55px;
+    display: flex;
+    flex-direction: column;
+
+    h4 {
+      font-weight: 700;
+      color: rgba(91, 104, 113, 1);
+      font-size: 20px;
+      line-height: 24px;
+    }
+
+    .special__select {
+      max-width: 450px;
+    }
+  }
+
   &__section {
     margin-top: 25px;
     display: flex;
@@ -99,6 +124,7 @@
           font-size: 15px;
           line-height: 18px;
           outline: none;
+          width: 100%;
         }
       }
 
@@ -164,13 +190,23 @@
 
     &__buttons {
       display: flex;
-      margin-top: 50px;
 
       button {
         max-width: 150px;
         width: 100%;
         height: 40px;
       }
+
+      p {
+        font-weight: 300;
+        font-size: 12px;
+        line-height: 18px;
+        color: rgba(0, 0, 0, 1);
+        margin-left: 50px;
+        max-width: 360px;
+        display: flex;
+        align-items: center;
+      }
     }
 
     &__cancel {
@@ -321,7 +357,7 @@
     background: #ffffff;
     border-radius: 12px;
     width: 100%;
-    padding: 74px 48px 136px 62px;
+    padding: 74px 48px 67px 62px;
     display: flex;
     flex-direction: column;
     row-gap: 61px;

src/pages/PartnerСategories/PartnerСategories.jsx

@@ -44,9 +44,25 @@ export const PartnerCategories = () => {
   const theme = useTheme(getTheme());
   const [nodes, setNodes] = useState([]);
   const [initialNodes, setInitialNodes] = useState([]);
+  const [activeTab, setActiveTab] = useState(1);
 
   const [search, setSearch] = useState("");
 
+  const tabs = [
+    {
+      id: 1,
+      name: "Все"
+    },
+    {
+      id: 2,
+      name: "Фронтенд"
+    },
+    {
+      id: 3,
+      name: "Бэкенд"
+    }
+  ];
+
   const COLUMNS = [
     {
       label: "",
@@ -256,6 +272,21 @@ export const PartnerCategories = () => {
           <div className="partner-categories__items">
             {Boolean(initialNodes.length) ? (
               <>
+                <div className="table__tabs">
+                  {tabs.map((tab) => {
+                    return (
+                      <button
+                        onClick={() => setActiveTab(tab.id)}
+                        key={tab.id}
+                        className={`table__tab ${
+                          tab.id === activeTab ? "table__tab--active" : ""
+                        }`}
+                      >
+                        {tab.name}
+                      </button>
+                    );
+                  })}
+                </div>
                 <label className="table__search" htmlFor="search">
                   Поиск по имени:
                   <input

src/pages/PartnerСategories/partnerСategories.scss

@@ -204,6 +204,29 @@
       }
     }
 
+    &__tabs {
+      margin: 0 auto 36px 18px;
+      background: rgba(240, 242, 245, 1);
+      padding: 4px 8px 4px 8px;
+      border-radius: 6px;
+      display: flex;
+    }
+
+    &__tab {
+      color: rgba(46, 58, 89, 1);
+      font-size: 15px;
+      outline: none;
+      background: none;
+      border: none;
+      padding: 0 12px;
+
+      &--active {
+        background: rgba(255, 255, 255, 1);
+        border-radius: 5px;
+        font-size: 16px;
+      }
+    }
+
     &__pagination {
       width: 100%;
       display: flex;

src/pages/Summary/Summary.jsx

@@ -243,11 +243,8 @@ export const Summary = () => {
                       "EasyImage",
                       "Image",
                       "ImageCaption",
-                      "ImageStyle",
-                      "ImageToolbar",
                       "ImageUpload",
-                      "MediaEmbed",
+                      "MediaEmbed"
-                      "BlockQuote"
                     ]
                   }}
                   onChange={(event, editor) => {

src/pages/ViewReport/viewReport.scss

@@ -64,13 +64,18 @@
   &__back {
     display: flex;
     align-items: center;
-    column-gap: 30px;
+    column-gap: 10px;
     margin-top: 20px;
     cursor: pointer;
 
     &:hover {
       text-decoration: none;
     }
+
+    img {
+      width: 23px;
+    }
+
     p {
       margin-bottom: 0;
       font-weight: 400;