Open source, privacy-first web analytics. Lightweight, cookie-free Google Analytics alternative. Self-hosted or cloud.
TypeScript analyticsanalytics-dashboardclickhouseelixirgoogle-analyticsmarketingopen-source-analyticsphoenixplausible-analyticspostgresqlprivacyprivacy-friendlyself-hostedsimple-analyticsstatisticstailwindcssweb-analyticswebsite-analyticswebsite-statswebsite-tracking
Feature/goals bar text (#1165)
Ru Singh9ce92641449c
diff --git a/CHANGELOG.md b/CHANGELOG.mdindex 905c814f27..297b563732 100644--- a/CHANGELOG.md+++ b/CHANGELOG.md@@ -23,6 +23,7 @@ All notable changes to this project will be documented in this file.- Crash when changing theme on a loaded dashboard plausible/analytics#1123- UI fix for details button overlapping content on mobile plausible/analytics#1114- UI fix for the main graph on mobile overlapping its tick items on both axis+- UI fixes for text not showing properly in bars across multiple lines. This hides the totals on <768px and only shows the uniques and % to accommodate the goals text too.### Removed- Removes AppSignal monitoring packagediff --git a/assets/js/dashboard/stats/bar.js b/assets/js/dashboard/stats/bar.jsindex e38b67845f..f1585b3f2f 100644--- a/assets/js/dashboard/stats/bar.js+++ b/assets/js/dashboard/stats/bar.js@@ -10,11 +10,20 @@ function barWidth(count, all) {return count / maxVal * 100}-export default function Bar({count, all, bg}) {+export default function Bar({count, all, bg, maxWidthDeduction, children}) {const width = barWidth(count, all)return (- <div className={bg} style={{width: width + '%', height: '30px'}}>+ <div+ className="w-full relative"+ style={{maxWidth: `calc(100% - ${maxWidthDeduction})`}}+ >+ <div+ className={`absolute top-0 left-0 h-full ${bg || ''}`}+ style={{width: `${width}%`}}+ >+ </div>+ {children}</div>)}diff --git a/assets/js/dashboard/stats/conversions/index.js b/assets/js/dashboard/stats/conversions/index.jsindex 2dd5da59ed..82a3909ef9 100644--- a/assets/js/dashboard/stats/conversions/index.js+++ b/assets/js/dashboard/stats/conversions/index.js@@ -8,11 +8,32 @@ import numberFormatter from '../../number-formatter'import * as api from '../../api'import LazyLoader from '../../lazy-loader'+const MOBILE_UPPER_WIDTH = 767+const DEFAULT_WIDTH = 1080+export default class Conversions extends React.Component {constructor(props) {super(props)- this.state = {loading: true}+ this.state = {+ loading: true,+ viewport: DEFAULT_WIDTH,+ }this.onVisible = this.onVisible.bind(this)++ this.handleResize = this.handleResize.bind(this);+ }++ componentDidMount() {+ window.addEventListener('resize', this.handleResize, false);+ this.handleResize();+ }++ componentWillUnmount() {+ window.removeEventListener('resize', this.handleResize, false);+ }++ handleResize() {+ this.setState({ viewport: window.innerWidth });}onVisible() {@@ -26,6 +47,11 @@ export default class Conversions extends React.Component {}}+ getBarMaxWidth() {+ const { viewport } = this.state;+ return viewport > MOBILE_UPPER_WIDTH ? "16rem" : "10rem";+ }+fetchConversions() {api.get(`/api/stats/${encodeURIComponent(this.props.site.domain)}/conversions`, this.props.query).then((res) => this.setState({loading: false, goals: res}))@@ -33,32 +59,39 @@ export default class Conversions extends React.Component {renderGoalText(goalName) {if (this.props.query.period === 'realtime') {- return <span className="block px-2" style={{marginTop: '-26px'}}>{goalName}</span>+ return <span className="block px-2 py-1.5 relative z-9 break-words dark:text-gray-200">{goalName}</span>} else {const query = new URLSearchParams(window.location.search)query.set('goal', goalName)return (- <Link to={{pathname: window.location.pathname, search: query.toString()}} style={{marginTop: '-26px'}} className="block px-2 hover:underline">+ <Link to={{pathname: window.location.pathname, search: query.toString()}} className="block px-2 py-1.5 hover:underline relative z-9 break-words dark:text-gray-200">{ goalName }</Link>)}}++renderGoal(goal) {+ const { viewport } = this.state;const renderProps = this.props.query.filters['goal'] == goal.name && goal.prop_namesreturn (<div className="my-2 text-sm" key={goal.name}><div className="flex items-center justify-between my-2">- <div className="relative w-full h-8 dark:text-gray-300" style={{maxWidth: 'calc(100% - 16rem)'}}>- <Bar count={goal.count} all={this.state.goals} bg="bg-red-50 dark:bg-gray-500 dark:bg-opacity-15" />+ <Bar+ count={goal.count}+ all={this.state.goals}+ bg="bg-red-50 dark:bg-gray-500 dark:bg-opacity-15"+ maxWidthDeduction={this.getBarMaxWidth()}+ >{this.renderGoalText(goal.name)}- </div>+ </Bar><div className="dark:text-gray-200"><span className="inline-block w-20 font-medium text-right">{numberFormatter(goal.count)}</span>- <span className="inline-block w-20 font-medium text-right">{numberFormatter(goal.total_count)}</span>+ {viewport > MOBILE_UPPER_WIDTH && <span className="inline-block w-20 font-medium text-right">{numberFormatter(goal.total_count)}</span>}<span className="inline-block w-20 font-medium text-right">{goal.conversion_rate}%</span></div></div>@@ -68,6 +101,7 @@ export default class Conversions extends React.Component {}renderInner() {+ const { viewport } = this.state;if (this.state.loading) {return <div className="mx-auto my-2 loading"><div></div></div>} else if (this.state.goals) {@@ -78,7 +112,7 @@ export default class Conversions extends React.Component {<span>Goal</span><div className="text-right"><span className="inline-block w-20">Uniques</span>- <span className="inline-block w-20">Total</span>+ {viewport > MOBILE_UPPER_WIDTH && <span className="inline-block w-20">Total</span>}<span className="inline-block w-20">CR</span></div></div>diff --git a/assets/js/dashboard/stats/conversions/prop-breakdown.js b/assets/js/dashboard/stats/conversions/prop-breakdown.jsindex bc1237fbe4..1d8b89ea21 100644--- a/assets/js/dashboard/stats/conversions/prop-breakdown.js+++ b/assets/js/dashboard/stats/conversions/prop-breakdown.js@@ -6,6 +6,9 @@ import Bar from '../bar'import numberFormatter from '../../number-formatter'import * as api from '../../api'+const MOBILE_UPPER_WIDTH = 767+const DEFAULT_WIDTH = 1080+export default class PropertyBreakdown extends React.Component {constructor(props) {super(props)@@ -21,14 +24,33 @@ export default class PropertyBreakdown extends React.Component {this.state = {loading: true,- propKey: propKey+ propKey: propKey,+ viewport: DEFAULT_WIDTH,}++ this.handleResize = this.handleResize.bind(this);}componentDidMount() {+ window.addEventListener('resize', this.handleResize, false);++ this.handleResize();this.fetchPropBreakdown()}+ componentWillUnmount() {+ window.removeEventListener('resize', this.handleResize, false);+ }++ handleResize() {+ this.setState({ viewport: window.innerWidth });+ }++ getBarMaxWidth() {+ const { viewport } = this.state;+ return viewport > MOBILE_UPPER_WIDTH ? "16rem" : "10rem";+ }+fetchPropBreakdown() {if (this.props.query.filters['goal']) {api.get(`/api/stats/${encodeURIComponent(this.props.site.domain)}/property/${encodeURIComponent(this.state.propKey)}`, this.props.query)@@ -46,24 +68,48 @@ export default class PropertyBreakdown extends React.Component {}return null}++ renderPropContent(value, query) {+ return (+ <span className="flex px-2 py-1.5 group dark:text-gray-300 relative z-9 break-words">+ <Link+ to={{pathname: window.location.pathname, search: query.toString()}}+ className="hover:underline block"+ >+ { value.name }+ </Link>+ { this.renderUrl(value) }+ </span>+ )+ }+renderPropValue(value) {const query = new URLSearchParams(window.location.search)query.set('props', JSON.stringify({[this.state.propKey]: value.name}))+ const { viewport } = this.state;return (<div className="flex items-center justify-between my-2" key={value.name}>- <div className="w-full h-8 relative" style={{maxWidth: 'calc(100% - 16rem)'}}>- <Bar count={value.count} all={this.state.breakdown} bg="bg-red-50 dark:bg-gray-500 dark:bg-opacity-15" />- <span className="flex px-2 group dark:text-gray-300" style={{marginTop: '-26px'}}>- <Link to={{pathname: window.location.pathname, search: query.toString()}} className="hover:underline block truncate">- { value.name }- </Link>- { this.renderUrl(value) }- </span>- </div>+ <Bar+ count={value.count}+ all={this.state.breakdown}+ bg="bg-red-50 dark:bg-gray-500 dark:bg-opacity-15"+ maxWidthDeduction={this.getBarMaxWidth()}+ >+ {this.renderPropContent(value, query)}+ </Bar><div className="dark:text-gray-200"><span className="font-medium inline-block w-20 text-right">{numberFormatter(value.count)}</span>- <span className="font-medium inline-block w-20 text-right">{numberFormatter(value.total_count)}</span>+ {+ viewport > MOBILE_UPPER_WIDTH ?+ (+ <span+ className="font-medium inline-block w-20 text-right"+ >{numberFormatter(value.total_count)}+ </span>+ )+ : null+ }<span className="font-medium inline-block w-20 text-right">{numberFormatter(value.conversion_rate)}%</span></div></div>diff --git a/assets/js/dashboard/stats/devices/browsers.js b/assets/js/dashboard/stats/devices/browsers.jsindex 57862dbf7c..24a2d210d2 100644--- a/assets/js/dashboard/stats/devices/browsers.js+++ b/assets/js/dashboard/stats/devices/browsers.js@@ -12,6 +12,7 @@ export default class Browsers extends React.Component {super(props)this.state = {loading: true}this.onVisible = this.onVisible.bind(this)+ this.renderBrowserContent = this.renderBrowserContent.bind(this)}componentDidUpdate(prevProps) {@@ -36,6 +37,20 @@ export default class Browsers extends React.Component {}}+ label() {+ return this.props.query.period === 'realtime' ? 'Current visitors' : 'Visitors'+ }++ renderBrowserContent(browser, query) {+ return (+ <span className="flex px-2 py-1.5 dark:text-gray-300 relative z-9 break-words">+ <Link className="block hover:underline" to={{search: query.toString()}}>+ {browser.name}+ </Link>+ </span>+ )+ }+renderBrowser(browser) {const query = new URLSearchParams(window.location.search)if (this.props.query.filters.browser) {@@ -46,24 +61,22 @@ export default class Browsers extends React.Component {return (<div className="flex items-center justify-between my-1 text-sm" key={browser.name}>- <div className="w-full h-8" style={{maxWidth: 'calc(100% - 6rem)'}}>- <Bar count={browser.count} all={this.state.browsers} bg="bg-green-50 dark:bg-gray-500 dark:bg-opacity-15" />- <span className="flex px-2 dark:text-gray-300" style={{marginTop: '-26px'}} >- <Link className="block truncate hover:underline" to={{search: query.toString()}}>- {browser.name}- </Link>- </span>- </div>- <span className="font-medium dark:text-gray-200">{numberFormatter(browser.count)} <span className="inline-block w-8 text-xs text-right">({browser.percentage}%)</span></span>+ <Bar+ count={browser.count}+ all={this.state.browsers}+ bg="bg-green-50 dark:bg-gray-500 dark:bg-opacity-15"+ maxWidthDeduction="6rem"+ >+ {this.renderBrowserContent(browser, query)}+ </Bar>+ <span className="font-medium dark:text-gray-200">+ {numberFormatter(browser.count)}+ <span className="inline-block w-8 text-xs text-right">({browser.percentage}%)</span>+ </span></div>)}- label() {- return this.props.query.period === 'realtime' ? 'Current visitors' : 'Visitors'- }--renderList() {const key = this.props.query.filters.browser ? this.props.query.filters.browser + ' version' : 'Browser'diff --git a/assets/js/dashboard/stats/devices/index.js b/assets/js/dashboard/stats/devices/index.jsindex a07bac3013..205e0fa3af 100644--- a/assets/js/dashboard/stats/devices/index.js+++ b/assets/js/dashboard/stats/devices/index.js@@ -76,22 +76,21 @@ class ScreenSizes extends React.Component {return (<div className="flex items-center justify-between my-1 text-sm" key={size.name}>- <div className="w-full h-8" style={{maxWidth: 'calc(100% - 6rem)'}}>- <Bar- count={size.count}- all={this.state.sizes}- bg="bg-green-50 dark:bg-gray-500 dark:bg-opacity-15"- />+ <Bar+ count={size.count}+ all={this.state.sizes}+ bg="bg-green-50 dark:bg-gray-500 dark:bg-opacity-15"+ maxWidthDeduction="6rem"+ ><spantooltip={EXPLANATION[size.name]}- className="flex px-2 dark:text-gray-300"- style={{marginTop: '-26px'}}+ className="flex px-2 py-1.5 dark:text-gray-300">- <Link className="block truncate hover:underline" to={{search: query.toString()}}>+ <Link className="block hover:underline" to={{search: query.toString()}}>{iconFor(size.name)} {size.name}</Link></span>- </div>+ </Bar><spanclassName="font-medium dark:text-gray-200">diff --git a/assets/js/dashboard/stats/devices/operating-systems.js b/assets/js/dashboard/stats/devices/operating-systems.jsindex 1b8e1abc07..4f80d5762c 100644--- a/assets/js/dashboard/stats/devices/operating-systems.js+++ b/assets/js/dashboard/stats/devices/operating-systems.js@@ -45,15 +45,22 @@ export default class OperatingSystems extends React.Component {}return (- <div className="flex items-center justify-between my-1 text-sm" key={os.name}>- <div className="w-full h-8" style={{maxWidth: 'calc(100% - 6rem)'}}>- <Bar count={os.count} all={this.state.operatingSystems} bg="bg-green-50 dark:gray-500 dark:bg-opacity-15" />- <span className="flex px-2 dark:text-gray-300" style={{marginTop: '-26px'}}>- <Link className="block truncate hover:underline" to={{search: query.toString()}}>+ <div+ className="flex items-center justify-between my-1 text-sm"+ key={os.name}+ >+ <Bar+ count={os.count}+ all={this.state.operatingSystems}+ bg="bg-green-50 dark:gray-500 dark:bg-opacity-15"+ maxWidthDeduction="6rem"+ >+ <span className="flex px-2 py-1.5 dark:text-gray-300 relative z-9 break-words">+ <Link className="block hover:underline" to={{search: query.toString()}}>{os.name}</Link></span>- </div>+ </Bar><span className="font-medium dark:text-gray-200">{numberFormatter(os.count)} <span className="inline-block w-8 text-xs text-right">({os.percentage}%)</span></span></div>)diff --git a/assets/js/dashboard/stats/pages/entry-pages.js b/assets/js/dashboard/stats/pages/entry-pages.jsindex cb6323d770..ab5f3ef445 100644--- a/assets/js/dashboard/stats/pages/entry-pages.js+++ b/assets/js/dashboard/stats/pages/entry-pages.js@@ -40,15 +40,28 @@ export default class EntryPages extends React.Component {return (<div className="flex items-center justify-between my-1 text-sm" key={page.name}>- <div className="w-full h-8 truncate" style={{maxWidth: 'calc(100% - 4rem)'}}>- <Bar count={page.count} all={this.state.pages} bg="bg-orange-50 dark:bg-gray-500 dark:bg-opacity-15" />- <span className="flex px-2 group dark:text-gray-300" style={{marginTop: '-26px'}}>- <Link to={{pathname: window.location.pathname, search: query.toString()}} className="block hover:underline">{page.name}</Link>- <a target="_blank" href={`http://${ this.props.site.domain }${page.name}`} className="hidden group-hover:block">+ <Bar+ count={page.count}+ all={this.state.pages}+ bg="bg-orange-50 dark:bg-gray-500 dark:bg-opacity-15"+ maxWidthDeduction="4rem"+ >+ <span className="flex px-2 py-1.5 group dark:text-gray-300 relative break-words z-9">+ <Link+ to={{pathname: window.location.pathname, search: query.toString()}}+ className="block hover:underline"+ >+ {page.name}+ </Link>+ <a+ target="_blank"+ href={`http://${ this.props.site.domain }${page.name}`}+ className="hidden group-hover:block"+ ><svg className="inline w-4 h-4 ml-1 -mt-1 text-gray-600 dark:text-gray-400" fill="currentColor" viewBox="0 0 20 20"><path d="M11 3a1 1 0 100 2h2.586l-6.293 6.293a1 1 0 101.414 1.414L15 6.414V9a1 1 0 102 0V4a1 1 0 00-1-1h-5z"></path><path d="M5 5a2 2 0 00-2 2v8a2 2 0 002 2h8a2 2 0 002-2v-3a1 1 0 10-2 0v3H5V7h3a1 1 0 000-2H5z"></path></svg></a></span>- </div>+ </Bar><span className="font-medium dark:text-gray-200">{numberFormatter(page.count)}</span></div>)diff --git a/assets/js/dashboard/stats/pages/exit-pages.js b/assets/js/dashboard/stats/pages/exit-pages.jsindex 5397165b66..9295fef391 100644--- a/assets/js/dashboard/stats/pages/exit-pages.js+++ b/assets/js/dashboard/stats/pages/exit-pages.js@@ -40,15 +40,28 @@ export default class ExitPages extends React.Component {return (<div className="flex items-center justify-between my-1 text-sm" key={page.name}>- <div className="w-full h-8 truncate" style={{maxWidth: 'calc(100% - 4rem)'}}>- <Bar count={page.count} all={this.state.pages} bg="bg-orange-50 dark:bg-gray-500 dark:bg-opacity-15" />- <span className="flex px-2 group dark:text-gray-300" style={{marginTop: '-26px'}} >- <Link to={{pathname: window.location.pathname, search: query.toString()}} className="block hover:underline">{page.name}</Link>- <a target="_blank" href={'http://' + this.props.site.domain + page.name} className="hidden group-hover:block">+ <Bar+ count={page.count}+ all={this.state.pages}+ bg="bg-orange-50 dark:bg-gray-500 dark:bg-opacity-15"+ maxWidthDeduction="4rem"+ >+ <span className="flex px-2 py-1.5 group dark:text-gray-300 z-9 relative break-words">+ <Link+ to={{pathname: window.location.pathname, search: query.toString()}}+ className="block hover:underline"+ >+ {page.name}+ </Link>+ <a+ target="_blank"+ href={'http://' + this.props.site.domain + page.name}+ className="hidden group-hover:block"+ ><svg className="inline w-4 h-4 ml-1 -mt-1 text-gray-600 dark:text-gray-400" fill="currentColor" viewBox="0 0 20 20"><path d="M11 3a1 1 0 100 2h2.586l-6.293 6.293a1 1 0 101.414 1.414L15 6.414V9a1 1 0 102 0V4a1 1 0 00-1-1h-5z"></path><path d="M5 5a2 2 0 00-2 2v8a2 2 0 002 2h8a2 2 0 002-2v-3a1 1 0 10-2 0v3H5V7h3a1 1 0 000-2H5z"></path></svg></a></span>- </div>+ </Bar><span className="font-medium dark:text-gray-200">{numberFormatter(page.count)}</span></div>)diff --git a/assets/js/dashboard/stats/pages/pages.js b/assets/js/dashboard/stats/pages/pages.jsindex 493c3c68fe..dc0276f031 100644--- a/assets/js/dashboard/stats/pages/pages.js+++ b/assets/js/dashboard/stats/pages/pages.js@@ -41,16 +41,34 @@ export default class Visits extends React.Component {const externalLink = 'https://' + domain.host + page.namereturn (- <div className="flex items-center justify-between my-1 text-sm" key={page.name}>- <div className="w-full h-8" style={{maxWidth: 'calc(100% - 4rem)'}}>- <Bar count={page.count} all={this.state.pages} bg="bg-orange-50 dark:bg-gray-500 dark:bg-opacity-15" />- <span className="flex px-2 group dark:text-gray-300" style={{marginTop: '-26px'}} >- <Link to={{pathname: window.location.pathname, search: query.toString()}} className="block hover:underline truncate">{page.name}</Link>- <a target="_blank" href={externalLink} className="hidden group-hover:block">+ <div+ className="flex items-center justify-between my-1 text-sm"+ key={page.name}+ >+ <Bar+ count={page.count}+ all={this.state.pages}+ bg="bg-orange-50 dark:bg-gray-500 dark:bg-opacity-15"+ maxWidthDeduction="4rem"+ >+ <span+ className="flex px-2 py-1.5 group dark:text-gray-300 relative z-9 break-words"+ >+ <Link+ to={{pathname: window.location.pathname, search: query.toString()}}+ className="block hover:underline"+ >+ {page.name}+ </Link>+ <a+ target="_blank"+ href={externalLink}+ className="hidden group-hover:block"+ ><svg className="inline w-4 h-4 ml-1 -mt-1 text-gray-600 dark:text-gray-400" fill="currentColor" viewBox="0 0 20 20"><path d="M11 3a1 1 0 100 2h2.586l-6.293 6.293a1 1 0 101.414 1.414L15 6.414V9a1 1 0 102 0V4a1 1 0 00-1-1h-5z"></path><path d="M5 5a2 2 0 00-2 2v8a2 2 0 002 2h8a2 2 0 002-2v-3a1 1 0 10-2 0v3H5V7h3a1 1 0 000-2H5z"></path></svg></a></span>- </div>+ </Bar><span className="font-medium dark:text-gray-200">{numberFormatter(page.count)}</span></div>)diff --git a/assets/js/dashboard/stats/sources/referrer-list.js b/assets/js/dashboard/stats/sources/referrer-list.jsindex c122fef81f..c4bb7795f3 100644--- a/assets/js/dashboard/stats/sources/referrer-list.js+++ b/assets/js/dashboard/stats/sources/referrer-list.js@@ -72,16 +72,28 @@ export default class Referrers extends React.Component {return (<div className="flex items-center justify-between my-1 text-sm" key={referrer.name}>- <div className="w-full h-8" style={{maxWidth: 'calc(100% - 4rem)'}}>- <Bar count={referrer.count} all={this.state.referrers} bg="bg-blue-50 dark:bg-gray-500 dark:bg-opacity-15" />- <span className="flex px-2 group" style={{marginTop: '-26px'}} >- <LinkOption className="block truncate dark:text-gray-300" to={{search: query.toString()}} disabled={referrer.name === 'Direct / None'}>- <img src={`https://icons.duckduckgo.com/ip3/${referrer.url}.ico`} referrerPolicy="no-referrer" className="inline w-4 h-4 mr-2 -mt-px align-middle" />+ <Bar+ count={referrer.count}+ all={this.state.referrers}+ bg="bg-blue-50 dark:bg-gray-500 dark:bg-opacity-15"+ maxWidthDeduction="4rem"+ >+ <span className="flex px-2 py-1.5 z-9 relative break-words group">+ <LinkOption+ className="block dark:text-gray-300"+ to={{search: query.toString()}}+ disabled={referrer.name === 'Direct / None'}+ >+ <img+ src={`https://icons.duckduckgo.com/ip3/${referrer.url}.ico`}+ referrerPolicy="no-referrer"+ className="inline w-4 h-4 mr-2 -mt-px align-middle"+ />{ referrer.name }</LinkOption>{ this.renderExternalLink(referrer) }</span>- </div>+ </Bar><span className="font-medium dark:text-gray-200">{numberFormatter(referrer.count)}</span></div>)diff --git a/assets/js/dashboard/stats/sources/search-terms.js b/assets/js/dashboard/stats/sources/search-terms.jsindex 77252269ea..6fc5607346 100644--- a/assets/js/dashboard/stats/sources/search-terms.js+++ b/assets/js/dashboard/stats/sources/search-terms.js@@ -36,14 +36,18 @@ export default class SearchTerms extends React.Component {renderSearchTerm(term) {return (<div className="flex items-center justify-between my-1 text-sm" key={term.name}>- <div className="w-full h-8" style={{maxWidth: 'calc(100% - 4rem)'}}>- <Bar count={term.count} all={this.state.searchTerms} bg="bg-blue-50 dark:bg-gray-500 dark:bg-opacity-15" />- <span className="flex px-2 dark:text-gray-300" style={{marginTop: '-26px'}} >- <span className="block truncate">+ <Bar+ count={term.count}+ all={this.state.searchTerms}+ bg="bg-blue-50 dark:bg-gray-500 dark:bg-opacity-15"+ maxWidthDeduction="4rem"+ >+ <span className="flex px-2 py-1.5 dark:text-gray-300 z-9 relative break-words">+ <span className="block">{ term.name }</span></span>- </div>+ </Bar><span className="font-medium dark:text-gray-200">{numberFormatter(term.count)}</span></div>)diff --git a/assets/js/dashboard/stats/sources/source-list.js b/assets/js/dashboard/stats/sources/source-list.jsindex 40ca9003a8..b1442b1cec 100644--- a/assets/js/dashboard/stats/sources/source-list.js+++ b/assets/js/dashboard/stats/sources/source-list.js@@ -43,16 +43,30 @@ class AllSources extends React.Component {query.set('source', referrer.name)return (- <div className="flex items-center justify-between my-1 text-sm" key={referrer.name}>- <div className="w-full h-8" style={{maxWidth: 'calc(100% - 4rem)'}}>- <Bar count={referrer.count} all={this.state.referrers} bg="bg-blue-50 dark:bg-gray-500 dark:bg-opacity-15" />- <span className="flex px-2 dark:text-gray-300" style={{marginTop: '-26px'}} >- <Link className="block truncate hover:underline" to={{search: query.toString()}}>- <img src={`https://icons.duckduckgo.com/ip3/${referrer.url}.ico`} referrerPolicy="no-referrer" className="inline w-4 h-4 mr-2 -mt-px align-middle" />+ <div+ className="flex items-center justify-between my-1 text-sm"+ key={referrer.name}+ >+ <Bar+ count={referrer.count}+ all={this.state.referrers}+ bg="bg-blue-50 dark:bg-gray-500 dark:bg-opacity-15"+ maxWidthDeduction="4rem"+ >+ <span className="flex px-2 py-1.5 dark:text-gray-300 relative z-9 break-words">+ <Link+ className="block hover:underline"+ to={{search: query.toString()}}+ >+ <img+ src={`https://icons.duckduckgo.com/ip3/${referrer.url}.ico`}+ referrerPolicy="no-referrer"+ className="inline w-4 h-4 mr-2 -mt-px align-middle"+ />{ referrer.name }</Link></span>- </div>+ </Bar><span className="font-medium dark:text-gray-200">{numberFormatter(referrer.count)}</span></div>)@@ -147,15 +161,25 @@ class UTMSources extends React.Component {query.set(this.props.tab, referrer.name)return (- <div className="flex items-center justify-between my-1 text-sm" key={referrer.name}>- <div className="w-full h-8" style={{maxWidth: 'calc(100% - 4rem)'}}>- <Bar count={referrer.count} all={this.state.referrers} bg="bg-blue-50 dark:bg-gray-500 dark:bg-opacity-15" />- <span className="flex px-2 dark:text-gray-300" style={{marginTop: '-26px'}} >- <Link className="block truncate hover:underline" to={{search: query.toString()}}>+ <div+ className="flex items-center justify-between my-1 text-sm"+ key={referrer.name}+ >+ <Bar+ count={referrer.count}+ all={this.state.referrers}+ bg="bg-blue-50 dark:bg-gray-500 dark:bg-opacity-15"+ maxWidthDeduction="4rem"+ >+ <span className="flex px-2 py-1.5 dark:text-gray-300 relative z-9 break-words">+ <Link+ className="block hover:underline"+ to={{search: query.toString()}}+ >{ referrer.name }</Link></span>- </div>+ </Bar><span className="font-medium dark:text-gray-200">{numberFormatter(referrer.count)}</span></div>)@@ -168,7 +192,7 @@ class UTMSources extends React.Component {renderList() {if (this.state.referrers && this.state.referrers.length > 0) {return (- <div class="flex flex-col flex-grow">+ <div className="flex flex-col flex-grow"><div className="flex items-center justify-between mt-3 mb-2 text-xs font-bold tracking-wide text-gray-500 dark:text-gray-400"><span>{UTM_TAGS[this.props.tab].label}</span><span>{this.label()}</span>