diff --git a/ghost/admin/app/components/gh-members-chart.hbs b/ghost/admin/app/components/gh-members-chart.hbs index f0f4ed7af2..6d199f51bb 100644 --- a/ghost/admin/app/components/gh-members-chart.hbs +++ b/ghost/admin/app/components/gh-members-chart.hbs @@ -46,7 +46,7 @@

Total Members

-
{{if this.fetchStatsTask.isRunning "-" this.stats.totalMembers}}
+
{{if this.fetchStatsTask.isRunning "-" this.stats.total}}
{{#if (eq this.range "all-time")}} @@ -54,11 +54,11 @@ {{else}}

Signed up in the last {{this.range}} days

{{/if}} -
{{if this.fetchStatsTask.isRunning "-" this.stats.totalMembersInRange}}
+
{{if this.fetchStatsTask.isRunning "-" this.stats.totalInRange}}

Signed up today

-
{{if this.fetchStatsTask.isRunning "-" this.stats.newMembersToday}}
+
{{if this.fetchStatsTask.isRunning "-" this.stats.newToday}}
\ No newline at end of file diff --git a/ghost/admin/app/components/gh-members-chart.js b/ghost/admin/app/components/gh-members-chart.js index 2c6a590b20..bbabef2664 100644 --- a/ghost/admin/app/components/gh-members-chart.js +++ b/ghost/admin/app/components/gh-members-chart.js @@ -1,6 +1,5 @@ /* global Chart */ import Component from '@ember/component'; -import moment from 'moment'; import {action} from '@ember/object'; import {computed, get} from '@ember/object'; import {inject as service} from '@ember/service'; @@ -70,12 +69,12 @@ export default Component.extend({ this.set('stats', stats); this.setChartOptions({ - rangeInDays: Object.keys(stats.totalMembersOnDate).length + rangeInDays: Object.keys(stats.totalOnDate).length }); this.setChartData({ - dateLabels: Object.keys(stats.totalMembersOnDate), - dateValues: Object.values(stats.totalMembersOnDate) + dateLabels: Object.keys(stats.totalOnDate), + dateValues: Object.values(stats.totalOnDate) }); }), diff --git a/ghost/admin/mirage/config/members.js b/ghost/admin/mirage/config/members.js index 5fa646846c..924307a799 100644 --- a/ghost/admin/mirage/config/members.js +++ b/ghost/admin/mirage/config/members.js @@ -46,10 +46,10 @@ export function mockMembersStats(server) { } return { - totalMembers: total, - totalMembersInRange: rangeTotal, - totalMembersOnDate: totalOnDate, - newMembersToday: dateCounts[moment().format('YYYY-MM-DD')] + total, + totalInRange: rangeTotal, + totalOnDate, + newToday: dateCounts[moment().format('YYYY-MM-DD')] }; }); }