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

Install curlylint

Browse source
This commit is contained in:
Jake Howard 2022-08-03 20:22:02 +01:00
parent 668bcc7d5b
commit e096dd8cf5
Signed by: jake
GPG key ID: 57AFB45680EDD477
20 changed files with 193 additions and 171 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
.gitlab-ci.yml
View file

@ -103,6 +103,11 @@ mypy:
script: script:
- mypy . - mypy .
curlylint:
<<: *python_test_template
script:
- curlylint .
prettier: prettier:
<<: *node_test_template <<: *node_test_template
script: script:

1
justfile
View file

@ -37,6 +37,7 @@ lint_python:
isort --check . isort --check .
flake8 flake8
mypy . --show-error-codes mypy . --show-error-codes
curlylint .
@lint_node: @lint_node:
npm run lint npm run lint

15
pyproject.toml Normal file
View file

@ -0,0 +1,15 @@
[tool.curlylint]
include = '/(website|templates)/.*\.html'
exclude = '''
(
navbar\.html
| referrallink_snippet_link\.html
| onlineaccount_snippet_link\.html
| base\.html
| 500\.html
)
'''
[tool.curlylint.rules]
indent = 2
html_has_lang = 'en-GB'

1
requirements/dev.in
View file

@ -10,3 +10,4 @@ django-browser-reload
django-debug-toolbar django-debug-toolbar
types-requests types-requests
mypy mypy
curlylint

8
requirements/dev.txt
View file

@ -7,13 +7,15 @@
anyascii==0.3.1 # via -r requirements/base.txt, wagtail anyascii==0.3.1 # via -r requirements/base.txt, wagtail
asgiref==3.5.2 # via -r requirements/base.txt, django asgiref==3.5.2 # via -r requirements/base.txt, django
async-timeout==4.0.2 # via -r requirements/base.txt, redis async-timeout==4.0.2 # via -r requirements/base.txt, redis
attrs==22.1.0 # via curlylint
beautifulsoup4==4.9.3 # via -r requirements/base.txt, wagtail beautifulsoup4==4.9.3 # via -r requirements/base.txt, wagtail
black==22.6.0 # via -r requirements/dev.in black==22.6.0 # via -r requirements/dev.in
brotli==1.0.9 # via -r requirements/base.txt, whitenoise brotli==1.0.9 # via -r requirements/base.txt, whitenoise
build==0.8.0 # via pip-tools build==0.8.0 # via pip-tools
certifi==2022.6.15 # via -r requirements/base.txt, requests certifi==2022.6.15 # via -r requirements/base.txt, requests
charset-normalizer==2.1.0 # via -r requirements/base.txt, requests charset-normalizer==2.1.0 # via -r requirements/base.txt, requests
click==8.1.3 # via -r requirements/base.txt, black, pip-tools, rq click==8.1.3 # via -r requirements/base.txt, black, curlylint, pip-tools, rq
curlylint==0.13.1 # via -r requirements/dev.in
deprecated==1.2.13 # via -r requirements/base.txt, redis deprecated==1.2.13 # via -r requirements/base.txt, redis
django==4.0.6 # via -r requirements/base.txt, django-browser-reload, django-debug-toolbar, django-filter, django-htmx, django-modelcluster, django-permissionedforms, django-redis, django-rq, django-taggit, django-treebeard, djangorestframework, wagtail django==4.0.6 # via -r requirements/base.txt, django-browser-reload, django-debug-toolbar, django-filter, django-htmx, django-modelcluster, django-permissionedforms, django-redis, django-rq, django-taggit, django-treebeard, djangorestframework, wagtail
django-browser-reload==1.6.0 # via -r requirements/dev.in django-browser-reload==1.6.0 # via -r requirements/dev.in
@ -44,7 +46,8 @@ mypy==0.971 # via -r requirements/dev.in
mypy-extensions==0.4.3 # via black, mypy mypy-extensions==0.4.3 # via black, mypy
openpyxl==3.0.10 # via -r requirements/base.txt, tablib openpyxl==3.0.10 # via -r requirements/base.txt, tablib
packaging==21.3 # via -r requirements/base.txt, build, redis packaging==21.3 # via -r requirements/base.txt, build, redis
pathspec==0.9.0 # via black parsy==1.1.0 # via curlylint
pathspec==0.9.0 # via black, curlylint
pep517==0.12.0 # via build pep517==0.12.0 # via build
pillow==9.2.0 # via -r requirements/base.txt, wagtail pillow==9.2.0 # via -r requirements/base.txt, wagtail
pip-tools==6.8.0 # via -r requirements/dev.in pip-tools==6.8.0 # via -r requirements/dev.in
@ -63,6 +66,7 @@ soupsieve==2.3.2.post1 # via -r requirements/base.txt, beautifulsoup4
sqlparse==0.4.2 # via -r requirements/base.txt, django, django-debug-toolbar sqlparse==0.4.2 # via -r requirements/base.txt, django, django-debug-toolbar
tablib[xls,xlsx]==3.2.1 # via -r requirements/base.txt, wagtail tablib[xls,xlsx]==3.2.1 # via -r requirements/base.txt, wagtail
telepath==0.2 # via -r requirements/base.txt, wagtail telepath==0.2 # via -r requirements/base.txt, wagtail
toml==0.10.2 # via curlylint
tomli==2.0.1 # via black, build, mypy, pep517 tomli==2.0.1 # via black, build, mypy, pep517
types-requests==2.28.5 # via -r requirements/dev.in types-requests==2.28.5 # via -r requirements/dev.in
types-urllib3==1.26.17 # via types-requests types-urllib3==1.26.17 # via types-requests

3
templates/500.html
View file

@ -1,5 +1,5 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en" dir="ltr"> <html lang="en-GB">
<head> <head>
<meta charset="utf-8" /> <meta charset="utf-8" />
<title>Internal server error</title> <title>Internal server error</title>
@ -7,7 +7,6 @@
</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>

3
templates/base.html
View file

@ -1,7 +1,7 @@
{% load static wagtailcore_tags wagtailuserbar navbar_tags footer_tags cache %} {% load static wagtailcore_tags wagtailuserbar navbar_tags footer_tags cache %}
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en"> <html lang="en-GB">
<head> <head>
<meta charset="utf-8" /> <meta charset="utf-8" />
<title> <title>
@ -38,7 +38,6 @@
{% 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>
<script async defer type="text/javascript" src="{% static 'contrib/htmx/htmx.min.js' %}"></script> <script async defer type="text/javascript" src="{% static 'contrib/htmx/htmx.min.js' %}"></script>

1
website/common/templates/common/navbar.html
View file

@ -35,5 +35,4 @@
</a> </a>
</div> </div>
</div> </div>
</div>
</nav> </nav>

1
website/contact/templates/contact/contact_page.html
View file

@ -22,5 +22,4 @@
</div> </div>
{% endfor %} {% endfor %}
</section> </section>
{% endblock %} {% endblock %}