Merge branch 'dev'

Author: Waren Gonzaga

.gitignore

@@ -1,2 +1,3 @@
 node_modules
-.now
+.now
+.DS_Store

README.md

@@ -1,14 +1,10 @@
 # COVID-19 Tracker CLI [![Developed by Waren Gonzaga](https://img.shields.io/badge/Developed%20by-Waren%20Gonzaga-blue.svg?longCache=true&style=for-the-badge)](https://facebook.com/warengonzagaofficial)
 
-[![Github Release](https://img.shields.io/github/release/warengonzaga/covid19-tracker-cli.svg?style=for-the-badge)](https://github.com/warengonzaga/covid19-tracker-cli/releases)
-[![Github Star](https://img.shields.io/github/stars/warengonzaga/covid19-tracker-cli.svg?style=for-the-badge)](https://github.com/warengonzaga/covid19-tracker-cli)
-[![Github Fork](https://img.shields.io/github/forks/warengonzaga/covid19-tracker-cli.svg?style=for-the-badge)](https://github.com/warengonzaga/covid19-tracker-cli)
-[![License](https://img.shields.io/github/license/warengonzaga/covid19-tracker-cli.svg?style=for-the-badge)](https://github.com/warengonzaga/covid19-tracker-cli)
-[![Powered By](https://img.shields.io/badge/Powered%20By-NodeJS-green.svg?style=for-the-badge)](https://nodejs.org)
+[![Github Release](https://img.shields.io/github/release/tracker-cli/covid19-tracker-cli.svg?style=for-the-badge)](https://github.com/warengonzaga/covid19-tracker-cli/releases) [![Github Star](https://img.shields.io/github/stars/tracker-cli/covid19-tracker-cli.svg?style=for-the-badge)](https://github.com/warengonzaga/covid19-tracker-cli) [![Github Fork](https://img.shields.io/github/forks/tracker-cli/covid19-tracker-cli.svg?style=for-the-badge)](https://github.com/warengonzaga/covid19-tracker-cli) [![License](https://img.shields.io/github/license/tracker-cli/covid19-tracker-cli.svg?style=for-the-badge)](https://github.com/warengonzaga/covid19-tracker-cli) [![Powered By](https://img.shields.io/badge/Powered%20By-NodeJS-green.svg?style=for-the-badge)](https://nodejs.org)
 
 ![Github Banner](./lib/img/covid19-tracker-cli-github-banner.jpg)
 
-**COVID-19 Tracker CLI** is an open-source NodeJS application for command line interface to track COVID-19 cases around the world. An optimized NodeJS application and a simple tracker with real-time updates from reliable data source. [Visit Wiki](https://github.com/warengonzaga/covid19-tracker-cli/wiki)
+**COVID-19 Tracker CLI** is an open-source NodeJS application for command line interface to track COVID-19 cases around the world. An optimized NodeJS application and a simple tracker with real-time updates from reliable data source. [Visit Wiki](https://github.com/tracker-cli/covid19-tracker-cli/wiki)
 
 ## Domain Names
 
@@ -88,6 +84,8 @@ wget -i https://covid19.trackercli.com && cat index.html
 http http://covid19.trackercli.com
 ```
 
+![CURL](./lib/img/demo-global.gif)
+
 ### Country Tracking
 
 To track COVID-19 cases on CLI by country, all you need to do is to append the URL with the country name or country [ISO 3166-1](https://warengonza.ga/iso-3166-1-codes) code.
@@ -106,6 +104,8 @@ curl -L covid19.trackercli.com/philippines
 curl -L covid19.trackercli.com/ph
 ```
 
+![CURL](./lib/img/demo-country.gif)
+
 #### Global Tracking with History Chart
 
 ```bash
@@ -118,6 +118,8 @@ curl -L covid19.trackercli.com/history
 curl -L covid19.trackercli.com/history/all
 ```
 
+![CURL](./lib/img/demo-history-global.gif)
+
 #### Country Tracking with History Chart
 
 ```bash
@@ -135,6 +137,8 @@ curl -L covid19.trackercli.com/history/ph/cases
 curl -L covid19.trackercli.com/history/ph/deaths
 ```
 
+![CURL](./lib/img/demo-history-country.gif)
+
 ## Advance Usage
 
 ### Check Update Automagically

app.js

@@ -4,8 +4,9 @@ const express     = require('express'),
       util        = require('./bin/util'),
       axios       = require('axios'),
       covid19     = require('./lib/cli'),
+      covid19GFX = require('./lib/cli/gfx'),
       pkg         = require('./package.json'),    // package.json info
-      apiBaseURL  = "https://corona.lmao.ninja",  // NovelCOVID API
+      apiBaseURL  = "https://corona.lmao.ninja/v2",  // NovelCOVID API
       port        = process.env.port || 7070;     // set port
 
 // global route for covid19 tracker
@@ -28,7 +29,7 @@ app.get(['/history/all/:chartType(cases|deaths)?', '/history/'], async (req, res
   const userAgent = req.headers['user-agent'],
         api = await axios.get(`${apiBaseURL}/all`),
         chartType = req.params.chartType || 'cases',
-        history = await axios.get(`${apiBaseURL}/v2/historical/all?lastdays=all`),
+        history = await axios.get(`${apiBaseURL}/historical/all?lastdays=all`),
         h = history.data;
         data = api.data;
 
@@ -110,7 +111,7 @@ app.get('/history/:country/:chartType(cases|deaths)?', async (req, res, next) =>
         countryData = req.params.country,
         chartType = req.params.chartType || 'cases',
         summary = await axios.get(`${apiBaseURL}/countries/${countryData}`),
-        history = await axios.get(`${apiBaseURL}/v2/historical/${summary.data.country}?lastdays=all`),
+        history = await axios.get(`${apiBaseURL}/historical/${summary.data.country}?lastdays=all`),
         s = summary.data,
         h = history.data;
 
@@ -128,6 +129,30 @@ app.get('/history/:country/:chartType(cases|deaths)?', async (req, res, next) =>
   return next();
 });
 
+
+// historical chart by country
+app.get('/history/charts/:country', async (req, res, next) => {
+ const userAgent = req.headers['user-agent'],
+        countryData = req.params.country,
+        chartType = req.params.chartType || 'cases',
+        summary = await axios.get(`${apiBaseURL}/countries/${countryData}`),
+        history = await axios.get(`${apiBaseURL}/v2/historical/${summary.data.country}?lastdays=all`),
+        s = summary.data,
+        h = history.data;
+
+  if (util.isCommandline(userAgent)) { 
+      covid19GFX.historyCountryTracker(
+        req, res,
+        s.country, s.cases, s.todayCases, 
+        s.deaths, s.todayDeaths, s.recovered, 
+        s.active, s.critical, s.casesPerOneMillion,
+        s.updated, h, chartType, s.countryInfo
+      )
+    return null;
+  }
+  return next();
+});
+
 app.get('*', (req, res) => res.send(`
 Welcome to COVID-19 Tracker CLI v${pkg.version} by Waren Gonzaga\n
 Please visit: https://warengonza.ga/covid19-tracker-cli

lib/cli/chart.js bin/util/chart.jslib/cli/chart.js renamed to bin/util/chart.js

@@ -0,0 +1,53 @@
+const ansi = require("ansi-styles");
+
+const color = {
+  tblclr: (border) => ansi.cyan.open + border + ansi.cyan.close,
+  white: (txt) => ansi.white.open + txt + ansi.white.close,
+  black: (txt) => ansi.black.open + txt + ansi.black.close,
+  green: (txt) => ansi.green.open + txt + ansi.green.close,
+  cyan: (txt) => ansi.cyan.open + txt + ansi.cyan.close,
+  magenta: (txt) => ansi.magenta.open + txt + ansi.magenta.close,
+  yellow: (txt) => ansi.yellow.open + txt + ansi.yellow.close,
+  red: (txt) => ansi.red.open + txt + ansi.red.close,
+  cyanBright: (txt) => ansi.cyanBright.open + txt + ansi.cyanBright.close,
+  magentaBright: (txt) =>
+    ansi.magentaBright.open + txt + ansi.magentaBright.close,
+  redBright: (txt) => ansi.redBright.open + txt + ansi.redBright.close,
+  greenBright: (txt) => ansi.greenBright.open + txt + ansi.greenBright.close,
+  cyanBG: (txt) => ansi.bgCyan.open + txt + ansi.bgCyan.close,
+};
+exports.color = color;
+
+exports.txt = {
+  line: "-".repeat(60),
+  tab: "    ",
+  space: " ",
+  br: "\n",
+};
+
+exports.formatNumber = (value) =>
+  value.toString().replace(/(\d)(?=(\d{3})+(?!\d))/g, "$1,");
+exports.ucfirst = (string) => string.charAt(0).toUpperCase() + string.slice(1);
+
+exports.table = {
+  borders: {
+    top: color.tblclr("═"),
+    "top-mid": color.tblclr("╤"),
+    "top-left": color.tblclr("╔"),
+    "top-right": color.tblclr("╗"),
+    bottom: color.tblclr("═"),
+    "bottom-mid": color.tblclr("╧"),
+    "bottom-left": color.tblclr("╚"),
+    "bottom-right": color.tblclr("╝"),
+    left: color.tblclr("║"),
+    "left-mid": color.tblclr("╟"),
+    mid: color.tblclr("─"),
+    "mid-mid": color.tblclr("┼"),
+    right: color.tblclr("║"),
+    "right-mid": color.tblclr("╢"),
+    middle: color.tblclr("│"),
+  },
+  col5: (txt) => {
+    return { colSpan: 5, content: txt };
+  },
+};