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
Add favicon to websites
Boris Kubiak90fa656d4093
diff --git a/components/common/Favicon.js b/components/common/Favicon.jsnew file mode 100644index 000000000..07ec696cb--- /dev/null+++ b/components/common/Favicon.js@@ -0,0 +1,21 @@+import React from 'react';+import styles from './Favicon.module.css';++function getHostName(url) {+ const match = url.match(/^(?:https?:\/\/)?(?:[^@\n]+@)?(?:www\.)?([^:/\n?=]+)/im);+ return match && match.length > 1 ? match[1] : null;+}++export default function Favicon({ domain, ...props }) {+ const hostName = domain ? getHostName(domain) : null;++ return hostName ? (+ <img+ className={styles.favicon}+ src={`https://icons.duckduckgo.com/ip3/${hostName}.ico`}+ height="16"+ alt=""+ {...props}+ />+ ) : null;+}diff --git a/components/common/Favicon.module.css b/components/common/Favicon.module.cssnew file mode 100644index 000000000..82c85c426--- /dev/null+++ b/components/common/Favicon.module.css@@ -0,0 +1,3 @@+.favicon {+ margin-right: 8px;+}diff --git a/components/metrics/WebsiteChart.js b/components/metrics/WebsiteChart.jsindex 07ba51614..a5390f787 100644--- a/components/metrics/WebsiteChart.js+++ b/components/metrics/WebsiteChart.js@@ -20,6 +20,7 @@ import { TOKEN_HEADER } from '../../lib/constants';export default function WebsiteChart({websiteId,title,+ domain,stickyHeader = false,showLink = false,onDataLoad = () => {},@@ -66,7 +67,7 @@ export default function WebsiteChart({return (<div className={styles.container}>- <WebsiteHeader websiteId={websiteId} title={title} showLink={showLink} />+ <WebsiteHeader websiteId={websiteId} title={title} domain={domain} showLink={showLink} /><div className={classNames(styles.header, 'row')}><StickyHeaderclassName={classNames(styles.metrics, 'col row')}diff --git a/components/metrics/WebsiteHeader.js b/components/metrics/WebsiteHeader.jsindex 803d18cc5..d5015d7ca 100644--- a/components/metrics/WebsiteHeader.js+++ b/components/metrics/WebsiteHeader.js@@ -4,14 +4,18 @@ import Link from 'components/common/Link';import PageHeader from 'components/layout/PageHeader';import RefreshButton from 'components/common/RefreshButton';import ButtonLayout from 'components/layout/ButtonLayout';+import Favicon from 'components/common/Favicon';import ActiveUsers from './ActiveUsers';import Arrow from 'assets/arrow-right.svg';import styles from './WebsiteHeader.module.css';-export default function WebsiteHeader({ websiteId, title, showLink = false }) {+export default function WebsiteHeader({ websiteId, title, domain, showLink = false }) {return (<PageHeader>- <div className={styles.title}>{title}</div>+ <div className={styles.title}>+ <Favicon domain={domain} />+ {title}+ </div><ActiveUsers className={styles.active} websiteId={websiteId} /><ButtonLayout align="right"><RefreshButton websiteId={websiteId} />diff --git a/components/pages/TestConsole.js b/components/pages/TestConsole.jsindex fef6c620d..b715b4a8e 100644--- a/components/pages/TestConsole.js+++ b/components/pages/TestConsole.js@@ -82,7 +82,12 @@ export default function TestConsole() {</div><div className="row"><div className="col-12">- <WebsiteChart websiteId={website.website_id} title={website.name} showLink />+ <WebsiteChart+ websiteId={website.website_id}+ title={website.name}+ domain={website.domain}+ showLink+ /><PageHeader>Events</PageHeader><EventsChart websiteId={website.website_id} /></div>diff --git a/components/pages/WebsiteDetails.js b/components/pages/WebsiteDetails.jsindex 6c3109090..81cde3adf 100644--- a/components/pages/WebsiteDetails.js+++ b/components/pages/WebsiteDetails.js@@ -120,6 +120,7 @@ export default function WebsiteDetails({ websiteId }) {<WebsiteChartwebsiteId={websiteId}title={data.name}+ domain={data.domain}onDataLoad={handleDataLoad}showLink={false}stickyHeaderdiff --git a/components/pages/WebsiteList.js b/components/pages/WebsiteList.jsindex cd96ae9f8..035524703 100644--- a/components/pages/WebsiteList.js+++ b/components/pages/WebsiteList.js@@ -17,9 +17,9 @@ export default function WebsiteList({ userId }) {return (<Page>- {data.map(({ website_id, name }) => (+ {data.map(({ website_id, name, domain }) => (<div key={website_id} className={styles.website}>- <WebsiteChart websiteId={website_id} title={name} showLink />+ <WebsiteChart websiteId={website_id} title={name} domain={domain} showLink /></div>))}{data.length === 0 && (diff --git a/components/settings/WebsiteSettings.js b/components/settings/WebsiteSettings.jsindex 0ff6246dc..686605f27 100644--- a/components/settings/WebsiteSettings.js+++ b/components/settings/WebsiteSettings.js@@ -13,6 +13,7 @@ import ShareUrlForm from 'components/forms/ShareUrlForm';import EmptyPlaceholder from 'components/common/EmptyPlaceholder';import ButtonLayout from 'components/layout/ButtonLayout';import Toast from 'components/common/Toast';+import Favicon from 'components/common/Favicon';import Pen from 'assets/pen.svg';import Trash from 'assets/trash.svg';import Plus from 'assets/plus.svg';@@ -60,8 +61,9 @@ export default function WebsiteSettings() {</ButtonLayout>);- const DetailsLink = ({ website_id, name }) => (+ const DetailsLink = ({ website_id, name, domain }) => (<Link href="/website/[...id]" as={`/website/${website_id}/${name}`}>+ <Favicon domain={domain} />{name}</Link>);