Skip to content

Commit a78053f

Browse files
committed
Introduce jinja templating and nhs_frontend_jinja
1 parent 6821623 commit a78053f

File tree

6 files changed

+43
-3
lines changed

6 files changed

+43
-3
lines changed
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
<h1>hello world</h1>
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
from jinja2 import ChoiceLoader, Environment, PackageLoader
2+
3+
def environment(**options):
4+
5+
env = Environment(**options, extensions=["jinja2.ext.do"])
6+
if env.loader:
7+
env.loader = ChoiceLoader(
8+
[
9+
env.loader,
10+
PackageLoader(
11+
"nhsuk_frontend_jinja",
12+
package_path="templates/components"
13+
),
14+
PackageLoader(
15+
"nhsuk_frontend_jinja",
16+
package_path="templates/macros"
17+
),
18+
PackageLoader("nhsuk_frontend_jinja"),
19+
]
20+
)
21+
22+
return env

lung_cancer_screening/settings.py

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
from os import environ
1414
from pathlib import Path
1515

16+
from jinja2 import ChainableUndefined
1617

1718
def boolean_env(key, default=None):
1819
value = environ.get(key)
@@ -44,6 +45,7 @@ def boolean_env(key, default=None):
4445
'django.contrib.sessions',
4546
'django.contrib.messages',
4647
'django.contrib.staticfiles',
48+
'lung_cancer_screening.core'
4749
]
4850

4951
MIDDLEWARE = [
@@ -59,6 +61,15 @@ def boolean_env(key, default=None):
5961
ROOT_URLCONF = 'lung_cancer_screening.urls'
6062

6163
TEMPLATES = [
64+
{
65+
"BACKEND": "django.template.backends.jinja2.Jinja2",
66+
"DIRS": [BASE_DIR / "jinja2"],
67+
"APP_DIRS": True,
68+
"OPTIONS": {
69+
"environment": "lung_cancer_screening.jinja2_env.environment",
70+
"undefined": ChainableUndefined,
71+
},
72+
},
6273
{
6374
'BACKEND': 'django.template.backends.django.DjangoTemplates',
6475
'DIRS': [],

lung_cancer_screening/views.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
1-
from django.http import HttpResponse
1+
from django.shortcuts import render
22

33
def home(request):
4-
"""Homepage view that displays hello world."""
5-
return HttpResponse("hello world")
4+
return render(
5+
request,
6+
"home/index.jinja"
7+
)

makefiles/dev.mk

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
.PHONY: dev-run dev-up dev-down dev-logs dev-shell dev-migrate dev-makemigrations dev-clean dev-test
22

3+
dev-build:
4+
docker-compose build
5+
36
dev-run:
47
docker-compose up --build
58

requirements.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
django
22
psycopg2-binary
3+
nhsuk-frontend-jinja

0 commit comments

Comments
 (0)