Compare commits
2 Commits
4e15f79c76
...
93c1dd3945
Author | SHA1 | Date | |
---|---|---|---|
|
93c1dd3945 | ||
|
7f0e5be087 |
@ -63,7 +63,7 @@ export const AuthBox = ({ title }) => {
|
|||||||
localStorage.setItem("role_status", res.status);
|
localStorage.setItem("role_status", res.status);
|
||||||
localStorage.setItem(
|
localStorage.setItem(
|
||||||
"access_token_expired_at",
|
"access_token_expired_at",
|
||||||
res.access_token_expired_at
|
res.access_token_expired_at,
|
||||||
);
|
);
|
||||||
dispatch(auth(true));
|
dispatch(auth(true));
|
||||||
dispatch(setUserInfo(res));
|
dispatch(setUserInfo(res));
|
||||||
|
@ -186,16 +186,26 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@media (max-width: 1200px) {
|
||||||
|
width: 110px;
|
||||||
|
}
|
||||||
|
|
||||||
@media (max-width: 968px) {
|
@media (max-width: 968px) {
|
||||||
|
width: 90px;
|
||||||
|
font-size: 11px;
|
||||||
|
}
|
||||||
|
|
||||||
|
@media (max-width: 680px) {
|
||||||
|
width: 70px;
|
||||||
font-size: 10px;
|
font-size: 10px;
|
||||||
}
|
}
|
||||||
|
|
||||||
@media (max-width: 610px) {
|
@media (max-width: 550px) {
|
||||||
width: 55px;
|
width: 60px;
|
||||||
height: 45px;
|
height: 35px;
|
||||||
}
|
}
|
||||||
|
|
||||||
@media (max-width: 480px) {
|
@media (max-width: 450px) {
|
||||||
width: 45px;
|
width: 45px;
|
||||||
height: 35px;
|
height: 35px;
|
||||||
}
|
}
|
||||||
|
@ -64,8 +64,8 @@ export const ProfileCalendar = () => {
|
|||||||
}
|
}
|
||||||
apiRequest(
|
apiRequest(
|
||||||
`/reports/reports-by-date?${requestDates}&user_card_id=${localStorage.getItem(
|
`/reports/reports-by-date?${requestDates}&user_card_id=${localStorage.getItem(
|
||||||
"cardId"
|
"cardId",
|
||||||
)}`
|
)}`,
|
||||||
).then((reports) => {
|
).then((reports) => {
|
||||||
let spendTime = 0;
|
let spendTime = 0;
|
||||||
for (const report of reports) {
|
for (const report of reports) {
|
||||||
|
@ -205,11 +205,11 @@ export const ProfileCalendarComponent = React.memo(
|
|||||||
<div className="calendar-component">
|
<div className="calendar-component">
|
||||||
<div className="calendar-component__header">
|
<div className="calendar-component__header">
|
||||||
<div className="calendar-component__header-info">
|
<div className="calendar-component__header-info">
|
||||||
<h3>Мои отчеты:</h3>
|
<h3>Мои отчеты за </h3>
|
||||||
<p className="calendar__hours">
|
<p className="calendar__hours">
|
||||||
{month}
|
{month}
|
||||||
<span>
|
<span>
|
||||||
{totalHours} {hourOfNum(totalHours)}{" "}
|
({totalHours} {hourOfNum(totalHours)})
|
||||||
</span>
|
</span>
|
||||||
</p>
|
</p>
|
||||||
</div>
|
</div>
|
||||||
@ -316,13 +316,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)}`
|
||||||
: "0 часов"}
|
: endDate
|
||||||
|
? "0 часов"
|
||||||
|
: ""}
|
||||||
</span>
|
</span>
|
||||||
{endDate && (
|
{endDate && (
|
||||||
<BaseButton
|
<BaseButton
|
||||||
|
@ -180,9 +180,7 @@ const ReportForm = () => {
|
|||||||
<p className="report-form__task-title--description">
|
<p className="report-form__task-title--description">
|
||||||
Краткое описание задачи
|
Краткое описание задачи
|
||||||
</p>
|
</p>
|
||||||
<p className="report-form__task-title--hours">
|
<p className="report-form__task-title--hours">Кол-во часов</p>
|
||||||
Количество часов
|
|
||||||
</p>
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
{inputs.map((input, index) => {
|
{inputs.map((input, index) => {
|
||||||
|
@ -352,6 +352,7 @@
|
|||||||
|
|
||||||
&__footer {
|
&__footer {
|
||||||
display: flex;
|
display: flex;
|
||||||
|
flex-direction: column-reverse;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
margin-top: 20px;
|
margin-top: 20px;
|
||||||
|
|
||||||
@ -380,16 +381,13 @@
|
|||||||
&-text {
|
&-text {
|
||||||
font-family: "GT Eesti Pro Display";
|
font-family: "GT Eesti Pro Display";
|
||||||
font-size: 1.9em;
|
font-size: 1.9em;
|
||||||
font-weight: 600;
|
|
||||||
font-style: normal;
|
font-style: normal;
|
||||||
letter-spacing: normal;
|
letter-spacing: normal;
|
||||||
line-height: 22.38px;
|
line-height: 22.38px;
|
||||||
text-align: left;
|
margin-bottom: 20px;
|
||||||
margin-left: 40px;
|
|
||||||
margin-bottom: 0;
|
|
||||||
|
|
||||||
span {
|
span {
|
||||||
font-weight: 100;
|
font-weight: 600;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -47,7 +47,7 @@ export const Instruction = () => {
|
|||||||
<img src={comment} alt="" />
|
<img src={comment} alt="" />
|
||||||
</div>
|
</div>
|
||||||
<div className="instruction__text instruction__text_info">
|
<div className="instruction__text instruction__text_info">
|
||||||
Количество вопросов в тесте: <span>{countQuestions}</span>
|
Вопросов в тесте: <span>{countQuestions}</span>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</>
|
</>
|
||||||
|
Loading…
Reference in New Issue
Block a user