git fix
This commit is contained in:
parent
66f5f97ee3
commit
bb918a4ddc
7 changed files with 0 additions and 92 deletions
|
@ -3,17 +3,6 @@
|
|||
<head>
|
||||
<script>
|
||||
let termdiv;
|
||||
<<<<<<< HEAD
|
||||
|
||||
function sendcommand(list) {
|
||||
fetch("/term",{
|
||||
method:"POST",
|
||||
body: list,
|
||||
headers: {"Content-type":"application/json; charset=UTF-8"}
|
||||
});
|
||||
getterm();
|
||||
};
|
||||
=======
|
||||
let terminput;
|
||||
let timer;
|
||||
let timertext;
|
||||
|
@ -35,7 +24,6 @@
|
|||
terminput.value = "";
|
||||
|
||||
}
|
||||
>>>>>>> 079d2a0 (terminal intigration)
|
||||
|
||||
function getterm() {
|
||||
let tmpterm = "";
|
||||
|
@ -50,17 +38,6 @@
|
|||
})
|
||||
.catch(termdiv.innerHTML = 'Fehler beim Abrufen der Daten');
|
||||
}
|
||||
<<<<<<< HEAD
|
||||
|
||||
|
||||
function initstuff() {
|
||||
termdiv = document.getElementById("terminal");
|
||||
getterm();
|
||||
setInterval(getterm,8000)
|
||||
}
|
||||
|
||||
|
||||
=======
|
||||
function getterminterval() {
|
||||
timer -= 1
|
||||
timertext.innerHTML = `Reload in ${timer} Seconds`
|
||||
|
@ -79,7 +56,6 @@
|
|||
getterm();
|
||||
setInterval(getterminterval,1000)
|
||||
}
|
||||
>>>>>>> 079d2a0 (terminal intigration)
|
||||
|
||||
window.onload = initstuff;
|
||||
</script>
|
||||
|
@ -93,12 +69,6 @@
|
|||
<img src="{{ url_for('static', filename='logo.png') }}" alt="Terra-Dash">
|
||||
<div id="dash">
|
||||
<div id="buttons">
|
||||
<<<<<<< HEAD
|
||||
<button class="button" onclick="sendcommand([`start`])">start</button>
|
||||
<button style="background-color: rgb(186, 0, 0);" class="button" onclick="sendcommand([`stop`])">stop</button>
|
||||
</div>
|
||||
<div id="terminal">
|
||||
=======
|
||||
<button style="margin-bottom: 10px;"
|
||||
class="button"
|
||||
onclick="sendcommand([COMMAND,`start`]);timer=2">start</button>
|
||||
|
@ -117,7 +87,6 @@
|
|||
onclick="sendtermcommand();
|
||||
terminput.value = ``">send</button>
|
||||
</div>
|
||||
>>>>>>> 079d2a0 (terminal intigration)
|
||||
</div>
|
||||
</div>
|
||||
</body>
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue