diff --git a/src/components/Common/ModalLayout/modalLayout.scss b/src/components/Common/ModalLayout/modalLayout.scss index 2c0ef01f..1b482681 100644 --- a/src/components/Common/ModalLayout/modalLayout.scss +++ b/src/components/Common/ModalLayout/modalLayout.scss @@ -29,7 +29,7 @@ &__info { font-size: 15px; font-weight: 300; - margin: 12px 0 20px; + margin-top: 8px; } @media (max-width: 805px) { @@ -52,13 +52,14 @@ flex-direction: column; justify-content: space-between; align-items: center; + row-gap: 5px; } .invite-person-block { display: flex; flex-direction: column; align-items: center; - row-gap: 10px; + row-gap: 5px; &__input { margin: 0; min-width: 240px; @@ -86,11 +87,10 @@ span { text-align: center; - margin: 5px 0; + margin-top: 15px; } .invite-person-block { - row-gap: 5px; &__btn { margin: 5px auto; } diff --git a/src/components/Modal/Tracker/TrackerModal/TrackerModal.jsx b/src/components/Modal/Tracker/TrackerModal/TrackerModal.jsx index 70705261..c41614db 100644 --- a/src/components/Modal/Tracker/TrackerModal/TrackerModal.jsx +++ b/src/components/Modal/Tracker/TrackerModal/TrackerModal.jsx @@ -406,11 +406,11 @@ export const TrackerModal = ({

Добавьте участника

-

- Выберите пользователя в списке или добавьте по e-mail -

+

+ Выберите пользователя в списке +

- или
+ или добавьте по e-mail
{ const [modalAdd, setModalAdd] = useState(false); const [modalDelete, setModalDelete] = useState(false); const [acceptModalOpen, setAcceptModalOpen] = useState(false); - const [path, setPath] = useState(""); const dispatch = useDispatch(); + const navigate = useNavigate(); const { showNotification } = useNotification(); useEffect(() => { @@ -84,18 +83,30 @@ export const ProjectTicket = ({ project, index }) => {
{project.name}
-

Открытые задачи

+ {/*

Открытые задачи

{project.columns.reduce( (accumulator, currentValue) => accumulator + currentValue.tasks.length, 0 )} - - # + */} + avatar + {project.owner_info.fio}
+ {/* + Посмотреть статистику + */} + { @@ -105,13 +116,6 @@ export const ProjectTicket = ({ project, index }) => { ... - - Посмотреть статистику - - {

редактировать

-
+
-

скопировать ссылку

+

скопировать ссылку

{ @@ -144,7 +148,14 @@ export const ProjectTicket = ({ project, index }) => {

в архив

- +
{ + navigate(`/profile/statistics/${project.id}`); + }} + > + +

статистика

+
{ setModalDelete(true); diff --git a/src/components/ProjectTicket/projectTicket.scss b/src/components/ProjectTicket/projectTicket.scss index 19425b18..8f397ce3 100644 --- a/src/components/ProjectTicket/projectTicket.scss +++ b/src/components/ProjectTicket/projectTicket.scss @@ -40,7 +40,6 @@ display: flex; align-items: center; position: relative; - margin-bottom: 30px; p { color: #6f6f6f; @@ -50,6 +49,11 @@ line-height: 17px; } + span { + color: blue; + font-size: 15px; + } + .count { margin-left: 8px; width: 26px; @@ -78,16 +82,16 @@ .menu-settings { position: absolute; - font-size: 21px; + font-size: 30px; color: #6f6f6f; right: 15px; - top: 0px; + top: -10px; } &__avatar { width: 25px; height: 25px; - margin-left: 56px; + margin-right: 10px; } &__open-tracker { diff --git a/src/pages/ProjectTracker/ProjectTracker.js b/src/pages/ProjectTracker/ProjectTracker.js index dde739ec..b352db07 100644 --- a/src/pages/ProjectTracker/ProjectTracker.js +++ b/src/pages/ProjectTracker/ProjectTracker.js @@ -878,6 +878,7 @@ export const ProjectTracker = () => { "YYYY-MM-DD HH:mm:ss" ); const titleColor = + task.dead_line && dateDeadline < new Date(currentDate) ? "red" : "#1a1919"; diff --git a/src/pages/Tracker/tracker.scss b/src/pages/Tracker/tracker.scss index c43f3381..d6ca2af1 100644 --- a/src/pages/Tracker/tracker.scss +++ b/src/pages/Tracker/tracker.scss @@ -171,7 +171,7 @@ .create-project-btn { width: 300px; - height: 113px; + height: 83px; border-radius: 12px; background: #ecf8e5; color: #000000; @@ -224,7 +224,6 @@ align-items: center; column-gap: 5px; img { - margin-left: -22px; height: 22px; } } @@ -564,6 +563,10 @@ display: flex; flex-direction: column; + @media (max-width: 900px) { + left: 0px; + } + .close { cursor: pointer; width: 20px; diff --git a/src/pages/ViewReport/ViewReport.jsx b/src/pages/ViewReport/ViewReport.jsx index c2ae1acf..e502eb28 100644 --- a/src/pages/ViewReport/ViewReport.jsx +++ b/src/pages/ViewReport/ViewReport.jsx @@ -155,7 +155,7 @@ export const ViewReport = () => { : "view-report__bar__delete disable" } > - Удалить отчет + Удалить )}
@@ -201,7 +201,7 @@ export const ViewReport = () => { -

Какие задачи выполнены?

+

Выполненные задачи

Время

@@ -242,7 +242,7 @@ export const ViewReport = () => {
{Boolean(difficulties.length) && (
-

Какие сложности возникли?

+

Возникшие сложности

{difficulties.map((item, index) => { return

{item}

; })} diff --git a/src/pages/ViewReport/viewReport.scss b/src/pages/ViewReport/viewReport.scss index 326921d5..7d2a7f5a 100644 --- a/src/pages/ViewReport/viewReport.scss +++ b/src/pages/ViewReport/viewReport.scss @@ -60,7 +60,7 @@ border-radius: 12px; padding: 20px 33px; align-items: center; - column-gap: 60px; + column-gap: 20px; height: 72px; justify-content: space-between; @@ -88,9 +88,14 @@ } &__delete { - background: white; - border-radius: 12px; - border: 1px dashed #8bcc60; + color: #000000; + font-size: 15px; + font-weight: 500; + line-height: 32px; + padding: 8px 24px; + background: whitesmoke; + border-radius: 44px; + border: none; } .disable { @@ -343,9 +348,8 @@ width: 100%; @media (max-width: 900px) { - max-width: 28px; - height: 28px; - font-size: 15px; + max-width: 40px; + height: 40px; } }