+
удалить
diff --git a/src/components/Modal/Tracker/ModalTicket/modalTicket.scss b/src/components/Modal/Tracker/ModalTicket/modalTicket.scss
index cabdc30f..4ef41186 100644
--- a/src/components/Modal/Tracker/ModalTicket/modalTicket.scss
+++ b/src/components/Modal/Tracker/ModalTicket/modalTicket.scss
@@ -20,6 +20,7 @@
border-radius: 8px;
display: flex;
flex-direction: row;
+ max-height: 750px;
.content {
position: relative;
@@ -116,45 +117,35 @@
}
.taskName {
+ display: -webkit-box;
max-width: 550px;
overflow: hidden;
- white-space: nowrap;
text-overflow: ellipsis;
- -webkit-line-clamp: 5;
+ -webkit-line-clamp: 2;
-webkit-box-orient: vertical;
}
.taskDescription {
+ display: -webkit-box;
max-width: 550px;
overflow: hidden;
- white-space: nowrap;
text-overflow: ellipsis;
- -webkit-line-clamp: 5;
+ -webkit-line-clamp: 4;
-webkit-box-orient: vertical;
}
.fullName {
max-width: 800px;
- overflow: hidden;
- white-space: nowrap;
- text-overflow: ellipsis;
- -webkit-line-clamp: 5;
- -webkit-box-orient: vertical;
}
.fullDescription {
max-width: 800px;
- overflow: hidden;
- white-space: nowrap;
- text-overflow: ellipsis;
- -webkit-line-clamp: 5;
- -webkit-box-orient: vertical;
}
.comments__list {
display: flex;
flex-direction: column;
- max-height: 300px;
+ max-height: 215px;
overflow: auto;
&::-webkit-scrollbar {
@@ -357,7 +348,7 @@
column-gap: 25px;
row-gap: 20px;
margin-top: 33px;
- max-height: 350px;
+ max-height: 170px;
overflow-y: auto;
&::-webkit-scrollbar {
@@ -376,6 +367,7 @@
}
.taskFile {
+ cursor: pointer;
position: relative;
.imgFile {
max-width: 170px;
@@ -409,6 +401,26 @@
}
}
}
+
+ .ImgOpened {
+ position: fixed;
+ width: 100vw;
+ height: 100vh;
+ top: 0;
+ left: 0;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ z-index: 100;
+ background-color: rgba(0, 0, 0, 0.2);
+
+ .imgFile {
+ width: 90vw;
+ height: 90vh;
+ max-width: none;
+ max-height: none;
+ }
+ }
}
.fileLoaded {
diff --git a/src/components/Modal/Tracker/TicketFullScreen/TicketFullScreen.jsx b/src/components/Modal/Tracker/TicketFullScreen/TicketFullScreen.jsx
index 5d0aa341..a624be02 100644
--- a/src/components/Modal/Tracker/TicketFullScreen/TicketFullScreen.jsx
+++ b/src/components/Modal/Tracker/TicketFullScreen/TicketFullScreen.jsx
@@ -6,6 +6,7 @@ import DatePicker, { registerLocale } from "react-datepicker";
import { useDispatch, useSelector } from "react-redux";
import { Link, useNavigate, useParams } from "react-router-dom";
+import { getProfileInfo } from "@redux/outstaffingSlice";
import {
deletePersonOnProject,
getBoarderLoader,
@@ -23,6 +24,8 @@ import {
import { apiRequest } from "@api/request";
+import { useNotification } from "@hooks/useNotification";
+
import { getCorrectDate } from "@components/Calendar/calendarHelper";
import { Footer } from "@components/Common/Footer/Footer";
import { Loader } from "@components/Common/Loader/Loader";
@@ -73,6 +76,7 @@ export const TicketFullScreen = () => {
minute: 0,
seconds: 0,
});
+ const profileInfo = useSelector(getProfileInfo);
const [timerId, setTimerId] = useState(null);
const [dropListOpen, setDropListOpen] = useState(false);
const [correctProjectUsers, setCorrectProjectUsers] = useState([]);
@@ -84,6 +88,7 @@ export const TicketFullScreen = () => {
const [uploadedFile, setUploadedFile] = useState(null);
const [taskFiles, setTaskFiles] = useState([]);
const [acceptModalOpen, setAcceptModalOpen] = useState(false);
+ const { showNotification } = useNotification();
useEffect(() => {
apiRequest(`/task/get-task?task_id=${ticketId.id}`).then((taskInfo) => {
@@ -175,7 +180,13 @@ export const TicketFullScreen = () => {
title: inputsValue.title,
description: inputsValue.description,
},
- }).then(() => {});
+ }).then(() => {
+ showNotification({
+ show: true,
+ text: "Изменения сохранены",
+ type: "success",
+ });
+ });
}
function createComment() {
@@ -988,11 +999,27 @@ export const TicketFullScreen = () => {
ссылка на задачу
+
в архив
-
+
удалить
diff --git a/src/components/Navigation/Navigation.jsx b/src/components/Navigation/Navigation.jsx
index ba43bc79..fb83c23a 100644
--- a/src/components/Navigation/Navigation.jsx
+++ b/src/components/Navigation/Navigation.jsx
@@ -17,6 +17,7 @@ export const Navigation = () => {
const [user] = useState(
localStorage.getItem("role_status") === "18" ? "partner" : "developer"
);
+
const [navInfo] = useState({
developer: [
{
diff --git a/src/components/SideBar/sidebar.scss b/src/components/SideBar/sidebar.scss
index 8a0d6705..6af9b83e 100644
--- a/src/components/SideBar/sidebar.scss
+++ b/src/components/SideBar/sidebar.scss
@@ -11,7 +11,6 @@
position: fixed;
width: 100% !important;
height: 80px;
- margin-bottom: 50px;
}
@media (max-width: 1440px) {
diff --git a/src/components/SliderWorkers/sliderWorkers.scss b/src/components/SliderWorkers/sliderWorkers.scss
index 5bc7f9a6..9b538b3d 100644
--- a/src/components/SliderWorkers/sliderWorkers.scss
+++ b/src/components/SliderWorkers/sliderWorkers.scss
@@ -32,6 +32,15 @@
line-height: 22px;
color: #000000;
}
+
+ @media (max-width: 1024px) {
+ text-align: center;
+ margin-top: 20px;
+
+ p {
+ margin-top: 15px;
+ }
+ }
}
.slick-list {
diff --git a/src/pages/AuthForDevelopers/authForDevelopers.scss b/src/pages/AuthForDevelopers/authForDevelopers.scss
index 06607e33..b81b2e1d 100644
--- a/src/pages/AuthForDevelopers/authForDevelopers.scss
+++ b/src/pages/AuthForDevelopers/authForDevelopers.scss
@@ -21,11 +21,23 @@
&__vector-black {
top: 460px;
right: -224px;
+
+ @media (max-width: 1200px) {
+ top: 370px;
+ }
+
+ @media (max-width: 1024px) {
+ top: 180px;
+ }
}
&__arrow {
margin-top: 360px;
z-index: 99;
+
+ @media (max-width: 1200px) {
+ display: none;
+ }
}
@media (max-width: 575.98px) {
@@ -42,6 +54,10 @@
padding-top: 30px;
position: relative;
padding-bottom: 310px;
+
+ @media (max-width: 1200px) {
+ display: none;
+ }
}
&__info-box {
diff --git a/src/pages/AuthForPartners/authForPartners.scss b/src/pages/AuthForPartners/authForPartners.scss
index 13c9e23e..17216e58 100644
--- a/src/pages/AuthForPartners/authForPartners.scss
+++ b/src/pages/AuthForPartners/authForPartners.scss
@@ -21,11 +21,23 @@
&__vector-black {
top: 460px;
right: -224px;
+
+ @media (max-width: 1200px) {
+ top: 370px;
+ }
+
+ @media (max-width: 1024px) {
+ top: 180px;
+ }
}
&__arrow {
margin-top: 360px;
cursor: pointer;
+
+ @media (max-width: 1200px) {
+ display: none;
+ }
}
@media (max-width: 575.98px) {
@@ -43,6 +55,10 @@
padding-top: 30px;
position: relative;
padding-bottom: 310px;
+
+ @media (max-width: 1200px) {
+ display: none;
+ }
}
@media (max-width: 575.98px) {
@@ -305,7 +321,7 @@
transform: rotate(90deg);
}
- @media (max-width: 660px) {
+ @media (max-width: 1024px) {
margin: 15px 0;
}
}
diff --git a/src/pages/CompanyInfo/companyInfo.scss b/src/pages/CompanyInfo/companyInfo.scss
index fbac5743..f5992751 100644
--- a/src/pages/CompanyInfo/companyInfo.scss
+++ b/src/pages/CompanyInfo/companyInfo.scss
@@ -3,6 +3,10 @@
font-family: "LabGrotesque", sans-serif;
background-color: #F1F1F1;
padding-top: 60px;
+
+ @media (max-width: 1375px) {
+ padding-top: 120px;
+ }
}
&__title {
@@ -17,6 +21,10 @@
color: #52B709;
font-weight: 700;
}
+
+ @media (max-width: 500px) {
+ font-size: 35px;
+ }
}
&__subTitle {
@@ -25,6 +33,10 @@
text-align: center;
font-size: 22px;
line-height: 32px;
+
+ @media (max-width: 500px) {
+ font-size: 18px;
+ }
}
.arrowElement {
@@ -35,6 +47,10 @@
display: flex;
justify-content: center;
align-items: center;
+
+ @media (max-width: 850px) {
+ display: none;
+ }
}
.arrowDown {
@@ -42,6 +58,10 @@
img {
transform: rotate(90deg);
}
+
+ @media (max-width: 500px) {
+ margin: 15px auto;
+ }
}
&__info {
@@ -68,6 +88,19 @@
ul {
padding-left: 18px;
}
+
+ @media (max-width: 700px) {
+ width: 100%;
+ }
+
+ @media (max-width: 600px) {
+ padding: 15px;
+ }
+ }
+
+ @media (max-width: 700px) {
+ flex-direction: column;
+ row-gap: 10px;
}
}
@@ -78,6 +111,12 @@
margin: 20px auto 70px;
max-width: 1000px;
+ @media (max-width: 700px) {
+ margin: 10px auto 30px;
+ text-align: center;
+ row-gap: 5px;
+ }
+
span {
color: #52B709;
font-weight: 700;
@@ -94,8 +133,16 @@
font-size: 18px;
line-height: 22px;
row-gap: 20px;
+
+ @media (max-width: 700px) {
+ row-gap: 8px;
+ }
}
}
+
+ @media (max-width: 500px) {
+ padding-top: 30px;
+ }
}
&__countingBlock {
@@ -108,10 +155,34 @@
row-gap: 16px;
position: relative;
+ @media (max-width: 1125px) {
+ padding-right: 45px;
+ }
+
+ @media (max-width: 850px) {
+ padding: 20px 25px;
+ }
+
+ @media (max-width: 780px) {
+ row-gap: 5px;
+ padding: 15px;
+ }
+
&__head {
display: flex;
justify-content: space-between;
align-items: center;
+
+ @media (max-width: 850px) {
+ justify-content: space-evenly;
+ }
+
+ @media (max-width: 750px) {
+ text-align: center;
+ img {
+ display: none;
+ }
+ }
}
&__bottom {
@@ -135,12 +206,21 @@
span {
color: #52B709;
}
+
+ @media (max-width: 780px) {
+ text-align: center;
+ row-gap: 5px;
+ }
}
.countingBlock__info {
display: flex;
flex-direction: column;
row-gap: 12px;
+
+ @media (max-width: 850px) {
+ row-gap: 5px;
+ }
}
.countingBlock {
@@ -162,6 +242,18 @@
position: absolute;
right: -140px;
top: -55px;
+
+ @media (max-width: 1440px) {
+ right: -25px;
+ }
+
+ @media (max-width: 1210px) {
+ right: 25px;
+ }
+
+ @media (max-width: 1125px) {
+ display: none;
+ }
}
}
}
diff --git a/src/pages/ProjectTracker/ProjectTracker.js b/src/pages/ProjectTracker/ProjectTracker.js
index 32a73399..f5fdca57 100644
--- a/src/pages/ProjectTracker/ProjectTracker.js
+++ b/src/pages/ProjectTracker/ProjectTracker.js
@@ -546,6 +546,7 @@ export const ProjectTracker = () => {
projectId={projectBoard.id}
projectName={projectBoard.name}
projectUsers={projectBoard.projectUsers}
+ projectOwnerId={projectBoard.owner_id}
/>
)}
@@ -621,96 +622,104 @@ export const ProjectTracker = () => {
)}
- {column.tasks.map((task) => {
- return (
-
- dragStartHandler(e, task, column.id)
- }
- onDragOver={(e) => dragOverTaskHandler(e, task)}
- onDragLeave={(e) => dragLeaveTaskHandler(e)}
- onDragEnd={() => dragEndTaskHandler()}
- onDrop={(e) =>
- dragDropTaskHandler(e, task, column)
- }
- onClick={(e) => openTicket(e, task)}
- >
+
+ {column.tasks.map((task) => {
+ return (
{
- if (window.innerWidth < 985) {
- window.location.replace(
- `/tracker/task/${task.id}`
- );
- }
- }}
+ key={task.id}
+ className={`tasks__board__item ${
+ taskHover[task.id] ? "task__hover" : ""
+ }`}
+ draggable={true}
+ onDragStart={(e) =>
+ dragStartHandler(e, task, column.id)
+ }
+ onDragOver={(e) => dragOverTaskHandler(e, task)}
+ onDragLeave={(e) => dragLeaveTaskHandler(e)}
+ onDragEnd={() => dragEndTaskHandler()}
+ onDrop={(e) =>
+ dragDropTaskHandler(e, task, column)
+ }
+ onClick={(e) => openTicket(e, task)}
>
-
- {task.title}
-
-
-
-
-
- {task.executor?.fio
- ? task.executor?.fio
- : "Исполнитель не назначен"}
-
- {task.executor?.avatar && (
-
{
+ if (window.innerWidth < 985) {
+ window.location.replace(
+ `/tracker/task/${task.id}`
+ );
}
- alt="avatar"
- />
- )}
-
-
-
Срок исполнения:
-
- {task.dead_line
- ? getCorrectDate(task.dead_line)
- : "Не выбран"}
-
-
-
-
-
-
- {task.comment_count}{" "}
- {caseOfNum(task.comment_count, "comments")}
-
+ }}
+ >
+
+ {task.title}
+
-
-
+
+
- {task.files ? task.files : 0}{" "}
- {caseOfNum(0, "files")}
+ {task.executor?.fio
+ ? task.executor?.fio
+ : "Исполнитель не назначен"}
+ {task.executor?.avatar && (
+
+ )}
-
-
item.id !== column.id
+ {task.dead_line && (
+
+
Срок исполнения:
+
+ {getCorrectDate(task.dead_line)}
+
+
)}
- currentColumn={column}
- task={task}
- />
-
- );
- })}
+
+
+
+
+ {task.comment_count}{" "}
+ {caseOfNum(
+ task.comment_count,
+ "comments"
+ )}
+
+
+
+
+
+ {task.files ? task.files : 0}{" "}
+ {caseOfNum(0, "files")}
+
+
+
+
item.id !== column.id
+ )}
+ currentColumn={column}
+ task={task}
+ />
+
+ );
+ })}
+