open.source/manifold
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Better date formatting

Browse Source
This commit is contained in:
Marshall Polaris 2022-09-27 17:59:27 -07:00
parent 6375f7cf2c
commit 399a3121ca
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
web/components/charts/generic-charts.tsx
View File

@ -43,14 +43,18 @@ const formatDate = (
const { includeYear, includeHour, includeMinute } = opts const { includeYear, includeHour, includeMinute } = opts
const d = dayjs(date) const d = dayjs(date)
const now = Date.now() const now = Date.now()
if (d.add(1, 'minute').isAfter(now) && d.subtract(1, 'minute').isBefore(now)) if (
d.add(1, 'minute').isAfter(now) &&
d.subtract(1, 'minute').isBefore(now)
) {
return 'Now' return 'Now'
if (d.isSame(now, 'day')) {
return '[Today]'
} else if (d.add(1, 'day').isSame(now, 'day')) {
return '[Yesterday]'
} else { } else {
let format = 'MMM D' const dayName = d.isSame(now, 'day')
? 'Today'
: d.add(1, 'day').isSame(now, 'day')
? 'Yesterday'
: null
let format = dayName ? `[${dayName}]` : 'MMM D'
if (includeMinute) { if (includeMinute) {
format += ', h:mma' format += ', h:mma'
} else if (includeHour) { } else if (includeHour) {