watson/umami
1
0
Fork 0
mirror of https://github.com/umami-software/umami.git synced 2026-02-04 12:47:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge remote-tracking branch 'origin/dev' into dev

Browse source 
# Conflicts:
#	src/app/share/[...shareId]/Header.tsx
This commit is contained in:
Mike Cao 2025-09-25 11:23:36 -07:00
commit dfc6161a53
5 changed files with 23 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/components/metrics/PageviewsChart.tsx
View file

@ -31,7 +31,7 @@ export function PageviewsChart({ data, unit, minDate, maxDate, ...props }: Pagev
__id: new Date().getTime(),
datasets: [
{
type: data.compare ? 'line' : 'bar',
type: 'bar',
label: formatMessage(labels.visitors),
data: generateTimeSeries(data.sessions, minDate, maxDate, unit, dateLocale),
borderWidth: 1,
@ -41,7 +41,7 @@ export function PageviewsChart({ data, unit, minDate, maxDate, ...props }: Pagev
order: 3,
},
{
type: data.compare ? 'line' : 'bar',
type: 'bar',
label: formatMessage(labels.views),
data: generateTimeSeries(data.pageviews, minDate, maxDate, unit, dateLocale),
barPercentage: 0.9,