Skip to content

Commit 45b4e59

Browse files
committed
WIP
1 parent 4773d1b commit 45b4e59

File tree

2 files changed

+25
-2
lines changed

2 files changed

+25
-2
lines changed

src/screens/hours/HoursScreen.tsx

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1-
import React, { useMemo } from 'react';
1+
import React, { useCallback, useMemo } from 'react';
22
import { Layout, Space } from 'antd';
33
import { observer } from 'mobx-react';
44
import { createUseStyles } from 'react-jss';
5+
import { isToday } from 'date-fns';
56

67
import rootStore from '../../modules/RootStore';
78
import { getTimeItems } from '../../helpers/TaskHelper';
@@ -12,19 +13,26 @@ import TimelineScreen from './components/TimelineScreen';
1213
import { HoursTabView } from './types';
1314
import useLocalStorage from '../../hooks/useLocalStorage';
1415
import { LOCAL_STORAGE_KEY } from '../../consts';
16+
import BackOnToday from './components/BackOnToday';
1517

1618
const { tasksStore } = rootStore;
1719

1820
const parseDateFromString = (value: string) => new Date(value);
1921

2022
export default observer(function HoursScreen() {
2123
const classes = useStyles();
24+
2225
const [date, setDate] = useLocalStorage<Date>(
2326
LOCAL_STORAGE_KEY.HOURS_SELECTED_DATE,
2427
new Date(),
2528
true,
2629
parseDateFromString
2730
);
31+
32+
const goTodayDate = useCallback(() => {
33+
setDate(new Date());
34+
}, [setDate]);
35+
2836
const [tab, setTab] = useLocalStorage<HoursTabView>(
2937
LOCAL_STORAGE_KEY.HOURS_TAB,
3038
HoursTabView.Edit,
@@ -42,7 +50,9 @@ export default observer(function HoursScreen() {
4250
<Space direction="vertical" className={classes.space}>
4351
<Header date={date} setDate={setDate} tab={tab} setTab={setTab} />
4452
<TotalHours timeItems={timeItems} />
45-
{tab === HoursTabView.Edit ? (
53+
{!timeItems.length && !isToday(date) ? (
54+
<BackOnToday goToday={goTodayDate} />
55+
) : tab === HoursTabView.Edit ? (
4656
<GridWithTimeItemsView date={date} />
4757
) : (
4858
<TimelineScreen date={date} />
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
import React, { FC } from 'react';
2+
import { Button } from 'antd';
3+
import { observer } from 'mobx-react';
4+
5+
type Props = {
6+
goToday(): void;
7+
};
8+
9+
const BackOnToday: FC<Props> = ({ goToday }: Props) => {
10+
return <Button onClick={goToday} title={'Go back'} />;
11+
};
12+
13+
export default observer(BackOnToday);

0 commit comments

Comments
 (0)