removed all emojis, added country search by name, iso code

Author: sagarkarira

.gitignore

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

app.js

@@ -1,5 +1,6 @@
 const express = require('express');
 const app = express();
+const lookup = require('country-code-lookup');
 
 const port = process.env.PORT || 3001;
 
@@ -22,6 +23,7 @@ app.get('/', (req, res) => {
 
 app.get('/:country', (req, res) => {
   const { country } = req.params;
+  let lookupObj = null;
   const format = req.query.format ? req.query.format : '';
 
   if (!country || country === 'all') {
@@ -36,13 +38,32 @@ app.get('/:country', (req, res) => {
     }).catch(error => res.send(error));
   }
 
+  try {
+    lookupObj = lookup.byIso(country)
+      || lookup.byFips(country)
+      || lookup.byCountry(country);
+  } catch (error) {
+    lookupObj = lookup.byFips(country) || lookup.byCountry(country);
+  }
+  if (!lookupObj) {
+    return res.send(`
+    Country not found.
+    Try full country name or country code.
+    Ex:
+      - /UK: for United Kingdom
+      - /US: for United States of America.
+      - /India: for India.
+    `);
+  }
+  const { iso2 } = lookupObj;
+
   if (format.toLowerCase() === 'json') {
-    return getJSONDataForCountry(country).then(result => {
+    return getJSONDataForCountry(iso2).then(result => {
       return res.json(result);
     }).catch(error => res.send(error));
   }
-  
-  return getCountryTable(country).then(result => {
+
+  return getCountryTable(iso2).then(result => {
     return res.send(result);
   }).catch(error => res.send(error));
 });

lib/byCountry.js

@@ -66,26 +66,26 @@ exports.getJSONData = async () => {
   return result.data;
 }
 
-exports.getJSONDataForCountry = async (country) => {
+exports.getJSONDataForCountry = async (countryCode) => {
   const result = await axios('https://coronavirus-tracker-api.herokuapp.com/all');
   const { latest, confirmed, deaths, recovered } = result.data;
-  const countryData = getDataByState(confirmed, deaths, recovered, country)
-    .filter(obj => obj.country === country);
+  const countryData = getDataByState(confirmed, deaths, recovered, countryCode)
+    .filter(obj => obj.countryCode === countryCode);
   return countryData;
 }
 
-exports.getCountryTable = async (country) => {
+exports.getCountryTable = async (countryCode) => {
   const head = [
     '',
     'State',
-    'Confirmed ✅',
-    'Recovered 😃',
-    'Deaths 😞',
-    'Active 😷',
+    'Confirmed',
+    'Recovered',
+    'Deaths',
+    'Active',
     'Mortality %',
     'Recovered %',
-    '1 Day 🔺',
-    '1 Week 🔺',
+    '1 Day ▲',
+    '1 Week ▲',
     // 'RoG',
     // '🏳',
   ];
@@ -98,11 +98,11 @@ exports.getCountryTable = async (country) => {
   });
   const result = await axios('https://coronavirus-tracker-api.herokuapp.com/all');
   const { latest, confirmed, deaths, recovered } = result.data;
-  const countryData = getDataByState(confirmed, deaths, recovered, country)
-    .filter(obj => obj.country === country);
+  const countryData = getDataByState(confirmed, deaths, recovered, countryCode)
+    .filter(obj => obj.countryCode === countryCode);
   const totalStats = getTotalStats(countryData);
   table.push({
-    [country]: [
+    [countryData[0].country]: [
       'Total',
       getConfirmed(totalStats.confirmed),
       getRecovered(totalStats.recovered),

lib/corona.js

@@ -82,14 +82,14 @@ exports.getCompleteTable = async () => {
   const head = [
     '',
     'Country',
-    'Confirmed ✅',
-    'Recovered 😃',
-    'Deaths 😞',
-    'Active 😷',
+    'Confirmed',
+    'Recovered',
+    'Deaths',
+    'Active',
     'Mortality %',
     'Recovered %',
-    '1 Day 🔺',
-    '1 Week 🔺',
+    '1 Day ▲',
+    '1 Week ▲',
     // 'RoG',
     // '🏳',
   ];
@@ -123,7 +123,7 @@ exports.getCompleteTable = async () => {
   countryData.forEach(cd => {
     const countryEmoji = getEmoji(cd.countryCode);
     const values = [
-      getCountry(cd.country),
+      getCountry(`${cd.country} (${cd.countryCode})`),
       getConfirmed(cd.confirmed),
       getRecovered(cd.recovered),
       getDeaths(cd.deaths),

lib/helpers.js

@@ -104,7 +104,7 @@ e.getOneDayChange = ({ confirmedByDay }) => {
   const present = confirmedByDay.length - 1;
   const dailyChange = confirmedByDay[present] - confirmedByDay[present - 1];
   return {
-    content: `${h(dailyChange)}🔺`,
+    content: `${h(dailyChange)} ▲`,
     hAlign: 'right',
   };
 };
@@ -113,7 +113,7 @@ e.getOneWeekChange = ({ confirmedByDay }) => {
   const present = confirmedByDay.length - 1;
   const weeklyChange = confirmedByDay[present] - confirmedByDay[present - 7];
   return {
-    content: `${h(weeklyChange)}🔺`,
+    content: `${h(weeklyChange)} ▲`,
     hAlign: 'right',
   };
 };

package-lock.json

@@ -21,6 +21,7 @@
     "axios": "^0.19.2",
     "chalk": "^3.0.0",
     "cli-table3": "^0.5.1",
+    "country-code-lookup": "0.0.16",
     "emoji-flags": "^1.2.0",
     "express": "^4.17.1",
     "humanize-number": "0.0.2",