- preparing for pre-commit hooks and djlint reformatting

Author: rptmat57

.pre-commit-config.yaml

@@ -0,0 +1,12 @@
+repos:
+  - repo: https://github.com/psf/black-pre-commit-mirror
+    rev: 24.3.0
+    hooks:
+      - id: black
+        language_version: python3.11
+
+  - repo: https://github.com/djlint/djLint
+    rev: v1.34.1
+    hooks:
+      - id: djlint-reformat-django
+#      - id: djlint-django

NEMO/static/nemo.js

@@ -771,7 +771,7 @@ function set_start_end_datetime_pickers(start_jq, end_jq, properties, set_end_da
 
 function sort_compare(element)
 {
-	return element.innerText.toLowerCase();
+	return element.innerText.toLowerCase().trim();
 }
 
 function sort_elements(list_element, selector, sort_function)

NEMO/templates/base.html

@@ -83,7 +83,7 @@
 			{% endif %}
             {# Content goes here #}
             {% block content %}{% endblock %}
-            <div class="modal-footer">{% block footer %}{% endblock %}</div>
+            {% spaceless %}<div class="modal-footer">{% block footer %}{% endblock %}</div>{% endspaceless %}
         </div>
         {% block extra_whitespace %}
             <div style="height: 200px"></div>

NEMO/templates/base/popup.html

@@ -5,4 +5,4 @@ <h4 id="modal-description-label" class="modal-title">{% block title %}{% endbloc
 <div class="modal-body">
     {% block content %}{% endblock %}
 </div>
-<div class="modal-footer">{% block footer %}{% endblock %}</div>
+{% spaceless %}<div class="modal-footer">{% block footer %}{% endblock %}</div>{% endspaceless %}

NEMO/templates/calendar/configuration_event_feed.html

@@ -1,3 +1,4 @@
+{# djlint:off #}
 [
 {% for x in events %}
     {

NEMO/templates/calendar/reservation_event_feed.html

@@ -1,3 +1,4 @@
+{# djlint:off #}
 [
 	{% for x in events %}
 	{

NEMO/templates/calendar/specific_user_feed.html

@@ -1,3 +1,4 @@
+{# djlint:off #}
 [
 	{% for x in usage_events %}
 	{

NEMO/templates/calendar/usage_event_feed.html

@@ -1,3 +1,4 @@
+{# djlint:off #}
 [
 	{% for x in usage_events %}
 	{

NEMO/templates/customizations/customizations_templates.html

@@ -428,7 +428,7 @@ <h3 class="customization-section-title" id="weekend_access_email_id">Weekend acc
 <script>
     function sort_comp(element)
     {
-        return element.getElementsByTagName("h3")[0].innerText.toLowerCase();
+        return element.getElementsByTagName("h3")[0].innerText.toLowerCase().trim();
     }
 
     window.addEventListener("load", function ()

README.md

@@ -1,4 +1,5 @@
-[![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black)
+[![Code style: black](https://img.shields.io/badge/python%20style-black-000000.svg)](https://github.com/psf/black)
+[![Code style: djlint](https://img.shields.io/badge/html%20style-djlint-black.svg)](https://www.djlint.com)
 [![PyPI - Python Version](https://img.shields.io/pypi/pyversions/NEMO?label=python)](https://www.python.org/downloads/release/python-380/)
 [![Docker Image Version (latest semver)](https://img.shields.io/docker/v/nanofab/nemo?label=NEMO%20docker%20version)](https://hub.docker.com/r/nanofab/nemo)
 [![GitHub release (latest by date)](https://img.shields.io/github/v/release/usnistgov/nemo?label=NEMO%20github%20version)](https://github.com/usnistgov/NEMO/releases)

pyproject.toml

@@ -0,0 +1,9 @@
+[tool.black]
+line-length = 120
+target-version = ['py311']
+
+[tool.djlint]
+profile = "django"
+max_attribute_length=100
+max_line_length=120
+ignore = "H031"

setup.py

@@ -2,7 +2,7 @@
 
 setup(
     name="NEMO",
-    version="5.3.1",
+    version="5.4.0",
     python_requires=">=3.8, <4",
     packages=find_namespace_packages(exclude=["resources", "resources.*", "build", "build.*"]),
     include_package_data=True,
@@ -43,6 +43,7 @@
         "pytz==2024.1",
         "requests==2.31.0",
     ],
+    extras_require={"dev-tools": ["pre-commit", "djlint", "black"]},
     entry_points={
         "console_scripts": ["nemo=NEMO.provisioning:entry_point"],
     },