watson/umami
1
0
Fork 0
mirror of https://github.com/umami-software/umami.git synced 2026-02-08 06:37:18 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Update realtime chart.

Browse source
This commit is contained in:
Mike Cao 2020-10-08 23:26:05 -07:00
parent e64a555652
commit fdc92d087b
32 changed files with 240 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

2
components/metrics/ActiveUsers.js
View file

@ -1,8 +1,8 @@
import React, { useMemo } from 'react';
import { FormattedMessage } from 'react-intl';
import classNames from 'classnames';
import useFetch from 'hooks/useFetch';
import styles from './ActiveUsers.module.css';
import { FormattedMessage } from 'react-intl';
export default function ActiveUsers({ websiteId, token, className }) {
const { data } = useFetch(`/api/website/${websiteId}/active`, { token }, { interval: 60000 });

2
components/metrics/BarChart.js
View file

@ -39,6 +39,8 @@ export default function BarChart({
const w = canvas.current.width;
switch (unit) {
case 'minute':
return dateFormat(d, 'h:mm', locale);
case 'hour':
return dateFormat(d, 'ha', locale);
case 'day':

4
components/metrics/PageviewsChart.js
View file

@ -26,7 +26,7 @@ export default function PageviewsChart({ websiteId, data, unit, records, classNa
data: { datasets },
} = chart;
datasets[0].data = data.uniques;
datasets[0].data = data.sessions;
datasets[0].label = intl.formatMessage({
id: 'metrics.unique-visitors',
defaultMessage: 'Unique visitors',
@ -56,7 +56,7 @@ export default function PageviewsChart({ websiteId, data, unit, records, classNa
id: 'metrics.unique-visitors',
defaultMessage: 'Unique visitors',
}),
data: data.uniques,
data: data.sessions,
lineTension: 0,
backgroundColor: colors.visitors.background,
borderColor: colors.visitors.border,

14
components/metrics/WebsiteChart.js
View file

@ -45,14 +45,14 @@ export default function WebsiteChart({
{ onDataLoad, update: [modified] },
);
const [pageviews, uniques] = useMemo(() => {
const chartData = useMemo(() => {
if (data) {
return [
getDateArray(data.pageviews, startDate, endDate, unit),
getDateArray(data.uniques, startDate, endDate, unit),
];
return {
pageviews: getDateArray(data.pageviews, startDate, endDate, unit),
sessions: getDateArray(data.sessions, startDate, endDate, unit),
};
}
return [[], []];
return { pageviews: [], sessions: [] };
}, [data]);
function handleCloseFilter() {
@ -87,7 +87,7 @@ export default function WebsiteChart({
{error && <ErrorMessage />}
<PageviewsChart
websiteId={websiteId}
data={{ pageviews, uniques }}
data={chartData}
unit={unit}
records={getDateLength(startDate, endDate, unit)}
loading={loading}