Merge pull request #581 from maykinmedia/feature/django-cms

Migrate to Django-CMS
maykinmedia · Apr 24, 2023 · 112f337 · 112f337
2 parents 0bd2642 + d60b7b0
commit 112f337
Show file tree

Hide file tree

Showing 132 changed files with 1,409 additions and 771 deletions.
diff --git a/requirements/base.in b/requirements/base.in
@@ -37,7 +37,7 @@ django-view-breadcrumbs
 markdown
 django_better_admin_arrayfield
 humanfriendly
-git+https://github.com/maykinmedia/mail-editor.git@f99e5c4920a95cf9141a71230d7dfb9f03b84e36#egg=mail-editor
+git+https://github.com/maykinmedia/mail-editor.git@a5743ff0f997a91d8202015b79966533f014f5bd#egg=mail-editor
 fontawesomefree
 django-timeline-logger
 django-csp
@@ -49,6 +49,17 @@ playwright
 django-yubin
 django-image-cropping
 
+# django cms
+django-cms
+djangocms-text-ckeditor
+djangocms-link
+djangocms-file
+djangocms-picture
+# djangocms-video
+# djangocms-googlemap
+# djangocms-snippet
+# djangocms-style
+
 # API libraries
 djangorestframework
 django-extra-fields

diff --git a/requirements/base.txt b/requirements/base.txt
@@ -74,6 +74,8 @@ django==3.2.15
     #   django-appconf
     #   django-axes
     #   django-choices
+    #   django-classy-tags
+    #   django-cms
     #   django-cors-headers
     #   django-csp
     #   django-csp-reports
@@ -95,6 +97,7 @@ django==3.2.15
     #   django-registration
     #   django-relativedelta
     #   django-rosetta
+    #   django-sekizai
     #   django-sendfile2
     #   django-simple-certmanager
     #   django-sniplates
@@ -131,6 +134,18 @@ django-choices==1.7.2
     #   mail-editor
 django-ckeditor==6.2.0
     # via mail-editor
+django-classy-tags==4.0.0
+    # via
+    #   django-cms
+    #   django-sekizai
+django-cms==3.11.1
+    # via
+    #   -r requirements/base.in
+    #   djangocms-attributes-field
+    #   djangocms-file
+    #   djangocms-link
+    #   djangocms-picture
+    #   djangocms-text-ckeditor
 django-colorfield==0.4.5
     # via -r requirements/base.in
 django-cors-headers==3.10.0
@@ -146,11 +161,17 @@ django-elasticsearch-dsl==7.2.1
 django-extra-fields==3.0.2
     # via -r requirements/base.in
 django-filer==2.2.4
-    # via -r requirements/base.in
+    # via
+    #   -r requirements/base.in
+    #   djangocms-file
+    #   djangocms-link
+    #   djangocms-picture
 django-filter==21.1
     # via -r requirements/base.in
 django-formtools==2.3
-    # via maykin-django-two-factor-auth
+    # via
+    #   django-cms
+    #   maykin-django-two-factor-auth
 django-hijack==3.0.4
     # via -r requirements/base.in
 django-htmx==1.13.0
@@ -193,6 +214,8 @@ django-relativedelta==1.1.2
     # via zgw-consumers
 django-rosetta==0.9.7
     # via -r requirements/base.in
+django-sekizai==4.0.0
+    # via django-cms
 django-sendfile2==0.7.0
     # via django-privates
 django-sessionprofile==1.0
@@ -212,12 +235,30 @@ django-solo==1.2.0
     #   zgw-consumers
 django-timeline-logger==2.0.0
     # via -r requirements/base.in
-django-treebeard==4.5.1
-    # via -r requirements/base.in
+django-treebeard==4.4
+    # via
+    #   -r requirements/base.in
+    #   django-cms
+    #   djangocms-attributes-field
 django-view-breadcrumbs==2.2.4
     # via -r requirements/base.in
 django-yubin==1.7.1
     # via -r requirements/base.in
+djangocms-admin-style==3.2.3
+    # via django-cms
+djangocms-attributes-field==2.1.0
+    # via
+    #   djangocms-file
+    #   djangocms-link
+    #   djangocms-picture
+djangocms-file==3.0.0
+    # via -r requirements/base.in
+djangocms-link==3.1.1
+    # via -r requirements/base.in
+djangocms-picture==4.0.0
+    # via -r requirements/base.in
+djangocms-text-ckeditor==5.1.2
+    # via -r requirements/base.in
 djangorestframework==3.12.4
     # via
     #   -r requirements/base.in
@@ -231,7 +272,9 @@ djangorestframework-camel-case==1.2.0
 drf-spectacular==0.20.1
     # via -r requirements/base.in
 easy-thumbnails[svg]==2.8.5
-    # via django-filer
+    # via
+    #   django-filer
+    #   djangocms-picture
 elastic-apm==6.4.0
     # via -r requirements/base.in
 elasticsearch==7.15.1
@@ -267,7 +310,9 @@ glom==20.11.0
 greenlet==2.0.1
     # via playwright
 html5lib==1.1
-    # via weasyprint
+    # via
+    #   djangocms-text-ckeditor
+    #   weasyprint
 humanfriendly==10.0
     # via -r requirements/base.in
 idna==3.2
@@ -292,7 +337,7 @@ lxml==4.9.1
     #   maykin-python3-saml
     #   svglib
     #   xmlsec
-mail-editor @ git+https://github.com/maykinmedia/mail-editor.git@f99e5c4920a95cf9141a71230d7dfb9f03b84e36
+mail-editor @ git+https://github.com/maykinmedia/mail-editor.git@a5743ff0f997a91d8202015b79966533f014f5bd
     # via -r requirements/base.in
 mail-parser==3.15.0
     # via django-yubin
@@ -316,11 +361,14 @@ openpyxl==3.0.9
     # via tablib
 orderedmultidict==1.0.1
     # via furl
+packaging==23.0
+    # via djangocms-text-ckeditor
 phonenumbers==8.12.33
     # via -r requirements/base.in
 pillow==9.0.1
     # via
     #   -r requirements/base.in
+    #   djangocms-text-ckeditor
     #   easy-thumbnails
     #   reportlab
     #   weasyprint

diff --git a/requirements/ci.txt b/requirements/ci.txt
@@ -133,6 +133,8 @@ django==3.2.15
     #   django-appconf
     #   django-axes
     #   django-choices
+    #   django-classy-tags
+    #   django-cms
     #   django-cors-headers
     #   django-csp
     #   django-csp-reports
@@ -154,6 +156,7 @@ django==3.2.15
     #   django-registration
     #   django-relativedelta
     #   django-rosetta
+    #   django-sekizai
     #   django-sendfile2
     #   django-simple-certmanager
     #   django-sniplates
@@ -203,6 +206,21 @@ django-ckeditor==6.2.0
     #   -c requirements/base.txt
     #   -r requirements/base.txt
     #   mail-editor
+django-classy-tags==4.0.0
+    # via
+    #   -c requirements/base.txt
+    #   -r requirements/base.txt
+    #   django-cms
+    #   django-sekizai
+django-cms==3.11.1
+    # via
+    #   -c requirements/base.txt
+    #   -r requirements/base.txt
+    #   djangocms-attributes-field
+    #   djangocms-file
+    #   djangocms-link
+    #   djangocms-picture
+    #   djangocms-text-ckeditor
 django-colorfield==0.4.5
     # via
     #   -c requirements/base.txt
@@ -235,6 +253,9 @@ django-filer==2.2.4
     # via
     #   -c requirements/base.txt
     #   -r requirements/base.txt
+    #   djangocms-file
+    #   djangocms-link
+    #   djangocms-picture
 django-filter==21.1
     # via
     #   -c requirements/base.txt
@@ -243,6 +264,7 @@ django-formtools==2.3
     # via
     #   -c requirements/base.txt
     #   -r requirements/base.txt
+    #   django-cms
     #   maykin-django-two-factor-auth
 django-hijack==3.0.4
     # via
@@ -326,6 +348,11 @@ django-rosetta==0.9.7
     # via
     #   -c requirements/base.txt
     #   -r requirements/base.txt
+django-sekizai==4.0.0
+    # via
+    #   -c requirements/base.txt
+    #   -r requirements/base.txt
+    #   django-cms
 django-sendfile2==0.7.0
     # via
     #   -c requirements/base.txt
@@ -357,10 +384,12 @@ django-timeline-logger==2.0.0
     # via
     #   -c requirements/base.txt
     #   -r requirements/base.txt
-django-treebeard==4.5.1
+django-treebeard==4.4
     # via
     #   -c requirements/base.txt
     #   -r requirements/base.txt
+    #   django-cms
+    #   djangocms-attributes-field
 django-view-breadcrumbs==2.2.4
     # via
     #   -c requirements/base.txt
@@ -371,6 +400,34 @@ django-yubin==1.7.1
     # via
     #   -c requirements/base.txt
     #   -r requirements/base.txt
+djangocms-admin-style==3.2.3
+    # via
+    #   -c requirements/base.txt
+    #   -r requirements/base.txt
+    #   django-cms
+djangocms-attributes-field==2.1.0
+    # via
+    #   -c requirements/base.txt
+    #   -r requirements/base.txt
+    #   djangocms-file
+    #   djangocms-link
+    #   djangocms-picture
+djangocms-file==3.0.0
+    # via
+    #   -c requirements/base.txt
+    #   -r requirements/base.txt
+djangocms-link==3.1.1
+    # via
+    #   -c requirements/base.txt
+    #   -r requirements/base.txt
+djangocms-picture==4.0.0
+    # via
+    #   -c requirements/base.txt
+    #   -r requirements/base.txt
+djangocms-text-ckeditor==5.1.2
+    # via
+    #   -c requirements/base.txt
+    #   -r requirements/base.txt
 djangorestframework==3.12.4
     # via
     #   -c requirements/base.txt
@@ -392,6 +449,7 @@ easy-thumbnails[svg]==2.8.5
     #   -c requirements/base.txt
     #   -r requirements/base.txt
     #   django-filer
+    #   djangocms-picture
 elastic-apm==6.4.0
     # via
     #   -c requirements/base.txt
@@ -469,6 +527,7 @@ html5lib==1.1
     # via
     #   -c requirements/base.txt
     #   -r requirements/base.txt
+    #   djangocms-text-ckeditor
     #   weasyprint
 humanfriendly==10.0
     # via
@@ -527,7 +586,7 @@ lxml==4.9.1
     #   pyquery
     #   svglib
     #   xmlsec
-mail-editor @ git+https://github.com/maykinmedia/mail-editor.git@f99e5c4920a95cf9141a71230d7dfb9f03b84e36
+mail-editor @ git+https://github.com/maykinmedia/mail-editor.git@a5743ff0f997a91d8202015b79966533f014f5bd
     # via
     #   -c requirements/base.txt
     #   -r requirements/base.txt
@@ -583,6 +642,11 @@ orderedmultidict==1.0.1
     #   -c requirements/base.txt
     #   -r requirements/base.txt
     #   furl
+packaging==23.0
+    # via
+    #   -c requirements/base.txt
+    #   -r requirements/base.txt
+    #   djangocms-text-ckeditor
 pep8==1.7.1
     # via -r requirements/test-tools.in
 phonenumbers==8.12.33
@@ -593,6 +657,7 @@ pillow==9.0.1
     # via
     #   -c requirements/base.txt
     #   -r requirements/base.txt
+    #   djangocms-text-ckeditor
     #   easy-thumbnails
     #   reportlab
     #   weasyprint