Merge branch 'master' of https://gitlab.stud.idi.ntnu.no/erlendrr/devops-workshop

ba6cc895 · Nora Roxette Rydding · 71726411 · baf19de3 · ba6cc895 · ba6cc895
Commit ba6cc895 authored Mar 3, 2020 by Nora Roxette Rydding
--- a/src/main/webapp/css/index.css
+++ b/src/main/webapp/css/index.css
@@ -25,6 +25,11 @@ a:hover { color: #2C303C; }
    align-self: center;
    justify-self: center;
 }
+.login {
+    display:flex;
+    flex-direction: column;
+    justify-content: space-between;
+}

 .loginInput {
    align-self: center;
@@ -34,6 +39,7 @@ a:hover { color: #2C303C; }
    padding: 2px;
    margin: 2px;
    box-sizing: border-box;
+    margin-bottom:10px;
 }

 .loginBtn {

--- a/src/main/webapp/index.html
+++ b/src/main/webapp/index.html
 <!DOCTYPE html>
 <html lang="en">
+
 <head>
    <meta charset="UTF-8">
    <meta name="viewport" content="width=device-width, initial-scale=1.0">
@@ -8,16 +9,24 @@
    <link rel="stylesheet" href="css/app.css" />
    <title>ChatPage</title>
 </head>
+
 <body>
    <div class="container">
        <div class="navbar">
            <h1 class="header">Meldingsapplikasjon</h1>
        </div>
-        <form class="main" id="loginForm" onsubmit="login(event)">
+        <form class="main login" 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="[\s\S]*">
            <button class="loginBtn">Logg inn</button>
        </form>
    </div>
    <script type="text/javascript" src="./js/index.js"></script>
 </body>
+
+</html>>
+
+</html>index.js"></script>
+</body>
+
 </html>
\ No newline at end of file
--- 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', {
@@ -43,4 +44,6 @@ function loadApplication(user){
    sessionStorage.setItem("username", user.username);
    window.location.href = "../app.html"

+}ion.href = "../app.html"
+
 }
\ No newline at end of file
--- a/src/main/webapp/js/settings.js
+++ b/src/main/webapp/js/settings.js
@@ -2,13 +2,23 @@ document.getElementById("newUsername").value = sessionStorage.getItem("username"
 document.getElementById("cancelButton").addEventListener("click", function(){
    window.location.href = "../app.html";
 });
+document.getElementById("newUsernameButton").addEventListener("click", event => {
+    editUser(event)
+    window.location.href = "../app.html";
+});

 /**
 * Makes HTTP PUT request to server for updating username and password
 */
 function editUser (event) {
    event.preventDefault();
-    let newInformation = {};
+    let newUsername = document.getElementById('newUsername').value
+    let newPassword = document.getElementById('newPassword').value
+    let newInformation = {
+        username: newUsername,
+        password: newPassword
+    };
+    sessionStorage.setItem("username", newUsername);

    fetch('../api/user/'+sessionStorage.getItem("userId"), {
        method: "PUT",

--- a/src/main/webapp/settings.html
+++ b/src/main/webapp/settings.html
@@ -27,11 +27,13 @@
                       autocomplete="off"
                       type="password">

-                <button class="btn">Lagre</button>
+                <button class="btn" id="newUsernameButton" type="button">Lagre</button>
                <button class="btn" id="cancelButton" type="button">Avbryt</button>
            </form>
        </div>
    </div>
 <script src="js/settings.js"></script>
 </body>
+</html>"js/settings.js"></script>
+</body>
 </html>
\ No newline at end of file