From 8502ff8fa4ee75ee44da170597b32688ce38ae88 Mon Sep 17 00:00:00 2001
From: Kyle Spearrin <kyle.spearrin@gmail.com>
Date: Thu, 15 Nov 2018 15:40:56 -0500
Subject: [PATCH] add master password strength text

---
 jslib                                      |  2 +-
 src/_locales/en/messages.json              | 12 ++++++++++
 src/popup/accounts/register.component.html | 12 +++++++---
 src/popup/accounts/register.component.ts   | 17 --------------
 src/popup/scss/box.scss                    | 26 ++++++++++------------
 5 files changed, 34 insertions(+), 35 deletions(-)

diff --git a/jslib b/jslib
index be080f4f17..da47faca5c 160000
--- a/jslib
+++ b/jslib
@@ -1 +1 @@
-Subproject commit be080f4f17b782fdb22c77560bd235e81346fb21
+Subproject commit da47faca5c9a41f732136448461a06fc6e6fe023
diff --git a/src/_locales/en/messages.json b/src/_locales/en/messages.json
index dcc8aa7dee..67ed789828 100644
--- a/src/_locales/en/messages.json
+++ b/src/_locales/en/messages.json
@@ -1113,6 +1113,18 @@
   "whoOwnsThisItem": {
     "message": "Who owns this item?"
   },
+  "strong": {
+    "message": "Strong",
+    "description": "ex. A strong password. Scale: Weak -> Good -> Strong"
+  },
+  "good": {
+    "message": "Good",
+    "description": "ex. A good password. Scale: Weak -> Good -> Strong"
+  },
+  "weak": {
+    "message": "Weak",
+    "description": "ex. A weak password. Scale: Weak -> Good -> Strong"
+  },
   "weakMasterPassword": {
     "message": "Weak Master Password"
   },
diff --git a/src/popup/accounts/register.component.html b/src/popup/accounts/register.component.html
index 84d13adf47..3ac1b637cf 100644
--- a/src/popup/accounts/register.component.html
+++ b/src/popup/accounts/register.component.html
@@ -24,10 +24,16 @@
                 <div class="box-content-row" appBoxRow>
                     <div class="box-content-row-flex">
                         <div class="row-main">
-                            <label for="masterPassword">{{'masterPass' | i18n}}</label>
+                            <label for="masterPassword">
+                                {{'masterPass' | i18n}}
+                                <strong class="sub-label text-{{masterPasswordScoreColor}}"
+                                        *ngIf="masterPasswordScoreText">
+                                    {{masterPasswordScoreText}}
+                                </strong>
+                            </label>
                             <input id="masterPassword" type="{{showPassword ? 'text' : 'password'}}"
                                     name="MasterPassword" class="monospaced" [(ngModel)]="masterPassword" required
-                                    [appAutofocus]="email !== ''" appInputVerbatim  (input)="updatePasswordStrength()">
+                                    [appAutofocus]="email !== ''" appInputVerbatim (input)="updatePasswordStrength()">
                         </div>
                         <div class="action-buttons">
                             <a class="row-btn" href="#" appStopClick appBlurClick
@@ -38,7 +44,7 @@
                         </div>
                     </div>
                     <div class="progress">
-                        <div class="progress-bar {{masterPasswordScoreColor}}" role="progressbar" aria-valuenow="0"
+                        <div class="progress-bar bg-{{masterPasswordScoreColor}}" role="progressbar" aria-valuenow="0"
                             aria-valuemin="0" aria-valuemax="100" [ngStyle]="{width: (masterPasswordScoreWidth + '%')}"
                             attr.aria-valuenow="{{masterPasswordScoreWidth}}"></div>
                     </div>
diff --git a/src/popup/accounts/register.component.ts b/src/popup/accounts/register.component.ts
index e738a9ac06..19fa0c1962 100644
--- a/src/popup/accounts/register.component.ts
+++ b/src/popup/accounts/register.component.ts
@@ -23,21 +23,4 @@ export class RegisterComponent extends BaseRegisterComponent {
         super(authService, router, i18nService, cryptoService, apiService, stateService, platformUtilsService,
             passwordGenerationService);
     }
-
-    get masterPasswordScoreWidth() {
-        return this.masterPasswordScore == null ? 0 : (this.masterPasswordScore + 1) * 20;
-    }
-
-    get masterPasswordScoreColor() {
-        switch (this.masterPasswordScore) {
-            case 4:
-                return 'bg-success';
-            case 3:
-                return 'bg-primary';
-            case 2:
-                return 'bg-warning';
-            default:
-                return 'bg-danger';
-        }
-    }
 }
diff --git a/src/popup/scss/box.scss b/src/popup/scss/box.scss
index 858ca764fb..ccf3b3d7ac 100644
--- a/src/popup/scss/box.scss
+++ b/src/popup/scss/box.scss
@@ -84,6 +84,10 @@
                 @include themify($themes) {
                     color: themed('mutedColor');
                 }
+
+                .sub-label {
+                    margin-left: 10px;
+                }
             }
 
             .text, .detail {
@@ -376,23 +380,17 @@
             .progress {
                 display: flex;
                 height: 5px;
-                overflow: hidden; // force rounded corners by cropping it
-                font-size: $font-size-small;
-                margin: 10px -15px -10px;
+                overflow: hidden;
+                margin: 5px -15px -10px;
 
-                @include themify($themes) {
-                    background-color: themed('borderColor');
+                .progress-bar {
+                    display: flex;
+                    flex-direction: column;
+                    justify-content: center;
+                    white-space: nowrap;
+                    background-color: $brand-primary;
                 }
             }
-              
-            .progress-bar {
-                display: flex;
-                flex-direction: column;
-                justify-content: center;
-                text-align: center;
-                white-space: nowrap;
-                background-color: $brand-primary;
-            }
         }
 
         &.condensed .box-content-row, .box-content-row.condensed {