repos/website
1
Fork 0
Code Issues 1 Pull requests 27 Activity

Add djhtml

Browse source
This commit is contained in:
Jake Howard 2022-08-03 20:37:34 +01:00
parent e096dd8cf5
commit 512f9cd3b9
Signed by: jake
GPG key ID: 57AFB45680EDD477
6 changed files with 20 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
.gitlab-ci.yml
View file

@ -108,6 +108,11 @@ curlylint:
script: script:
- curlylint . - curlylint .
djhtml:
<<: *python_test_template
script:
- git ls-files '*.html' | xargs djhtml --check --tabwidth 2
prettier: prettier:
<<: *node_test_template <<: *node_test_template
script: script:

2
justfile
View file

@ -28,6 +28,7 @@ test *ARGS:
format: format:
black . black .
isort . isort .
git ls-files '*.html' | xargs djhtml -i --tabwidth 2
npm run format npm run format
lint: lint_python lint_node lint: lint_python lint_node
@ -38,6 +39,7 @@ lint_python:
flake8 flake8
mypy . --show-error-codes mypy . --show-error-codes
curlylint . curlylint .
git ls-files '*.html' | xargs djhtml --check --tabwidth 2
@lint_node: @lint_node:
npm run lint npm run lint

1
requirements/dev.in
View file

@ -11,3 +11,4 @@ django-debug-toolbar
types-requests types-requests
mypy mypy
curlylint curlylint
djhtml

1
requirements/dev.txt
View file

@ -30,6 +30,7 @@ django-rq==2.5.1 # via -r requirements/base.txt
django-taggit==2.1.0 # via -r requirements/base.txt, wagtail django-taggit==2.1.0 # via -r requirements/base.txt, wagtail
django-treebeard==4.5.1 # via -r requirements/base.txt, wagtail django-treebeard==4.5.1 # via -r requirements/base.txt, wagtail
djangorestframework==3.13.1 # via -r requirements/base.txt, wagtail djangorestframework==3.13.1 # via -r requirements/base.txt, wagtail
djhtml==1.5.1 # via -r requirements/dev.in
draftjs-exporter==2.1.7 # via -r requirements/base.txt, wagtail draftjs-exporter==2.1.7 # via -r requirements/base.txt, wagtail
et-xmlfile==1.1.0 # via -r requirements/base.txt, openpyxl et-xmlfile==1.1.0 # via -r requirements/base.txt, openpyxl
flake8==4.0.1 # via -r requirements/dev.in flake8==4.0.1 # via -r requirements/dev.in

18
templates/500.html
View file

@ -1,12 +1,12 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en-GB"> <html lang="en-GB">
<head> <head>
<meta charset="utf-8" /> <meta charset="utf-8" />
<title>Internal server error</title> <title>Internal server error</title>
<meta name="viewport" content="width=device-width, initial-scale=1" /> <meta name="viewport" content="width=device-width, initial-scale=1" />
</head> </head>
<body> <body>
<h1>Internal server error</h1> <h1>Internal server error</h1>
<h2>Sorry, there seems to be an error. Please try again soon.</h2> <h2>Sorry, there seems to be an error. Please try again soon.</h2>
</body> </body>
</html> </html>

4
templates/base.html
View file

@ -25,7 +25,7 @@
{% wagtailuserbar %} {% wagtailuserbar %}
{% cache 3600 "navbar" %} {% cache 3600 "navbar" %}
{% navbar %} {% navbar %}
{% endcache %} {% endcache %}
{% block main %} {% block main %}
@ -35,7 +35,7 @@
{% endblock %} {% endblock %}
{% cache 3600 "footer" %} {% cache 3600 "footer" %}
{% footer %} {% footer %}
{% endcache %} {% endcache %}
<script async defer type="text/javascript" src="{% static 'js/base.js' %}"></script> <script async defer type="text/javascript" src="{% static 'js/base.js' %}"></script>