gaspersic/freeCodeCamp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Code cleanup

Browse Source
This commit is contained in:
Sahat Yalkabov
2013-11-26 23:15:13 -05:00
parent 86946bb385
commit c37a4d7ba8
3 changed files with 10 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
app.js
View File

@ -1,3 +1,4 @@
// Load modules and libraries
var express = require('express'), var express = require('express'),
http = require('http'), http = require('http'),
path = require('path'), path = require('path'),
@ -6,28 +7,23 @@ var express = require('express'),
mongoose = require('mongoose'), mongoose = require('mongoose'),
passport = require('passport'); 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 // Load controllers
var home = require('./controllers/home'), var home = require('./controllers/home'),
user = require('./controllers/user'), user = require('./controllers/user'),
api = require('./controllers/api'), api = require('./controllers/api'),
contact = require('./controllers/contact'); contact = require('./controllers/contact');
// App Configuration (API Keys, Database URI)
var config = require('./config/config.json');
var passportConf = require('./config/passport');
// Connect to database // Connect to database
var db = mongoose.connect(config.db); var db = mongoose.connect(config.db);
// Initialize express application // Initialize express application
var app = express(); var app = express();
// Express Configuration
app.set('port', process.env.PORT || 3000); app.set('port', process.env.PORT || 3000);
app.set('views', __dirname + '/views'); app.set('views', __dirname + '/views');
app.set('view engine', 'jade'); app.set('view engine', 'jade');
@ -44,7 +40,7 @@ app.use(flash());
app.use(express.static(path.join(__dirname, 'public'))); app.use(express.static(path.join(__dirname, 'public')));
app.use(app.router); app.use(app.router);
// Express Routes
app.get('/', home.index); app.get('/', home.index);
app.get('/login', user.getLogin); app.get('/login', user.getLogin);
app.post('/login', user.postLogin); app.post('/login', user.postLogin);

15
controllers/api.js
View File

@ -5,7 +5,7 @@ var config = require('../config/config.json');
var User = require('../models/User'); var User = require('../models/User');
// API PROVIDERS SETUP // API PROVIDERS SETUP
var Tumblr = require('tumblrwks'); //var Tumblr = require('tumblrwks');
var foursquare = require('node-foursquare')({ var foursquare = require('node-foursquare')({
secrets: { secrets: {
clientId: config.foursquare.clientId, 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) { exports.apiBrowser = function(req, res) {
console.log(req.user); console.log(req.user);
@ -56,10 +48,6 @@ exports.foursquare = function(req, res) {
exports.tumblr = 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', { res.render('api/tumblr', {
title: 'Tumblr API', title: 'Tumblr API',
user: req.user user: req.user
@ -82,7 +70,6 @@ exports.foursquareAuth = function(req, res) {
*/ */
exports.foursquareCallback = function(req, res) { exports.foursquareCallback = function(req, res) {
foursquare.getAccessToken({ code: req.query.code }, function(err, accessToken) { 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) { User.findByIdAndUpdate(req.user._id, { $set: { tokens: { foursquare: accessToken } } }, null, function(err, user) {
if (err) throw err; if (err) throw err;
res.redirect('/api/foursquare'); res.redirect('/api/foursquare');

3
package.json
View File

@ -14,7 +14,6 @@
"forever": "latest", "forever": "latest",
"node-foursquare": "latest", "node-foursquare": "latest",
"tumblrwks": "latest", "tumblrwks": "latest",
"geoip-lite": "latest", "geoip-lite": "latest"
"opencv": "latest"
} }
} }