From b71e9bf5a527a9d54012c4066f44a17c1d58edde Mon Sep 17 00:00:00 2001 From: Uku Taht Date: Wed, 8 Jan 2020 10:48:27 +0200 Subject: [PATCH] Show more link unconditionally --- assets/js/dashboard/stats/browsers.js | 6 ++--- assets/js/dashboard/stats/conversions.js | 1 - assets/js/dashboard/stats/countries.js | 6 ++--- assets/js/dashboard/stats/more-link.js | 22 ++++++++----------- .../js/dashboard/stats/operating-systems.js | 6 ++--- assets/js/dashboard/stats/pages.js | 6 ++--- assets/js/dashboard/stats/referrers.js | 6 ++--- 7 files changed, 24 insertions(+), 29 deletions(-) diff --git a/assets/js/dashboard/stats/browsers.js b/assets/js/dashboard/stats/browsers.js index ae7d22438..ac8ff2e29 100644 --- a/assets/js/dashboard/stats/browsers.js +++ b/assets/js/dashboard/stats/browsers.js @@ -41,13 +41,13 @@ export default class Browsers extends React.Component { render() { if (this.state.loading) { return ( -
+
) } else if (this.state.browsers) { return ( -
+

Browsers

by visitors
@@ -56,7 +56,7 @@ export default class Browsers extends React.Component {
{ this.state.browsers.map(this.renderBrowser.bind(this)) }
- +
) } diff --git a/assets/js/dashboard/stats/conversions.js b/assets/js/dashboard/stats/conversions.js index 9148d3d1c..ec269e897 100644 --- a/assets/js/dashboard/stats/conversions.js +++ b/assets/js/dashboard/stats/conversions.js @@ -61,7 +61,6 @@ export default class Conversions extends React.Component {
{ this.state.goals.map(this.renderGoal.bind(this)) }
-
) } diff --git a/assets/js/dashboard/stats/countries.js b/assets/js/dashboard/stats/countries.js index 04bd1bd8e..7cac97873 100644 --- a/assets/js/dashboard/stats/countries.js +++ b/assets/js/dashboard/stats/countries.js @@ -43,13 +43,13 @@ export default class Countries extends React.Component { render() { if (this.state.loading) { return ( -
+
) } else if (this.state.countries) { return ( -
+

Top Countries

by visitors
@@ -58,7 +58,7 @@ export default class Countries extends React.Component {
{ this.state.countries.map(this.renderCountry.bind(this)) }
- +
) } diff --git a/assets/js/dashboard/stats/more-link.js b/assets/js/dashboard/stats/more-link.js index c34c9bd26..5658fc87b 100644 --- a/assets/js/dashboard/stats/more-link.js +++ b/assets/js/dashboard/stats/more-link.js @@ -1,17 +1,13 @@ import React from 'react'; import { Link } from 'react-router-dom' -export default function MoreLink({site, list, endpoint}) { - if (list.length >= 5) { - return ( -
- - - MORE - -
- ) - } else { - return null - } +export default function MoreLink({site, endpoint}) { + return ( +
+ + + MORE + +
+ ) } diff --git a/assets/js/dashboard/stats/operating-systems.js b/assets/js/dashboard/stats/operating-systems.js index e07bc7af9..b77039923 100644 --- a/assets/js/dashboard/stats/operating-systems.js +++ b/assets/js/dashboard/stats/operating-systems.js @@ -41,13 +41,13 @@ export default class OperatingSystems extends React.Component { render() { if (this.state.loading) { return ( -
+
) } else if (this.state.systems) { return ( -
+

Operating Systems

by visitors
@@ -56,7 +56,7 @@ export default class OperatingSystems extends React.Component {
{ this.state.systems.map(this.renderSystem.bind(this)) }
- +
) } diff --git a/assets/js/dashboard/stats/pages.js b/assets/js/dashboard/stats/pages.js index 737bf1577..062da4770 100644 --- a/assets/js/dashboard/stats/pages.js +++ b/assets/js/dashboard/stats/pages.js @@ -45,13 +45,13 @@ export default class Pages extends React.Component { render() { if (this.state.loading) { return ( -
+
) } else if (this.state.pages) { return ( -
+

Top Pages

by {eventName(this.props.query)}
@@ -60,7 +60,7 @@ export default class Pages extends React.Component {
{ this.state.pages.map(this.renderPage.bind(this)) }
- +
) } diff --git a/assets/js/dashboard/stats/referrers.js b/assets/js/dashboard/stats/referrers.js index 7e1a2d63b..195366e2d 100644 --- a/assets/js/dashboard/stats/referrers.js +++ b/assets/js/dashboard/stats/referrers.js @@ -43,13 +43,13 @@ export default class Referrers extends React.Component { render() { if (this.state.loading) { return ( -
+
) } else if (this.state.referrers) { return ( -
+

Top Referrers

by visitors
@@ -58,7 +58,7 @@ export default class Referrers extends React.Component {
{ this.state.referrers.map(this.renderReferrer.bind(this)) }
- +
) }