From 7dfd04b7b6cf418e45b2a68235191ee1ca6d03ca Mon Sep 17 00:00:00 2001 From: darta Date: Mon, 24 Jan 2022 17:37:36 +0100 Subject: [PATCH] feat(api,admin): added menu bar --- admin/src/admin/static/templates/base.html | 14 +- admin/src/admin/static/templates/header.html | 53 +-- admin/src/admin/static/templates/sidebar.html | 12 +- admin/src/admin/views/WebViews.py | 2 +- docker/api/default.conf | 9 + docker/api/src/api/lib/menu.py | 8 + .../api/src/api/static/_templates/admin.html | 313 ++++++++++++++++++ 7 files changed, 346 insertions(+), 65 deletions(-) create mode 100644 docker/api/src/api/static/_templates/admin.html diff --git a/admin/src/admin/static/templates/base.html b/admin/src/admin/static/templates/base.html index 76b5b84..16d788f 100644 --- a/admin/src/admin/static/templates/base.html +++ b/admin/src/admin/static/templates/base.html @@ -38,7 +38,7 @@ -
+
@@ -102,6 +102,18 @@ + + {% with messages = get_flashed_messages(with_categories=true) %} {% if messages %} diff --git a/admin/src/admin/static/templates/header.html b/admin/src/admin/static/templates/header.html index cfe07f7..7b81904 100644 --- a/admin/src/admin/static/templates/header.html +++ b/admin/src/admin/static/templates/header.html @@ -1,53 +1,2 @@ -
-
- -
+ diff --git a/admin/src/admin/static/templates/sidebar.html b/admin/src/admin/static/templates/sidebar.html index 69e1531..4b62e3d 100644 --- a/admin/src/admin/static/templates/sidebar.html +++ b/admin/src/admin/static/templates/sidebar.html @@ -1,8 +1,4 @@
- - - Digital Democratic -
@@ -18,13 +14,7 @@
  • Roles
  • Import
  • Customization
    • - {% if current_user.role == 'admin' %} -

    System Admin

    -
    -
  • SysAdminUsers
    • -
  • SysAdminGroups
    • -
  • External
    • - {% endif %} +
  • Legal
    • About diff --git a/admin/src/admin/views/WebViews.py b/admin/src/admin/views/WebViews.py index c2b41b0..55be5c5 100644 --- a/admin/src/admin/views/WebViews.py +++ b/admin/src/admin/views/WebViews.py @@ -90,7 +90,7 @@ def avatar(userid): def dashboard(provider=False): data = json.loads(requests.get("http://isard-sso-api/json").text) return render_template( - "pages/dashboard.html", title="Dashboard", nav="Dashboard", data=data + "pages/dashboard.html", title="Customization", nav="Customization", data=data ) diff --git a/docker/api/default.conf b/docker/api/default.conf index a633301..2006d21 100644 --- a/docker/api/default.conf +++ b/docker/api/default.conf @@ -72,6 +72,15 @@ server { access_log off; } + location /header/html/admin { + alias /api/api/static/templates/header_admin.html; + default_type text/html; + index header_admin.html + expires 1m; + log_not_found off; + access_log off; + } + location / { try_files $uri $uri/ expires 1m; diff --git a/docker/api/src/api/lib/menu.py b/docker/api/src/api/lib/menu.py index 69e7122..7f3213a 100644 --- a/docker/api/src/api/lib/menu.py +++ b/docker/api/src/api/lib/menu.py @@ -110,6 +110,7 @@ class Menu: with open("api/static/templates/header.html", "w") as fh: fh.write(output_from_parsed_template) + ## Nextcloud. Nginx will serve /header/html/nextcloud -> header_nextcloud.html with open("api/static/templates/header_nextcloud.html", "w") as fh: fh.write(output_from_parsed_template) with open("api/static/templates/header_nextcloud.html", "a") as fh: @@ -118,6 +119,13 @@ class Menu: with open("api/static/templates/header.json", "w") as fh: fh.write(json.dumps(self.menudict)) + ## Admin app. Nginx will serve /header/html/admin -> header_admin.html + template = env.get_template("admin.html") + output_from_parsed_template = template.render(data=self.menudict) + print(output_from_parsed_template) + with open("api/static/templates/header_admin.html", "w") as fh: + fh.write(output_from_parsed_template) + def get_header(self): return self.menudict # with open('menu.yaml', 'w') as yml: diff --git a/docker/api/src/api/static/_templates/admin.html b/docker/api/src/api/static/_templates/admin.html new file mode 100644 index 0000000..350ad89 --- /dev/null +++ b/docker/api/src/api/static/_templates/admin.html @@ -0,0 +1,313 @@ +{% block css %} + +{% endblock %} + + +{% block pagescript %} + +{% endblock %} \ No newline at end of file