Testing if Develop Can be Merged Into Master

components/changePassword/changePassword.html

@@ -10,6 +10,13 @@ <h1 id="changePasswordPageTitle" class="title-auth">Change Password</h1>
         <div id="changePasswordPageMessage" class="subtitle-auth" style="{{getChangePasswordMessageColor}}">{{getChangePasswordMessage}}</div>
 
         <form>
+          {{#if changePasswordErrorMessages}}
+            <div id="errorMessages" class="list-errors">
+              {{#each changePasswordErrorMessages}}
+                <div class="alert alert-danger list-item">{{this}}</div>
+              {{/each}}
+            </div>
+          {{/if}}
           <div class="input-symbol">
             <input id="changePasswordPageOldPasswordInput" type="password" name="oldPassword" placeholder="Old Password" style="{{getPasswordStyling}}" />
             <span class="fa fa-lock" title="Password"></span>

components/changePassword/changePassword.js

@@ -26,7 +26,7 @@ Template.changePassword.helpers({
       return "border: 1px solid #a94442";
     } else if (ActiveEntry.errorMessages.equals('password', "Password is weak")) {
       return "border: 1px solid #f2dede";
-    } else if (ActiveEntry.errorMessages.equals('password', "Password present")) {
+    } else if (ActiveEntry.successMessages.equals('password', "Password present")) {
       return "border: 1px solid green";
     } else {
       return "border: 1px solid gray";
@@ -39,18 +39,28 @@ Template.changePassword.helpers({
       return "border: 1px solid #a94442";
     } else if (ActiveEntry.errorMessages.equals('confirm', "Password is weak")) {
       return "border: 1px solid #f2dede";
-    } else if (ActiveEntry.errorMessages.equals('confirm', "Passwords match")) {
+    } else if (ActiveEntry.successMessages.equals('confirm', "Passwords match")) {
       return "border: 1px solid green";
     } else {
       return "border: 1px solid gray";
     }
+  },
+  changePasswordErrorMessages: function() {
+    if (ActiveEntry.errorMessages.get('password')) {
+      return [ActiveEntry.errorMessages.get('password')];
+    }
+
+    if (ActiveEntry.errorMessages.get('confirm')) {
+      return [ActiveEntry.errorMessages.get('confirm')];
+    }
+
+    return;
   }
 });
 
 Template.changePassword.events({
   'change, keyup #changePasswordPagePasswordInput': function (event, template) {
     var password = $('[name="password"]').val();
-    var confirmPassword = $('[name="confirm"]').val();
 
     ActiveEntry.verifyPassword(password);
     ActiveEntry.errorMessages.set('changePasswordError', null);
@@ -63,22 +73,11 @@ Template.changePassword.events({
     ActiveEntry.errorMessages.set('changePasswordError', null);
   },
   "submit": function (event, template) {
-    event.preventDefault();
-
     var oldPassword = $('[name="oldPassword"]').val();
-
     var password = $('[name="password"]').val();
     var confirmPassword = $('[name="confirm"]').val();
 
-    ActiveEntry.verifyConfirmPassword(password, confirmPassword);
-    ActiveEntry.errorMessages.set('changePasswordError', null);
-
-    Accounts.changePassword(oldPassword, confirmPassword, function(error) {
-      if (error) {
-        console.warn(error);
-        return;
-      }
-      console.log('Password changed!');
-    });
+    ActiveEntry.changePassword(oldPassword, password, confirmPassword);
+    event.preventDefault();
   }
 });

components/changePassword/changePassword.less

@@ -2,4 +2,14 @@
   input{
     padding-left: 40px;
   }
+  #errorMessages{
+    padding-top: .5rem;
+    padding-bottom: .5rem;
+    font-size: 14px;
+    box-sizing: border-box;
+    width: 100.5%;
+    margin-bottom: 15px;
+    color: red;
+    font-weight: bold;
+  }
 }

components/entrySignIn/entrySignIn.html

@@ -17,6 +17,13 @@ <h1 id="signInPageTitle" class="title-auth">Sign In.</h1>
           <p id="signInPageMessage" class="subtitle-auth" style="{{getSignInMessageColor}}">{{getSignInMessage}}</p>
 
           <form>
+            {{#if signInErrorMessages}}
+              <div id="errorMessages" class="list-errors">
+                {{#each signInErrorMessages}}
+                  <div class="alert alert-danger list-item">{{this}}</div>
+                {{/each}}
+              </div>
+            {{/if}}
             <div class="input-symbol">
               <input id="signInPageEmailInput" type="text" name="email" placeholder="Your Email" style="{{getEmailValidationStyling}}" />
               <i class="fa fa-envelope-o" title="Your Email"></i>

components/entrySignIn/entrySignIn.js

@@ -48,7 +48,7 @@ Template.entrySignIn.helpers({
       return "border: 1px solid #a94442";
     } else if (ActiveEntry.errorMessages.equals('email', "Email is poorly formatted")) {
       return "border: 1px solid #f2dede";
-    } else if (ActiveEntry.errorMessages.equals('email', "Email present")) {
+    } else if (ActiveEntry.successMessages.equals('email', "Email present")) {
       return "border: 1px solid green";
     } else {
       return "border: 1px solid gray";
@@ -59,11 +59,21 @@ Template.entrySignIn.helpers({
       return "border: 1px solid #a94442";
     } else if (ActiveEntry.errorMessages.equals('password', "Password is weak")) {
       return "border: 1px solid #f2dede";
-    } else if (ActiveEntry.errorMessages.equals('password', "Password present")) {
+    } else if (ActiveEntry.successMessages.equals('password', "Password present")) {
       return "border: 1px solid green";
     } else {
       return "border: 1px solid gray";
     }
+  },
+  signInErrorMessages: function() {
+    if (ActiveEntry.errorMessages.get("email")) {
+      return [ActiveEntry.errorMessages.get("email")];
+    }
+    if (ActiveEntry.errorMessages.get("password") === 'Password is required') {
+      return [ActiveEntry.errorMessages.get("password")];
+    }
+
+    return;
   }
 });
 
@@ -77,34 +87,36 @@ Template.entrySignIn.events({
   },
   'click #forgotPasswordButton': function (event) {
     event.preventDefault();
+    ActiveEntry.reset();
     Router.go('/forgotPassword');
   },
   "click #needAnAccountButton": function (event) {
     event.preventDefault();
+    ActiveEntry.reset();
     Router.go('/entrySignUp');
   },
   'keyup input[name="email"]': function (event, template) {
     var email = $('input[name="email"]').val();
 
-    ActiveEntry.verifyEmail(email);
+    //ActiveEntry.verifyEmail(email);
     ActiveEntry.errorMessages.set('signInError', null);
   },
   'change input[name="email"]': function (event, template) {
     var email = $('input[name="email"]').val();
 
-    ActiveEntry.verifyEmail(email);
+    //ActiveEntry.verifyEmail(email);
     ActiveEntry.errorMessages.set('signInError', null);
   },
   'keyup #signInPagePasswordInput': function (event, template) {
     var password = $('input[name="password"]').val();
 
-    ActiveEntry.verifyPassword(password);
+    //ActiveEntry.verifyPassword(password);
     ActiveEntry.errorMessages.set('signInError', null);
   },
   'change #signInPagePasswordInput': function (event, template) {
     var password = $('input[name="password"]').val();
 
-    ActiveEntry.verifyPassword(password);
+    //ActiveEntry.verifyPassword(password);
     ActiveEntry.errorMessages.set('signInError', null);
   },
   // 'submit': function (event, template) {
@@ -116,6 +128,7 @@ Template.entrySignIn.events({
   // },
   'click #signInToAppButton': function (event, template){
     console.log('click #signInToAppButton');
+    ActiveEntry.reset();
     // var emailValue = template.$('[name=email]').val();
     // var passwordValue = template.$('[name=password]').val();
     var emailValue = template.$('#signInPageEmailInput').val();

components/entrySignUp/entrySignUp.html

@@ -11,14 +11,13 @@ <h1 id="signUpPageTitle" class="title-auth">Join.</h1>
         <div id="signUpPageMessage" class="subtitle-auth" style="{{getSignUpMessageColor}}">{{getSignUpMessage}}</div>
 
         <form id="entrySignUpForm">
-          {{#if errorMessages}}
+          {{#if signUpErrorMessage}}
             <div id="errorMessages" class="list-errors">
-              {{#each errorMessages}}
+              {{#each signUpErrorMessage}}
                 <div class="alert alert-danger list-item">{{this}}</div>
               {{/each}}
             </div>
           {{/if}}
-
           <div class="input-symbol ">
             <input id="signUpPageFullNameInput" type="text" name="fullName" placeholder="Full Name" style="{{getFullNameStyling}}" />
             <i class="fa fa-user" title="Full Name"></i>
@@ -47,13 +46,13 @@ <h1 id="signUpPageTitle" class="title-auth">Join.</h1>
             <!-- <span class="icon-lock" title="Confirm Password"></span> -->
           </div>
         </form>
-          <br>
-          <br>
-          <button id="signUpPageJoinNowButton" type="submit" class="btn-primary btn-main btn-large" style="{{getButtonColor}}">Join Now</button>
+        <br>
+        <br>
+        <button id="signUpPageJoinNowButton" type="submit" class="btn-primary btn-main btn-large" style="{{getButtonColor}}">Join Now</button>
 
-          <br>
-          <br>
-          <button id="signUpPageSignInButton" class="btn-gray btn-main btn-large">Have an account? Sign in</button>
+        <br>
+        <br>
+        <button id="signUpPageSignInButton" class="btn-gray btn-main btn-large">Have an account? Sign in</button>
 
       </div>
 

components/entrySignUp/entrySignUp.js

@@ -41,7 +41,7 @@ Template.entrySignUp.helpers({
       return "border: 1px solid #a94442";
     } else if (ActiveEntry.errorMessages.equals('email', "Email is poorly formatted")) {
       return "border: 1px solid #f2dede";
-    } else if (ActiveEntry.errorMessages.equals('email', "Email present")) {
+    } else if (ActiveEntry.successMessages.equals('email', "Email present")) {
       return "border: 1px solid green";
     } else {
       return "border: 1px solid gray";
@@ -52,7 +52,7 @@ Template.entrySignUp.helpers({
       return "border: 1px solid #a94442";
     } else if (ActiveEntry.errorMessages.equals('password', "Password is weak")) {
       return "border: 1px solid #f2dede";
-    } else if (ActiveEntry.errorMessages.equals('password', "Password present")) {
+    } else if (ActiveEntry.successMessages.equals('password', "Password present")) {
       return "border: 1px solid green";
     } else {
       return "border: 1px solid gray";
@@ -69,7 +69,7 @@ Template.entrySignUp.helpers({
       return "border: 1px solid #a94442";
     } else if (ActiveEntry.errorMessages.equals('confirm', "Password is weak")) {
       return "border: 1px solid #f2dede";
-    } else if (ActiveEntry.errorMessages.equals('confirm', "Passwords match")) {
+    } else if (ActiveEntry.successMessages.equals('confirm', "Passwords match")) {
       return "border: 1px solid green";
     } else {
       return "border: 1px solid gray";
@@ -80,11 +80,25 @@ Template.entrySignUp.helpers({
       return "border: 1px solid #a94442";
     } else if (ActiveEntry.errorMessages.equals('fullName', "Name is probably not complete")) {
       return "border: 1px solid #f2dede";
-    } else if (ActiveEntry.errorMessages.equals('fullName', "Name present")) {
+    } else if (ActiveEntry.successMessages.equals('fullName', "Name present")) {
       return "border: 1px solid green";
     } else {
       return "border: 1px solid gray";
     }
+  },
+  signUpErrorMessage: function() {
+    var allErrorMessages = Object.keys(ActiveEntry.errorMessages.all()).filter(function(key) {
+      return key !== "signInError" && ActiveEntry.errorMessages.get(key);
+    });
+
+    if (allErrorMessages.length > 0) {
+      var errorMessage = ActiveEntry.errorMessages.get(allErrorMessages[0]);
+      if (errorMessage) {
+        return [errorMessage];
+      }
+    }
+
+    return;
   }
 });
 
@@ -99,13 +113,13 @@ Template.entrySignUp.events({
     ActiveEntry.verifyEmail(email);
     ActiveEntry.errorMessages.set('signInError', null);
   },
-  'change, keyup #signUpPagePasswordInput': function (event, template) {
+  'keyup #signUpPagePasswordInput': function (event, template) {
     var password = $('[name="password"]').val();
 
     ActiveEntry.verifyPassword(password);
     ActiveEntry.errorMessages.set('signInError', null);
   },
-  'change, keyup #signUpPagePasswordConfirmInput': function (event, template) {
+  'keyup #signUpPagePasswordConfirmInput': function (event, template) {
 
     var password = $('[name="password"]').val();
     var confirmPassword = $('[name="confirm"]').val();
@@ -124,10 +138,10 @@ Template.entrySignUp.events({
   'click #signUpPageJoinNowButton': function (event, template) {
 
     ActiveEntry.signUp(
-      $('#signUpPageEmailInput').val(),
-      $('#signUpPagePasswordInput').val(),
-      $('#signUpPagePasswordConfirmInput').val(),
-      $('#signUpPageFullNameInput').val()
+        $('#signUpPageEmailInput').val(),
+        $('#signUpPagePasswordInput').val(),
+        $('#signUpPagePasswordConfirmInput').val(),
+        $('#signUpPageFullNameInput').val()
     );
   }
 });

components/entrySignUp/entrySignUp.less

@@ -4,4 +4,19 @@
     padding-left: 40px !important;
     color: black;
   }
+  #errorMessages{
+    padding-top: .5rem;
+    padding-bottom: .5rem;
+    font-size: 14px;
+    box-sizing: border-box;
+    width: 100.5%;
+    margin-bottom: 15px;
+    color: red;
+    font-weight: bold;
+  }
 }
+
+#entrySignUp .progress{
+  height: 5px;
+  margin-bottom: 1px
+}

components/forgotPassword/forgotPassword.html

@@ -7,7 +7,7 @@
         {{/if}}
 
         <h1 id="signInPageTitle" class="title-auth">Forgot Password</h1>
-        <div id="signInPageMessage" class="subtitle-auth" >Imdivrove your clincal practice with checklists.</div>
+        <div id="signInPageMessage" class="subtitle-auth" >Improve your clinical practice with checklists.</div>
 
         <form>
           <div class="input-symbol">