From c37a4d7ba845ae85998904e3b58c5881d04a6377 Mon Sep 17 00:00:00 2001
From: Sahat Yalkabov <sakhat@gmail.com>
Date: Tue, 26 Nov 2013 23:15:13 -0500
Subject: [PATCH] Code cleanup

---
 app.js             | 18 +++++++-----------
 controllers/api.js | 15 +--------------
 package.json       |  5 ++---
 3 files changed, 10 insertions(+), 28 deletions(-)

diff --git a/app.js b/app.js
index 0cab8e9f9c..ebae43ce0c 100755
--- a/app.js
+++ b/app.js
@@ -1,3 +1,4 @@
+// Load modules and libraries
 var express = require('express'),
     http = require('http'),
     path = require('path'),
@@ -6,28 +7,23 @@ var express = require('express'),
     mongoose = require('mongoose'),
     passport = require('passport');
 
-// TODO: Add node-opencv!!
-// TODO: "Lego-like" modules, e.g. swap one login view for another
-// TODO: Let users plug any components of the website
-// App Configuration (API Keys, Database URI)
-var config = require('./config/config.json');
-var passportConf = require('./config/passport');
-
-
 // Load controllers
 var home = require('./controllers/home'),
     user = require('./controllers/user'),
     api = require('./controllers/api'),
     contact = require('./controllers/contact');
 
+// App Configuration (API Keys, Database URI)
+var config = require('./config/config.json');
+var passportConf = require('./config/passport');
+
 // Connect to database
 var db = mongoose.connect(config.db);
 
-
-
 // Initialize express application
 var app = express();
 
+// Express Configuration
 app.set('port', process.env.PORT || 3000);
 app.set('views', __dirname + '/views');
 app.set('view engine', 'jade');
@@ -44,7 +40,7 @@ app.use(flash());
 app.use(express.static(path.join(__dirname, 'public')));
 app.use(app.router);
 
-
+// Express Routes
 app.get('/', home.index);
 app.get('/login', user.getLogin);
 app.post('/login', user.postLogin);
diff --git a/controllers/api.js b/controllers/api.js
index ca2c4b4315..1df7eb3e1e 100644
--- a/controllers/api.js
+++ b/controllers/api.js
@@ -5,7 +5,7 @@ var config = require('../config/config.json');
 var User = require('../models/User');
 
 // API PROVIDERS SETUP
-var Tumblr = require('tumblrwks');
+//var Tumblr = require('tumblrwks');
 var foursquare = require('node-foursquare')({
   secrets: {
     clientId: config.foursquare.clientId,
@@ -14,14 +14,6 @@ var foursquare = require('node-foursquare')({
   }
 });
 
-var tumblr = new Tumblr(
-  {
-    consumerKey: 'your consumer key'
-  }//, "arktest.tumblr.com"
-  // specify the blog url now or the time you want to use
-);
-
-
 
 exports.apiBrowser = function(req, res) {
   console.log(req.user);
@@ -56,10 +48,6 @@ exports.foursquare = function(req, res) {
 
 exports.tumblr = function(req, res) {
 
-  tumblr.get('/info', { hostname: 'sahat.tumblr.com' }, function(err, json){
-    console.log(json);
-  });
-
   res.render('api/tumblr', {
     title: 'Tumblr API',
     user: req.user
@@ -82,7 +70,6 @@ exports.foursquareAuth = function(req, res) {
  */
 exports.foursquareCallback = function(req, res) {
   foursquare.getAccessToken({ code: req.query.code }, function(err, accessToken) {
-    if (err) throw err;
     User.findByIdAndUpdate(req.user._id, { $set: { tokens: { foursquare: accessToken } } }, null, function(err, user) {
       if (err) throw err;
       res.redirect('/api/foursquare');
diff --git a/package.json b/package.json
index 7de4f04f46..feb7c53922 100755
--- a/package.json
+++ b/package.json
@@ -14,7 +14,6 @@
     "forever": "latest",
     "node-foursquare": "latest",
     "tumblrwks": "latest",
-    "geoip-lite": "latest",
-    "opencv": "latest"
+    "geoip-lite": "latest"
  }
-}
\ No newline at end of file
+}