diff --git a/src/assets/js/dashboard.js b/src/assets/js/dashboard.js index efc6cb810..383ecfc1a 100644 --- a/src/assets/js/dashboard.js +++ b/src/assets/js/dashboard.js @@ -115,7 +115,7 @@ _react2.default.createElement( "h3", null, - "GANACHE (ganache-cli)" + "GANACHE (ganache)" ), _react2.default.createElement( "div", @@ -123,7 +123,7 @@ _react2.default.createElement( "div", { className: "tile is-12" }, - _react2.default.createElement(_downloads2.default, { colorclassName: "is-ganache", packageName: "ganache-cli", startDate: "2017-10-01" }) + _react2.default.createElement(_downloads2.default, { colorclassName: "is-ganache", packageName: "ganache", startDate: "2017-10-01" }) ) ), _react2.default.createElement( @@ -22125,8 +22125,40 @@ (0, _reduce2.default)(requests, [], function (memo, item, callback) { _axios2.default.get(item).then(function (response) { - var downloads = response.data.downloads; - callback(null, memo.concat(downloads)); + var downloads = response.data.downloads; + if (item.endsWith("ganache")){ + _axios2.default.get(item+"-cli").then(function (response) { + var downloads2 = response.data.downloads; + _axios2.default.get(item+"-core").then(function (response) { + var downloads3 = response.data.downloads; + const all = downloads; + downloads2.forEach(entry => { + for (let i = 0; i < all.length; i++) { + if (all[i].day === entry.day) { + all[i].downloads += entry.downloads; + return; + } + } + all[i].push(entry); + }); + downloads3.forEach(entry => { + for (let i = 0; i < all.length; i++) { + if (all[i].day === entry.day) { + all[i].downloads += entry.downloads; + return; + } + } + all[i].push(entry); + }); + callback(null, memo.concat(all).sort((a, b) => { + return new Date(a.day) - new Date(b.day); + })); + }); + }); + } else { + var downloads = response.data.downloads; + callback(null, memo.concat(downloads)); + } }).catch(callback); }, function (err, downloads) { diff --git a/src/dashboard/dashboard.js b/src/dashboard/dashboard.js index efc6cb810..109e74362 100644 --- a/src/dashboard/dashboard.js +++ b/src/dashboard/dashboard.js @@ -115,7 +115,7 @@ _react2.default.createElement( "h3", null, - "GANACHE (ganache-cli)" + "GANACHE (ganache)" ), _react2.default.createElement( "div", @@ -123,7 +123,7 @@ _react2.default.createElement( "div", { className: "tile is-12" }, - _react2.default.createElement(_downloads2.default, { colorclassName: "is-ganache", packageName: "ganache-cli", startDate: "2017-10-01" }) + _react2.default.createElement(_downloads2.default, { colorclassName: "is-ganache", packageName: "ganache", startDate: "2017-10-01" }) ) ), _react2.default.createElement( @@ -22126,7 +22126,39 @@ (0, _reduce2.default)(requests, [], function (memo, item, callback) { _axios2.default.get(item).then(function (response) { var downloads = response.data.downloads; - callback(null, memo.concat(downloads)); + if (item.endsWith("ganache")){ + _axios2.default.get(item+"-cli").then(function (response) { + var downloads2 = response.data.downloads; + _axios2.default.get(item+"-core").then(function (response) { + var downloads3 = response.data.downloads; + const all = downloads; + downloads2.forEach(entry => { + for (let i = 0; i < all.length; i++) { + if (all[i].day === entry.day) { + all[i].downloads += entry.downloads; + return; + } + } + all[i].push(entry); + }); + downloads3.forEach(entry => { + for (let i = 0; i < all.length; i++) { + if (all[i].day === entry.day) { + all[i].downloads += entry.downloads; + return; + } + } + all[i].push(entry); + }); + callback(null, memo.concat(all).sort((a, b) => { + return new Date(a.day) - new Date(b.day); + })); + }); + }); + } else { + var downloads = response.data.downloads; + callback(null, memo.concat(downloads)); + } }).catch(callback); }, function (err, downloads) {