diff --git a/app.js b/app.js index d77bd8b15b..dff8270448 100644 --- a/app.js +++ b/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); diff --git a/controllers/resources.js b/controllers/resources.js index 01e7d9a072..99844a3095 100644 --- a/controllers/resources.js +++ b/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' diff --git a/public/css/main.less b/public/css/main.less index 613774804c..cf8b467ed8 100644 --- a/public/css/main.less +++ b/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; diff --git a/views/account/account.jade b/views/account/account.jade index 25a0c9c063..5e849b8278 100644 --- a/views/account/account.jade +++ b/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-heading.text-center Update your profile here: + .panel.panel-info.min-height-1000(ng-controller="profileValidationController") + .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-heading.text-center Link other services to your account: + .panel.panel-info + .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 - - .panel.panel-danger - .panel-heading.text-center Danger Zone: - .panel-body - .col-xs-12.text-center - button.btn.btn-danger.btn-small.confirm-deletion - span.ion-trash-b - | I want to delete my account - br - br - script. - $('.confirm-deletion').on("click", function() { - $('#modal-dialog').modal('show'); - }); - #modal-dialog.modal.animated.wobble - .modal-dialog - .modal-content - .modal-header - a.close(href='#', data-dismiss='modal', aria-hidden='true') × - h3 Are you really leaving us? - .modal-body - p Pro Tip: If you tweet feedback to  - a(href="https://twitter.com/intent/tweet?text=Hey%20@freecodecamp") @FreeCodeCamp - | , we'll act quickly on it! - .modal-footer - a.btn.btn-success.btn-block(href='#', data-dismiss='modal', aria-hidden='true') - span.ion-happy - | Nevermind, I'll stick around - br - form(action='/account/delete', method='POST') - input(type='hidden', name='_csrf', value=_csrf) - button.btn.btn-danger.btn-block(type='submit') - span.ion-trash-b - | Yes, Delete my account + | Link Twitter with my account + .col-xs-12 + a.btn.btn-lg.btn-block.btn-warning.btn-link-social(href='/logout') + span.ion-android-exit + | Sign me out of Free Code Camp + .col-xs-12 + a.btn.btn-lg.btn-block.btn-danger.confirm-deletion.btn-link-social + span.ion-trash-b + | Delete my Free Code Camp account + script. + $('.confirm-deletion').on("click", function() { + $('#modal-dialog').modal('show'); + }); + #modal-dialog.modal.animated.wobble + .modal-dialog + .modal-content + .modal-header + a.close(href='#', data-dismiss='modal', aria-hidden='true') × + h3 Are you really leaving us? + .modal-body + p Pro Tip: If you tweet feedback to  + a(href="https://twitter.com/intent/tweet?text=Hey%20@freecodecamp") @FreeCodeCamp + | , we'll act quickly on it! + .modal-footer + a.btn.btn-success.btn-block(href='#', data-dismiss='modal', aria-hidden='true') + span.ion-happy + | Nevermind, I'll stick around + br + form(action='/account/delete', method='POST') + input(type='hidden', name='_csrf', value=_csrf) + button.btn.btn-danger.btn-block(type='submit') + span.ion-trash-b + | Yes, Delete my account diff --git a/views/account/show.jade b/views/account/show.jade index ad95d1b91b..8194c4b107 100644 --- a/views/account/show.jade +++ b/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 + " ]" diff --git a/views/partials/navbar.jade b/views/partials/navbar.jade index d57af2b098..5b895c57ba 100644 --- a/views/partials/navbar.jade +++ b/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 - a(href='/challenges/0') Challenges - - else - li - a(href='/challenges') Challenges - - 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='/challenges') Challenges + li + a(href='/chat') Chat + 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') [ #{user.points} ] + if (user.profile.username) + a(href='/' + user.profile.username) [ #{user.points} ] + else + a(href='/account') [ #{user.points} ] .hidden-xs if user.profile.picture if (user.profile.username) diff --git a/views/resources/chat.jade b/views/resources/chat.jade new file mode 100644 index 0000000000..b300dcc3e7 --- /dev/null +++ b/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') \ No newline at end of file