Skip to content
Snippets Groups Projects
Commit 908b61c6 authored by Jakob Karevold Grønhaug's avatar Jakob Karevold Grønhaug
Browse files

Merge branch 'front-page-password' into 'master'

Added password input field to front page

See merge request !3
parents 775a6f55 d49839ba
Branches
No related tags found
1 merge request!3Added password input field to front page
Pipeline #158269 passed
...@@ -2,18 +2,20 @@ ...@@ -2,18 +2,20 @@
display: grid; display: grid;
grid-template-rows: 1fr 10fr; grid-template-rows: 1fr 10fr;
grid-template-columns: auto 8fr auto; grid-template-columns: auto 8fr auto;
grid-template-areas: 'navbar navbar navbar' '. main .'; grid-template-areas: "navbar navbar navbar" ". main .";
grid-gap: 2px; grid-gap: 2px;
height: 100%; height: 100%;
background: #EEEEEE; background: #eeeeee;
} }
a:hover { color: #2C303C; } a:hover {
color: #2c303c;
}
.navbar { .navbar {
display: grid; display: grid;
grid-area: navbar; grid-area: navbar;
grid-template-areas: 'header'; grid-template-areas: "header";
} }
.header { .header {
...@@ -40,7 +42,7 @@ a:hover { color: #2C303C; } ...@@ -40,7 +42,7 @@ a:hover { color: #2C303C; }
align-self: center; align-self: center;
justify-self: center; justify-self: center;
height: 40px; height: 40px;
background: #2C303C; background: #2c303c;
color: white; color: white;
border: none; border: none;
border-radius: 4px; border-radius: 4px;
...@@ -50,27 +52,27 @@ a:hover { color: #2C303C; } ...@@ -50,27 +52,27 @@ a:hover { color: #2C303C; }
} }
.loginBtn:hover { .loginBtn:hover {
background: #5C9EAD; background: #5c9ead;
border-color: #5C9EAD; border-color: #5c9ead;
color: white; color: white;
} }
@media only screen and (max-width: 480px) { @media only screen and (max-width: 480px) {
.container { .container {
grid-template-columns: auto; grid-template-columns: auto;
grid-template-areas: 'navbar' 'main'; grid-template-areas: "navbar" "main";
} }
.navbar { .navbar {
grid-template-columns: auto; grid-template-columns: auto;
grid-template-areas: 'header sysinfo'; grid-template-areas: "header sysinfo";
} }
.main { .main {
display: grid; display: grid;
grid-template-areas: grid-template-areas:
'usernameInput passwordInput' "usernameInput passwordInput"
'loginBtn loginBtn'; "loginBtn loginBtn";
grid-template-rows: 1fr 1fr; grid-template-rows: 1fr 1fr;
} }
......
...@@ -14,7 +14,8 @@ ...@@ -14,7 +14,8 @@
<h1 class="header">Meldings applikasjon</h1> <h1 class="header">Meldings applikasjon</h1>
</div> </div>
<form class="main" id="loginForm" onsubmit="login(event)"> <form class="main" id="loginForm" onsubmit="login(event)">
<input class="loginInput" placeholder="Brukernavn..." id="username" required pattern="([\w]+)"> <input class="loginInput" placeholder="Brukernavn..." id="username" required pattern="([\w]+)"></br>
<input class="loginInput" placeholder="Passord..." id="password" required type="password">
<button class="loginBtn">Logg inn</button> <button class="loginBtn">Logg inn</button>
</form> </form>
</div> </div>
......
...@@ -15,7 +15,8 @@ inputfield.addEventListener("input",function () { ...@@ -15,7 +15,8 @@ inputfield.addEventListener("input",function () {
function login(event){ function login(event){
event.preventDefault(); event.preventDefault();
let user = { let user = {
"username": document.getElementById('username').value "username": document.getElementById('username').value,
"password": document.getElementById('password').value
}; };
fetch('../api/user', { fetch('../api/user', {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment