From 813edb5dbc5e868f203f7c9c00d7784566dc6453 Mon Sep 17 00:00:00 2001
From: Quincy Larson <QuincyLarson@users.noreply.github.com>
Date: Sat, 1 Oct 2016 04:55:29 -0700
Subject: [PATCH] update sign in flow (#10873)

* update sign in flow and simplify welcome page slightly
---
 server/boot/a-extendUser.js         | 12 +-----------
 server/boot/randomAPIs.js           |  7 +++++++
 server/views/account/signin.jade    | 15 ++++-----------
 server/views/resources/welcome.jade | 22 ++++++++++++++++++++++
 4 files changed, 34 insertions(+), 22 deletions(-)
 create mode 100644 server/views/resources/welcome.jade

diff --git a/server/boot/a-extendUser.js b/server/boot/a-extendUser.js
index 57e318d14c..9576e7b712 100644
--- a/server/boot/a-extendUser.js
+++ b/server/boot/a-extendUser.js
@@ -67,10 +67,6 @@ module.exports = function(app) {
   User.afterRemote('create', function({ req, res }, user, next) {
     debug('user created, sending email');
     if (!user.email || !isEmail(user.email)) { return next(); }
-    const redirect = req.session && req.session.returnTo ?
-      req.session.returnTo :
-      '/';
-
     var mailOptions = {
       type: 'email',
       to: user.email,
@@ -92,13 +88,7 @@ module.exports = function(app) {
     debug('sending welcome email');
     return user.verify(mailOptions, function(err) {
       if (err) { return next(err); }
-      req.flash('success', {
-        msg: [ 'Congratulations ! We\'ve created your account. ',
-               'Please check your email. We sent you a link that you can ',
-               'click to verify your email address and then login.'
-             ].join('')
-      });
-      return res.redirect(redirect);
+      return res.redirect('/welcome');
     });
   });
 };
diff --git a/server/boot/randomAPIs.js b/server/boot/randomAPIs.js
index 57ea58a5f4..c3f840543c 100644
--- a/server/boot/randomAPIs.js
+++ b/server/boot/randomAPIs.js
@@ -26,6 +26,7 @@ module.exports = function(app) {
   router.get('/shop/confirm-stickers', confirmStickers);
   router.get('/all-stories', showAllTestimonials);
   router.get('/terms', terms);
+  router.get('/welcome', welcome);
   router.get('/privacy', privacy);
   router.get('/how-nonprofit-projects-work', howNonprofitProjectsWork);
   router.get(
@@ -57,6 +58,12 @@ module.exports = function(app) {
       });
   }
 
+  function welcome(req, res) {
+    res.render('resources/welcome', {
+      title: 'Welcome to Free Code Camp!'
+    });
+  }
+
   function howNonprofitProjectsWork(req, res) {
       res.render('resources/how-nonprofit-projects-work', {
           title: 'How our nonprofit projects work'
diff --git a/server/views/account/signin.jade b/server/views/account/signin.jade
index c6be91453d..f6a5b02c1b 100644
--- a/server/views/account/signin.jade
+++ b/server/views/account/signin.jade
@@ -1,30 +1,23 @@
 extends ../layout
 block content
     .text-center
-        h2 New to Free Code Camp?
-          br
-          .button-spacer
-          | Sign up now:
+        h2 Are you new to Free Code Camp?
+        .spacer
         a.btn.btn-lg.btn-block.btn-social.btn-primary(href='/email-signup')
             i.fa.fa-envelope
             | Sign up with Email
-        a.btn.btn-lg.btn-block.btn-social.btn-github(href='/auth/github')
-            i.fa.fa-github
-            | Sign up with GitHub
         .spacer
         hr
         .spacer
         h2 Are you a returning camper?
-          br
-          .button-spacer
-          | Sign in with one of these options:
+        .spacer
         a.btn.btn-lg.btn-block.btn-social.btn-primary(href='/email-signin')
             i.fa.fa-envelope
             | Sign in with Email
         a.btn.btn-lg.btn-block.btn-social.btn-github(href='/auth/github')
             i.fa.fa-github
             | Sign in with GitHub
-        br
+        .button-spacer
         p
             a(href="/deprecated-signin") Click here if you previously signed in using a different method.
 
diff --git a/server/views/resources/welcome.jade b/server/views/resources/welcome.jade
new file mode 100644
index 0000000000..49afba3510
--- /dev/null
+++ b/server/views/resources/welcome.jade
@@ -0,0 +1,22 @@
+extends ../layout
+block content
+    .row
+        .col-xs-12.col-sm-10.col-sm-offset-1.col-md-6.col-md-offset-3.text-center
+            h1 Welcome to Free Code Camp!
+            p You have created a brand new account.
+            p Already have an account? &thinsp;
+                a(href='/signout') Sign out, then sign in with a different email address.
+            .spacer
+            hr
+            .spacer
+            p Can we show you how to join our chat rooms and local study groups?
+            p It only takes a few minutes.
+            .spacer
+            .row
+                .col-xs-12
+                    a.btn.btn-lg.btn-block.btn-primary.btn-link-social(href='/')
+                        | Yes, I want to join the community
+            .row
+                .col-xs-12
+                    a.btn.btn-lg.btn-block.btn-danger.btn-link-social(href='/map')
+                        | No, I want to start coding immediately