make both score and picture redirect to portfolio, make chat and forum links redirect universally regardless of completion of challenges, simplify accounts page

app.js

@@ -208,6 +208,7 @@ app.use(
 app.get('/', homeController.index);
 app.get('/privacy', resourcesController.privacy);
 app.get('/jquery-exercises', resourcesController.jqueryExercises);
+app.get('/chat', resourcesController.chat);
 app.get('/live-pair-programming', resourcesController.livePairProgramming);
 app.get('/install-screenhero', resourcesController.installScreenHero);
 app.get('/javascript-in-your-inbox', resourcesController.javaScriptInYourInbox);

controllers/resources.js

@@ -55,6 +55,12 @@ module.exports = {
         });
     },
 
+    chat: function chat(req, res) {
+        res.render('resources/chat', {
+            title: "Enter Free Code Camp's Chat Rooms"
+        });
+    },
+
     nonprofitProjectInstructions: function nonprofitProjectInstructions(req, res) {
         res.render('resources/nonprofit-project-instructions', {
             title: 'Nonprofit Project Instructions'

public/css/main.less

@@ -704,6 +704,11 @@ iframe.iphone {
   padding-top: 10px;
 }
 
+.gitter-imbed {
+  height: 100%;
+  margin-bottom: 50px;
+}
+
 //uncomment this to see the dimensions of all elements outlined in red
 //* {
 //  border-color: red;

views/account/account.jade

@@ -2,8 +2,8 @@ extends ../layout
 block content
     script.
         var challengeName = 'Account View'
-    .panel.panel-primary.min-height-1000(ng-controller="profileValidationController")
+    .panel.panel-info.min-height-1000(ng-controller="profileValidationController")
-        .panel-heading.text-center Update your profile here:
+        .panel-heading.text-center Update your portfolio here:
         .panel-body
           .container.text-center
               form.form-horizontal(action='/account/profile', method='POST', novalidate='novalidate', name='profileForm' ng-show="asyncComplete")
@@ -268,75 +268,65 @@ block content
                             span.ion-edit
                             | Update my Portfolio
                         br
-    .panel.panel-primary
+
-        .panel-heading.text-center Actions
-        .panel-body
-            .col-xs-12
-                if (user.profile.username)
-                    a.btn.btn-lg.btn-block.btn-info.btn-link-social(href='/#{user.profile.username}') Check out my Public Profile
-                a.btn.btn-lg.btn-block.btn-primary.btn-link-social(href='/challenges') Take me to my current challenge
-                a.btn.btn-lg.btn-block.btn-warning.btn-link-social(href='/logout') Sign out
-            br
     - if (!user.google || !user.facebook || /*!user.github ||*/ !user.linkedin || !user.twitter)
-        .panel.panel-primary
+        .panel.panel-info
-            .panel-heading.text-center Link other services to your account:
+            .panel-heading.text-center Manage your account here:
             .panel-body
                 - if (!user.google)
                     .col-xs-12
                         a.btn.btn-lg.btn-block.btn-google-plus.btn-link-social(href='/auth/google')
                             i.fa.fa-google-plus
-                            | Link Google with your account
+                            | Link Google with my account
                 - if (!user.facebook)
                     .col-xs-12
                         a.btn.btn-lg.btn-block.btn-facebook.btn-link-social(href='/auth/facebook')
                             i.fa.fa-facebook
-                            | Link Facebook with your account
+                            | Link Facebook with my account
                 //- if (!user.github)
                 //    .col-xs-12
                 //        a.btn.btn-lg.btn-block.btn-github.btn-link-social(href='/auth/github')
                 //            i.fa.fa-github
-                //            | Link GitHub with your account
+                //            | Link GitHub with my account
                 - if (!user.linkedin)
                     .col-xs-12
                         a.btn.btn-lg.btn-block.btn-linkedin.btn-link-social(href='/auth/linkedin')
                             i.fa.fa-linkedin
-                            | Link LinkedIn with your account
+                            | Link LinkedIn with my account
                 - if (!user.twitter)
                     .col-xs-12
                         a.btn.btn-lg.btn-block.btn-twitter.btn-link-social(href='/auth/twitter')
                             i.fa.fa-twitter
-                            | Link Twitter with your account
+                            | Link Twitter with my account
-
+                .col-xs-12
-    .panel.panel-danger
+                    a.btn.btn-lg.btn-block.btn-warning.btn-link-social(href='/logout')
-        .panel-heading.text-center Danger Zone:
+                        span.ion-android-exit
-        .panel-body
+                        | Sign me out of Free Code Camp
-            .col-xs-12.text-center
+                .col-xs-12
-              button.btn.btn-danger.btn-small.confirm-deletion
+                    a.btn.btn-lg.btn-block.btn-danger.confirm-deletion.btn-link-social
-                  span.ion-trash-b
+                        span.ion-trash-b
-                  | I want to delete my account
+                        | Delete my Free Code Camp account
-              br
+                    script.
-              br
+                        $('.confirm-deletion').on("click", function() {
-              script.
+                          $('#modal-dialog').modal('show');
-                  $('.confirm-deletion').on("click", function() {
+                        });
-                    $('#modal-dialog').modal('show');
+                    #modal-dialog.modal.animated.wobble
-                  });
+                        .modal-dialog
-              #modal-dialog.modal.animated.wobble
+                            .modal-content
-                  .modal-dialog
+                                .modal-header
-                      .modal-content
+                                    a.close(href='#', data-dismiss='modal', aria-hidden='true') ×
-                          .modal-header
+                                    h3 Are you really leaving us?
-                              a.close(href='#', data-dismiss='modal', aria-hidden='true') ×
+                                .modal-body
-                              h3 Are you really leaving us?
+                                    p Pro Tip: If you tweet feedback to 
-                          .modal-body
+                                        a(href="https://twitter.com/intent/tweet?text=Hey%20@freecodecamp") @FreeCodeCamp
-                              p Pro Tip: If you tweet feedback to 
+                                        | , we'll act quickly on it!
-                                  a(href="https://twitter.com/intent/tweet?text=Hey%20@freecodecamp") @FreeCodeCamp
+                                .modal-footer
-                                  | , we'll act quickly on it!
+                                    a.btn.btn-success.btn-block(href='#', data-dismiss='modal', aria-hidden='true')
-                          .modal-footer
+                                        span.ion-happy
-                              a.btn.btn-success.btn-block(href='#', data-dismiss='modal', aria-hidden='true')
+                                        | Nevermind, I'll stick around
-                                  span.ion-happy
+                                    br
-                                  | Nevermind, I'll stick around
+                                    form(action='/account/delete', method='POST')
-                              br
+                                        input(type='hidden', name='_csrf', value=_csrf)
-                              form(action='/account/delete', method='POST')
+                                        button.btn.btn-danger.btn-block(type='submit')
-                                  input(type='hidden', name='_csrf', value=_csrf)
+                                            span.ion-trash-b
-                                  button.btn.btn-danger.btn-block(type='submit')
+                                            | Yes, Delete my account
-                                      span.ion-trash-b
-                                      | Yes, Delete my account

views/account/show.jade

@@ -1,10 +1,15 @@
 extends ../layout
 block content
     .col-xs-12.col-sm-12.col-md-12
-        .panel.panel-primary
+        .panel.panel-info
             .panel-heading.text-center
                 h1 #{username}'s portfolio
             .panel-body
+                if (user && user.profile.username === username)
+                .col-xs-12
+                    .text-center
+                        a.btn.btn-big.btn-primary(href="/account") Update my public portfolio
+                    br
                 .row
                     .col-xs-12
                         .col-xs-12.col-sm-12.col-md-5
@@ -35,9 +40,6 @@ block content
                                 h3.flat-top.bolded.wrappable= location
                                 h4.flat-top.wrappable= bio
                         .col-xs-12.col-sm-12.col-md-3.text-center
-                            if (user && user.profile.username === username)
-                                a.btn.btn-warning(href="/account") Edit my Profile
-
                             .background-svg.img-center
                                 .points-on-top
                                     = "[ " + points + " ]"

views/partials/navbar.jade

@@ -8,24 +8,12 @@
         img.img-responsive.nav-logo(src='https://s3.amazonaws.com/freecodecamp/freecodecamp_logo.svg', alt='learn to code javascript at Free Code Camp logo')
 .collapse.navbar-collapse
     ul.nav.navbar-nav.navbar-right.hamburger-dropdown
-        - if (!cc)
+        li
-            li
+            a(href='/challenges') Challenges
-                a(href='/challenges/0') Challenges
+        li
-        - else
+            a(href='/chat') Chat
-            li
+        li
-                a(href='/challenges') Challenges
+            a(href='http://forum.freecodecamp.com' target='_blank') Forum
-        - if (!cc || (cc && cc[1] < 1))
-            li
-                a(href='/challenges/1') Chat
-        - else
-            li
-                a(href='http://chat.freecodecamp.com' target='_blank') Chat
-        - if (!cc || (cc && cc[2] < 1))
-            li
-                a(href='/challenges/2') Forum
-        - else
-            li
-                a(href='http://forum.freecodecamp.com' target='_blank') Forum
         li
             a(href='/bonfires') Bonfires
         if !user
@@ -34,7 +22,10 @@
                 a.btn.signup-btn.signup-btn-nav(href='/login') Sign in
         else
             li
-                a(href='/account') [&nbsp;#{user.points}&nbsp;]
+                if (user.profile.username)
+                    a(href='/' + user.profile.username) [&nbsp;#{user.points}&nbsp;]
+                else
+                    a(href='/account') [&nbsp;#{user.points}&nbsp;]
             .hidden-xs
                 if user.profile.picture
                     if (user.profile.username)

views/resources/chat.jade

@@ -0,0 +1,22 @@
+extends ../layout-wide
+block content
+    h3
+        ol.col-md-offset-2
+            li Create a GitHub Account 
+                a(href="http://github.com/join", target='_blank') here
+                | .
+            li Download the chat room app on  
+                a(href="https://update.gitter.im/osx/latest") Windows
+                | , 
+                a(href="https://update.gitter.im/win/latest") Mac
+                | , 
+                a(href="http://appstore.com/gitter") iPhone
+                | ,  or  
+                a(href="https://play.google.com/store/apps/details?id=im.gitter.gitter&hl=en_GB") Android
+                |  , or go  
+                a(href="http://chat.freecodecamp.com") here
+                | .
+            li Keep the chat room open while you code so that you can meet friends and ask for help.
+    .col-xs-12
+        .embed-responsive.embed-responsive-16by9.gitter-imbed
+            iframe(src='http://www.gitter.im/freecodecamp/freecodecamp', frameborder='0', scrolling='no')