diff --git a/src/main/java/resources/CalculatorResource.java b/src/main/java/resources/CalculatorResource.java index 5712a798cbe315637d0b34089b59ddb0ee3fc114..190ff52bbcc4f6c9fe6c899845952e5e8c18253e 100644 --- a/src/main/java/resources/CalculatorResource.java +++ b/src/main/java/resources/CalculatorResource.java @@ -1,6 +1,9 @@ package resources; +<<<<<<< HEAD +======= +>>>>>>> 794a6583a949557859a601f9399dfb3bbf0def40 import javax.ws.rs.Consumes; import javax.ws.rs.POST; import javax.ws.rs.Path; @@ -12,7 +15,6 @@ import javax.ws.rs.core.MediaType; */ @Path("/calculator") public class CalculatorResource { - /** * Method handling HTTP POST requests. The calculated answer to the expression will be sent to the client as * plain/text. @@ -47,7 +49,7 @@ public int calculate(String expression) { return result; } - +//Multiplication public int multiplication(String equation) { String[] split = equation.split("[*]"); int sum = Integer.parseInt(split[0]); 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', {