From bb05703f2bd3447c005512773e3700b23ea06c6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?dni=20=E2=9A=A1?= Date: Mon, 20 Feb 2023 11:40:10 +0100 Subject: [PATCH] change prettier and reformat stuff --- .github/workflows/formatting.yml | 5 +- .prettierignore | 8 ++ Makefile | 8 +- lnbits/core/templates/admin/_tab_funding.html | 2 +- lnbits/core/templates/admin/_tab_users.html | 1 - lnbits/core/templates/admin/index.html | 15 +++- lnbits/extensions/invoices/README.md | 2 +- lnbits/extensions/invoices/config.json | 2 +- lnbits/extensions/invoices/static/css/pay.css | 86 ++++++++++--------- 9 files changed, 73 insertions(+), 56 deletions(-) create mode 100644 .prettierignore diff --git a/.github/workflows/formatting.yml b/.github/workflows/formatting.yml index 709ebcb3..f3dca3ad 100644 --- a/.github/workflows/formatting.yml +++ b/.github/workflows/formatting.yml @@ -27,12 +27,11 @@ jobs: - name: Install packages run: | poetry install + npm install prettier - name: Check black run: make checkblack - name: Check isort run: make checkisort - uses: actions/setup-node@v3 - name: Check prettier - run: | - npm install prettier - make checkprettier + run: make checkprettier diff --git a/.prettierignore b/.prettierignore new file mode 100644 index 00000000..776b0b09 --- /dev/null +++ b/.prettierignore @@ -0,0 +1,8 @@ +**/.git +**/.svn +**/.hg +**/node_modules + +*.yml + +**/lnbits/static diff --git a/Makefile b/Makefile index 636f8c33..a38ad8f9 100644 --- a/Makefile +++ b/Makefile @@ -6,8 +6,8 @@ format: prettier isort black check: mypy pyright pylint flake8 checkisort checkblack checkprettier -prettier: $(shell find lnbits -name "*.js" -o -name ".html") - ./node_modules/.bin/prettier --write lnbits/static/js/*.js lnbits/core/static/js/*.js lnbits/extensions/*/templates/*/*.html ./lnbits/core/templates/core/*.html lnbits/templates/*.html lnbits/extensions/*/static/js/*.js lnbits/extensions/*/static/components/*/*.js lnbits/extensions/*/static/components/*/*.html +prettier: + poetry run ./node_modules/.bin/prettier --write lnbits pyright: poetry run ./node_modules/.bin/pyright @@ -27,8 +27,8 @@ isort: pylint: poetry run pylint *.py lnbits/ tools/ tests/ -checkprettier: $(shell find lnbits -name "*.js" -o -name ".html") - ./node_modules/.bin/prettier --check lnbits/static/js/*.js lnbits/core/static/js/*.js lnbits/extensions/*/templates/*/*.html ./lnbits/core/templates/core/*.html lnbits/templates/*.html lnbits/extensions/*/static/js/*.js lnbits/extensions/*/static/components/*/*.js lnbits/extensions/*/static/components/*/*.html +checkprettier: + poetry run ./node_modules/.bin/prettier --check lnbits checkblack: poetry run black --check . diff --git a/lnbits/core/templates/admin/_tab_funding.html b/lnbits/core/templates/admin/_tab_funding.html index 35349e38..9fe3e831 100644 --- a/lnbits/core/templates/admin/_tab_funding.html +++ b/lnbits/core/templates/admin/_tab_funding.html @@ -38,7 +38,7 @@ filled v-model="formData.lightning_invoice_expiry" label="Invoice expiry (seconds)" - mask="#######" + mask="#######" > diff --git a/lnbits/core/templates/admin/_tab_users.html b/lnbits/core/templates/admin/_tab_users.html index 46483c18..3fbc5381 100644 --- a/lnbits/core/templates/admin/_tab_users.html +++ b/lnbits/core/templates/admin/_tab_users.html @@ -58,6 +58,5 @@
- diff --git a/lnbits/core/templates/admin/index.html b/lnbits/core/templates/admin/index.html index 239830e3..4f1bea04 100644 --- a/lnbits/core/templates/admin/index.html +++ b/lnbits/core/templates/admin/index.html @@ -395,14 +395,23 @@ addExtensionsManifest() { const addManifest = this.formAddExtensionsManifest.trim() const manifests = this.formData.lnbits_extensions_manifests - if (addManifest && addManifest.length && !manifests.includes(addManifest)) { - this.formData.lnbits_extensions_manifests = [...manifests, addManifest] + if ( + addManifest && + addManifest.length && + !manifests.includes(addManifest) + ) { + this.formData.lnbits_extensions_manifests = [ + ...manifests, + addManifest + ] this.formAddExtensionsManifest = '' } }, removeExtensionsManifest(manifest) { const manifests = this.formData.lnbits_extensions_manifests - this.formData.lnbits_extensions_manifests = manifests.filter(m => m !== manifest) + this.formData.lnbits_extensions_manifests = manifests.filter( + m => m !== manifest + ) }, restartServer() { LNbits.api diff --git a/lnbits/extensions/invoices/README.md b/lnbits/extensions/invoices/README.md index 2b5bd538..cf3e8be0 100644 --- a/lnbits/extensions/invoices/README.md +++ b/lnbits/extensions/invoices/README.md @@ -16,4 +16,4 @@ This extension allows users to create "traditional" invoices (not in the lightni - add one or more line items - enter a name & price for each line item 3. You can then use share your invoice link with your customer to receive payment\ - ![invoice link](https://imgur.com/a/L0JOj4T.png) \ No newline at end of file + ![invoice link](https://imgur.com/a/L0JOj4T.png) diff --git a/lnbits/extensions/invoices/config.json b/lnbits/extensions/invoices/config.json index a604fec5..1f0e4cde 100644 --- a/lnbits/extensions/invoices/config.json +++ b/lnbits/extensions/invoices/config.json @@ -1,6 +1,6 @@ { "name": "Invoices", "short_description": "Create invoices for your clients.", - "tile": "/invoices/static/image/invoices.png", + "tile": "/invoices/static/image/invoices.png", "contributors": ["leesalminen"] } diff --git a/lnbits/extensions/invoices/static/css/pay.css b/lnbits/extensions/invoices/static/css/pay.css index ad7ce914..75ccd112 100644 --- a/lnbits/extensions/invoices/static/css/pay.css +++ b/lnbits/extensions/invoices/static/css/pay.css @@ -1,65 +1,67 @@ -#invoicePage>.row:first-child>.col-md-6 { - display: flex; +#invoicePage > .row:first-child > .col-md-6 { + display: flex; } -#invoicePage>.row:first-child>.col-md-6>.q-card { - flex: 1; +#invoicePage > .row:first-child > .col-md-6 > .q-card { + flex: 1; } #invoicePage .clear { - margin-bottom: 25px; + margin-bottom: 25px; } #printQrCode { - display: none; + display: none; } @media (min-width: 1024px) { - #invoicePage>.row:first-child>.col-md-6:first-child>div { - margin-right: 5px; - } + #invoicePage > .row:first-child > .col-md-6:first-child > div { + margin-right: 5px; + } - #invoicePage>.row:first-child>.col-md-6:nth-child(2)>div { - margin-left: 5px; - } + #invoicePage > .row:first-child > .col-md-6:nth-child(2) > div { + margin-left: 5px; + } } - @media print { - * { - color: black !important; - } + * { + color: black !important; + } - header, button, #payButtonContainer { - display: none !important; - } + header, + button, + #payButtonContainer { + display: none !important; + } - main, .q-page-container { - padding-top: 0px !important; - } + main, + .q-page-container { + padding-top: 0px !important; + } - .q-card { - box-shadow: none !important; - border: 1px solid black; - } + .q-card { + box-shadow: none !important; + border: 1px solid black; + } - .q-item { - padding: 5px; - } + .q-item { + padding: 5px; + } - .q-card__section { - padding: 5px; - } + .q-card__section { + padding: 5px; + } - #printQrCode { - display: block; - } + #printQrCode { + display: block; + } - p { - margin-bottom: 0px !important; - } + p { + margin-bottom: 0px !important; + } - #invoicePage .clear { - margin-bottom: 10px !important; - } -} \ No newline at end of file + #invoicePage .clear { + margin-bottom: 10px !important; + } +}