Merge branch 'main' into trackerTask

# Conflicts:
#	src/pages/Quiz/QuizPage.js
This commit is contained in:
Mikola
2024-02-14 14:59:20 +03:00
98 changed files with 1071 additions and 931 deletions

View File

@ -13,7 +13,7 @@
width: 100%;
}
.projectPersons {
.project-persons {
display: flex;
position: relative;
left: 5px;
@ -37,7 +37,7 @@
}
}
.onePerson {
.one-person {
display: flex;
position: relative;
left: -15px;
@ -63,7 +63,7 @@
display: flex;
}
.countPersons {
.count-persons {
color: #252c32;
border: 1px solid #dde2e4;
background: white;
@ -73,7 +73,7 @@
.add-person {
background: #00c5a8;
color: white;
font-size: 14px;
font-size: 18px;
transition: all 0.15s ease;
left: -28px;
z-index: 2;

View File

@ -558,7 +558,7 @@ export const ModalTiсket = ({
(div) =>
div.classList &&
(div.classList.contains("button-add-worker") ||
div.classList.contains("dropdownList"))
div.classList.contains("dropdown-list"))
)
) {
setDropListOpen(false);
@ -570,7 +570,7 @@ export const ModalTiсket = ({
!path.find(
(div) =>
div.classList &&
(div.classList.contains("deadLine") ||
(div.classList.contains("dead-line") ||
div.classList.contains("react-datepicker-popper"))
)
) {
@ -622,7 +622,7 @@ export const ModalTiсket = ({
}}
/>
) : (
<h5 className="taskName">{inputsValue.title}</h5>
<h5 className="task-name">{inputsValue.title}</h5>
)}
<div className="content__description">
{editOpen ? (
@ -674,13 +674,13 @@ export const ModalTiсket = ({
</div>
)}
{/*{uploadedFile && (*/}
{/* <div className="fileLoaded">*/}
{/* <div className="file-loaded">*/}
{/* {uploadedFile.map((file) => {*/}
{/* return (*/}
{/* <div className="loadedFile" key={file.id}>*/}
{/* <div className="loaded-file" key={file.id}>*/}
{/* <img src={backendImg(file.url)} alt="img" key={file.id} />*/}
{/* <div*/}
{/* className="deleteFile"*/}
{/* className="delete-file"*/}
{/* onClick={() => deleteLoadedFile(file)}*/}
{/* >*/}
{/* <img src={close} alt="delete" />*/}
@ -758,7 +758,8 @@ export const ModalTiсket = ({
<div className="workers">
<div className="workers_box task__info">
<span className="exit" onClick={() => setActive(false)}></span>
Создатель: <p className="workers__creator">{task.user?.fio}</p>
<h5>Создатель: </h5>
<p className="workers__creator">{task.user?.fio}</p>
{executor ? (
<>
<h5>Исполнитель: </h5>
@ -780,7 +781,7 @@ export const ModalTiсket = ({
</div>
</>
) : (
<div className="add-worker moreItems ">
<div className="add-worker more-items">
<button
className="button-add-worker"
onClick={() => setDropListOpen(true)}
@ -789,16 +790,16 @@ export const ModalTiсket = ({
</button>
<span>Добавить исполнителя</span>
{dropListOpen && (
<div className="dropdownList">
<div className="dropdown-list">
<img
src={close}
className="dropdownList__close"
className="dropdown-list__close"
onClick={() => setDropListOpen(false)}
/>
{correctProjectUsers.map((person) => {
return (
<div
className="dropdownList__person"
className="dropdown-list__person"
key={person.user_id}
onClick={() => taskExecutor(person)}
>
@ -845,7 +846,7 @@ export const ModalTiсket = ({
</div>
</div>
)}
<div className="add-worker moreItems">
<div className="add-worker more-items">
<button
className="button-add-worker"
onClick={() => setDropListMembersOpen(true)}
@ -854,17 +855,17 @@ export const ModalTiсket = ({
</button>
<span>Добавить участника</span>
{dropListMembersOpen && (
<div className="dropdownList">
<div className="dropdown-list">
<img
src={close}
className="dropdownList__close"
className="dropdown-list__close"
onClick={() => setDropListMembersOpen(false)}
/>
{users.length ? (
users.map((person) => {
return (
<div
className="dropdownList__person"
className="dropdown-list__person"
key={person.user_id}
onClick={() => addMember(person)}
>
@ -881,7 +882,7 @@ export const ModalTiсket = ({
);
})
) : (
<p className="noUsers">Нет пользователей</p>
<p className="no-users">Нет пользователей</p>
)}
</div>
)}
@ -889,14 +890,14 @@ export const ModalTiсket = ({
</div>
<div className="workers_box-middle">
<div className="deadLine">
<div className="dead-line">
<div
className="deadLine__container"
className="dead-line__container"
onClick={() => setDatePickerOpen(!datePickerOpen)}
>
<img src={calendarIcon} alt="calendar" />
<span>
{deadLine ? getCorrectDate(deadLine) : "Срок исполнения:"}
{deadLine ? getCorrectDate(deadLine) : "Срок исполнения"}
</span>
</div>
<DatePicker
@ -913,7 +914,7 @@ export const ModalTiсket = ({
/>
</div>
<div className="time">
<img src={watch}></img>
<p></p>
<p>
{correctTimerTime(currentTimerCount.hours)}:
{correctTimerTime(currentTimerCount.minute)}:
@ -990,7 +991,7 @@ export const ModalTiсket = ({
{correctProjectTags.map((tag) => {
return (
<div
className="tagItem"
className="tag-item"
key={tag.id}
onClick={() => addTagToTask(tag.id)}
>
@ -1000,7 +1001,7 @@ export const ModalTiсket = ({
);
})}
{!Boolean(correctProjectTags.length) && (
<p className="tags__dropDown__noItem">Нет тегов</p>
<p className="tags__dropDown__no-item">Нет тегов</p>
)}
</div>
)}

View File

@ -66,6 +66,7 @@
margin-left: 15px;
&__category {
height: 22px;
margin-right: 5px;
}
@ -144,17 +145,17 @@
margin-bottom: 0;
}
.taskName {
.task-name {
max-width: 550px;
text-overflow: ellipsis;
-webkit-line-clamp: 2;
}
.fullName {
.full-name {
max-width: 800px;
}
.fullDescription {
.full-description {
max-width: 800px;
}
@ -193,7 +194,7 @@
margin: 10px 0;
}
&__subComment {
&__sub-comment {
&:before {
content: "";
background: #e4e4e6;
@ -366,22 +367,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;
@ -402,7 +403,7 @@
}
}
.ImgOpened {
.img-opened {
position: fixed;
width: 100vw;
height: 100vh;
@ -414,7 +415,7 @@
z-index: 100;
background-color: rgba(0, 0, 0, 0.2);
.imgFile {
.img-file {
width: 90vw;
height: 90vh;
max-width: none;
@ -423,18 +424,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;
@ -454,7 +455,7 @@
}
}
&:hover {
.deleteFile {
.delete-file {
background: rgb(226, 226, 226, 0.6);
}
}
@ -725,7 +726,7 @@
}
}
.deadLine {
.dead-line {
position: relative;
&__container {
padding: 5px 10px 5px;
@ -846,7 +847,8 @@
.time {
display: flex;
align-items: center;
justify-content: space-between;
justify-content: center;
column-gap: 5px;
font-size: 13px;
margin-top: 5px;
width: 160px;
@ -860,7 +862,7 @@
&__creator {
font-size: 14px;
font-weight: 500;
max-width: 200px;
overflow: hidden;
white-space: nowrap;
@ -924,7 +926,7 @@
}
}
.dropdownList {
.dropdown-list {
position: absolute;
background: white;
padding: 10px;
@ -937,7 +939,7 @@
flex-direction: column;
row-gap: 8px;
.noUsers {
.no-users {
font-size: 14px;
text-align: center;
}
@ -1064,7 +1066,7 @@
top: 5px;
}
.tagItem {
.tag-item {
display: flex;
align-items: center;
justify-content: space-between;
@ -1091,7 +1093,7 @@
}
}
&__noItem {
&__no-item {
line-height: 20px;
font-size: 15px;
margin: 0;

View File

@ -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 = () => {
}}
/>
) : (
<h5 className="fullName nameFullScreen">
<h5 className="full-name name-fullscreen">
{inputsValue.title}
</h5>
)}
@ -708,7 +708,7 @@ export const TicketFullScreen = () => {
) : (
<div className="ticket__description">
<div
className="fullDescription fullScreenDescription"
className="full-description fullscreen-description"
dangerouslySetInnerHTML={{
__html: inputsValue.description
}}
@ -717,7 +717,7 @@ export const TicketFullScreen = () => {
)}
</div>
{Boolean(taskFiles.length) && (
<div className="task__files filesFullScreen">
<div className="task__files files-fullscreen">
{taskFiles.map((file) => {
return (
<FileTracker
@ -731,17 +731,17 @@ export const TicketFullScreen = () => {
</div>
)}
{uploadedFile && (
<div className="fileLoaded">
<div className="file-loaded">
{uploadedFile.map((file) => {
return (
<div className="loadedFile" key={file.id}>
<div className="loaded-file" key={file.id}>
<img
src={backendImg(file.url)}
alt="img"
key={file.id}
/>
<div
className="deleteFile"
className="delete-file"
onClick={() => deleteLoadedFile(file)}
>
<img src={fileDelete} alt="delete" />
@ -775,7 +775,7 @@ export const TicketFullScreen = () => {
{caseOfNum(taskFiles.length, "files")}
</div>
</div>
<div className="content__input commentFullScreen">
<div className="content__input comment-fullscreen">
<input
placeholder="Оставить комментарий"
value={inputsValue.comment}
@ -809,7 +809,7 @@ export const TicketFullScreen = () => {
</div>
</div>
</div>
<div className="workers fullScreenWorkers">
<div className="workers fullscreen-workers">
<div className="workers_box task__info">
<div className="workers__creator">
Создатель: <p>{taskInfo.user?.fio}</p>
@ -836,7 +836,7 @@ export const TicketFullScreen = () => {
</div>
</>
) : (
<div className="add-worker moreItems ">
<div className="add-worker more-items ">
<button
className="button-add-worker"
onClick={() => setDropListOpen(true)}
@ -845,16 +845,16 @@ export const TicketFullScreen = () => {
</button>
<span>Добавить исполнителя</span>
{dropListOpen && (
<div className="dropdownList">
<div className="dropdown-list">
<img
src={close}
className="dropdownList__close"
className="dropdown-list__close"
onClick={() => setDropListOpen(false)}
/>
{correctProjectUsers.map((person) => {
return (
<div
className="dropdownList__person"
className="dropdown-list__person"
key={person.user_id}
onClick={() => taskExecutor(person)}
>
@ -901,7 +901,7 @@ export const TicketFullScreen = () => {
</div>
</div>
)}
<div className="add-worker moreItems">
<div className="add-worker more-items">
<button
className="button-add-worker"
onClick={() => setDropListMembersOpen(true)}
@ -910,17 +910,17 @@ export const TicketFullScreen = () => {
</button>
<span>Добавить участника</span>
{dropListMembersOpen && (
<div className="dropdownList">
<div className="dropdown-list">
<img
src={close}
className="dropdownList__close"
className="dropdown-list__close"
onClick={() => setDropListMembersOpen(false)}
/>
{users.length ? (
users.map((person) => {
return (
<div
className="dropdownList__person"
className="dropdown-list__person"
key={person.user_id}
onClick={() => addMember(person)}
>
@ -937,7 +937,7 @@ export const TicketFullScreen = () => {
);
})
) : (
<p className="noUsers">Нет пользователей</p>
<p className="no-users">Нет пользователей</p>
)}
</div>
)}
@ -945,9 +945,9 @@ export const TicketFullScreen = () => {
</div>
<div className="workers_box-middle">
<div className="deadLine">
<div className="dead-line">
<div
className="deadLine__container"
className="dead-line__container"
onClick={() => setDatePickerOpen(!datePickerOpen)}
>
<img src={calendarIcon} alt="calendar" />
@ -1049,7 +1049,7 @@ export const TicketFullScreen = () => {
{correctProjectTags.map((tag) => {
return (
<div
className="tagItem"
className="tag-item"
key={tag.id}
onClick={() => addTagToTask(tag.id)}
>
@ -1059,7 +1059,7 @@ export const TicketFullScreen = () => {
);
})}
{!Boolean(correctProjectTags.length) && (
<p className="tags__dropDown__noItem">Нет тегов</p>
<p className="tags__dropDown__no-item">Нет тегов</p>
)}
</div>
)}

View File

@ -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) {
@ -84,7 +84,7 @@
gap: 20px;
border-bottom: none !important;
.deadLine {
.dead-line {
width: 100%;
}
@ -122,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;
@ -141,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;
}

View File

@ -413,11 +413,11 @@ export const TrackerModal = ({
<div className="select__person">
<div className="title-project select-person">
<h4>Добавьте участника</h4>
<p className="select-person__info">
Выберите пользователя в списке или добавьте по e-mail
</p>
<div className="invite__blocks">
<div className="add-person-block">
<p className="select-person__info">
Выберите пользователя в списке
</p>
<div
className={
selectWorkersOpen
@ -468,8 +468,8 @@ export const TrackerModal = ({
Добавить
</BaseButton>
</div>
<span>или</span>
<div className="invite-person-block">
<span>или добавьте по e-mail</span>
<div className="input-container invite-person-block__input">
<input
className="name-project"
@ -494,13 +494,14 @@ export const TrackerModal = ({
{modalType === "create-ticket-project" && (
<>
<div className="title-project">
<div className="createTaskHead">
<div className="createTaskBody__right__owner">
<div className="create-task-head">
<div className="create-task-body__right__owner">
<p>Создание задачи</p>
</div>
</div>
<div className="createTaskBody">
<div className="createTaskBody__left">
<div className="create-task-body">
<div className="create-task-body__left">
<h4>Введите название и описание задачи</h4>
<div className="input-container">
<input
maxLength="100"
@ -532,14 +533,14 @@ export const TrackerModal = ({
}}
/>
</div>
<div className="createTaskBody__right">
<div className="createTaskBody__right__tags">
<div className="create-task-body__right">
<div className="create-task-body__right__tags">
<div className="tags__selected">
<div className="tags__selected__items">
{taskTags.map((tag) => {
return (
<div
className="selectedTag"
className="selected-tag"
key={tag.id}
style={{ background: tag.color }}
>
@ -596,7 +597,7 @@ export const TrackerModal = ({
);
})}
{Boolean(!correctProjectTags.length) && (
<p className="noTags">Нет тегов</p>
<p className="no-tags">Нет тегов</p>
)}
</div>
)}
@ -688,7 +689,7 @@ export const TrackerModal = ({
</div>
)}
</div>
<div className="createTaskBody__right__deadLine">
<div className="create-task-body__right__dead-line">
<img src={calendarImg} alt="calendar" />
<p onClick={() => setDatePickerOpen(!datePickerOpen)}>
{deadLineDate

View File

@ -305,7 +305,7 @@
}
}
.createTaskHead {
.create-task-head {
width: 100%;
padding: 5px 10px;
display: flex;
@ -319,7 +319,7 @@
color: #000000;
}
&__selectColumn {
&__select-column {
display: flex;
column-gap: 8px;
cursor: pointer;
@ -335,7 +335,7 @@
}
}
.createTaskBody {
.create-task-body {
padding: 15px 20px;
display: flex;
column-gap: 20px;
@ -448,7 +448,7 @@
gap: 8px;
max-width: 393px;
.selectedTag {
.selected-tag {
display: flex;
padding: 7px 7px 7px 8px;
border-radius: 35px;
@ -525,7 +525,7 @@
}
}
.noTags {
.no-tags {
text-align: center;
font-size: 18px;
}
@ -603,7 +603,7 @@
font-size: 16px;
}
&__deadLine {
&__dead-line {
display: flex;
align-items: center;
column-gap: 5px;