From 4a36e58756dc63e1bfe4fa4250c88f8e3ddc1413 Mon Sep 17 00:00:00 2001 From: Michael Q Larson Date: Wed, 15 Oct 2014 15:57:51 -0700 Subject: [PATCH] allow access to both production and development databases --- .env | 1 + .gitignore | 1 + app.js | 5 +++++ controllers/curriculum.js | 1 + package.json | 1 + views/curriculum/curriculum.jade | 1 + 6 files changed, 10 insertions(+) create mode 100644 .env diff --git a/.env b/.env new file mode 100644 index 0000000000..cff2fb72e7 --- /dev/null +++ b/.env @@ -0,0 +1 @@ +MONGODB='mongodb://localhost:27017/test' \ No newline at end of file diff --git a/.gitignore b/.gitignore index d7a24f21fc..9eb78ce978 100644 --- a/.gitignore +++ b/.gitignore @@ -8,6 +8,7 @@ lib-cov *.gz *.swp +.env pids logs results diff --git a/app.js b/app.js index 1ef1428a4c..8d707c55e0 100644 --- a/app.js +++ b/app.js @@ -3,6 +3,8 @@ */ var express = require('express'); +var dotenv = require('dotenv'); +dotenv.load(); var cookieParser = require('cookie-parser'); var compress = require('compression'); var session = require('express-session'); @@ -31,6 +33,7 @@ var userController = require('./controllers/user'); var apiController = require('./controllers/api'); var contactController = require('./controllers/contact'); + /** * API keys and Passport configuration. */ @@ -51,8 +54,10 @@ var server = http.createServer(app); server.listen(2999, function() { console.log('server started on %d', 2999); +// console.log(process.env) }); + var io = socket.listen(server); //console.log('Express server started on port %s', server.address().port); diff --git a/controllers/curriculum.js b/controllers/curriculum.js index 4955e5f06e..2d7e7de9a3 100644 --- a/controllers/curriculum.js +++ b/controllers/curriculum.js @@ -6,5 +6,6 @@ exports.index = function(req, res) { res.render('curriculum/curriculum', { title: 'Curriculum', + course: Users.first.name }); }; \ No newline at end of file diff --git a/package.json b/package.json index 566d3c59e3..be4ed2218f 100644 --- a/package.json +++ b/package.json @@ -20,6 +20,7 @@ "connect-mongo": "^0.4.1", "cookie-parser": "^1.3.3", "csso": "^1.3.11", + "dotenv": "^0.4.0", "errorhandler": "^1.2.0", "express": "^4.9.5", "express-flash": "^0.0.2", diff --git a/views/curriculum/curriculum.jade b/views/curriculum/curriculum.jade index 32c8bbd394..8b7b1f7d1c 100644 --- a/views/curriculum/curriculum.jade +++ b/views/curriculum/curriculum.jade @@ -12,6 +12,7 @@ block content div.form h3.title What's your nickname? input.usernameInput(type='text', maxlength='14') + h1= title // .row