change prettier and reformat stuff

.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: |
+        run: make checkprettier
-          npm install prettier
-          make checkprettier

.prettierignore

@@ -0,0 +1,8 @@
+**/.git
+**/.svn
+**/.hg
+**/node_modules
+
+*.yml
+
+**/lnbits/static

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")
+prettier:
-	./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
+	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")
+checkprettier:
-	./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
+	poetry run ./node_modules/.bin/prettier --check lnbits
 
 checkblack:
 	poetry run black --check .

lnbits/core/templates/admin/_tab_funding.html

@@ -38,7 +38,7 @@
                 filled
                 v-model="formData.lightning_invoice_expiry"
                 label="Invoice expiry (seconds)"
-                mask="#######"            
+                mask="#######"
               >
               </q-input>
             </div>

lnbits/core/templates/admin/_tab_users.html

@@ -58,6 +58,5 @@
       </div>
       <br />
     </div>
-
   </q-card-section>
 </q-tab-panel>

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)) {
+        if (
-          this.formData.lnbits_extensions_manifests = [...manifests, addManifest]
+          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

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)
+   ![invoice link](https://imgur.com/a/L0JOj4T.png)

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"]
 }

lnbits/extensions/invoices/static/css/pay.css

@@ -1,65 +1,67 @@
-#invoicePage>.row:first-child>.col-md-6 {
+#invoicePage > .row:first-child > .col-md-6 {
-	display:  flex;
+  display: flex;
 }
 
-#invoicePage>.row:first-child>.col-md-6>.q-card {
+#invoicePage > .row:first-child > .col-md-6 > .q-card {
-	flex:  1;
+  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 {
+  #invoicePage > .row:first-child > .col-md-6:first-child > div {
-		margin-right: 5px;
+    margin-right: 5px;
-	}
+  }
 
-	#invoicePage>.row:first-child>.col-md-6:nth-child(2)>div {
+  #invoicePage > .row:first-child > .col-md-6:nth-child(2) > div {
-		margin-left: 5px;
+    margin-left: 5px;
-	}
+  }
 }
 
-
 @media print {
-	* {
+  * {
-		color:  black !important;
+    color: black !important;
-	}
+  }
 
-	header, button, #payButtonContainer {
+  header,
-		display:  none !important;
+  button,
-	}
+  #payButtonContainer {
+    display: none !important;
+  }
 
-	main, .q-page-container {
+  main,
-		padding-top: 0px !important;
+  .q-page-container {
-	}
+    padding-top: 0px !important;
+  }
 
-	.q-card {
+  .q-card {
-		box-shadow:  none !important;
+    box-shadow: none !important;
-		border:  1px solid black;
+    border: 1px solid black;
-	}
+  }
 
-	.q-item {
+  .q-item {
-		padding:  5px;
+    padding: 5px;
-	}
+  }
 
-	.q-card__section {
+  .q-card__section {
-		padding:  5px;
+    padding: 5px;
-	}
+  }
 
-	#printQrCode {
+  #printQrCode {
-		display:  block;
+    display: block;
-	}
+  }
 
-	p {
+  p {
-		margin-bottom: 0px !important;
+    margin-bottom: 0px !important;
-	}
+  }
 
-	#invoicePage .clear {
+  #invoicePage .clear {
-		margin-bottom: 10px !important;
+    margin-bottom: 10px !important;
-	}
+  }
-}
+}