many small bug-fixes

app.js

@@ -1,22 +1,14 @@
 var express = require('express');
 var app = express(); 
-var port = process.env.PORT || 3000; 
+var port = require('./config/config.js').port; 
 
 var passport = require('passport');
 var flash    = require('connect-flash');
 require('./config/passport')(passport); // pass passport for configuration
 
-
 require('./config/database.js').safeConnect(); 
-
-var db = require('./lib/db');
 var helperLib = require('./lib/helperLib.js');
 
-// var routes = require('./routes/routes.js'); 
-var http = require('http');
-var path = require('path');
-
-
 
 // all environments
 app.set('port', port);
@@ -32,7 +24,6 @@ app.use(express.favicon());
 app.use(express.json());
 app.use(express.urlencoded());
 app.use(express.methodOverride());
-app.use(app.router);
 
 app.use(express.cookieParser()); //(I've also installed cookie module)
 app.use(express.bodyParser()); //not sure...
@@ -42,6 +33,8 @@ app.use(express.session({secret: 'secretpasswordforsessions', store: helperLib.g
 app.use(passport.initialize()); 
 app.use(passport.session()); 
 app.use(flash()); 
+app.use(app.router);
+
 
 app.set('view options', {
   layout: false
@@ -49,11 +42,14 @@ app.set('view options', {
 
 
 
-
-
+var http = require('http');
+var path = require('path');
 var server = http.Server(app);
 helperLib.createSocket(server); 
 server.listen(port);
+require('./lib/routes.js')(app, passport); 
+
+
 
 
 

config/auth.js

@@ -1,8 +1,9 @@
+var port = require('./config.js').port; 
 module.exports = {
 	'googleAuth' : {
-		'clientID' 		: 'your-secret-clientID-here',
-		'clientSecret' 	: 'your-client-secret-here',
-		'callbackURL' 	: 'http://localhost:3000/auth/google/callback'
+		'clientID' 		: 'yours-here',
+		'clientSecret' 	: 'yours-here',
+		'callbackURL' 	: 'http://localhost:' + port +  '/auth/google/callback'
 	}
 };
 

config/config.js

@@ -0,0 +1,4 @@
+var config = {}
+config.port = process.env.PORT || 3000; 
+
+module.exports = config; 

lib/helperLib.js

@@ -1,6 +1,5 @@
 var //cookie = require('cookie'), 
    crypto = require('crypto')
-  , db = require('./db')
   //, exchange = require('./exchange')
   , express = require('express')
   , http = require('http')
@@ -8,7 +7,8 @@ var //cookie = require('cookie'),
   , ObjectID = require('mongodb').ObjectID, 
   cookie = require('cookie');
   
-var User = require('../models/User.js');
+var mongoose = require('mongoose'); 
+var User = mongoose.model('User'); 
 var Node = require('../models/Node.js');
 var sessionStore = new MemoryStore();
 var io;

lib/routes.js

@@ -16,7 +16,7 @@ module.exports = function(app, passport) {
     // the callback after google has authenticated the user
     app.get('/auth/google/callback',
             passport.authenticate('google', {
-                    successRedirect : '/profile',
+                    successRedirect : '/',
                     failureRedirect : '/'
             }));
 };

models/Node.js

@@ -1,13 +1,13 @@
-var db = require('../lib/db');
+var mongoose = require('mongoose'); 
 
-var NodeSchema = new db.Schema({
+var NodeSchema = new mongoose.Schema({
     text: {type: String}, 
     children: {type: Array}, 
     parents: {type: Array}, 
     markdown: {type: Boolean}
 })
 
-var SnapSchema = new db.Schema({
+var SnapSchema = new mongoose.Schema({
     text: {type: String}, 
     children: {type: Array}, 
     parents: {type: Array}, 
@@ -19,8 +19,8 @@ var SnapSchema = new db.Schema({
 
 var rootID;
 
-var MySnap = db.mongoose.model('snaps', SnapSchema);
-var MyNode = db.mongoose.model('nodes', NodeSchema);
+var MySnap = mongoose.model('snaps', SnapSchema);
+var MyNode = mongoose.model('nodes', NodeSchema);
 
 // Exports
 module.exports.addNode = addNode;

package.json

@@ -8,7 +8,7 @@
   "dependencies": {
     "express": "3.1.0",
     "jade": "0.26.1",
-    "mongoose": "2.6.5",
+    "mongoose": "~3.8.1",
     "ejs": "0.8.3",
     "mongodb": "^1.1.7",
     "socket.io": "0.9.13",

views/index.ejs

@@ -80,6 +80,7 @@
               <li><a href="">Another action</a></li>
               <li class="divider"></li>
               <li><a href="">Separated link</a></li>
+              <li><a href="/auth/google">Sign In with Google</a></li>
             </ul>
           </li>
         </ul>