Updated password validation & requirements

MyEtherWallet · Apr 30, 2016 · a388d7c · a388d7c
1 parent 38f98ee
commit a388d7c
Show file tree

Hide file tree

Showing 10 changed files with 6,922 additions and 7,726 deletions.
diff --git a/app/scripts/services/globalService.js b/app/scripts/services/globalService.js
@@ -28,13 +28,13 @@ var globalService = function($http, $httpParamSerializerJQLike) {
       name: "Offline Transaction",
             url:"offline-transaction"
     },
-    thedao: {
-      id: 5,
-      name: "\"The DAO\"",
-            url: "the-dao"
-    },
+//    thedao: {
+//      id: 5,
+//      name: "\"The DAO\"",
+//            url: "the-dao"
+//    },
     digix: {
-      id: 6,
+      id: 5,
       name: "Digix",
             url: "digix"
     },
@@ -44,7 +44,7 @@ var globalService = function($http, $httpParamSerializerJQLike) {
 //            url: "contracts"
 //    },
     help: {
-      id: 7,
+      id: 6,
       name: "Help",
             url: "help"
     }

diff --git a/app/styles/less/etherwallet-custom.less b/app/styles/less/etherwallet-custom.less
@@ -333,3 +333,15 @@ input[type="password"]+.eye{
     text-decoration: none;
   }
 }
+
+
+
+.form-control.valid:not(.ng-pristine) {
+  border: 1px solid @brand-success;
+  box-shadow: inset 0 1px 1px rgba(0,0,0,.075),0 0 8px fade(@brand-success, 60%);
+}
+
+.form-control.invalid:not(.ng-pristine) {
+  border: 1px solid @brand-danger;
+  box-shadow: inset 0 1px 1px rgba(0,0,0,.075),0 0 8px fade(@brand-danger, 60%);
+}
diff --git a/app/views/generateWallet.tpl b/app/views/generateWallet.tpl
@@ -4,7 +4,7 @@
   <div class="row">
     <div class="col-sm-6">
       <div class="form-group">
-        <h4>Enter password to encrypt private key <small>(min 7 characters)</small> </h4>
+        <h4>Enter a strong password <small> (at least 8 characters w/ at least 1 lowercase, 1 uppercase, 1 number)</small> </h4>
         <div class="input-group">
           <input type="{{showPass && 'password' || 'text'}}" class="form-control" placeholder="Don't forget to save this!" ng-model="password" ng-class="isStrongPass() ? 'valid' : 'invalid'"/>
           <span class="input-group-addon eye" ng-click="showPass=!showPass"></span>
@@ -13,7 +13,7 @@
     </div>
     <div class="col-sm-6">
       <div class="form-group">
-        <h4>Generate Wallet </h4>
+        <h4>Generate Wallet <br class="hidden-xs" /> <br class="hidden-xs" /></h4>
         <a class="btn btn-primary btn-block btnAction" func="generateSingleWallet" ng-click="genNewWallet()">GENERATE</a>
       </div>
     </div>

diff --git a/app/views/generateWalletEmbedded.tpl b/app/views/generateWalletEmbedded.tpl
@@ -5,7 +5,7 @@
   <div class="row">
     <div class="col-sm-6">
       <div class="form-group">
-        <h4>Enter password <small>(min 7 characters)</small> </h4>
+        <h4>Enter a strong password <small> (at least 8 characters w/ at least 1 lowercase, 1 uppercase, 1 number)</small> </h4>
         <div class="input-group">
           <input type="{{showPass && 'password' || 'text'}}" class="form-control" placeholder="Don't forget to save this!" ng-model="password" ng-class="isStrongPass() ? 'valid' : 'invalid'"/>
           <span class="input-group-addon eye" ng-click="showPass=!showPass"></span>
@@ -14,7 +14,7 @@
     </div>
     <div class="col-sm-6">
       <div class="form-group">
-        <h4>Generate Wallet </h4>
+        <h4>Generate Wallet <br class="hidden-xs" /> <br class="hidden-xs" /></h4>
         <a class="btn btn-primary btn-block btnAction" func="generateSingleWallet" ng-click="genNewWallet()">GENERATE</a>
       </div>
     </div>

diff --git a/dist/css/etherwallet-master.css b/dist/css/etherwallet-master.css
@@ -5690,6 +5690,14 @@ input[type="password"] + .eye:before {
 .digix-send a.active:focus {
   text-decoration: none;
 }
+.form-control.valid:not(.ng-pristine) {
+  border: 1px solid #5cb85c;
+  box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(92, 184, 92, 0.6);
+}
+.form-control.invalid:not(.ng-pristine) {
+  border: 1px solid #d9534f;
+  box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(217, 83, 79, 0.6);
+}
 /* Custom Utilities */
 .text-navy {
   color: #263c56;

diff --git a/dist/css/etherwallet-master.min.css b/dist/css/etherwallet-master.min.css
diff --git a/dist/embedded.html b/dist/embedded.html
@@ -49,7 +49,7 @@ <h2> Generate Wallet </h2>
   <div class="row">
     <div class="col-sm-6">
       <div class="form-group">
-        <h4>Enter password <small>(min 7 characters)</small> </h4>
+        <h4>Enter a strong password <small> (at least 8 characters w/ at least 1 lowercase, 1 uppercase, 1 number)</small> </h4>
         <div class="input-group">
           <input type="{{showPass && 'password' || 'text'}}" class="form-control" placeholder="Don't forget to save this!" ng-model="password" ng-class="isStrongPass() ? 'valid' : 'invalid'"/>
           <span class="input-group-addon eye" ng-click="showPass=!showPass"></span>
@@ -58,7 +58,7 @@ <h4>Enter password <small>(min 7 characters)</small> </h4>
     </div>
     <div class="col-sm-6">
       <div class="form-group">
-        <h4>Generate Wallet </h4>
+        <h4>Generate Wallet <br class="hidden-xs" /> <br class="hidden-xs" /></h4>
         <a class="btn btn-primary btn-block btnAction" func="generateSingleWallet" ng-click="genNewWallet()">GENERATE</a>
       </div>
     </div>

diff --git a/dist/index.html b/dist/index.html
@@ -74,7 +74,7 @@ <h2> Generate Wallet </h2>
   <div class="row">
     <div class="col-sm-6">
       <div class="form-group">
-        <h4>Enter password to encrypt private key <small>(min 7 characters)</small> </h4>
+        <h4>Enter a strong password <small> (at least 8 characters w/ at least 1 lowercase, 1 uppercase, 1 number)</small> </h4>
         <div class="input-group">
           <input type="{{showPass && 'password' || 'text'}}" class="form-control" placeholder="Don't forget to save this!" ng-model="password" ng-class="isStrongPass() ? 'valid' : 'invalid'"/>
           <span class="input-group-addon eye" ng-click="showPass=!showPass"></span>
@@ -83,7 +83,7 @@ <h4>Enter password to encrypt private key <small>(min 7 characters)</small> </h4
     </div>
     <div class="col-sm-6">
       <div class="form-group">
-        <h4>Generate Wallet </h4>
+        <h4>Generate Wallet <br class="hidden-xs" /> <br class="hidden-xs" /></h4>
         <a class="btn btn-primary btn-block btnAction" func="generateSingleWallet" ng-click="genNewWallet()">GENERATE</a>
       </div>
     </div>