commit fixes

Author: ernest-phillips

public/auth.page.js

@@ -20,18 +20,19 @@ function onSignUpSubmit(event) {
     HTTP.signupUser({
         userData,
         onSuccess: user => {
-            alert(`User "${user.username}" created, you may now log in.`);
+
+            $('.alert').html(`User "${user.username}" created, you may now log in.`);
             window.open('/login.html', '_self');
         },
         onError: err => {
-            alert('There was a problem processing your request, please try again later.');
+            $('.alert').html('A user with that username and/or email already exists.')
+
 
         }
     });
 }
 
 function onLoginSubmit(event) {
-    console.log("OnLogin Running")
 
     event.preventDefault();
     const userData = {
@@ -46,11 +47,11 @@ function onLoginSubmit(event) {
             authenticatedUser.jwtToken = response.jwtToken;
             CACHE.saveAuthenticatedUserIntoCache(authenticatedUser);
 
-            alert('Login succesful, redirecting you to homepage ...');
+            $('.alert').html('Login succesful, redirecting you to homepage ...');
             window.open('/home.html', '_self');
         },
         onError: err => {
-            alert('Incorrect username or password. Please try again.');
+            $('.alert').html('Incorrect username or password. Please try again.');
         }
     });
 }

public/css/main.css

@@ -963,4 +963,20 @@ input[type=number]::-webkit-outer-spin-button {
     .wo-container {
         width: 320px;
     }
+}
+
+
+/* INVALID FORMS */
+
+input:required:invalid {
+    border-color: #C00000;
+}
+
+.labels {
+    text-align: left;
+    font-size: 2rem;
+}
+
+.alert {
+    color: #C00000
 }

public/home.js

@@ -36,20 +36,13 @@ function onWorkoutCardClick(event) {
 
 // Handle deleting Workouts
 function onDeleteWorkoutBtnClick(event) {
-    /**
-     * Because "onWorkoutDeleteClick" and "onWorkoutClick" both are listening for clicks inside of
-     * #Workout-card element, we need to call event.stopImmediatePropagation to avoid both
-     * event listeners firing when we click on the delete button inside #Workout-card.
-     */
+
     event.stopImmediatePropagation();
-    // Step 1: Get the Workout id to delete from it's parent.
     const workoutId = $(event.currentTarget)
         .closest('#workout-card')
         .attr('data-workout-id');
-    // Step 2: Verify use is sure of deletion
     const userSaidYes = confirm('Are you sure you want to delete this workout?');
     if (userSaidYes) {
-        // Step 3: Make ajax call to delete workout
         HTTP.deleteWorkout({
             workoutId: workoutId,
             jwtToken: STATE.authUser.jwtToken,

public/login.html

@@ -33,6 +33,7 @@ <h1>Sign into your account</h1>
                         <p class="message"> Not registered?
                             <a class="js-signUp" href="/signup.html">Create an account </a>
                         </p>
+                        <h4 class="alert"></h4>
                     </div>
 
                 </div>

public/signup.html

@@ -28,14 +28,19 @@ <h1 class="log-logo">
 
                         <h1>Create Free Account</h1>
                         <form id="sign-up-form" class="signup-form" action="/api/user" method="POST">
+                            <label class="labels" for="name">Name</labelclass>
+                            <input class="item" id="name-txt" type="text" placeholder="name" name="name" autocomplete="off" pattern=".{4,}" title="4 Characters min." required/>
 
-                            <input class="item" id="name-txt" type="text" placeholder="name" name="name" autocomplete="off" required/>
+                            <label class="labels" for="username">Username</label>
                             <input class="item" id="username-txt" type="text" placeholder="username" name="username" autocomplete="off" required/>
+                            <label class="labels" for="password">Password</label>
                             <input class="item" id="password-txt" type="password" placeholder="password" name="password" autocomplete="off" pattern="(?=.*\d)(?=.*[a-z])(?=.*[A-Z]).{8,}" title="Must contain at least one number and one uppercase and lowercase letter, and at least 8 or more characters"
                                 required/>
-                            <input class="item" id="email-txt" type="text" placeholder="email address" name="email" autocomplete="off" />
-                            <button class="login-btn" type="submit">Register</button>
-                            <p class="message">Already registered? <a href="./login.html">Sign In</a></p>
+                            <labelclass="labels" for="email">E-mail</label>
+                                <input class="item" id="email-txt" type="text" placeholder="email address" name="email" autocomplete="off" />
+                                <button class="login-btn" type="submit">Register</button>
+                                <p class="message">Already registered? <a href="./login.html">Sign In</a></p>
+                                <h4 class="alert"></h4>
                         </form>
                     </div>
                 </div>

public/utilities/cache.module.js

@@ -38,4 +38,6 @@ function deleteAuthenticatedUserFromCache() {
     localStorage.removeItem('username');
     localStorage.removeItem('name');
     localStorage.removeItem('email');
+    localStorage.removeItem('currentDate');
+    localStorage.removeItem('dateString');
 }