From 044a7f1c0624e3d1ca42f4f57f8600dd727f7076 Mon Sep 17 00:00:00 2001 From: "Edgar P. Burkhart" Date: Tue, 18 Apr 2023 19:01:41 +0200 Subject: [PATCH] Add djlint pre-commit hook --- .pre-commit-config.yaml | 5 ++++ nummi/main/templates/main/base.html | 30 ++++++------------- nummi/main/templates/main/confirm_delete.html | 4 +-- nummi/main/templates/main/form/account.html | 6 ++-- nummi/main/templates/main/form/category.html | 6 ++-- nummi/main/templates/main/form/invoice.html | 4 +-- nummi/main/templates/main/form/snapshot.html | 6 ++-- .../main/templates/main/form/transaction.html | 4 +-- nummi/main/templates/main/index.html | 6 ++-- nummi/main/templates/main/list/snapshot.html | 4 +-- .../main/templates/main/list/transaction.html | 4 +-- nummi/main/templates/main/login.html | 4 +-- nummi/main/templates/main/search.html | 4 +-- 13 files changed, 40 insertions(+), 47 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 34ecda0..e97183d 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -8,3 +8,8 @@ repos: rev: 23.3.0 hooks: - id: black + - repo: https://github.com/Riverside-Healthcare/djLint + rev: v1.23.1 + hooks: + - id: djlint-django + args: ["--reformat"] diff --git a/nummi/main/templates/main/base.html b/nummi/main/templates/main/base.html index b5eee2b..befb11f 100644 --- a/nummi/main/templates/main/base.html +++ b/nummi/main/templates/main/base.html @@ -11,13 +11,13 @@ {% block link %} + type="image/svg+xml" /> + type="text/css" /> + type="text/css" /> {% endblock %} @@ -36,9 +36,7 @@
  • - {% translate "Home" %} - + accesskey="h">{% translate "Home" %}
  • - {% translate "New account" %} - + accesskey="a">{% translate "New account" %}
  • - {% translate "New snapshot" %} - + accesskey="s">{% translate "New snapshot" %}
  • - {% translate "New category" %} - + accesskey="c">{% translate "New category" %}
  • - {% translate "New transaction" %} - + accesskey="t">{% translate "New transaction" %}
  • - {% translate "Search" %} - + accesskey="r">{% translate "Search" %}
  • {% translate "Log out" %} diff --git a/nummi/main/templates/main/confirm_delete.html b/nummi/main/templates/main/confirm_delete.html index da28ece..7ad791e 100644 --- a/nummi/main/templates/main/confirm_delete.html +++ b/nummi/main/templates/main/confirm_delete.html @@ -6,10 +6,10 @@ {{ block.super }} + type="text/css" /> + type="text/css" /> {% endblock %} {% block body %} {% spaceless %} diff --git a/nummi/main/templates/main/form/account.html b/nummi/main/templates/main/form/account.html index 7967eb0..0b3bcdc 100644 --- a/nummi/main/templates/main/form/account.html +++ b/nummi/main/templates/main/form/account.html @@ -7,13 +7,13 @@ {{ block.super }} + type="text/css" /> + type="text/css" /> + type="text/css" /> {% endblock %} {% block body %}

    diff --git a/nummi/main/templates/main/form/category.html b/nummi/main/templates/main/form/category.html index c2c1782..b6f8052 100644 --- a/nummi/main/templates/main/form/category.html +++ b/nummi/main/templates/main/form/category.html @@ -7,13 +7,13 @@ {{ block.super }} + type="text/css" /> + type="text/css" /> + type="text/css" /> {% endblock %} {% block body %}

    diff --git a/nummi/main/templates/main/form/invoice.html b/nummi/main/templates/main/form/invoice.html index 34f925c..a0fb629 100644 --- a/nummi/main/templates/main/form/invoice.html +++ b/nummi/main/templates/main/form/invoice.html @@ -7,10 +7,10 @@ {{ block.super }} + type="text/css" /> + type="text/css" /> {% endblock %} {% block body %}

    {{ form.instance }}

    diff --git a/nummi/main/templates/main/form/snapshot.html b/nummi/main/templates/main/form/snapshot.html index 3ecfb5b..f303fd5 100644 --- a/nummi/main/templates/main/form/snapshot.html +++ b/nummi/main/templates/main/form/snapshot.html @@ -7,13 +7,13 @@ {{ block.super }} + type="text/css" /> + type="text/css" /> + type="text/css" /> {% endblock %} {% block body %} {% with snapshot=form.instance %} diff --git a/nummi/main/templates/main/form/transaction.html b/nummi/main/templates/main/form/transaction.html index 9fa3cb6..9813d40 100644 --- a/nummi/main/templates/main/form/transaction.html +++ b/nummi/main/templates/main/form/transaction.html @@ -7,10 +7,10 @@ {{ block.super }} + type="text/css" /> + type="text/css" /> {% endblock %} {% block body %}

    {{ form.instance }}

    diff --git a/nummi/main/templates/main/index.html b/nummi/main/templates/main/index.html index 18495c5..5a108c5 100644 --- a/nummi/main/templates/main/index.html +++ b/nummi/main/templates/main/index.html @@ -6,13 +6,13 @@ {{ block.super }} + type="text/css" /> + type="text/css" /> + type="text/css" /> {% endblock %} {% block body %} {% if accounts %} diff --git a/nummi/main/templates/main/list/snapshot.html b/nummi/main/templates/main/list/snapshot.html index 28c385a..f73ca0b 100644 --- a/nummi/main/templates/main/list/snapshot.html +++ b/nummi/main/templates/main/list/snapshot.html @@ -11,10 +11,10 @@ {{ block.super }} + type="text/css" /> + type="text/css" /> {% endblock %} {% block body %}

    {% translate "Statements" %}

    diff --git a/nummi/main/templates/main/list/transaction.html b/nummi/main/templates/main/list/transaction.html index d2c6672..912e45b 100644 --- a/nummi/main/templates/main/list/transaction.html +++ b/nummi/main/templates/main/list/transaction.html @@ -14,10 +14,10 @@ {{ block.super }} + type="text/css" /> + type="text/css" /> {% endblock %} {% block body %}

    {% translate "Transactions" %}

    diff --git a/nummi/main/templates/main/login.html b/nummi/main/templates/main/login.html index 32149b6..4ed17e4 100644 --- a/nummi/main/templates/main/login.html +++ b/nummi/main/templates/main/login.html @@ -5,10 +5,10 @@ {{ block.super }} + type="text/css" /> + type="text/css" /> {% endblock %} {% block body %}

    {% translate "Log In" %}

    diff --git a/nummi/main/templates/main/search.html b/nummi/main/templates/main/search.html index 2baf470..0361299 100644 --- a/nummi/main/templates/main/search.html +++ b/nummi/main/templates/main/search.html @@ -9,10 +9,10 @@ {{ block.super }} + type="text/css" /> + type="text/css" /> {% endblock %} {% block body %}

    {% translate "Search" %}