give users without images a default image and retroactively give that to all their stories and comments and also make some UI changes to stories.

This commit is contained in:
Michael Q Larson
2015-03-08 15:39:36 -07:00
parent 4529558ce4
commit 8d2552fe57
5 changed files with 27 additions and 16 deletions

View File

@@ -130,9 +130,7 @@ module.exports = {
var githubHeaders = {headers: {'User-Agent': 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_8_2) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/29.0.1521.3 Safari/537.36'}, port:80 }; var githubHeaders = {headers: {'User-Agent': 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_8_2) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/29.0.1521.3 Safari/537.36'}, port:80 };
request('https://api.github.com/repos/freecodecamp/freecodecamp/pulls?client_id=' + secrets.github.clientID + '&client_secret=' + secrets.github.clientSecret, githubHeaders, function(err, status1, pulls) { request('https://api.github.com/repos/freecodecamp/freecodecamp/pulls?client_id=' + secrets.github.clientID + '&client_secret=' + secrets.github.clientSecret, githubHeaders, function(err, status1, pulls) {
pulls = pulls ? Object.keys(JSON.parse(pulls)).length : "Can't connect to github"; pulls = pulls ? Object.keys(JSON.parse(pulls)).length : "Can't connect to github";
debug('pulls', pulls);
request('https://api.github.com/repos/freecodecamp/freecodecamp/issues?client_id=' + secrets.github.clientID + '&client_secret=' + secrets.github.clientSecret, githubHeaders, function (err, status2, issues) { request('https://api.github.com/repos/freecodecamp/freecodecamp/issues?client_id=' + secrets.github.clientID + '&client_secret=' + secrets.github.clientSecret, githubHeaders, function (err, status2, issues) {
debug('issues', issues);
issues = ((pulls === parseInt(pulls)) && issues) ? Object.keys(JSON.parse(issues)).length - pulls : "Can't connect to GitHub"; issues = ((pulls === parseInt(pulls)) && issues) ? Object.keys(JSON.parse(issues)).length - pulls : "Can't connect to GitHub";
res.send({"issues": issues, "pulls" : pulls}); res.send({"issues": issues, "pulls" : pulls});
}); });
@@ -168,8 +166,16 @@ module.exports = {
about: function(req, res) { about: function(req, res) {
if (req.user) { if (req.user) {
if (!req.user.picture) { if (!req.user.picture) {
req.user.picture = "https://s3.amazonaws.com/freecodecamp/favicons/apple-touch-icon-180x180.png" User.find({'_id': req.user._id}, function (err, user) {
req.user.save(); if (err) {
debug('Err:', err);
}
user = user.pop();
user.picture = "https://s3.amazonaws.com/freecodecamp/favicons/apple-touch-icon-180x180.png";
user.markModifed('user.picture');
user.save();
updateUserStoryPictures(user._id.toString(), "https://s3.amazonaws.com/freecodecamp/favicons/apple-touch-icon-180x180.png");
});
} }
} }
@@ -291,7 +297,6 @@ module.exports = {
var $ = cheerio.load(body); var $ = cheerio.load(body);
var title = $('title').text(); var title = $('title').text();
result.title = title; result.title = title;
debug('calling callback with', result);
callback(null, result); callback(null, result);
} else { } else {
callback('failed'); callback('failed');
@@ -334,8 +339,6 @@ module.exports = {
R.forEach(function(story) { R.forEach(function(story) {
story.author.picture = picture; story.author.picture = picture;
debug('This is a story', story);
debug(story.author.picture);
story.markModified('author'); story.markModified('author');
story.save(); story.save();
}, foundStories); }, foundStories);

View File

@@ -834,6 +834,10 @@ iframe.iphone {
height: 35px; height: 35px;
} }
.story-headline {
font-size: 20px;
}
//uncomment this to see the dimensions of all elements outlined in red //uncomment this to see the dimensions of all elements outlined in red
//* { //* {

View File

@@ -24,7 +24,7 @@
var div = document.createElement('div'); var div = document.createElement('div');
$(div) $(div)
.html( .html(
'<div class="media ' + backgroundColorForCommentNestingLevel + ' media-news">' + '<div class="media media-news">' +
'<div class="media-left">' + '<div class="media-left">' +
"<a href='/" + commentDetails.author.username + "'>" + "<a href='/" + commentDetails.author.username + "'>" +
'<img class="media-object img-news" src="' + commentDetails.author.picture +'" alt="' + commentDetails.author.username + '">' + '<img class="media-object img-news" src="' + commentDetails.author.picture +'" alt="' + commentDetails.author.username + '">' +

View File

@@ -22,15 +22,17 @@
$(div) $(div)
.html( .html(
"<div class='col-xs-12 text-left'>" + "<div class='col-xs-12 text-left'>" +
"<div class='col-xs-1 col-sm-1 positive-5'>" + "<h2 class='col-xs-1 col-sm-1 positive-5'>" +
(i + 1) + (i + 1) +
"</div>" + "</h2>" +
"<div class='col-xs-2 col-sm-1'>" + "<div class='col-xs-2 col-sm-1'>" +
"<a href='/" + data[i].author.username + "'>" +
"<img src='" + data[i].author.picture + "' class='img-news'/>" + "<img src='" + data[i].author.picture + "' class='img-news'/>" +
"</a>" +
"</div>" + "</div>" +
"<div class='col-xs-9 col-sm-10'>" + "<div class='col-xs-9 col-sm-10'>" +
"<div class='row'>" + "<div class='row'>" +
"<div class='col-xs-12'>" + "<div class='story-headline col-xs-12'>" +
"<a href='/stories/" + linkedName + "'>" "<a href='/stories/" + linkedName + "'>"
+ data[i].storyLink + + data[i].storyLink +
"</a>" + "</a>" +

View File

@@ -22,15 +22,17 @@
$(div) $(div)
.html( .html(
"<div class='col-xs-12 text-left'>" + "<div class='col-xs-12 text-left'>" +
"<div class='col-xs-1 col-sm-1 positive-5'>" + "<h2 class='col-xs-1 col-sm-1 positive-5'>" +
(i + 1) + (i + 1) +
"</div>" + "</h2>" +
"<div class='col-xs-2 col-sm-1'>" + "<div class='col-xs-2 col-sm-1'>" +
"<a href='/" + data[i].author.username + "'>" +
"<img src='" + data[i].author.picture + "' class='img-news'/>" + "<img src='" + data[i].author.picture + "' class='img-news'/>" +
"</a>" +
"</div>" + "</div>" +
"<div class='col-xs-9 col-sm-10'>" + "<div class='col-xs-9 col-sm-10'>" +
"<div class='row'>" + "<div class='row'>" +
"<div class='col-xs-12'>" + "<div class='story-headline col-xs-12'>" +
"<a href='/stories/" + linkedName + "'>" "<a href='/stories/" + linkedName + "'>"
+ data[i].storyLink + + data[i].storyLink +
"</a>" + "</a>" +