Skip to content
Snippets Groups Projects
Commit bfa9f76d authored by JacobTheisen's avatar JacobTheisen
Browse files

halla

parent ab849a86
No related branches found
No related tags found
No related merge requests found
Pipeline #72056 passed with warnings
Stage: test
Stage: deploy
Show whitespace changes
Inline Side-by-side
src/main/webapp/app.html
+ 107
− 61
View file @ bfa9f76d
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en"> <html lang="en">
<head> <head>
<meta charset="UTF-8"> <meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="viewport" content="width=device-width, initial-scale=1.0" />
<link rel="stylesheet" href="css/app.css" /> <link rel="stylesheet" href="css/app.css" />
<link rel="stylesheet" href="css/popup.css" /> <link rel="stylesheet" href="css/popup.css" />
<title>Application</title> <title>Application</title>
...@@ -17,7 +16,7 @@ ...@@ -17,7 +16,7 @@
</div> </div>
<div class="menu"> <div class="menu">
<ul> <ul>
<li><a href="#">Ressursovervåking</a></li> <li><a href="http://129.241.96.83:61208/">Ressursovervåking</a></li>
<li><a href="#">Logg</a></li> <li><a href="#">Logg</a></li>
<li><a href="./settings.html">Innstillinger</a></li> <li><a href="./settings.html">Innstillinger</a></li>
<li><a href="/">Logg ut</a></li> <li><a href="/">Logg ut</a></li>
...@@ -30,19 +29,30 @@ ...@@ -30,19 +29,30 @@
</div> </div>
<ul id="userList"> <ul id="userList">
<li onclick="openCalculator(); toggleUserList();"><i class="fas fa-user userIcon"></i>Kalkulator</li> <li onclick="openCalculator(); toggleUserList();">
<i class="fas fa-user userIcon"></i>Kalkulator
</li>
</ul> </ul>
<ul id="groupChatList"> <ul id="groupChatList"></ul>
</ul>
<div class="popup" id="formpopup"> <div class="popup" id="formpopup">
<form class="popupContainer" autocomplete="off" onsubmit="createGroupChat(event); toggleUserList();"> <form
class="popupContainer"
autocomplete="off"
onsubmit="createGroupChat(event); toggleUserList();"
>
<div class="popupHeader"> <div class="popupHeader">
<h1>Gruppesamtale</h1> <h1>Gruppesamtale</h1>
<label><b>Gruppenavn</b></label> <label><b>Gruppenavn</b></label>
<input class="popupInput" id="groupname" placeholder="Skriv inn navn på gruppesamtale" required pattern="[\w+]([\s\w+])+"> <input
<label><b>Velg deltakere</b></label> <br> class="popupInput"
id="groupname"
placeholder="Skriv inn navn på gruppesamtale"
required
pattern="[\w+]([\s\w+])+"
/>
<label><b>Velg deltakere</b></label> <br />
</div> </div>
<div class="popupUsers"> <div class="popupUsers">
...@@ -51,7 +61,13 @@ ...@@ -51,7 +61,13 @@
<div> <div>
<button class="popupBtn">Legg til</button> <button class="popupBtn">Legg til</button>
<button onclick="closeForm(event)" class="popupBtn" id="popupBtnAbort">Avbryt</button> <button
onclick="closeForm(event)"
class="popupBtn"
id="popupBtnAbort"
>
Avbryt
</button>
</div> </div>
</form> </form>
</div> </div>
...@@ -61,18 +77,48 @@ ...@@ -61,18 +77,48 @@
<h2 class="usernameReceiver" id="usernameReceiver"></h2> <h2 class="usernameReceiver" id="usernameReceiver"></h2>
<div class="messages" id="messages"></div> <div class="messages" id="messages"></div>
<form class="chatInput" id="messageForm" autocomplete="off" onsubmit="postMessage(event)"> <form
<input id="messageInput" class="textfield" type="text" placeholder="Melding..."> class="chatInput"
id="messageForm"
autocomplete="off"
onsubmit="postMessage(event)"
>
<input
id="messageInput"
class="textfield"
type="text"
placeholder="Melding..."
/>
<button class="submitBtn">Send melding</button> <button class="submitBtn">Send melding</button>
</form> </form>
<form class="chatInput" id="calculateForm" autocomplete="off" onsubmit="submitExpression(event)"> <form
<input id="expressionInput" class="textfield" type="text" placeholder="Regnestykke..."> class="chatInput"
id="calculateForm"
autocomplete="off"
onsubmit="submitExpression(event)"
>
<input
id="expressionInput"
class="textfield"
type="text"
placeholder="Regnestykke..."
/>
<button class="submitBtn">Send regnestykke</button> <button class="submitBtn">Send regnestykke</button>
</form> </form>
<form class="chatInput" id="groupChatForm" autocomplete="off" onsubmit="postGroupMessage(event)"> <form
<input id="groupMessageInput" class="textfield" type="text" placeholder="Melding..."> class="chatInput"
id="groupChatForm"
autocomplete="off"
onsubmit="postGroupMessage(event)"
>
<input
id="groupMessageInput"
class="textfield"
type="text"
placeholder="Melding..."
/>
<button class="submitBtn">Send melding</button> <button class="submitBtn">Send melding</button>
</form> </form>
</div> </div>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment