From b02ddc135dd6881b44bde584717b5450cee5c27d Mon Sep 17 00:00:00 2001 From: Mrugesh Mohapatra Date: Tue, 3 May 2016 15:06:20 +0000 Subject: [PATCH] Update paths to minimize re-directs --- common/app/components/Nav/Nav.jsx | 2 +- server/boot/commit.js | 2 +- server/passport-providers.js | 2 +- server/views/challenges/showHTML.jade | 2 +- server/views/challenges/showJS.jade | 2 +- server/views/challenges/showVideo.jade | 2 +- server/views/challenges/showZiplineOrBasejump.jade | 2 +- server/views/partials/navbar.jade | 2 +- server/views/resources/stories.jade | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/common/app/components/Nav/Nav.jsx b/common/app/components/Nav/Nav.jsx index 922c05081b..c748684474 100644 --- a/common/app/components/Nav/Nav.jsx +++ b/common/app/components/Nav/Nav.jsx @@ -95,7 +95,7 @@ export default class extends React.Component { return ( + href='/signin'> Sign In ); diff --git a/server/boot/commit.js b/server/boot/commit.js index 5bb00e7ce7..77c7008a41 100644 --- a/server/boot/commit.js +++ b/server/boot/commit.js @@ -23,7 +23,7 @@ import { } from '../utils/middleware'; const sendNonUserToSignIn = ifNoUserRedirectTo( - '/login', + '/signin', 'You must be signed in to commit to a nonprofit.', 'info' ); diff --git a/server/passport-providers.js b/server/passport-providers.js index f0d99c3c3e..6103a56eaa 100644 --- a/server/passport-providers.js +++ b/server/passport-providers.js @@ -1,5 +1,5 @@ var successRedirect = '/'; -var failureRedirect = '/login'; +var failureRedirect = '/signin'; var linkFailureRedirect = '/account'; module.exports = { local: { diff --git a/server/views/challenges/showHTML.jade b/server/views/challenges/showHTML.jade index 7835148327..b9c706c707 100644 --- a/server/views/challenges/showHTML.jade +++ b/server/views/challenges/showHTML.jade @@ -37,7 +37,7 @@ block content var userLoggedIn = true; if (!user) .button-spacer - a.btn.signup-btn.btn-block.btn-block(href='/login') Sign in so you can save your progress + a.btn.signup-btn.btn-block.btn-block(href='/signin') Sign in so you can save your progress script. var userLoggedIn = false; .button-spacer diff --git a/server/views/challenges/showJS.jade b/server/views/challenges/showJS.jade index 3939b29bed..517c5d13ec 100644 --- a/server/views/challenges/showJS.jade +++ b/server/views/challenges/showJS.jade @@ -43,7 +43,7 @@ block content label.btn.btn-primary.btn-lg#trigger-issue-modal Bug if (!user) .button-spacer - a.btn.signup-btn.btn-block.btn-block(href='/login') Sign in so you can save your progress + a.btn.signup-btn.btn-block.btn-block(href='/signin') Sign in so you can save your progress script. var userLoggedIn = false; .button-spacer diff --git a/server/views/challenges/showVideo.jade b/server/views/challenges/showVideo.jade index f29911013e..e9c128616e 100644 --- a/server/views/challenges/showVideo.jade +++ b/server/views/challenges/showVideo.jade @@ -31,7 +31,7 @@ block content .btn.btn-primary.btn-big#trigger-issue-modal Report a bug if (!user) .button-spacer - a.btn.btn-big.signup-btn.btn-block(href='/login') Sign in so you can save your progress + a.btn.btn-big.signup-btn.btn-block(href='/signin') Sign in so you can save your progress script. var userLoggedIn = false; br diff --git a/server/views/challenges/showZiplineOrBasejump.jade b/server/views/challenges/showZiplineOrBasejump.jade index 5c3639a8d6..cfc35e20ee 100644 --- a/server/views/challenges/showZiplineOrBasejump.jade +++ b/server/views/challenges/showZiplineOrBasejump.jade @@ -31,7 +31,7 @@ block content .btn.btn-primary.btn-primary-ghost.btn-big#trigger-issue-modal Bug if (!user) .button-spacer - a.btn.btn-big.signup-btn.btn-block(href='/login') Sign in so you can save your progress + a.btn.btn-big.signup-btn.btn-block(href='/signin') Sign in so you can save your progress script. var userLoggedIn = false; br diff --git a/server/views/partials/navbar.jade b/server/views/partials/navbar.jade index edbc4b72c0..bb495e099a 100644 --- a/server/views/partials/navbar.jade +++ b/server/views/partials/navbar.jade @@ -25,7 +25,7 @@ nav.navbar.navbar-default.navbar-fixed-top.nav-height a(href='/shop') Shop if !user li - a(href='/login') Sign in + a(href='/signin') Sign in else li.brownie-points-nav a(href='/' + user.username) [ #{user.points} ] diff --git a/server/views/resources/stories.jade b/server/views/resources/stories.jade index 79739bdcbb..e013dae899 100644 --- a/server/views/resources/stories.jade +++ b/server/views/resources/stories.jade @@ -22,4 +22,4 @@ block content if !user .text-center - a.btn.btn-cta.signup-btn.btn-block(href="/login") Start learning to code (it's free) + a.btn.btn-cta.signup-btn.btn-block(href="/signin") Start learning to code (it's free)