m/umami
1
0
Fork 0
mirror of https://github.com/kremalicious/umami.git synced 2025-02-14 21:10:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed date display for session profile.

Browse Source
This commit is contained in:
Mike Cao 2024-08-13 01:04:28 -07:00
parent af64602951
commit fc758745dc
2 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,8 +1,7 @@
import { formatDate } from 'lib/date';
import { isSameDay } from 'date-fns'; import { isSameDay } from 'date-fns';
import { Loading, Icon, StatusLight } from 'react-basics'; import { Loading, Icon, StatusLight } from 'react-basics';
import Icons from 'components/icons'; import Icons from 'components/icons';
import { useLocale, useSessionActivity } from 'components/hooks'; import { useSessionActivity, useTimezone } from 'components/hooks';
import styles from './SessionActivity.module.css'; import styles from './SessionActivity.module.css';
export function SessionActivity({ export function SessionActivity({
@ -16,7 +15,7 @@ export function SessionActivity({
startDate: string; startDate: string;
endDate: string; endDate: string;
}) { }) {
const { locale } = useLocale(); const { formatDate } = useTimezone();
const { data, isLoading } = useSessionActivity(websiteId, sessionId, startDate, endDate); const { data, isLoading } = useSessionActivity(websiteId, sessionId, startDate, endDate);
if (isLoading) { if (isLoading) {
@ -34,14 +33,12 @@ export function SessionActivity({
return ( return (
<> <>
{showHeader && ( {showHeader && (
<div className={styles.header}> <div className={styles.header}>{formatDate(createdAt, 'EEEE, PPP')}</div>
{formatDate(new Date(createdAt), 'EEEE, PPP', locale)}
</div>
)} )}
<div key={eventId} className={styles.row}> <div key={eventId} className={styles.row}>
<div className={styles.time}> <div className={styles.time}>
<StatusLight color={`#${visitId?.substring(0, 6)}`}> <StatusLight color={`#${visitId?.substring(0, 6)}`}>
{formatDate(new Date(createdAt), 'h:mm:ss aaa', locale)} {formatDate(createdAt, 'h:mm:ss aaa')}
</StatusLight> </StatusLight>
</div> </div>
<Icon>{eventName ? <Icons.Bolt /> : <Icons.Eye />}</Icon> <Icon>{eventName ? <Icons.Bolt /> : <Icons.Eye />}</Icon>

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

@ -1,5 +1,4 @@
import { formatDate } from 'lib/date'; import { useFormat, useLocale, useMessages, useRegionNames, useTimezone } from 'components/hooks';
import { useFormat, useLocale, useMessages, useRegionNames } from 'components/hooks';
import TypeIcon from 'components/common/TypeIcon'; import TypeIcon from 'components/common/TypeIcon';
import { Icon, CopyIcon } from 'react-basics'; import { Icon, CopyIcon } from 'react-basics';
import Icons from 'components/icons'; import Icons from 'components/icons';
@ -7,6 +6,7 @@ import styles from './SessionInfo.module.css';
export default function SessionInfo({ data }) { export default function SessionInfo({ data }) {
const { locale } = useLocale(); const { locale } = useLocale();
const { formatDate } = useTimezone();
const { formatMessage, labels } = useMessages(); const { formatMessage, labels } = useMessages();
const { formatValue } = useFormat(); const { formatValue } = useFormat();
const { getRegionName } = useRegionNames(locale); const { getRegionName } = useRegionNames(locale);
@ -20,10 +20,10 @@ export default function SessionInfo({ data }) {
</dd> </dd>
<dt>{formatMessage(labels.lastSeen)}</dt> <dt>{formatMessage(labels.lastSeen)}</dt>
<dd>{formatDate(new Date(data?.lastAt), 'EEEE, PPPpp', locale)}</dd> <dd>{formatDate(data?.lastAt, 'EEEE, PPPpp')}</dd>
<dt>{formatMessage(labels.firstSeen)}</dt> <dt>{formatMessage(labels.firstSeen)}</dt>
<dd>{formatDate(new Date(data?.firstAt), 'EEEE, PPPpp', locale)}</dd> <dd>{formatDate(data?.firstAt, 'EEEE, PPPpp')}</dd>
<dt>{formatMessage(labels.country)}</dt> <dt>{formatMessage(labels.country)}</dt>
<dd> <dd>