new fixes

This commit is contained in:
2023-03-01 00:28:58 +03:00
parent b568ec699e
commit 28a0c7f843
13 changed files with 141 additions and 63 deletions

View File

@ -60,7 +60,7 @@ export const Summary = () => {
<div className='skills__section__items'>
<div className='skills__section__items__wrapper'>
{profileInfo.skillValues && profileInfo.skillValues.map((skill) =>
<span key={skill.id} className='skill_item'>{skill.skill.name}</span>
<span key={skill.id} className='skill_item'>{skill.skill.name},</span>
)}
</div>
</div>
@ -86,7 +86,7 @@ export const Summary = () => {
</div>
<div className='summary__sectionGitItems'>
{Boolean(gitInfo.length) && gitInfo.map((itemGit) => {
return <div key={itemGit.id} className='summary__sectionGitItem gitItem'>
return <a href={itemGit.link} target="_blank" rel="noreferrer" key={itemGit.id} className='summary__sectionGitItem gitItem'>
<div className='gitItem__info'>
<div className='gitItem__info__about'>
<img src={gitImgItem} alt='gitImg'/>
@ -103,7 +103,7 @@ export const Summary = () => {
<a className='gitItem__link' href={itemGit.link} target="_blank" rel="noreferrer">
<img src={rightArrow} alt='arrowRight'/>
</a>
</div>
</a>
})
}
</div>

View File

@ -51,7 +51,7 @@
margin-top: 30px;
display: flex;
align-items: center;
padding: 0 130px 0 45px;
padding: 0 25px 0 45px;
justify-content: space-between;
@media (max-width: 930px) {
@ -150,16 +150,16 @@
}
&__git {
background: #52B709;
border-radius: 44px;
border-radius: 31px;
width: 177px;
height: 50px;
height: 62px;
font-weight: 500;
font-size: 16px;
font-size: 1.9em;
line-height: 32px;
color: white;
border: none;
transition: all 0.3s ease;
background-image: linear-gradient(to top, #6aaf5c 0%, #52b709 100%), linear-gradient(36deg, rgba(255, 255, 255, 0) 0%, rgba(255, 255, 255, 0.16) 47%, rgba(255, 255, 255, 0.17) 50%, rgba(255, 255, 255, 0) 100%);
&:hover {
box-shadow: 6px 5px 20px rgb(87 98 80 / 21%);
@ -168,6 +168,7 @@
@media (max-width: 690px) {
width: 120px;
height: 50px;
}
}
@ -307,10 +308,12 @@
border-radius: 12px;
padding: 35px 30px 30px 45px;
transition: all 0.3s ease;
color: #000000;
&:hover {
box-shadow: 6px 5px 20px rgb(87 98 80 / 21%);
transform: scale(1.02);
text-decoration: none;
}
@media (max-width: 825px) {

View File

@ -12,7 +12,7 @@ import {Footer} from "../../components/Footer/Footer";
import arrow from "../../images/right-arrow.png";
import arrowSwitchDate from "../../images/arrowViewReport.png";
import {apiRequest} from "../../api/request";
import {getCorrectDate, getCreatedDate} from '../../components/Calendar/calendarHelper'
import {getCorrectDate, getCreatedDate, hourOfNum} from '../../components/Calendar/calendarHelper'
import './viewReport.scss'
@ -90,7 +90,7 @@ export const ViewReport = () => {
</Link>
<div className='viewReport__bar'>
<h3 className='viewReport__bar__date'>{getCorrectDate(reportDay)}</h3>
<p className='viewReport__bar__hours'>Вами потрачено на работу : <span>{totalHours} часов</span></p>
<p className='viewReport__bar__hours'>Вами потрачено на работу : <span>{totalHours} {hourOfNum(totalHours)}</span></p>
{/*<div className='viewReport__bar__progressBar'>*/}
{/* <span></span>*/}
{/*</div>*/}
@ -128,7 +128,7 @@ export const ViewReport = () => {
<td>
<div className='viewReport__done__hours__item'>
<span>{task.hours}</span>
<p className='hours'>часов на задачу</p>
<p className='hours'>{hourOfNum(task.hours)} на задачу</p>
</div>
</td>
</tr>

View File

@ -82,7 +82,7 @@
&__hours {
font-weight: 400;
font-size: 12px;
font-size: 15px;
line-height: 32px;
color: #000000;