diff --git a/app/routes/time-entries.tsx b/app/routes/time-entries.tsx index 84691a6..5b656cb 100644 --- a/app/routes/time-entries.tsx +++ b/app/routes/time-entries.tsx @@ -15,7 +15,8 @@ import { Badge, ThemeIcon, Alert, - Box + Box, + MediaQuery } from '@mantine/core'; import { json, LoaderArgs, MetaFunction, redirect } from '@remix-run/node'; import { @@ -40,6 +41,7 @@ import { requireUser } from '~/session.server'; import { getTimeEntries, TimeEntry } from '~/models/timeEntry.server'; import TimeElapsed from '~/components/TimeElapsed'; import SectionTimeElapsed from '~/components/SectionTimeElapsed'; +import dayjs from 'dayjs'; export const meta: MetaFunction = () => { return { @@ -181,7 +183,7 @@ export default function TimeEntriesPage() { mt="lg" mb="md" mx="auto" - maw={500} + maw={800} sx={{ display: 'flex', justifyContent: 'space-between', @@ -203,6 +205,54 @@ export default function TimeEntriesPage() { } }} /> + + + + + new Date(t.startTime) >= + new Date(new Date().getFullYear(), new Date().getMonth(), 1) + ) as any as TimeEntry[] + } + size="sm" + additionalLabel="this month" + /> + + + + + new Date(t.startTime) >= + dayjs(new Date()).startOf('week').toDate() + ) as any as TimeEntry[] + } + size="sm" + additionalLabel="this week" + /> + - - - new Date(t.startTime) >= - new Date(new Date().getFullYear(), new Date().getMonth(), 1) - ) as any as TimeEntry[] - } - size="sm" - additionalLabel="this month" - />