TryGhost/Ghost
1
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2024-11-25 19:48:50 +03:00
Code Issues Projects Releases Wiki Activity

Fixed up linting errors for new empty state for new Dashboard

Browse Source 
refs: https://github.com/TryGhost/Team/issues/1594
This commit is contained in:
James Morris 2022-05-09 11:59:09 +01:00
parent f9231afa2a
commit d6e98eca68
2 changed files with 392 additions and 396 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

544
ghost/admin/app/components/dashboard/v5/charts/anchor.js
View File

@ -82,8 +82,6 @@ export default class Anchor extends Component {
loadCharts() {
this.dashboardStats.loadMemberCountStats();
console.log('this.dashboardStats.memberCounts', this.dashboardStats.memberCounts);
if (this.hasPaidTiers) {
this.dashboardStats.loadMrrStats();
}
@ -368,337 +366,337 @@ export default class Anchor extends Component {
return {
stats: [
{
"date": "2022-04-07",
"free": 2610,
"tier1": 295,
"tier2": 20,
"paid": 315,
"comped": 0,
"paidSubscribed": 2,
"paidCanceled": 1
date: '2022-04-07',
free: 2610,
tier1: 295,
tier2: 20,
paid: 315,
comped: 0,
paidSubscribed: 2,
paidCanceled: 1
},
{
"date": "2022-04-08",
"free": 2765,
"tier1": 298,
"tier2": 24,
"paid": 322,
"comped": 0,
"paidSubscribed": 7,
"paidCanceled": 0
date: '2022-04-08',
free: 2765,
tier1: 298,
tier2: 24,
paid: 322,
comped: 0,
paidSubscribed: 7,
paidCanceled: 0
},
{
"date": "2022-04-09",
"free": 3160,
"tier1": 299,
"tier2": 28,
"paid": 327,
"comped": 0,
"paidSubscribed": 5,
"paidCanceled": 0
date: '2022-04-09',
free: 3160,
tier1: 299,
tier2: 28,
paid: 327,
comped: 0,
paidSubscribed: 5,
paidCanceled: 0
},
{
"date": "2022-04-10",
"free": 3580,
"tier1": 300,
"tier2": 30,
"paid": 330,
"comped": 0,
"paidSubscribed": 4,
"paidCanceled": 1
date: '2022-04-10',
free: 3580,
tier1: 300,
tier2: 30,
paid: 330,
comped: 0,
paidSubscribed: 4,
paidCanceled: 1
},
{
"date": "2022-04-11",
"free": 3583,
"tier1": 301,
"tier2": 31,
"paid": 332,
"comped": 0,
"paidSubscribed": 2,
"paidCanceled": 0
date: '2022-04-11',
free: 3583,
tier1: 301,
tier2: 31,
paid: 332,
comped: 0,
paidSubscribed: 2,
paidCanceled: 0
},
{
"date": "2022-04-12",
"free": 3857,
"tier1": 303,
"tier2": 36,
"paid": 339,
"comped": 0,
"paidSubscribed": 8,
"paidCanceled": 1
date: '2022-04-12',
free: 3857,
tier1: 303,
tier2: 36,
paid: 339,
comped: 0,
paidSubscribed: 8,
paidCanceled: 1
},
{
"date": "2022-04-13",
"free": 4223,
"tier1": 304,
"tier2": 39,
"paid": 343,
"comped": 0,
"paidSubscribed": 4,
"paidCanceled": 0
date: '2022-04-13',
free: 4223,
tier1: 304,
tier2: 39,
paid: 343,
comped: 0,
paidSubscribed: 4,
paidCanceled: 0
},
{
"date": "2022-04-14",
"free": 4289,
"tier1": 306,
"tier2": 42,
"paid": 348,
"comped": 0,
"paidSubscribed": 6,
"paidCanceled": 1
date: '2022-04-14',
free: 4289,
tier1: 306,
tier2: 42,
paid: 348,
comped: 0,
paidSubscribed: 6,
paidCanceled: 1
},
{
"date": "2022-04-15",
"free": 4458,
"tier1": 307,
"tier2": 49,
"paid": 356,
"comped": 0,
"paidSubscribed": 8,
"paidCanceled": 0
date: '2022-04-15',
free: 4458,
tier1: 307,
tier2: 49,
paid: 356,
comped: 0,
paidSubscribed: 8,
paidCanceled: 0
},
{
"date": "2022-04-16",
"free": 4752,
"tier1": 307,
"tier2": 49,
"paid": 356,
"comped": 0,
"paidSubscribed": 1,
"paidCanceled": 1
date: '2022-04-16',
free: 4752,
tier1: 307,
tier2: 49,
paid: 356,
comped: 0,
paidSubscribed: 1,
paidCanceled: 1
},
{
"date": "2022-04-17",
"free": 4947,
"tier1": 310,
"tier2": 50,
"paid": 360,
"comped": 0,
"paidSubscribed": 5,
"paidCanceled": 1
date: '2022-04-17',
free: 4947,
tier1: 310,
tier2: 50,
paid: 360,
comped: 0,
paidSubscribed: 5,
paidCanceled: 1
},
{
"date": "2022-04-18",
"free": 5047,
"tier1": 312,
"tier2": 49,
"paid": 361,
"comped": 0,
"paidSubscribed": 2,
"paidCanceled": 1
date: '2022-04-18',
free: 5047,
tier1: 312,
tier2: 49,
paid: 361,
comped: 0,
paidSubscribed: 2,
paidCanceled: 1
},
{
"date": "2022-04-19",
"free": 5430,
"tier1": 314,
"tier2": 55,
"paid": 369,
"comped": 0,
"paidSubscribed": 8,
"paidCanceled": 0
date: '2022-04-19',
free: 5430,
tier1: 314,
tier2: 55,
paid: 369,
comped: 0,
paidSubscribed: 8,
paidCanceled: 0
},
{
"date": "2022-04-20",
"free": 5760,
"tier1": 316,
"tier2": 57,
"paid": 373,
"comped": 0,
"paidSubscribed": 4,
"paidCanceled": 0
date: '2022-04-20',
free: 5760,
tier1: 316,
tier2: 57,
paid: 373,
comped: 0,
paidSubscribed: 4,
paidCanceled: 0
},
{
"date": "2022-04-21",
"free": 6022,
"tier1": 318,
"tier2": 63,
"paid": 381,
"comped": 0,
"paidSubscribed": 9,
"paidCanceled": 1
date: '2022-04-21',
free: 6022,
tier1: 318,
tier2: 63,
paid: 381,
comped: 0,
paidSubscribed: 9,
paidCanceled: 1
},
{
"date": "2022-04-22",
"free": 6294,
"tier1": 319,
"tier2": 64,
"paid": 383,
"comped": 0,
"paidSubscribed": 2,
"paidCanceled": 0
date: '2022-04-22',
free: 6294,
tier1: 319,
tier2: 64,
paid: 383,
comped: 0,
paidSubscribed: 2,
paidCanceled: 0
},
{
"date": "2022-04-23",
"free": 6664,
"tier1": 320,
"tier2": 69,
"paid": 389,
"comped": 0,
"paidSubscribed": 6,
"paidCanceled": 0
date: '2022-04-23',
free: 6664,
tier1: 320,
tier2: 69,
paid: 389,
comped: 0,
paidSubscribed: 6,
paidCanceled: 0
},
{
"date": "2022-04-24",
"free": 6721,
"tier1": 320,
"tier2": 70,
"paid": 390,
"comped": 0,
"paidSubscribed": 1,
"paidCanceled": 0
date: '2022-04-24',
free: 6721,
tier1: 320,
tier2: 70,
paid: 390,
comped: 0,
paidSubscribed: 1,
paidCanceled: 0
},
{
"date": "2022-04-25",
"free": 6841,
"tier1": 321,
"tier2": 80,
"paid": 401,
"comped": 0,
"paidSubscribed": 11,
"paidCanceled": 0
date: '2022-04-25',
free: 6841,
tier1: 321,
tier2: 80,
paid: 401,
comped: 0,
paidSubscribed: 11,
paidCanceled: 0
},
{
"date": "2022-04-26",
"free": 6880,
"tier1": 323,
"tier2": 89,
"paid": 412,
"comped": 0,
"paidSubscribed": 11,
"paidCanceled": 0
date: '2022-04-26',
free: 6880,
tier1: 323,
tier2: 89,
paid: 412,
comped: 0,
paidSubscribed: 11,
paidCanceled: 0
},
{
"date": "2022-04-27",
"free": 7179,
"tier1": 325,
"tier2": 92,
"paid": 417,
"comped": 0,
"paidSubscribed": 5,
"paidCanceled": 0
date: '2022-04-27',
free: 7179,
tier1: 325,
tier2: 92,
paid: 417,
comped: 0,
paidSubscribed: 5,
paidCanceled: 0
},
{
"date": "2022-04-28",
"free": 7288,
"tier1": 325,
"tier2": 100,
"paid": 425,
"comped": 0,
"paidSubscribed": 9,
"paidCanceled": 1
date: '2022-04-28',
free: 7288,
tier1: 325,
tier2: 100,
paid: 425,
comped: 0,
paidSubscribed: 9,
paidCanceled: 1
},
{
"date": "2022-04-29",
"free": 7430,
"tier1": 325,
"tier2": 101,
"paid": 426,
"comped": 0,
"paidSubscribed": 2,
"paidCanceled": 1
date: '2022-04-29',
free: 7430,
tier1: 325,
tier2: 101,
paid: 426,
comped: 0,
paidSubscribed: 2,
paidCanceled: 1
},
{
"date": "2022-04-30",
"free": 7458,
"tier1": 326,
"tier2": 102,
"paid": 428,
"comped": 0,
"paidSubscribed": 2,
"paidCanceled": 0
date: '2022-04-30',
free: 7458,
tier1: 326,
tier2: 102,
paid: 428,
comped: 0,
paidSubscribed: 2,
paidCanceled: 0
},
{
"date": "2022-05-01",
"free": 7621,
"tier1": 327,
"tier2": 117,
"paid": 444,
"comped": 0,
"paidSubscribed": 17,
"paidCanceled": 1
date: '2022-05-01',
free: 7621,
tier1: 327,
tier2: 117,
paid: 444,
comped: 0,
paidSubscribed: 17,
paidCanceled: 1
},
{
"date": "2022-05-02",
"free": 7721,
"tier1": 328,
"tier2": 123,
"paid": 451,
"comped": 0,
"paidSubscribed": 8,
"paidCanceled": 1
date: '2022-05-02',
free: 7721,
tier1: 328,
tier2: 123,
paid: 451,
comped: 0,
paidSubscribed: 8,
paidCanceled: 1
},
{
"date": "2022-05-03",
"free": 7897,
"tier1": 327,
"tier2": 137,
"paid": 464,
"comped": 0,
"paidSubscribed": 14,
"paidCanceled": 1
date: '2022-05-03',
free: 7897,
tier1: 327,
tier2: 137,
paid: 464,
comped: 0,
paidSubscribed: 14,
paidCanceled: 1
},
{
"date": "2022-05-04",
"free": 7937,
"tier1": 327,
"tier2": 143,
"paid": 470,
"comped": 0,
"paidSubscribed": 6,
"paidCanceled": 0
date: '2022-05-04',
free: 7937,
tier1: 327,
tier2: 143,
paid: 470,
comped: 0,
paidSubscribed: 6,
paidCanceled: 0
},
{
"date": "2022-05-05",
"free": 7961,
"tier1": 328,
"tier2": 158,
"paid": 486,
"comped": 0,
"paidSubscribed": 16,
"paidCanceled": 0
date: '2022-05-05',
free: 7961,
tier1: 328,
tier2: 158,
paid: 486,
comped: 0,
paidSubscribed: 16,
paidCanceled: 0
},
{
"date": "2022-05-06",
"free": 8006,
"tier1": 328,
"tier2": 162,
"paid": 490,
"comped": 0,
"paidSubscribed": 5,
"paidCanceled": 1
date: '2022-05-06',
free: 8006,
tier1: 328,
tier2: 162,
paid: 490,
comped: 0,
paidSubscribed: 5,
paidCanceled: 1
}
],
labels: [
"2022-04-07",
"2022-04-08",
"2022-04-09",
"2022-04-10",
"2022-04-11",
"2022-04-12",
"2022-04-13",
"2022-04-14",
"2022-04-15",
"2022-04-16",
"2022-04-17",
"2022-04-18",
"2022-04-19",
"2022-04-20",
"2022-04-21",
"2022-04-22",
"2022-04-23",
"2022-04-24",
"2022-04-25",
"2022-04-26",
"2022-04-27",
"2022-04-28",
"2022-04-29",
"2022-04-30",
"2022-05-01",
"2022-05-02",
"2022-05-03",
"2022-05-04",
"2022-05-05",
"2022-05-06"
'2022-04-07',
'2022-04-08',
'2022-04-09',
'2022-04-10',
'2022-04-11',
'2022-04-12',
'2022-04-13',
'2022-04-14',
'2022-04-15',
'2022-04-16',
'2022-04-17',
'2022-04-18',
'2022-04-19',
'2022-04-20',
'2022-04-21',
'2022-04-22',
'2022-04-23',
'2022-04-24',
'2022-04-25',
'2022-04-26',
'2022-04-27',
'2022-04-28',
'2022-04-29',
'2022-04-30',
'2022-05-01',
'2022-05-02',
'2022-05-03',
'2022-05-04',
'2022-05-05',
'2022-05-06'
],
data: [
2925,
@ -732,7 +730,7 @@ export default class Anchor extends Component {
8447,
8496
]
}
};
}
calculatePercentage(from, to) {

244
ghost/admin/app/components/dashboard/v5/charts/mrr.js
View File

@ -100,8 +100,6 @@ export default class Mrr extends Component {
let labels = stats.map(stat => stat.date);
let data = stats.map(stat => stat.mrr);
console.log('this.isTotalMembersZero', this.isTotalMembersZero);
// with no members yet, let's show empty state with dummy data
if (this.isTotalMembersZero) {
stats = this.emptyData.stats;
@ -245,187 +243,187 @@ export default class Mrr extends Component {
return {
stats: [
{
"date": "2022-04-07",
"mrr": 0,
"currency": "usd"
date: '2022-04-07',
mrr: 0,
currency: 'usd'
},
{
"date": "2022-04-08",
"mrr": 0,
"currency": "usd"
date: '2022-04-08',
mrr: 0,
currency: 'usd'
},
{
"date": "2022-04-09",
"mrr": 1500,
"currency": "usd"
date: '2022-04-09',
mrr: 1500,
currency: 'usd'
},
{
"date": "2022-04-10",
"mrr": 2000,
"currency": "usd"
date: '2022-04-10',
mrr: 2000,
currency: 'usd'
},
{
"date": "2022-04-11",
"mrr": 4500,
"currency": "usd"
date: '2022-04-11',
mrr: 4500,
currency: 'usd'
},
{
"date": "2022-04-12",
"mrr": 7500,
"currency": "usd"
date: '2022-04-12',
mrr: 7500,
currency: 'usd'
},
{
"date": "2022-04-13",
"mrr": 11000,
"currency": "usd"
date: '2022-04-13',
mrr: 11000,
currency: 'usd'
},
{
"date": "2022-04-14",
"mrr": 12500,
"currency": "usd"
date: '2022-04-14',
mrr: 12500,
currency: 'usd'
},
{
"date": "2022-04-15",
"mrr": 14500,
"currency": "usd"
date: '2022-04-15',
mrr: 14500,
currency: 'usd'
},
{
"date": "2022-04-16",
"mrr": 18000,
"currency": "usd"
date: '2022-04-16',
mrr: 18000,
currency: 'usd'
},
{
"date": "2022-04-17",
"mrr": 21500,
"currency": "usd"
date: '2022-04-17',
mrr: 21500,
currency: 'usd'
},
{
"date": "2022-04-18",
"mrr": 25000,
"currency": "usd"
date: '2022-04-18',
mrr: 25000,
currency: 'usd'
},
{
"date": "2022-04-19",
"mrr": 28000,
"currency": "usd"
date: '2022-04-19',
mrr: 28000,
currency: 'usd'
},
{
"date": "2022-04-20",
"mrr": 30000,
"currency": "usd"
date: '2022-04-20',
mrr: 30000,
currency: 'usd'
},
{
"date": "2022-04-21",
"mrr": 34000,
"currency": "usd"
date: '2022-04-21',
mrr: 34000,
currency: 'usd'
},
{
"date": "2022-04-22",
"mrr": 35000,
"currency": "usd"
date: '2022-04-22',
mrr: 35000,
currency: 'usd'
},
{
"date": "2022-04-23",
"mrr": 35500,
"currency": "usd"
date: '2022-04-23',
mrr: 35500,
currency: 'usd'
},
{
"date": "2022-04-24",
"mrr": 37000,
"currency": "usd"
date: '2022-04-24',
mrr: 37000,
currency: 'usd'
},
{
"date": "2022-04-25",
"mrr": 38000,
"currency": "usd"
date: '2022-04-25',
mrr: 38000,
currency: 'usd'
},
{
"date": "2022-04-26",
"mrr": 40500,
"currency": "usd"
date: '2022-04-26',
mrr: 40500,
currency: 'usd'
},
{
"date": "2022-04-27",
"mrr": 43500,
"currency": "usd"
date: '2022-04-27',
mrr: 43500,
currency: 'usd'
},
{
"date": "2022-04-28",
"mrr": 47000,
"currency": "usd"
date: '2022-04-28',
mrr: 47000,
currency: 'usd'
},
{
"date": "2022-04-29",
"mrr": 48000,
"currency": "usd"
date: '2022-04-29',
mrr: 48000,
currency: 'usd'
},
{
"date": "2022-04-30",
"mrr": 50500,
"currency": "usd"
date: '2022-04-30',
mrr: 50500,
currency: 'usd'
},
{
"date": "2022-05-01",
"mrr": 53500,
"currency": "usd"
date: '2022-05-01',
mrr: 53500,
currency: 'usd'
},
{
"date": "2022-05-02",
"mrr": 55000,
"currency": "usd"
date: '2022-05-02',
mrr: 55000,
currency: 'usd'
},
{
"date": "2022-05-03",
"mrr": 56500,
"currency": "usd"
date: '2022-05-03',
mrr: 56500,
currency: 'usd'
},
{
"date": "2022-05-04",
"mrr": 57000,
"currency": "usd"
date: '2022-05-04',
mrr: 57000,
currency: 'usd'
},
{
"date": "2022-05-05",
"mrr": 58000,
"currency": "usd"
date: '2022-05-05',
mrr: 58000,
currency: 'usd'
},
{
"date": "2022-05-06",
"mrr": 58500,
"currency": "usd"
date: '2022-05-06',
mrr: 58500,
currency: 'usd'
}
],
labels: [
"2022-04-07",
"2022-04-08",
"2022-04-09",
"2022-04-10",
"2022-04-11",
"2022-04-12",
"2022-04-13",
"2022-04-14",
"2022-04-15",
"2022-04-16",
"2022-04-17",
"2022-04-18",
"2022-04-19",
"2022-04-20",
"2022-04-21",
"2022-04-22",
"2022-04-23",
"2022-04-24",
"2022-04-25",
"2022-04-26",
"2022-04-27",
"2022-04-28",
"2022-04-29",
"2022-04-30",
"2022-05-01",
"2022-05-02",
"2022-05-03",
"2022-05-04",
"2022-05-05",
"2022-05-06"
'2022-04-07',
'2022-04-08',
'2022-04-09',
'2022-04-10',
'2022-04-11',
'2022-04-12',
'2022-04-13',
'2022-04-14',
'2022-04-15',
'2022-04-16',
'2022-04-17',
'2022-04-18',
'2022-04-19',
'2022-04-20',
'2022-04-21',
'2022-04-22',
'2022-04-23',
'2022-04-24',
'2022-04-25',
'2022-04-26',
'2022-04-27',
'2022-04-28',
'2022-04-29',
'2022-04-30',
'2022-05-01',
'2022-05-02',
'2022-05-03',
'2022-05-04',
'2022-05-05',
'2022-05-06'
],
data: [
0,
@ -459,7 +457,7 @@ export default class Mrr extends Component {
63500,
63500
]
}
};
}
calculatePercentage(from, to) {