Merge 846bacc into 7f9b0cb

requirements.txt

@@ -1,13 +1,14 @@
 Django[bcrypt]==4.2.5
-django-bootstrap3==23.4
+django-bootstrap4==22.3
 dj-database-url==2.1.0
 dj-static==0.0.6
 django-admin-csvexport==2.2
 django-csp==3.7
 django-csp-reports==1.8.1
-crispy-bootstrap3==2022.1
+crispy-bootstrap4==2022.1
 django-crispy-forms==2.0
 django-filter==23.3
+django-icons==23.3
 djangorestframework==3.14.0
 drf-spectacular==0.26.5
 drf-spectacular-sidecar==2023.9.1

teamtemp/settings/base.py

@@ -113,10 +113,11 @@
     'django.contrib.admindocs',
     'django_filters',
     'teamtemp.responses',
-    'bootstrap3',
+    'bootstrap4',
+    'django_icons',
     'rest_framework',
     'crispy_forms',
-    'crispy_bootstrap3',
+    'crispy_bootstrap4',
     'cspreports',
     'csvexport',
     'drf_spectacular',
@@ -187,9 +188,11 @@
     },
 ]
 
-# Settings for django-bootstrap3
-BOOTSTRAP3 = {
+# Settings for django-bootstrap4
+
+BOOTSTRAP4 = {
     'javascript_in_head': True,
+    'include_jquery': True,
     'jquery_url': '/static/jquery-3.6.3.min.js',
 }
 
@@ -203,8 +206,10 @@
     "'self'",
     "'unsafe-inline'",
     'code.jquery.com',
+    'maxcdn.bootstrapcdn.com',
     'stackpath.bootstrapcdn.com',
     'cdnjs.cloudflare.com',
+    'stackpath.bootstrapcdn.com',
     'www.gstatic.com',
     'ssl.gstatic.com',
     'cdn.jsdelivr.net',
@@ -279,9 +284,15 @@
 WORDCLOUD_HEIGHT = 400
 WORDCLOUD_WIDTH = 400
 
-CRISPY_ALLOWED_TEMPLATE_PACKS = "bootstrap3"
+DJANGO_ICONS = {
+    "ICONS": {
+        "filter": {"name": "fas fa-filter"},
+    },
+}
+
+CRISPY_ALLOWED_TEMPLATE_PACKS = "bootstrap4"
 
-CRISPY_TEMPLATE_PACK = "bootstrap3"
+CRISPY_TEMPLATE_PACK = "bootstrap4"
 
 SPECTACULAR_SETTINGS = {
     'TITLE': 'Team Temperature API',