cmu-delphi · BrainIsDead · Nov 30, 2023 · Oct 17, 2023 · Oct 17, 2023 · Oct 17, 2023
diff --git a/Pipfile b/Pipfile
@@ -15,7 +15,7 @@ django-health-check = "*"
 django-cors-headers = "*"
 django-debug-toolbar = "*"
 gunicorn = "*"
-django-bootstrap-v5 = "*"
+pygraphviz = "*"
 factory-boy = "*"
 linkpreview = "*"
 django-redis = "*"

diff --git a/Pipfile.lock b/Pipfile.lock
diff --git a/src/datasources/models.py b/src/datasources/models.py
@@ -39,6 +39,9 @@ class SourceSubdivision(TimeStampedModel):
         on_delete=models.PROTECT
     )
 
+    class Meta:
+        ordering: list[str] = ["name"]
+
     def __str__(self) -> str:
         """
         Returns the name of the source subdivision as a string.
@@ -80,6 +83,9 @@ class DataSource(TimeStampedModel):
         related_name="data_sources"
     )
 
+    class Meta:
+        ordering: list[str] = ["name"]
+
     def __str__(self) -> str:
         """
         Returns the name of the data source as a string.

diff --git a/src/signal_documentation/settings.py b/src/signal_documentation/settings.py
@@ -76,7 +76,6 @@
 ]
 
 EXTERNAL_APPS: list[str] = [
-    'bootstrap5',
     'corsheaders',
     'debug_toolbar',
     'django_extensions',

diff --git a/src/signals/filters.py b/src/signals/filters.py
@@ -19,6 +19,7 @@ class Meta:
         fields: list[str] = [
             'search',
             'pathogen',
+            'active',
             'available_geography',
             'signal_type',
             'category',

diff --git a/src/signals/models.py b/src/signals/models.py
@@ -52,6 +52,7 @@ class SignalCategory(TimeStampedModel):
     )
 
     class Meta:
+        ordering: list[str] = ["name"]
         verbose_name_plural: str = "signal categories"
 
     def __str__(self) -> str:

diff --git a/src/signals/tests/test_api.py b/src/signals/tests/test_api.py
diff --git a/src/signals/tests/test_views.py b/src/signals/tests/test_views.py
@@ -14,7 +14,7 @@
 class SignalListViewTest(TestCase):
 
     def setUp(self):
-        for i in range(fake.random_int(min=1, max=100)):
+        for _ in range(fake.random_int(min=1, max=100)):
             SignalFactory()
 
     def test_signal_list_view(self):

diff --git a/src/signals/urls.py b/src/signals/urls.py
@@ -9,9 +9,9 @@
 
 urlpatterns: list[URLPattern] = [
     path('', SignalsListView.as_view(), name='signals'),
+    path('signals/<int:pk>/', SignalsDetailView.as_view(), name='signal'),
     path('signals/<pk>/', SignalsDetailView.as_view(), name='signal'),
 
     # REST API
-    path('api/v1/signals/', SignalsListApiView.as_view(), name='signals_api'),
-
+    path('api/v1/signals/', SignalsListApiView.as_view(), name='signals_api')
 ]
diff --git a/src/templates/400.html b/src/templates/400.html
@@ -1,6 +1,5 @@
 {% extends "error.html" %}
 {% load static %}
-{% load bootstrap5 %}
 {% load i18n %}
 
 {% block content %}

diff --git a/src/templates/403.html b/src/templates/403.html
@@ -1,6 +1,5 @@
 {% extends "error.html" %}
 {% load static %}
-{% load bootstrap5 %}
 {% load i18n %}
 
 {% block content %}

diff --git a/src/templates/404.html b/src/templates/404.html
@@ -1,6 +1,5 @@
 {% extends "error.html" %}
 {% load static %}
-{% load bootstrap5 %}
 {% load i18n %}
 
 {% block content %}

diff --git a/src/templates/500.html b/src/templates/500.html
@@ -1,6 +1,5 @@
 {% extends "error.html" %}
 {% load static %}
-{% load bootstrap5 %}
 {% load i18n %}
 
 {% block content %}

diff --git a/src/templates/error.html b/src/templates/error.html
@@ -16,10 +16,6 @@
   <link href="{% static 'assets/img/favicon.png' %}" rel="icon">
   <link href="{% static 'assets/img/apple-touch-icon.png' %}" rel="apple-touch-icon">
 
-  <!-- Include Bootstrap CSS and JS files -->
-  <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css">
-  <script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/js/bootstrap.bundle.min.js"></script>
-
   <!-- Google Fonts -->
   <link href="{% static 'https://fonts.gstatic.com' %}" rel="preconnect">
   <link href="https://fonts.googleapis.com/css?family=Open+Sans:300,300i,400,400i,600,600i,700,700i|Nunito:300,300i,400,400i,600,600i,700,700i|Poppins:300,300i,400,400i,500,500i,600,600i,700,700i" rel="stylesheet">

diff --git a/src/templates/index.html b/src/templates/index.html
@@ -5,9 +5,6 @@
 
 
 <head>
-  {% load bootstrap5 %}
-  {% bootstrap_css %}
-  {% bootstrap_javascript %}
   <meta charset="utf-8">
   <meta content="width=device-width, initial-scale=1.0" name="viewport">
 
@@ -19,10 +16,6 @@
   <link href="{% static 'assets/img/favicon.png' %}" rel="icon">
   <link href="{% static 'assets/img/apple-touch-icon.png' %}" rel="apple-touch-icon">
 
-  <!-- Include Bootstrap CSS and JS files -->
-  <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css">
-  <script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/js/bootstrap.bundle.min.js"></script>
-
   <!-- Google Fonts -->
   <link href="{% static 'https://fonts.gstatic.com' %}" rel="preconnect">
   <link href="https://fonts.googleapis.com/css?family=Open+Sans:300,300i,400,400i,600,600i,700,700i|Nunito:300,300i,400,400i,600,600i,700,700i|Poppins:300,300i,400,400i,500,500i,600,600i,700,700i" rel="stylesheet">
@@ -48,17 +41,17 @@
   ======================================================== -->
 </head>
 
-<body>
+<body class="toggle-sidebar">
 
   <!-- ======= Header ======= -->
   <header id="header" class="header fixed-top d-flex align-items-center">
 
     <div class="d-flex align-items-center justify-content-between">
+      <i class="bi bi-list toggle-sidebar-btn"></i>
       <a href="{% url 'signals' %}" class="logo d-flex align-items-center">
         <img assets/img/logo.png" alt="">
         <span class="d-none d-lg-block">Signal Documentation</span>
       </a>
-      <i class="bi bi-list toggle-sidebar-btn"></i>
     </div><!-- End Logo -->
 
     <nav class="header-nav ms-auto">

diff --git a/src/templates/signals/signal_detail.html b/src/templates/signals/signal_detail.html
@@ -1,6 +1,5 @@
 {% extends "index.html" %}
 
-{% load bootstrap5 %}
 {% load i18n %}
 {% block content %}
 <main id="main" class="main">