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

tracker add task fix

Browse Source
This commit is contained in:
Victor Batischev 2024-01-30 20:02:28 +03:00
parent 7a5d6fc9ec
commit a32533fdea
5 changed files with 33 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -955,7 +955,7 @@ export const TicketFullScreen = () => {
<div className="workers fullScreenWorkers"> <div className="workers fullScreenWorkers">
<div className="workers_box task__info"> <div className="workers_box task__info">
<p className="workers__creator"> <p className="workers__creator">
Создатель :<p>&nbsp;{taskInfo.user?.fio}</p> Создатель:<p>&nbsp;{taskInfo.user?.fio}</p>
</p> </p>
{taskInfo.executor ? ( {taskInfo.executor ? (

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

@ -484,7 +484,7 @@ export const TrackerModal = ({
<div className="title-project"> <div className="title-project">
<div className="createTaskHead"> <div className="createTaskHead">
<div className="createTaskBody__right__owner"> <div className="createTaskBody__right__owner">
<p>Создатель : {profileInfo?.fio}</p> <p>Создатель: {profileInfo?.fio}</p>
<img <img
src={ src={
profileInfo.photo profileInfo.photo
@ -711,12 +711,12 @@ export const TrackerModal = ({
}} }}
/> />
</div> </div>
</div>
</div>
<BaseButton styles={"button-add"} onClick={createTiket}> <BaseButton styles={"button-add"} onClick={createTiket}>
Создать Создать
</BaseButton> </BaseButton>
</div> </div>
</div>
</div>
</> </>
)} )}
{modalType === "editProject" && ( {modalType === "editProject" && (

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

@ -31,7 +31,7 @@
align-items: center; align-items: center;
flex-direction: column; flex-direction: column;
row-gap: 8px; row-gap: 8px;
margin-bottom: 10px; padding-bottom: 10px;
.select-priority { .select-priority {
background-color: white; background-color: white;
@ -296,7 +296,7 @@
.createTaskHead { .createTaskHead {
width: 100%; width: 100%;
padding: 30px 42px 18px; padding: 5px 10px;
display: flex; display: flex;
column-gap: 9.5px; column-gap: 9.5px;
align-items: center; align-items: center;
@ -325,9 +325,9 @@
} }
.createTaskBody { .createTaskBody {
padding: 13px 43px 46px 42px; padding: 10px;
display: flex; display: flex;
column-gap: 55px; column-gap: 20px;
&__left { &__left {
display: flex; display: flex;
@ -336,7 +336,8 @@
color: #263238 !important; color: #263238 !important;
font-size: 16px; font-size: 16px;
line-height: 19.2px; line-height: 19.2px;
margin-bottom: 25px; margin-bottom: 15px;
margin-left: 5px;
} }
.input-container { .input-container {
@ -360,8 +361,8 @@
} }
.ck-editor__editable.ck-rounded-corners { .ck-editor__editable.ck-rounded-corners {
min-height: 110px; min-height: 130px;
max-height: 110px; max-height: 130px;
} }
} }
@ -399,7 +400,7 @@
font-weight: 300; font-weight: 300;
line-height: 18px; line-height: 18px;
font-size: 15px; font-size: 15px;
margin-bottom: 17.5px; margin-bottom: 10px;
border-radius: 8px; border-radius: 8px;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
@ -579,7 +580,6 @@
font-weight: 300; font-weight: 300;
line-height: 18px; line-height: 18px;
font-size: 15px; font-size: 15px;
margin-bottom: 27px;
z-index: 100; z-index: 100;
} }
@ -600,7 +600,7 @@
line-height: 18px; line-height: 18px;
font-size: 15px; font-size: 15px;
position: relative; position: relative;
margin-bottom: 22px; margin: 8px 0 30px;
span { span {
color: #6f6f6f; color: #6f6f6f;

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

@ -964,17 +964,17 @@ export const ProjectTracker = () => {
/> />
<span> <span>
{task.comment_count}{" "} {task.comment_count}{" "}
{caseOfNum( {/* {caseOfNum(
task.comment_count, task.comment_count,
"comments" "comments"
)} )} */}
</span> </span>
</div> </div>
<div className="tasks__board__item__info__more"> <div className="tasks__board__item__info__more">
<img src={filesBoard} alt="filesImg" /> <img src={filesBoard} alt="filesImg" />
<span> <span>
{task.files ? task.files : 0}{" "} {task.files ? task.files : 0}{" "}
{caseOfNum(0, "files")} {/* {caseOfNum(0, "files")} */}
</span> </span>
</div> </div>
</div> </div>

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

@ -130,7 +130,7 @@
&__content { &__content {
width: 100%; width: 100%;
background: #ffffff; background: #ffffff;
padding: 27px 0 29px; padding: 15px 0;
margin-bottom: 50px; margin-bottom: 50px;
&__wrapper { &__wrapper {
@ -705,9 +705,9 @@
} }
&__container { &__container {
padding: 30px 25px 30px; padding: 10px;
display: flex; display: flex;
column-gap: 25px; column-gap: 15px;
margin: 0 auto; margin: 0 auto;
overflow: auto; overflow: auto;
max-width: 100%; max-width: 100%;
@ -730,9 +730,9 @@
} }
@media (max-width: 900px) { @media (max-width: 900px) {
padding: 15px; padding: 5px;
flex-direction: column; flex-direction: column;
row-gap: 25px; row-gap: 15px;
transform: none; transform: none;
} }
} }
@ -744,8 +744,7 @@
0px 1px 1px rgba(0, 0, 0, 0.06); 0px 1px 1px rgba(0, 0, 0, 0.06);
border-radius: 8px; border-radius: 8px;
padding: 12px 10px 12px 8px; padding: 12px 10px 12px 8px;
min-width: 365px; width: 360px;
max-width: 380px;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
row-gap: 10px; row-gap: 10px;
@ -765,10 +764,10 @@
.tasksContainer { .tasksContainer {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
row-gap: 16px; row-gap: 8px;
max-height: 750px; max-height: 750px;
overflow: auto; overflow: auto;
padding: 8px; padding: 5px;
&::-webkit-scrollbar { &::-webkit-scrollbar {
width: 3px; width: 3px;
@ -798,7 +797,7 @@
&__item { &__item {
width: 328px; width: 328px;
padding: 4px 10px; padding: 6px 10px;
position: relative; position: relative;
box-shadow: 0px 3px 2px -2px rgba(0, 0, 0, 0.06), box-shadow: 0px 3px 2px -2px rgba(0, 0, 0, 0.06),
0px 5px 3px -2px rgba(0, 0, 0, 0.02); 0px 5px 3px -2px rgba(0, 0, 0, 0.02);
@ -866,7 +865,7 @@
color: #5c6165; color: #5c6165;
font-weight: 400; font-weight: 400;
font-size: 14px; font-size: 14px;
line-height: 110%; line-height: 120%;
max-height: 100px; max-height: 100px;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
@ -877,7 +876,7 @@
&__info { &__info {
display: flex; display: flex;
justify-content: space-between; column-gap: 10px;
align-items: center; align-items: center;
pointer-events: none; pointer-events: none;
@ -908,8 +907,8 @@
&__priority { &__priority {
display: flex; display: flex;
justify-content: space-between;
align-items: center; align-items: center;
column-gap: 5px;
margin-bottom: 8px; margin-bottom: 8px;
p { p {
@ -938,8 +937,8 @@
&__deadLine { &__deadLine {
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: space-between; column-gap: 5px;
margin-bottom: 10px; margin-bottom: 8px;
p { p {
font-weight: 500; font-weight: 500;
@ -979,7 +978,7 @@
flex-wrap: wrap; flex-wrap: wrap;
column-gap: 6px; column-gap: 6px;
row-gap: 3px; row-gap: 3px;
margin-bottom: 5px; margin: 5px 0 8px;
.tagItem { .tagItem {
padding: 3px 10px; padding: 3px 10px;