From 413dedd29ed5908bf883879b8ac9135c7c9727f0 Mon Sep 17 00:00:00 2001 From: Julian Lobbes Date: Mon, 21 Nov 2022 20:32:07 +0100 Subject: [PATCH] feat(webapi): add api packages and base files --- docker-compose.yml | 1 + lumi2/__init__.py | 8 ++++++++ lumi2/static/js/tables.js | 10 ++++++++++ lumi2/templates/base.html | 8 +++++++- lumi2/templates/usermanager/group_list.html | 5 +---- lumi2/templates/usermanager/user_list.html | 6 ++---- lumi2/webapi.py | 7 +++++++ requirements.txt | 1 + 8 files changed, 37 insertions(+), 9 deletions(-) create mode 100644 lumi2/static/js/tables.js create mode 100644 lumi2/webapi.py diff --git a/docker-compose.yml b/docker-compose.yml index 657bc61..db8ea0d 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -12,6 +12,7 @@ services: - ./lumi2/exceptions.py:/app/lumi2/exceptions.py:ro - ./lumi2/ldap.py:/app/lumi2/ldap.py:ro - ./lumi2/usermodel.py:/app/lumi2/usermodel.py:ro + - ./lumi2/webapi.py:/app/lumi2/webapi.py:ro - ./lumi2/usermanager.py:/app/lumi2/usermanager.py:ro - ./lumi2/static/js:/app/lumi2/static/js:ro - ./lumi2/static/css:/app/lumi2/static/css:ro diff --git a/lumi2/__init__.py b/lumi2/__init__.py index 45338da..33bafd9 100644 --- a/lumi2/__init__.py +++ b/lumi2/__init__.py @@ -1,6 +1,10 @@ import os from flask import Flask +from flask_restful import Api + + +api = Api() def create_app(test_config=None): @@ -44,6 +48,10 @@ def create_app(test_config=None): app.register_blueprint(usermanager.bp) app.add_url_rule('/', endpoint='index') + from . import webapi + api.add_resource(webapi.HelloWorld, '/api/hello') + api.init_app(app) + # TODO create OUs return app diff --git a/lumi2/static/js/tables.js b/lumi2/static/js/tables.js new file mode 100644 index 0000000..909aa32 --- /dev/null +++ b/lumi2/static/js/tables.js @@ -0,0 +1,10 @@ +$(function() { + $("table").tablesorter({ + theme: 'bootstrap', + headerTemplate: '{content} {icon}', + cssIcon: 'bi-arrow-down-up', + cssIconNone: '', + cssIconAsc: 'bi-arrow-up', + cssIconDesc: 'bi-arrow-down', + }); +}); diff --git a/lumi2/templates/base.html b/lumi2/templates/base.html index 7b6d7f1..7e74562 100644 --- a/lumi2/templates/base.html +++ b/lumi2/templates/base.html @@ -20,9 +20,13 @@ + + + +