From 2ff9676043060ef271593445be95144fd2f0483b Mon Sep 17 00:00:00 2001 From: Danny van Kooten Date: Wed, 19 Sep 2018 08:21:04 +0200 Subject: [PATCH] always show at least 1 visitor if there are pageviews. #129 --- assets/src/js/components/Sidebar.js | 7 ++++++- pkg/datastore/sqlstore/site_stats.go | 4 +++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/assets/src/js/components/Sidebar.js b/assets/src/js/components/Sidebar.js index beaa6e0..d0b5c70 100644 --- a/assets/src/js/components/Sidebar.js +++ b/assets/src/js/components/Sidebar.js @@ -36,6 +36,11 @@ class Sidebar extends Component { return; } + // Make sure we always show at least 1 visitor when there are pageviews + if ( data.Visitors == 0 && data.Pageviews > 0 ) { + data.Visitors = 1 + } + this.setState({ loading: false, data: data @@ -47,7 +52,7 @@ class Sidebar extends Component { return (
- +
diff --git a/pkg/datastore/sqlstore/site_stats.go b/pkg/datastore/sqlstore/site_stats.go index c06e1ce..214cb0e 100644 --- a/pkg/datastore/sqlstore/site_stats.go +++ b/pkg/datastore/sqlstore/site_stats.go @@ -2,8 +2,9 @@ package sqlstore import ( "database/sql" - "github.com/usefathom/fathom/pkg/models" "time" + + "github.com/usefathom/fathom/pkg/models" ) func (db *sqlstore) GetSiteStats(date time.Time) (*models.SiteStats, error) { @@ -49,6 +50,7 @@ func (db *sqlstore) GetAggregatedSiteStats(startDate time.Time, endDate time.Tim if err != nil && err == sql.ErrNoRows { return nil, ErrNoResults } + return stats, err }