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

camomilla/__init__.py

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

camomilla/models/page.py

@@ -10,7 +10,6 @@ from django.http import Http404, HttpRequest
 from django.shortcuts import redirect
 from django.urls import NoReverseMatch, reverse
 from django.utils import timezone
-from django.utils.functional import lazy
 from django.utils.text import slugify
 from django.utils.translation import gettext_lazy as _
 from django.utils.translation import get_language
@@ -24,7 +23,6 @@ from camomilla.utils import (
     lang_fallback_query,
     set_nofallbacks,
     url_lang_decompose,
-    get_all_templates_files,
 )
 from camomilla.utils.getters import pointed_getter
 from camomilla import settings
@@ -33,10 +31,6 @@ from django.conf import settings as django_settings
 from modeltranslation.utils import build_localized_fieldname
 
 
-def GET_TEMPLATE_CHOICES():
-    return [(t, t) for t in get_all_templates_files()]
-
-
 class UrlRedirect(models.Model):
     language_code = models.CharField(max_length=10, null=True)
     from_url = models.CharField(max_length=400)
@@ -233,7 +227,7 @@ class AbstractPage(SeoMixin, MetaMixin, models.Model, metaclass=PageBase):
     date_created = models.DateTimeField(auto_now_add=True)
     date_updated_at = models.DateTimeField(auto_now=True)
     breadcrumbs_title = models.CharField(max_length=128, null=True, blank=True)
-    template = models.CharField(max_length=500, null=True, blank=True, choices=[])
+    template = models.CharField(max_length=500, null=True, blank=True)
     template_data = models.JSONField(default=dict, null=False, blank=True)
     ordering = models.PositiveIntegerField(default=0, blank=False, null=False)
     parent_page = models.ForeignKey(
@@ -276,7 +270,6 @@ class AbstractPage(SeoMixin, MetaMixin, models.Model, metaclass=PageBase):
 
     def __init__(self, *args, **kwargs):
         super(AbstractPage, self).__init__(*args, **kwargs)
-        self._meta.get_field("template").choices = lazy(GET_TEMPLATE_CHOICES, list)()
 
     def __str__(self) -> str:
         return "(%s) %s" % (self.__class__.__name__, self.title or self.permalink)

camomilla/serializers/base/__init__.py

@@ -9,18 +9,22 @@ from camomilla.serializers.mixins import (
     FieldsOverrideMixin,
     TranslationsMixin,
 )
+from camomilla.settings import ENABLE_TRANSLATIONS
 
-
-class BaseModelSerializer(
+bases = (
     SetupEagerLoadingMixin,
     NestMixin,
     FilterFieldsMixin,
     FieldsOverrideMixin,
     JSONFieldPatchMixin,
     OrderingMixin,
-    TranslationsMixin,
-    serializers.ModelSerializer,
-):
+)
+
+if ENABLE_TRANSLATIONS:
+    bases += (TranslationsMixin,)
+
+
+class BaseModelSerializer(*bases, serializers.ModelSerializer):
     """
     This is the base serializer for all the models.
     It adds support for:

camomilla/settings.py

@@ -87,6 +87,18 @@ 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
+)
+
+INTEGRATIONS_ASTRO_ENABLE = pointed_getter(
+    django_settings, "CAMOMILLA.INTEGRATIONS.ASTRO.ENABLE", False
+)
+
+INTEGRATIONS_ASTRO_URL = pointed_getter(
+    django_settings, "CAMOMILLA.INTEGRATIONS.ASTRO.URL", ""
+)
+
 DEBUG = pointed_getter(django_settings, "CAMOMILLA.DEBUG", django_settings.DEBUG)
 
 # camomilla settings example
@@ -104,10 +116,17 @@ 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
 #     }
+#     "INTEGRATIONS": {
+#         "ASTRO": {
+#             "ENABLE": True,
+#             "URL": "http://localhost:4321"
+#         }
+#     }
 #     "API": {"NESTING_DEPTH": 10, "TRANSLATION_ACCESSOR": "translations"},
 #     "DEBUG": False
 # }

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,77 @@
+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.1"

camomilla/theme/admin/pages.py

@@ -3,6 +3,8 @@ from camomilla import settings
 from .translations import TranslationAwareModelAdmin
 from camomilla.models import UrlNode
 
+from camomilla.utils import get_templates
+
 
 class AbstractPageModelFormMeta(forms.models.ModelFormMetaclass):
     def __new__(mcs, name, bases, attrs):
@@ -22,6 +24,12 @@ class AbstractPageModelFormMeta(forms.models.ModelFormMetaclass):
 class AbstractPageModelForm(
     forms.models.BaseModelForm, metaclass=AbstractPageModelFormMeta
 ):
+    def __init__(self, *args, **kwargs):
+        request = kwargs.pop("request", None)
+        super().__init__(*args, **kwargs)
+        templates = [(t, t) for t in get_templates(request)]
+        templates.insert(0, ("", "---------"))
+        self.fields["template"] = forms.ChoiceField(choices=templates)
 
     def get_initial_for_field(self, field, field_name):
         if field_name in UrlNode.LANG_PERMALINK_FIELDS:
@@ -43,4 +51,16 @@ class AbstractPageModelForm(
 
 class AbstractPageAdmin(TranslationAwareModelAdmin):
     form = AbstractPageModelForm
+
+    def get_form(self, request, obj=None, **kwargs):
+        kwargs["form"] = self.form
+        form = super().get_form(request, obj, **kwargs)
+
+        class FormWithRequest(form):
+            def __new__(cls, *args, **kwargs_):
+                kwargs_["request"] = request
+                return form(*args, **kwargs_)
+
+        return FormWithRequest
+
     change_form_template = "admin/camomilla/page/change_form.html"

camomilla/theme/apps.py

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

camomilla/utils/templates.py

@@ -1,20 +1,53 @@
 from pathlib import Path
 from typing import Sequence
+import requests
 
 from django import template as django_template
 from os.path import relpath
+from camomilla.settings import (
+    REGISTERED_TEMPLATES_APPS,
+    INTEGRATIONS_ASTRO_ENABLE,
+    INTEGRATIONS_ASTRO_URL,
+)
 
 
-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)
-        )
+def get_templates(request=None) -> Sequence[str]:
     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"))
+
+    if INTEGRATIONS_ASTRO_ENABLE and request is not None:
+        try:
+            response = requests.get(
+                INTEGRATIONS_ASTRO_URL + "/api/templates",
+                cookies={
+                    "sessionid": request.COOKIES.get("sessionid"),
+                    "csrftoken": request.COOKIES.get("csrftoken"),
+                },
+            )
+            if response.status_code == 200:
+                astro_templates = response.json()
+                for template in astro_templates:
+                    files.append(template)
+        except:
+            pass
+
     return files

camomilla/views/base/__init__.py

@@ -4,6 +4,8 @@ from ..mixins import (
     OrderingMixin,
     CamomillaBasePermissionMixin,
 )
+from camomilla.serializers.mixins import TranslationsMixin
+from camomilla.utils.translation import plain_to_nest
 from rest_framework import viewsets
 from rest_framework.metadata import SimpleMetadata
 from structured.contrib.restframework import StructuredJSONField
@@ -29,8 +31,8 @@ class BaseViewMetadata(SimpleMetadata):
 
     def get_serializer_info(self, serializer):
         info = super().get_serializer_info(serializer)
-        if hasattr(serializer, "plain_to_nest"):
-            info.update(serializer.plain_to_nest(info))
+        if isinstance(serializer, TranslationsMixin) and serializer.is_translatable:
+            info.update(plain_to_nest(info, serializer.translation_fields))
         return info
 
 

camomilla/views/mixins/pagination.py

@@ -86,7 +86,7 @@ class PaginateStackMixin:
             if "sqlite" in settings.DATABASES["default"]["ENGINE"]:
                 filter_statement = Q()
                 for field in search_fields:
-                    filter_statement |= Q(**{field + '__icontains': search_string})
+                    filter_statement |= Q(**{field + "__icontains": search_string})
                 return list_handler.filter(filter_statement)
             else:
                 return list_handler.annotate(

django_camomilla_cms-6.0.1.dist-info/METADATA

@@ -0,0 +1,133 @@
+Metadata-Version: 2.4
+Name: django-camomilla-cms
+Version: 6.0.1
+Summary: Django powered cms
+Author-email: Lotrèk <dimmitutto@lotrek.it>
+License: MIT
+Project-URL: Homepage, https://github.com/camomillacms/camomilla-core
+Keywords: cms,django,api cms
+Classifier: Environment :: Web Environment
+Classifier: Framework :: Django
+Classifier: Intended Audience :: Developers
+Classifier: Programming Language :: Python
+Classifier: Programming Language :: Python :: 3
+Requires-Python: <=3.13,>=3.8
+Description-Content-Type: text/markdown
+License-File: LICENSE
+Requires-Dist: django-modeltranslation<=0.18.12,>=0.18.7
+Requires-Dist: djsuperadmin<1.0.0,>=0.9
+Requires-Dist: djangorestframework<=3.14.0,>=3.10.0
+Requires-Dist: django-structured-json-field>=0.4.2
+Requires-Dist: Pillow>=10.0.0
+Requires-Dist: django-admin-interface<1.0.0,>=0.26.0
+Requires-Dist: django-ckeditor<7.0.0,>=5.7.1
+Requires-Dist: django-tinymce<5.0.0,>=4.1.0
+Requires-Dist: python-magic<0.5,>=0.4
+Requires-Dist: Django<6,>=3.2
+Requires-Dist: django_jsonform>=2.23
+Requires-Dist: inflection>=0.5.1
+Requires-Dist: uritemplate>=4.1.0
+Dynamic: license-file
+
+[![PyPI](https://img.shields.io/pypi/v/django-camomilla-cms?style=flat-square)](https://pypi.org/project/django-camomilla-cms)
+[![Django Versions](https://img.shields.io/badge/django-3.2%20%7C%204.2%20%7C%205.1-blue?style=flat-square)](https://www.djangoproject.com/)
+[![Build](https://img.shields.io/github/actions/workflow/status/camomillacms/camomilla-core/ci.yml?branch=master&style=flat-square)](https://github.com/camomillacms/camomilla-core/actions)
+[![Last Commit](https://img.shields.io/github/last-commit/camomillacms/camomilla-core?style=flat-square)](https://github.com/camomillacms/camomilla-core/commits/master)
+[![Contributors](https://img.shields.io/github/contributors/camomillacms/camomilla-core?style=flat-square)](https://github.com/camomillacms/camomilla-core/graphs/contributors)
+[![Open Issues](https://img.shields.io/github/issues/camomillacms/camomilla-core?style=flat-square)](https://github.com/camomillacms/camomilla-core/issues)
+[![Codecov](https://img.shields.io/codecov/c/github/camomillacms/camomilla-core?style=flat-square)](https://app.codecov.io/gh/camomillacms/camomilla-core/tree/master/camomilla)
+[![License](https://img.shields.io/github/license/camomillacms/camomilla-core?style=flat-square)](./LICENSE)
+
+
+<br>
+<br>
+<br>
+<br>
+<div align="center">
+    <picture>
+        <source media="(prefers-color-scheme: dark)" srcset="https://camomillacms.github.io/camomilla-core/images/camomilla-logo-dark.svg?v=1">
+        <source media="(prefers-color-scheme: light)" srcset="https://camomillacms.github.io/camomilla-core/images/camomilla-logo-light.svg?v=1">
+        <img alt="Fallback image description" src="https://camomillacms.github.io/camomilla-core/images/camomilla-logo-light.svg?v=1" style="width: 250px; height: auto;">
+    </picture>
+</div>
+<h3 align="center"">Our beloved Django CMS</h3>
+<br>
+
+## ⭐️ Features
+
+<!-- Highlight some of the features your module provide here -->
+
+- 🧘‍♀️ &nbsp;Built on top of the django framework
+- 🥨 &nbsp;Beaked page abstract model to let you manage everything you need as a page.
+- 🏞️ &nbsp;Optimized media management with autoresize
+- 👯 &nbsp;Enable relations inside django JSONFields
+- ⚡️ &nbsp;AutoCreate api endpoints from models
+- 🚧 &nbsp;Enable JsonSchema directly in models endpoints
+
+Camomilla is a Django CMS that allows you to create and manage your website's content with ease. It provides a simple and intuitive interface for managing pages, media, and other content types. Camomilla is built on top of the Django framework, which means it inherits all the features and benefits of Django framework.
+We try to continuously improve Camomilla by adding new features and fixing bugs. You can check the [CHANGELOG](./CHANGELOG.md) to see what has been added in the latest releases.
+
+## 📦 Quick Start
+
+Here you can find some quick setup instructions to get started with Camomilla. For more detailed information, please refer to the [documentation](https://camomillacms.github.io/camomilla-core/).
+
+> [!TIP]
+>
+> #### Env Virtualization 👾
+>
+> Use a virtualenv to isolate your project's dependencies from the system's python installation before starting. Check out [virtualenvwrapper](https://virtualenvwrapper.readthedocs.io/en/latest/) for more information.
+
+Install django-camomilla-cms and django from pip
+
+```bash
+$ pip install django
+$ pip install django-camomilla-cms==6.0.0
+```
+
+Create a new django project
+
+```bash
+$ django-admin startproject <project_name>
+$ cd <project_name>
+```
+
+Create a dedicated folder for camomilla migrations
+
+```bash
+$ mkdir -p camomilla_migrations
+$ touch camomilla_migrations.__init__.py
+```
+
+Create migrations and prepare the database
+
+```bash
+$ python manage.py makemigrations camomilla
+$ python manage.py migrate
+```
+
+Add camomilla and camomilla dependencies to your project's INSTALLED_APPS
+
+```python
+# <project_name>/settings.py
+
+INSTALLED_APPS = [
+    ...
+    'camomilla', # always needed
+    'camomilla.theme', # needed to customize admin interface
+    'djsuperadmin', # needed if you whant to use djsuperadmin for contents
+    'modeltranslation', # needed if your website is multilanguage (can be added later)
+    'rest_framework',  # always needed
+    'rest_framework.authtoken',  # always needed
+    ...
+]
+```
+
+Run the server
+
+```bash
+$ python manage.py runserver
+```
+
+## 🧑‍💻 How to Contribute
+
+We welcome contributions to Camomilla! If you want to contribute, please read our [contributing guide](./CONTRIBUTING.md) for more information on how to get started.