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

add @rybar's new placeholder camper image and fix the broken logic that was supposed to update it for existing users

Browse Source
This commit is contained in:
Michael Q Larson
2015-03-11 23:58:16 -07:00
parent 3004c64ee7
commit 8e8711d947
4 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config/passport.js
View File

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

7
controllers/resources.js
View File

@ -171,14 +171,11 @@ module.exports = {
about: function(req, res) { about: function(req, res) {
if (req.user) { if (req.user) {
if (!req.user.picture) { if (!req.user.profile.picture || req.user.profile.picture === "https://s3.amazonaws.com/freecodecamp/favicons/apple-touch-icon-180x180.png") {
req.user.profile.picture = "https://s3.amazonaws.com/freecodecamp/camper-image-placeholder.png";
req.user.picture = "https://s3.amazonaws.com/freecodecamp/favicons/apple-touch-icon-180x180.png";
req.user.save(); req.user.save();
} }
} }
var date1 = new Date("10/15/2014"); var date1 = new Date("10/15/2014");
var date2 = new Date(); var date2 = new Date();
var timeDiff = Math.abs(date2.getTime() - date1.getTime()); var timeDiff = Math.abs(date2.getTime() - date1.getTime());

4
controllers/user.js
View File

@ -123,7 +123,7 @@ exports.postEmailSignup = function(req, res, next) {
password: req.body.password, password: req.body.password,
profile : { profile : {
username: req.body.username.trim(), username: req.body.username.trim(),
picture: 'https://s3.amazonaws.com/freecodecamp/favicons/apple-touch-icon-180x180.png' picture: 'https://s3.amazonaws.com/freecodecamp/camper-image-placeholder.png'
} }
}); });
@ -362,7 +362,7 @@ exports.postUpdateProfile = function(req, res, next) {
user.profile.codepenProfile = req.body.codepenProfile.trim() || ''; user.profile.codepenProfile = req.body.codepenProfile.trim() || '';
user.profile.twitterHandle = req.body.twitterHandle.trim() || ''; user.profile.twitterHandle = req.body.twitterHandle.trim() || '';
user.profile.bio = req.body.bio.trim() || ''; user.profile.bio = req.body.bio.trim() || '';
user.profile.picture = req.body.picture.trim() || 'https://s3.amazonaws.com/freecodecamp/favicons/apple-touch-icon-180x180.png'; user.profile.picture = req.body.picture.trim() || 'https://s3.amazonaws.com/freecodecamp/camper-image-placeholder.png';
user.portfolio.website1Title = req.body.website1Title.trim() || ''; user.portfolio.website1Title = req.body.website1Title.trim() || '';
user.portfolio.website1Link = req.body.website1Link.trim() || ''; user.portfolio.website1Link = req.body.website1Link.trim() || '';
user.portfolio.website1Image = req.body.website1Image.trim() || ''; user.portfolio.website1Image = req.body.website1Image.trim() || '';

2
views/account/show.jade
View File

@ -16,7 +16,7 @@ block content
if picture if picture
img.img-center.img-responsive.public-profile-img(src=picture) img.img-center.img-responsive.public-profile-img(src=picture)
else else
img.img-center.img-responsive.public-profile-img(src='https://s3.amazonaws.com/freecodecamp/favicons/apple-touch-icon-180x180.png') img.img-center.img-responsive.public-profile-img(src='https://s3.amazonaws.com/freecodecamp/camper-image-placeholder.png')
h1.text-center.negative-5 h1.text-center.negative-5
- if (twitterHandle) - if (twitterHandle)
a.ion-social-twitter.text-primary(title="@#{username}'s Twitter Profile", href="http://twitter.com/#{twitterHandle}", target='_blank') a.ion-social-twitter.text-primary(title="@#{username}'s Twitter Profile", href="http://twitter.com/#{twitterHandle}", target='_blank')