diff options
| -rw-r--r-- | public/assets/javascripts/ui/_router.js | 2 | ||||
| -rw-r--r-- | server/index.js | 2 | ||||
| -rw-r--r-- | server/lib/auth/index.js | 3 | ||||
| -rw-r--r-- | views/partials/header.ejs | 2 |
4 files changed, 6 insertions, 3 deletions
diff --git a/public/assets/javascripts/ui/_router.js b/public/assets/javascripts/ui/_router.js index 7337357..4219a28 100644 --- a/public/assets/javascripts/ui/_router.js +++ b/public/assets/javascripts/ui/_router.js @@ -20,6 +20,7 @@ var SiteRouter = Router.extend({ "/": 'home', "/home": 'home', "/login": 'signin', + "/signin": 'signin', "/signup": 'signup', "/auth/usernameTaken": 'usernameTaken', @@ -47,6 +48,7 @@ var SiteRouter = Router.extend({ "/": 'home', "/home": 'home', "/login": 'signin', + "/signin": 'signin', "/signup": 'signup', "/auth/usernameTaken": 'usernameTaken', "/auth/password": 'passwordReset', diff --git a/server/index.js b/server/index.js index 90b724c..c2b3421 100644 --- a/server/index.js +++ b/server/index.js @@ -82,6 +82,8 @@ site.route = function () { app.get('/home', views.demoHome); app.get('/login', views.modal); app.get('/logout', auth.logout); + app.get('/signin', views.modal); + app.get('/signout', auth.logout); app.get('/signup', views.modal); app.post('/auth/signin', auth.loggedInLocal); app.post('/auth/signup', auth.signup); diff --git a/server/lib/auth/index.js b/server/lib/auth/index.js index c2275ff..0c46105 100644 --- a/server/lib/auth/index.js +++ b/server/lib/auth/index.js @@ -30,14 +30,13 @@ var auth = { callbackURL: 'http://' + config.host + '/auth/twitter/callback' }, auth.insertTwitterUser)); - /* passport.use(new FacebookStrategy({ clientID: process.env.VVALLS_FACEBOOK_KEY || '719828821410310', clientSecret: process.env.VVALLS_FACEBOOK_SECRET || 'f9aba78e08f37f621eadb88b1409d48c', callbackURL: 'http://' + config.host + '/auth/facebook/callback', enableProof: false, }, auth.insertFacebookUser)); - */ + auth.mail.init() }, diff --git a/views/partials/header.ejs b/views/partials/header.ejs index ea579cc..ce5bab9 100644 --- a/views/partials/header.ejs +++ b/views/partials/header.ejs @@ -74,7 +74,7 @@ [[ } else { ]] <a href="/signup" data-role="show-signup-modal" class="signUp topLink">Sign Up</a> - <a href="/login" data-role="show-signin-modal" class="signIn topLink">Sign In</a> + <a href="/signin" data-role="show-signin-modal" class="signIn topLink">Sign In</a> [[ } ]] </span> </div>
\ No newline at end of file |