updates

alplora/urls.py

@@ -3,6 +3,8 @@ from django.conf.urls import url
 from .views import IndexView, LoginView, ContactView
 
 
+app_name = "alplora"
+
 urlpatterns = [
     url(r'^$', IndexView.as_view(), name='index'),
     url(r'login/', LoginView.as_view(), name='login'),

datacenterlight/urls.py

@@ -7,6 +7,8 @@ from .views import (
     WhyDataCenterLightView, ContactUsView
 )
 
+app_name = "datacenterlight"
+
 urlpatterns = [
     url(r'^$', IndexView.as_view(), name='index'),
     url(r'^t/$', IndexView.as_view(), name='index_t'),

dynamicweb/settings/base.py

@@ -96,7 +96,7 @@ INSTALLED_APPS = (
     'djangocms_multisite',
     'easy_thumbnails',
     'utils',
-    #'stored_messages',
+    'stored_messages',
     'mptt',
     'parler',
     'guardian',

dynamicweb/urls.py

@@ -18,6 +18,7 @@ from django.views.generic import RedirectView
 from django.urls import reverse_lazy
 import debug_toolbar
 
+
 urlpatterns = [
     url(r'^index.html$', LandingView.as_view()),
     url(r'^open_api/',
@@ -30,7 +31,7 @@ urlpatterns = [
         name="django.hosting"),
     url(r'^nosystemd/', include('nosystemd.urls', namespace="nosystemd")),
     url(r'^taggit_autosuggest/', include('taggit_autosuggest.urls')),
-    url(r'^jsi18n/(?P<packages>\S+?)/$', i18n.javascript_catalog),
+    url(r'^jsi18n/(?P<packages>\S+?)/$', i18n.JavaScriptCatalog.as_view()),
     url(r'^product/(?P<product_slug>[\w-]+)/$',
         PaymentOrderView.as_view(),
         name='show_product'),
@@ -42,11 +43,12 @@ urlpatterns += i18n_patterns(
 
 # note the django CMS URLs included via i18n_patterns
 REDIRECT_TO_CMS = False
-if Page.objects.filter(site_id=Site.objects.get_current().id).count():
-    REDIRECT_TO_CMS = True
+"""TODO:if Page.objects.filter(site_id=Site.objects.get_current().id).count():
+    REDIRECT_TO_CMS = True"""
+
 
 urlpatterns += i18n_patterns(
-    url(r'^admin/', include(admin.site.urls)),
+    url(r'^admin/', admin.site.urls),
     url(r'^datacenterlight/',
         include('datacenterlight.urls', namespace="datacenterlight")),
     url(r'^hosting/', RedirectView.as_view(url=reverse_lazy('hosting:login')),

hosting/urls.py

@@ -14,6 +14,8 @@ from .views import (
     InvoiceListView, InvoiceDetailView, CheckUserVM
 )
 
+app_name = "hosting"
+
 urlpatterns = [
     url(r'index/?$', IndexView.as_view(), name='index'),
     url(r'django/?$', DjangoHostingView.as_view(), name='djangohosting'),
@@ -69,7 +71,7 @@ urlpatterns = [
         name='reset_password'),
     url(r'reset-password-confirm/(?P<uidb64>[0-9A-Za-z]+)-(?P<token>.+)/$',
         PasswordResetConfirmView.as_view(), name='reset_password_confirm'),
-    url(r'^logout/?$', auth_views.logout,
+    url(r'^logout/?$', auth_views.LogoutView.as_view(),
         {'next_page': '/hosting/login?logged_out=true'}, name='logout'),
     url(r'^validate/(?P<validate_slug>.*)/$',
         SignupValidatedView.as_view(), name='validate')

legacy_compat.py

@@ -520,4 +520,11 @@ def install_backport_collections_shim():
 
     sys.modules["backport_collections"] = module
 
-install_backport_collections_shim()
+install_backport_collections_shim()
+
+
+import django.template.library
+from django.template.library import Library
+
+if not hasattr(Library, "assignment_tag"):
+    Library.assignment_tag = Library.simple_tag

nosystemd/urls.py

@@ -1,26 +1,77 @@
-from django.conf.urls import url
-from django.contrib.auth import views as auth_views
+from django.urls import path
+from django.contrib.auth.views import LogoutView
+
+from .views import (
+    LandingView,
+    LoginView,
+    SignupView,
+    PasswordResetView,
+    PasswordResetConfirmView,
+    DonationView,
+    DonationDetailView,
+    ChangeDonatorStatusDetailView,
+    DonatorStatusDetailView,
+    DonationListView,
+)
+
+
+app_name = "nosystemd"
 
-from .views import LandingView, LoginView, SignupView, PasswordResetView,\
-    PasswordResetConfirmView, DonationView, DonationDetailView, ChangeDonatorStatusDetailView,\
-    DonatorStatusDetailView, DonationListView
 
 urlpatterns = [
-    url(r'^$', LandingView.as_view(), name='landing'),
-    url(r'^login/?$', LoginView.as_view(), name='login'),
-    url(r'^signup/?$', SignupView.as_view(), name='signup'),
-    url(r'^logout/?$', auth_views.logout,
-        {'next_page': '/nosystemd/login?logged_out=true'}, name='logout'),
-    url(r'reset-password/?$', PasswordResetView.as_view(), name='reset_password'),
-    url(r'reset-password-confirm/(?P<uidb64>[0-9A-Za-z]+)-(?P<token>.+)/$',
-        PasswordResetConfirmView.as_view(), name='reset_password_confirm'),
-    url(r'^donations/?$', DonationListView.as_view(), name='donations'),
-    url(r'donations/(?P<pk>\d+)/?$', DonationDetailView.as_view(), name='donations'),
-    url(r'^make_donation/?$', DonationView.as_view(), name='make_donation'),
-    url(r'donations/status/?$', DonatorStatusDetailView.as_view(),
-        name='donator_status'),
-    url(r'donations/status/(?P<pk>\d+)/?$', ChangeDonatorStatusDetailView.as_view(),
-        name='change_donator_status'),
-    # url(r'^donation/invoice?$', DonationView.as_view(), name='donation_detail'),
-
-]
+    path(
+        "",
+        LandingView.as_view(),
+        name="landing",
+    ),
+    path(
+        "login/",
+        LoginView.as_view(),
+        name="login",
+    ),
+    path(
+        "signup/",
+        SignupView.as_view(),
+        name="signup",
+    ),
+    path(
+        "logout/",
+        LogoutView.as_view(next_page="/nosystemd/login?logged_out=true"),
+        name="logout",
+    ),
+    path(
+        "reset-password/",
+        PasswordResetView.as_view(),
+        name="reset_password",
+    ),
+    path(
+        "reset-password-confirm/<uidb64>-<token>/",
+        PasswordResetConfirmView.as_view(),
+        name="reset_password_confirm",
+    ),
+    path(
+        "donations/",
+        DonationListView.as_view(),
+        name="donations",
+    ),
+    path(
+        "donations/<int:pk>/",
+        DonationDetailView.as_view(),
+        name="donations",
+    ),
+    path(
+        "make_donation/",
+        DonationView.as_view(),
+        name="make_donation",
+    ),
+    path(
+        "donations/status/",
+        DonatorStatusDetailView.as_view(),
+        name="donator_status",
+    ),
+    path(
+        "donations/status/<int:pk>/",
+        ChangeDonatorStatusDetailView.as_view(),
+        name="change_donator_status",
+    ),
+]

opennebula_api/urls.py

@@ -1,13 +1,28 @@
-from django.conf.urls import url, include
+from django.urls import include, path
+
 from rest_framework.urlpatterns import format_suffix_patterns
+
 from .views import VmCreateView, VmDetailsView
 
-urlpatterns = {
-    url(r'^auth/', include('rest_framework.urls', namespace='rest_framework')),
 
-    url(r'^vms/$', VmCreateView.as_view(), name="vm_create"),
-    url(r'^vms/(?P<pk>[0-9]+)/$', VmDetailsView.as_view(),
-        name="vm_details"),
-}
+app_name = "opennebula_api"
 
-urlpatterns = format_suffix_patterns(urlpatterns)
+
+urlpatterns = [
+    path(
+        "auth/",
+        include("rest_framework.urls", namespace="rest_framework"),
+    ),
+    path(
+        "vms/",
+        VmCreateView.as_view(),
+        name="vm_create",
+    ),
+    path(
+        "vms/<int:pk>/",
+        VmDetailsView.as_view(),
+        name="vm_details",
+    ),
+]
+
+urlpatterns = format_suffix_patterns(urlpatterns)

updated_requirements.txt

@@ -19,7 +19,7 @@ django-appconf==1.2.0
 django-appdata==0.4.0
 django-bootstrap3==26.2
 django-classy-tags==0.8.0
-django-cms==5.1.3
+django-debug-toolbar==8.0.0
 django-filer==3.6.0
 django-formtools==2.1
 django-guardian==3.5.0
@@ -31,9 +31,11 @@ django-multisite==1.9.0
 django-parler==2.4
 django-phonenumber-field==1.3.0
 django-polymorphic==4.11.7
-django-reversion==1.10.2
+django-recaptcha==4.1.0
+django-reversion==6.3.0
 django-sekizai==0.10.0
 django-sortedm2m==4.0.0
+django-stored-messages==1.4.0
 django-taggit==6.1.0
 django-taggit-autosuggest==0.4.2
 django-taggit-templatetags==0.2.5
@@ -64,6 +66,7 @@ pyasn1==0.6.4
 pycrypto==2.6.1
 pycryptodome==3.23.0
 pymemcache==4.0.0
+PyOTP==2.10.0
 python-dateutil==2.9.0.post0
 python-dotenv==1.2.3
 python-slugify==9.1.2
@@ -72,6 +75,7 @@ rcssmin==1.2.2
 requests==2.34.2
 requests-file==3.0.1
 rjsmin==1.2.5
+setuptools==84.0.0
 six==1.17.0
 sqlparse==0.6.0
 stripe==15.6.1