diff --git a/src/main/java/resources/CalculatorResource.java b/src/main/java/resources/CalculatorResource.java index b2ad6c1f5cd8ab1d44282723037773f4573dbad1..c36683c1fd3dfcdc35a4e5abc73f8bcec7d27a49 100644 --- a/src/main/java/resources/CalculatorResource.java +++ b/src/main/java/resources/CalculatorResource.java @@ -1,6 +1,5 @@ package resources; - import javax.ws.rs.Consumes; import javax.ws.rs.POST; import javax.ws.rs.Path; diff --git a/src/main/webapp/index.html b/src/main/webapp/index.html index 33d5d878eed8de101d9bd6b14c58c82e22b0be69..7edbf69ae0b24049b1b178a6815f9e27e51e8213 100644 --- a/src/main/webapp/index.html +++ b/src/main/webapp/index.html @@ -15,6 +15,7 @@ </div> <form class="main" id="loginForm" onsubmit="login(event)"> <input class="loginInput" placeholder="Brukernavn..." id="username" required pattern="([\w]+)"> + <input class="loginInput" type="password" placeholder="Passord..." id="password" required pattern="([\w]+)"> <button class="loginBtn">Logg inn</button> </form> </div> diff --git a/src/main/webapp/js/index.js b/src/main/webapp/js/index.js index 60d5a1f6a82d5eb71a3920cb936b7eb1f3789cd7..7b408f35cee437a8514d5d94103a4e0da5afe244 100644 --- a/src/main/webapp/js/index.js +++ b/src/main/webapp/js/index.js @@ -15,7 +15,8 @@ inputfield.addEventListener("input",function () { function login(event){ event.preventDefault(); let user = { - "username": document.getElementById('username').value + "username": document.getElementById('username').value, + "password": document.getElementById('password').value }; fetch('../api/user', {