From cfd376c538211cc1c0c4e9d7101ed067d744dc8d Mon Sep 17 00:00:00 2001
From: Sahat Yalkabov <sakhat@gmail.com>
Date: Tue, 19 Nov 2013 14:33:11 -0500
Subject: [PATCH] added routes and controllers (not yet implemented) for
 contact and api sample browser pages

---
 app.js                 | 13 +++++++++++--
 config/passport.js     |  2 ++
 controllers/api.js     |  3 +++
 controllers/contact.js |  7 +++++++
 4 files changed, 23 insertions(+), 2 deletions(-)
 create mode 100644 controllers/api.js
 create mode 100644 controllers/contact.js

diff --git a/app.js b/app.js
index 83a3fdcf23..24b9ea6384 100755
--- a/app.js
+++ b/app.js
@@ -12,7 +12,9 @@ var passportConf = require('./config/passport');
 
 // Load controllers
 var home = require('./controllers/home'),
-    user = require('./controllers/user');
+    user = require('./controllers/user'),
+    api = require('./controllers/api'),
+    contact = require('./controllers/contact');
 
 // Connect to database
 var db = mongoose.connect(config.db);
@@ -29,7 +31,7 @@ app.use(express.favicon());
 app.use(express.cookieParser());
 app.use(express.bodyParser());
 app.use(express.methodOverride());
-app.use(express.session({ secret: 'Bob-Alice' }));
+app.use(express.session({ secret: 'Bob-vs-Alice' }));
 app.use(passport.initialize());
 app.use(passport.session());
 app.use(flash());
@@ -52,6 +54,13 @@ app.get('/account', passportConf.ensureAuthenticated, user.account);
 app.get('/admin', passportConf.ensureAuthenticated, passportConf.ensureAdmin(), user.admin);
 app.get('/partials/:name', home.partials);
 
+app.get('/api', api.apiBrowser);
+
+app.get('/contact', contact.getContact);
+app.post('/contact', contact.postContact);
+
+
+
 // Redirect the user to Facebook for authentication.  When complete,
 // Facebook will redirect the user back to the application at
 app.get('/auth/facebook', passport.authenticate('facebook'));
diff --git a/config/passport.js b/config/passport.js
index fde4d2a9c2..76123a3150 100755
--- a/config/passport.js
+++ b/config/passport.js
@@ -4,6 +4,8 @@ var passport = require('passport'),
     User = require('../models/User'),
     config = require('./config.json');
 
+// TODO: Request email permission from Oauth
+// TODO: if email matches, users are the same, merge accounts
 
 passport.serializeUser(function(user, done) {
   done(null, user.id);
diff --git a/controllers/api.js b/controllers/api.js
new file mode 100644
index 0000000000..3418faf16b
--- /dev/null
+++ b/controllers/api.js
@@ -0,0 +1,3 @@
+exports.apiBrowser = function(req, res) {
+
+};
\ No newline at end of file
diff --git a/controllers/contact.js b/controllers/contact.js
new file mode 100644
index 0000000000..b910bcbeaa
--- /dev/null
+++ b/controllers/contact.js
@@ -0,0 +1,7 @@
+exports.getContact = function(req, res) {
+
+};
+
+exports.postContact = function(req, res) {
+
+};
\ No newline at end of file