Skip to content

Commit bb1788f

Browse files
committed
a bit more pretty
1 parent 24755b8 commit bb1788f

File tree

1 file changed

+9
-12
lines changed

1 file changed

+9
-12
lines changed

app.js

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,17 @@
11
var data = {
22
Title: "Tulsa Open Source",
33
Tagline: "",
4-
mainStyle: "css/bootstrap.css"
4+
mainStyle: "css/bootstrap.css",
5+
post: {},
6+
posts: []
57
}
68

7-
var express = require('express'),
9+
const express = require('express'),
810
cons = require('consolidate'),
911
mongodb = require('mongodb'),
10-
ObjectId = mongodb.ObjectID,
12+
ObjectId = mongodb.ObjectID;
1113

12-
app = express();
14+
var app = express();
1315

1416
const config = {
1517
dbServer: process.env.DBSERVER,
@@ -18,11 +20,6 @@ const config = {
1820
dbUser: process.env.DBUSER,
1921
dbPW: process.env.DBPASS,
2022
}
21-
//var DBSERVER = process.env.DBSERVER;
22-
//var DBPASS = process.env.DBPASS;
23-
//var DBUSER = process.env.DBUSER;
24-
//var DBNAME = process.env.DBNAME;
25-
//var DBPORT = process.env.DBPORT;
2623

2724
var dbserver = new mongodb.Server(config.dbServer, config.dbPort, {});
2825
var db = new mongodb.Db(config.dbName, dbserver, {})
@@ -45,14 +42,14 @@ function stash(res, template, id) {
4542
if (id) {
4643
db.collection('posts').findOne({ _id: new ObjectId(id) }, (err, doc) => {
4744
console.log(doc);
48-
var toSend = data;
45+
var toSend = Object.assign({}, data); //Copy
4946
toSend.post = doc;
5047
res.render(template, toSend);
5148
});
5249
} else {
5350
db.collection('posts').find({}).toArray((err, docs) => {
5451
docs.reverse();
55-
var toSend = data;
52+
var toSend = Object.assign({}, data); //Copy
5653
toSend.posts = docs;
5754
res.render('index', data);
5855
});
@@ -74,4 +71,4 @@ app.get('/', (req, res) => {
7471
} else stash(res, 'index.html', null);
7572
});
7673

77-
app.listen(process.env.PORT||3000);
74+
app.listen(process.env.PORT || 3000);

0 commit comments

Comments
 (0)