diff --git a/server/views/account/deprecated-signin.jade b/server/views/account/deprecated-signin.jade index 5401b419e3..648dbf4649 100644 --- a/server/views/account/deprecated-signin.jade +++ b/server/views/account/deprecated-signin.jade @@ -15,7 +15,10 @@ block content a.btn.btn-lg.btn-block.btn-social.btn-twitter(href='/auth/twitter') i.fa.fa-twitter | Sign in with Twitter - + br + p + a(href="/signin") Or click here to go back. + script. $(document).ready(function() { var method = localStorage.getItem('lastSigninMethodDeprecated'), diff --git a/server/views/account/email-signin.jade b/server/views/account/email-signin.jade index 1616b64a0a..1b78fe6809 100644 --- a/server/views/account/email-signin.jade +++ b/server/views/account/email-signin.jade @@ -10,8 +10,8 @@ block content #flash-content .row .text-center - h2 Sign in with your Email here: - .button-spacer + h2 Sign in with an Email here: + .button-spacer .col-sm-6.col-sm-offset-3 form(method='POST', action='/passwordless-auth') input(type='hidden', name='_csrf', value=_csrf) @@ -25,7 +25,13 @@ block content .col-sm-6.col-sm-offset-3 br p.text-center - a(href="/signup") Or Click here if you want to sign up. + | Free Code Camp uses passwordless authentication. + br + | If you are a new camper use any email, and sign up instantly, + | or use your existing email with us, if you already have an account. + br + p.text-center + a(href="/signin") Or click here if you want to sign in with other options. script. $(document).ready(function() { diff --git a/server/views/account/signin.jade b/server/views/account/signin.jade index 0b1123cf89..44283ca74f 100644 --- a/server/views/account/signin.jade +++ b/server/views/account/signin.jade @@ -1,19 +1,19 @@ extends ../layout block content .text-center - h2 Are you a returning camper? + h2 Welcome to Free Code Camp. br .button-spacer - | Sign in with one of these options: + | Sign in or Sign up with one of these options: a.btn.btn-lg.btn-block.btn-social.btn-primary(href='/email-signin') i.fa.fa-envelope - | Sign in with Email + | Continue with Email a.btn.btn-lg.btn-block.btn-social.btn-github(href='/auth/github') i.fa.fa-github - | Sign in with GitHub + | Continue with GitHub br p - a(href="/deprecated-signin") Click here if you previously signed in using a different method. + a(href="/deprecated-signin") Or click here if you previously signed up using a different method. script. $(document).ready(function() { @@ -43,7 +43,7 @@ block content $(this).removeClass('active'); obj.methodClass = $(this).attr('class').split(' ').pop(); obj.method = $(this).text(); - if(obj.method === "Sign in with Email" || obj.method === "Sign in with GitHub") { + if(obj.method === "Continue with Email" || obj.method === "Continue in with GitHub") { localStorage.setItem('lastSigninMethod', JSON.stringify(obj)); } else { localStorage.removeItem('lastSigninMethod'); diff --git a/server/views/partials/navbar.jade b/server/views/partials/navbar.jade index dd38b4d40d..a71f23ca24 100644 --- a/server/views/partials/navbar.jade +++ b/server/views/partials/navbar.jade @@ -28,12 +28,12 @@ nav.navbar.navbar-default.navbar-static-top.nav-height a(href='https://www.freecodecamp.org/donate') Donate if !user li - a(href='/signup') Sign Up + a(href='/signin') Sign In else li.avatar-points a(href='/settings') span.brownie-points-nav - span.hidden-md.hidden-lg #{user.username} + span.hidden-md.hidden-lg #{user.username} span.brownie-points [ #{user.points} ] span.hidden-xs.hidden-sm.avatar img.profile-picture.float-right(src='#{user.picture}')