Remove noisy logs, add new camp counselors and add github auth back in
This commit is contained in:
		| @@ -26,7 +26,6 @@ passport.deserializeUser(function(id, done) { | ||||
|   User.findOne({ | ||||
|     _id: id | ||||
|   }, '-password', function(err, user) { | ||||
|     console.log(user); | ||||
|     done(err, user); | ||||
|   }); | ||||
| }); | ||||
| @@ -480,11 +479,9 @@ function isAuthenticated(req, res, next) { | ||||
|  | ||||
| function hasEmail(req, res) { | ||||
|   if (req.user) { | ||||
|       console.log('started'); | ||||
|       if (req.user.email) { | ||||
|         res.redirect('/'); | ||||
|       } else { | ||||
|         console.log('hit'); | ||||
|         req.flash('info', { | ||||
|           msg: 'Please add your email address before starting our challenges.' | ||||
|         }); | ||||
|   | ||||
| @@ -206,8 +206,6 @@ exports.postUpdateProfile = function(req, res, next) { | ||||
|         } | ||||
|         var user = req.user; | ||||
|         if (existingUsername && existingUsername.profile.username != user.profile.username) { | ||||
|           console.log(user.profile.username) | ||||
|           console.log(existingUsername.username) | ||||
|           req.flash('errors', { | ||||
|             msg: 'An account with that username already exists.' | ||||
|           }); | ||||
|   | ||||
| @@ -8,6 +8,9 @@ block content | ||||
|         a.btn.btn-lg.btn-block.btn-facebook.btn-social(href='/auth/facebook') | ||||
|           i.fa.fa-facebook | ||||
|           | Sign in with Facebook | ||||
|         a.btn.btn-lg.btn-block.btn-github.btn-social(href='/auth/github') | ||||
|           i.fa.fa-github | ||||
|           | Sign in with GitHub | ||||
|         a.btn.btn-lg.btn-block.btn-linkedin.btn-social(href='/auth/linkedin') | ||||
|           i.fa.fa-linkedin | ||||
|           | Sign in with LinkedIn | ||||
|   | ||||
| @@ -55,6 +55,11 @@ block content | ||||
|                         a.btn.btn-lg.btn-block.btn-facebook.btn-link-social(href='/auth/facebook') | ||||
|                             i.fa.fa-facebook | ||||
|                             | Link Facebook with your 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 | ||||
|                 - if (!user.linkedin) | ||||
|                     .col-xs-12 | ||||
|                         a.btn.btn-lg.btn-block.btn-linkedin.btn-link-social(href='/auth/linkedin') | ||||
|   | ||||
| @@ -167,7 +167,6 @@ | ||||
|                                 a(href='https://twitter.com/debBlufftonAGS/status/532198725129867265') November 11, 2014 | ||||
|                             script(async='', src='//platform.twitter.com/widgets.js', charset='utf-8') | ||||
|  | ||||
|  | ||||
| .panel.panel-primary | ||||
|     .panel-heading.landing-panel-heading.text-center Our Team of Volunteers | ||||
|     .panel-body | ||||
| @@ -183,11 +182,11 @@ | ||||
|                     }); | ||||
|                 #shuffle | ||||
|                     .col-xs-12.col-sm-4.col-md-3.team-member | ||||
|                         h3.negative-10.text-nowrap Nique Devereaux | ||||
|                         h4.negative-10.text-nowrap Alliance Builder | ||||
|                         img.profile-image(src='https://s3.amazonaws.com/freecodecamp/nique-devereaux.jpg' alt="Nique Devereaux's picture") | ||||
|                         h4.text-nowrap Tempe, Arizona | ||||
|                         p.negative-10 "Gamer ever since Pong. Coder ever since I discovered how much I enjoy telling machines what to do." | ||||
|                         h3.negative-10.text-nowrap Michael Johnson | ||||
|                         h4.negative-10.text-nowrap Nonprofit Coordinator | ||||
|                         img.profile-image(src='https://s3.amazonaws.com/freecodecamp/michael-johnson.jpeg' alt="Michael Johnson's picture") | ||||
|                         h4.text-nowrap Washington, D.C. | ||||
|                         p.negative-10 "I'm a recent Harvard graduate who took a pass on Wall Street to code for a cause. Coding is the 21st century literacy." | ||||
|                     .col-xs-12.col-sm-4.col-md-3.team-member | ||||
|                         h3.negative-10.text-nowrap Berkeley Martinez | ||||
|                         h4.negative-10.text-nowrap JavaScript Engineer | ||||
| @@ -201,11 +200,11 @@ | ||||
|                         h4.text-nowrap San Diego, California | ||||
|                         p.negative-10 "I'm a college student who turned to code as an avenue for creative expression. I love political science and economics." | ||||
|                     .col-xs-12.col-sm-4.col-md-3.team-member | ||||
|                         h3.negative-10.text-nowrap Brian Ball | ||||
|                         h3.negative-10.text-nowrap Jeanette Casteñeta | ||||
|                         h4.negative-10.text-nowrap Product Manager | ||||
|                         img.profile-image(src='https://s3.amazonaws.com/freecodecamp/brian-ball.jpg' alt="Brian Ball's picture") | ||||
|                         img.profile-image(src='https://s3.amazonaws.com/freecodecamp/jeanette-casteneta.jpg' alt="Jeanette Casteñeta's picture") | ||||
|                         h4.text-nowrap San Francisco, California | ||||
|                         p.negative-10 "I build products people use. I'm fascinated by how fast the internet is changing the world." | ||||
|                         p.negative-10 "Home-ec diva. I can envision a dress, then stitch it together. Now I'm learning how to do the same thing with code." | ||||
|                     .col-xs-12.col-sm-4.col-md-3.team-member | ||||
|                         h3.negative-10.text-nowrap Darryl Dixon | ||||
|                         h4.negative-10.text-nowrap Community Builder | ||||
|   | ||||
		Reference in New Issue
	
	Block a user