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

Merge branch 'main' into tracker-connect-back

Browse Source 
# Conflicts:
#	src/components/Modal/TrackerModal/trackerModal.scss
#	src/components/UI/ModalTicket/ModalTicket.jsx
This commit is contained in:
Николай Полтщук
2023-06-26 12:42:32 +03:00
parent fc6feca92d 0f63b597f2
commit dc123e1fc7
21 changed files with 1913 additions and 2446 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/pages/Tracker/Tracker.js
View File

@ -14,9 +14,10 @@ import { urlForLocal } from "@utils/helper";
import { apiRequest } from "@api/request";
import { getCorrectDate } from "@components/Calendar/calendarHelper";
import BaseButton from "@components/Common/BaseButton/BaseButton";
import { Footer } from "@components/Common/Footer/Footer";
import { Loader } from "@components/Common/Loader/Loader";
import TrackerModal from "@components/Modal/TrackerModal/TrackerModal";
import TrackerModal from "@components/Modal/Tracker/TrackerModal/TrackerModal";
import { Navigation } from "@components/Navigation/Navigation";
import { ProfileBreadcrumbs } from "@components/ProfileBreadcrumbs/ProfileBreadcrumbs";
import { ProfileHeader } from "@components/ProfileHeader/ProfileHeader";
@ -190,15 +191,16 @@ export const Tracker = () => {
<img src={noProjects} alt="noProjectImg" />
<p>Создайте свой первый проект</p>
</div>
<button
className="createProjectBtn"
<BaseButton
styles={"createProjectBtn"}
onClick={() => {
dispatch(modalToggle("createProject"));
setModalCreateProject(true);
}}
>
<span>+</span>Создать проект
</button>
</BaseButton>
</div>
<p className="no-projects__info">
Ставьте задачи, следите за прогрессом, ведите учёт рабочего
@ -208,15 +210,15 @@ export const Tracker = () => {
)}
{Boolean(projects.length) && !loader && (
<div className="create-newProject">
<button
className="createProjectBtn"
<BaseButton
styles="createProjectBtn"
onClick={() => {
dispatch(modalToggle("createProject"));
setModalCreateProject(true);
}}
>
<span>+</span>Создать проект
</button>
</BaseButton>
<p>
Ставьте задачи, следите за прогрессом, ведите учёт рабочего
времени

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

@ -142,8 +142,6 @@
margin-left: 17px;
}
}
button {
}
}
&__info {
@ -155,16 +153,11 @@
}
.createProjectBtn {
background: #52b709;
border-radius: 44px;
max-width: 188px;
height: 50px;
width: 100%;
border: none;
font-weight: 400;
font-size: 15px;
line-height: 32px;
color: #ffffff;
display: flex;
align-items: center;
justify-content: center;
@ -222,23 +215,23 @@
align-items: center;
}
h4 {
h5 {
color: #1458dd;
font-weight: 700;
font-size: 22px;
line-height: 32px;
margin-bottom: 0;
max-width: 30%;
word-break: break-all;
}
&__add {
display: flex;
span {
margin: 0 15px 0 10px;
.button-add-column {
width: 33px;
height: 33px;
background: #52b709;
border-radius: 44px;
color: whitesmoke;
cursor: pointer;
font-size: 15px;
display: flex;
align-items: center;
@ -315,7 +308,7 @@
z-index: 2;
display: flex;
flex-direction: column;
background: linear-gradient(180deg, #FFFFFF 0%, #EBEBEB 100%);
background: linear-gradient(180deg, #ffffff 0%, #ebebeb 100%);
border-radius: 40px;
padding: 33px 24px 44px 34px;
width: 425px;
@ -323,15 +316,16 @@
&__close {
cursor: pointer;
width: 8px;
height: 8px;
position: absolute;
right: 20px;
top: 15px;
margin-left: auto;
}
&__count {
display: flex;
align-items: end;
color: #1458DD;
color: #1458dd;
font-size: 22px;
margin-top: 10px;
span {
@ -355,7 +349,7 @@
span {
width: auto;
height: auto;
color: #1458DD;
color: #1458dd;
font-weight: 600;
font-size: 18px;
line-height: 22px;
@ -397,8 +391,8 @@
.delete {
cursor: pointer;
width: 14px;
height: 14px;
width: 20px;
height: 20px;
}
}
@ -407,7 +401,7 @@
cursor: pointer;
span {
background: #8BCC60;
background: #8bcc60;
left: 0;
}
@ -424,6 +418,7 @@
}
&__checkBox {
margin: 0 15px 0 0;
cursor: pointer;
display: flex;
align-items: center;
@ -551,6 +546,13 @@
display: flex;
flex-direction: column;
justify-content: space-between;
transition: 0.4s;
&:hover {
transform: scale(0.99);
box-shadow: 4px 4px 8px 0px rgba(34, 60, 80, 0.11);
transition: 0.4s;
}
&__hide {
opacity: 0;
@ -771,6 +773,10 @@
max-width: 450px;
width: 100%;
&:focus-within {
border: 1px solid #0000004d;
}
@media (max-width: 690px) {
max-width: 350px;
}
@ -834,8 +840,15 @@
border-radius: 12px;
padding: 12px 42px 7px 32px;
justify-content: space-between;
transition: 0.4s;
cursor: pointer;
&:hover {
transform: scale(0.99);
box-shadow: 4px 4px 8px 0px rgba(34, 60, 80, 0.11);
transition: 0.4s;
}
&__info {
display: flex;
flex-direction: column;
@ -968,9 +981,12 @@
background: #f1f1f1;
border-radius: 12px;
padding: 12px 42px 7px 32px;
transition: 0.4s;
&:hover {
background: var(--ds-background-neutral-subtle-hovered, #f4f5f7);
transform: scale(0.99);
box-shadow: 4px 4px 8px 0px rgba(34, 60, 80, 0.11);
transition: 0.4s;
}
p {
@ -1047,6 +1063,10 @@
max-width: 300px;
width: 100%;
&:focus-within {
border: 1px solid #0000004d;
}
@media (max-width: 590px) {
max-width: 230px;
}