Rip out registration and the audit log for now. Upgrade to Django 3.2

8 files changed, 41 insertions, 58 deletions

diff --git a/app/app/settings.py b/app/app/settings.py
index 888d53b..d3dca5d 100644
--- a/app/app/settings.py
+++ b/app/app/settings.py
@@ -13,16 +13,22 @@ https://docs.djangoproject.com/en/1.11/ref/settings/
 import os
 import yaml
 
+try:
+    from yaml import CLoader as Loader, CDumper as Dumper
+except ImportError:
+    from yaml import Loader, Dumper
+
 # Build paths inside the project like this: os.path.join(BASE_DIR, ...)
 BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 
 
 def get_default_config():
     if os.path.exists(BASE_DIR + '/config.yml'):
-        return yaml.load(open(BASE_DIR + '/config.yml').read())
+        return yaml.load(open(BASE_DIR + '/config.yml').read(), Loader=Loader)
     else:
         print("Warning: loading example config! Create config.yml Soon!")
-        return yaml.load(open(BASE_DIR + '/config-example.yml').read())
+        return yaml.load(open(BASE_DIR + '/config-example.yml').read(), \
+                Loader=Loader)
 
 
 CONFIG = {}
@@ -86,7 +92,7 @@ INSTALLED_APPS = [
     'django.contrib.staticfiles',
     'dispatch.apps.DispatchConfig',
     'dispatchAuth.apps.DispatchauthConfig',
-    'auditlog',
+    # 'auditlog',
 ]
 
 MIDDLEWARE = [
@@ -98,7 +104,7 @@ MIDDLEWARE = [
     'django.contrib.messages.middleware.MessageMiddleware',
     'django.middleware.clickjacking.XFrameOptionsMiddleware',
     'dispatch.middleware.LoginRequiredMiddleware',
-    'auditlog.middleware.AuditlogMiddleware',
+    # 'auditlog.middleware.AuditlogMiddleware',
 ]
 
 ROOT_URLCONF = 'app.urls'
@@ -188,3 +194,5 @@ LOGIN_REDIRECT_URL = '/'
 
 MEDIA_ROOT = BASE_DIR + '/media'
 MEDIA_URL = '/media/'
+
+DEFAULT_AUTO_FIELD = 'django.db.models.AutoField'
diff --git a/app/app/urls.py b/app/app/urls.py
index 78d4239..773deaa 100644
--- a/app/app/urls.py
+++ b/app/app/urls.py
@@ -18,18 +18,18 @@ from django.conf.urls import include, url
 from django.conf.urls.static import static
 from django.contrib import admin
 
-from registration.backends.hmac.views import RegistrationView
-from dispatchAuth.forms import UserForm
+# from registration.backends.hmac.views import RegistrationView
+# from dispatchAuth.forms import UserForm
 
 urlpatterns = [
     url(r'^', include('dispatch.urls')),
     # Override registration form
-    url(r'^accounts/register/$',
-        RegistrationView.as_view(
-            form_class=UserForm
-        ),
-        name='registration_register',
-    ),
-    url(r'^accounts/', include('registration.backends.hmac.urls')),
+    # url(r'^accounts/register/$',
+    #     RegistrationView.as_view(
+    #         form_class=UserForm
+    #     ),
+    #     name='registration_register',
+    # ),
+    # url(r'^accounts/', include('registration.backends.hmac.urls')),
     url(r'^admin/', admin.site.urls),
 ] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
diff --git a/app/dispatch/models.py b/app/dispatch/models.py
index a933c76..aba8a92 100644
--- a/app/dispatch/models.py
+++ b/app/dispatch/models.py
@@ -1,7 +1,5 @@
 from django.db import models
 from django.conf import settings
-from auditlog.registry import auditlog
-from auditlog.models import AuditlogHistoryField
 # from django.contrib.auth import get_user_model
 from datetime import datetime
 from django.core.exceptions import ObjectDoesNotExist
@@ -15,7 +13,6 @@ import re
 
 
 class Customer(models.Model):
-    history         = AuditlogHistoryField()
     name            = models.CharField(max_length=256)
     address         = models.CharField(max_length=256)
     phone_number    = models.DecimalField(max_digits=16,decimal_places=0)
@@ -42,7 +39,6 @@ class Customer(models.Model):
 
 
 class Load(models.Model):
-    history         = AuditlogHistoryField()
     date            = models.DateField()
     user            = models.ForeignKey(settings.AUTH_USER_MODEL, on_delete=models.CASCADE)
     customer        = models.ForeignKey(Customer, on_delete=models.CASCADE)
@@ -217,12 +213,3 @@ class InvoiceItem(models.Model):
     def total(self):
         return self.quantity*self.amount
 
-
-
-
-
-auditlog.register(Invoice)
-auditlog.register(UserInvoiceNumber)
-auditlog.register(Identity)
-auditlog.register(Customer)
-auditlog.register(Load)
diff --git a/app/dispatch/templates/dispatch/nav.html b/app/dispatch/templates/dispatch/nav.html
index b9e02e8..bc34d41 100644
--- a/app/dispatch/templates/dispatch/nav.html
+++ b/app/dispatch/templates/dispatch/nav.html
@@ -6,7 +6,6 @@
   <li><a href="{% url 'load_list' %}">Loads</a></li>
   <li><a href="{% url 'invoice_list' %}">Invoices</a></li>
   {% if request.user.is_superuser %}
-  <li><a href="{% url 'log_summary' %}">Audit Log</a></li>
   <li><a href="{% url 'driver_list' %}">Vendors</a></li>
   <li><a href="{% url 'customer_list' %}">Customers</a></li>
   {% else %}
diff --git a/app/dispatch/urls.py b/app/dispatch/urls.py
index d78186b..c922b30 100644
--- a/app/dispatch/urls.py
+++ b/app/dispatch/urls.py
@@ -48,7 +48,4 @@ urlpatterns = [
         url(r'^invoices/edit/(?P<pk>\d+)$', views.InvoiceEdit.as_view(), name='invoice_edit'),
         url(r'^invoices/delete/(?P<pk>\d+)$', views.InvoiceDelete.as_view(), name='invoice_delete'),
         url(r'^drivers/view/(?P<pk>\d+)/generate/$', views.InvoiceGenerateForDates, name='invoice_generate'),
-
-        url(r'^audit_log/summary/$', views.AuditLog.as_view(), name='log_summary'),
-
 ]
diff --git a/app/dispatch/views.py b/app/dispatch/views.py
index fc8bab2..60172bb 100644
--- a/app/dispatch/views.py
+++ b/app/dispatch/views.py
@@ -1,7 +1,6 @@
 from django.shortcuts import render, redirect
 from django.http import HttpResponse
 from django.utils.encoding import smart_str
-from auditlog.models import LogEntry
 # from django.template import loader
 from django.urls import reverse, reverse_lazy
 # import django.contrib.auth as auth
@@ -180,14 +179,6 @@ class DriverSummary(UserPassesTestMixin, LoadDateSort):
         return context
 
 
-class AuditLog(UserPassesTestMixin, ListView):
-    template_name = "dispatch/log/summary.html"
-    model = LogEntry
-
-    def test_func(self):
-        return self.request.user.is_superuser
-
-
 class DriverUpdate(UserPassesTestMixin, UpdateView):
     template_name = "dispatch/drivers/edit.html"
     model = User
diff --git a/app/dispatchAuth/forms.py b/app/dispatchAuth/forms.py
index 99781f7..72aa46b 100644
--- a/app/dispatchAuth/forms.py
+++ b/app/dispatchAuth/forms.py
@@ -1,11 +1,11 @@
-from registration.forms import RegistrationForm
+# from registration.forms import RegistrationForm
 from .models import User
 
 
-class UserForm(RegistrationForm):
-    # fields = ['email', 'first_name', 'last_name']
-    # model = User
-
-    class Meta:
-        fields = ['email', 'first_name', 'last_name']
-        model = User
+# class UserForm(RegistrationForm):
+#     # fields = ['email', 'first_name', 'last_name']
+#     # model = User
+# 
+#     class Meta:
+#         fields = ['email', 'first_name', 'last_name']
+#         model = User
diff --git a/app/requirements.txt b/app/requirements.txt
index 8879a8a..ac816f3 100644
--- a/app/requirements.txt
+++ b/app/requirements.txt
@@ -1,12 +1,13 @@
+asgiref==3.4.1
 confusable-homoglyphs==3.2.0
-Django==2.1.5
-django-auditlog==0.4.5
-django-jsonfield==1.0.1
-django-registration==2.3
-Faker==0.8.4
-psycopg2==2.7.3.2
-pyaml==17.10.0
-python-dateutil==2.6.1
-pytz==2017.2
-PyYAML==3.12
-six==1.10.0
+Django==3.2.8
+django-auditlog==0.4.7
+django-jsonfield==1.4.1
+django-registration==3.2
+Faker==9.2.0
+python-dateutil==2.6.0
+pytz==2021.3
+PyYAML==5.4.1
+six==1.16.0
+sqlparse==0.4.2
+text-unidecode==1.3