Render monospaced table in HTML when not curl request

archcorsair · archcorsair · commit 7a77b4ab8c73 · 2020-03-19T02:24:06.000-07:00
diff --git a/app.js b/app.js
@@ -18,6 +18,7 @@ function errorHandler(error, res) {
 app.use(morgan(':remote-addr :remote-user :method :url :status :res[content-length] - :response-time ms'));
 
 app.get('/', (req, res) => {
+  const isCurl = req.headers['user-agent'].match(/\bcurl\b/gmi) !== null
   const format = req.query.format ? req.query.format : '';
 
   if (format.toLowerCase() === 'json') {
@@ -27,7 +28,7 @@ app.get('/', (req, res) => {
     }).catch(error => errorHandler(error, res));
   }
 
-  return getCompleteTable().then(result => {
+  return getCompleteTable({isCurl}).then(result => {
     res.setHeader('Cache-Control', 's-maxage=900');
     return res.send(result);
   }).catch(error => errorHandler(error, res));
diff --git a/bin/index.js b/bin/index.js
@@ -50,7 +50,7 @@ const { argv } = yargs
 const { emojis, country } = argv;
 (
   country === 'ALL'
-    ? getCompleteTable(emojis)
+    ? getCompleteTable({emojis})
     : getCountryTable(country, emojis)
 )
   .then(console.log)
diff --git a/lib/api.js b/lib/api.js
@@ -1,4 +1,4 @@
-const NodeCache = require( "node-cache" );
+const NodeCache = require('node-cache');
 const axios = require('axios');
 const myCache = new NodeCache( { stdTTL: 100, checkperiod: 600 } );
 const CORONA_ALL_KEY = 'coronaAll';
diff --git a/lib/corona.js b/lib/corona.js
@@ -79,7 +79,7 @@ function extraStats(dataArr) {
   );
 }
 
-exports.getCompleteTable = async (emojis = false) => {
+exports.getCompleteTable = async ({isCurl, emojis = false}) => {
   const head = [
     '',
     'Country',
@@ -139,5 +139,26 @@ exports.getCompleteTable = async (emojis = false) => {
     table.push({ [rank++]: values })
   });
   const lastUpdated = countryData[0].lastUpdated;
+  if (!isCurl) {
+    const template = `<!DOCTYPE html>
+    <html lang="en">
+    <head>
+      <meta charset="UTF-8">
+      <meta name="viewport" content="width=device-width, initial-scale=1.0">
+      <link href="https://fonts.googleapis.com/css?family=Roboto+Mono&display=swap" rel="stylesheet">
+      <title>Coronavirus Tracker</title>
+      <style>
+        pre {
+          font-family: 'Roboto Mono', monospace;
+          white-space: pre;
+        }
+      </style>
+    </head>
+      <body>
+        <pre>${table.toString() + footer(lastUpdated)}</pre>
+      </body>
+    </html>`
+    return template;
+  }
   return table.toString() + footer(lastUpdated);
-}
+}
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -7,7 +7,7 @@
     "corona": "./bin/index.js"
   },
   "scripts": {
-    "dev": "nodemon app.js",
+    "dev": "nodemon --inspect app.js",
     "start": "node app.js",
     "test": "echo \"Error: no test specified\" && exit 1"
   },

Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ const { argv } = yargs`
`50`	`50`	`const { emojis, country } = argv;`
`51`	`51`	`(`
`52`	`52`	`country === 'ALL'`
`53`		`- ? getCompleteTable(emojis)`
	`53`	`+ ? getCompleteTable({emojis})`
`54`	`54`	`: getCountryTable(country, emojis)`
`55`	`55`	`)`
`56`	`56`	`.then(console.log)`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-const NodeCache = require( "node-cache" );`
	`1`	`+const NodeCache = require('node-cache');`
`2`	`2`	`const axios = require('axios');`
`3`	`3`	`const myCache = new NodeCache( { stdTTL: 100, checkperiod: 600 } );`
`4`	`4`	`const CORONA_ALL_KEY = 'coronaAll';`