diff --git a/__pycache__/main.cpython-312.pyc b/__pycache__/main.cpython-312.pyc index a0e5acb..e69146f 100644 Binary files a/__pycache__/main.cpython-312.pyc and b/__pycache__/main.cpython-312.pyc differ diff --git a/__pycache__/settings.cpython-312.pyc b/__pycache__/settings.cpython-312.pyc index 222a210..a513fa7 100644 Binary files a/__pycache__/settings.cpython-312.pyc and b/__pycache__/settings.cpython-312.pyc differ 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 @@ @@ -93,12 +69,6 @@ Terra-Dash
-<<<<<<< HEAD - - -
-
-======= @@ -117,7 +87,6 @@ onclick="sendtermcommand(); terminput.value = ``">send
->>>>>>> 079d2a0 (terminal intigration)