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

fixed-pages #5

Merged
MaxOvs19 merged 2 commits from fixed-pages into main 2023-12-19 21:01:12 +03:00
Conversation 0 Commits 2 Files Changed 6 +5 -5
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 663cfc924f - Show all commits

2
src/components/AuthBox/AuthBox.jsx
View File

@ -14,8 +14,8 @@ import ModalRegistration from "@components/Modal/ModalRegistration/ModalRegistra
import ModalResetPassword from "@components/Modal/ModalResetPassword/ModalResetPassword"; import ModalResetPassword from "@components/Modal/ModalResetPassword/ModalResetPassword";
import authHead from "assets/icons/authHead.svg"; import authHead from "assets/icons/authHead.svg";
import eyePassword from "assets/icons/passwordIcon.svg";
import eyeNoPassword from "assets/icons/eyePassword.svg"; import eyeNoPassword from "assets/icons/eyePassword.svg";
import eyePassword from "assets/icons/passwordIcon.svg";
import "./authBox.scss"; import "./authBox.scss";

8
src/components/ProfileCalendar/ProfileCalendarComponent.jsx
View File

@ -316,15 +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)}`
: endDate : endDate
? "0 часов" ? "0 часов"
: ""} : ""}
</span> </span>
{endDate && ( {endDate && (
<BaseButton <BaseButton