Compare commits

..

No commits in common. "a3bcfc7cf7d64d74eb1228f6851e85bcc1b169af" and "b19e00d98f1631a2c5b05944ca274a4d2618afb3" have entirely different histories.

4 changed files with 18 additions and 13 deletions

View File

@ -286,15 +286,15 @@ export const ProfileCalendarComponent = React.memo(
? `${getCorrectDate(startDate)} - ${getCorrectDate(endDate)}` ? `${getCorrectDate(startDate)} - ${getCorrectDate(endDate)}`
: `${getCorrectDate(endDate)} - ${getCorrectDate(startDate)}` : `${getCorrectDate(endDate)} - ${getCorrectDate(startDate)}`
: activePeriod : activePeriod
? "Выберите диапазон на календаре" ? "Выберите диапазон на календаре"
: "Выбрать диапазон"} : "Выбрать диапазон"}
</span> </span>
<span> <span>
{totalRangeHours {totalRangeHours
? `${totalRangeHours} ${hourOfNum(totalRangeHours)}` ? `${totalRangeHours} ${hourOfNum(totalRangeHours)}`
: endDate : endDate
? "0 часов" ? "0 часов"
: ""} : ""}
</span> </span>
{endDate && ( {endDate && (
<BaseButton <BaseButton

View File

@ -108,9 +108,17 @@ export const ProjectTicket = ({ project, index }) => {
</div> </div>
</Link> </Link>
<Link to={`/profile/statistics/${project.id}`} className="project-stats"> {/* <Link
to={`/profile/statistics/${project.id}`}
className="project__statistics"
>
Посмотреть статистику Посмотреть статистику
</Link> </Link> */}
<span className="project-stats" onClick={() => {}}>
Просмотреть <br />
статистику проекта
</span>
<span <span
className="menu-settings" className="menu-settings"

View File

@ -3,7 +3,7 @@
flex-direction: column; flex-direction: column;
position: relative; position: relative;
width: 22%; width: 22%;
height: 140px; height: 170px;
background: #f1f1f1; background: #f1f1f1;
border-radius: 12px; border-radius: 12px;
@ -90,7 +90,7 @@
color: #678eda; color: #678eda;
position: absolute; position: absolute;
left: 18px; left: 18px;
bottom: 16px; bottom: 10px;
} }
.menu-settings { .menu-settings {

View File

@ -130,6 +130,7 @@
row-gap: 30px; row-gap: 30px;
display: none; display: none;
align-items: center; align-items: center;
justify-content: center;
@media (max-width: 785px) { @media (max-width: 785px) {
row-gap: 25px; row-gap: 25px;
@ -162,7 +163,7 @@
.create-project-btn { .create-project-btn {
width: 22%; width: 22%;
height: 140px; height: 170px;
border-radius: 12px; border-radius: 12px;
background: #ecf8e5; background: #ecf8e5;
color: #000000; color: #000000;
@ -190,10 +191,6 @@
img { img {
margin: 0 20px 0 0; margin: 0 20px 0 0;
} }
p {
text-align: left;
}
} }
&:hover { &:hover {