Umami is a privacy-first web and product analytics platform. Traffic, campaigns, behavior, conversions, and revenue in one place. No cookies, no surveillance, self-hosted or in the cloud.
TypeScript analyticsaudience-segmentationchartscohort-analysisgoogle-analyticsproduct-analyticsstatisticsuser-journeyweb-analytics
Toggle formatting on click. Renamed charts folder to metrics.
Mike Caoe75593443a9a
diff --git a/components/WebsiteDetails.js b/components/WebsiteDetails.jsindex 7d6de00ec..a3c418803 100644--- a/components/WebsiteDetails.js+++ b/components/WebsiteDetails.js@@ -1,10 +1,10 @@import React, { useEffect, useState } from 'react';import classNames from 'classnames';-import WebsiteChart from 'components/charts/WebsiteChart';-import RankingsChart from 'components/charts/RankingsChart';+import WebsiteChart from 'components/metrics/WebsiteChart';+import RankingsChart from 'components/metrics/RankingsChart';import WorldMap from 'components/common/WorldMap';import Page from 'components/layout/Page';-import WebsiteHeader from 'components/charts/WebsiteHeader';+import WebsiteHeader from 'components/metrics/WebsiteHeader';import MenuLayout from 'components/layout/MenuLayout';import Button from 'components/common/Button';import { getDateRange } from 'lib/date';diff --git a/components/WebsiteList.js b/components/WebsiteList.jsindex 218ac14da..3b0b7879b 100644--- a/components/WebsiteList.js+++ b/components/WebsiteList.js@@ -1,7 +1,7 @@import React, { useState, useEffect } from 'react';import { useRouter } from 'next/router';-import WebsiteHeader from 'components/charts/WebsiteHeader';-import WebsiteChart from 'components/charts/WebsiteChart';+import WebsiteHeader from 'components/metrics/WebsiteHeader';+import WebsiteChart from 'components/metrics/WebsiteChart';import Page from 'components/layout/Page';import Button from 'components/common/Button';import EmptyPlaceholder from 'components/common/EmptyPlaceholder';diff --git a/components/charts/ActiveUsers.js b/components/metrics/ActiveUsers.jssimilarity index 100%rename from components/charts/ActiveUsers.jsrename to components/metrics/ActiveUsers.jsdiff --git a/components/charts/ActiveUsers.module.css b/components/metrics/ActiveUsers.module.csssimilarity index 100%rename from components/charts/ActiveUsers.module.cssrename to components/metrics/ActiveUsers.module.cssdiff --git a/components/charts/MetricCard.js b/components/metrics/MetricCard.jssimilarity index 100%rename from components/charts/MetricCard.jsrename to components/metrics/MetricCard.jsdiff --git a/components/charts/MetricCard.module.css b/components/metrics/MetricCard.module.csssimilarity index 100%rename from components/charts/MetricCard.module.cssrename to components/metrics/MetricCard.module.cssdiff --git a/components/charts/MetricsBar.js b/components/metrics/MetricsBar.jssimilarity index 100%rename from components/charts/MetricsBar.jsrename to components/metrics/MetricsBar.jsdiff --git a/components/charts/MetricsBar.module.css b/components/metrics/MetricsBar.module.csssimilarity index 100%rename from components/charts/MetricsBar.module.cssrename to components/metrics/MetricsBar.module.cssdiff --git a/components/charts/PageviewsChart.js b/components/metrics/PageviewsChart.jssimilarity index 100%rename from components/charts/PageviewsChart.jsrename to components/metrics/PageviewsChart.jsdiff --git a/components/charts/PageviewsChart.module.css b/components/metrics/PageviewsChart.module.csssimilarity index 100%rename from components/charts/PageviewsChart.module.cssrename to components/metrics/PageviewsChart.module.cssdiff --git a/components/charts/QuickButtons.js b/components/metrics/QuickButtons.jssimilarity index 100%rename from components/charts/QuickButtons.jsrename to components/metrics/QuickButtons.jsdiff --git a/components/charts/QuickButtons.module.css b/components/metrics/QuickButtons.module.csssimilarity index 100%rename from components/charts/QuickButtons.module.cssrename to components/metrics/QuickButtons.module.cssdiff --git a/components/charts/RankingsChart.js b/components/metrics/RankingsChart.jssimilarity index 83%rename from components/charts/RankingsChart.jsrename to components/metrics/RankingsChart.jsindex be73be97e..d113bed06 100644--- a/components/charts/RankingsChart.js+++ b/components/metrics/RankingsChart.js@@ -25,6 +25,7 @@ export default function RankingsChart({const [data, setData] = useState();const [format, setFormat] = useState(true);const formatFunc = format ? formatLongNumber : formatNumber;+ const shouldAnimate = limit > 0;const rankings = useMemo(() => {if (data) {@@ -54,13 +55,23 @@ export default function RankingsChart({setFormat(state => !state);}- const Row = ({ index, style }) => {- const { x, y, z } = rankings[index];+ function getRow(x, y, z) {return (- <div style={style}>- <AnimatedRow key={x} label={x} value={y} percent={z} animate={limit} format={formatFunc} />- </div>+ <AnimatedRow+ key={x}+ label={x}+ value={y}+ percent={z}+ animate={shouldAnimate}+ format={formatFunc}+ onClick={handleSetFormat}+ />);+ }++ const Row = ({ index, style }) => {+ const { x, y, z } = rankings[index];+ return <div style={style}>{getRow(x, y, z)}</div>;};useEffect(() => {@@ -75,22 +86,15 @@ export default function RankingsChart({return (<div className={classNames(styles.container, className)}>- <div className={styles.header} onClick={handleSetFormat}>+ <div className={styles.header}><div className={styles.title}>{title}</div>- <div className={styles.heading}>{heading}</div>+ <div className={styles.heading} onClick={handleSetFormat}>+ {heading}+ </div></div><div className={styles.body}>{limit ? (- rankings.map(({ x, y, z }) => (- <AnimatedRow- key={x}- label={x}- value={y}- percent={z}- animate={limit}- format={formatFunc}- />- ))+ rankings.map(({ x, y, z }) => getRow(x, y, z))) : (<FixedSizeList height={600} itemCount={rankings.length} itemSize={30}>{Row}@@ -108,7 +112,7 @@ export default function RankingsChart({);}-const AnimatedRow = ({ label, value = 0, percent, animate, format }) => {+const AnimatedRow = ({ label, value = 0, percent, animate, format, onClick }) => {const props = useSpring({width: percent,y: value,@@ -117,7 +121,7 @@ const AnimatedRow = ({ label, value = 0, percent, animate, format }) => {});return (- <div className={styles.row}>+ <div className={styles.row} onClick={onClick}><div className={styles.label}>{label}</div><animated.div className={styles.value}>{props.y?.interpolate(format)}</animated.div><div className={styles.percent}>diff --git a/components/charts/RankingsChart.module.css b/components/metrics/RankingsChart.module.csssimilarity index 98%rename from components/charts/RankingsChart.module.cssrename to components/metrics/RankingsChart.module.cssindex c72a1d4e1..a59822544 100644--- a/components/charts/RankingsChart.module.css+++ b/components/metrics/RankingsChart.module.css@@ -10,7 +10,6 @@.header {display: flex;line-height: 40px;- cursor: pointer;}.title {@@ -23,6 +22,7 @@font-size: var(--font-size-small);text-align: center;width: 100px;+ cursor: pointer;}.row {@@ -56,6 +56,7 @@text-align: right;margin-right: 10px;font-weight: 600;+ cursor: pointer;}.percent {diff --git a/components/charts/WebsiteChart.js b/components/metrics/WebsiteChart.jssimilarity index 100%rename from components/charts/WebsiteChart.jsrename to components/metrics/WebsiteChart.jsdiff --git a/components/charts/WebsiteChart.module.css b/components/metrics/WebsiteChart.module.csssimilarity index 100%rename from components/charts/WebsiteChart.module.cssrename to components/metrics/WebsiteChart.module.cssdiff --git a/components/charts/WebsiteHeader.js b/components/metrics/WebsiteHeader.jssimilarity index 94%rename from components/charts/WebsiteHeader.jsrename to components/metrics/WebsiteHeader.jsindex 471662282..459fd69f4 100644--- a/components/charts/WebsiteHeader.js+++ b/components/metrics/WebsiteHeader.js@@ -13,8 +13,8 @@ export default function WebsiteHeader({ websiteId, name, showLink = false }) {return (<PageHeader>{showLink ? (- <Link href="/website/[...id]" as={`/website/${websiteId}/${name}`}>- <a className={styles.title}>{name}</a>+ <Link href="/website/[...id]" as={`/website/${websiteId}/${name}`} className={styles.title}>+ {name}</Link>) : (<div className={styles.title}>{name}</div>diff --git a/components/charts/WebsiteHeader.module.css b/components/metrics/WebsiteHeader.module.csssimilarity index 100%rename from components/charts/WebsiteHeader.module.cssrename to components/metrics/WebsiteHeader.module.cssdiff --git a/package.json b/package.jsonindex d2dc3ed4f..df9e7c7a5 100644--- a/package.json+++ b/package.json@@ -1,6 +1,6 @@{"name": "umami",- "version": "0.13.0",+ "version": "0.14.0","description": "A simple, fast, website analytics alternative to Google Analytics. ","author": "Mike Cao <[email protected]>","license": "MIT",