Add by country route

Author: Waren Gonzaga

app.js

@@ -1,7 +1,9 @@
+// node modules
 const   express = require('express'),
         app = express(),
         util = require('./bin/util'),
         fs = require('fs'),
+        axios = require('axios'),
         covid19 = require('./lib/cli');
 
 // set port
@@ -10,16 +12,48 @@ const port = process.env.port || 7070;
 // package.json info
 const pkg = JSON.parse(fs.readFileSync('package.json'));
 
+// api base url
+const apiBaseURL = "https://corona.lmao.ninja";
+
 // global route for covid19 tracker
 app.get('/', async (req, res, next) => {
-    const userAgent = req.headers['user-agent'];
+    const userAgent = req.headers['user-agent'],
+          api = await axios.get(`${apiBaseURL}/all`),
+          data = api.data;
     if (util.isCommandline(userAgent)) {
-      await res.send(covid19.covid19globaltracker());
+      await res.send(covid19.covid19globaltracker(
+        data.cases, data.deaths,
+        data.recovered, data.updated
+      ));
       return null;
     }
     return next();
 });
 
-app.get('*', (req, res) => res.send(`Something went wrong? Contact the developer!\n`));
+// by country route for covid19 tracker
+app.get('/:country', async (req, res, next) => {
+  const userAgent = req.headers['user-agent'],
+        countryData = req.params.country,
+        api = await axios.get(`${apiBaseURL}/countries/${countryData}`),
+        all = await axios.get(`${apiBaseURL}/all`),
+        u = all.data,
+        d = api.data;
+  if (util.isCommandline(userAgent)) {
+    await res.send(covid19.covid19countrytracker(
+      d.country, d.cases, d.todayCases, 
+      d.deaths, d.todayDeaths, d.recovered, 
+      d.active, d.critical, d.casesPerOneMillion,
+      u.updated
+    ));
+    return null;
+  }
+  return next();
+});
+
+app.get('*', (req, res) => res.send(`
+Sorry, CLI version is only available at the moment...
+\n
+Try curl https://covid19tracker.xyz
+\n`));
 
 app.listen(port, () => console.log(`COVID-19 Tracker v${pkg.version} is listening on port ${port}!`));

lib/cli/index.js

@@ -1,13 +1,16 @@
 /* eslint-disable no-await-in-loop */
 
 const   style   = require('ansi-styles'),
-        request = require("request"),
         fs      = require('fs'),
         table3   = require('cli-table3');
 
+const axios = require('axios');
+
 const   tblopn = style.cyan.open,
         tblcls = style.cyan.close;
 
+const   apiBaseURL = "https://corona.lmao.ninja";
+
 // package.json information
 const   pkg = JSON.parse(fs.readFileSync('package.json'));
 
@@ -24,20 +27,9 @@ let ts = Date.now(),
     year = date_ob.getFullYear(),
     currentdate = month + "/" + date + "/" + year;
 
-// api request for global data
-request.get("https://corona.lmao.ninja/all", (error, response, body) => {
-    if(error) {
-        return console.dir(error);
-    }
-    globalData = JSON.parse(body);
-});
-
 // covid19 global tracker
-exports.covid19globaltracker = () => {
-    const   cases = globalData.cases, 
-            deaths = globalData.deaths, 
-            recovered = globalData.recovered,
-            asof = new Date(globalData.updated),
+exports.covid19globaltracker = (c, d, r, u) => {
+    const   cases = c, deaths = d, recovered = r, asof = new Date(u),
             table = new table3({
                 head: [{colSpan:3,content:`${style.white.open}COVID-19 Tracker CLI v`+pkg.version+` - Global Update${style.white.close}`}],
                 chars: {    'top': `${tblopn}═${tblcls}`,
@@ -67,12 +59,56 @@ exports.covid19globaltracker = () => {
     return table.toString()+'\n'+footer;
 };
 
+const lastupdate = async () => {
+    return await axios.get(`${apiBaseURL}/all`).then(function(res){
+        const update = res.data.updated;
+        return update.toLocaleString();
+    });
+}; 
+
+exports.covid19countrytracker = (n, c, tC, d, tD, r, a, cl, cPOM, u) => {
+    const   name = n, cases = c, todayCases = tC,
+            deaths = d, todayDeaths = tD, recovered = r,
+            active = a, critical = cl, casesPerOneMillion = cPOM,
+            asof = new Date(u);
+            table = new table3({
+                head: [{colSpan:4,content:`${style.white.open}COVID-19 Tracker CLI v`+pkg.version+` - ${name} Update${style.white.close}`}],
+                chars: {    'top': `${tblopn}═${tblcls}`,
+                            'top-mid': `${tblopn}╤${tblcls}`,
+                            'top-left': `${tblopn}╔${tblcls}`, 
+                            'top-right': `${tblopn}╗${tblcls}`,
+                            'bottom': `${tblopn}═${tblcls}`, 
+                            'bottom-mid': `${tblopn}╧${tblcls}`, 
+                            'bottom-left': `${tblopn}╚${tblcls}`, 
+                            'bottom-right': `${tblopn}╝${tblcls}`,
+                            'left': `${tblopn}║${tblcls}` , 
+                            'left-mid': `${tblopn}╟${tblcls}` , 
+                            'mid': `${tblopn}─${tblcls}` , 
+                            'mid-mid': `${tblopn}┼${tblcls}`,
+                            'right': `${tblopn}║${tblcls}` , 
+                            'right-mid': `${tblopn}╢${tblcls}` , 
+                            'middle': `${tblopn}│${tblcls}` }
+            });
+
+    table.push(
+        [{colSpan:4,content:style.gray.open+'As of '+asof.toLocaleString()+' [Date:'+currentdate+']'+style.gray.close}],
+        [`${style.magenta.open}Cases${style.magenta.close}`, `${style.red.open}Deaths${style.red.close}`, `${style.green.open}Recovered${style.green.close}`,`${style.cyan.open}Active${style.cyan.close}`],
+        [formatNumber(cases), formatNumber(deaths), formatNumber(recovered), formatNumber(active)],
+        [`${style.magentaBright.open}Today Cases${style.magentaBright.close}`, `${style.redBright.open}Today Deaths${style.red.close}`, `${style.redBright.open}Critical${style.redBright.close}`,`${style.cyanBright.open}Cases Per Million${style.cyanBright.close}`],
+        [formatNumber(todayCases), formatNumber(todayDeaths), formatNumber(critical), formatNumber(casesPerOneMillion)],
+        [{colSpan:4,content:style.gray.open+`Source: https://www.worldometers.info/coronavirus/`+style.gray.close}],
+        [{colSpan:4,content:style.gray.open+`Code: https://github.com/warengonzaga/covid19-tracker-cli`+style.gray.close}]
+    );
+
+    return table.toString()+'\n'+footer;
+};
+
 const footer = `
  Always wash your hands, stay safe... 
 
  ---
  Love this project? Please consider buying me a cup of coffee!
- ${style.yellow.open}buymeacoff.ee/warengonzaga${style.yellow.close}
+ ${style.yellow.open}warengonzaga.com/buymeacoffee${style.yellow.close}
 
  ---
  Follow ${style.bgCyan.open}${style.black.open}@warengonzaga${style.black.close}${style.bgCyan.close} for more updates!