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

small fix

Browse Source
This commit is contained in:
Victor Batischev 2024-02-06 18:22:06 +03:00
parent e9235884dd
commit ef8a0813b3
6 changed files with 56 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/components/ArchiveTableTracker/ArchiveTableTracker.jsx
View File

@ -24,9 +24,13 @@ const ArchiveTableTracker = ({ filterCompleteTasks, loader }) => {
);
})
) : (
<div className="archive__noItem">
<p>В данном месяце у вас не было задач</p>
</div>
<tr>
<td>
<div className="archive__noItem">
<p>В данном месяце у вас не было задач</p>
</div>
</td>
</tr>
)}
</>
)}

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

@ -135,7 +135,7 @@
.edit-column {
// background: linear-gradient(180deg, #fff 0%, #ebebeb 37.29%);
.title-project {
margin-top: 20px;
margin-top: 8px;
}
.button-add {
margin-top: 8px;

2
src/components/Modal/Tracker/TicketFullScreen/TicketFullScreen.jsx
View File

@ -972,7 +972,7 @@ export const TicketFullScreen = () => {
</div>
<div className="time">
<img src={watch}></img>
<span>Длительность : </span>
<span>Длительность: </span>
<p>
{correctTimerTime(currentTimerCount.hours)}:
{correctTimerTime(currentTimerCount.minute)}:

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

@ -793,55 +793,49 @@ export const TrackerModal = ({
{modalType === "edit-column" && (
<div>
<div className="title-project">
<h4>Введите новое название</h4>
<div className="input-container">
<input
className="name-project"
value={columnName}
onChange={(e) => dispatch(setColumnName(e.target.value))}
/>
<div>
<h4>Название колонки</h4>
<div className="input-container">
<input
className="name-project"
value={columnName}
onChange={(e) => dispatch(setColumnName(e.target.value))}
/>
</div>
</div>
<h4>Приоритет колонки</h4>
<div
className={
selectColumnPriorityOpen
? "select-priority select-priority--open"
: "select-priority"
}
onClick={() =>
setSelectColumnPriorityOpen(!selectColumnPriorityOpen)
}
>
<span>{selectColumnPriority}</span>
<img src={arrowDown} alt="arrow" />
{selectColumnPriorityOpen && (
<div className="select-priority__dropDown">
{projectBoard.columns.map((column, index) => {
return (
<span
key={column.id}
onClick={() => {
setSelectColumnPriority(index + 1);
dispatch(setColumnPriority(index + 1));
}}
>
{index + 1}
</span>
);
})}
</div>
)}
<div>
<h4>Приоритет колонки</h4>
<div
className={
selectColumnPriorityOpen
? "select-priority select-priority--open"
: "select-priority"
}
onClick={() =>
setSelectColumnPriorityOpen(!selectColumnPriorityOpen)
}
>
<span>{selectColumnPriority}</span>
<img src={arrowDown} alt="arrow" />
{selectColumnPriorityOpen && (
<div className="select-priority__dropDown">
{projectBoard.columns.map((column, index) => {
return (
<span
key={column.id}
onClick={() => {
setSelectColumnPriority(index + 1);
dispatch(setColumnPriority(index + 1));
}}
>
{index + 1}
</span>
);
})}
</div>
)}
</div>
</div>
{/*<div className="input-container">*/}
{/* <input*/}
{/* className="name-project"*/}
{/* placeholder="Приоритет колонки"*/}
{/* type="number"*/}
{/* step="1"*/}
{/* value={columnPriority}*/}
{/* onChange={(e) => dispatch(setColumnPriority(e.target.value))}*/}
{/* />*/}
{/*</div>*/}
</div>
<BaseButton styles={"button-add"} onClick={changeColumnParams}>
Сохранить

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

@ -30,13 +30,12 @@
display: flex;
align-items: center;
flex-direction: column;
row-gap: 8px;
padding-bottom: 10px;
row-gap: 12px;
padding-bottom: 15px;
.select-priority {
background-color: white;
width: 100%;
margin: 12px 0;
padding: 10px 8px;
border-radius: 8px;
font-size: 14px;

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

@ -397,15 +397,8 @@ export const ProjectTracker = () => {
div.classList.contains("tags__list"))
)
) {
setTags({
open: false,
add: false,
edit: false
});
setTagInfo({
description: "",
name: ""
});
setTags({ open: false, add: false, edit: false });
setTagInfo({ description: "", name: "" });
setColor("#aabbcc");
}
@ -962,20 +955,11 @@ export const ProjectTracker = () => {
src={commentsBoard}
alt="commentsImg"
/>
<span>
{task.comment_count}{" "}
{/* {caseOfNum(
task.comment_count,
"comments"
)} */}
</span>
<span>{task.comment_count}</span>
</div>
<div className="tasks__board__item__info__more">
<img src={filesBoard} alt="filesImg" />
<span>
{task.file_count ? task.file_count : 0}{" "}
{/* {caseOfNum(0, "files")} */}
</span>
<span>{task.file_count}</span>
</div>
</div>
<TrackerSelectColumn