From 78249348ebb29e812867af8b099b44c8d921a433 Mon Sep 17 00:00:00 2001 From: Victor Batischev Date: Wed, 31 Jan 2024 16:46:16 +0300 Subject: [PATCH] fix style names --- .../Common/ModalLayout/modalLayout.scss | 22 +++++++-------- .../Tracker/ListEmployees/ListEmployees.jsx | 4 +-- .../Tracker/ListEmployees/listEmployees.scss | 2 +- .../Tracker/TrackerModal/TrackerModal.jsx | 28 +++++++++---------- .../Tracker/TrackerModal/trackerModal.scss | 2 +- src/components/ProjectTiket/ProjectTiket.jsx | 2 +- src/pages/ProjectTracker/ProjectTracker.js | 12 ++++---- src/pages/Tracker/Tracker.jsx | 12 ++++---- src/pages/Tracker/tracker.scss | 6 ++-- 9 files changed, 45 insertions(+), 45 deletions(-) diff --git a/src/components/Common/ModalLayout/modalLayout.scss b/src/components/Common/ModalLayout/modalLayout.scss index 450bb582..f0b896ac 100644 --- a/src/components/Common/ModalLayout/modalLayout.scss +++ b/src/components/Common/ModalLayout/modalLayout.scss @@ -21,7 +21,7 @@ align-items: center; justify-content: center; - .selectPerson { + .select-person { align-items: start; &__info { @@ -45,7 +45,7 @@ font-weight: 300; } - .addPersonBlock { + .add-person-block { display: flex; flex-direction: column; justify-content: space-between; @@ -55,7 +55,7 @@ } } - .invitePersonBlock { + .invite-person-block { display: flex; flex-direction: column; row-gap: 20px; @@ -89,14 +89,14 @@ margin: 5px 0; } - .invitePersonBlock { + .invite-person-block { row-gap: 5px; &__btn { margin: 5px auto; } } - .addPersonBtn { + .add-person-btn { margin: 10px auto 0; } } @@ -114,7 +114,7 @@ } } - .createTiketProject { + .create-ticket-project { padding: 0; background: white; } @@ -128,11 +128,11 @@ transform: scale(1); } -.createProject, -.createColumn, -.editProject, -.addWorker, -.editColumn { +.create-project, +.create-column, +.edit-project, +.add-worker, +.edit-column { background: linear-gradient(180deg, #fff 0%, #ebebeb 37.29%); .title-project { margin-top: 20px; diff --git a/src/components/Modal/Tracker/ListEmployees/ListEmployees.jsx b/src/components/Modal/Tracker/ListEmployees/ListEmployees.jsx index 09f029fa..a9fefcb4 100644 --- a/src/components/Modal/Tracker/ListEmployees/ListEmployees.jsx +++ b/src/components/Modal/Tracker/ListEmployees/ListEmployees.jsx @@ -81,12 +81,12 @@ const ListEmployees = ({
{ - dispatch(modalToggle("addWorker")); + dispatch(modalToggle("add-worker")); setModalAdd(true); setActiveListEmpl(false); }} > - + + +

Добавить участников

diff --git a/src/components/Modal/Tracker/ListEmployees/listEmployees.scss b/src/components/Modal/Tracker/ListEmployees/listEmployees.scss index 4dbb73cf..df242307 100644 --- a/src/components/Modal/Tracker/ListEmployees/listEmployees.scss +++ b/src/components/Modal/Tracker/ListEmployees/listEmployees.scss @@ -70,7 +70,7 @@ left: -20px; } - .addPerson { + .add-person { background: #00c5a8; color: white; font-size: 14px; diff --git a/src/components/Modal/Tracker/TrackerModal/TrackerModal.jsx b/src/components/Modal/Tracker/TrackerModal/TrackerModal.jsx index bde241ee..11adeda3 100644 --- a/src/components/Modal/Tracker/TrackerModal/TrackerModal.jsx +++ b/src/components/Modal/Tracker/TrackerModal/TrackerModal.jsx @@ -306,7 +306,7 @@ export const TrackerModal = ({ } useEffect(() => { - modalType === "addWorker" + modalType === "add-worker" ? apiRequest("/project/my-employee").then((el) => { let persons = el.managerEmployees; let ids = projectBoard.projectUsers.map((user) => user.user_id); @@ -394,10 +394,10 @@ export const TrackerModal = ({ // setSelectWorkersOpen(false); // }} > - {modalType === "addWorker" && ( + {modalType === "add-worker" && ( <>
-
+

Добавьте участника

{/*
*/} {/* setEmailWorker(e.target.value)}*/} {/* />*/} {/*
*/} -

+

Выберите пользователя в проекте или добавьте по e-mail

-
+
Добавить
или -
-
+
+
- + Отправить приглашение
@@ -479,7 +479,7 @@ export const TrackerModal = ({
)} - {modalType === "createTiketProject" && ( + {modalType === "create-ticket-project" && ( <>
@@ -719,7 +719,7 @@ export const TrackerModal = ({
)} - {modalType === "editProject" && ( + {modalType === "edit-project" && (

Введите новое название

@@ -737,7 +737,7 @@ export const TrackerModal = ({
)} - {modalType === "createProject" && ( + {modalType === "create-project" && (

{titleProject}

@@ -772,7 +772,7 @@ export const TrackerModal = ({
)} - {modalType === "createColumn" && ( + {modalType === "create-column" && (

Введите название колонки

@@ -790,7 +790,7 @@ export const TrackerModal = ({
)} - {modalType === "editColumn" && ( + {modalType === "edit-column" && (

Введите новое название

diff --git a/src/components/Modal/Tracker/TrackerModal/trackerModal.scss b/src/components/Modal/Tracker/TrackerModal/trackerModal.scss index 538dca27..6dfede96 100644 --- a/src/components/Modal/Tracker/TrackerModal/trackerModal.scss +++ b/src/components/Modal/Tracker/TrackerModal/trackerModal.scss @@ -730,7 +730,7 @@ margin: 0 auto; } -.addPersonBtn { +.add-person-btn { margin: 0 auto 0 0; margin-top: 20px; } diff --git a/src/components/ProjectTiket/ProjectTiket.jsx b/src/components/ProjectTiket/ProjectTiket.jsx index 11500b74..5b6f5586 100644 --- a/src/components/ProjectTiket/ProjectTiket.jsx +++ b/src/components/ProjectTiket/ProjectTiket.jsx @@ -125,7 +125,7 @@ export const ProjectTiket = ({ project, index }) => {
{ - dispatch(modalToggle("editProject")); + dispatch(modalToggle("edit-project")); setModalAdd(true); setModalSelect(false); }} diff --git a/src/pages/ProjectTracker/ProjectTracker.js b/src/pages/ProjectTracker/ProjectTracker.js index 3426c9aa..ce43476e 100644 --- a/src/pages/ProjectTracker/ProjectTracker.js +++ b/src/pages/ProjectTracker/ProjectTracker.js @@ -214,7 +214,7 @@ export const ProjectTracker = () => { function selectedTabTask(columnId, length) { setSelectedTab(columnId); - dispatch(modalToggle("createTiketProject")); + dispatch(modalToggle("create-ticket-project")); setModalAdd(true); setPriorityTask(length); } @@ -369,7 +369,7 @@ export const ProjectTracker = () => { !path.find( (div) => div.classList && - (div.classList.contains("addPerson") || + (div.classList.contains("add-person") || div.classList.contains("persons__list")) ) ) { @@ -494,7 +494,7 @@ export const ProjectTracker = () => {
{ - dispatch(modalToggle("createColumn")); + dispatch(modalToggle("create-column")); setModalAdd(true); }} styles={"button-add-column"} @@ -508,7 +508,7 @@ export const ProjectTracker = () => { className={ projectBoard.projectUsers?.length ? "tasks__head__persons" - : "tasks__head__persons noProjectUsers" + : "tasks__head__persons no-project-users" } > {Boolean(projectBoard.projectUsers?.length) && ( @@ -538,7 +538,7 @@ export const ProjectTracker = () => { +1 )} { setPersonListOpen(true); }} @@ -837,7 +837,7 @@ export const ProjectTracker = () => { ...prevState, [column.id]: false })); - dispatch(modalToggle("editColumn")); + dispatch(modalToggle("edit-column")); dispatch(setColumnName(column.title)); dispatch(setColumnId(column.id)); dispatch(setColumnPriority(column.priority)); diff --git a/src/pages/Tracker/Tracker.jsx b/src/pages/Tracker/Tracker.jsx index a7e16e2f..e21cb09f 100644 --- a/src/pages/Tracker/Tracker.jsx +++ b/src/pages/Tracker/Tracker.jsx @@ -208,14 +208,14 @@ export const Tracker = () => {
{ - dispatch(modalToggle("createProject")); + dispatch(modalToggle("create-project")); setModalCreateProject(true); }} > # -

+

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

@@ -226,14 +226,14 @@ export const Tracker = () => { {projects && Boolean(projects.length) && !loader && ( <> { - dispatch(modalToggle("createProject")); + dispatch(modalToggle("create-project")); setModalCreateProject(true); }} > # -

Добавить проект

+

Добавить проект

)} diff --git a/src/pages/Tracker/tracker.scss b/src/pages/Tracker/tracker.scss index 4773bba3..d840d80f 100644 --- a/src/pages/Tracker/tracker.scss +++ b/src/pages/Tracker/tracker.scss @@ -176,7 +176,7 @@ } } - .createProjectBtn { + .create-project-btn { max-width: 322px; width: 322px; height: 166px; @@ -306,11 +306,11 @@ } } - .noProjectUsers { + .no-project-users { @media (max-width: 900px) { position: inherit; - .addPerson { + .add-person { position: inherit; }