diff --git a/app/catalogue/__init__.py b/app/catalogue/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/app/catalogue/admin.py b/app/catalogue/admin.py deleted file mode 100644 index 8c38f3f..0000000 --- a/app/catalogue/admin.py +++ /dev/null @@ -1,3 +0,0 @@ -from django.contrib import admin - -# Register your models here. diff --git a/app/catalogue/apps.py b/app/catalogue/apps.py deleted file mode 100644 index ecd2a99..0000000 --- a/app/catalogue/apps.py +++ /dev/null @@ -1,7 +0,0 @@ -from django.apps import AppConfig - - -class CatalogueConfig(AppConfig): - default_auto_field = "django.db.models.BigAutoField" - name = "app.catalogue" - verbose_name = "Catalogue" diff --git a/app/catalogue/migrations/__init__.py b/app/catalogue/migrations/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/app/catalogue/models.py b/app/catalogue/models.py deleted file mode 100644 index 71a8362..0000000 --- a/app/catalogue/models.py +++ /dev/null @@ -1,3 +0,0 @@ -from django.db import models - -# Create your models here. diff --git a/app/catalogue/tests.py b/app/catalogue/tests.py deleted file mode 100644 index 7ce503c..0000000 --- a/app/catalogue/tests.py +++ /dev/null @@ -1,3 +0,0 @@ -from django.test import TestCase - -# Create your tests here. diff --git a/app/catalogue/urls.py b/app/catalogue/urls.py deleted file mode 100644 index 5119061..0000000 --- a/app/catalogue/urls.py +++ /dev/null @@ -1,7 +0,0 @@ -from django.urls import path - -from . import views - -urlpatterns = [ - path("", views.index, name="index"), -] diff --git a/app/catalogue/views.py b/app/catalogue/views.py deleted file mode 100644 index 516bb89..0000000 --- a/app/catalogue/views.py +++ /dev/null @@ -1,8 +0,0 @@ -from django.http import HttpResponse -from django.template import loader - - -def index(request): - template = loader.get_template("catalogue/index.html") - context = {"foo": "bar"} - return HttpResponse(template.render(context, request)) diff --git a/app/search/urls.py b/app/search/urls.py index 5119061..e0a7757 100644 --- 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 index 302dddc..521f5d7 100644 --- 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 b/app/templates/search/catalogue/index.html similarity index 100% rename from app/templates/catalogue/index.html rename to app/templates/search/catalogue/index.html diff --git a/config/settings/base.py b/config/settings/base.py index 8a61890..206c6a9 100644 --- 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 index 40eed37..40251cb 100644 --- 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)