Merge pull request cse442-fall-2019-offering#89 from cse442-fall-2019…

…-offering/develop Merge develop without blank test user from login
RiggiG · Dec 4, 2019 · b3204c6 · b3204c6
2 parents 09d01e6 + d75b0d6
commit b3204c6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/system/display/index.html b/system/display/index.html
@@ -23,7 +23,9 @@ <h1 class="login">Enter your credentials or swipe your ID card to login.</h1>
           <br>
           <br>
           <input class="login" type="button" onclick="uLogin();" value="Login" id="login">
-          <!--<p class="user">New User?
+	  <br>
+	  <span id="errortext" style="color:red;"></span>
+	  <!--<p class="user">New User?
             <a href="#">Create Account</a>
           </p>
 	  -->

diff --git a/system/main.js b/system/main.js
@@ -11,10 +11,6 @@ function getLoginTest() {
 		{
 			username: "edmund",
 			password: "qwerty"
-		},
-		{
-			username: "",
-			password: ""
 		}
 	];
 	return loginTest;
@@ -82,6 +78,7 @@ function uLogin(){
 	}
 	else{
 	    console.log("No such account");
+	    document.getElementById("errortext").innerHTML = "Error: invalid credentials.";
 	}
 }