refactor: show total for this week, reorder counters

This commit is contained in:
Nicola Zambello 2023-03-05 10:06:55 +01:00
parent 01ec528ee4
commit 890a695754
Signed by: nzambello
GPG key ID: 56E4A92C2C1E50BA

View file

@ -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() {
}
}}
/>
<MediaQuery
query="(max-width: 600px)"
styles={{
display: 'none'
}}
>
<Box>
<SectionTimeElapsed
timeEntries={
data.timeEntries.filter(
(t) =>
new Date(t.startTime) >=
new Date(new Date().getFullYear(), new Date().getMonth(), 1)
) as any as TimeEntry[]
}
size="sm"
additionalLabel="this month"
/>
</Box>
</MediaQuery>
<Divider
orientation="vertical"
sx={{
'@media (max-width: 600px)': {
display: 'none'
}
}}
/>
<SectionTimeElapsed
timeEntries={
data.timeEntries.filter(
(t) =>
new Date(t.startTime) >=
dayjs(new Date()).startOf('week').toDate()
) as any as TimeEntry[]
}
size="sm"
additionalLabel="this week"
/>
<Divider
orientation="vertical"
sx={{
'@media (max-width: 600px)': {
display: 'none'
}
}}
/>
<SectionTimeElapsed
timeEntries={
data.timeEntries.filter(
@ -221,25 +271,6 @@ export default function TimeEntriesPage() {
size="sm"
additionalLabel="today"
/>
<Divider
orientation="vertical"
sx={{
'@media (max-width: 600px)': {
display: 'none'
}
}}
/>
<SectionTimeElapsed
timeEntries={
data.timeEntries.filter(
(t) =>
new Date(t.startTime) >=
new Date(new Date().getFullYear(), new Date().getMonth(), 1)
) as any as TimeEntry[]
}
size="sm"
additionalLabel="this month"
/>
</Group>
<div role="region" id="time-entries">