Merge pull request #172 from zediious/0.4.5.5

Changes for 0.5

config/README.md

@@ -13,7 +13,6 @@ DJANGO_SECRET_KEY=''
 DEBUG=
 RUNNING_IN_DOCKER=
 DOMAIN_NAME=''
-ADMIN_BRAND_NAME=''
 LANGUAGE_CODE='en-us'
 TIME_ZONE='America/New_York'
 
@@ -61,9 +60,6 @@ Set this to `True` if you are running this in a Docker Container (you would/shou
 ### **DOMAIN_NAME**
 Set this to the public domain that you will be connecting to the server with in production. This is the domain that NGINX is listening for requests on. This is only relevant when running in production/Docker, and is overriden when in a development environment.
 
-### **ADMIN_BRAND_NAME**
-The brand name used in admin interfaces. This will not be displayed on the typical user front end.
-
 ### **LANGUAGE_CODE**
 A code representing the language used by Django. This is set to `en-us` by default, but can be changed. https://docs.djangoproject.com/en/4.1/ref/settings/#language-code
 

config/logging.py

@@ -115,11 +115,21 @@
             'level': 'DEBUG',
             'propagate': False,
         },
+        'panel.forms': {
+            'handlers': ['console', 'log_file', 'mail_admins'],
+            'level': 'DEBUG',
+            'propagate': False,
+        },
         'staffapps.views': {
             'handlers': ['console', 'log_file', 'mail_admins'],
             'level': 'DEBUG',
             'propagate': False,
         },
+        'staffapps.template_db': {
+            'handlers': ['console', 'log_file', 'mail_admins'],
+            'level': 'DEBUG',
+            'propagate': False,
+        },
         'authprofiles.auth': {
             'handlers': ['console', 'log_file', 'mail_admins'],
             'level': 'DEBUG',

config/settings.py

@@ -6,7 +6,6 @@
 from celery.schedules import crontab
 
 from config.logging import LOGGING_DEFINITION
-from config.jazzmin import JAZZMIN_SETTINGS_ORIGINAL, JAZZMIN_UI_TWEAKS_ORIGINAL
 
 # Define project directories
 BASE_DIR: str = Path(__file__).resolve().parent.parent
@@ -68,7 +67,6 @@
 
 # Application/Middleware definitions
 INSTALLED_APPS: list[str] = [
-    'jazzmin',
     'django.contrib.admin',
     'django.contrib.auth',
     'django.contrib.contenttypes',
@@ -115,6 +113,7 @@
                 'django.contrib.auth.context_processors.auth',
                 'django.contrib.messages.context_processors.messages',
                 'raptorWeb.raptormc.context_processor.context_process',
+                'raptorWeb.panel.context_processor.context_process',
                 'raptorWeb.authprofiles.context_processor.all_users_to_context',
                 'raptorWeb.raptorbot.context_processor.add_discord_guild_data',
                 'raptorWeb.gameservers.context_processor.server_settings_to_context',
@@ -283,11 +282,6 @@
     }
 }
 
-# ** Settings for "django-jazzmin" app **
-JAZZMIN_SETTINGS = JAZZMIN_SETTINGS_ORIGINAL
-
-JAZZMIN_UI_TWEAKS = JAZZMIN_UI_TWEAKS_ORIGINAL
-
 # ** Settings for "django_bootstrap5" app **
 BOOTSTRAP5: dict = {
 

config/urls.py

@@ -39,7 +39,6 @@
     path('robots.txt', TemplateView.as_view(template_name=join(RAPTORMC_TEMPLATE_DIR, 'robots.txt'), content_type="text/plain")),
     path('tinymce/', include('tinymce.urls')),
     path('captcha/', include('captcha.urls')),
-    path('admin/', admin.site.urls, name="admin"),
     path('panel/', include(panel_urls), name='panel'),
     path('api/servers/', include(server_urls), name="gameservers"),
     path('api/donations/', include(donation_urls), name="donations"),

environment.yml

@@ -23,7 +23,6 @@ dependencies:
     - django-js-asset==2.1.0
     - python-dotenv==1.0.0
     - mysqlclient==2.1.1
-    - django-jazzmin==2.6.0
     - discord.py==2.3.2
     - django-ranged-response==0.2.0
     - django-simple-captcha==0.5.20