feat: add home blocks, move db tpl to jinja

Author: Jérémy Leriche

backend/app.py

@@ -69,9 +69,8 @@ def inject_to_tpl():
         debug=app.debug, 
         locale=get_locale(), 
         isMultiObservatories=utils.isMultiObservatories,
-        isDbPagePublished=utils.isDbPagePublished,
         getThumborUrl=utils.getThumborUrl,
-        pathExists=os.path.exists,
+        getCustomTpl=utils.getCustomTpl,
     )
     data.update(custom)
     return data

backend/routes.py

@@ -301,14 +301,20 @@ def sample():
 
 @main.route('/about')
 def about():
-    if (not utils.isDbPagePublished('about')):
+
+    tpl = utils.getCustomTpl('about')
+
+    if not tpl:
         return abort(404)
 
-    return render_template('db-page.jinja', name='about', page=utils.getDbPage('about'))
+    return render_template(tpl)
+
+@main.route('/legal-notices')
+def legal_notices():
+
+    tpl = utils.getCustomTpl('legal_notices')
 
-@main.route('/disclaimer')
-def disclaimer():
-    if (not utils.isDbPagePublished('disclaimer')):
+    if not tpl:
         return abort(404)
 
-    return render_template('db-page.jinja', name='disclaimer', page=utils.getDbPage('disclaimer'))
+    return render_template(tpl)

backend/tpl/components/legal-footer.jinja

@@ -0,0 +1,6 @@
+{{ _('footer.copyright') }}
+
+{% if getCustomTpl('legal_notices') %}
+  <span class="mx-3">-</span>
+  <a href="/legal-notices">Mentions Légales</a>
+{% endif %}

backend/tpl/components/main-nav.jinja

@@ -2,7 +2,7 @@
   <li class="nav-item {% if active_page == 'home' %}active{% endif %}">
     <a class="nav-link " href="/">{{ _('header.nav.home') }}</a>
   </li>
-  {% if isDbPagePublished('about'): %}
+  {% if getCustomTpl('about') %}
   <li class="nav-item {% if active_page == 'about' %}active{% endif %}">
     <a class="nav-link" href="/about" >{{ _('header.nav.about') }}</a>
   </li>

backend/tpl/home_mono_obs.jinja

@@ -27,8 +27,10 @@
 
   {% include 'components/home-carousel.jinja' %}
 
-  {% set home_block_1 = dbconf.get('home_block_1_' + locale.__str__()) if dbconf.get('home_block_1_' + locale.__str__()) else dbconf.get('home_block_1', '') %}
-  {% autoescape false %}{{ home_block_1 }}{% endautoescape %}
+  {% set home_block_1 = getCustomTpl('home_block_1') %}
+  {% if home_block_1 %}
+    {% include home_block_1 %}
+  {% endif %}
 
   <div class="blocks mt-4">
 
@@ -54,8 +56,10 @@
 
   </div>
 
-  {% set home_block_2 = dbconf.get('home_block_2_' + locale.__str__()) if dbconf.get('home_block_2_' + locale.__str__()) else dbconf.get('home_block_2', '') %}
-  {% autoescape false %}{{ home_block_2 }}{% endautoescape %}
+  {% set home_block_2 = getCustomTpl('home_block_2') %}
+  {% if home_block_2 %}
+    {% include home_block_2 %}
+  {% endif %}
 </div>
 
 <script>

backend/tpl/home_multi_obs.jinja

@@ -29,8 +29,10 @@
 
   {% include 'components/home-carousel.jinja' %}
 
-  {% set home_block_1 = dbconf.get('home_block_1_' + locale.__str__()) if dbconf.get('home_block_1_' + locale.__str__()) else dbconf.get('home_block_1', '') %}
-  {% autoescape false %}{{ home_block_1 }}{% endautoescape %}
+  {% set home_block_1 = getCustomTpl('home_block_1') %}
+  {% if home_block_1 %}
+    {% include home_block_1 %}
+  {% endif %}
 
   <div class="container-fluid px-0 my-4 my-md-5">
     {% set count = namespace(value=0) %}
@@ -78,8 +80,10 @@
     {% endfor %}  
   </div>
 
-  {% set home_block_2 = dbconf.get('home_block_2_' + locale.__str__()) if dbconf.get('home_block_2_' + locale.__str__()) else dbconf.get('home_block_2', '') %}
-  {% autoescape false %}{{ home_block_2 }}{% endautoescape %}
+  {% set home_block_2 = getCustomTpl('home_block_2') %}
+  {% if home_block_2 %}
+    {% include home_block_2 %}
+  {% endif %}
 
   <div class="container-xl">
     <div class="text-center">
@@ -93,8 +97,10 @@
     </a>
   </div>
 
-  {% set home_block_3 = dbconf.get('home_block_3_' + locale.__str__()) if dbconf.get('home_block_3_' + locale.__str__()) else dbconf.get('home_block_3', '') %}
-  {% autoescape false %}{{ home_block_3 }}{% endautoescape %}
+  {% set home_block_3 = getCustomTpl('home_block_3') %}
+  {% if home_block_3 %}
+    {% include home_block_3 %}
+  {% endif %}
 
 </div>
 

backend/tpl/layout.jinja

@@ -62,8 +62,9 @@
     </header>
     <div class="header-title d-none d-sm-block">{% block header_title %}{% endblock %}</div>
     {% block content %}{% endblock %}
-    {% if pathExists('tpl/custom/footer.jinja') %}
-    {% include 'custom/footer.jinja' %}
+    {% set footer = getCustomTpl('footer') %}
+    {% if footer: %}
+      {% include footer %}
     {% else %}
     <footer class="app-footer">
       {% block footer %}
@@ -117,13 +118,8 @@
 
       <hr class="mt-4" />
 
-      <div class="text-light d-flex">
-        {{ _('footer.copyright') }}
-        
-        {% if isDbPagePublished('disclaimer'): %}
-          <span class="mx-3">-</span>
-          <a href="/disclaimer">Mentions Légales</a>
-        {% endif %}
+      <div class="mt-4 d-flex">
+        {% include 'components/legal-footer.jinja' %}
       </div>
       {% endblock %}
     </footer>

backend/utils.py

@@ -24,6 +24,15 @@
 site_schema = models.TSiteSchema(many=True)
 themes_sthemes_schema = models.CorSthemeThemeSchema(many=True)
 
+def getCustomTpl(name):
+    tpl_local = f'custom/{name}_{get_locale().__str__()}.jinja'
+    tpl_common = f'custom/{name}.jinja'
+    if os.path.exists(f'tpl/{tpl_local}'):
+        return tpl_local
+    if os.path.exists(f'tpl/{tpl_common}'):
+        return tpl_common
+    return None
+
 def getThumborSignature(url):
     key = bytes(os.getenv("THUMBOR_SECURITY_KEY"), 'UTF-8')
     msg = bytes(url, 'UTF-8')
@@ -148,12 +157,6 @@ def getDbConf():
 
     return conf
 
-
-def isDbPagePublished(name):
-    dbconf = getDbConf()
-
-    return dbconf.get('page_' + name + '_published_' + get_locale().__str__(), dbconf.get('page_' + name + '_published')) is True
-
 def isMultiObservatories():
     # Pourrait passer par un count sql
     sql = text("SELECT id FROM geopaysages.t_observatory where is_published is true")
@@ -163,18 +166,6 @@ def isMultiObservatories():
         return True
     return False
 
-def getDbPage(name):
-    dbconf = getDbConf()
-
-    locale = get_locale()
-    title_locale = dbconf.get('page_' + name + '_title_' + locale.__str__())
-    content_locale = dbconf.get('page_' + name + '_content_' + locale.__str__())
-
-    return {
-        'title': title_locale if title_locale else dbconf.get('page_' + name + '_title', ''),
-        'content': content_locale if content_locale else dbconf.get('page_' + name + '_content', '')
-    }
-
 def getFiltersData():
     sites=site_schema.dump(models.TSite.query.join(models.Observatory).filter(models.TSite.publish_site == True, models.Observatory.is_published == True).order_by(DEFAULT_SORT_SITES))
     for site in sites: