Skip to content
Snippets Groups Projects
Commit 8538418d authored by Jenny Farstad Blindheimsvik's avatar Jenny Farstad Blindheimsvik
Browse files

TEST

parents 23937424 7dc4a22e
No related branches found
No related tags found
No related merge requests found
Pipeline #72149 passed
......@@ -45,7 +45,7 @@ user_careful=50
user_warning=70
user_critical=90
# add action when CPU > 90 %
user_critical_action=echo "Warning. CPU percentage is {{percentage}}" > test.txt
user_critical_action=echo "Warning. CPU percentage is way too high." >> ~/warnings.txt
#user_log=False
system_careful=50
system_warning=70
......
# DAG 1
# Hvis vi kunne gjort iterasjonen på nytt:
## Hva ville vi gjort annerledes?
Ingenting, det gikk veldig bra og vi var veldig effektiv
......@@ -9,4 +10,7 @@ Alt
Mye
# Hva kan forbedres?
Gruppeinndeling..
\ No newline at end of file
Gruppeinndeling. Gruppeinndeling tok veldig lan tid. var rart at workshopen ikke var obligatorisk for alle da viktigeten av arbeidet på tvers av studieprogrammene ble satt veldig stort fokus på på forhånd.
# DAG 2
......@@ -25,23 +25,6 @@ public class UserResource {
public List<User> getUsers(){
UserDAO userDAO = new UserDAO();
new Thread(){
public void run(){
Date date = new Date();
int number = 0;
boolean run = true;
while (run) {
number++;
if (number == Integer.MAX_VALUE) {
Date newDate = new Date();
if(newDate.getTime()-date.getTime() > 25000) run = false;
number = 0;
}
}
}
}.start();
return userDAO.getUsers();
}
......
......@@ -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 {
......
<!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
......@@ -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', {
......
......@@ -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",
......
......@@ -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
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment