From 12c1963d67e37b8ec652d2580142e922bd5003ec Mon Sep 17 00:00:00 2001 From: Jonathan Carter Date: Thu, 3 Apr 2025 21:23:49 +0200 Subject: [PATCH] Catch up with uncommitted changes --- .../users/__pycache__/routes.cpython-312.pyc | Bin 2382 -> 1908 bytes src/applets/users/routes.py | 11 ++++++++++- src/static/mem | 4 ---- src/system-installer-web-client | 1 + 4 files changed, 11 insertions(+), 5 deletions(-) delete mode 100755 src/static/mem diff --git a/src/applets/users/__pycache__/routes.cpython-312.pyc b/src/applets/users/__pycache__/routes.cpython-312.pyc index 4c06c18f72826bbe0e9de4a4f57a841cbf29b645..f7ea782140f0d5621a00caaf181edd86388fad70 100644 GIT binary patch delta 291 zcmX>n^o5V_G%qg~0}vehTb=%kWg?#hW7S0UQmz!X7KSLkN_I_-iPsv`nSlyG__G9% zn9fkb2&BLug>f~M9n7G~H2EZ>x>OZcX>n>%v0g?=ZjL5n5hqaHN`}uM)sxehlH~+} z3=SYJ<_8iD3}3hyc%*08T;|rez@kyazxg`z9A<-C+{GnDnR)5)DVfP7#UKk5iUfe< zErF!c%$$^Xh-^+KkX8Z;3ry}~KgA9*&rg$oay&<{F31wFR1qJD1(Jdoz+sb{pHiBW lYFDHN6a$%D>@fKWhoLwNqvmI31}2dYOduAY0HZiq7XU05LZScw delta 766 zcmZ8f&ubGw6rR~^HtBA=iK{hfLSY*#HDDX+L1;;GsZ@%!9;yd(37ehGX6xn$`$I@* z$qEI}A&2zfS*+>Ji$~82l2Acd`yY6Tq$f|#Oid6U?6;5aeeZkoX7^J3Dv4j_=6HbP zr>f}dTt|$<_nj5DV=gRleMkxbpwKbsU!|ZRqVO>&M4B^czVp^=2QeSO&lq9o0q3s_ zfCFZlP7?$daE=&?0fI-sAr3SqBaWaGnsA6c1c&e}*e5e^?1MDdy3NZtp4pmZcb~&# z+vm2P>}~Hn^dq`iFDYix)*Q#E>9!v>m74A7{HDvHVgo4P-b?xn7ou8}Xs#Rwmn! zRa3F;T&kj(4cV|)%Zg#TmX^xz)M($dBb#aDPl1)dL##M~n;3kNo~JmmwUU^WKooCI zKAHzcc=MbU{}5r`1d`Tu%-Q5Ol4-X!k5dYX?vLQ-5V74$N4sa-{ylPo)a^?2-`H@r zT1T#_<*hZWBaU{ddpESc!NJFH901IX5ku0E1Q_0vUdLa>2mI1GO#Nb5m?MH)Bbtd( I7^Ca_0Y62yY5)KL diff --git a/src/applets/users/routes.py b/src/applets/users/routes.py index 3992633..e75cdea 100644 --- a/src/applets/users/routes.py +++ b/src/applets/users/routes.py @@ -2,7 +2,16 @@ from applets.software import bp from flask import Flask, request, session, redirect, \ url_for, render_template, flash, Blueprint # we use this neat little trick to get config data from the main app -from flask import current_ap +from flask import current_app + + +@bp.route('/users') +def users_root(): + """ + Users screen for the webui. + """ + string_dict = build_stringlist() + return render_template('users.html', string_dict=string_dict) def build_stringlist(): diff --git a/src/static/mem b/src/static/mem deleted file mode 100755 index 5c020c1..0000000 --- a/src/static/mem +++ /dev/null @@ -1,4 +0,0 @@ -mem() -{ - ps -eo rss,pid,euser,args:100 --sort %mem | grep -v grep | grep -i $@ | awk '{printf $1/1024 "MB"; $1=""; print }' -} diff --git a/src/system-installer-web-client b/src/system-installer-web-client index e772577..4079a55 100755 --- a/src/system-installer-web-client +++ b/src/system-installer-web-client @@ -3,6 +3,7 @@ import webview LOCATION = "http://10.10.99.22:8080/welcome" +#LOCATION = "http://localhost:8080/welcome" def on_closed(): """