From bb918a4ddcfb1227c6168f2538fbd06122e4f2a3 Mon Sep 17 00:00:00 2001
From: megamichi <michi.mega123@gmail.com>
Date: Mon, 16 Sep 2024 21:15:57 +0200
Subject: [PATCH] git fix

---
 __pycache__/main.cpython-312.pyc     | Bin 2004 -> 2010 bytes
 __pycache__/settings.cpython-312.pyc | Bin 525 -> 530 bytes
 app.py                               |  20 ----------------
 main.py                              |   4 ----
 settings.py                          |   4 ----
 static/style.css                     |  33 ---------------------------
 templates/index.html                 |  31 -------------------------
 7 files changed, 92 deletions(-)

diff --git a/__pycache__/main.cpython-312.pyc b/__pycache__/main.cpython-312.pyc
index a0e5acb6ee1fec3b9eb5e46b8e3190b99dcb9710..e69146f16cc3ab7f6aee9ccf488aa9d6780d013a 100644
GIT binary patch
delta 161
zcmV;S0AByp584k6%MA?*00000g-_^a>ah*H1OW%L$^`ELF8~1m0Pq6=0RiIx4%+|^
z+W;8w1_uErm<OK>nGEv)2LUJW6aWMah<efk8SnxWljsH<4Jg+_R?$LM&=Mrm5?7NE
z2Olli79H0XC(#xs*A_L=7B$xvJJA+9*c>FEO_@#b1ppBp^8f=83Wx>p3IGWXlUD~h
P2PFUm8u;)ila~iQcw;d}

delta 155
zcmcb`e}$j-G%qg~0|+QQPusDPcMl6A+vZa&?-})f0mVKrGcq#XX5hQcz<--T;sYBy
zqxyvM=`|B;J~IHBAA}fKcsi;sF-v}65}f>kO@>$Ex?|`?$IuHxDwl=ACJVC5t1l?O
zu5NKr-Qv2s+eLM^>*_ui)qO6+re2TDx)_@^f#<S7b_eSN4&KSJ?3V2E3@lPVJ}6C|
H%Wew*IQ=xY

diff --git a/__pycache__/settings.cpython-312.pyc b/__pycache__/settings.cpython-312.pyc
index 222a21055f8c5349a84cc88d37ae80ca4474504b..a513fa7f6213f7bd5e5e786e411a6e1a122535b4 100644
GIT binary patch
delta 80
zcmeBWnZ&|-nwOW00SM;$zer2l$h(?RBM`{@z|6?V_>@8T0~-UYV1rA$PovKSiOVcf
hGlDO&D12aMU}XKkGx;{78jq;jMLxAg?jm8JCID(M6=eVb

delta 75
zcmbQl(#yhonwOW00SM-*Jx_Dr$h(?R*$2q`z|6?Vc$Y!=0lRQRNqbFW%><9j?6NbG
cFS08(uzcW{{D4u7M_A<|pGqTlkuXp_03aF_SO5S3

diff --git a/app.py b/app.py
index 0fbe912..92edcb8 100644
--- a/app.py
+++ b/app.py
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
-#!/usr/bin/python3
-=======
 #!/usr/bi/python3
->>>>>>> 079d2a0 (terminal intigration)
 from flask import *
 from main import launchserver
 import libtmux
@@ -38,21 +34,6 @@ def getlpane() -> libtmux.Pane:
 @app.route("/term", methods=["GET", "POST"])
 def get_terminal_output():
     if request.method == "POST":
-<<<<<<< HEAD
-        data = request.data.decode()
-        print(data)
-
-        if data == "bla":
-            print("test")
-            getlpane().send_keys("test")
-        elif data == "start":
-            launchserver(getlpane())
-
-        elif data == "stop":
-            getlpane().send_keys("exit")
-
-        return ["sucessful"]
-=======
         data = request.get_json()#json.loads(request.data.decode())
         print(data,type(data))
         content = data["content"]
@@ -66,7 +47,6 @@ def get_terminal_output():
                 getlpane().send_keys(content[2])
 
             return ["sucessful"]
->>>>>>> 079d2a0 (terminal intigration)
     elif request.method == "GET":
         term = get_term()
         if term[1] == "mono":
diff --git a/main.py b/main.py
index 7c26969..8de8925 100644
--- a/main.py
+++ b/main.py
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
-#!/usr/bin/python3
-=======
 #!/usr/bi/python3
->>>>>>> 079d2a0 (terminal intigration)
 import libtmux
 import settings
 import libtmux.constants
diff --git a/settings.py b/settings.py
index d327cb2..725d72e 100644
--- a/settings.py
+++ b/settings.py
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
-#!/usr/bin/python3
-=======
 #!/usr/bi/python3
->>>>>>> 079d2a0 (terminal intigration)
 from os import path
 
 path = (
diff --git a/static/style.css b/static/style.css
index 8cd190d..34c479c 100644
--- a/static/style.css
+++ b/static/style.css
@@ -1,9 +1,5 @@
 a {
-<<<<<<< HEAD
-    color: rgb(107, 214, 0);
-=======
     color: chartreuse;
->>>>>>> 079d2a0 (terminal intigration)
 }
 
 body {
@@ -23,10 +19,6 @@ body {
     padding: 10px;
     border-radius: 20px;
     border-style:hidden;
-<<<<<<< HEAD
-    margin-bottom: 10px;
-=======
->>>>>>> 079d2a0 (terminal intigration)
     
 }
 #buttons {
@@ -34,17 +26,9 @@ body {
     flex-direction: column;
     padding: 10px;
 }
-<<<<<<< HEAD
-
-
-.input {
-    color: chartreuse;
-    background-color: rgb(0, 0, 0);
-=======
 input {
     color: chartreuse;
     background-color: rgba(0, 0, 0, 0.1);
->>>>>>> 079d2a0 (terminal intigration)
     border-color: chartreuse;
     padding: 10px;
     border-style: solid;
@@ -52,14 +36,9 @@ input {
     border-radius: 20px;
 }
 
-<<<<<<< HEAD
-#terminal {
-    background-color: #0001002a;
-=======
 
 #terminal {
     background-color: rgba(0, 0, 0, 0.1);
->>>>>>> 079d2a0 (terminal intigration)
     color: chartreuse;
     border-style: solid;
     border-color: chartreuse;
@@ -67,19 +46,7 @@ input {
     padding: 15px;
     font-family: 'Courier New', Courier, monospace;
     font-size: 16px;
-<<<<<<< HEAD
-    width: 100%;
-    height: 100%;
-    overflow-y: auto;
-    box-shadow: 0 0 10px rgba(0, 255, 0, 0.5);
-    flex-grow: 1;
-}
-#dash {
-    display: flex;
-    height: 100vh;
-=======
     height: 100%;
     overflow-y: auto;
     box-shadow: 0 0 10px rgb(0, 255, 0);
->>>>>>> 079d2a0 (terminal intigration)
 }
diff --git a/templates/index.html b/templates/index.html
index 34bb377..be47085 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -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>