Move catalogue into search

nationalarchives · Aug 27, 2024 · 4d73fbe · 4d73fbe
1 parent d9020a9
commit 4d73fbe
Show file tree

Hide file tree

Showing 13 changed files with 8 additions and 36 deletions.
diff --git a/app/catalogue/__init__.py b/app/catalogue/__init__.py
diff --git a/app/catalogue/admin.py b/app/catalogue/admin.py
diff --git a/app/catalogue/apps.py b/app/catalogue/apps.py
diff --git a/app/catalogue/migrations/__init__.py b/app/catalogue/migrations/__init__.py
diff --git a/app/catalogue/models.py b/app/catalogue/models.py
diff --git a/app/catalogue/tests.py b/app/catalogue/tests.py
diff --git a/app/catalogue/urls.py b/app/catalogue/urls.py
diff --git a/app/catalogue/views.py b/app/catalogue/views.py
diff --git a/app/search/urls.py b/app/search/urls.py
@@ -4,4 +4,5 @@
 
 urlpatterns = [
     path("", views.index, name="index"),
+    path("catalogue/", views.catalogue_index, name="catalogue"),
 ]
diff --git a/app/search/views.py b/app/search/views.py
@@ -6,3 +6,9 @@ def index(request):
     template = loader.get_template("search/index.html")
     context = {"foo": "bar"}
     return HttpResponse(template.render(context, request))
+
+
+def catalogue_index(request):
+    template = loader.get_template("search/catalogue/index.html")
+    context = {"foo": "bar"}
+    return HttpResponse(template.render(context, request))
diff --git a/app/templates/catalogue/index.html → app/templates/search/catalogue/index.html b/app/templates/catalogue/index.html → app/templates/search/catalogue/index.html
diff --git a/config/settings/base.py b/config/settings/base.py
@@ -111,7 +111,7 @@
 # Static files (CSS, JavaScript, Images)
 # https://docs.djangoproject.com/en/5.0/howto/static-files/
 
-STATIC_URL = "static/"
+STATIC_URL = "search/static/"
 STATIC_ROOT = os.path.join(BASE_DIR, "static")
 STATICFILES_DIRS = [os.path.join(BASE_DIR, "app/static")]
 STATICFILES_STORAGE = "whitenoise.storage.CompressedManifestStaticFilesStorage"

diff --git a/config/urls.py b/config/urls.py
@@ -24,9 +24,5 @@
     path("", include(("app.main.urls", "main"), namespace="main")),
     path("healthcheck/", include("app.healthcheck.urls")),
     path("search/", include(("app.search.urls", "search"), namespace="search")),
-    path(
-        "catalogue/",
-        include(("app.catalogue.urls", "catalogue"), namespace="catalogue"),
-    ),
     path("admin/", admin.site.urls),
 ] + static(settings.STATIC_URL, document_root=settings.STATIC_ROOT)