From af07631abe5716fe43fe87a258b653605c373458 Mon Sep 17 00:00:00 2001 From: Gubar Nikita Date: Fri, 9 Feb 2024 18:17:15 +0300 Subject: [PATCH] refactoring allStyles styleStyle -> style-style --- .../AllTaskTableItem/AllTaskTableItem.jsx | 6 +- .../AllTaskTableItem/allTaskTableItem.scss | 2 +- .../AllTaskTableTracker.jsx | 2 +- .../ArchiveTableTracker.jsx | 2 +- .../ArchiveTasksItem/ArchiveTasksItem.jsx | 8 +- .../ArchiveTasksItem/archiveTasksItem.scss | 4 +- src/components/AuthBox/AuthBox.jsx | 2 +- src/components/AuthBox/authBox.scss | 2 +- .../Calendar/calendarComponent.scss | 8 +- src/components/Candidate/candidate.scss | 2 +- src/components/CardControl/CardControl.jsx | 2 +- src/components/CardControl/CardControl.scss | 2 +- .../CatalogPersonCard/CatalogPersonCard.jsx | 22 ++-- .../CatalogPersonCard/catalogPersonCard.scss | 20 +-- .../CategoriesItem/CategoriesItem.jsx | 8 +- .../CategoriesItem/categoriesItem.scss | 2 +- src/components/FileTracker/FileTracker.jsx | 6 +- .../Modal/AcceptModal/AcceptModal.jsx | 10 +- .../Modal/AcceptModal/acceptModal.scss | 4 +- .../ModalRegistration/ModalRegistration.jsx | 8 +- .../ModalRegistration/modalRegistration.scss | 2 +- src/components/Modal/ModalReset/ModalReset.js | 10 +- .../Modal/ModalReset/modalReset.scss | 10 +- .../ModalResetPassword/ModalResetPassword.jsx | 20 +-- .../modalResetPassword.scss | 13 +- .../ModalTrackerRegistration.js | 10 +- .../modalTrackerRegistration.scss | 6 +- .../Tracker/ListEmployees/listEmployees.scss | 6 +- .../Modal/Tracker/ModalTicket/ModalTicket.jsx | 38 +++--- .../Tracker/ModalTicket/modalTicket.scss | 38 +++--- .../TicketFullScreen/TicketFullScreen.jsx | 46 +++---- .../TicketFullScreen/ticketFullScreen.scss | 21 ++-- .../Tracker/TrackerModal/TrackerModal.jsx | 18 +-- .../Tracker/TrackerModal/trackerModal.scss | 12 +- src/components/Navigation/Navigation.jsx | 6 +- .../PartnerPersonCard/PartnerPersonCard.jsx | 12 +- .../PartnerPersonCard/partnerPersonCard.scss | 4 +- .../ProfileBreadcrumbs/ProfileBreadcrumbs.jsx | 2 +- .../profileBreadcrumbs.scss | 2 +- .../ProfileCalendarComponent.jsx | 8 +- .../ProfileHeader/profileHeader.scss | 6 +- src/components/ReportForm/ReportForm.jsx | 8 +- src/components/ReportForm/reportForm.scss | 8 +- src/components/ShortReport/ShortReport.jsx | 24 ++-- src/components/ShortReport/shortReport.scss | 2 +- src/components/StarRating/StarRating.scss | 4 + src/components/TaskItem/taskItem.scss | 1 + .../TrackerSelectColumn.jsx | 4 +- .../trackerSelectColumn.scss | 4 +- .../TrackerTaskComment/TrackerTaskComment.jsx | 2 +- .../features/quiz/CardAviableTest.jsx | 2 +- src/components/features/quiz/quiz.scss | 2 +- src/pages/Auth/auth.scss | 10 +- .../AuthForCandidate/AuthForCandidate.jsx | 2 +- .../AuthForCandidate/authForCandidate.scss | 4 +- .../CatalogSpecialists/CatalogSpecialists.jsx | 18 +-- .../catalogSpecialists.scss | 22 ++-- src/pages/CompanyInfo/CompanyInfo.jsx | 42 +++---- src/pages/CompanyInfo/companyInfo.scss | 30 ++--- .../FrequentlyAskedQuestion.scss | 119 +++++++++--------- .../FrequentlyAskedQuestions.scss | 12 +- .../PartnerAddRequest/PartnerAddRequest.js | 26 ++-- .../PartnerAddRequest/partnerAddRequest.scss | 38 +++--- src/pages/PartnerBid/PartnerBid.jsx | 31 ++--- src/pages/PartnerBid/partnerBid.scss | 4 +- .../PartnerEmployeeReport.jsx | 16 +-- .../partnerEmployeeReport.scss | 6 +- .../PartnerEmployees/PartnerEmployees.js | 18 +-- .../PartnerEmployees/partnerEmployees.scss | 25 ++-- src/pages/PartnerRequests/PartnerRequests.jsx | 28 ++--- .../PartnerRequests/partnerRequests.scss | 8 +- src/pages/PartnerSettings/PartnerSettings.jsx | 2 +- .../PartnerSettings/partnerSettings.scss | 2 +- src/pages/PartnerTreaties/PartnerTreaties.js | 22 ++-- .../PartnerTreaties/partnerTreaties.scss | 25 ++-- .../PartnerСategories/PartnerСategories.jsx | 12 +- .../partnerСategories.scss | 24 ++-- src/pages/ProjectTracker/ProjectTracker.js | 54 ++++---- src/pages/Quiz/quiz-page.scss | 21 ++++ .../RegistrationForCandidate.js | 30 ++--- .../registationForCandidate.scss | 4 +- .../RegistrationSetting.js | 32 ++--- .../registrationSetting.scss | 31 ++--- src/pages/Summary/Summary.js | 32 ++--- src/pages/Summary/summary.scss | 14 +-- src/pages/Tracker/Tracker.jsx | 34 ++--- src/pages/Tracker/tracker.scss | 44 +++---- src/pages/TrackerIntro/TrackerIntro.js | 40 +++--- src/pages/TrackerIntro/trackerIntro.scss | 18 +-- .../TrackerRegistration.js | 8 +- .../trackerRegistration.scss | 10 +- src/pages/ViewReport/ViewReport.jsx | 34 ++--- src/pages/ViewReport/viewReport.scss | 29 +++-- 93 files changed, 751 insertions(+), 703 deletions(-) diff --git a/src/components/AllTaskTableTracker/AllTaskTableItem/AllTaskTableItem.jsx b/src/components/AllTaskTableTracker/AllTaskTableItem/AllTaskTableItem.jsx index 5fe752e6..6efa3771 100644 --- a/src/components/AllTaskTableTracker/AllTaskTableItem/AllTaskTableItem.jsx +++ b/src/components/AllTaskTableTracker/AllTaskTableItem/AllTaskTableItem.jsx @@ -9,14 +9,14 @@ const AllTaskTableItem = ({ task, projects }) => { e.target?.classList.toggle("open-desc-item"); e.target .closest("td") - ?.querySelector(".taskList__table__name-project") + ?.querySelector(".task-list__table__name-project") .classList.toggle("hide-desc"); } return ( -
+

{task.title}

{ }} />
-
+

Проект:

{projects?.map((project) => { diff --git a/src/components/AllTaskTableTracker/AllTaskTableItem/allTaskTableItem.scss b/src/components/AllTaskTableTracker/AllTaskTableItem/allTaskTableItem.scss index d8482e9f..4cf62943 100644 --- a/src/components/AllTaskTableTracker/AllTaskTableItem/allTaskTableItem.scss +++ b/src/components/AllTaskTableTracker/AllTaskTableItem/allTaskTableItem.scss @@ -3,7 +3,7 @@ transform: rotate(45deg) !important; } -.taskList { +.task-list { &__table { margin-top: 20px; font-size: 14px; diff --git a/src/components/AllTaskTableTracker/AllTaskTableTracker.jsx b/src/components/AllTaskTableTracker/AllTaskTableTracker.jsx index 56e0575b..9f57c34e 100644 --- a/src/components/AllTaskTableTracker/AllTaskTableTracker.jsx +++ b/src/components/AllTaskTableTracker/AllTaskTableTracker.jsx @@ -34,7 +34,7 @@ const AllTaskTableTracker = ({ filteredAllTasks, projects, loader }) => { return ( <> - +
diff --git a/src/components/ArchiveTableTracker/ArchiveTableTracker.jsx b/src/components/ArchiveTableTracker/ArchiveTableTracker.jsx index 71148cfd..13b046ad 100644 --- a/src/components/ArchiveTableTracker/ArchiveTableTracker.jsx +++ b/src/components/ArchiveTableTracker/ArchiveTableTracker.jsx @@ -26,7 +26,7 @@ const ArchiveTableTracker = ({ filterCompleteTasks, loader }) => { ) : ( diff --git a/src/components/ArchiveTableTracker/ArchiveTasksItem/ArchiveTasksItem.jsx b/src/components/ArchiveTableTracker/ArchiveTasksItem/ArchiveTasksItem.jsx index 2247e071..e1418e6f 100644 --- a/src/components/ArchiveTableTracker/ArchiveTasksItem/ArchiveTasksItem.jsx +++ b/src/components/ArchiveTableTracker/ArchiveTasksItem/ArchiveTasksItem.jsx @@ -7,8 +7,8 @@ import "./archiveTasksItem.scss"; const ArchiveTasksItem = ({ task, index }) => { return ( - - -
Задача
-
+

В данном месяце у вас не было задач

-

{task.title}

+ 		+

{task.title}

{/* { {/* }}*/} {/*/>*/} 		+

{new Date( task.timers.reduce((acc, cur) => acc + cur.deltaSeconds, 0) * 1000 @@ -25,7 +25,7 @@ const ArchiveTasksItem = ({ task, index }) => { .slice(11, 19)}

+

{getCorrectDate(task.updated_at)}

diff --git a/src/components/ArchiveTableTracker/ArchiveTasksItem/archiveTasksItem.scss b/src/components/ArchiveTableTracker/ArchiveTasksItem/archiveTasksItem.scss index 3fc6237b..f214e04d 100644 --- a/src/components/ArchiveTableTracker/ArchiveTasksItem/archiveTasksItem.scss +++ b/src/components/ArchiveTableTracker/ArchiveTasksItem/archiveTasksItem.scss @@ -1,10 +1,10 @@ -.completeTask__title { +.complete-task__title { white-space: nowrap; max-width: 250px; text-overflow: ellipsis; overflow: hidden; } -.archive__completeTask__time { +.archive__complete-task__time { text-align: center; } diff --git a/src/components/AuthBox/AuthBox.jsx b/src/components/AuthBox/AuthBox.jsx index acda9724..27c5bf67 100644 --- a/src/components/AuthBox/AuthBox.jsx +++ b/src/components/AuthBox/AuthBox.jsx @@ -90,7 +90,7 @@ export const AuthBox = ({ title }) => { -
+
{

-
+
arrow
diff --git a/src/components/CardControl/CardControl.scss b/src/components/CardControl/CardControl.scss index f7d68f91..647d35dd 100644 --- a/src/components/CardControl/CardControl.scss +++ b/src/components/CardControl/CardControl.scss @@ -60,7 +60,7 @@ font-weight: 700; } } - &Link { + &-link { width: 48px; height: 48px; background: #ddeec6; diff --git a/src/components/CatalogPersonCard/CatalogPersonCard.jsx b/src/components/CatalogPersonCard/CatalogPersonCard.jsx index 4395c27a..b026e229 100644 --- a/src/components/CatalogPersonCard/CatalogPersonCard.jsx +++ b/src/components/CatalogPersonCard/CatalogPersonCard.jsx @@ -12,30 +12,30 @@ export const CatalogPersonCard = ({ description }) => { return ( -
-
-
+
+
+
avatar - {level} + {level}
-
- {name} - {salary} / час -

+

+ {name} + {salary} / час +

Разработка: {category}

-
+
{skills.map((item, index) => { return ( -
+
{item}
); })}
-

{description}

+

{description}

); }; diff --git a/src/components/CatalogPersonCard/catalogPersonCard.scss b/src/components/CatalogPersonCard/catalogPersonCard.scss index 6bae36b0..7192a92f 100644 --- a/src/components/CatalogPersonCard/catalogPersonCard.scss +++ b/src/components/CatalogPersonCard/catalogPersonCard.scss @@ -1,5 +1,5 @@ -.catalogPersonCard { - background: #FFFFFF; +.catalog-person-card { + background: #ffffff; padding: 29px 32px; border-radius: 8px; display: flex; @@ -25,7 +25,7 @@ bottom: -10px; padding: 3.5px 19px; border-radius: 44px; - background: #1458DD; + background: #1458dd; color: white; font-size: 14px; } @@ -45,7 +45,7 @@ } &__salary { - color: #1458DD; + color: #1458dd; font-weight: 700; font-size: 18px; line-height: 22px; @@ -53,7 +53,7 @@ &__category { span { - color: #6F6F6F; + color: #6f6f6f; font-size: 12px; line-height: 18px; font-weight: 400; @@ -72,25 +72,25 @@ row-gap: 16px; margin-top: 22px; padding-bottom: 17px; - border-bottom: 0.5px solid #B3DF93; + border-bottom: 0.5px solid #b3df93; } - &__skillItem { + &__skill-item { display: flex; justify-content: center; align-items: center; font-size: 12px; - color: #6F6F6F; + color: #6f6f6f; width: 62px; height: 26px; - border: 0.5px solid #8DC63F; + border: 0.5px solid #8dc63f; border-radius: 44px; } &__description { margin-top: 17px; max-width: 245px; - color: #6F6F6F; + color: #6f6f6f; font-size: 12px; line-height: 18px; } diff --git a/src/components/CategoriesItem/CategoriesItem.jsx b/src/components/CategoriesItem/CategoriesItem.jsx index a91eeccc..a0f0900d 100644 --- a/src/components/CategoriesItem/CategoriesItem.jsx +++ b/src/components/CategoriesItem/CategoriesItem.jsx @@ -10,14 +10,16 @@ export const CategoriesItem = ({ img, title, skills, available, link }) => { -
+
img
{title}
-
+

{skills}

arrow diff --git a/src/components/CategoriesItem/categoriesItem.scss b/src/components/CategoriesItem/categoriesItem.scss index eabcad44..f4e04353 100644 --- a/src/components/CategoriesItem/categoriesItem.scss +++ b/src/components/CategoriesItem/categoriesItem.scss @@ -1,4 +1,4 @@ -.categoriesItem { +.categories-item { display: flex; flex-direction: column; padding: 33px 32px 25px 28px; diff --git a/src/components/FileTracker/FileTracker.jsx b/src/components/FileTracker/FileTracker.jsx index 0d940f35..62ae64c7 100644 --- a/src/components/FileTracker/FileTracker.jsx +++ b/src/components/FileTracker/FileTracker.jsx @@ -24,14 +24,14 @@ const FileTracker = ({ file, setDeletedTask, taskId }) => { return (
{ if (openImg) setOpenImg(!openImg); }} > img { @@ -39,7 +39,7 @@ const FileTracker = ({ file, setDeletedTask, taskId }) => { }} /> {!openImg && ( -
deleteFile(file)}> +
deleteFile(file)}> delete
)} diff --git a/src/components/Modal/AcceptModal/AcceptModal.jsx b/src/components/Modal/AcceptModal/AcceptModal.jsx index c39af125..f1486d57 100644 --- a/src/components/Modal/AcceptModal/AcceptModal.jsx +++ b/src/components/Modal/AcceptModal/AcceptModal.jsx @@ -6,10 +6,10 @@ import "./acceptModal.scss"; export const AcceptModal = ({ title, closeModal, agreeHandler }) => { return ( -
-
-

{title}

-
+
+
+

{title}

+
close {
-
+
Ваше имя
{ /> {validationErrors.username}
-
+
E-mail
{
-
+
Пароль
{ /> {validationErrors.password}
-
+
Повторите пароль
{ return ( -
-

Восстановление доступа

-
+
+

Восстановление доступа

+
Укажите e-mail, для которого хотите восстановить пароль.
- + setModalReset(false)} src={close} - className="modalReset__close" + className="modal-reset__close" alt="close" />
diff --git a/src/components/Modal/ModalReset/modalReset.scss b/src/components/Modal/ModalReset/modalReset.scss index c2c8deba..1b53c86f 100644 --- a/src/components/Modal/ModalReset/modalReset.scss +++ b/src/components/Modal/ModalReset/modalReset.scss @@ -1,8 +1,8 @@ -.modalReset { +.modal-reset { display: flex; flex-direction: column; border-radius: 20px; - background: linear-gradient(180deg, #FFF 0%, #EBEBEB 100%); + background: linear-gradient(180deg, #fff 0%, #ebebeb 100%); padding: 23px 110px 8px 36px; row-gap: 29px; position: relative; @@ -28,7 +28,7 @@ padding: 8px 12px; font-size: 15px; border-radius: 8px; - background-color: #EFF2F7; + background-color: #eff2f7; outline: none; border: none; max-width: 300px; @@ -37,9 +37,9 @@ &__submit { border-radius: 44px; - background: #52B709; + background: #52b709; padding: 9px 46px; - color: #FFF; + color: #fff; font-size: 16px; font-weight: 500; line-height: 32px; diff --git a/src/components/Modal/ModalResetPassword/ModalResetPassword.jsx b/src/components/Modal/ModalResetPassword/ModalResetPassword.jsx index 72a90203..d3b093bf 100644 --- a/src/components/Modal/ModalResetPassword/ModalResetPassword.jsx +++ b/src/components/Modal/ModalResetPassword/ModalResetPassword.jsx @@ -117,16 +117,16 @@ export const ModalResetPassword = ({ active, setActive }) => { }; return ( -
+
close setActive(false)} /> -

Восстановление пароля

+

Восстановление пароля

{!step ? ( -
+
Введите ваш e-mail:
{ ) : (
) : ( -
+
setStep(false)} - className="resetPassword__email__arrow" + className="reset-password__email__arrow" />
Введите код подтверждения:
{ placeholder="token" /> {inputsError.token && ( - Введите данные + Введите данные )}
Введите новый пароль:
{ className={inputsError.password ? "error" : ""} /> {inputsError.password && ( - Минимум 6 символов + Минимум 6 символов )} {loader ? ( ) : ( Добавить исполнителя {dropListOpen && ( -
+
setDropListOpen(false)} /> {correctProjectUsers.map((person) => { return (
taskExecutor(person)} > @@ -848,7 +848,7 @@ export const ModalTiсket = ({
)} -
+
Добавить участников {dropListMembersOpen && ( -
+
setDropListMembersOpen(false)} /> {users.length ? ( users.map((person) => { return (
addMember(person)} > @@ -884,7 +884,7 @@ export const ModalTiсket = ({ ); }) ) : ( -

Нет пользователей

+

Нет пользователей

)}
)} @@ -892,9 +892,9 @@ export const ModalTiсket = ({
-
+
setDatePickerOpen(!datePickerOpen)} > calendar @@ -994,7 +994,7 @@ export const ModalTiсket = ({ {correctProjectTags.map((tag) => { return (
addTagToTask(tag.id)} > @@ -1004,7 +1004,7 @@ export const ModalTiсket = ({ ); })} {!Boolean(correctProjectTags.length) && ( -

Нет тегов

+

Нет тегов

)}
)} diff --git a/src/components/Modal/Tracker/ModalTicket/modalTicket.scss b/src/components/Modal/Tracker/ModalTicket/modalTicket.scss index 92e56b86..d41d2946 100644 --- a/src/components/Modal/Tracker/ModalTicket/modalTicket.scss +++ b/src/components/Modal/Tracker/ModalTicket/modalTicket.scss @@ -143,7 +143,7 @@ margin-bottom: 0; } - .taskName { + .task-name { display: -webkit-box; max-width: 550px; overflow: hidden; @@ -152,11 +152,11 @@ -webkit-box-orient: vertical; } - .fullName { + .full-name { max-width: 800px; } - .fullDescription { + .full-description { max-width: 800px; } @@ -195,7 +195,7 @@ margin: 10px 0; } - &__subComment { + &__sub-comment { &:before { content: ""; background: #e4e4e6; @@ -368,22 +368,22 @@ margin-top: 33px; overflow-y: auto; - .taskFile { + .task-file { cursor: pointer; position: relative; - .imgFile { + .img-file { max-width: 170px; max-height: 104px; object-fit: contain; } &:hover { - .deleteFile { + .delete-file { background: rgb(226, 226, 226, 0.6); } } - .deleteFile { + .delete-file { position: absolute; cursor: pointer; display: flex; @@ -404,7 +404,7 @@ } } - .ImgOpened { + .img-opened { position: fixed; width: 100vw; height: 100vh; @@ -416,7 +416,7 @@ z-index: 100; background-color: rgba(0, 0, 0, 0.2); - .imgFile { + .img-file { width: 90vw; height: 90vh; max-width: none; @@ -425,18 +425,18 @@ } } - .fileLoaded { + .file-loaded { display: flex; align-items: center; margin: 10px 0 0; - .loadedFile { + .loaded-file { position: relative; img { max-width: 100px; object-fit: contain; } - .deleteFile { + .delete-file { position: absolute; cursor: pointer; display: flex; @@ -456,7 +456,7 @@ } } &:hover { - .deleteFile { + .delete-file { background: rgb(226, 226, 226, 0.6); } } @@ -727,7 +727,7 @@ } } - .deadLine { + .dead-line { position: relative; &__container { padding: 5px 10px 5px; @@ -925,7 +925,7 @@ } } - .dropdownList { + .dropdown-list { position: absolute; background: white; padding: 10px; @@ -938,7 +938,7 @@ flex-direction: column; row-gap: 8px; - .noUsers { + .no-users { font-size: 14px; text-align: center; } @@ -1065,7 +1065,7 @@ top: 5px; } - .tagItem { + .tag-item { display: flex; align-items: center; justify-content: space-between; @@ -1092,7 +1092,7 @@ } } - &__noItem { + &__no-item { line-height: 20px; font-size: 15px; margin: 0; diff --git a/src/components/Modal/Tracker/TicketFullScreen/TicketFullScreen.jsx b/src/components/Modal/Tracker/TicketFullScreen/TicketFullScreen.jsx index 803aa2c0..e031cbb3 100644 --- a/src/components/Modal/Tracker/TicketFullScreen/TicketFullScreen.jsx +++ b/src/components/Modal/Tracker/TicketFullScreen/TicketFullScreen.jsx @@ -565,7 +565,7 @@ export const TicketFullScreen = () => { (div) => div.classList && (div.classList.contains("button-add-worker") || - div.classList.contains("dropdownList")) + div.classList.contains("dropdown-list")) ) ) { setDropListOpen(false); @@ -577,7 +577,7 @@ export const TicketFullScreen = () => { !path.find( (div) => div.classList && - (div.classList.contains("deadLine") || + (div.classList.contains("dead-line") || div.classList.contains("react-datepicker-popper")) ) ) { @@ -674,7 +674,7 @@ export const TicketFullScreen = () => { }} /> ) : ( -
+
{inputsValue.title}
)} @@ -708,7 +708,7 @@ export const TicketFullScreen = () => { ) : (
{ )}
{Boolean(taskFiles.length) && ( -
+
{taskFiles.map((file) => { return ( {
)} {uploadedFile && ( -
+
{uploadedFile.map((file) => { return ( -
+
img
deleteLoadedFile(file)} > delete @@ -775,7 +775,7 @@ export const TicketFullScreen = () => { {caseOfNum(taskFiles.length, "files")}
-
+
{
-
+
Создатель:

 {taskInfo.user?.fio}

@@ -836,7 +836,7 @@ export const TicketFullScreen = () => {
) : ( -
+
Добавить исполнителя {dropListOpen && ( -
+
setDropListOpen(false)} /> {correctProjectUsers.map((person) => { return (
taskExecutor(person)} > @@ -901,7 +901,7 @@ export const TicketFullScreen = () => {
)} -
+
Добавить участников {dropListMembersOpen && ( -
+
setDropListMembersOpen(false)} /> {users.length ? ( users.map((person) => { return (
addMember(person)} > @@ -937,7 +937,7 @@ export const TicketFullScreen = () => { ); }) ) : ( -

Нет пользователей

+

Нет пользователей

)}
)} @@ -945,9 +945,9 @@ export const TicketFullScreen = () => {
-
+
setDatePickerOpen(!datePickerOpen)} > calendar @@ -1050,7 +1050,7 @@ export const TicketFullScreen = () => { {correctProjectTags.map((tag) => { return (
addTagToTask(tag.id)} > @@ -1060,7 +1060,7 @@ export const TicketFullScreen = () => { ); })} {!Boolean(correctProjectTags.length) && ( -

Нет тегов

+

Нет тегов

)}
)} diff --git a/src/components/Modal/Tracker/TicketFullScreen/ticketFullScreen.scss b/src/components/Modal/Tracker/TicketFullScreen/ticketFullScreen.scss index 525dd6e9..907779dc 100644 --- a/src/components/Modal/Tracker/TicketFullScreen/ticketFullScreen.scss +++ b/src/components/Modal/Tracker/TicketFullScreen/ticketFullScreen.scss @@ -2,11 +2,11 @@ background: #f5f5f5; } -.fullName { +.full-name { display: flex; align-items: center; span { - color: #6F6F6F; + color: #6f6f6f; font-weight: 500; font-size: 12px; line-height: 17px; @@ -39,7 +39,7 @@ span { display: flex; width: 120px; - color: #6F6F6F; + color: #6f6f6f; font-weight: 500; font-size: 12px; line-height: 17px; @@ -47,9 +47,9 @@ } } -.fullScreenWorkers { +.fullscreen-workers { @media (max-width: 880px) { - background: #DFF1FF; + background: #dff1ff; .workers_box { @media (max-width: 880px) { @@ -62,7 +62,6 @@ .workers__creator { margin-bottom: 0 !important; display: flex; - } .add-worker { @@ -85,7 +84,7 @@ gap: 20px; border-bottom: none !important; - .deadLine { + .dead-line { width: 100%; } @@ -123,13 +122,13 @@ } } -.commentFullScreen { +.comment-fullscreen { @media (max-width: 520px) { width: auto !important; } } -.filesFullScreen { +.files-fullscreen { @media (max-width: 520px) { justify-content: space-evenly; max-height: 400px !important; @@ -142,13 +141,13 @@ } } -.nameFullScreen { +.name-fullscreen { @media (max-width: 520px) { white-space: inherit !important; } } -.fullScreenDescription { +.fullscreen-description { @media (max-width: 1190px) { white-space: inherit !important; } diff --git a/src/components/Modal/Tracker/TrackerModal/TrackerModal.jsx b/src/components/Modal/Tracker/TrackerModal/TrackerModal.jsx index c918c9d6..622eafc3 100644 --- a/src/components/Modal/Tracker/TrackerModal/TrackerModal.jsx +++ b/src/components/Modal/Tracker/TrackerModal/TrackerModal.jsx @@ -487,8 +487,8 @@ export const TrackerModal = ({ {modalType === "create-ticket-project" && ( <>
-
-
+
+

Создатель: {profileInfo?.fio}

-
-
+
+

Введите название и описание задачи

-
-
+
+
{taskTags.map((tag) => { return (
@@ -598,7 +598,7 @@ export const TrackerModal = ({ ); })} {Boolean(!correctProjectTags.length) && ( -

Нет тегов

+

Нет тегов

)}
)} @@ -690,7 +690,7 @@ export const TrackerModal = ({
)}
-
+
calendar Срок исполнения arrow diff --git a/src/components/Modal/Tracker/TrackerModal/trackerModal.scss b/src/components/Modal/Tracker/TrackerModal/trackerModal.scss index 5d7560ba..8e249ea0 100644 --- a/src/components/Modal/Tracker/TrackerModal/trackerModal.scss +++ b/src/components/Modal/Tracker/TrackerModal/trackerModal.scss @@ -293,7 +293,7 @@ } } - .createTaskHead { + .create-task-head { width: 100%; padding: 5px 10px; display: flex; @@ -307,7 +307,7 @@ color: #000000; } - &__selectColumn { + &__select-column { display: flex; column-gap: 8px; cursor: pointer; @@ -323,7 +323,7 @@ } } - .createTaskBody { + .create-task-body { padding: 10px; display: flex; column-gap: 20px; @@ -436,7 +436,7 @@ gap: 8px; max-width: 393px; - .selectedTag { + .selected-tag { display: flex; padding: 7px 7px 7px 8px; border-radius: 35px; @@ -513,7 +513,7 @@ } } - .noTags { + .no-tags { text-align: center; font-size: 18px; } @@ -591,7 +591,7 @@ font-size: 16px; } - &__deadLine { + &__dead-line { display: flex; align-items: center; column-gap: 18px; diff --git a/src/components/Navigation/Navigation.jsx b/src/components/Navigation/Navigation.jsx index dc48a5dc..a94a0686 100644 --- a/src/components/Navigation/Navigation.jsx +++ b/src/components/Navigation/Navigation.jsx @@ -88,8 +88,8 @@ export const Navigation = () => { })} -
-

+
+

{profileInfo?.fio ? profileInfo?.fio : profileInfo?.username}

@@ -97,7 +97,7 @@ export const Navigation = () => { src={ profileInfo?.photo ? urlForLocal(profileInfo.photo) : avatarMok } - className="profile-header__personalInfoAvatar" + className="profile-header__personal-info-avatar" alt="avatar" /> diff --git a/src/components/PartnerPersonCard/PartnerPersonCard.jsx b/src/components/PartnerPersonCard/PartnerPersonCard.jsx index ac62ebb2..1861ab5a 100644 --- a/src/components/PartnerPersonCard/PartnerPersonCard.jsx +++ b/src/components/PartnerPersonCard/PartnerPersonCard.jsx @@ -9,18 +9,18 @@ import "./partnerPersonCard.scss"; export const PartnerPersonCard = ({ name, img, userId }) => { return ( -
-
+
+
avatar
-
-

{name}

+
+

{name}

Подробный отчет -
+
arrow
diff --git a/src/components/PartnerPersonCard/partnerPersonCard.scss b/src/components/PartnerPersonCard/partnerPersonCard.scss index 5ca095f4..160a5fbf 100644 --- a/src/components/PartnerPersonCard/partnerPersonCard.scss +++ b/src/components/PartnerPersonCard/partnerPersonCard.scss @@ -1,4 +1,4 @@ -.partnerPersonCard { +.partner-person-card { display: flex; position: relative; @@ -15,7 +15,7 @@ &__info { position: relative; - background: #E1FCCF; + background: #e1fccf; z-index: 1; padding: 15px 15px 15px 30px; left: -15px; diff --git a/src/components/ProfileBreadcrumbs/ProfileBreadcrumbs.jsx b/src/components/ProfileBreadcrumbs/ProfileBreadcrumbs.jsx index 1de2b38b..5626e3a5 100644 --- a/src/components/ProfileBreadcrumbs/ProfileBreadcrumbs.jsx +++ b/src/components/ProfileBreadcrumbs/ProfileBreadcrumbs.jsx @@ -5,7 +5,7 @@ import "./profileBreadcrumbs.scss"; export const ProfileBreadcrumbs = ({ links }) => { return ( -
+
{links.map((link, index) => { return ( diff --git a/src/components/ProfileBreadcrumbs/profileBreadcrumbs.scss b/src/components/ProfileBreadcrumbs/profileBreadcrumbs.scss index e7a1e744..20b3a525 100644 --- a/src/components/ProfileBreadcrumbs/profileBreadcrumbs.scss +++ b/src/components/ProfileBreadcrumbs/profileBreadcrumbs.scss @@ -1,4 +1,4 @@ -.profileBreadcrumbs { +.profile-breadcrumbs { display: flex; margin-bottom: 12px; diff --git a/src/components/ProfileCalendar/ProfileCalendarComponent.jsx b/src/components/ProfileCalendar/ProfileCalendarComponent.jsx index 8cab6dd5..13fbaeb4 100644 --- a/src/components/ProfileCalendar/ProfileCalendarComponent.jsx +++ b/src/components/ProfileCalendar/ProfileCalendarComponent.jsx @@ -244,13 +244,13 @@ export const ProfileCalendarComponent = React.memo( key={day} className={ startRangeDays - ? `selectDays ${ + ? `select-days ${ String(startDate?._d) === String(day._d) || endDate === day - ? "selectedDay" + ? "selected-day" : "" } ${endDate ? "disable" : ""} ${ - selectedRangeDays[day] ? "selectedDay" : "" + selectedRangeDays[day] ? "selected-day" : "" }` : dayStyles(day) } @@ -270,7 +270,7 @@ export const ProfileCalendarComponent = React.memo( )}
-
+
{ diff --git a/src/components/ProfileHeader/profileHeader.scss b/src/components/ProfileHeader/profileHeader.scss index 8c95104b..ede51420 100644 --- a/src/components/ProfileHeader/profileHeader.scss +++ b/src/components/ProfileHeader/profileHeader.scss @@ -84,12 +84,12 @@ } } - &__personalInfo { + &__personal-info { display: flex; column-gap: 20px; align-items: center; - &Name { + &-name { margin-bottom: 0; font-size: 12px; line-height: 32px; @@ -103,7 +103,7 @@ } } - &Avatar { + &-avatar { width: 37px; height: 37px; border-radius: 100px; diff --git a/src/components/ReportForm/ReportForm.jsx b/src/components/ReportForm/ReportForm.jsx index 8d719b1c..b27287db 100644 --- a/src/components/ReportForm/ReportForm.jsx +++ b/src/components/ReportForm/ReportForm.jsx @@ -200,7 +200,7 @@ const ReportForm = () => { value={inputs[index].task} className={ !input.task && reportSuccess === "Заполните задачи" - ? "checkTask" + ? "check-task" : "" } name="text" @@ -224,7 +224,7 @@ const ReportForm = () => { className={ !input.hours_spent && reportSuccess === "Заполните задачи" - ? "checkTask" + ? "check-task" : "" } name="number" @@ -259,7 +259,7 @@ const ReportForm = () => { })}
-

+

+

Добавить задачу @@ -313,7 +313,7 @@ const ReportForm = () => { {reportSuccess && (

{reportSuccess} diff --git a/src/components/ReportForm/reportForm.scss b/src/components/ReportForm/reportForm.scss index 9c4a7b3c..a056498a 100644 --- a/src/components/ReportForm/reportForm.scss +++ b/src/components/ReportForm/reportForm.scss @@ -194,7 +194,7 @@ flex-direction: column; &--description { - .checkTask { + .check-task { border-color: #fc0000; } @@ -229,7 +229,7 @@ margin-left: 0px; } - .checkTask { + .check-task { border-color: #fc0000; } @@ -267,7 +267,7 @@ align-items: center; justify-content: center; - .addMore { + .add-more { display: flex; align-items: center; justify-content: center; @@ -383,7 +383,7 @@ margin-left: 20px; } - .errorText { + .error-text { color: #bf3c3c; font-weight: 600; } diff --git a/src/components/ShortReport/ShortReport.jsx b/src/components/ShortReport/ShortReport.jsx index c4b7238e..2dfac39a 100644 --- a/src/components/ShortReport/ShortReport.jsx +++ b/src/components/ShortReport/ShortReport.jsx @@ -75,9 +75,9 @@ export const ShortReport = () => { return (

-
-
-

+
+
+

Ваши отчеты - просмотр отчета за день

@@ -85,11 +85,11 @@ export const ShortReport = () => {
-
-

+
+

{getCorrectDate(reportDate)}

-

+

Вами потрачено на работу:{" "} {totalHours} {hourOfNum(totalHours)} @@ -99,9 +99,9 @@ export const ShortReport = () => {

{loader && } {Boolean(taskText.length) && ( -
+
- +
@@ -123,7 +123,7 @@ export const ShortReport = () => {

-
+
{task.hours}

{hourOfNum(task.hours)} на задачу @@ -145,7 +145,7 @@ export const ShortReport = () => {

{Boolean(difficulties.length) && ( -
+

Какие сложности возникли?

{difficulties.map((item, index) => { return

{item}

; @@ -153,7 +153,7 @@ export const ShortReport = () => {
)} {Boolean(tomorrowTask.length) && ( -
+

Что планируется сделать завтра?

{tomorrowTask.map((item, index) => { return

{item}

; @@ -163,7 +163,7 @@ export const ShortReport = () => {
)} {!Boolean(taskText.length) && !loader && ( -
+

В этот день вы не заполняли отчет

diff --git a/src/components/ShortReport/shortReport.scss b/src/components/ShortReport/shortReport.scss index e1afef85..fafa0792 100644 --- a/src/components/ShortReport/shortReport.scss +++ b/src/components/ShortReport/shortReport.scss @@ -2,7 +2,7 @@ margin-bottom: 30px; } -.viewReport { +.view-report { &__title-box { display: flex; align-items: center; diff --git a/src/components/StarRating/StarRating.scss b/src/components/StarRating/StarRating.scss index 26730287..40190361 100644 --- a/src/components/StarRating/StarRating.scss +++ b/src/components/StarRating/StarRating.scss @@ -3,6 +3,7 @@ align-items: center; font-size: var(--size); line-height: 0.75; + &__body { position: relative; &::before { @@ -11,6 +12,7 @@ color: var(--color); } } + &__active { position: absolute; height: 100%; @@ -28,6 +30,7 @@ color: var(--color); } } + &__items { display: flex; position: absolute; @@ -36,6 +39,7 @@ left: 0; top: 0; } + &__item { flex: 0 0 20%; height: 100%; diff --git a/src/components/TaskItem/taskItem.scss b/src/components/TaskItem/taskItem.scss index 9f965c5b..0463d3ca 100644 --- a/src/components/TaskItem/taskItem.scss +++ b/src/components/TaskItem/taskItem.scss @@ -30,6 +30,7 @@ &__hours { margin-left: 3.3rem; display: flex; + &-value { width: 34px; height: 34px; diff --git a/src/components/TrackerSelectColumn/TrackerSelectColumn.jsx b/src/components/TrackerSelectColumn/TrackerSelectColumn.jsx index 640b59b3..88f92288 100644 --- a/src/components/TrackerSelectColumn/TrackerSelectColumn.jsx +++ b/src/components/TrackerSelectColumn/TrackerSelectColumn.jsx @@ -12,13 +12,13 @@ export const TrackerSelectColumn = ({ columns, task, currentColumn }) => { const [openSelect, setOpenSelect] = useState(false); return (
setOpenSelect(!openSelect)} >

{currentColumn.title}

arrow {openSelect && ( -
+
{columns.map((column) => { return (

diff --git a/src/components/features/quiz/CardAviableTest.jsx b/src/components/features/quiz/CardAviableTest.jsx index a1c6d289..72a8c223 100644 --- a/src/components/features/quiz/CardAviableTest.jsx +++ b/src/components/features/quiz/CardAviableTest.jsx @@ -29,7 +29,7 @@ export const CardAvailableTest = ({ title, description, path, status }) => {

-
+
arrow
diff --git a/src/components/features/quiz/quiz.scss b/src/components/features/quiz/quiz.scss index 0f3e3cd5..42701f1a 100644 --- a/src/components/features/quiz/quiz.scss +++ b/src/components/features/quiz/quiz.scss @@ -493,7 +493,7 @@ $maxWidthContainer: 1123; font-weight: 700; } } - &Link { + &-link { width: 48px; height: 48px; background: #ddeec6; diff --git a/src/pages/Auth/auth.scss b/src/pages/Auth/auth.scss index 89caaa90..7e02a761 100644 --- a/src/pages/Auth/auth.scss +++ b/src/pages/Auth/auth.scss @@ -326,14 +326,14 @@ } } - &__partnersForPart { + &__partners-for-part { background: #406128; color: white; margin-left: -35px; } - &__partnersForPart, - &__developersForPart { + &__partners-for-part, + &__developers-for-part { width: 220px; height: 50px; border-radius: 44px; @@ -341,7 +341,7 @@ border: none; } - &__developersForPart { + &__developers-for-part { background-color: #52b7098c; color: #2d6505; } @@ -353,7 +353,7 @@ flex-direction: column; } - &__partnersForPart { + &__partners-for-part { margin: 15px 0 0 0; } } diff --git a/src/pages/AuthForCandidate/AuthForCandidate.jsx b/src/pages/AuthForCandidate/AuthForCandidate.jsx index 4ca9330d..fa359a6e 100644 --- a/src/pages/AuthForCandidate/AuthForCandidate.jsx +++ b/src/pages/AuthForCandidate/AuthForCandidate.jsx @@ -128,7 +128,7 @@ export const AuthForCandidate = () => {

Для нас не имеет значение Ваша локация.

-
+
{personalInfoItems.map((item, index) => { return ( diff --git a/src/pages/AuthForCandidate/authForCandidate.scss b/src/pages/AuthForCandidate/authForCandidate.scss index bd2bd555..2f5c0af8 100644 --- a/src/pages/AuthForCandidate/authForCandidate.scss +++ b/src/pages/AuthForCandidate/authForCandidate.scss @@ -32,7 +32,7 @@ line-height: 32px; } - &__categoriesWrapper { + &__categories-wrapper { position: relative; margin-top: 200px; width: 100%; @@ -47,7 +47,7 @@ grid-template-columns: 1fr; } - .categoriesItem { + .categories-item { @media (max-width: 1094px) { flex: 0 0 48.6%; } diff --git a/src/pages/CatalogSpecialists/CatalogSpecialists.jsx b/src/pages/CatalogSpecialists/CatalogSpecialists.jsx index 64962e6a..ed52cef5 100644 --- a/src/pages/CatalogSpecialists/CatalogSpecialists.jsx +++ b/src/pages/CatalogSpecialists/CatalogSpecialists.jsx @@ -145,25 +145,25 @@ const CatalogSpecialists = () => { } ]; return ( -
+
-
+
-
+

Каталог специалистов

-
-
+
+
worker

🖐 50+ специалистов доступны

-
+
{personalInfoItems.map((item, index) => { return ( { ); })}
-

+

Найти специалиста по навыкам

-
+
-
+
{mockPersons.map((person, index) => { return ( { return ( -
+
-
+
-

+

Арендуйте IT специалистов:
быстро, выгодно, на любой срок.

-
+
arrow
-

+

Мы предоставляем вам «в аренду» IT-специалистов. При этом они находятся в нашем штате. Оплата происходит за отработанные часы

-
-
-
+
+
+
countingImg -
-

+
+

Экономия бюджета компании - главное преимущество аутстаффинга

-

+

Приблизительный просчет дал результаты в экономии до 50% бюджета

-
+
arrow
-
- Давайте просчитаем: -

+

+ Давайте просчитаем: +

Оплата работы разработчика в штат 1500 руб/ч (250 000 руб/мес).

- calc + calc
-
+
brace
-
+
  • НДФЛ (13% от зарплаты)
    • @@ -80,11 +80,11 @@ export const CompanyInfo = () => {
-
- +
+ В итоге у нас получается: -
+

Специалист с изначальной расценкой в 1 500 руб/ч с учетом всех остальных расходов diff --git a/src/pages/CompanyInfo/companyInfo.scss b/src/pages/CompanyInfo/companyInfo.scss index f5992751..6d845e69 100644 --- a/src/pages/CompanyInfo/companyInfo.scss +++ b/src/pages/CompanyInfo/companyInfo.scss @@ -1,7 +1,7 @@ -.companyInfo { +.company-info { &__content { font-family: "LabGrotesque", sans-serif; - background-color: #F1F1F1; + background-color: #f1f1f1; padding-top: 60px; @media (max-width: 1375px) { @@ -18,7 +18,7 @@ margin: 0 auto; text-align: center; span { - color: #52B709; + color: #52b709; font-weight: 700; } @@ -39,10 +39,10 @@ } } - .arrowElement { + .arrow-element { width: 48px; height: 48px; - background-color: #D3E4BC; + background-color: #d3e4bc; border-radius: 50px; display: flex; justify-content: center; @@ -53,7 +53,7 @@ } } - .arrowDown { + .arrow-down { margin: 35px auto 45px; img { transform: rotate(90deg); @@ -118,7 +118,7 @@ } span { - color: #52B709; + color: #52b709; font-weight: 700; } @@ -145,7 +145,7 @@ } } - &__countingBlock { + &__counting-block { padding: 27px 185px 26px 45px; border-radius: 12px; background: white; @@ -190,13 +190,13 @@ flex-direction: column; row-gap: 12px; - .titleBottom { + .title-bottom { font-size: 21px; font-weight: 700; line-height: 48px; } - .subTitleBottom { + .subtitle-bottom { color: #000000; font-weight: 500; font-size: 18px; @@ -204,7 +204,7 @@ } span { - color: #52B709; + color: #52b709; } @media (max-width: 780px) { @@ -213,7 +213,7 @@ } } - .countingBlock__info { + .counting-block__info { display: flex; flex-direction: column; row-gap: 12px; @@ -223,7 +223,7 @@ } } - .countingBlock { + .counting-block { &__title { font-size: 18px; font-weight: 500; @@ -232,13 +232,13 @@ } &__subTitle { - color: #6F6F6F; + color: #6f6f6f; font-size: 12px; line-height: 20px; } } - .countingBlockImg { + .counting-block-img { position: absolute; right: -140px; top: -55px; diff --git a/src/pages/FrequentlyAskedQuestion/FrequentlyAskedQuestion.scss b/src/pages/FrequentlyAskedQuestion/FrequentlyAskedQuestion.scss index c8726730..b0658825 100644 --- a/src/pages/FrequentlyAskedQuestion/FrequentlyAskedQuestion.scss +++ b/src/pages/FrequentlyAskedQuestion/FrequentlyAskedQuestion.scss @@ -1,60 +1,65 @@ -@import './../../assets/functions.scss'; +@import "./../../assets/functions.scss"; .frequently-asked-question { - background: #f5f5f5; - height: 100%; - min-height: 100vh; - font-family: "LabGrotesque", sans-serif; - display: flex; - flex-direction: column; - @media (max-width: 1375px) { - margin-top: 80px; + background: #f5f5f5; + height: 100%; + min-height: 100vh; + font-family: "LabGrotesque", sans-serif; + display: flex; + flex-direction: column; + + @media (max-width: 1375px) { + margin-top: 80px; } - &__container { - flex: 1 1 auto; - margin-top: 30px; - } - &__title { - font-weight: 500; - @include adaptiv-value("font-size", 38, 24, 1); - line-height: 84%; - margin: 42px 0 30px 0; - color: #000000; - } - &__back { - margin: 0 0 30px 0; - display: flex; - align-items: center; - cursor: pointer; - gap: 19px; - p { - font-size: 12px; - line-height: 167%; - color: #6f6f6f; - } - } - &__arrow { - background: rgba(141, 198, 63, 0.5098039216); - width: 48px; - height: 48px; - border-radius: 44px; - display: flex; - align-items: center; - justify-content: center; - transform: rotate(180deg); - } - &__answer { - font-weight: 400; - font-size: 20px; - line-height: 120%; - background: #ffffff; - border-radius: 12px; - word-break: break-word; - color: #000000; - @include adaptiv-value("padding-top", 33, 15, 1); - @include adaptiv-value("padding-bottom", 33, 15, 1); - @include adaptiv-value("padding-left", 41, 22, 1); - @include adaptiv-value("padding-right", 41, 22, 1); - } - } - \ No newline at end of file + + &__container { + flex: 1 1 auto; + margin-top: 30px; + } + + &__title { + font-weight: 500; + @include adaptiv-value("font-size", 38, 24, 1); + line-height: 84%; + margin: 42px 0 30px 0; + color: #000000; + } + + &__back { + margin: 0 0 30px 0; + display: flex; + align-items: center; + cursor: pointer; + gap: 19px; + p { + font-size: 12px; + line-height: 167%; + color: #6f6f6f; + } + } + + &__arrow { + background: rgba(141, 198, 63, 0.5098039216); + width: 48px; + height: 48px; + border-radius: 44px; + display: flex; + align-items: center; + justify-content: center; + transform: rotate(180deg); + } + + &__answer { + font-weight: 400; + font-size: 20px; + line-height: 120%; + background: #ffffff; + border-radius: 12px; + word-break: break-word; + color: #000000; + @include adaptiv-value("padding-top", 33, 15, 1); + @include adaptiv-value("padding-bottom", 33, 15, 1); + @include adaptiv-value("padding-left", 41, 22, 1); + @include adaptiv-value("padding-right", 41, 22, 1); + } +} diff --git a/src/pages/FrequentlyAskedQuestions/FrequentlyAskedQuestions.scss b/src/pages/FrequentlyAskedQuestions/FrequentlyAskedQuestions.scss index 4fbb16e9..ba6850db 100644 --- a/src/pages/FrequentlyAskedQuestions/FrequentlyAskedQuestions.scss +++ b/src/pages/FrequentlyAskedQuestions/FrequentlyAskedQuestions.scss @@ -5,32 +5,39 @@ font-family: "LabGrotesque", sans-serif; display: flex; flex-direction: column; + @media (max-width: 1375px) { margin-top: 80px; } + &__container { flex: 1 1 auto; margin: 30px 0; } + &__about { display: flex; align-items: center; margin: 30px 0; + @media (max-width: 600px) { flex-wrap: wrap; row-gap: 25px; } } + &__title { font-weight: 500; font-size: 48px; line-height: 67%; color: #000000; margin: 0 13px 0 0; + @media (max-width: 600px) { order: 1; } } + &__arrow { background: rgba(128, 119, 119, 0.3); flex: 0 0 27px; @@ -40,10 +47,12 @@ align-items: center; justify-content: center; margin: 0 24px 0 0; + @media (max-width: 600px) { order: 2; } } + &__description { font-weight: 400; font-size: 18px; @@ -52,15 +61,16 @@ color: #000000; white-space: pre-line; } + &__items { display: grid; grid-row-gap: 49px; grid-column-gap: 29px; grid-template-columns: 1fr 1fr; + @media (max-width: 750px) { grid-template-columns: 1fr; grid-gap: 60px; } } } - diff --git a/src/pages/PartnerAddRequest/PartnerAddRequest.js b/src/pages/PartnerAddRequest/PartnerAddRequest.js index d56f0f94..18d17fc7 100644 --- a/src/pages/PartnerAddRequest/PartnerAddRequest.js +++ b/src/pages/PartnerAddRequest/PartnerAddRequest.js @@ -142,7 +142,7 @@ export const PartnerAddRequest = () => { }; return ( -

+
@@ -158,14 +158,14 @@ export const PartnerAddRequest = () => { } ]} /> -

+

{editRequest ? "Страница редактирования заявки" : "Страница добавления заявки"}

-
-
-
+
+
+

Данные открытой позиции

Название вакансии

@@ -300,7 +300,7 @@ export const PartnerAddRequest = () => { )}
-
+

Квалификация

Выберите уровень знаний

@@ -395,9 +395,9 @@ export const PartnerAddRequest = () => {
-
-
-
+
+
+
process

Процесс:

@@ -410,8 +410,8 @@ export const PartnerAddRequest = () => { проекты и Git.

-
-
+
+
reportImg

Отчетность:

@@ -426,8 +426,8 @@ export const PartnerAddRequest = () => { Можем выделить руководителя проекта и тестировщиков.

-
-
+
+
documentsImg

Обмен
diff --git a/src/pages/PartnerAddRequest/partnerAddRequest.scss b/src/pages/PartnerAddRequest/partnerAddRequest.scss index 66dde114..4001a3d0 100644 --- a/src/pages/PartnerAddRequest/partnerAddRequest.scss +++ b/src/pages/PartnerAddRequest/partnerAddRequest.scss @@ -1,8 +1,8 @@ -.partnerAddRequest { - background: #F1F1F1; +.partner-add-request { + background: #f1f1f1; height: 100%; min-height: 100vh; - font-family: 'LabGrotesque', sans-serif; + font-family: "LabGrotesque", sans-serif; .container { max-width: 1160px; @@ -17,7 +17,7 @@ color: #000000; font-weight: 700; font-size: 22px; - line-height: 32px + line-height: 32px; } &__section { @@ -42,7 +42,7 @@ } .form__block { - background: #FFFFFF; + background: #ffffff; border-radius: 12px; padding: 25px 95px 30px 55px; min-width: 600px; @@ -58,7 +58,7 @@ font-weight: 700; font-size: 20px; line-height: 24px; - color: #5B6871; + color: #5b6871; margin-bottom: 35px; } @@ -79,7 +79,7 @@ } &__input { - background: #EFF2F7; + background: #eff2f7; border-radius: 8px; padding: 8px 12px; margin-bottom: 35px; @@ -115,7 +115,7 @@ &__select { padding: 8px 15px 9px 12px; - background: #EFF2F7; + background: #eff2f7; border-radius: 12px; cursor: pointer; display: flex; @@ -140,7 +140,7 @@ } textarea { - background: #EFF2F7; + background: #eff2f7; border-radius: 8px; width: 100%; border: none; @@ -177,9 +177,9 @@ display: flex; align-items: center; justify-content: center; - border: 0.5px solid #8DC63F; + border: 0.5px solid #8dc63f; border-radius: 44px; - color: #6F6F6F; + color: #6f6f6f; font-weight: 400; font-size: 14px; line-height: 32px; @@ -192,9 +192,9 @@ } &__save { - background: #52B709; + background: #52b709; border-radius: 44px; - color: #FFFFFF; + color: #ffffff; font-weight: 700; font-size: 14px; line-height: 32px; @@ -210,14 +210,14 @@ display: flex; gap: 5px; flex-wrap: wrap; - background: #EFF2F7; + background: #eff2f7; border-radius: 8px; padding: 8px 12px 9px; position: relative; cursor: pointer; .skill { - background: #8DC63F; + background: #8dc63f; border-radius: 12px; font-weight: 400; font-size: 12px; @@ -304,7 +304,7 @@ font-size: 12px; line-height: 14px; color: #263238; - background: #8DC63F; + background: #8dc63f; border-radius: 12px; padding: 5px; max-width: 100px; @@ -319,7 +319,7 @@ } &__info { - background: #FFFFFF; + background: #ffffff; border-radius: 12px; width: 100%; padding: 74px 48px 136px 62px; @@ -350,7 +350,7 @@ } h4 { - color: #5B6871; + color: #5b6871; font-weight: 700; font-size: 20px; line-height: 24px; @@ -367,7 +367,7 @@ } &:last-child { - .partnerAddRequest__info__block__title { + .partner-add-request__info__block__title { margin-bottom: 35px; } } diff --git a/src/pages/PartnerBid/PartnerBid.jsx b/src/pages/PartnerBid/PartnerBid.jsx index 4c81f259..3199b13e 100644 --- a/src/pages/PartnerBid/PartnerBid.jsx +++ b/src/pages/PartnerBid/PartnerBid.jsx @@ -74,7 +74,7 @@ export const PartnerBid = () => { 4: "Senior" }); return ( -
+
@@ -110,13 +110,13 @@ export const PartnerBid = () => { { name: "Просмотр заявки - PHP разработчик", link: "/profile/bid" } ]} /> -

Страница заявки

+

Страница заявки

{loader && } {!loader && ( <> -
+

{requestInfo.title}

-
+
Редактировать { />
-
+
el.id === requestId) - 1 ]?.id - ? "partnerBid__switcher__prev switchDate" - : "partnerBid__switcher__prev switchDate disable" + ? "partner-bid__switcher__prev switch-date" + : "partner-bid__switcher__prev switch-date disable" } onClick={() => { dispatch( @@ -153,8 +153,8 @@ export const PartnerBid = () => { partnerRequests[ partnerRequests.findIndex((el) => el.id === requestId) + 1 ]?.id - ? "partnerBid__switcher__next switchDate" - : "partnerBid__switcher__next switchDate disable" + ? "partner-bid__switcher__next switch-date" + : "partner-bid__switcher__next switch-date disable" } onClick={() => { dispatch( @@ -229,22 +229,25 @@ export const PartnerBid = () => {

-
-
+
+

Подходящие сотрудники по запросу

-
+
{requestInfo.result_profiles.length && requestInfo.result_profiles.map((person, index) => { return ( -
+
avatar

{person.fio} - {person.position_title},{" "} {levels[person.level]}

Подробнее diff --git a/src/pages/PartnerBid/partnerBid.scss b/src/pages/PartnerBid/partnerBid.scss index 115bf211..45f28d22 100644 --- a/src/pages/PartnerBid/partnerBid.scss +++ b/src/pages/PartnerBid/partnerBid.scss @@ -1,4 +1,4 @@ -.partnerBid { +.partner-bid { background: #f1f1f1; height: 100%; min-height: 100vh; @@ -78,7 +78,7 @@ justify-content: space-between; } - .switchDate { + .switch-date { width: 48px; height: 48px; background: #8dc63f; diff --git a/src/pages/PartnerEmployeeReport/PartnerEmployeeReport.jsx b/src/pages/PartnerEmployeeReport/PartnerEmployeeReport.jsx index 8906d88d..e19a3d90 100644 --- a/src/pages/PartnerEmployeeReport/PartnerEmployeeReport.jsx +++ b/src/pages/PartnerEmployeeReport/PartnerEmployeeReport.jsx @@ -73,7 +73,7 @@ export const PartnerEmployeeReport = () => { }, [requestDates]); return ( -
+
@@ -84,30 +84,30 @@ export const PartnerEmployeeReport = () => { ]} /> {!Object.keys(userInfo).length ? ( -
+
) : ( <> -
-
+
+

{userInfo.fio}

{userInfo.position}

-
+
{userInfo?.stack && userInfo.stack.map((skill, index) => { return {skill}; })}
-
+
{loader ? ( -
+
) : ( -
+
setValue(value)} diff --git a/src/pages/PartnerEmployeeReport/partnerEmployeeReport.scss b/src/pages/PartnerEmployeeReport/partnerEmployeeReport.scss index 7e5953d8..316c3fa1 100644 --- a/src/pages/PartnerEmployeeReport/partnerEmployeeReport.scss +++ b/src/pages/PartnerEmployeeReport/partnerEmployeeReport.scss @@ -1,5 +1,5 @@ -.employeeReport { - background: #F1F1F1; +.employee-report { + background: #f1f1f1; height: 100%; min-height: 100vh; font-family: "LabGrotesque", sans-serif; @@ -42,7 +42,7 @@ font-size: 12px; line-height: 14px; color: #263238; - background: #8DC63F; + background: #8dc63f; border-radius: 12px; padding: 5px; max-width: 130px; diff --git a/src/pages/PartnerEmployees/PartnerEmployees.js b/src/pages/PartnerEmployees/PartnerEmployees.js index 1162c823..12ee652e 100644 --- a/src/pages/PartnerEmployees/PartnerEmployees.js +++ b/src/pages/PartnerEmployees/PartnerEmployees.js @@ -23,7 +23,7 @@ export const PartnerEmployees = () => { return ; } return ( -
+
@@ -37,17 +37,17 @@ export const PartnerEmployees = () => { } ]} /> -

Backend разработчики

-
+

Backend разработчики

+
{partnerEmployees.map((person) => { return ( -
-
+
+
avatar

{person.name}

-
-
+
+
{person.qualification}
{person.level}
@@ -58,10 +58,10 @@ export const PartnerEmployees = () => {
-
+
Проект:
{person.project}
-
+

Открытые задачи

diff --git a/src/pages/PartnerEmployees/partnerEmployees.scss b/src/pages/PartnerEmployees/partnerEmployees.scss index 6334a830..1427544b 100644 --- a/src/pages/PartnerEmployees/partnerEmployees.scss +++ b/src/pages/PartnerEmployees/partnerEmployees.scss @@ -1,8 +1,8 @@ -.partnerEmployees { - background: #F1F1F1; +.partner-employees { + background: #f1f1f1; height: 100%; min-height: 100vh; - font-family: 'LabGrotesque', sans-serif; + font-family: "LabGrotesque", sans-serif; &__title { color: #000000; @@ -19,13 +19,13 @@ } &__item { - background: #E1FCCF; + background: #e1fccf; border-radius: 12px; display: flex; position: relative; &__name { - background: #FFFFFF; + background: #ffffff; border-radius: 12px; padding: 25px 22px 25px; display: flex; @@ -57,9 +57,9 @@ justify-content: space-between; &:after { - content: ''; + content: ""; position: absolute; - background: #52B709; + background: #52b709; border-radius: 12px; height: 4px; width: 51%; @@ -80,7 +80,7 @@ } span { - color: #6F6F6F; + color: #6f6f6f; font-weight: 500; font-size: 14px; } @@ -102,7 +102,7 @@ display: flex; align-items: center; justify-content: center; - background: #FFFFFF; + background: #ffffff; border-radius: 50px; width: 41px; height: 41px; @@ -135,7 +135,7 @@ p { margin-bottom: 0; - color: #6F6F6F; + color: #6f6f6f; font-weight: 500; font-size: 13px; line-height: 24px; @@ -153,12 +153,12 @@ justify-content: center; margin-left: 8px; padding: 0 6px; - background: #DDDDDD; + background: #dddddd; border-radius: 4px; font-weight: 500; font-size: 14px; line-height: 24px; - color: #6F6F6F; + color: #6f6f6f; } } } @@ -166,7 +166,6 @@ } } - .container { max-width: 1160px; margin-top: 23px; diff --git a/src/pages/PartnerRequests/PartnerRequests.jsx b/src/pages/PartnerRequests/PartnerRequests.jsx index 50d69d86..a900d54f 100644 --- a/src/pages/PartnerRequests/PartnerRequests.jsx +++ b/src/pages/PartnerRequests/PartnerRequests.jsx @@ -41,7 +41,7 @@ export const PartnerRequests = () => { }); }, []); return ( -
+
@@ -51,26 +51,26 @@ export const PartnerRequests = () => { { name: "Запросы и открытые позиции", link: "/profile/requests" } ]} /> -

Запросы

+

Запросы

{loader && } {Boolean(requests.length) && !loader && ( -
-
+
+
{requests.map((item, index) => { return ( { dispatch(setPartnerRequestId(item.id)); dispatch(setPartnerRequests(requests)); }} > -

+

{item.position.name}

-

+

Подходящие кандидаты {item.result_count}

@@ -78,7 +78,7 @@ export const PartnerRequests = () => { ); })}
-
+

Инструкция: подачи заявки

Оператор компании заводит заявку и указывает необходимые @@ -94,9 +94,9 @@ export const PartnerRequests = () => {

)} {!Boolean(requests.length) && !loader && ( -
-
-
+
+
+
cursor

У вас ещё нет запросов на сотрудников

@@ -106,7 +106,7 @@ export const PartnerRequests = () => {
-
+

Инструкция: подачи заявки

Оператор компании заводит заявку и указывает необходимые @@ -114,12 +114,12 @@ export const PartnerRequests = () => {

-
+
-

+

Перейти в полный КАТАЛОГ{" "} сотрудников

diff --git a/src/pages/PartnerRequests/partnerRequests.scss b/src/pages/PartnerRequests/partnerRequests.scss index a6eca369..8a080d03 100644 --- a/src/pages/PartnerRequests/partnerRequests.scss +++ b/src/pages/PartnerRequests/partnerRequests.scss @@ -1,4 +1,4 @@ -.partnerRequests { +.partner-requests { background: #f1f1f1; height: 100%; min-height: 100vh; @@ -189,7 +189,7 @@ } } - &__noItems { + &__no-items { display: flex; flex-direction: column; @@ -330,14 +330,14 @@ } } - &__freeEmployees { + &__free-employees { h2 { font-weight: 500; font-size: 30px; line-height: 32px; } - .catalogLink { + .catalog-link { margin-top: 70px; width: 100%; font-weight: 700; diff --git a/src/pages/PartnerSettings/PartnerSettings.jsx b/src/pages/PartnerSettings/PartnerSettings.jsx index b77b5421..ebd2a262 100644 --- a/src/pages/PartnerSettings/PartnerSettings.jsx +++ b/src/pages/PartnerSettings/PartnerSettings.jsx @@ -120,7 +120,7 @@ export const PartnerSettings = () => {

Изменение пароля

-
+
{ arrow
-
+

Договор № К-1-2022 @@ -166,7 +166,7 @@ export const PartnerTreaties = () => {

-
+

Акт №4 от 10.03.23

@@ -179,11 +179,11 @@ export const PartnerTreaties = () => {
arrow -

к Доп. соглашению № 1

+

к Доп. соглашению № 1

arrow @@ -225,11 +225,11 @@ export const PartnerTreaties = () => {
arrow -

к Доп. соглашению № 1

+

к Доп. соглашению № 1

arrow @@ -278,7 +278,7 @@ export const PartnerTreaties = () => {
-
+

Акт №4 от 10.03.23

@@ -291,11 +291,11 @@ export const PartnerTreaties = () => {
arrow -

к Доп. соглашению № 1

+

к Доп. соглашению № 1

arrow @@ -337,11 +337,11 @@ export const PartnerTreaties = () => {
arrow -

к Доп. соглашению № 1

+

к Доп. соглашению № 1

arrow diff --git a/src/pages/PartnerTreaties/partnerTreaties.scss b/src/pages/PartnerTreaties/partnerTreaties.scss index 4c203582..3dbf1cd3 100644 --- a/src/pages/PartnerTreaties/partnerTreaties.scss +++ b/src/pages/PartnerTreaties/partnerTreaties.scss @@ -1,8 +1,8 @@ .treaties { - background: #F1F1F1; + background: #f1f1f1; height: 100%; min-height: 100vh; - font-family: 'LabGrotesque', sans-serif; + font-family: "LabGrotesque", sans-serif; &__title { font-weight: 700; @@ -43,7 +43,7 @@ width: calc(100% - 150px); &__main { - background: #FFFFFF; + background: #ffffff; border-radius: 0 12px 12px 12px; flex-wrap: wrap; column-gap: 34px; @@ -69,7 +69,7 @@ .img { width: 32px; height: 32px; - background: #E2E5CF; + background: #e2e5cf; border-radius: 50px; display: flex; align-items: center; @@ -101,8 +101,8 @@ } } - .notPaid { - background: #EBEBEB; + .not-paid { + background: #ebebeb; } .persons { @@ -137,7 +137,7 @@ .img { width: 48px; height: 48px; - background: #CFE0B8; + background: #cfe0b8; display: flex; justify-content: center; align-items: center; @@ -215,7 +215,7 @@ align-items: center; .arrow { - background: #CFE0B8; + background: #cfe0b8; border-radius: 50px; display: flex; align-items: center; @@ -229,12 +229,12 @@ display: flex; flex-direction: column; - .personArrow { + .person-arrow { margin-top: 20px; max-width: 125px; } - .moreInfo { + .more-info { font-weight: 300; font-size: 10px; line-height: 17px; @@ -321,7 +321,7 @@ display: flex; p { - color: #A29EB6; + color: #a29eb6; } } @@ -347,7 +347,7 @@ } .total { - color: #1458DD; + color: #1458dd; } } } @@ -377,7 +377,6 @@ } } - .container { max-width: 1160px; margin-top: 23px; diff --git a/src/pages/PartnerСategories/PartnerСategories.jsx b/src/pages/PartnerСategories/PartnerСategories.jsx index 4ebf2784..b2443b0c 100644 --- a/src/pages/PartnerСategories/PartnerСategories.jsx +++ b/src/pages/PartnerСategories/PartnerСategories.jsx @@ -146,7 +146,7 @@ export const PartnerCategories = () => { // } // ]); return ( -
+
@@ -156,11 +156,11 @@ export const PartnerCategories = () => { { name: "Данные моего персонала", link: "/profile/employees" } ]} /> -

Данные персонала

+

Данные персонала

{loader ? ( ) : ( -
+
{staff.map((card) => { return ( { {/* key={index}*/} {/* className={*/} {/* item.available*/} - {/* ? "partnerCategories__item item"*/} - {/* : "partnerCategories__item item item__disable"*/} + {/* ? "partner-categories__item item"*/} + {/* : "partner-categories__item item item__disable"*/} {/* }*/} {/* onClick={() => {*/} {/* dispatch(setPartnerEmployees(mokPersons));*/} @@ -196,7 +196,7 @@ export const PartnerCategories = () => { {/*
*/} {/*
*/} {/* {!item.available && (*/} - {/*
*/} + {/*
*/} {/*

У вас нет персонала из категории

*/} {/* */} {/*
*/} diff --git a/src/pages/PartnerСategories/partnerСategories.scss b/src/pages/PartnerСategories/partnerСategories.scss index 6b01d99a..4c927f19 100644 --- a/src/pages/PartnerСategories/partnerСategories.scss +++ b/src/pages/PartnerСategories/partnerСategories.scss @@ -1,8 +1,8 @@ -.partnerCategories { - background: #F1F1F1; +.partner-categories { + background: #f1f1f1; height: 100%; min-height: 100vh; - font-family: 'LabGrotesque', sans-serif; + font-family: "LabGrotesque", sans-serif; &__title { color: #000000; @@ -21,13 +21,12 @@ //column-gap: 21px; } - .item { display: flex; flex-direction: column; padding: 33px 32px 25px 28px; width: 32%; - background: #FFFFFF; + background: #ffffff; border-radius: 12px; transition: all 0.3s ease; position: relative; @@ -59,12 +58,12 @@ opacity: 0; } - .item__disableHover { + .item__disable-hover { opacity: 1; } } - &Hover { + &-hover { position: absolute; display: flex; left: 0; @@ -72,7 +71,7 @@ align-items: center; justify-content: space-between; padding: 16px 13px 16px 21px; - border: 3px solid #52B709; + border: 3px solid #52b709; bottom: 0; border-radius: 12px; opacity: 0; @@ -91,12 +90,12 @@ width: 140px; height: 50px; border: none; - background: #52B709; + background: #52b709; border-radius: 44px; font-weight: 500; font-size: 15px; line-height: 32px; - color: #FFFFFF; + color: #ffffff; } } } @@ -124,7 +123,7 @@ p { max-width: 181px; margin-bottom: 0; - color: #6F6F6F; + color: #6f6f6f; font-weight: 400; font-size: 12px; line-height: 20px; @@ -136,13 +135,12 @@ justify-content: center; width: 48px; height: 48px; - background: #DDEEC6; + background: #ddeec6; border-radius: 50px; } } } - .container { max-width: 1160px; margin-top: 23px; diff --git a/src/pages/ProjectTracker/ProjectTracker.js b/src/pages/ProjectTracker/ProjectTracker.js index 2fab3efd..0af6f4f6 100644 --- a/src/pages/ProjectTracker/ProjectTracker.js +++ b/src/pages/ProjectTracker/ProjectTracker.js @@ -382,7 +382,7 @@ export const ProjectTracker = () => { (div) => div.classList && (div.classList.contains("tasks__head__executor") || - div.classList.contains("tasks__head__executorDropdown")) + div.classList.contains("tasks__head__executor-dropdown")) ) ) { setSelectedExecutorOpen(false); @@ -508,8 +508,8 @@ export const ProjectTracker = () => {
{projectBoard.projectUsers.slice(0, 3).map((person) => { @@ -528,7 +528,7 @@ export const ProjectTracker = () => {
)} {projectBoard.projectUsers?.length > 3 && ( - +1 + +1 )} {
{selectedExecutor ? ( -
+

{selectedExecutor.user.fio}

{ alt="arrow" /> {selectExecutorOpen && ( -
+
{projectBoard.projectUsers.map((user) => { return (
executorFilter(user)} > @@ -637,7 +637,7 @@ export const ProjectTracker = () => { {tags.open && (
setTags((prevState) => ({ ...prevState, @@ -653,20 +653,20 @@ export const ProjectTracker = () => {
{projectBoard.mark.map((tag) => { return ( -
-

+

+

{tag.title}

-
- +
+ {tag.slug} -
+
edit {
)} {(tags.add || tags.edit) && ( -
+
{ }} /> { } /> { }} className={ tagInfo.name && tagInfo.description - ? "formTag__btn" - : "formTag__btn disable" + ? "form-tag__btn" + : "form-tag__btn disable" } > {tags.add ? "Добавить" : "Изменить"} @@ -856,7 +856,7 @@ export const ProjectTracker = () => {
)} -
+
{column.tasks.map((task) => { return (
{ {task.mark.map((tag) => { return (
@@ -942,7 +942,7 @@ export const ProjectTracker = () => {
)} {task.dead_line && ( -
+

Срок исполнения:

{getCorrectDate(task.dead_line)} @@ -978,17 +978,17 @@ export const ProjectTracker = () => { })} {Boolean(projectBoard?.columns) && !Boolean(projectBoard.columns.length) && ( -
+
В проекте нет задач.
)} {filteredNoTasks && ( -
-
- noTasks +
+
+ no-tasks

Пока нет подходящих задач

-

+

Ставьте задачи, следите за прогрессом, ведите учёт рабочего времени

diff --git a/src/pages/Quiz/quiz-page.scss b/src/pages/Quiz/quiz-page.scss index 7b34b243..f5f7a21d 100644 --- a/src/pages/Quiz/quiz-page.scss +++ b/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 12px 0px 0px; @@ -25,21 +28,26 @@ padding: 20px 51px; 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; } diff --git a/src/pages/RegistrationForCandidate/RegistrationForCandidate.js b/src/pages/RegistrationForCandidate/RegistrationForCandidate.js index 33204a25..10ef7523 100644 --- a/src/pages/RegistrationForCandidate/RegistrationForCandidate.js +++ b/src/pages/RegistrationForCandidate/RegistrationForCandidate.js @@ -51,10 +51,10 @@ export const RegistrationForCandidate = () => { ); return ( -
+
-
+

Хочу в команду IT-специалистов

@@ -65,28 +65,28 @@ export const RegistrationForCandidate = () => { Для нас не имеет значения Ваша локация.

-
-
-
+
+
+
img

Backend разработчики

-

+

Java PHP Python C# React Vue.js NodeJs Golang Ruby JavaScript

img
{/* форма регистрации */}
-
+
{ /> {validationErrors.username}
-
+
{ /> {validationErrors.summary}
-
+
{ /> {validationErrors.email}
-
+
{ /> {validationErrors.tg}
-
+
{ /> {validationErrors.password}
-
+
{ /> {validationErrors.secondPassword}
-
+
diff --git a/src/pages/RegistrationForCandidate/registationForCandidate.scss b/src/pages/RegistrationForCandidate/registationForCandidate.scss index 3994a605..03f678ca 100644 --- a/src/pages/RegistrationForCandidate/registationForCandidate.scss +++ b/src/pages/RegistrationForCandidate/registationForCandidate.scss @@ -1,4 +1,4 @@ -.registrationCandidate { +.registration-candidate { font-family: "LabGrotesque", sans-serif; position: relative; background-color: #f1f1f1; @@ -39,7 +39,7 @@ } } - &__formWrapper { + &__form-wrapper { position: relative; margin-top: 200px; display: flex; diff --git a/src/pages/RegistrationSetting/RegistrationSetting.js b/src/pages/RegistrationSetting/RegistrationSetting.js index e68d1883..9115cdcc 100644 --- a/src/pages/RegistrationSetting/RegistrationSetting.js +++ b/src/pages/RegistrationSetting/RegistrationSetting.js @@ -71,33 +71,33 @@ export const RegistrationSetting = () => { const [step, setStep] = useState(1); return ( -
+
-
+
-

+

Добро пожаловать{" "} в ITGuild arrow

-
-
- +
+
+ Эти ответы помогут сформировать кабинет -
+
= 2 ? "active" : ""} /> = 3 ? "active" : ""} />
-

+

Со сколькими людьми ты будешь работать?

-
+
{questions.countPeople.map((item, index) => { return (
img
{step >= 2 && ( -
-

Какая у тебя роль?

-
+
+

Какая у тебя роль?

+
{questions.role.map((item, index) => { return (
)} {step >= 3 && ( -
+
Организуй комфортную среду для продуктивности @@ -191,7 +191,7 @@ export const RegistrationSetting = () => { ); })}
-
@@ -206,7 +206,7 @@ export const RegistrationSetting = () => { setStep((prevState) => prevState + 1); } }} - className="registrationSetting__continue" + className="registration-setting__continue" > Продолжить diff --git a/src/pages/RegistrationSetting/registrationSetting.scss b/src/pages/RegistrationSetting/registrationSetting.scss index 184914c8..85ab5803 100644 --- a/src/pages/RegistrationSetting/registrationSetting.scss +++ b/src/pages/RegistrationSetting/registrationSetting.scss @@ -1,4 +1,4 @@ -.registrationSetting { +.registration-setting { &__content { font-family: "LabGrotesque", sans-serif; background-color: #f1f1f1; @@ -21,7 +21,7 @@ margin-bottom: 46px; color: #000000; span { - color: #52B709; + color: #52b709; position: relative; img { position: absolute; @@ -48,7 +48,7 @@ } &__question { - background: #FFFFFF; + background: #ffffff; border-radius: 12px; padding: 46.5px 75.5px 38px; position: relative; @@ -60,17 +60,18 @@ } } - .questionBlock { + .question-block { display: flex; flex-direction: column; margin-bottom: 18px; + &__head { display: flex; margin-bottom: 33px; } &__suptitle { - color: #6F6F6F; + color: #6f6f6f; font-size: 14px; margin-right: 70px; } @@ -83,12 +84,12 @@ span { width: 75px; height: 6.5px; - background: #B0BABF; + background: #b0babf; border-radius: 77px; } .active { - background: #6F6F6F; + background: #6f6f6f; } } @@ -105,14 +106,14 @@ button { border-radius: 12px; - border: 1px solid #8DC63F; + border: 1px solid #8dc63f; padding: 4px 30px; line-height: 32px; font-size: 15px; } .active { - background: #1458DD; + background: #1458dd; color: whitesmoke; font-weight: 500; border: none; @@ -123,13 +124,13 @@ &__environment { margin-top: 13px; padding: 32px 20px 42px 44px; - background: #E2EBEF; + background: #e2ebef; border-radius: 12px; .environment { &__suptitle { font-size: 14px; - color: #6F6F6F; + color: #6f6f6f; margin-left: 31px; } @@ -181,7 +182,7 @@ column-gap: 22.4px; p { - color: #6F6F6F; + color: #6f6f6f; font-size: 12px; max-width: 189px; } @@ -190,7 +191,7 @@ width: 48px; height: 48px; border-radius: 50px; - background: #DDEEC6; + background: #ddeec6; margin-left: auto; display: flex; align-items: center; @@ -204,12 +205,12 @@ .item--active { opacity: 1; - border: 2px solid #1458DD; + border: 2px solid #1458dd; } &__continue { margin: 6px 0 0 75.5px; - background-color: #52B709; + background-color: #52b709; width: 174px; height: 46px; color: white; diff --git a/src/pages/Summary/Summary.js b/src/pages/Summary/Summary.js index 11522090..3e49b959 100644 --- a/src/pages/Summary/Summary.js +++ b/src/pages/Summary/Summary.js @@ -95,7 +95,7 @@ export const Summary = () => {

Вернуться

)} -
+
{
{editSkills ? ( -
+
{selectedSkills && selectedSkills.map((skill) => { return ( @@ -156,9 +156,9 @@ export const Summary = () => { ); })} -
+
setSelectSkillsOpen(!selectSkillsOpen)} > Выберите скилл @@ -168,7 +168,7 @@ export const Summary = () => { />
{selectSkillsOpen && ( -
+
{skillsList.map((skill) => { return (

{ ]) } key={skill.id} - className="selectSkills__item" + className="select-skills__item" > {skill.name}

@@ -253,12 +253,12 @@ export const Summary = () => {
)} {openGit && ( -
+

Ваши репозитории

-
+
{Boolean(gitInfo.length) && gitInfo.map((itemGit) => { return ( @@ -267,23 +267,23 @@ export const Summary = () => { target="_blank" rel="noreferrer" key={itemGit.id} - className="summary__sectionGitItem gitItem" + className="summary__section-git-item git-item" > -
-
+ diff --git a/src/pages/Summary/summary.scss b/src/pages/Summary/summary.scss index a17d1a20..7e5e334d 100644 --- a/src/pages/Summary/summary.scss +++ b/src/pages/Summary/summary.scss @@ -86,7 +86,7 @@ } } - .openGit { + .open-git { .summary__name { max-width: none; @@ -250,7 +250,7 @@ } } - .editSkills { + .edit-skills { display: flex; flex-wrap: wrap; gap: 14px; @@ -273,7 +273,7 @@ } } - .selectSkills { + .select-skills { position: relative; display: flex; flex-direction: column; @@ -384,10 +384,10 @@ padding: 15px 35px 15px 50px !important; } - &__sectionGit { + &__section-git { margin-top: 25px; - &Items { + &-items { margin-top: 25px; display: flex; flex-wrap: wrap; @@ -395,7 +395,7 @@ column-gap: 25px; justify-content: space-between; - .noGitItems { + .no-git-items { width: 100%; font-size: 20px; background: #ffffff; @@ -405,7 +405,7 @@ font-weight: 600; } - .gitItem { + .git-item { width: 48%; display: flex; align-items: center; diff --git a/src/pages/Tracker/Tracker.jsx b/src/pages/Tracker/Tracker.jsx index 310a3f20..c18c625b 100644 --- a/src/pages/Tracker/Tracker.jsx +++ b/src/pages/Tracker/Tracker.jsx @@ -236,12 +236,12 @@ export const Tracker = () => {
-
-
+
+

{25} - {35} @@ -260,7 +260,7 @@ export const Tracker = () => {

-
+
search { />
-
- +
+ #

Фильтр

 - +

Очистить фильтр
@@ -288,18 +288,18 @@ export const Tracker = () => { projects={projects} /> -
-
+
+

Учет моего рабочего времени за день

Задач выполнено:

{2}

-
+

Общее время:

{"4 ч 34 мин"}

-
+
#

Сверка пройдена

@@ -311,7 +311,7 @@ export const Tracker = () => {
-
+
Закрыть сегодняшний день @@ -381,23 +381,23 @@ export const Tracker = () => { )}`}

-
+
{Boolean( projects?.filter((project) => project.status === 10).length ) ? ( projects?.map((project, index) => { return project.status === 10 ? (
-
+

{project.name}

{project.date}

-
+
#

Создатель проекта:

@@ -410,7 +410,7 @@ export const Tracker = () => { ); }) ) : ( -
+
#

В архиве проектов нет

diff --git a/src/pages/Tracker/tracker.scss b/src/pages/Tracker/tracker.scss index cafefd44..2109e746 100644 --- a/src/pages/Tracker/tracker.scss +++ b/src/pages/Tracker/tracker.scss @@ -367,7 +367,7 @@ border-color: gray; } - &Selected { + &-selected { display: flex; align-items: center; border-radius: 8px; @@ -428,7 +428,7 @@ transform: rotate(180deg); } - &Dropdown { + &-dropdown { position: absolute; top: 33px; left: 0; @@ -441,7 +441,7 @@ row-gap: 7px; width: 100%; - .executorDropdown__person { + .executor-dropdown__person { display: flex; justify-content: space-between; align-items: center; @@ -565,7 +565,7 @@ margin-top: 8px; padding: 0 8px 8px; - .tagItem { + .tag-item { display: flex; align-items: center; flex-direction: row; @@ -620,7 +620,7 @@ } } - .addNewTag { + .add-new-tag { display: flex; align-items: center; column-gap: 15px; @@ -649,7 +649,7 @@ } } - .formTag { + .form-tag { display: flex; flex-direction: column; padding: 8px; @@ -750,7 +750,7 @@ transform: scaleX(1); } - .tasksContainer { + .tasks-container { display: flex; flex-direction: column; row-gap: 8px; @@ -923,7 +923,7 @@ } } - &__deadLine { + &__dead-line { display: flex; align-items: center; column-gap: 5px; @@ -969,7 +969,7 @@ row-gap: 3px; margin: 5px 0 8px; - .tagItem { + .tag-item { padding: 3px 10px; border-radius: 10px; color: white; @@ -978,7 +978,7 @@ } } - .openItems { + .open-items { cursor: pointer; border-radius: 44px; width: 33px; @@ -993,11 +993,11 @@ color: white; } - .moreItems { + .more-items { background: #8bcc60; } - .lessItems { + .less-items { background: #f92828; } @@ -1036,7 +1036,7 @@ } } - &__noItems { + &__no-items { font-weight: 500; font-size: 25px; transform: scaleY(-1); @@ -1046,12 +1046,12 @@ } } - &__noTasks { + &__no-tasks { display: flex; flex-direction: column; transform: scaleY(-1); - &Info { + &-info { display: flex; align-items: center; margin-bottom: 15px; @@ -1068,7 +1068,7 @@ } } - &More { + &-more { font-size: 14px; line-height: 22px; } @@ -1138,14 +1138,14 @@ display: flex; } - &__allTasks { + &__all-tasks { max-width: 1160px; padding: 0 20px; margin: 0 auto; display: flex; flex-direction: column; - .taskList { + .task-list { &__head { display: flex; justify-content: space-between; @@ -1548,7 +1548,7 @@ } } - &__tasksWrapper { + &__tasks-wrapper { margin-top: 20px; display: flex; flex-direction: column; @@ -1580,7 +1580,7 @@ } } - &__completeTask { + &__complete-task { display: flex; justify-content: space-between; align-items: center; @@ -1598,7 +1598,7 @@ color: #111112; } - .completeTask__title { + .complete-task__title { font-weight: 700; font-size: 18px; line-height: 32px; @@ -1857,7 +1857,7 @@ } } - &__noItem { + &__no-item { padding: 23px 0 19px; color: #6f6f6f; diff --git a/src/pages/TrackerIntro/TrackerIntro.js b/src/pages/TrackerIntro/TrackerIntro.js index 0649eff8..6c6b3925 100644 --- a/src/pages/TrackerIntro/TrackerIntro.js +++ b/src/pages/TrackerIntro/TrackerIntro.js @@ -15,64 +15,64 @@ import "./trackerIntro.scss"; export const TrackerIntro = () => { return ( -
+
-
+
-
-
-
+
+
+
img Подключись и пользуйся бесплатно!
-

+

Сервис для планирования и работы для Вашей команды img

-

+

Российский сервис для совместной работы команд. Все процессы компании в одном месте: проекты, задачи, цели, сотрудники, документы, переписки, отчеты

- + Начать работу
img
-
-
+
+
board heard
-
+

Управление большим количеством проектов и гибкая настройка структуры под любые процессы

- + Начать работу
-
-

+
+

Используйте сервис, который позаботится о персональных данных вашей компании и
не уйдет с рынка. img

-
-
-
+
+
+
+

Настраиваемые @@ -85,8 +85,8 @@ export const TrackerIntro = () => { работу вашей команды.

-
-
+
+
+

Учет diff --git a/src/pages/TrackerIntro/trackerIntro.scss b/src/pages/TrackerIntro/trackerIntro.scss index a11f2434..9aef7707 100644 --- a/src/pages/TrackerIntro/trackerIntro.scss +++ b/src/pages/TrackerIntro/trackerIntro.scss @@ -1,4 +1,4 @@ -.trackerIntro { +.tracker-intro { &__content { font-family: "LabGrotesque", sans-serif; background-color: #f1f1f1; @@ -14,7 +14,7 @@ } &__intro { - display: flex; + display: flex; justify-content: space-between; align-items: end; padding: 50px 0 75px; @@ -73,7 +73,7 @@ margin-bottom: 75px; span { - color: #52B709; + color: #52b709; } img { @@ -137,7 +137,7 @@ } &__btn { - background: #52B709; + background: #52b709; border-radius: 44px; padding: 9px 48px; color: white; @@ -160,7 +160,7 @@ align-items: end; margin: 0 auto 115px; - &Img { + &-img { position: relative; margin-bottom: 34px; } @@ -242,7 +242,7 @@ margin-bottom: 100px; span { - color: #52B709; + color: #52b709; } img { @@ -281,20 +281,20 @@ max-width: none; } - &Head { + &-head { display: flex; align-items: center; margin-bottom: 45px; span { - background: #52B709; + background: #52b709; border-radius: 44px; display: flex; align-items: center; justify-content: center; width: 71px; height: 71px; - color: #FFFFFF; + color: #ffffff; font-size: 30px; @media (max-width: 650px) { diff --git a/src/pages/TrackerRegistration/TrackerRegistration.js b/src/pages/TrackerRegistration/TrackerRegistration.js index 91e6262c..238f7e68 100644 --- a/src/pages/TrackerRegistration/TrackerRegistration.js +++ b/src/pages/TrackerRegistration/TrackerRegistration.js @@ -66,7 +66,7 @@ export const TrackerRegistration = () => {

-
+
Ваше имя
{ /> {validationErrors.username}
-
+
Ваш e-mail
{ /> {validationErrors.email}
-
+
Придумайте пароль
{ /> {validationErrors.password}
-
+
Повторите пароль
{ }, []); return ( -
+
-
+
{localStorage.getItem("role_status") !== "18" && ( <> { { name: "Просмотр отчета за день", link: "/profile/view" } ]} /> -

+

Ваши отчеты - просмотр отчета за день

)} {

Вернуться

{localStorage.getItem("role_status") !== "18" && ( -
- +
+ {deleteLoader ? ( ) : ( @@ -135,8 +135,8 @@ export const ViewReport = () => { onClick={deleteReport} className={ taskText.length - ? "viewReport__bar__delete" - : "viewReport__bar__delete disable" + ? "view-report__bar__delete" + : "view-report__bar__delete disable" } > Удалить отчет @@ -145,14 +145,14 @@ export const ViewReport = () => {
)}
-
+
previousDay()}> -
+
arrow
@@ -171,7 +171,7 @@ export const ViewReport = () => { params.id }`} > -
+
arrow
@@ -179,9 +179,9 @@ export const ViewReport = () => {
{loader && } {Boolean(taskText.length) && ( -
+
- +
@@ -203,7 +203,7 @@ export const ViewReport = () => {

-
+
{Math.floor(task.hours)}

{hourOfNum(Math.floor(task.hours))} @@ -225,7 +225,7 @@ export const ViewReport = () => {

{Boolean(difficulties.length) && ( -
+

Какие сложности возникли?

{difficulties.map((item, index) => { return

{item}

; @@ -233,7 +233,7 @@ export const ViewReport = () => {
)} {Boolean(tomorrowTask.length) && ( -
+

Что планируется сделать завтра?

{tomorrowTask.map((item, index) => { return

{item}

; @@ -243,7 +243,7 @@ export const ViewReport = () => {
)} {!Boolean(taskText.length) && !loader && ( -
+
{localStorage.getItem("role_status") === "4" ? (

В этот день вы не заполняли отчет diff --git a/src/pages/ViewReport/viewReport.scss b/src/pages/ViewReport/viewReport.scss index 8cfdae69..ce695d36 100644 --- a/src/pages/ViewReport/viewReport.scss +++ b/src/pages/ViewReport/viewReport.scss @@ -1,8 +1,8 @@ -.viewReport { - background: #F1F1F1; +.view-report { + background: #f1f1f1; height: 100%; min-height: 100vh; - font-family: 'LabGrotesque', sans-serif; + font-family: "LabGrotesque", sans-serif; .container { max-width: 1160px; @@ -25,7 +25,7 @@ line-height: 32px; color: #000000; span { - color: #52B709; + color: #52b709; } @media (max-width: 500px) { @@ -56,7 +56,7 @@ &__bar { display: flex; margin-top: 20px; - background: #FFFFFF; + background: #ffffff; border-radius: 12px; padding: 20px 33px; align-items: center; @@ -73,7 +73,7 @@ } &__edit { - background: #E1FCCF; + background: #e1fccf; border-radius: 44px; border: none; } @@ -81,7 +81,7 @@ &__delete { background: white; border-radius: 12px; - border: 1px dashed #8BCC60; + border: 1px dashed #8bcc60; } .disable { @@ -124,7 +124,7 @@ .switch-date { width: 48px; height: 48px; - background: #8DC63F; + background: #8dc63f; border-radius: 50px; display: flex; justify-content: center; @@ -169,7 +169,6 @@ border-collapse: separate; border-spacing: 28px 0; - @media (max-width: 1205px) { display: grid; border-collapse: collapse; @@ -278,7 +277,7 @@ &__hours { width: 25%; - background: #FFFFFF; + background: #ffffff; border-radius: 12px; padding: 32px 40px 18px; display: flex; @@ -323,7 +322,7 @@ span { max-width: 48px; height: 48px; - background: #8DC63F; + background: #8dc63f; border-radius: 50px; display: flex; align-items: center; @@ -360,7 +359,7 @@ display: flex; flex-direction: column; row-gap: 10px; - background: #FFFFFF; + background: #ffffff; border-radius: 12px; margin: 20px 0; padding: 15px; @@ -390,9 +389,9 @@ margin-bottom: 0; } - &__noTask { + &__no-task { padding: 25px 10px; - background: #FFFFFF; + background: #ffffff; border-radius: 12px; text-align: center; @@ -407,7 +406,7 @@ } span { - color: #8BCC60; + color: #8bcc60; font-weight: 500; } }