From a0e88f0f78b9d67d363ef6e53c243d7d91d199e1 Mon Sep 17 00:00:00 2001 From: Jake Howard Date: Fri, 5 Aug 2022 08:58:21 +0100 Subject: [PATCH] Remove root template dir --- Dockerfile | 1 - pyproject.toml | 2 +- {templates => website/common/templates}/404.html | 0 {templates => website/common/templates}/500.html | 0 {templates => website/common/templates}/base.html | 0 {templates => website/common/templates}/wagtail_base.html | 0 website/settings.py | 3 --- 7 files changed, 1 insertion(+), 5 deletions(-) rename {templates => website/common/templates}/404.html (100%) rename {templates => website/common/templates}/500.html (100%) rename {templates => website/common/templates}/base.html (100%) rename {templates => website/common/templates}/wagtail_base.html (100%) diff --git a/Dockerfile b/Dockerfile index 9ab9beb..b229e7d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -32,7 +32,6 @@ COPY --chown=website --from=frontend ./static/build ./static/build COPY --chown=website ./etc ./etc COPY --chown=website ./manage.py ./manage.py -COPY --chown=website ./templates ./templates COPY --chown=website ./website ./website RUN SECRET_KEY=none python manage.py collectstatic --noinput --clear -v3 diff --git a/pyproject.toml b/pyproject.toml index 184721f..6ccfe14 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,5 +1,5 @@ [tool.curlylint] -include = '/(website|templates)/.*\.html' +include = '/website/.*\.html' exclude = ''' ( navbar\.html diff --git a/templates/404.html b/website/common/templates/404.html similarity index 100% rename from templates/404.html rename to website/common/templates/404.html diff --git a/templates/500.html b/website/common/templates/500.html similarity index 100% rename from templates/500.html rename to website/common/templates/500.html diff --git a/templates/base.html b/website/common/templates/base.html similarity index 100% rename from templates/base.html rename to website/common/templates/base.html diff --git a/templates/wagtail_base.html b/website/common/templates/wagtail_base.html similarity index 100% rename from templates/wagtail_base.html rename to website/common/templates/wagtail_base.html diff --git a/website/settings.py b/website/settings.py index fd0d9ec..916899f 100644 --- a/website/settings.py +++ b/website/settings.py @@ -79,9 +79,6 @@ ROOT_URLCONF = "website.urls" TEMPLATES = [ { "BACKEND": "django.template.backends.django.DjangoTemplates", - "DIRS": [ - BASE_DIR / "templates", - ], "APP_DIRS": True, "OPTIONS": { "context_processors": [