twitter username now persisted

FreeCodeCamp · 2106cbdbf296355999123d22a2947c427fb0aa7e · QuincyLarson committed Oct 13, 2014 · Oct 13, 2014 · 2106cbd
1 parent 254740c
commit 2106cbdbf296355999123d22a2947c427fb0aa7e
Unified Split

Showing with 45 additions and 25 deletions.

+3 −0 .node-inspectorrc

+2 −1 config/passport.js

+17 −14 public/css/styles.less

+23 −10 views/curriculum/curriculum.jade
@@ -0,0 +1,3 @@
+{
+    "save-live-edit": true
+}
@@ -64,7 +64,7 @@ passport.use(new TwitterStrategy(secrets.twitter, function(req, accessToken, tok
           user.profile.name = user.profile.name || profile.displayName;
           user.profile.location = user.profile.location || profile._json.location;
           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) {
             req.flash('info', { msg: 'Twitter account has been linked.' });
             done(err, user);
@@ -86,6 +86,7 @@ passport.use(new TwitterStrategy(secrets.twitter, function(req, accessToken, tok
       user.profile.name = profile.displayName;
       user.profile.location = profile._json.location;
       user.profile.picture = profile._json.profile_image_url_https;
+      user.profile.username = profile.username;
       user.save(function(err) {
         done(err, user);
       });
@@ -63,13 +63,6 @@ footer {
   margin-right: 6px;
 }
 
-html { height: 50%; }
-body { margin: 0; height: 100%; position: relative; }
-#firepad-container {
-  width: 100%;
-  height: 100%;
-}
-
 .img-center {
   margin: 0 auto;
 }
@@ -104,13 +97,21 @@ ul {
   word-wrap: break-word;
 }
 
-/* Pages */
+
+
+
+
+
+
+
+
+/* Pages * /
 
 .pages {
-  height: inherit;
+  height: 100%;
   margin: 0;
   padding: 0;
-  width: inherit;
+  width: 100%;
 }
 
 .page {
@@ -119,7 +120,7 @@ ul {
   width: 100%;
 }
 
-/* Login Page */
+/* Login Page * /
 
 .login.page {
   background-color: #000;
@@ -159,7 +160,7 @@ ul {
   font-weight: 100;
 }
 
-/* Chat page */
+/* Chat page * /
 
 .chat.page {
   display: none;
@@ -182,7 +183,7 @@ ul {
   text-align: center;
 }
 
-/* Messages */
+/* Messages * /
 
 .chatArea {
   height: 100%;
@@ -220,4 +221,6 @@ ul {
   position: absolute;
   right: 0;
   width: 100%;
-}
+}
+
+/**/
@@ -3,13 +3,26 @@ extends ../layout
 block content
     .page-header
         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...')
+//