diff --git a/CHANGELOG.md b/CHANGELOG.md index 905c814f2..297b56373 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 package diff --git a/assets/js/dashboard/stats/bar.js b/assets/js/dashboard/stats/bar.js index e38b67845..f1585b3f2 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 ( -
+
+
+
+ {children}
) } diff --git a/assets/js/dashboard/stats/conversions/index.js b/assets/js/dashboard/stats/conversions/index.js index 2dd5da59e..82a3909ef 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 {goalName} + return {goalName} } else { const query = new URLSearchParams(window.location.search) query.set('goal', goalName) return ( - + { goalName } ) } } + + renderGoal(goal) { + const { viewport } = this.state; const renderProps = this.props.query.filters['goal'] == goal.name && goal.prop_names return (
-
- + {this.renderGoalText(goal.name)} -
+
{numberFormatter(goal.count)} - {numberFormatter(goal.total_count)} + {viewport > MOBILE_UPPER_WIDTH && {numberFormatter(goal.total_count)}} {goal.conversion_rate}%
@@ -68,6 +101,7 @@ export default class Conversions extends React.Component { } renderInner() { + const { viewport } = this.state; if (this.state.loading) { return
} else if (this.state.goals) { @@ -78,7 +112,7 @@ export default class Conversions extends React.Component { Goal
Uniques - Total + {viewport > MOBILE_UPPER_WIDTH && Total} CR
diff --git a/assets/js/dashboard/stats/conversions/prop-breakdown.js b/assets/js/dashboard/stats/conversions/prop-breakdown.js index bc1237fbe..1d8b89ea2 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 ( + + + { value.name } + + { this.renderUrl(value) } + + ) + } + renderPropValue(value) { const query = new URLSearchParams(window.location.search) query.set('props', JSON.stringify({[this.state.propKey]: value.name})) + const { viewport } = this.state; return (
-
- - - - { value.name } - - { this.renderUrl(value) } - -
+ + {this.renderPropContent(value, query)} +
{numberFormatter(value.count)} - {numberFormatter(value.total_count)} + { + viewport > MOBILE_UPPER_WIDTH ? + ( + {numberFormatter(value.total_count)} + + ) + : null + } {numberFormatter(value.conversion_rate)}%
diff --git a/assets/js/dashboard/stats/devices/browsers.js b/assets/js/dashboard/stats/devices/browsers.js index 57862dbf7..24a2d210d 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 ( + + + {browser.name} + + + ) + } + 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 (
-
- - - - {browser.name} - - -
- {numberFormatter(browser.count)} ({browser.percentage}%) + + {this.renderBrowserContent(browser, query)} + + + {numberFormatter(browser.count)} + ({browser.percentage}%) +
) } - 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.js index a07bac301..205e0fa3a 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 (
-
- + - + {iconFor(size.name)} {size.name} -
+ diff --git a/assets/js/dashboard/stats/devices/operating-systems.js b/assets/js/dashboard/stats/devices/operating-systems.js index 1b8e1abc0..4f80d5762 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 ( -
-
- - - +
+ + + {os.name} -
+
{numberFormatter(os.count)} ({os.percentage}%)
) diff --git a/assets/js/dashboard/stats/pages/entry-pages.js b/assets/js/dashboard/stats/pages/entry-pages.js index cb6323d77..ab5f3ef44 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 (
-
- - - {page.name} - + + + + {page.name} + + -
+ {numberFormatter(page.count)}
) diff --git a/assets/js/dashboard/stats/pages/exit-pages.js b/assets/js/dashboard/stats/pages/exit-pages.js index 5397165b6..9295fef39 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 (
-
- - - {page.name} - + + + + {page.name} + + -
+ {numberFormatter(page.count)}
) diff --git a/assets/js/dashboard/stats/pages/pages.js b/assets/js/dashboard/stats/pages/pages.js index 493c3c68f..dc0276f03 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.name return ( -
-
- - - {page.name} - + + {numberFormatter(page.count)}
) diff --git a/assets/js/dashboard/stats/sources/referrer-list.js b/assets/js/dashboard/stats/sources/referrer-list.js index c122fef81..c4bb7795f 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 (
-
- - - - + + + + { referrer.name } { this.renderExternalLink(referrer) } -
+ {numberFormatter(referrer.count)}
) diff --git a/assets/js/dashboard/stats/sources/search-terms.js b/assets/js/dashboard/stats/sources/search-terms.js index 77252269e..6fc560734 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 (
-
- - - + + + { term.name } -
+ {numberFormatter(term.count)}
) diff --git a/assets/js/dashboard/stats/sources/source-list.js b/assets/js/dashboard/stats/sources/source-list.js index 40ca9003a..b1442b1ce 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 ( -
-
- - - - +
+ + + + { referrer.name } -
+
{numberFormatter(referrer.count)}
) @@ -147,15 +161,25 @@ class UTMSources extends React.Component { query.set(this.props.tab, referrer.name) return ( -
-
- - - +
+ + + { referrer.name } -
+
{numberFormatter(referrer.count)}
) @@ -168,7 +192,7 @@ class UTMSources extends React.Component { renderList() { if (this.state.referrers && this.state.referrers.length > 0) { return ( -
+
{UTM_TAGS[this.props.tab].label} {this.label()}