Skip to content
Snippets Groups Projects
Commit 57ea95e0 authored by Gustav Elmqvist's avatar Gustav Elmqvist
Browse files

Fixed input validation

parent b4044a80
No related branches found
No related tags found
No related merge requests found
...@@ -58,20 +58,17 @@ loadWelcomeView = function() { ...@@ -58,20 +58,17 @@ loadWelcomeView = function() {
loginform.addEventListener("submit", function(event) { loginform.addEventListener("submit", function(event) {
event.preventDefault(); event.preventDefault();
if (inputValidation("loginform")) { var message = serverstub.signIn(loginform["email"].value, loginform["password"].value);
var message = serverstub.signIn(loginform["email"].value, loginform["password"].value); console.log(message);
console.log(message); if(!message.success) {
if(!message.success) { loginform["email"].value = "";
loginform["email"].value = ""; loginform["password"].value = "";
loginform["password"].value = ""; loginform["email"].setAttribute("placeholder", message.message);
loginform["email"].setAttribute("placeholder", message.message); } else {
} else { localStorage.setItem("logintoken", message.data);
localStorage.setItem("logintoken", message.data); loadProfileView();
loadProfileView(); }
}
}
}) })
} }
loadProfileView = function() { loadProfileView = function() {
...@@ -235,51 +232,38 @@ reloadBoard = function(board, email=null) { ...@@ -235,51 +232,38 @@ reloadBoard = function(board, email=null) {
inputValidation = function(formID) { inputValidation = function(formID) {
var form = document.forms[formID]; var form = document.forms[formID];
let allInputs = form.querySelectorAll("input"); var emptyField = false;
var valid = true; form.querySelectorAll("input").forEach(function(elem) {
allInputs.forEach(function(elem) {
if(elem.type === "text" && elem.value === "") { if(elem.type === "text" && elem.value === "") {
elem.setAttribute("placeholder", "Don't leave blank"); elem.setAttribute("placeholder", "Don't leave blank");
valid = false; emptyField = true;
} }) }
if (form["email"] != null && !validateEmail(form)) { })
valid = false; return !emptyField && validateEmail(form) && validatePassword(form)
}
valid = validatePassword(form, formID);
return valid;
} }
function validateEmail(form) { function validateEmail(form) {
var validRegex = /\w+@\w+\.\w+/ var valid = form["email"].value.match(/\w+@\w+\.\w+/)
var email = form["email"]; if (!valid) {
if (!email.value.match(validRegex)) {
email.value = ""; email.value = "";
email.setAttribute("placeholder", "Invalid email"); email.setAttribute("placeholder", "Invalid email");
return false;
} }
return true; return valid;
} }
function validatePassword(form, formID) { function validatePassword(form) {
if((formID == "signupform" || formID == "changepassform") && form["password"].value != form["password2"].value) { if (form['password'].value == form['password2'].value && form['password'].value.length >= 8) {
form["password"].value = ""; return true
form["password2"].value = ""; }
if (form['password'].value != form['password2'].value) {
form["password"].setAttribute("placeholder", "Passwords must match"); form["password"].setAttribute("placeholder", "Passwords must match");
form["password2"].setAttribute("placeholder", "Passwords must match"); }
return false; else if (form['password'].value.length < 8) {
}
if((formID == "signupform" || formID == "changepassform") && form["password"].value.length < 8) {
form["password"].value = "";
form["password2"].value = "";
form["password"].setAttribute("placeholder", "Password must be 8 characters or longer"); form["password"].setAttribute("placeholder", "Password must be 8 characters or longer");
return false; }
} form["password"].value = "";
if(formID == "loginform" && form["password"].value.length < 8) { form["password2"].value = "";
form["password"].value = ""; return false;
form["password"].setAttribute("placeholder", "Wrong password");
return false;
}
return true;
} }
function openTab(event, tabName) { function openTab(event, tabName) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment