From 48f66a3da5f238afa337e6abbe615896d1320eae Mon Sep 17 00:00:00 2001 From: eashaw Date: Mon, 24 Jan 2022 20:12:41 -0600 Subject: [PATCH] Website redirect updates and bug fixes (#3859) * fix logout redirect * clear form input when clearing a quote * reset password redirect * fix new-password styes, fix broken links on unauthorized view * disable IOS dropdown appearance --- website/api/controllers/account/logout.js | 2 +- website/assets/js/pages/customers/new-license.page.js | 1 + website/assets/js/pages/entrance/new-password.page.js | 6 +++--- website/assets/styles/pages/contact.less | 1 + website/views/498.ejs | 4 ++-- website/views/pages/customers/new-license.ejs | 2 +- website/views/pages/entrance/new-password.ejs | 9 +++++++-- 7 files changed, 16 insertions(+), 9 deletions(-) diff --git a/website/api/controllers/account/logout.js b/website/api/controllers/account/logout.js index 8119faa6ef..bdb1d2ba48 100644 --- a/website/api/controllers/account/logout.js +++ b/website/api/controllers/account/logout.js @@ -41,7 +41,7 @@ actually logged in. (If they weren't, then this action is just a no-op.)`, // > Under the covers, this persists the now-logged-out session back // > to the underlying session store. if (!this.req.wantsJSON) { - throw {redirect: '/'}; + throw {redirect: '/customers/login'}; } } diff --git a/website/assets/js/pages/customers/new-license.page.js b/website/assets/js/pages/customers/new-license.page.js index fba5c7dbde..53aa0c9929 100644 --- a/website/assets/js/pages/customers/new-license.page.js +++ b/website/assets/js/pages/customers/new-license.page.js @@ -83,6 +83,7 @@ parasails.registerPage('new-license', { clickResetForm: async function() { // When the "X" is clicked... this.formErrors = {}; + this.formData.numberOfHosts = undefined; this.showBillingForm = false; this.numberOfHostsQuoted = undefined; // When the input field has been rendered back into existence, focus it for our friendly user. diff --git a/website/assets/js/pages/entrance/new-password.page.js b/website/assets/js/pages/entrance/new-password.page.js index 6729c24922..74a032f5ab 100644 --- a/website/assets/js/pages/entrance/new-password.page.js +++ b/website/assets/js/pages/entrance/new-password.page.js @@ -15,8 +15,8 @@ parasails.registerPage('new-password', { // Form rules formRules: { - password: {required: true}, - confirmPassword: {required: true, sameAs: 'password'}, + password: {required: true, minLength: 8}, + confirmPassword: {required: true, minLength: 8, sameAs: 'password'}, }, // Server error state for the form @@ -45,7 +45,7 @@ parasails.registerPage('new-password', { // > (Note that we re-enable the syncing state here. This is on purpose-- // > to make sure the spinner stays there until the page navigation finishes.) this.syncing = true; - window.location = '/'; + window.location = '/customers/login'; }, } diff --git a/website/assets/styles/pages/contact.less b/website/assets/styles/pages/contact.less index c240d894f0..9b0ffcca18 100644 --- a/website/assets/styles/pages/contact.less +++ b/website/assets/styles/pages/contact.less @@ -27,6 +27,7 @@ } .selectbox select { appearance: none; + -webkit-appearance: none; } @media (max-width: 575px) { diff --git a/website/views/498.ejs b/website/views/498.ejs index 2a02e2d048..9b06a39ed2 100644 --- a/website/views/498.ejs +++ b/website/views/498.ejs @@ -3,8 +3,8 @@

Sorry, that link is expired, or
 it has already been used.

-

Need further help accessing your account?
 Please contact support or request a new password reset.

- Reset password +

Need further help accessing your account?
 Please contact support or request a new password reset.

+ Reset password
diff --git a/website/views/pages/customers/new-license.ejs b/website/views/pages/customers/new-license.ejs index 0e6af6a634..d921f3c51e 100644 --- a/website/views/pages/customers/new-license.ejs +++ b/website/views/pages/customers/new-license.ejs @@ -29,7 +29,7 @@ Order total
- ${{!showQuotedPrice ? quotedPrice : formData.numberOfHosts * 12}}.00 /year + ${{(!showQuotedPrice || _.isNaN(formData.numberOfHosts * 12)) ? quotedPrice : formData.numberOfHosts * 12}}.00 /year
diff --git a/website/views/pages/entrance/new-password.ejs b/website/views/pages/entrance/new-password.ejs index 973518e9bb..1c12a231f5 100644 --- a/website/views/pages/entrance/new-password.ejs +++ b/website/views/pages/entrance/new-password.ejs @@ -1,22 +1,27 @@
-

Change your password?

+

Change your password?

+
-
Please enter a password.
+
Please enter a password.
+
Password too short.
+

Minimum length is 8 characters

+
Password too short.
Your new password and confirmation do not match.
Submit
+
<%- /* Expose locals as `window.SAILS_LOCALS` :: */ exposeLocalsToBrowser() %>