apuc/guild_front
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix style names

Browse Source
This commit is contained in:
Victor Batischev 2024-01-31 16:46:16 +03:00
parent 73c9101be2
commit 78249348eb
9 changed files with 45 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/components/Common/ModalLayout/modalLayout.scss
View File

@ -21,7 +21,7 @@
align-items: center; align-items: center;
justify-content: center; justify-content: center;
.selectPerson { .select-person {
align-items: start; align-items: start;
&__info { &__info {
@ -45,7 +45,7 @@
font-weight: 300; font-weight: 300;
} }
.addPersonBlock { .add-person-block {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
justify-content: space-between; justify-content: space-between;
@ -55,7 +55,7 @@
} }
} }
.invitePersonBlock { .invite-person-block {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
row-gap: 20px; row-gap: 20px;
@ -89,14 +89,14 @@
margin: 5px 0; margin: 5px 0;
} }
.invitePersonBlock { .invite-person-block {
row-gap: 5px; row-gap: 5px;
&__btn { &__btn {
margin: 5px auto; margin: 5px auto;
} }
} }
.addPersonBtn { .add-person-btn {
margin: 10px auto 0; margin: 10px auto 0;
} }
} }
@ -114,7 +114,7 @@
} }
} }
.createTiketProject { .create-ticket-project {
padding: 0; padding: 0;
background: white; background: white;
} }
@ -128,11 +128,11 @@
transform: scale(1); transform: scale(1);
} }
.createProject, .create-project,
.createColumn, .create-column,
.editProject, .edit-project,
.addWorker, .add-worker,
.editColumn { .edit-column {
background: linear-gradient(180deg, #fff 0%, #ebebeb 37.29%); background: linear-gradient(180deg, #fff 0%, #ebebeb 37.29%);
.title-project { .title-project {
margin-top: 20px; margin-top: 20px;

4
src/components/Modal/Tracker/ListEmployees/ListEmployees.jsx
View File

@ -81,12 +81,12 @@ const ListEmployees = ({
<div <div
className="persons__list__add" className="persons__list__add"
onClick={() => { onClick={() => {
dispatch(modalToggle("addWorker")); dispatch(modalToggle("add-worker"));
setModalAdd(true); setModalAdd(true);
setActiveListEmpl(false); setActiveListEmpl(false);
}} }}
> >
<span className="addPerson">+</span> <span className="add-person">+</span>
<p>Добавить участников</p> <p>Добавить участников</p>
</div> </div>
</div> </div>

2
src/components/Modal/Tracker/ListEmployees/listEmployees.scss
View File

@ -70,7 +70,7 @@
left: -20px; left: -20px;
} }
.addPerson { .add-person {
background: #00c5a8; background: #00c5a8;
color: white; color: white;
font-size: 14px; font-size: 14px;

28
src/components/Modal/Tracker/TrackerModal/TrackerModal.jsx
View File

@ -306,7 +306,7 @@ export const TrackerModal = ({
} }
useEffect(() => { useEffect(() => {
modalType === "addWorker" modalType === "add-worker"
? apiRequest("/project/my-employee").then((el) => { ? apiRequest("/project/my-employee").then((el) => {
let persons = el.managerEmployees; let persons = el.managerEmployees;
let ids = projectBoard.projectUsers.map((user) => user.user_id); let ids = projectBoard.projectUsers.map((user) => user.user_id);
@ -394,10 +394,10 @@ export const TrackerModal = ({
// setSelectWorkersOpen(false); // setSelectWorkersOpen(false);
// }} // }}
> >
{modalType === "addWorker" && ( {modalType === "add-worker" && (
<> <>
<div className="select__person"> <div className="select__person">
<div className="title-project selectPerson"> <div className="title-project select-person">
<h4>Добавьте участника</h4> <h4>Добавьте участника</h4>
{/*<div className="input-container">*/} {/*<div className="input-container">*/}
{/* <input*/} {/* <input*/}
@ -406,11 +406,11 @@ export const TrackerModal = ({
{/* onChange={(e) => setEmailWorker(e.target.value)}*/} {/* onChange={(e) => setEmailWorker(e.target.value)}*/}
{/* />*/} {/* />*/}
{/*</div>*/} {/*</div>*/}
<p className="selectPerson__info"> <p className="select-person__info">
Выберите пользователя в проекте или добавьте по e-mail Выберите пользователя в проекте или добавьте по e-mail
</p> </p>
<div className="invite__blocks"> <div className="invite__blocks">
<div className="addPersonBlock"> <div className="add-person-block">
<div <div
className={ className={
selectWorkersOpen selectWorkersOpen
@ -455,22 +455,22 @@ export const TrackerModal = ({
)} )}
</div> </div>
<BaseButton <BaseButton
styles={"button-add addPersonBtn"} styles={"button-add add-person-btn"}
onClick={addUserToProject} onClick={addUserToProject}
> >
Добавить Добавить
</BaseButton> </BaseButton>
</div> </div>
<span>или</span> <span>или</span>
<div className="invitePersonBlock"> <div className="invite-person-block">
<div className="input-container invitePersonBlock__input"> <div className="input-container invite-person-block__input">
<input <input
className="name-project" className="name-project"
placeholder="e-mail" placeholder="e-mail"
type="email" type="email"
/> />
</div> </div>
<BaseButton styles={"button-add invitePersonBlock__btn"}> <BaseButton styles={"button-add invite-person-block__btn"}>
Отправить приглашение Отправить приглашение
</BaseButton> </BaseButton>
</div> </div>
@ -479,7 +479,7 @@ export const TrackerModal = ({
</div> </div>
</> </>
)} )}
{modalType === "createTiketProject" && ( {modalType === "create-ticket-project" && (
<> <>
<div className="title-project"> <div className="title-project">
<div className="createTaskHead"> <div className="createTaskHead">
@ -719,7 +719,7 @@ export const TrackerModal = ({
</div> </div>
</> </>
)} )}
{modalType === "editProject" && ( {modalType === "edit-project" && (
<div> <div>
<div className="title-project"> <div className="title-project">
<h4>Введите новое название</h4> <h4>Введите новое название</h4>
@ -737,7 +737,7 @@ export const TrackerModal = ({
</BaseButton> </BaseButton>
</div> </div>
)} )}
{modalType === "createProject" && ( {modalType === "create-project" && (
<div> <div>
<div className="title-project"> <div className="title-project">
<h4>{titleProject}</h4> <h4>{titleProject}</h4>
@ -772,7 +772,7 @@ export const TrackerModal = ({
</BaseButton> </BaseButton>
</div> </div>
)} )}
{modalType === "createColumn" && ( {modalType === "create-column" && (
<div> <div>
<div className="title-project"> <div className="title-project">
<h4>Введите название колонки</h4> <h4>Введите название колонки</h4>
@ -790,7 +790,7 @@ export const TrackerModal = ({
</BaseButton> </BaseButton>
</div> </div>
)} )}
{modalType === "editColumn" && ( {modalType === "edit-column" && (
<div> <div>
<div className="title-project"> <div className="title-project">
<h4>Введите новое название</h4> <h4>Введите новое название</h4>

2
src/components/Modal/Tracker/TrackerModal/trackerModal.scss
View File

@ -730,7 +730,7 @@
margin: 0 auto; margin: 0 auto;
} }
.addPersonBtn { .add-person-btn {
margin: 0 auto 0 0; margin: 0 auto 0 0;
margin-top: 20px; margin-top: 20px;
} }

2
src/components/ProjectTiket/ProjectTiket.jsx
View File

@ -125,7 +125,7 @@ export const ProjectTiket = ({ project, index }) => {
<div className="project__settings-menu"> <div className="project__settings-menu">
<div <div
onClick={() => { onClick={() => {
dispatch(modalToggle("editProject")); dispatch(modalToggle("edit-project"));
setModalAdd(true); setModalAdd(true);
setModalSelect(false); setModalSelect(false);
}} }}

12
src/pages/ProjectTracker/ProjectTracker.js
View File

@ -214,7 +214,7 @@ export const ProjectTracker = () => {
function selectedTabTask(columnId, length) { function selectedTabTask(columnId, length) {
setSelectedTab(columnId); setSelectedTab(columnId);
dispatch(modalToggle("createTiketProject")); dispatch(modalToggle("create-ticket-project"));
setModalAdd(true); setModalAdd(true);
setPriorityTask(length); setPriorityTask(length);
} }
@ -369,7 +369,7 @@ export const ProjectTracker = () => {
!path.find( !path.find(
(div) => (div) =>
div.classList && div.classList &&
(div.classList.contains("addPerson") || (div.classList.contains("add-person") ||
div.classList.contains("persons__list")) div.classList.contains("persons__list"))
) )
) { ) {
@ -494,7 +494,7 @@ export const ProjectTracker = () => {
<div className="tasks__head__add"> <div className="tasks__head__add">
<BaseButton <BaseButton
onClick={() => { onClick={() => {
dispatch(modalToggle("createColumn")); dispatch(modalToggle("create-column"));
setModalAdd(true); setModalAdd(true);
}} }}
styles={"button-add-column"} styles={"button-add-column"}
@ -508,7 +508,7 @@ export const ProjectTracker = () => {
className={ className={
projectBoard.projectUsers?.length projectBoard.projectUsers?.length
? "tasks__head__persons" ? "tasks__head__persons"
: "tasks__head__persons noProjectUsers" : "tasks__head__persons no-project-users"
} }
> >
{Boolean(projectBoard.projectUsers?.length) && ( {Boolean(projectBoard.projectUsers?.length) && (
@ -538,7 +538,7 @@ export const ProjectTracker = () => {
<span className="countPersons">+1</span> <span className="countPersons">+1</span>
)} )}
<span <span
className="addPerson" className="add-person"
onClick={() => { onClick={() => {
setPersonListOpen(true); setPersonListOpen(true);
}} }}
@ -837,7 +837,7 @@ export const ProjectTracker = () => {
...prevState, ...prevState,
[column.id]: false [column.id]: false
})); }));
dispatch(modalToggle("editColumn")); dispatch(modalToggle("edit-column"));
dispatch(setColumnName(column.title)); dispatch(setColumnName(column.title));
dispatch(setColumnId(column.id)); dispatch(setColumnId(column.id));
dispatch(setColumnPriority(column.priority)); dispatch(setColumnPriority(column.priority));

12
src/pages/Tracker/Tracker.jsx
View File

@ -208,14 +208,14 @@ export const Tracker = () => {
</div> </div>
<BaseButton <BaseButton
styles={"createProjectBtn"} styles={"create-project-btn"}
onClick={() => { onClick={() => {
dispatch(modalToggle("createProject")); dispatch(modalToggle("create-project"));
setModalCreateProject(true); setModalCreateProject(true);
}} }}
> >
<img src={addProjectImg} alt="#"></img> <img src={addProjectImg} alt="#"></img>
<p className="createProjectBtn__text"> <p className="create-project-btn__text">
Ставьте задачи, следите за прогрессом, ведите учёт Ставьте задачи, следите за прогрессом, ведите учёт
рабочего времени рабочего времени
</p> </p>
@ -226,14 +226,14 @@ export const Tracker = () => {
{projects && Boolean(projects.length) && !loader && ( {projects && Boolean(projects.length) && !loader && (
<> <>
<BaseButton <BaseButton
styles="createProjectBtn" styles="create-project-btn"
onClick={() => { onClick={() => {
dispatch(modalToggle("createProject")); dispatch(modalToggle("create-project"));
setModalCreateProject(true); setModalCreateProject(true);
}} }}
> >
<img src={addProjectImg} alt="#"></img> <img src={addProjectImg} alt="#"></img>
<p className="createProjectBtn__text">Добавить проект</p> <p className="create-project-btn__text">Добавить проект</p>
</BaseButton> </BaseButton>
</> </>
)} )}

6
src/pages/Tracker/tracker.scss
View File

@ -176,7 +176,7 @@
} }
} }
.createProjectBtn { .create-project-btn {
max-width: 322px; max-width: 322px;
width: 322px; width: 322px;
height: 166px; height: 166px;
@ -306,11 +306,11 @@
} }
} }
.noProjectUsers { .no-project-users {
@media (max-width: 900px) { @media (max-width: 900px) {
position: inherit; position: inherit;
.addPerson { .add-person {
position: inherit; position: inherit;
} }