From 7f7853a412588fedda87e4009679f4bc879d1ff3 Mon Sep 17 00:00:00 2001 From: pika Date: Sun, 30 Mar 2025 23:50:33 +0200 Subject: [PATCH] addet static content.. WIP --- app/routes/__pycache__/api.cpython-313.pyc | Bin 16378 -> 16405 bytes app/routes/api.py | 85 +- .../libs/tabler-icons/fonts/tabler-icons.ttf | 1814 +++++++++++++++++ .../libs/tabler-icons/fonts/tabler-icons.woff | 1814 +++++++++++++++++ .../tabler-icons/fonts/tabler-icons.woff2 | 1814 +++++++++++++++++ 5 files changed, 5479 insertions(+), 48 deletions(-) create mode 100644 app/static/libs/tabler-icons/fonts/tabler-icons.ttf create mode 100644 app/static/libs/tabler-icons/fonts/tabler-icons.woff create mode 100644 app/static/libs/tabler-icons/fonts/tabler-icons.woff2 diff --git a/app/routes/__pycache__/api.cpython-313.pyc b/app/routes/__pycache__/api.cpython-313.pyc index 271063a3eca5ccdcf07a876f3baaf150b81eeb71..44c42525a99f5a61cfa5247f2fb5ee5b57633acb 100644 GIT binary patch delta 4804 zcmai1eQaA-6~E8+v!CraU;d~+;>3;JG)^6-ZI*QX+LCo$yLNPKT#pr(d2algxpkay zpFKvU;SIsaV9n zSc|tN-GS0Y zW4ar4eM9d&QHe{aCPc#<7}`?t3-Icy$yf33!F6m>?@ZL<)Llnz+Xni>tMvEOSr_5@ z-_<+M*Yro~$n|cZzqg`47OkzK(G8^gG->v*!Lz?_1DPEajey9`n$9XB+sBOIe)f68 zcRIp?DxS@zlt*CD`e-VfNvHC1a&m&^lQ2rn2gJV%dwdWv)tH)`lyhn7fe-4%88MTW z#}#UTao9-xd`f{iMKvmgGdVd=ee94)7PkVYb^e;ES1)+jpDf*bswybgEEN#c)3f=^xXhj8 z7HA)Gw)k zwihK#J34|OAo6Eiei|$0ygv86f-x%0ivy0_O6=Ve+su^oaO=il*G#Cy7 z`!M_~&#)U#-+X7&--O~e_zsKfH_ufg0(?thE4AXd9m$4()z;jGavU5zU(cbSm@tYS zNEHq1nA`+#Xknp;fR$w5YI#c7H6Lufs)P9c&e5$oXwV#N0})lkgi?5X!lrtTtG4vS zXklE=@#%d|Tcl-(D z^39r5v$mIHCe3$CQM;-K^W21LK+mHLpv7kpe0 z`*0tlgk6g`=36&yDaURVH1vLu(>z7XVGC`*iF#q&!@`X7;Ayjyy5UfQ5&KRnN)L$2Y@49^QI=wUBWfxOyV^IkwvdG z5Z5G=!<-ei8((!M`FC_JbZT8}uC$cCjz{65A0+4mUl8BP6e*U@MR($a~h->BE=P zC3|qu8Y&q=bQf!GdoS{76xFg>HDDc6E#v9r=tM3L8Ag-1zUl}I_+4Terru(E{RaV= zC;dr5c!>SE-DNz1dd{+cx6cbHcCBN(hgSrfQWzVPl{_z#3jG2IEwGO|K7_Tm0zO?A zu3B^c>ZR?yY#jcXOd;HvB!)k-{84&*f{*~WgNnpPZ{s^G@ zYG^?CA^Tn!bvc+cA*O~wA7Tf)Xgsr0J!C>4l zfRMpcfcNABIa6Hh)+R{0nUDllIsU|qaZ}6`)eS&3#3v@*rVEioGy9C_XRkEdr3Z~M z^KRXUldbrD2`MgB)TA71)x<1uV16TKBn zaZ5${8Yu0z=@eZDi8*qXVN0m|X5Z}IHe4;Js{Z7G<5*P*eF(@sS9O$MdZJ9}1kFrC zki$BPogl?EABo4IUrcX1MeEF4zO9bXraal)~sJT%BhN+3e@I){|GY z(x@79h4C|Bp;FRGSkDFMooI+3%OMyY3vXIqobdKm4QD6lIK_M-)Q$ve0mW>l{p_#d zt|C^CIyVQQcL76{=tMSqCN+AV9)M3c%6uRER911}kf<{OZ#T_E!l$$_TcQ1IdRcGI3=x-+tr$s*W5uL* zI97<>=D5{B9PVYiXW8Ak?DQ|YgE!2g!!jkoyxDru^0eh*rJlZO}=GM`{fIlvsX4>IecYL zY2a{a)4lJy+Ap1-Ilt`fT=GU2ywT;h&{A9PLR;^0$JV8e{)LWyFz;-j$@7q`}E%`)}{V7`=3t;T|jbRoAcxuh%1YwZrQTtL2bO|Auq$P>cRes{rFS zTf{@I`R5{+1TEnitgM^~ybV8ogKC)wEUh);7wWV4SKPF@0{8Z{O4d7R-+Bbe^*z~BjT%R;24FVE}x_v?ybn1SQZLBgQ$UOz0YY76^u7K^ra z&euumwQhe0@;~0tw$|GFYFqm#4953hVJ>+S2mde^sL^=m5UO=EQ`VcjVun(Pf z_Rl?E7k02O?tNBxih1^R6nQ(=g66R9s&*)H(Lz3xRiaq#_=uNjRZ1pvsc|`(RCQ-2 z>Gx1rq!Wd_Oz}4)9Yk^v3I6b)BS=mn!S<22hN@A1Odg-i(=^UtX9n%k-9WLN(wC56 zrcsPA2bXVwCh)V`X{yq`@riUHE8jtX4h+~IQQFw`eG%h3WYarj=e)H4zk;hz7#42o WiLM#Ro)rUrucVp(&OaDX)Bgayt+V(5 delta 4509 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 diff --git a/app/routes/api.py b/app/routes/api.py index ff5bd31..da88c8b 100644 --- a/app/routes/api.py +++ b/app/routes/api.py @@ -8,6 +8,8 @@ import ipaddress from flask_wtf import CSRFProtect import markdown from datetime import datetime +from flask import flash +from app.utils.app_utils import validate_port_data bp = Blueprint("api", __name__, url_prefix="/api") csrf = CSRFProtect() @@ -284,61 +286,48 @@ def suggest_port(server_id): def add_app_port(app_id): """Add a port to an application""" app = App.query.get_or_404(app_id) - - # Accept both JSON and form data - if request.is_json: - data = request.json - else: - data = request.form - - port_number = data.get("port") - protocol = data.get("protocol", "TCP") - description = data.get("description", "") - - if not port_number: - return jsonify({"success": False, "error": "Port number is required"}), 400 - + try: - port_number = int(port_number) - - # Check if port already exists for this app - existing_port = Port.query.filter_by(app_id=app_id, number=port_number).first() + port_number = request.form.get("port_number") + protocol = request.form.get("protocol", "TCP") + description = request.form.get("description", "") + + # Validate port data + valid, clean_port, error = validate_port_data(port_number, protocol, description) + + if not valid: + return jsonify({"success": False, "error": error}), 400 + + # Check if port already exists + existing_port = Port.query.filter_by(app_id=app_id, port_number=clean_port).first() if existing_port: - return ( - jsonify( - { - "success": False, - "error": "Port already exists for this application", - } - ), - 400, - ) - + return jsonify({ + "success": False, + "error": f"Port {clean_port} already exists for this application" + }), 400 + # Create new port - port = Port( - number=port_number, - protocol=protocol, - description=description, + new_port = Port( app_id=app_id, + port_number=clean_port, + protocol=protocol, + description=description ) - - db.session.add(port) + db.session.add(new_port) db.session.commit() - - return jsonify( - { - "success": True, - "message": f"Port {port_number} added to {app.name}", - "port": { - "id": port.id, - "number": port.number, - "protocol": port.protocol, - "description": port.description, - }, + + flash(f"Port {clean_port}/{protocol} added successfully", "success") + return jsonify({ + "success": True, + "message": f"Port {clean_port}/{protocol} added successfully", + "port": { + "id": new_port.id, + "number": new_port.port_number, + "protocol": new_port.protocol, + "description": new_port.description } - ) - except ValueError: - return jsonify({"success": False, "error": "Invalid port number"}), 400 + }) + except Exception as e: db.session.rollback() return jsonify({"success": False, "error": str(e)}), 500 diff --git a/app/static/libs/tabler-icons/fonts/tabler-icons.ttf b/app/static/libs/tabler-icons/fonts/tabler-icons.ttf new file mode 100644 index 0000000..f42247e --- /dev/null +++ b/app/static/libs/tabler-icons/fonts/tabler-icons.ttf @@ -0,0 +1,1814 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Page not found · GitHub · GitHub + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + +
+ Skip to content + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + +
+ +
+ + + + + + + + +
+ + + + + +
+ + + + + + + + + +
+
+ + + +
+
+ +
+
+ 404 “This is not the web page you are looking for” + + + + + + + + + + + + +
+
+ +
+
+ +
+ + +
+
+
+ Contact Support — + GitHub Status — + @githubstatus +
+
+ +
+ +
+ + + + + + + + + + + + + + + + + + + + + +
+ +
+
+ + + diff --git a/app/static/libs/tabler-icons/fonts/tabler-icons.woff b/app/static/libs/tabler-icons/fonts/tabler-icons.woff new file mode 100644 index 0000000..b0ba617 --- /dev/null +++ b/app/static/libs/tabler-icons/fonts/tabler-icons.woff @@ -0,0 +1,1814 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Page not found · GitHub · GitHub + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + +
+ Skip to content + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + +
+ +
+ + + + + + + + +
+ + + + + +
+ + + + + + + + + +
+
+ + + +
+
+ +
+
+ 404 “This is not the web page you are looking for” + + + + + + + + + + + + +
+
+ +
+
+ +
+ + +
+
+
+ Contact Support — + GitHub Status — + @githubstatus +
+
+ +
+ +
+ + + + + + + + + + + + + + + + + + + + + +
+ +
+
+ + + diff --git a/app/static/libs/tabler-icons/fonts/tabler-icons.woff2 b/app/static/libs/tabler-icons/fonts/tabler-icons.woff2 new file mode 100644 index 0000000..c760395 --- /dev/null +++ b/app/static/libs/tabler-icons/fonts/tabler-icons.woff2 @@ -0,0 +1,1814 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Page not found · GitHub · GitHub + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + +
+ Skip to content + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + +
+ +
+ + + + + + + + +
+ + + + + +
+ + + + + + + + + +
+
+ + + +
+
+ +
+
+ 404 “This is not the web page you are looking for” + + + + + + + + + + + + +
+
+ +
+
+ +
+ + +
+
+
+ Contact Support — + GitHub Status — + @githubstatus +
+
+ +
+ +
+ + + + + + + + + + + + + + + + + + + + + +
+ +
+
+ + +