watson/umami
1
0
Fork 0
mirror of https://github.com/umami-software/umami.git synced 2026-02-14 17:45:38 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fixed timezone date format.

Browse source
This commit is contained in:
Mike Cao 2024-08-20 14:15:47 -07:00
parent 17e2658fdc
commit 511fec2ddb
6 changed files with 22 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/app/(main)/websites/[websiteId]/sessions/SessionsTable.tsx
View file

@ -6,7 +6,7 @@ import styles from './SessionsTable.module.css';
import TypeIcon from 'components/common/TypeIcon';
export function SessionsTable({ data = [] }: { data: any[]; showDomain?: boolean }) {
const { formatDate } = useTimezone();
const { formatTimezoneDate } = useTimezone();
const { formatMessage, labels } = useMessages();
const { formatValue } = useFormat();
@ -51,7 +51,7 @@ export function SessionsTable({ data = [] }: { data: any[]; showDomain?: boolean
)}
</GridColumn>
<GridColumn name="lastAt" label={formatMessage(labels.lastSeen)}>
{row => formatDate(row.createdAt, 'PPPpp')}
{row => formatTimezoneDate(row.createdAt, 'PPPpp')}
</GridColumn>
</GridTable>
);

6
src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionActivity.tsx
View file

@ -15,7 +15,7 @@ export function SessionActivity({
startDate: Date;
endDate: Date;
}) {
const { formatDate } = useTimezone();
const { formatTimezoneDate } = useTimezone();
const { data, isLoading } = useSessionActivity(websiteId, sessionId, startDate, endDate);
if (isLoading) {
@ -33,12 +33,12 @@ export function SessionActivity({
return (
<>
{showHeader && (
<div className={styles.header}>{formatDate(createdAt, 'EEEE, PPP')}</div>
<div className={styles.header}>{formatTimezoneDate(createdAt, 'EEEE, PPP')}</div>
)}
<div key={eventId} className={styles.row}>
<div className={styles.time}>
<StatusLight color={`#${visitId?.substring(0, 6)}`}>
{formatDate(createdAt, 'h:mm:ss aaa')}
{formatTimezoneDate(createdAt, 'h:mm:ss aaa')}
</StatusLight>
</div>
<Icon>{eventName ? <Icons.Bolt /> : <Icons.Eye />}</Icon>

6
src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionInfo.tsx
View file

@ -6,7 +6,7 @@ import styles from './SessionInfo.module.css';
export default function SessionInfo({ data }) {
const { locale } = useLocale();
const { formatDate } = useTimezone();
const { formatTimezoneDate } = useTimezone();
const { formatMessage, labels } = useMessages();
const { formatValue } = useFormat();
const { getRegionName } = useRegionNames(locale);
@ -20,10 +20,10 @@ export default function SessionInfo({ data }) {
</dd>
<dt>{formatMessage(labels.lastSeen)}</dt>
<dd>{formatDate(data?.lastAt, 'EEEE, PPPpp')}</dd>
<dd>{formatTimezoneDate(data?.lastAt, 'EEEE, PPPpp')}</dd>
<dt>{formatMessage(labels.firstSeen)}</dt>
<dd>{formatDate(data?.firstAt, 'EEEE, PPPpp')}</dd>
<dd>{formatTimezoneDate(data?.firstAt, 'EEEE, PPPpp')}</dd>
<dt>{formatMessage(labels.country)}</dt>
<dd>