From 608de1ed9eba1cd1b9bad961d3d9933a3c467563 Mon Sep 17 00:00:00 2001 From: Wojciech Kalemba Date: Wed, 30 Aug 2017 19:49:42 +0200 Subject: [PATCH] Issue #44: Redesign forgot/reset/confirm pages (#83) * #44 Redesign sign-up page * #44 Redesign forgot password page * #44 Redesign confirm forgot password page * #44 Redesign confirm reset password page * #44 Redesign reset password page. Adjust buttons and cleanup. * #44 Redesign confirm setup page * #44 Adjust boxes to small screens * #44 Update custom regexp validator to allow only texts with uppercase AND lowercase letters. --- .../common/customValidators/CustomRegex.ts | 2 +- .../forgot-confirmation.html | 27 ++- .../forgot-password/forgot-password.html | 51 ++++-- .../reset-confirmation.html | 29 +++- .../views/reset-password/reset-password.html | 61 +++---- .../email-confirmation.html | 29 +++- .../ui/src/app/views/setup/setup.component.ts | 1 + .../src/ui/src/app/views/setup/setup.scss | 156 ++++++++++++++++++ .../src/app/views/setup/sign-up/sign-up.html | 102 +++++++----- .../ui/src/assets/styles/icons/ArgoPro.svg | 71 ++++++++ .../assets/styles/icons/argologo-white.svg | 1 + 11 files changed, 421 insertions(+), 109 deletions(-) create mode 100644 saas/axops/src/ui/src/app/views/setup/setup.scss create mode 100644 saas/axops/src/ui/src/assets/styles/icons/ArgoPro.svg create mode 100644 saas/axops/src/ui/src/assets/styles/icons/argologo-white.svg diff --git a/saas/axops/src/ui/src/app/common/customValidators/CustomRegex.ts b/saas/axops/src/ui/src/app/common/customValidators/CustomRegex.ts index 4e81b2ccb25f..d98dc935d4ac 100644 --- a/saas/axops/src/ui/src/app/common/customValidators/CustomRegex.ts +++ b/saas/axops/src/ui/src/app/common/customValidators/CustomRegex.ts @@ -2,7 +2,7 @@ export class CustomRegex { // Password will match only: 8+ letters, at least 1 lower case letter, // at least 1 upper case letter, and at least 1 special character - public static password = /^(?=.*?[A-Za-z])(?=.*?[0-9])(?=.*?[#?!@()_+=;:"\'<>,./~{\[\\}|\]$%^&*-]).{8,}$/; + public static password = /^(?=.*?[A-Z])(?=.*?[a-z])(?=.*?[0-9])(?=.*?[#?!@()_+=;:"\'<>,./~{\[\\}|\]$%^&*-]).{8,}$/; // Minimum 8 characters at least 1 Alphabet, 1 Number and 1 Special Character: // public static password: string = '^(?=.*[A-Za-z])(?=.*\d)(?=.*[$@$!%*#?&])[A-Za-z\d$@$!%*#?&]{8,}$'; diff --git a/saas/axops/src/ui/src/app/views/forgot-password/forgot-confirmation/forgot-confirmation.html b/saas/axops/src/ui/src/app/views/forgot-password/forgot-confirmation/forgot-confirmation.html index 9ec6322643f9..62dca8245d10 100644 --- a/saas/axops/src/ui/src/app/views/forgot-password/forgot-confirmation/forgot-confirmation.html +++ b/saas/axops/src/ui/src/app/views/forgot-password/forgot-confirmation/forgot-confirmation.html @@ -1,10 +1,23 @@ -
-