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

twitter username now persisted

Browse Source
This commit is contained in:
Michael Q Larson
2014-10-13 21:38:10 -07:00
parent 254740c065
commit 2106cbdbf2
4 changed files with 45 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.node-inspectorrc Normal file
View File

@ -0,0 +1,3 @@
{
"save-live-edit": true
}

3
config/passport.js
View File

@ -64,7 +64,7 @@ passport.use(new TwitterStrategy(secrets.twitter, function(req, accessToken, tok
user.profile.name = user.profile.name || profile.displayName; user.profile.name = user.profile.name || profile.displayName;
user.profile.location = user.profile.location || profile._json.location; user.profile.location = user.profile.location || profile._json.location;
user.profile.picture = user.profile.picture || profile._json.profile_image_url_https; user.profile.picture = user.profile.picture || profile._json.profile_image_url_https;
user.profile.username = profile.displayName; user.profile.username = profile.username;
user.save(function(err) { user.save(function(err) {
req.flash('info', { msg: 'Twitter account has been linked.' }); req.flash('info', { msg: 'Twitter account has been linked.' });
done(err, user); done(err, user);
@ -86,6 +86,7 @@ passport.use(new TwitterStrategy(secrets.twitter, function(req, accessToken, tok
user.profile.name = profile.displayName; user.profile.name = profile.displayName;
user.profile.location = profile._json.location; user.profile.location = profile._json.location;
user.profile.picture = profile._json.profile_image_url_https; user.profile.picture = profile._json.profile_image_url_https;
user.profile.username = profile.username;
user.save(function(err) { user.save(function(err) {
done(err, user); done(err, user);
}); });

31
public/css/styles.less
View File

@ -63,13 +63,6 @@ footer {
margin-right: 6px; margin-right: 6px;
} }
html { height: 50%; }
body { margin: 0; height: 100%; position: relative; }
#firepad-container {
width: 100%;
height: 100%;
}
.img-center { .img-center {
margin: 0 auto; margin: 0 auto;
} }
@ -104,13 +97,21 @@ ul {
word-wrap: break-word; word-wrap: break-word;
} }
/* Pages */
/* Pages * /
.pages { .pages {
height: inherit; height: 100%;
margin: 0; margin: 0;
padding: 0; padding: 0;
width: inherit; width: 100%;
} }
.page { .page {
@ -119,7 +120,7 @@ ul {
width: 100%; width: 100%;
} }
/* Login Page */ /* Login Page * /
.login.page { .login.page {
background-color: #000; background-color: #000;
@ -159,7 +160,7 @@ ul {
font-weight: 100; font-weight: 100;
} }
/* Chat page */ /* Chat page * /
.chat.page { .chat.page {
display: none; display: none;
@ -182,7 +183,7 @@ ul {
text-align: center; text-align: center;
} }
/* Messages */ /* Messages * /
.chatArea { .chatArea {
height: 100%; height: 100%;
@ -220,4 +221,6 @@ ul {
position: absolute; position: absolute;
right: 0; right: 0;
width: 100%; width: 100%;
} }
/**/

33
views/curriculum/curriculum.jade
View File

@ -3,13 +3,26 @@ extends ../layout
block content block content
.page-header .page-header
h3 Your Curriculum h3 Your Curriculum
.col-xs-12.col-sm-12.col-md-12 ul.pages
ul.pages li.chat.page
li.chat.page div.chatArea
div.chatArea ul.messages
ul.messages input.inputMessage(placeholder='Type here...')
input.inputMessage(placeholder='Type here...') li.login.page
li.login.page div.form
div.form h3.title What's your nickname?
h3.title What's your nickname? input.usernameInput(type='text', maxlength='14')
input.usernameInput(type='text', maxlength='14')
// .row
// .col-sm-6
// h3 Your Curriculum
// .col-sm-6
// .chat
// .chat-messages
// .chat-input.row
// .col-sm-3
// input.usernameInput(placeholder='Nickanem', type='text', maxlength='14')
// .col-sm-9
// input.inputMessage(placeholder='Type here...')
//