django-camomilla-cms 6.0.0b17__py2.py3-none-any.whl → 6.0.0b18__py2.py3-none-any.whl

camomilla/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "6.0.0-beta.17"
+__version__ = "6.0.0-beta.18"
 
 
 def get_core_apps():

camomilla/settings.py

@@ -87,6 +87,11 @@ API_TRANSLATION_ACCESSOR = pointed_getter(
     django_settings, "CAMOMILLA.API.TRANSLATION_ACCESSOR", "translations"
 )
 
+REGISTERED_TEMPLATES_APPS = pointed_getter(
+    django_settings,
+    "CAMOMILLA.RENDER.REGISTERED_TEMPLATES_APPS", None
+)
+
 DEBUG = pointed_getter(django_settings, "CAMOMILLA.DEBUG", django_settings.DEBUG)
 
 # camomilla settings example
@@ -104,6 +109,7 @@ DEBUG = pointed_getter(django_settings, "CAMOMILLA.DEBUG", django_settings.DEBUG
 #         "AUTO_CREATE_HOMEPAGE": True,
 #         "ARTICLE": {"DEFAULT_TEMPLATE": "", "INJECT_CONTEXT": None },
 #         "PAGE": {"DEFAULT_TEMPLATE": "", "INJECT_CONTEXT": None }
+#         "REGISTERED_TEMPLATE_APPS": []
 #     },
 #     "STRUCTURED_FIELD": {
 #         "CACHE_ENABLED": True

camomilla/templates/defaults/base.html

@@ -1,5 +1,7 @@
 {% load menus %}
 {% load i18n %}
+{% load model_extras %}
+
 {% get_current_language as current_lang %}
 
 
@@ -9,9 +11,6 @@
     <title>Camomilla CMS</title>
     <style>
         html,
-        body {
-            height: 100%;
-        }
 
         body {
             background-color: #f7fafc;
@@ -49,6 +48,45 @@
             font-size: 18px;
             font-style: italic;
         }
+        .accordion {
+            margin: 2rem auto;
+            border: 1px solid #000;
+            font-family: monospace;
+            width: 800px;
+            max-width: 800px;
+        }
+
+        .accordion-header {
+            display: flex;
+            justify-content: space-between;
+            align-items: center;
+            padding: 0.75rem 1rem;
+            cursor: pointer;
+            user-select: none;
+        }
+
+        .accordion-icon {
+            width: 1rem;
+            height: 1rem;
+            transition: transform 0.3s ease;
+        }
+
+        .accordion-toggle:checked + .accordion-header .accordion-icon {
+            transform: rotate(180deg);
+        }
+
+        .accordion-body {
+            max-height: 0;
+            overflow: hidden;
+            transition: max-height 0.3s ease;
+        }
+
+        .accordion-toggle:checked + .accordion-header + .accordion-body {
+            max-height: 30vh;
+            padding: 1rem;
+            border-top: 1px solid #000;
+            overflow-y: auto;
+        }
     </style>
 </head>
 
@@ -104,11 +142,29 @@
         - <b>Module:</b> {{page_model.module}} <br>
         - <b>Identifier:</b> {{page.pk}} <br>
         - <b>Permalink:</b> {{page.permalink}} <br>
-        - <b>Language:</b> {{current_lang}} <br>        
+        - <b>Language:</b> {{current_lang}} <br>             
     </code>
+    
     {% endblock %}
+
     {% block content %}
     {% endblock %}
+    
+    <div class="accordion">
+    <input type="checkbox" id="accordion-toggle" class="accordion-toggle" hidden>
+    <label for="accordion-toggle" class="accordion-header">
+        <span>Page data</span>
+        <svg class="accordion-icon" viewBox="0 0 24 24">
+        <path d="M6 9l6 6 6-6" stroke="currentColor" stroke-width="2" fill="none" stroke-linecap="round"/>
+        </svg>
+    </label>
+    <div class="accordion-body">
+        <pre>{{ page|to_pretty_dict|safe }}</pre>
+    </div>
+</div>
+
+</div>
+
 </body>
 
 </html>

camomilla/templatetags/model_extras.py

@@ -0,0 +1,73 @@
+from django import template
+from django.utils.safestring import mark_safe
+from django.forms.models import model_to_dict
+from structured.pydantic.models import BaseModel
+import json
+import re
+import html
+from datetime import datetime
+
+register = template.Library()
+
+
+def custom_json_serializer(obj):
+    """Serialize custom objects to JSON."""
+    if isinstance(obj, datetime):
+        return obj.isoformat()
+    raise TypeError(f"Type {type(obj)} not serializable")
+
+
+def pretty_dict(data, indent_level=0):
+    """
+    Recursive function to format a dictionary into a pretty string.
+    Args:
+        data (dict): The dictionary to format.
+        indent_level (int): The current indentation level.
+    Returns:
+        str: A pretty-printed string representation of the dictionary.
+    """
+    indent = "  " * indent_level
+    result = []
+
+    for key, value in data.items():
+
+        if isinstance(value, dict):
+            result.append(f"{indent}'{key}': {{")
+            result.append(pretty_dict(value, indent_level + 1))
+            result.append(f"{indent}}},")
+
+        elif isinstance(value, list):
+            result.append(f"{indent}'{key}': [")
+            for item in value:
+                if isinstance(item, dict):
+                    result.append(pretty_dict(item, indent_level + 1))
+                else:
+                    result.append(f"{indent}  {json.dumps(item, default=custom_json_serializer)},")
+            result.append(f"{indent}],")
+
+        else:
+            result.append(f"{indent}'{key}': {json.dumps(value, default=custom_json_serializer)},")
+
+    return "\n".join(result).rstrip(',')
+
+
+@register.filter
+def to_pretty_dict(instance):
+    data = model_to_dict(instance)
+
+    for key, value in data.items():
+        if isinstance(value, BaseModel):
+            data[key] = value.model_dump()
+
+    formatted_dict = "{\n" + pretty_dict(data, indent_level=1) + "\n}"
+
+    escaped = html.escape(formatted_dict)
+
+    # This to highlight the keys in the JSON
+    highlighted = re.sub(
+        r"(')([^&#]+?)('):",
+        r"<span style='color:#df3079'>'\2'</span>:",
+        escaped
+    )
+
+    return mark_safe(f"<pre>{highlighted}</pre>")

camomilla/theme/__init__.py

@@ -1 +1 @@
-__version__ = "6.0.0-beta.17"
+__version__ = "6.0.0-beta.18"

camomilla/theme/apps.py

@@ -34,4 +34,5 @@ class CamomillaThemeConfig(AppConfig):
             "django_jsonform",
             "admin_interface",
             "colorfield",
+            "structured",
         )

camomilla/utils/templates.py

@@ -3,18 +3,31 @@ from typing import Sequence
 
 from django import template as django_template
 from os.path import relpath
+from camomilla.settings import REGISTERED_TEMPLATES_APPS
 
 
 def get_all_templates_files() -> Sequence[str]:
-    dirs = []
-    for engine in django_template.loader.engines.all():
-        # Exclude pip installed site package template dirs
-        dirs.extend(
-            x
-            for x in engine.template_dirs
-            if "site-packages" not in str(x) or "camomilla" in str(x)
-        )
     files = []
-    for dir in dirs:
-        files.extend(relpath(x, dir) for x in Path(dir).glob("**/*.html") if x)
+
+    for engine in django_template.loader.engines.all():
+
+        if REGISTERED_TEMPLATES_APPS:
+            dirs = [
+                d for d in engine.template_dirs
+                if any(app in str(d) for app in REGISTERED_TEMPLATES_APPS)
+            ]
+        else:
+            # Exclude pip installed site package template dirs
+            dirs = [
+                d for d in engine.template_dirs
+                if "site-packages" not in str(d) or "camomilla" in str(d)
+            ]
+
+        for d in dirs:
+            base = Path(d)
+            files.extend(
+                relpath(f, d)
+                for f in base.rglob("*.html")
+            )
+
     return files

{django_camomilla_cms-6.0.0b17.dist-info → django_camomilla_cms-6.0.0b18.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: django-camomilla-cms
-Version: 6.0.0b17
+Version: 6.0.0b18
 Summary: Django powered cms
 Author-email: Lotrèk <dimmitutto@lotrek.it>
 License: MIT

{django_camomilla_cms-6.0.0b17.dist-info → django_camomilla_cms-6.0.0b18.dist-info}/RECORD

@@ -1,4 +1,4 @@
-camomilla/__init__.py,sha256=xH1i4zwYfJScQn-ySoem00poi295diBqrVChxqcmkW8,251
+camomilla/__init__.py,sha256=rVNwuy2J-skWorDHQHY5RbR836EfOwG8yJmEDdWPZEE,251
 camomilla/apps.py,sha256=eUwb9ynyiRAc5OXgt7ZsAdhsCOnPCpNdIFYMheNeN-o,532
 camomilla/authentication.py,sha256=jz6tQT4PPEu-_JLox1LZrOy7EiWBb9MWaObK63MJGus,855
 camomilla/context_processors.py,sha256=cGowjDZ-oDGYn1j2Pj5QDGCqnzXAOdOwp5dmzin_FTc,165
@@ -9,7 +9,7 @@ camomilla/model_api.py,sha256=-7l3fc2eN1itCMzkWA8nFaQXMmz0vs7IlGlShF-gSuo,2487
 camomilla/parsers.py,sha256=fL8XGCGPxJIZNZkPdGtnPSbDP-6-yzGOCVMuLPjkx9Y,1975
 camomilla/permissions.py,sha256=9NlBO4JMmg36vXCUjPNyq6uZxhkdrnXyIbJVLtWhGWE,1813
 camomilla/redirects.py,sha256=ilcyHidb5Iw3jTrXMnPntr50kkl_WB3QOB0VNkIxP7A,263
-camomilla/settings.py,sha256=nY-a1PRhbQ_edvNG5WyndPLWxwsRb_h4eFAjmOHvKYM,3599
+camomilla/settings.py,sha256=V9rf42MSAwJoGlJS-yAW5pzgGcu5J1g7rrVCAmRtMJU,3763
 camomilla/sitemap.py,sha256=U2t5TwhB_-sEscmQZ69PZ5st3bIap8NRxzWEvCgB130,786
 camomilla/translation.py,sha256=_QyfTlKG6hQ_ClRfxzeJ-3oI3Nu5peJN9xFkO9Ib3As,1316
 camomilla/urls.py,sha256=XgaeFoG2eXlJQve3KmFKlD-74CMLW1ziaY1mq-lrAiA,2095
@@ -60,7 +60,7 @@ camomilla/storages/default.py,sha256=GNzvV_JZpXMcfTkyXjw5CfK8EIBi3o-NXYBO0KAxD5M
 camomilla/storages/optimize.py,sha256=VGSXZigzZC8LnPTqyTOpPA2Ba9EJB_KC5bcACoRs4GA,2762
 camomilla/storages/overwrite.py,sha256=jvW3zHvXNzH9dIjeZmmfXo_O3K1ZQmLQzmlSKAOE8ZA,360
 camomilla/templates/admin/camomilla/page/change_form.html,sha256=ig7rRUtylDZMINBQuVPpZLmeB4sOTV_VtqnTgzAyxEo,251
-camomilla/templates/defaults/base.html,sha256=pklt7Pif3g9d7gwgRxCQj7gniJaHD14ZqZID_xIlC0A,6638
+camomilla/templates/defaults/base.html,sha256=C2gCnQP1AkERPv5w00nVhZdfg2h_8DMoIkmdf2I-VVY,8166
 camomilla/templates/defaults/articles/default.html,sha256=1f89jBvNtTa1mPAbC91yy8CzeAjTWO3hhQsTuQW5OKg,239
 camomilla/templates/defaults/pages/default.html,sha256=bP81Qb6M56I-fBJMywWwEu_cnERtWIX28UkGrUSRU6M,144
 camomilla/templates/defaults/parts/langswitch.html,sha256=AkaQzb2KNjRYCMLUn_jE31V36rwBIwp4MneirWPiBcI,3424
@@ -72,8 +72,9 @@ camomilla/templates_context/rendering.py,sha256=GfTR45_gC7WT7zTKPVXkBDwe22uF63A-
 camomilla/templatetags/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 camomilla/templatetags/camomilla_filters.py,sha256=35x0-cWrRHeLhqypSLlJzEFY_fQDcRHiwZQpFgIsspE,692
 camomilla/templatetags/menus.py,sha256=7fc4f9DDqtqG6wNb5_Q0km-fq0mqvGnbpR21qO1TJUw,960
-camomilla/theme/__init__.py,sha256=3ahSYJ-HBLHrW2VZ45mAM6mlZvpqDKPffxhE0EkD9as,30
-camomilla/theme/apps.py,sha256=3nCSZ6d4tkx2aMNNnQQoqX8PGrrMNf4VxCxBV_JXNrA,1040
+camomilla/templatetags/model_extras.py,sha256=mfPab5wQwAiBud4PWyn4lRumdqdniz3OhZy433zm4KQ,2180
+camomilla/theme/__init__.py,sha256=-G_a31a_XYZrR-sYH8Ect9skMQcf0vEfDEKXexJXOIw,30
+camomilla/theme/apps.py,sha256=Ue2H80fbFgxkQyHeU2H0fWs9Y6d-EnHYv4zz824FSRk,1066
 camomilla/theme/admin/__init__.py,sha256=TALAZaE-gWshSeGc6yy7VahdX5UfeCeoOE9Q5kJCEpM,2270
 camomilla/theme/admin/pages.py,sha256=y3rL1nwZlytyD-YR_qqLiBAmjCAjkBY3v56V6JdhBvY,1908
 camomilla/theme/admin/translations.py,sha256=iAjGM1A1aYrsz1FpeybROk6rn3Ddl_oUCwgU5oD8nSw,308
@@ -88,7 +89,7 @@ camomilla/utils/normalization.py,sha256=RDCZtjwpEEwjvfUjQl2bEWFKw7NxTzkXco72VeO2
 camomilla/utils/query_parser.py,sha256=TUScPzPVVJzaKdqy5NqtMOft3H5Bx6liXTVPM1yjH24,6303
 camomilla/utils/seo.py,sha256=8p_a_TGgohenpJb094tT4mMxbn2xzW0qDILuTnjNocM,3324
 camomilla/utils/setters.py,sha256=LV57SM65rL1_ZQkVzk9al_Q13lndVywXLkqgfIvgS0Y,915
-camomilla/utils/templates.py,sha256=Lv4-5019cnM30HmdZnYWiU5gxry-eFZVAhwOofGQRDs,598
+camomilla/utils/templates.py,sha256=pgj9vrMypdJEYfvabbWRTu3r498pbjvcLCOSrrsm-sw,924
 camomilla/utils/translation.py,sha256=w5tvTInDLegWBb1TnDWo09ckKY3K6hajuNNsngZIxPQ,4205
 camomilla/views/__init__.py,sha256=94QuOnnbfMMb17mruO2ydUt286-8zBmDxEPWrJv5Wog,178
 camomilla/views/articles.py,sha256=qGxebOA5iTbGGe9PfbH40YBoDPKktH8FJongg6rh2R8,571
@@ -108,7 +109,7 @@ camomilla/views/mixins/optimize.py,sha256=iRPNkoeIIlJugk7DjJhDPaqeX7Opi7TxnUoMDn
 camomilla/views/mixins/ordering.py,sha256=mh7fqPyVCVJh84Nl2pYFQouzGxa-ANF3Wqv0pCb7OVU,4779
 camomilla/views/mixins/pagination.py,sha256=NWerBdMyBt4Kswig4fbANqGTzsll8SJdE6a8_UIoueU,5772
 camomilla/views/mixins/permissions.py,sha256=TPmR3Hoa3BjeJu9rCE_7lpLOAupue4WI42C21HTo6X4,200
-django_camomilla_cms-6.0.0b17.dist-info/licenses/LICENSE,sha256=kVS7zDrNkav2hLLXbOJwVdonY2ToApTK3khyJagGQoQ,1063
+django_camomilla_cms-6.0.0b18.dist-info/licenses/LICENSE,sha256=kVS7zDrNkav2hLLXbOJwVdonY2ToApTK3khyJagGQoQ,1063
 tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/test_api.py,sha256=t03EFDezGgm4UJl8RIVvnTUkAGTB6ptm0G2lHBQ7ljc,1833
 tests/test_camomilla_filters.py,sha256=5LlR3tctGu6qxVmOrY52AGh_ACvEzdAvkwH2v7medpo,1536
@@ -125,8 +126,8 @@ tests/test_utils.py,sha256=o_FG7XOxLePOBfwBr4sk09gej0onWNw9t2-gSjGmgNg,3741
 tests/fixtures/__init__.py,sha256=NGj22kLV65v56IpOrOVqSkPhJePTXD4QjuuZhZSMwfQ,460
 tests/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/utils/api.py,sha256=TYcDXeILHtBwzwG0acwPFmiqMZnlF9VnLB0Ydhg55vA,865
-tests/utils/media.py,sha256=ChsoHqwWmVYHE7teFsV9swTqBEFD0zcvQSBuKsK9G_s,298
-django_camomilla_cms-6.0.0b17.dist-info/METADATA,sha256=oiU3jK3ZCjQurWBdq2vaUZgBr2OMim4RLEjSPtIVm28,2565
-django_camomilla_cms-6.0.0b17.dist-info/WHEEL,sha256=oSJJyWjO7Z2XSScFQUpXG1HL-N0sFMqqeKVVbZTPkWc,109
-django_camomilla_cms-6.0.0b17.dist-info/top_level.txt,sha256=G9VIGBmMMqC7JEckoTgXKmC6T2BR75QRkqRnngw1_lo,16
-django_camomilla_cms-6.0.0b17.dist-info/RECORD,,
+tests/utils/media.py,sha256=-cnrQzzVuhNSb5rT5xMUs5f3yYpBnS0fVGDcjgsb8lw,291
+django_camomilla_cms-6.0.0b18.dist-info/METADATA,sha256=BwxjdmoaRTe-4KYk6odNDH53VHDiyBtS5vRA2dHWjIY,2565
+django_camomilla_cms-6.0.0b18.dist-info/WHEEL,sha256=_z0Kb-VmhLeNt2nZ-PsoQBjD25rP0tBwgAyRYD7oTKI,109
+django_camomilla_cms-6.0.0b18.dist-info/top_level.txt,sha256=G9VIGBmMMqC7JEckoTgXKmC6T2BR75QRkqRnngw1_lo,16
+django_camomilla_cms-6.0.0b18.dist-info/RECORD,,

{django_camomilla_cms-6.0.0b17.dist-info → django_camomilla_cms-6.0.0b18.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.3.1)
+Generator: setuptools (80.7.1)
 Root-Is-Purelib: true
 Tag: py2-none-any
 Tag: py3-none-any

tests/utils/media.py

@@ -2,8 +2,9 @@ import os
 from tests.fixtures import load_asset
 from django.conf import settings
 
+
 def load_asset_and_remove_media(filename):
-      asset = load_asset(filename)
-      if os.path.exists(f"{settings.MEDIA_ROOT}/{filename}"):
-          os.remove(f"{settings.MEDIA_ROOT}/{filename}")
-      return asset
+    asset = load_asset(filename)
+    if os.path.exists(f"{settings.MEDIA_ROOT}/{filename}"):
+        os.remove(f"{settings.MEDIA_ROOT}/{filename}")
+    return asset