Web UI - project logo from API settings

mupif · Jul 2, 2024 · 203b2cf · 203b2cf
1 parent 951a42b
commit 203b2cf
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 3 deletions.
diff --git a/mupifDB/api/main.py b/mupifDB/api/main.py
@@ -67,6 +67,9 @@
     {
         "name": "Additional",
     },
+    {
+        "name": "Settings",
+    },
     {
         "name": "User Interface",
     },

diff --git a/mupifDB/restApiControl.py b/mupifDB/restApiControl.py
@@ -894,7 +894,18 @@ def updateStatScheduler(runningTasks=None, scheduledTasks=None, load=None, proce
 
 
 # --------------------------------------------------
-# Ontology
+# Settings
+# --------------------------------------------------
+
+def getSettings():
+    if api_type == 'granta':
+        return {}
+    response = rGet(url=RESTserver + "settings")
+    return response.json()
+
+
+# --------------------------------------------------
+# EDM
 # --------------------------------------------------
 
 def getEDMDataArray(DBName, Type):

diff --git a/webapi/index.py b/webapi/index.py
@@ -88,6 +88,10 @@ def update_user_name(user_id: str, val):
 import mupifDB
 
 
+settings = mupifDB.restApiControl.getSettings()
+PROJECT_NAME = settings.get('projectName', '')
+PROJECT_LOGO_URL = settings.get('projectLogoUrl', '/static/images/project-logo.png')
+
 app = Flask(__name__)
 app.secret_key = AUTH_APP_SECRET_KEY
 CORS(app, resources={r"/static/*": {"origins": "*"}})
@@ -175,7 +179,7 @@ def getUserHasAdminRights():
 
 def my_render_template(*args,**kw):
     'Wraps render_template and ads a few common keywords'
-    return render_template(*args,title='MuPIFDB web interface',server=request.host_url,RESTserver=RESTserver,**kw)
+    return render_template(*args, title='MuPIFDB web interface', server=request.host_url, RESTserver=RESTserver, projectLogoUrl=PROJECT_LOGO_URL, **kw)
 
 
 def login_header_html():

diff --git a/webapi/templates/basic.html b/webapi/templates/basic.html
@@ -1,4 +1,5 @@
 {% extends "layout.html" %}
 {% block title %} {{ title }} {% endblock %}
 {% block login %} {{ login }} {% endblock %}
+{% block projectLogoUrl %} {{ projectLogoUrl }} {% endblock %}
 {% block content %} {{ body }}{% endblock %}
diff --git a/webapi/templates/layout.html b/webapi/templates/layout.html
@@ -11,7 +11,7 @@
             <div style="display: flex;flex-direction: row;gap: 10px;">
                 <img src="/static/images/mupif-logo.png" height="60px" align="right">
                 <img src="/static/images/ctu-logo.png" height="60px" align="right">
-                <img src="/static/images/project-logo.png" height="60px" align="left">
+                <img src="{% block projectLogoUrl %}{% endblock %}" height="60px" align="left">
                 <div><p>MuPIFDB web interface</p></div>
             </div>
             <div class="block_login">{% block login %}{% endblock %}</div>