From 6ab77f958cc87731f4c7bc20bc59c14b1ebe03b6 Mon Sep 17 00:00:00 2001 From: Jakob Ketterl Date: Sun, 8 Mar 2020 21:28:15 +0100 Subject: [PATCH] add settings button, start with the admin template --- htdocs/admin.html | 15 +++++++++++++++ htdocs/gfx/openwebrx-panel-settings.png | Bin 0 -> 1440 bytes htdocs/include/header.include.html | 1 + owrx/controllers/{settings.py => admin.py} | 6 +++--- owrx/controllers/session.py | 2 +- owrx/http.py | 4 ++-- 6 files changed, 22 insertions(+), 6 deletions(-) create mode 100644 htdocs/admin.html create mode 100644 htdocs/gfx/openwebrx-panel-settings.png rename owrx/controllers/{settings.py => admin.py} (81%) diff --git a/htdocs/admin.html b/htdocs/admin.html new file mode 100644 index 0000000..d9b8c66 --- /dev/null +++ b/htdocs/admin.html @@ -0,0 +1,15 @@ + + + + OpenWebRX Settings + + + + + + +${header} +
+ Admin-only area! +
+ \ No newline at end of file diff --git a/htdocs/gfx/openwebrx-panel-settings.png b/htdocs/gfx/openwebrx-panel-settings.png new file mode 100644 index 0000000000000000000000000000000000000000..b209b87c94cfd9c9f44b19a36b0b9c305e92fed9 GIT binary patch literal 1440 zcmV;R1z-A!P)EX>4Tx04R}tkv&MmKpe$iTct%Rf_9MNkfAzRkSgM+RVYG*P%E_RU~=gfG-*gu zTpR`0f`cE6RROnpui)9@T$_we!cF3z*O&;2?2m4e9tpFljzbi*RvAfDc| zbk6(45muHI;&bA0gDyz?$aUG}H_j!8{X8>bWHa-`5n`d##c~(3vY`@B5yuo&qkMnP zWrgz=XSG^q?R)YUh6~!tGS_L2AcaLNL4*JqbyQG=g*dGmDJC+spY-rY9luB}nOqex zax9<*6_Voz|AXJ%n#IY4n-oq0y)U-?F$x5CfmXw|zmILZbpiyQfh(=!uQh?0PtqG5 zEp`M9Yy%h99ZlW?E_Z<8CtWfmM+(sN7mL9A8GTb87`g@e*4*CO`#607veZ@j1~@nb z#!8gE?(yzWcW?imY4`U7a42%7-XZ2C00006VoOIv0IvYA0I#2U7aRZp010qNS#tmY z4c7nw4c7reD4Tcy000McNliruMCxY}9~@22CIcfv}J? zU^KM+F`6g{YLq_-qP7DR=#Pb8$>jM4UwVhK=}jhi@7{CH{oc9feCOPerpDB`zazvN z0G^Tbx};kF{*m-v2;rL;yET!Z9+9+1QiG(QBz-Swnxq3j?E`Z+uoxHx8q4M$1#SUt zlL256FaY!e%|H!M1daiRQsfT-$APE)-fZ0gpinJPF90QAJ8%FP1}@nvyMWm#IG;qVmejIokm{mci!*QCA@z^;@Ba(6{8?2V} zgQQMLA4%$xv_{e{NvkA%2Xv*_%t;!SbUwyo?ar*ZiTPFLuT4&f1;A^-dIx+Bu*F{N zO6bnB&Gv}^dKf4GgTT(j+DzbYU^7q$^Z{eQFTii!wAVJa09SyfgpGb5c_DL!09tMA zCU6*-lUUzsqXGEDV3wAx7tCGTEi(kXld#bQ9P~&03AAPbwiDRxI+(V8!d&zua2qJ5 z$P~Qke4qyys$i=T*qc0+O2OYK>1+sLxB~XPq*IcLl70>$4E(2M3E`-NyH(O@N%K=% zn-E4Mot0FdH7oCR?xT_(${4NP;zsC98nDl0olLHxWL2&Yqi{n12zt4s0wV*tI6uh4$2D zlW=!R$1yR2Ei+Q%-fLaTS~qan$J*l>*y-m%d$l`7?-k%eRAT_NxQKUDSfAk{e$sLy ze%_YWKw78MMZ7r%*yq5P)oy#7RQ)mC#T=6@Rl6_#YwL`pxv`g!60oW4Ydah#xeWR_ zU>&fmthL?%TpPcr#DH6AL%qO01O46E`WY}iMW@L%_m*W#)_vE{FIDsY_%-mwc;^W` zYo6PmB7el0+3xqe8-s6wC6jUAESjqt5*@=>?ENuB0;`jBNz&o6Ryi+eiKLk!gwY4` u-$e-FhI{^N29)<5VMPq6sWCMsW848QF=)P$V;zM60000
Log

  • Receiver

  • Map
    • +

  • Settings
    • diff --git a/owrx/controllers/settings.py b/owrx/controllers/admin.py similarity index 81% rename from owrx/controllers/settings.py rename to owrx/controllers/admin.py index 748c646..a775068 100644 --- a/owrx/controllers/settings.py +++ b/owrx/controllers/admin.py @@ -1,4 +1,4 @@ -from . import Controller +from .template import WebpageController from .session import SessionStorage @@ -10,7 +10,7 @@ class Authentication(object): return False -class SettingsController(Controller): +class AdminController(WebpageController): def __init__(self, handler, request, options): self.authentication = Authentication() super().__init__(handler, request, options) @@ -22,4 +22,4 @@ class SettingsController(Controller): self.send_redirect("/login") def indexAction(self): - self.send_response("actual content here") + self.serve_template("admin.html", **self.template_variables()) diff --git a/owrx/controllers/session.py b/owrx/controllers/session.py index bb40bd4..7ebd1b1 100644 --- a/owrx/controllers/session.py +++ b/owrx/controllers/session.py @@ -47,7 +47,7 @@ class SessionController(WebpageController): key = SessionStorage.getSharedInstance().startSession({"user": data["user"]}) cookie = SimpleCookie() cookie["owrx-session"] = key - self.send_redirect("/settings", cookies=cookie) + self.send_redirect("/admin", cookies=cookie) else: self.send_redirect("/login") else: diff --git a/owrx/http.py b/owrx/http.py index 07d7867..86fa8f1 100644 --- a/owrx/http.py +++ b/owrx/http.py @@ -11,7 +11,7 @@ from owrx.controllers.assets import ( from owrx.controllers.websocket import WebSocketController from owrx.controllers.api import ApiController from owrx.controllers.metrics import MetricsController -from owrx.controllers.settings import SettingsController +from owrx.controllers.admin import AdminController from owrx.controllers.session import SessionController from http.server import BaseHTTPRequestHandler from urllib.parse import urlparse, parse_qs @@ -100,7 +100,7 @@ class Router(object): StaticRoute("/features", FeatureController), StaticRoute("/api/features", ApiController), StaticRoute("/metrics", MetricsController), - StaticRoute("/settings", SettingsController), + StaticRoute("/admin", AdminController), StaticRoute("/login", SessionController, options={"action": "loginAction"}), StaticRoute("/login", SessionController, method="POST", options={"action": "processLoginAction"}), StaticRoute("/logout", SessionController, options={"action": "logoutAction"}),