Merge pull request #51 from coderbunker/markdown

Add Markdown support for spreadsheet item objects.

Author: Doug Wright

app.js

@@ -2,7 +2,12 @@ const express = require('express');
 
 const qr = require('qr-image');
 
-const { loadDatabase, searchDatabase } = require('./googleSpreadsheet');
+const {
+  loadDatabase,
+  searchDatabase,
+  addMarkdown,
+  addSimilarItems,
+} = require('./googleSpreadsheet');
 
 const app = express();
 
@@ -56,20 +61,19 @@ app.get('/recent', (req, res) => {
 
 app.get('/:uuid', (req, res) => {
   loadDatabase((allItems) => {
-    const matches = searchDatabase(req.params, allItems);
-    if (matches.length === 0) {
+    const match = searchDatabase(req.params, allItems)[0];
+    if (match.length === 0) {
       logScanned(req.params.uuid);
       res.status(404).render('notFound', {
         item: '',
         id: req.params.uuid,
       });
       return;
     }
-    logScanned(req.params.uuid, matches[0].fixture);
-    matches[0].similarItems = searchDatabase({ fixture: matches[0].fixture }, allItems)
-      .filter(item => item.uuid !== matches[0].uuid)
-      .splice(0, 3);
-    res.render('item', matches[0]);
+    addMarkdown(match);
+    addSimilarItems(match, allItems);
+    logScanned(req.params.uuid, match.fixture);
+    res.render('item', match);
   });
 });
 

googleSpreadsheet.js

@@ -1,5 +1,6 @@
 const google = require('googleapis');
 const keys = require('./config/keys');
+const marked = require('marked');
 
 function rowToObject(val, lab) {
   const o = {};
@@ -33,7 +34,23 @@ function searchDatabase(query, rows) {
   return matches;
 }
 
+function addSimilarItems(obj, allObj) {
+  obj.similarItems = searchDatabase({ fixture: obj.fixture }, allObj)
+    .filter(item => item.uuid !== obj.uuid)
+    .splice(0, 3);
+  return obj;
+}
+
+function addMarkdown(obj) {
+  obj.HOWTO = marked(obj.HOWTO);
+  obj.details = marked(obj.details);
+  obj.Troubleshooting = marked(obj.Troubleshooting);
+  return obj;
+}
+
 module.exports = {
   loadDatabase,
   searchDatabase,
+  addMarkdown,
+  addSimilarItems,
 };

package-lock.json

@@ -21,6 +21,7 @@
     "express-session": "^1.15.5",
     "googleapis": "^21.3.0",
     "jquery": "^3.2.1",
+    "marked": "^0.3.7",
     "qr-image": "^3.2.0",
     "url-regex": "^4.1.1",
     "uuid-regexp": "^0.3.0"

package.json

@@ -4,7 +4,7 @@
 <article style='margin-top:2em'class="col-xs-12 col-lg-4 col-lg-offset-4">
   <p>Sorry, item not found with the id:</p>
   <p>
-    <strong><%= id %></strong>
+    <strong><%- id %></strong>
   </p>
 </article>