diff --git a/.flake8 b/.flake8
index 9027e02..cd601f2 100644
--- a/.flake8
+++ b/.flake8
@@ -6,4 +6,5 @@ exclude =
old,
build,
dist
+ venv
max-line-length = 200
\ No newline at end of file
diff --git a/.prettierignore b/.prettierignore
index b03e4e1..af9bbc5 100644
--- a/.prettierignore
+++ b/.prettierignore
@@ -13,4 +13,7 @@ src/resources
venv
node_modules
translations/static
-package-lock.json
\ No newline at end of file
+package-lock.json
+.pytest_cache
+.vscode
+commaLinkList.html
\ No newline at end of file
diff --git a/.prettierrc b/.prettierrc
index 4d96f64..0613395 100644
--- a/.prettierrc
+++ b/.prettierrc
@@ -4,7 +4,7 @@
"tabWidth": 4,
"overrides": [
{
- "files": "**/*.html",
+ "files": "src/**/*.html",
"options": { "parser": "lwc" }
}
]
diff --git a/biblia/asgi.py b/biblia/asgi.py
index d383201..59bc5ab 100644
--- a/biblia/asgi.py
+++ b/biblia/asgi.py
@@ -11,6 +11,6 @@
from django.core.asgi import get_asgi_application
-os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'biblia.settings')
+os.environ.setdefault("DJANGO_SETTINGS_MODULE", "biblia.settings")
application = get_asgi_application()
diff --git a/biblia/settings.py b/biblia/settings.py
index ab086bd..87403c6 100644
--- a/biblia/settings.py
+++ b/biblia/settings.py
@@ -11,6 +11,7 @@
"""
import os
+
import dj_database_url
import dotenv
diff --git a/biblia/urls.py b/biblia/urls.py
index 97958c0..4734e04 100644
--- a/biblia/urls.py
+++ b/biblia/urls.py
@@ -13,10 +13,10 @@
1. Import the include() function: from django.urls import include, path
2. Add a URL to urlpatterns: path('blog/', include('blog.urls'))
"""
-from django.contrib import admin
-from django.urls import path, include
from django.conf import settings
from django.conf.urls.static import static
+from django.contrib import admin
+from django.urls import include, path
urlpatterns = [
path("", include("translations.urls")),
diff --git a/biblia/wsgi.py b/biblia/wsgi.py
index 911f691..90f9e73 100644
--- a/biblia/wsgi.py
+++ b/biblia/wsgi.py
@@ -11,6 +11,6 @@
from django.core.wsgi import get_wsgi_application
-os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'biblia.settings')
+os.environ.setdefault("DJANGO_SETTINGS_MODULE", "biblia.settings")
application = get_wsgi_application()
diff --git a/manage.py b/manage.py
index 38b9183..91470df 100755
--- a/manage.py
+++ b/manage.py
@@ -5,7 +5,7 @@
def main():
- os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'biblia.settings')
+ os.environ.setdefault("DJANGO_SETTINGS_MODULE", "biblia.settings")
try:
from django.core.management import execute_from_command_line
except ImportError as exc:
@@ -17,5 +17,5 @@ def main():
execute_from_command_line(sys.argv)
-if __name__ == '__main__':
+if __name__ == "__main__":
main()
diff --git a/package.json b/package.json
index 276ce1f..5ce1afc 100644
--- a/package.json
+++ b/package.json
@@ -31,13 +31,17 @@
],
"license": "MIT",
"lint-staged": {
- "**/*.{css,html,js,json,md,ts,yaml,yml}": [
+ "**/*.{css,js,json,md,ts,yaml,yml}": [
+ "prettier --write"
+ ],
+ "src/**/*.html": [
"prettier --write"
],
"./src/**/*.js": [
"eslint"
],
"**/*.py": [
+ "isort",
"black",
"flake8"
]
@@ -47,8 +51,8 @@
"build": "lwc-services build -m production -w webpack.config.js",
"build:development": "lwc-services build -w webpack.config.js",
"lint": "eslint ./src/**/*.js",
- "prettier": "prettier --write \"**/*.{css,html,js,json,md,ts,yaml,yml}\"",
- "prettier:verify": "prettier --list-different \"**/*.{css,html,js,json,md,ts,yaml,yml}\"",
+ "prettier": "prettier --write \"**/*.{css,js,json,md,ts,yaml,yml}\" \"src/**/*.html\"",
+ "prettier:verify": "prettier --list-different \"**/*.{css,js,json,md,ts,yaml,yml}\" \"src/**/*.html\"",
"test:unit": "lwc-services test:unit",
"test:unit:coverage": "lwc-services test:unit --coverage",
"test:unit:debug": "lwc-services test:unit --debug",
diff --git a/pyproject.toml b/pyproject.toml
new file mode 100644
index 0000000..929503c
--- /dev/null
+++ b/pyproject.toml
@@ -0,0 +1,7 @@
+[tool.isort]
+profile = "black"
+multi_line_output = 3
+
+[tool.black]
+line-length = 88
+target-version = ['py38']
diff --git a/requirements_dev.txt b/requirements_dev.txt
index c07af36..5e5647a 100644
--- a/requirements_dev.txt
+++ b/requirements_dev.txt
@@ -1,3 +1,3 @@
black
flake8
-isort
\ No newline at end of file
+isort
diff --git a/src/modules/bib/addVolume/addVolume.js b/src/modules/bib/addVolume/addVolume.js
index 573b396..767dda3 100644
--- a/src/modules/bib/addVolume/addVolume.js
+++ b/src/modules/bib/addVolume/addVolume.js
@@ -1,5 +1,10 @@
import { LightningElement, track } from 'lwc';
-import { createRecord, getRecordUiUrl, getRecordApiUrl, getRecordsFromApi } from 'bib/drf';
+import {
+ createRecord,
+ getRecordUiUrl,
+ getRecordApiUrl,
+ getRecordsFromApi
+} from 'bib/drf';
import { Feature } from 'bib/feature';
export default class AddVolume extends LightningElement {
@@ -44,8 +49,8 @@ export default class AddVolume extends LightningElement {
async connectedCallback() {
// Start async loads of data from DRF to improve responsiveness.
- await getRecordsFromApi("persons");
- await getRecordsFromApi("texts");
+ await getRecordsFromApi('persons');
+ await getRecordsFromApi('texts');
}
// Change Handlers
diff --git a/src/modules/bib/dataTable/dataTable.html b/src/modules/bib/dataTable/dataTable.html
index 99c051f..bf6dbca 100644
--- a/src/modules/bib/dataTable/dataTable.html
+++ b/src/modules/bib/dataTable/dataTable.html
@@ -6,9 +6,16 @@
|
-
+ |
{col.name}
- ▲
+
+ ▲
+
▼
@@ -21,8 +28,12 @@
|
-
+
|
@@ -41,8 +52,13 @@
{entry.value}
-
- {pill.value}
+
+ {pill.value}
@@ -51,6 +67,6 @@
-
+
Showing {recordsShown} of {recordCount}.
-
\ No newline at end of file
+
diff --git a/src/modules/bib/translationView/translationView.html b/src/modules/bib/translationView/translationView.html
index 3f9171b..64e1481 100644
--- a/src/modules/bib/translationView/translationView.html
+++ b/src/modules/bib/translationView/translationView.html
@@ -1,11 +1,20 @@
Translations
-
-