From e8fce5d292ac153d8cc03c5c837c75d03f28d2d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niklas=20Stro=CC=88m?= Date: Mon, 8 Sep 2014 01:39:29 +0800 Subject: [PATCH 1/3] removed the old signup and signin pages which was not in use (except if you tried to post a new link without being logged in, then you got redirected to that login page) --- client/views/users/forgot_password.html | 14 ----------- client/views/users/forgot_password.js | 14 ----------- client/views/users/signin.html | 25 ------------------- client/views/users/signin.js | 29 ---------------------- client/views/users/signup.html | 28 --------------------- client/views/users/signup.js | 33 ------------------------- lib/router.js | 25 ++----------------- 7 files changed, 2 insertions(+), 166 deletions(-) delete mode 100644 client/views/users/forgot_password.html delete mode 100644 client/views/users/forgot_password.js delete mode 100644 client/views/users/signin.html delete mode 100644 client/views/users/signin.js delete mode 100644 client/views/users/signup.html delete mode 100644 client/views/users/signup.js diff --git a/client/views/users/forgot_password.html b/client/views/users/forgot_password.html deleted file mode 100644 index de4208d01..000000000 --- a/client/views/users/forgot_password.html +++ /dev/null @@ -1,14 +0,0 @@ - \ No newline at end of file diff --git a/client/views/users/forgot_password.js b/client/views/users/forgot_password.js deleted file mode 100644 index 1d8d59b71..000000000 --- a/client/views/users/forgot_password.js +++ /dev/null @@ -1,14 +0,0 @@ -Template[getTemplate('forgot_password')].events({ - 'click input[type=submit]': function(e){ - e.preventDefault(); - var options=new Object(); - options.email=$('#email').val(); - Accounts.forgotPassword(options, function(error){ - if(error){ - console.log(error); - }else{ - throwError(i18n.t("Password reset link sent!")); - } - }); - } -}); \ No newline at end of file diff --git a/client/views/users/signin.html b/client/views/users/signin.html deleted file mode 100644 index e3a29f9c9..000000000 --- a/client/views/users/signin.html +++ /dev/null @@ -1,25 +0,0 @@ - \ No newline at end of file diff --git a/client/views/users/signin.js b/client/views/users/signin.js deleted file mode 100644 index 73662bac8..000000000 --- a/client/views/users/signin.js +++ /dev/null @@ -1,29 +0,0 @@ -Template[getTemplate('signin')].events({ - 'click input[type=submit]': function(event){ - event.preventDefault(); - var username = $('#username').val(); - var password = $('#password').val(); - Meteor.loginWithPassword(username, password, function(err){ - if(err){ - console.log(err); - throwError(err.reason); - } - }); - }, - - 'click #signup': function(){ - // Session.set('state', 'signup'); - Router.go('/signup'); - }, - - 'click .twitter-button': function(){ - Meteor.loginWithTwitter(function(){ - Router.go('/'); - }); - }, - 'click .facebook-button': function(){ - Meteor.loginWithFacebook(function(){ - Router.go('/'); - }); - } -}); \ No newline at end of file diff --git a/client/views/users/signup.html b/client/views/users/signup.html deleted file mode 100644 index e8d7c0aec..000000000 --- a/client/views/users/signup.html +++ /dev/null @@ -1,28 +0,0 @@ - \ No newline at end of file diff --git a/client/views/users/signup.js b/client/views/users/signup.js deleted file mode 100644 index 9b7f5c409..000000000 --- a/client/views/users/signup.js +++ /dev/null @@ -1,33 +0,0 @@ -Template[getTemplate('signup')].events({ - 'click input[type=submit]': function(event){ - event.preventDefault(); - var username = $('#username').val(); - var email = $('#email').val(); - var password = $('#password').val(); - if(!username || !email || !password){ - throwError(i18n.t('Please fill in all fields')); - return false; - } - Accounts.createUser({ - username: username - , email: email - , password: password - }, function(err){ - if(err){ - console.log(err); - }else{ - Router.go('/'); - } - }); - }, - - 'click #signin': function(){ - Router.go('/signin'); - }, - - 'click .twitter-button': function(){ - Meteor.loginWithTwitter(function(){ - Router.go('/'); - }); - } -}); \ No newline at end of file diff --git a/lib/router.js b/lib/router.js index 8e6ab5a24..907d13226 100644 --- a/lib/router.js +++ b/lib/router.js @@ -65,12 +65,9 @@ Comment Submit -------------------- User Profie User Edit -Forgot Password Account All Users Unsubscribe (from notifications) -Sign Up -Sign In 6) Misc Routes -------------------- @@ -137,7 +134,7 @@ Router._filters = { isLoggedIn: function(pause) { if (!(Meteor.loggingIn() || Meteor.user())) { throwError(i18n.t('Please Sign In First.')); - this.render('signin'); + this.render('entrySignIn'); // should route with a return session being set. pause(); } }, @@ -248,7 +245,7 @@ if(Meteor.isClient){ Router.onBeforeAction(filters.canView, {except: ['entrySignIn', 'entrySignUp', 'entryForgotPassword', 'entryResetPassword', 'entrySignOut']}); Router.onBeforeAction(filters.hasCompletedProfile); Router.onBeforeAction(filters.isLoggedIn, {only: ['post_submit']}); - Router.onBeforeAction(filters.isLoggedOut, {only: ['signin', 'signup']}); + Router.onBeforeAction(filters.isLoggedOut, {only: []}); Router.onBeforeAction(filters.canPost, {only: ['posts_pending', 'post_submit']}); Router.onBeforeAction(filters.canEditPost, {only: ['post_edit']}); Router.onBeforeAction(filters.canEditComment, {only: ['comment_edit']}); @@ -616,12 +613,6 @@ Meteor.startup(function () { controller: AccountController }); - // Forgot Password - - this.route('forgot_password', { - template: getTemplate('forgot_password'), - }); - // All Users this.route('all-users', { @@ -658,18 +649,6 @@ Meteor.startup(function () { } }); - // User Sign-Up - - this.route('signup', { - template: getTemplate('signup'), - }); - - // User Sign-In - - this.route('signin', { - template: getTemplate('signin'), - }); - // -------------------------------------------- Other -------------------------------------------- // From ed97a26d453ed98715b4b15c00d75270620814a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niklas=20Stro=CC=88m?= Date: Mon, 8 Sep 2014 01:52:09 +0800 Subject: [PATCH 2/3] removed the last few references to the old sign in flow - (trying to up up vote comments without being signed in etc.) also unified all references to /sign-in to use the getSigninUrl() --- client/views/comments/comment_item.js | 10 +++++----- client/views/posts/modules/post_upvote.js | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/client/views/comments/comment_item.js b/client/views/comments/comment_item.js index 65c4b6705..57fe48994 100644 --- a/client/views/comments/comment_item.js +++ b/client/views/comments/comment_item.js @@ -156,7 +156,7 @@ Template.comment_item.events({ 'click .not-upvoted .upvote': function(e, instance){ e.preventDefault(); if(!Meteor.user()){ - Router.go('/signin'); + Router.go(getSigninUrl()); throwError(i18n.t("Please log in first")); } Meteor.call('upvoteComment', this, function(error, result){ @@ -166,7 +166,7 @@ Template.comment_item.events({ 'click .upvoted .upvote': function(e, instance){ e.preventDefault(); if(!Meteor.user()){ - Router.go('/signin'); + Router.go(getSigninUrl()); throwError(i18n.t("Please log in first")); } Meteor.call('cancelUpvoteComment', this, function(error, result){ @@ -176,7 +176,7 @@ Template.comment_item.events({ 'click .not-downvoted .downvote': function(e, instance){ e.preventDefault(); if(!Meteor.user()){ - Router.go('/signin'); + Router.go(getSigninUrl()); throwError(i18n.t("Please log in first")); } Meteor.call('downvoteComment', this, function(error, result){ @@ -186,11 +186,11 @@ Template.comment_item.events({ 'click .downvoted .downvote': function(e, instance){ e.preventDefault(); if(!Meteor.user()){ - Router.go('/signin'); + Router.go(getSigninUrl()); throwError(i18n.t("Please log in first")); } Meteor.call('cancelDownvoteComment', this, function(error, result){ trackEvent("post downvote cancelled", {'commentId':instance.data._id, 'postId': instance.data.post, 'authorId':instance.data.userId}); }); } -}); \ No newline at end of file +}); diff --git a/client/views/posts/modules/post_upvote.js b/client/views/posts/modules/post_upvote.js index 4aa091c77..0eb7b73c2 100644 --- a/client/views/posts/modules/post_upvote.js +++ b/client/views/posts/modules/post_upvote.js @@ -15,11 +15,11 @@ Template[getTemplate('postUpvote')].events({ var post = this; e.preventDefault(); if(!Meteor.user()){ - Router.go('/sign-in'); + Router.go(getSigninUrl()); throwError(i18n.t("Please log in first")); } Meteor.call('upvotePost', post, function(error, result){ trackEvent("post upvoted", {'_id': post._id}); }); } -}); \ No newline at end of file +}); From e8a895443e0c7b5975b6f299de57a6b44f67efbd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niklas=20Stro=CC=88m?= Date: Mon, 8 Sep 2014 02:08:34 +0800 Subject: [PATCH 3/3] Set fromWhere session to return to the current page after successful login. (eg. if i go to /submit without being logged in, I will be moved to the the login page, and after a successful login i will be transferred back to the submit page) --- lib/router.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/router.js b/lib/router.js index 907d13226..47a208e14 100644 --- a/lib/router.js +++ b/lib/router.js @@ -134,7 +134,11 @@ Router._filters = { isLoggedIn: function(pause) { if (!(Meteor.loggingIn() || Meteor.user())) { throwError(i18n.t('Please Sign In First.')); - this.render('entrySignIn'); // should route with a return session being set. + var current = getCurrentRoute(); + if (current){ + Session.set('fromWhere', current); + } + this.render('entrySignIn'); pause(); } },