make format

lnbits/extensions/diagonalley/templates/diagonalley/index.html

@@ -859,7 +859,11 @@
           >
             <div class="text-center q-mb-lg">
               {% raw %}
-              <q-responsive :ratio="1" class="q-mx-xl" @click="copyText(keys[type])">
+              <q-responsive
+                :ratio="1"
+                class="q-mx-xl"
+                @click="copyText(keys[type])"
+              >
                 <qrcode
                   :value="keys[type]"
                   :options="{width: 250}"
@@ -867,7 +871,11 @@
                 ></qrcode>
                 <q-tooltip>{{ keys[type] }}</q-tooltip>
               </q-responsive>
-              <p>{{ type == 'pubkey' ? 'Public Key' : 'Private Key' }}<br /><small>Click to copy</small></p>
+              <p>
+                {{ type == 'pubkey' ? 'Public Key' : 'Private Key' }}<br /><small
+                  >Click to copy</small
+                >
+              </p>
               {% endraw %}
             </div>
           </div>
@@ -1412,18 +1420,18 @@
       },
       exportKeysCSV: function () {
         let colls = [
-        {
+          {
-          name: 'privatekey',
+            name: 'privatekey',
-          align: 'left',
+            align: 'left',
-          label: 'Private Key',
+            label: 'Private Key',
-          field: 'privkey'
+            field: 'privkey'
-        },
+          },
-        {
+          {
-          name: 'publickey',
+            name: 'publickey',
-          align: 'left',
+            align: 'left',
-          label: 'Public Key',
+            label: 'Public Key',
-          field: 'pubkey'
+            field: 'pubkey'
-        },
+          }
         ]
         LNbits.utils.exportCSV(colls, [this.keys])
       },

lnbits/extensions/diagonalley/templates/diagonalley/order.html

@@ -102,10 +102,7 @@
       <q-card-section>
         <q-separator></q-separator>
         <q-list>
-          <q-expansion-item
+          <q-expansion-item group="extras" icon="vpn_key" label="Keys"
-            group="extras"
-            icon="vpn_key"
-            label="Keys"
             ><p>
               Bellow are the keys needed to contact the merchant. They are
               stored in the browser!
@@ -118,7 +115,11 @@
               >
                 <div class="text-center q-mb-lg">
                   {% raw %}
-                  <q-responsive :ratio="1" class="q-mx-auto" style="max-width: 250px;">
+                  <q-responsive
+                    :ratio="1"
+                    class="q-mx-auto"
+                    style="max-width: 250px"
+                  >
                     <qrcode
                       :value="user.keys[type]"
                       :options="{width: 500}"
@@ -134,62 +135,63 @@
               </div>
             </div>
             <q-separator></q-separator>
-        <div class="row q-mt-lg">
-          <q-btn outline color="grey" @click="downloadKeys"
-            >Backup keys
-            <q-tooltip>Download your keys</q-tooltip>
-          </q-btn>
-          <q-btn
-            outline
-            color="grey"
-            class="q-mx-sm"
-            @click="keysDialog.show = true"
-            :disabled="this.user.keys"
-            >Restore keys
-            <q-tooltip>Restore keys</q-tooltip>
-          </q-btn>
-          <q-btn
-            @click="deleteData"
-            v-close-popup
-            flat
-            color="grey"
-            class="q-ml-auto"
-            >Delete data
-            <q-tooltip>Delete all data from browser</q-tooltip>
-          </q-btn>
-        </div>
-            </q-expansion-item
-          >
-        </q-list>
-        <q-expansion-item
-            icon="qr_code"
-            label="Export page"
-            >
-            <p>
-              Export, or send, this page to another device
-            </p>
-            <div class="text-center q-mb-lg">
-              <q-responsive :ratio="1" class="q-my-xl q-mx-auto" style="max-width: 250px;" @click="copyText(exportURL)">
-                <qrcode
-                :value="exportURL"
-                :options="{width: 500}"
-                class="rounded-borders"
-                ></qrcode>
-                <q-tooltip>Click to copy</q-tooltip>
-              </q-responsive>
-            </div>
             <div class="row q-mt-lg">
+              <q-btn outline color="grey" @click="downloadKeys"
+                >Backup keys
+                <q-tooltip>Download your keys</q-tooltip>
+              </q-btn>
               <q-btn
-                @click="copyText(exportURL)"
+                outline
+                color="grey"
+                class="q-mx-sm"
+                @click="keysDialog.show = true"
+                :disabled="this.user.keys"
+                >Restore keys
+                <q-tooltip>Restore keys</q-tooltip>
+              </q-btn>
+              <q-btn
+                @click="deleteData"
                 v-close-popup
                 flat
                 color="grey"
                 class="q-ml-auto"
-                >Copy URL
+                >Delete data
-                <q-tooltip>Export, or send, this page to another device</q-tooltip>
+                <q-tooltip>Delete all data from browser</q-tooltip>
               </q-btn>
             </div>
           </q-expansion-item>
+        </q-list>
+        <q-expansion-item icon="qr_code" label="Export page">
+          <p>Export, or send, this page to another device</p>
+          <div class="text-center q-mb-lg">
+            <q-responsive
+              :ratio="1"
+              class="q-my-xl q-mx-auto"
+              style="max-width: 250px"
+              @click="copyText(exportURL)"
+            >
+              <qrcode
+                :value="exportURL"
+                :options="{width: 500}"
+                class="rounded-borders"
+              ></qrcode>
+              <q-tooltip>Click to copy</q-tooltip>
+            </q-responsive>
+          </div>
+          <div class="row q-mt-lg">
+            <q-btn
+              @click="copyText(exportURL)"
+              v-close-popup
+              flat
+              color="grey"
+              class="q-ml-auto"
+              >Copy URL
+              <q-tooltip
+                >Export, or send, this page to another device</q-tooltip
+              >
+            </q-btn>
+          </div>
+        </q-expansion-item>
       </q-card-section>
     </q-card>
   </div>
@@ -268,8 +270,11 @@
       }
     },
     computed: {
-      exportURL(){
+      exportURL() {
-        return '{{request.url}}' + `&keys=${this.user.keys.publickey},${this.user.keys.privatekey}`
+        return (
+          '{{request.url}}' +
+          `&keys=${this.user.keys.publickey},${this.user.keys.privatekey}`
+        )
       }
     },
     methods: {
@@ -333,8 +338,9 @@
       },
       async generateKeys(payment_hash) {
         //check if the keys are set
-        if("publickey" in this.user.keys && "privatekey" in this.user.keys) return
+        if ('publickey' in this.user.keys && 'privatekey' in this.user.keys)
-        
+          return
+
         return await LNbits.api
           .request('GET', `/diagonalley/api/v1/keys/${payment_hash}`, null)
           .then(response => {
@@ -417,15 +423,18 @@
       let order_details = JSON.parse('{{ order | tojson }}')
       let products = JSON.parse('{{ products | tojson }}')
       let order_id = '{{ order_id }}'
-      let hasKeys = Boolean(JSON.parse('{{ publickey | tojson }}') && JSON.parse('{{ privatekey | tojson }}'))
+      let hasKeys = Boolean(
+        JSON.parse('{{ publickey | tojson }}') &&
+          JSON.parse('{{ privatekey | tojson }}')
+      )
 
-      if(hasKeys) {
+      if (hasKeys) {
         this.user.keys = {
           privatekey: '{{ privatekey }}',
           publickey: '{{ publickey }}'
         }
       }
-      
+
       this.stall = JSON.parse('{{ stall | tojson }}')
       this.products = order_details.map(o => {
         let product = products.find(p => p.id == o.product_id)

lnbits/extensions/diagonalley/views.py

@@ -95,7 +95,10 @@ async def display(request: Request, market_id):
 
 @diagonalley_ext.get("/order", response_class=HTMLResponse)
 async def chat_page(
-    request: Request, merch: str = Query(...), invoice_id: str = Query(...), keys: str = Query(None)
+    request: Request,
+    merch: str = Query(...),
+    invoice_id: str = Query(...),
+    keys: str = Query(None),
 ):
     stall = await get_diagonalley_stall(merch)
     order = await get_diagonalley_order_invoiceid(invoice_id)
@@ -112,8 +115,8 @@ async def chat_page(
                 "publickey": stall.publickey,
                 "wallet": stall.wallet,
             },
-            "publickey": keys.split(',')[0] if keys else None,
+            "publickey": keys.split(",")[0] if keys else None,
-            "privatekey": keys.split(',')[1] if keys else None,
+            "privatekey": keys.split(",")[1] if keys else None,
             "order_id": order.invoiceid,
             "order": [details.dict() for details in _order],
             "products": [product.dict() for product in products],