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

finished report page

Browse Source
This commit is contained in:
Hope87 2021-06-23 12:48:02 +03:00
parent e854bddfa8
commit 435d4fc5ad
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/Calendar/CalendarComponent.js
View File

@ -78,7 +78,7 @@ const CalendarComponent = () => {
id="btn" id="btn"
> >
<img className={style.calendarIcon} src={calendarIcon} alt="" /> <img className={style.calendarIcon} src={calendarIcon} alt="" />
{currentMonthAndDay()} {currentMonthAndDay(day)}
</button> </button>
)) ))
)} )}

8
src/components/Calendar/calendarHelper.js
View File

@ -26,10 +26,10 @@ export function currentMonth() {
return currentMonth.charAt(0).toUpperCase() + currentMonth.slice(1); return currentMonth.charAt(0).toUpperCase() + currentMonth.slice(1);
} }
// export function currentMonthAndDay(day) { export function currentMonthAndDay(day) {
// return day.format('D MMMM'); return day.format('D MMMM');
// } }
export function currentMonthAndDay() { export function currentMonthAndDayReportPage() {
return moment().format('D MMMM'); return moment().format('D MMMM');
} }

4
src/components/ReportForm/ReportForm.js
View File

@ -4,7 +4,7 @@ import calendarIcon from '../../images/calendar_icon.png';
import ellipse from '../../images/ellipse.png'; import ellipse from '../../images/ellipse.png';
import remove from '../../images/remove.png'; import remove from '../../images/remove.png';
import addIcon from '../../images/addIcon.png'; import addIcon from '../../images/addIcon.png';
import { currentMonthAndDay } from '../Calendar/calendarHelper'; import { currentMonthAndDayReportPage } from '../Calendar/calendarHelper';
import InputsComponent from '../InputsComponent/InputsComponent'; import InputsComponent from '../InputsComponent/InputsComponent';
const ReportForm = () => { const ReportForm = () => {
@ -32,7 +32,7 @@ const ReportForm = () => {
</div> </div>
<div className={style.reportForm__blockImg}> <div className={style.reportForm__blockImg}>
<img className={style.calendarIcon} src={calendarIcon} alt="" /> <img className={style.calendarIcon} src={calendarIcon} alt="" />
{currentMonthAndDay()} {currentMonthAndDayReportPage()}
</div> </div>
<div className={style.reportForm__tasks}> <div className={style.reportForm__tasks}>
<img src={ellipse} alt="" /> <img src={ellipse} alt="" />