From f53245ebc16de29bdbbb546fdba4899476606fac Mon Sep 17 00:00:00 2001
From: hasezoey <10911626+hasezoey@users.noreply.github.com>
Date: Wed, 20 Jun 2018 00:01:19 +0200
Subject: [PATCH] Small Changes - app.js prettifying - adding some JSDOC - fix
 <h4></h2> Error - a bit more pretty - package.json:     Adding Repo    
 Adding author     rename to the the repo name

---
 .gitignore              |   6 +--
 app.js                  | 111 +++++++++++++++++++++-------------------
 package.json            |  18 +++----
 templates/hardware.html |   2 +-
 templates/index.html    |   2 +-
 templates/post.html     |   2 +-
 6 files changed, 70 insertions(+), 71 deletions(-)

diff --git a/.gitignore b/.gitignore
index 4e9769e..afceb1f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,3 @@
-environment
-/node_modules
-
+environment/
+node_modules/
+.vs/
\ No newline at end of file
diff --git a/app.js b/app.js
index e5b1973..b70e679 100644
--- a/app.js
+++ b/app.js
@@ -1,52 +1,60 @@
-var data={
-		Title:"Tulsa Open Source",
-		Tagline:"",
-		mainStyle:"css/bootstrap.css"
-	}
+var data = {
+    Title: "Tulsa Open Source",
+    Tagline: "",
+    mainStyle: "css/bootstrap.css",
+    post: {},
+    posts: []
+}
 
-var express = require('express')
- , cons = require('consolidate')
- , mongodb = require('mongodb')
- , ObjectId = mongodb.ObjectID
- , app = express();
- 
-var DBSERVER = process.env.DBSERVER;
-var DBPASS = process.env.DBPASS;
-var DBUSER = process.env.DBUSER;
-var DBNAME = process.env.DBNAME;
-var DBPORT = process.env.DBPORT;
- 
-var dbserver = new mongodb.Server(DBSERVER,DBPORT, {});
-var db = new mongodb.Db(DBNAME, dbserver, {})
+const express = require('express'),
+    cons = require('consolidate'),
+    mongodb = require('mongodb'),
+    ObjectId = mongodb.ObjectID;
+
+var app = express();
+
+const config = {
+    dbServer: process.env.DBSERVER,
+    dbPort: process.env.DBPORT,
+    dbName: process.env.DBNAME,
+    dbUser: process.env.DBUSER,
+    dbPW: process.env.DBPASS,
+}
+
+var dbserver = new mongodb.Server(config.dbServer, config.dbPort, {});
+var db = new mongodb.Db(config.dbName, dbserver, {})
 
-db.open(function(err,res){
-  db.authenticate(DBUSER,DBPASS,function(err,res){
-          if(err){
-                  console.warn(err);
-          }else{
-                  console.log(res);
-          }
-  });
+db.open((err, res) => {
+    db.authenticate(DBUSER, DBPASS, (err, res) => {
+        if (err) {
+            console.warn(err);
+        } else console.log(res);
+    });
 }); 
 
-function stash(res,template,id){
-	if(id){
-		db.collection('posts').findOne({_id:new ObjectId(id)}, function(err,doc){
-			console.log(doc);
-			var toSend=data
-			toSend.post=doc;
-			res.render(template, toSend);
-		});
-	}else{
-		db.collection('posts').find({}).toArray(function(err, docs) {
-			docs.reverse()
-			var toSend=data
-			toSend.posts=docs
-			res.render('index', data);
-		});
-	}
+/**
+ * 
+ * @param {Response} res
+ * @param {string} template Path to Template File
+ * @param {number | string} id
+ */
+function stash(res, template, id) {
+    if (id) {
+        db.collection('posts').findOne({ _id: new ObjectId(id) }, (err, doc) => {
+            console.log(doc);
+            var toSend = Object.assign({}, data); //Copy
+            toSend.post = doc;
+            res.render(template, toSend);
+        });
+    } else {
+        db.collection('posts').find({}).toArray((err, docs) => {
+            docs.reverse();
+            var toSend = Object.assign({}, data); //Copy
+            toSend.posts = docs;
+            res.render('index', data);
+        });
+    }
 }
-		
  
 // assign the mustache engine to .html files
 app.engine('html', cons.mustache);
@@ -57,15 +65,10 @@ app.use(express.static(__dirname + '/public'));
 app.set('views', __dirname + '/templates');
  
 // test mustache
-app.get('/', function(req, res){
-  if(req.query.id){
-	  stash(res,'post.html',req.query.id)
-  }else{
-	stash(res,'index.html',null);
-  }
+app.get('/', (req, res) => {
+    if (req.query.id) {
+        stash(res, 'post.html', req.query.id);
+    } else stash(res, 'index.html', null);
 });
 
-
- 
-
-app.listen(process.env.PORT||3000);
+app.listen(process.env.PORT || 3000);
diff --git a/package.json b/package.json
index 0d8c2da..e86b4c3 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
-  "name": "projectmakeit",
-  "version": "0.0.0",
+  "name": "tulsa-opensource-blog",
+  "version": "0.1.0",
   "description": "Blog Engine used on ProjectMakeIt",
   "main": "app.js",
   "dependencies": {
@@ -9,15 +9,11 @@
     "mongodb": "~1.3.8",
     "mustache": "~0.7.2"
   },
-  "devDependencies": {},
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
+  "scripts": {},
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/TulsaOpenSourceHardware/tulsa-opensource-blog.git"
   },
-  "repository": "",
-  "engines": {
-    "node": "0.10.x",
-    "npm": "1.2.x"
-  },
-  "author": "",
+  "author": "Tulsa OpenSource Hardware Team",
   "license": "BSD"
 }
diff --git a/templates/hardware.html b/templates/hardware.html
index fe893e3..68c7c54 100644
--- a/templates/hardware.html
+++ b/templates/hardware.html
@@ -8,7 +8,7 @@
 	<body>
 		<div class="jumbotron">
 			<h1 class='title'>{{Title}}</h1>
-			<h4 class='title'>{{Tagline}}</h2>
+			<h4 class='title'>{{Tagline}}</h4>
 		</div>
 		<div class="container">
 		<div class="row">
diff --git a/templates/index.html b/templates/index.html
index 1f15c2a..564cf5b 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -8,7 +8,7 @@
 	<body>
 		<div class="jumbotron">
 			<h1 class='title'>{{Title}}</h1>
-			<h4 class='title'>{{Tagline}}</h2>
+			<h4 class='title'>{{Tagline}}</h4>
 		</div>
 		<div class="container">
 		<div class="row">
diff --git a/templates/post.html b/templates/post.html
index b7dc706..b934d86 100644
--- a/templates/post.html
+++ b/templates/post.html
@@ -8,7 +8,7 @@
 	<body>
 		<div class="jumbotron">
 			<h1 class='title'>{{Title}}</h1>
-			<h4 class='title'>{{Tagline}}</h2>
+			<h4 class='title'>{{Tagline}}</h4>
 		</div>
 		<div class="container">
 		<div class="row">