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
Added icons for browsers, OS and devices.
Mike Cao6b69f69c08a3
diff --git a/components/metrics/BrowsersTable.js b/components/metrics/BrowsersTable.jsindex a8dd34ea5..2920280f6 100644--- a/components/metrics/BrowsersTable.js+++ b/components/metrics/BrowsersTable.js@@ -2,12 +2,23 @@ import FilterLink from 'components/common/FilterLink';import MetricsTable from 'components/metrics/MetricsTable';import { BROWSERS } from 'lib/constants';import useMessages from 'hooks/useMessages';+import { useRouter } from 'next/router';export function BrowsersTable({ websiteId, ...props }) {const { formatMessage, labels } = useMessages();+ const { basePath } = useRouter();function renderLink({ x: browser }) {- return <FilterLink id="browser" value={browser} label={BROWSERS[browser] || browser} />;+ return (+ <FilterLink id="browser" value={browser} label={BROWSERS[browser] || browser}>+ <img+ src={`${basePath}/images/browsers/${browser || 'unknown'}.png`}+ alt={browser}+ width={16}+ height={16}+ />+ </FilterLink>+ );}return (diff --git a/components/metrics/DevicesTable.js b/components/metrics/DevicesTable.jsindex 1bc3ac041..30b2a742d 100644--- a/components/metrics/DevicesTable.js+++ b/components/metrics/DevicesTable.js@@ -1,9 +1,11 @@import MetricsTable from './MetricsTable';import FilterLink from 'components/common/FilterLink';import useMessages from 'hooks/useMessages';+import { useRouter } from 'next/router';export function DevicesTable({ websiteId, ...props }) {const { formatMessage, labels } = useMessages();+ const { basePath } = useRouter();function renderLink({ x: device }) {return (@@ -11,7 +13,14 @@ export function DevicesTable({ websiteId, ...props }) {id="device"value={labels[device] && device}label={formatMessage(labels[device] || labels.unknown)}- />+ >+ <img+ src={`${basePath}/images/device/${device.toLowerCase() || 'unknown'}.png`}+ alt={device}+ width={16}+ height={16}+ />+ </FilterLink>);}diff --git a/components/metrics/OSTable.js b/components/metrics/OSTable.jsindex a638038b3..02ead27d0 100644--- a/components/metrics/OSTable.js+++ b/components/metrics/OSTable.js@@ -1,12 +1,25 @@import MetricsTable from './MetricsTable';import FilterLink from 'components/common/FilterLink';import useMessages from 'hooks/useMessages';+import { useRouter } from 'next/router';export function OSTable({ websiteId, ...props }) {const { formatMessage, labels } = useMessages();+ const { basePath } = useRouter();function renderLink({ x: os }) {- return <FilterLink id="os" value={os} />;+ return (+ <FilterLink id="os" value={os}>+ <img+ src={`${basePath}/images/os/${+ os.toLowerCase().replaceAll(/[^\w]+/g, '-') || 'unknown'+ }.png`}+ alt={os}+ width={16}+ height={16}+ />+ </FilterLink>+ );}return (diff --git a/lib/constants.ts b/lib/constants.tsindex 5772e1479..9753a8d43 100644--- a/lib/constants.ts+++ b/lib/constants.ts@@ -182,7 +182,7 @@ export const DESKTOP_OS = ['BeOS','Chrome OS','Linux',- 'macOS',+ 'Mac OS','Open BSD','OS/2','QNX',@@ -204,33 +204,34 @@ export const DESKTOP_OS = [export const MOBILE_OS = ['Amazon OS', 'Android OS', 'BlackBerry OS', 'iOS', 'Windows Mobile'];export const BROWSERS = {+ android: 'Android',aol: 'AOL',- edge: 'Edge',- 'edge-ios': 'Edge (iOS)',- yandexbrowser: 'Yandex',- kakaotalk: 'KaKaoTalk',- samsung: 'Samsung',- silk: 'Silk',- miui: 'MIUI',beaker: 'Beaker',- 'edge-chromium': 'Edge (Chromium)',+ bb10: 'BlackBerry 10',chrome: 'Chrome','chromium-webview': 'Chrome (webview)',- phantomjs: 'PhantomJS',crios: 'Chrome (iOS)',+ curl: 'Curl',+ edge: 'Edge',+ 'edge-chromium': 'Edge (Chromium)',+ 'edge-ios': 'Edge (iOS)',+ facebook: 'Facebook',firefox: 'Firefox',fxios: 'Firefox (iOS)',- 'opera-mini': 'Opera Mini',- opera: 'Opera',ie: 'IE',- bb10: 'BlackBerry 10',- android: 'Android',- ios: 'iOS',- safari: 'Safari',- facebook: 'Facebook',instagram: 'Instagram',+ ios: 'iOS','ios-webview': 'iOS (webview)',+ kakaotalk: 'KaKaoTalk',+ miui: 'MIUI',+ opera: 'Opera',+ 'opera-mini': 'Opera Mini',+ phantomjs: 'PhantomJS',+ safari: 'Safari',+ samsung: 'Samsung',+ silk: 'Silk',searchbot: 'Searchbot',+ yandexbrowser: 'Yandex',};export const MAP_FILE = '/datamaps.world.json';diff --git a/public/images/browsers/android-webview.png b/public/images/browsers/android-webview.pngnew file mode 100644index 000000000..99242297cBinary files /dev/null and b/public/images/browsers/android-webview.png differdiff --git a/public/images/browsers/android.png b/public/images/browsers/android.pngnew file mode 100644index 000000000..6e28498d2Binary files /dev/null and b/public/images/browsers/android.png differdiff --git a/public/images/browsers/aol.png b/public/images/browsers/aol.pngnew file mode 100644index 000000000..66dc4288eBinary files /dev/null and b/public/images/browsers/aol.png differdiff --git a/public/images/browsers/beaker.png b/public/images/browsers/beaker.pngnew file mode 100644index 000000000..fbc997cd8Binary files /dev/null and b/public/images/browsers/beaker.png differdiff --git a/public/images/browsers/blackberry.png b/public/images/browsers/blackberry.pngnew file mode 100644index 000000000..74f255cb9Binary files /dev/null and b/public/images/browsers/blackberry.png differdiff --git a/public/images/browsers/brave.png b/public/images/browsers/brave.pngnew file mode 100644index 000000000..0556c120cBinary files /dev/null and b/public/images/browsers/brave.png differdiff --git a/public/images/browsers/chrome.png b/public/images/browsers/chrome.pngnew file mode 100644index 000000000..e4e2773fcBinary files /dev/null and b/public/images/browsers/chrome.png differdiff --git a/public/images/browsers/chromium-webview.png b/public/images/browsers/chromium-webview.pngnew file mode 100644index 000000000..a3fd998d8Binary files /dev/null and b/public/images/browsers/chromium-webview.png differdiff --git a/public/images/browsers/crios.png b/public/images/browsers/crios.pngnew file mode 100644index 000000000..e4e2773fcBinary files /dev/null and b/public/images/browsers/crios.png differdiff --git a/public/images/browsers/curl.png b/public/images/browsers/curl.pngnew file mode 100644index 000000000..dd2219273Binary files /dev/null and b/public/images/browsers/curl.png differdiff --git a/public/images/browsers/edge-chromium.png b/public/images/browsers/edge-chromium.pngnew file mode 100644index 000000000..1f2b230f1Binary files /dev/null and b/public/images/browsers/edge-chromium.png differdiff --git a/public/images/browsers/edge-ios.png b/public/images/browsers/edge-ios.pngnew file mode 100644index 000000000..1f2b230f1Binary files /dev/null and b/public/images/browsers/edge-ios.png differdiff --git a/public/images/browsers/edge.png b/public/images/browsers/edge.pngnew file mode 100644index 000000000..3881a7e0aBinary files /dev/null and b/public/images/browsers/edge.png differdiff --git a/public/images/browsers/facebook.png b/public/images/browsers/facebook.pngnew file mode 100644index 000000000..4dc9b267bBinary files /dev/null and b/public/images/browsers/facebook.png differdiff --git a/public/images/browsers/firefox.png b/public/images/browsers/firefox.pngnew file mode 100644index 000000000..c118f9c14Binary files /dev/null and b/public/images/browsers/firefox.png differdiff --git a/public/images/browsers/fxios.png b/public/images/browsers/fxios.pngnew file mode 100644index 000000000..c118f9c14Binary files /dev/null and b/public/images/browsers/fxios.png differdiff --git a/public/images/browsers/ie.png b/public/images/browsers/ie.pngnew file mode 100644index 000000000..1d3bbe8faBinary files /dev/null and b/public/images/browsers/ie.png differdiff --git a/public/images/browsers/instagram.png b/public/images/browsers/instagram.pngnew file mode 100644index 000000000..5961a6b3bBinary files /dev/null and b/public/images/browsers/instagram.png differdiff --git a/public/images/browsers/ios-webview.png b/public/images/browsers/ios-webview.pngnew file mode 100644index 000000000..5f2dd4019Binary files /dev/null and b/public/images/browsers/ios-webview.png differdiff --git a/public/images/browsers/ios.png b/public/images/browsers/ios.pngnew file mode 100644index 000000000..5f2dd4019Binary files /dev/null and b/public/images/browsers/ios.png differdiff --git a/public/images/browsers/kakaotalk.png b/public/images/browsers/kakaotalk.pngnew file mode 100644index 000000000..e932a67bdBinary files /dev/null and b/public/images/browsers/kakaotalk.png differdiff --git a/public/images/browsers/miui.png b/public/images/browsers/miui.pngnew file mode 100644index 000000000..5f929510fBinary files /dev/null and b/public/images/browsers/miui.png differdiff --git a/public/images/browsers/opera-mini.png b/public/images/browsers/opera-mini.pngnew file mode 100644index 000000000..d4e26712fBinary files /dev/null and b/public/images/browsers/opera-mini.png differdiff --git a/public/images/browsers/opera.png b/public/images/browsers/opera.pngnew file mode 100644index 000000000..84e6d0fc5Binary files /dev/null and b/public/images/browsers/opera.png differdiff --git a/public/images/browsers/safari.png b/public/images/browsers/safari.pngnew file mode 100644index 000000000..b06369aa8Binary files /dev/null and b/public/images/browsers/safari.png differdiff --git a/public/images/browsers/samsung.png b/public/images/browsers/samsung.pngnew file mode 100644index 000000000..544e390e0Binary files /dev/null and b/public/images/browsers/samsung.png differdiff --git a/public/images/browsers/searchbot.png b/public/images/browsers/searchbot.pngnew file mode 100644index 000000000..46a33055cBinary files /dev/null and b/public/images/browsers/searchbot.png differdiff --git a/public/images/browsers/silk.png b/public/images/browsers/silk.pngnew file mode 100644index 000000000..6af1d726aBinary files /dev/null and b/public/images/browsers/silk.png differdiff --git a/public/images/browsers/unknown.png b/public/images/browsers/unknown.pngnew file mode 100644index 000000000..47a1553c5Binary files /dev/null and b/public/images/browsers/unknown.png differdiff --git a/public/images/browsers/yandexbrowser.png b/public/images/browsers/yandexbrowser.pngnew file mode 100644index 000000000..f703db23bBinary files /dev/null and b/public/images/browsers/yandexbrowser.png differdiff --git a/public/images/device/desktop.png b/public/images/device/desktop.pngnew file mode 100644index 000000000..d5ede419dBinary files /dev/null and b/public/images/device/desktop.png differdiff --git a/public/images/device/laptop.png b/public/images/device/laptop.pngnew file mode 100644index 000000000..19f669679Binary files /dev/null and b/public/images/device/laptop.png differdiff --git a/public/images/device/mobile.png b/public/images/device/mobile.pngnew file mode 100644index 000000000..d2190f4aaBinary files /dev/null and b/public/images/device/mobile.png differdiff --git a/public/images/device/tablet.png b/public/images/device/tablet.pngnew file mode 100644index 000000000..5e06bcff9Binary files /dev/null and b/public/images/device/tablet.png differdiff --git a/public/images/device/unknown.png b/public/images/device/unknown.pngnew file mode 100644index 000000000..520580267Binary files /dev/null and b/public/images/device/unknown.png differdiff --git a/public/images/os/amazon-os.png b/public/images/os/amazon-os.pngnew file mode 100644index 000000000..9b18cf0fdBinary files /dev/null and b/public/images/os/amazon-os.png differdiff --git a/public/images/os/android-os.png b/public/images/os/android-os.pngnew file mode 100644index 000000000..fc6509b36Binary files /dev/null and b/public/images/os/android-os.png differdiff --git a/public/images/os/beos.png b/public/images/os/beos.pngnew file mode 100644index 000000000..6bc4a8a5cBinary files /dev/null and b/public/images/os/beos.png differdiff --git a/public/images/os/blackberry-os.png b/public/images/os/blackberry-os.pngnew file mode 100644index 000000000..c77db5254Binary files /dev/null and b/public/images/os/blackberry-os.png differdiff --git a/public/images/os/chrome-os.png b/public/images/os/chrome-os.pngnew file mode 100644index 000000000..ae0086010Binary files /dev/null and b/public/images/os/chrome-os.png differdiff --git a/public/images/os/ios.png b/public/images/os/ios.pngnew file mode 100644index 000000000..1c129ae84Binary files /dev/null and b/public/images/os/ios.png differdiff --git a/public/images/os/linux.png b/public/images/os/linux.pngnew file mode 100644index 000000000..ce8fba38eBinary files /dev/null and b/public/images/os/linux.png differdiff --git a/public/images/os/mac-os.png b/public/images/os/mac-os.pngnew file mode 100644index 000000000..357e3eac4Binary files /dev/null and b/public/images/os/mac-os.png differdiff --git a/public/images/os/open-bsd.png b/public/images/os/open-bsd.pngnew file mode 100644index 000000000..806887e83Binary files /dev/null and b/public/images/os/open-bsd.png differdiff --git a/public/images/os/os-2.png b/public/images/os/os-2.pngnew file mode 100644index 000000000..5f88105daBinary files /dev/null and b/public/images/os/os-2.png differdiff --git a/public/images/os/qnx.png b/public/images/os/qnx.pngnew file mode 100644index 000000000..59d9a44c4Binary files /dev/null and b/public/images/os/qnx.png differdiff --git a/public/images/os/sun-os.png b/public/images/os/sun-os.pngnew file mode 100644index 000000000..c19f0eb39Binary files /dev/null and b/public/images/os/sun-os.png differdiff --git a/public/images/os/unknown.png b/public/images/os/unknown.pngnew file mode 100644index 000000000..520580267Binary files /dev/null and b/public/images/os/unknown.png differdiff --git a/public/images/os/windows-10.png b/public/images/os/windows-10.pngnew file mode 100644index 000000000..4effcd2b6Binary files /dev/null and b/public/images/os/windows-10.png differdiff --git a/public/images/os/windows-11.png b/public/images/os/windows-11.pngnew file mode 100644index 000000000..4effcd2b6Binary files /dev/null and b/public/images/os/windows-11.png differdiff --git a/public/images/os/windows-2000.png b/public/images/os/windows-2000.pngnew file mode 100644index 000000000..3bccae3fbBinary files /dev/null and b/public/images/os/windows-2000.png differdiff --git a/public/images/os/windows-3-11.png b/public/images/os/windows-3-11.pngnew file mode 100644index 000000000..3bccae3fbBinary files /dev/null and b/public/images/os/windows-3-11.png differdiff --git a/public/images/os/windows-7.png b/public/images/os/windows-7.pngnew file mode 100644index 000000000..cd2db79e4Binary files /dev/null and b/public/images/os/windows-7.png differdiff --git a/public/images/os/windows-8-1.png b/public/images/os/windows-8-1.pngnew file mode 100644index 000000000..3ce98aaafBinary files /dev/null and b/public/images/os/windows-8-1.png differdiff --git a/public/images/os/windows-8.png b/public/images/os/windows-8.pngnew file mode 100644index 000000000..3ce98aaafBinary files /dev/null and b/public/images/os/windows-8.png differdiff --git a/public/images/os/windows-95.png b/public/images/os/windows-95.pngnew file mode 100644index 000000000..3bccae3fbBinary files /dev/null and b/public/images/os/windows-95.png differdiff --git a/public/images/os/windows-98.png b/public/images/os/windows-98.pngnew file mode 100644index 000000000..3bccae3fbBinary files /dev/null and b/public/images/os/windows-98.png differdiff --git a/public/images/os/windows-me.png b/public/images/os/windows-me.pngnew file mode 100644index 000000000..cd2db79e4Binary files /dev/null and b/public/images/os/windows-me.png differdiff --git a/public/images/os/windows-server-2003.png b/public/images/os/windows-server-2003.pngnew file mode 100644index 000000000..cd2db79e4Binary files /dev/null and b/public/images/os/windows-server-2003.png differdiff --git a/public/images/os/windows-vista.png b/public/images/os/windows-vista.pngnew file mode 100644index 000000000..cd2db79e4Binary files /dev/null and b/public/images/os/windows-vista.png differdiff --git a/public/images/os/windows-xp.png b/public/images/os/windows-xp.pngnew file mode 100644index 000000000..cd2db79e4Binary files /dev/null and b/public/images/os/windows-xp.png differ