refactor: show total for this week, reorder counters
This commit is contained in:
parent
01ec528ee4
commit
890a695754
|
|
@ -15,7 +15,8 @@ import {
|
||||||
Badge,
|
Badge,
|
||||||
ThemeIcon,
|
ThemeIcon,
|
||||||
Alert,
|
Alert,
|
||||||
Box
|
Box,
|
||||||
|
MediaQuery
|
||||||
} from '@mantine/core';
|
} from '@mantine/core';
|
||||||
import { json, LoaderArgs, MetaFunction, redirect } from '@remix-run/node';
|
import { json, LoaderArgs, MetaFunction, redirect } from '@remix-run/node';
|
||||||
import {
|
import {
|
||||||
|
|
@ -40,6 +41,7 @@ import { requireUser } from '~/session.server';
|
||||||
import { getTimeEntries, TimeEntry } from '~/models/timeEntry.server';
|
import { getTimeEntries, TimeEntry } from '~/models/timeEntry.server';
|
||||||
import TimeElapsed from '~/components/TimeElapsed';
|
import TimeElapsed from '~/components/TimeElapsed';
|
||||||
import SectionTimeElapsed from '~/components/SectionTimeElapsed';
|
import SectionTimeElapsed from '~/components/SectionTimeElapsed';
|
||||||
|
import dayjs from 'dayjs';
|
||||||
|
|
||||||
export const meta: MetaFunction = () => {
|
export const meta: MetaFunction = () => {
|
||||||
return {
|
return {
|
||||||
|
|
@ -181,7 +183,7 @@ export default function TimeEntriesPage() {
|
||||||
mt="lg"
|
mt="lg"
|
||||||
mb="md"
|
mb="md"
|
||||||
mx="auto"
|
mx="auto"
|
||||||
maw={500}
|
maw={800}
|
||||||
sx={{
|
sx={{
|
||||||
display: 'flex',
|
display: 'flex',
|
||||||
justifyContent: 'space-between',
|
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
|
<SectionTimeElapsed
|
||||||
timeEntries={
|
timeEntries={
|
||||||
data.timeEntries.filter(
|
data.timeEntries.filter(
|
||||||
|
|
@ -221,25 +271,6 @@ export default function TimeEntriesPage() {
|
||||||
size="sm"
|
size="sm"
|
||||||
additionalLabel="today"
|
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>
|
</Group>
|
||||||
|
|
||||||
<div role="region" id="time-entries">
|
<div role="region" id="time-entries">
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue