Skip to content

Deduplicate code #40

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sagarkarira merged 1 commit into from
Mar 21, 2020
Merged

Deduplicate code #40

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 4 additions & 39 deletions lib/byCountry.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,22 +2,20 @@ const Table = require('cli-table3');
const _ = require('lodash');
const helpers = require('./helpers');
const api = require('./api');
const stripAnsi = require('strip-ansi');
const {
extraStats,
getConfirmed,
getActive,
getDeaths,
getRecovered,
getMortalityPer,
getRecoveredPer,
getEmoji,
calActive,
calMortalityPer,
calRecoveredPer,
getOneDayChange,
getOneWeekChange,
getTotalStats,
footer,
htmlTemplate,
} = require('./helpers');

function getDataByState(confirmed, deaths, recovered) {
Expand Down Expand Up @@ -51,16 +49,6 @@ function getDataByState(confirmed, deaths, recovered) {
return _.sortBy(countryArr, (o) => -o.confirmed);
}

function extraStats(dataArr) {
return dataArr.map(obj => ({
...obj,
active: calActive(obj),
mortalityPer: calMortalityPer(obj),
recoveredPer: calRecoveredPer(obj),
})
);
}

exports.getJSONData = async () => {
const data = await api.getCoronaData();
const { confirmed, deaths, recovered } = data;
Expand Down Expand Up @@ -134,30 +122,7 @@ exports.getCountryTable = async ({
}

const { lastUpdated } = countryData[0];
if (!isCurl) {
const template = `<!doctype html>
<html lang="en">
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<title>Coronavirus Tracker</title>
<style>
body {
background-color: #0d0208;
color: #00ff41;
}
pre {
font-family: SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;
white-space: pre;
}
</style>
</head>
<body>
<pre>${table.toString() + footer(lastUpdated)}</pre>
</body>
</html>`;
return stripAnsi(template);
}
const ret = table.toString() + footer(lastUpdated);

return table.toString() + footer(lastUpdated);
return isCurl ? ret : htmlTemplate(ret);
};
44 changes: 5 additions & 39 deletions lib/corona.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,9 @@ const Table = require('cli-table3');
const _ = require('lodash');
const helpers = require('./helpers');
const api = require('./api');
const stripAnsi = require('strip-ansi');

const {
extraStats,
getCountry,
getConfirmed,
getActive,
Expand All @@ -12,13 +13,11 @@ const {
getMortalityPer,
getRecoveredPer,
getEmoji,
calActive,
calMortalityPer,
calRecoveredPer,
getOneDayChange,
getOneWeekChange,
getTotalStats,
footer,
htmlTemplate,
} = require('./helpers');

function getDataByCountry(confirmed, deaths, recovered) {
Expand Down Expand Up @@ -67,16 +66,6 @@ function getDataByCountry(confirmed, deaths, recovered) {
return _.sortBy(countryArr, (o) => -o.confirmed);
}

function extraStats(dataArr) {
return dataArr.map(obj => ({
...obj,
active: calActive(obj),
mortalityPer: calMortalityPer(obj),
recoveredPer: calRecoveredPer(obj),
})
);
}

exports.getCompleteTable = async ({
isCurl = true,
emojis = false,
Expand Down Expand Up @@ -139,30 +128,7 @@ exports.getCompleteTable = async ({
]
});
const { lastUpdated } = countryData[0];
if (!isCurl) {
const template = `<!doctype html>
<html lang="en">
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<title>Coronavirus Tracker</title>
<style>
body {
background-color: #0d0208;
color: #00ff41;
}
pre {
font-family: SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;
white-space: pre;
}
</style>
</head>
<body>
<pre>${table.toString() + footer(lastUpdated)}</pre>
</body>
</html>`;
return stripAnsi(template);
}
const ret = table.toString() + footer(lastUpdated);

return table.toString() + footer(lastUpdated);
return isCurl ? ret : htmlTemplate(ret);
};
39 changes: 39 additions & 0 deletions lib/helpers.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ const emojiFlags = require('emoji-flags');
const _ = require('lodash');
const moment = require('moment');
const lookup = require('country-code-lookup');
const stripAnsi = require('strip-ansi');
const e = exports;

e.getCountry = (country) => {
Expand Down Expand Up @@ -222,3 +223,41 @@ e.getTableHeaders = (emojis, secondColumnName) => {
];
return head;
};

e.extraStats = (dataArr) => {
return dataArr.map(obj => {
return {
...obj,
active: e.calActive(obj),
mortalityPer: e.calMortalityPer(obj),
recoveredPer: e.calRecoveredPer(obj)
};
});
};

e.htmlTemplate = (body) => {
const template = `<!doctype html>
<html lang="en">
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<title>Coronavirus Tracker</title>
<style>
body {
background-color: #0d0208;
color: #00ff41;
}
pre {
font-family: SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;
white-space: pre;
}
</style>
</head>
<body>
<pre>${body}</pre>
</body>
</html>
`;

return stripAnsi(template);
};