Merge branch 'master' of https://github.com/FreeCodeCamp/freecodecamp

config/passport.js

@@ -67,7 +67,7 @@ passport.use(new FacebookStrategy(secrets.facebook, function(req, accessToken, r
           user.tokens.push({ kind: 'facebook', accessToken: accessToken });
           user.profile.name = user.profile.name || profile.displayName;
           user.profile.gender = user.profile.gender || profile._json.gender;
-          user.profile.picture = user.profile.picture || 'https://graph.facebook.com/' + profile.id + '/picture?type=large';
+          user.profile.picture = user.profile.picture || 'https://s3.amazonaws.com/freecodecamp/favicons/apple-touch-icon-180x180.png';
           user.save(function(err) {
             req.flash('info', { msg: 'Facebook account has been linked.' });
             done(err, user);

controllers/resources.js

@@ -38,7 +38,6 @@ module.exports = {
                 debug('User err: ', err);
                 next(err);
             }
-            console.log('user count', users.length);
             Challenge.find({}, function (err, challenges) {
                 if (err) {
                     debug('User err: ', err);

controllers/user.js

@@ -106,7 +106,8 @@ exports.postEmailSignup = function(req, res, next) {
     email: req.body.email.trim(),
     password: req.body.password,
     profile : {
-      username: req.body.username.trim()
+      username: req.body.username.trim(),
+        picture: 'https://s3.amazonaws.com/freecodecamp/favicons/apple-touch-icon-180x180.png'
     }
   });
 

models/Story.js

@@ -41,11 +41,6 @@ var storySchema = new mongoose.Schema({
     }
 });
 
-storySchema.pre('save', function(next) {
-    console.log('pre save test');
-    next();
-});
-
 module.exports = mongoose.model('Story', storySchema);
 
 /*

public/js/main.js

@@ -143,8 +143,6 @@ $(document).ready(function() {
                 .done(function (data, textStatus, xhr) {
                     $('#storyRank').text(data.rank);
                 });
-        } else {
-            console.log('Can\'t upvote because you\'ve already upvoted');
         }
     };
     $('#upvote').on('click', upvoteHandler);
@@ -154,7 +152,6 @@ $(document).ready(function() {
         var link = $('#story-url').val();
         var headline = $('#story-title').val();
         var description = $('#description-box').val();
-        console.log(link, headline, description);
         var userDataForUpvote = {
             upVotedBy: user._id,
             upVotedByUsername: user.profile.username
@@ -193,7 +190,6 @@ $(document).ready(function() {
     var commentSubmitButtonHandler = function commentSubmitButtonHandler() {
         $('comment-button').unbind('click');
         var data = $('#comment-box').val();
-        console.log('comment clicked');
 
         $('#comment-button').attr('disabled', 'disabled');
         $.post('/stories/comment/',

seed_data/seed.js

@@ -1,8 +1,6 @@
 require('dotenv').load();
 var Challenge = require('../models/Challenge.js'),
     Bonfire = require('../models/Bonfire.js'),
-    Comment = require('../models/Comment.js'),
-    Story = require('../models/Story.js'),
     Courseware = require('../models/Courseware.js'),
     mongoose = require('mongoose'),
     secrets = require('../config/secrets'),
@@ -15,7 +13,7 @@ var Challenge = require('../models/Challenge.js'),
 mongoose.connect(secrets.db);
 
 var counter = 0;
-var offerings = 5;
+var offerings = 3;
 
 var CompletionMonitor = function() {
     counter++;
@@ -78,37 +76,3 @@ Courseware.remove({}, function(err, data) {
     });
     console.log('coursewares');
 });
-
-Story.remove({}, function(err, data) {
-    if (err) {
-        console.error(err);
-    } else {
-        console.log('Deleted ', data);
-    }
-    Story.create(stories, function(err, data) {
-        if (err) {
-            console.log(err);
-        } else {
-            console.log('Saved ', data);
-        }
-        CompletionMonitor();
-    });
-    console.log('stories');
-});
-
-Comment.remove({}, function(err, data) {
-    if (err) {
-        console.error(err);
-    } else {
-        console.log('Deleted ', data);
-    }
-    Comment.create(comments, function(err, data) {
-        if (err) {
-            console.log(err);
-        } else {
-            console.log('Saved ', data);
-        }
-        CompletionMonitor();
-    });
-    console.log('stories');
-});

views/stories/comments.jade

@@ -14,7 +14,6 @@
                         type: 'GET',
                         url: '/stories/comments/' + comment,
                         error: function (xhr, textStatus, errorThrown) {
-                            console.log('got error');
                             commentDetails = {
                                 error: true,
                                 body: 'There seems to be a problem fetching this comment.'
@@ -22,7 +21,6 @@
                         },
                         success: function (data, textStatus, xhr) {
                             commentDetails = data;
-                            console.log(commentDetails.commentOn);
                             var div = document.createElement('div');
                             $(div)
                                     .html(

views/stories/preliminary-submit.jade

@@ -15,14 +15,12 @@
     script.
             $('#story-url').on('keypress', function(e) {
                 if (e.which === 13 || e === 13) {
-                    console.log('enter pressed');
                     $('#preliminary-story-submit').click();
                 }
             });
             var preliminaryStorySubmit = function preliminaryStorySubmit() {
 
                 var storyURL = $('#story-url').val();
-                console.log(storyURL);
                 $('#preliminary-story-submit').attr('disabled', 'disabled');
 
                 $.post('/stories/preliminary',

views/stories/search-stories.jade

@@ -21,7 +21,6 @@ script.
     });
     function executeSearch() {
         $('#stories').empty();
-        console.log('clicked or enter button');
         var searchTerm = $('#searchArea').val();
         var getLinkedName = function getLinkedName(name) {
             return name.toLowerCase().replace(/\s/g, '-');
@@ -33,7 +32,6 @@ script.
                         }
                 })
                 .fail(function (xhr, textStatus, errorThrown) {
-                    console.log('failure');
                 })
                 .done(function (data, textStatus, xhr) {
                     for (var i = 0; i < data.length; i++) {