updated API docs

lnbits/extensions/copilot/templates/copilot/_api_docs.html

@@ -13,11 +13,11 @@
     label="API info"
     :content-inset-level="0.5"
   >
-    <q-expansion-item group="api" dense expand-separator label="Create charge">
+    <q-expansion-item group="api" dense expand-separator label="Create copilot">
       <q-card>
         <q-card-section>
           <code
-            ><span class="text-blue">POST</span> /satspay/api/v1/charge</code
+            ><span class="text-blue">POST</span> /copilot/api/v1/copilot</code
           >
           <h5 class="text-caption q-mt-sm q-mb-none">Headers</h5>
           <code>{"X-Api-Key": &lt;admin_key&gt;}</code><br />
@@ -27,25 +27,24 @@
           <h5 class="text-caption q-mt-sm q-mb-none">
             Returns 200 OK (application/json)
           </h5>
-          <code>[&lt;charge_object&gt;, ...]</code>
+          <code>[&lt;copilot_object&gt;, ...]</code>
           <h5 class="text-caption q-mt-sm q-mb-none">Curl example</h5>
           <code
-            >curl -X POST {{ request.url_root }}api/v1/charge -d
-            '{"onchainwallet": &lt;string, watchonly_wallet_id&gt;,
-            "description": &lt;string&gt;, "webhook":&lt;string&gt;, "time":
-            &lt;integer&gt;, "amount": &lt;integer&gt;, "lnbitswallet":
-            &lt;string, lnbits_wallet_id&gt;}' -H "Content-type:
-            application/json" -H "X-Api-Key: {{g.user.wallets[0].adminkey }}"
+            >curl -X POST {{ request.url_root }}api/v1/copilot -d '{"title":
+            &lt;string&gt;, "animation": &lt;string&gt;,
+            "show_message":&lt;string&gt;, "amount": &lt;integer&gt;,
+            "lnurl_title": &lt;string&gt;}' -H "Content-type: application/json"
+            -H "X-Api-Key: {{g.user.wallets[0].adminkey }}"
           </code>
         </q-card-section>
       </q-card>
     </q-expansion-item>
-    <q-expansion-item group="api" dense expand-separator label="Update charge">
+    <q-expansion-item group="api" dense expand-separator label="Update copilot">
       <q-card>
         <q-card-section>
           <code
             ><span class="text-blue">PUT</span>
-            /satspay/api/v1/charge/&lt;charge_id&gt;</code
+            /copilot/api/v1/copilot/&lt;copilot_id&gt;</code
           >
           <h5 class="text-caption q-mt-sm q-mb-none">Headers</h5>
           <code>{"X-Api-Key": &lt;admin_key&gt;}</code><br />
@@ -55,26 +54,26 @@
           <h5 class="text-caption q-mt-sm q-mb-none">
             Returns 200 OK (application/json)
           </h5>
-          <code>[&lt;charge_object&gt;, ...]</code>
+          <code>[&lt;copilot_object&gt;, ...]</code>
           <h5 class="text-caption q-mt-sm q-mb-none">Curl example</h5>
           <code
-            >curl -X POST {{ request.url_root }}api/v1/charge/&lt;charge_id&gt;
-            -d '{"onchainwallet": &lt;string, watchonly_wallet_id&gt;,
-            "description": &lt;string&gt;, "webhook":&lt;string&gt;, "time":
-            &lt;integer&gt;, "amount": &lt;integer&gt;, "lnbitswallet":
-            &lt;string, lnbits_wallet_id&gt;}' -H "Content-type:
-            application/json" -H "X-Api-Key: {{g.user.wallets[0].adminkey }}"
+            >curl -X POST {{ request.url_root
+            }}api/v1/copilot/&lt;copilot_id&gt; -d '{"title": &lt;string&gt;,
+            "animation": &lt;string&gt;, "show_message":&lt;string&gt;,
+            "amount": &lt;integer&gt;, "lnurl_title": &lt;string&gt;}' -H
+            "Content-type: application/json" -H "X-Api-Key:
+            {{g.user.wallets[0].adminkey }}"
           </code>
         </q-card-section>
       </q-card>
     </q-expansion-item>
 
-    <q-expansion-item group="api" dense expand-separator label="Get charge">
+    <q-expansion-item group="api" dense expand-separator label="Get copilot">
       <q-card>
         <q-card-section>
           <code
             ><span class="text-blue">GET</span>
-            /satspay/api/v1/charge/&lt;charge_id&gt;</code
+            /copilot/api/v1/copilot/&lt;copilot_id&gt;</code
           >
           <h5 class="text-caption q-mt-sm q-mb-none">Headers</h5>
           <code>{"X-Api-Key": &lt;invoice_key&gt;}</code><br />
@@ -84,20 +83,20 @@
           <h5 class="text-caption q-mt-sm q-mb-none">
             Returns 200 OK (application/json)
           </h5>
-          <code>[&lt;charge_object&gt;, ...]</code>
+          <code>[&lt;copilot_object&gt;, ...]</code>
           <h5 class="text-caption q-mt-sm q-mb-none">Curl example</h5>
           <code
-            >curl -X GET {{ request.url_root }}api/v1/charge/&lt;charge_id&gt;
+            >curl -X GET {{ request.url_root }}api/v1/copilot/&lt;copilot_id&gt;
             -H "X-Api-Key: {{ g.user.wallets[0].inkey }}"
           </code>
         </q-card-section>
       </q-card>
     </q-expansion-item>
-    <q-expansion-item group="api" dense expand-separator label="Get charges">
+    <q-expansion-item group="api" dense expand-separator label="Get copilots">
       <q-card>
         <q-card-section>
           <code
-            ><span class="text-blue">GET</span> /satspay/api/v1/charges</code
+            ><span class="text-blue">GET</span> /copilot/api/v1/copilots</code
           >
           <h5 class="text-caption q-mt-sm q-mb-none">Headers</h5>
           <code>{"X-Api-Key": &lt;invoice_key&gt;}</code><br />
@@ -107,10 +106,10 @@
           <h5 class="text-caption q-mt-sm q-mb-none">
             Returns 200 OK (application/json)
           </h5>
-          <code>[&lt;charge_object&gt;, ...]</code>
+          <code>[&lt;copilot_object&gt;, ...]</code>
           <h5 class="text-caption q-mt-sm q-mb-none">Curl example</h5>
           <code
-            >curl -X GET {{ request.url_root }}api/v1/charges -H "X-Api-Key: {{
+            >curl -X GET {{ request.url_root }}api/v1/copilots -H "X-Api-Key: {{
             g.user.wallets[0].inkey }}"
           </code>
         </q-card-section>
@@ -127,7 +126,7 @@
         <q-card-section>
           <code
             ><span class="text-pink">DELETE</span>
-            /satspay/api/v1/charge/&lt;charge_id&gt;</code
+            /copilot/api/v1/copilot/&lt;copilot_id&gt;</code
           >
           <h5 class="text-caption q-mt-sm q-mb-none">Headers</h5>
           <code>{"X-Api-Key": &lt;admin_key&gt;}</code><br />
@@ -136,34 +135,11 @@
           <h5 class="text-caption q-mt-sm q-mb-none">Curl example</h5>
           <code
             >curl -X DELETE {{ request.url_root
-            }}api/v1/charge/&lt;charge_id&gt; -H "X-Api-Key: {{
+            }}api/v1/copilot/&lt;copilot_id&gt; -H "X-Api-Key: {{
             g.user.wallets[0].adminkey }}"
           </code>
         </q-card-section>
       </q-card>
     </q-expansion-item>
-    <q-expansion-item group="api" dense expand-separator label="Get balances">
-      <q-card>
-        <q-card-section>
-          <code
-            ><span class="text-blue">GET</span>
-            /satspay/api/v1/charges/balance/&lt;charge_id&gt;</code
-          >
-          <h5 class="text-caption q-mt-sm q-mb-none">
-            Body (application/json)
-          </h5>
-          <h5 class="text-caption q-mt-sm q-mb-none">
-            Returns 200 OK (application/json)
-          </h5>
-          <code>[&lt;charge_object&gt;, ...]</code>
-          <h5 class="text-caption q-mt-sm q-mb-none">Curl example</h5>
-          <code
-            >curl -X GET {{ request.url_root
-            }}api/v1/charges/balance/&lt;charge_id&gt; -H "X-Api-Key: {{
-            g.user.wallets[0].inkey }}"
-          </code>
-        </q-card-section>
-      </q-card>
-    </q-expansion-item>
   </q-expansion-item>
 </q-card>

lnbits/extensions/copilot/templates/copilot/display.html

@@ -1,223 +1,5 @@
-{% extends "public.html" %} {% block page %}
-<div class="q-pa-sm theCard">
-  <q-card class="my-card">
-    <div class="column">
-      <center>
-        <div class="col theHeading">{{ charge.description }}</div>
-      </center>
-      <div class="col">
-        <div
-          class="col"
-          color="white"
-          style="background-color: grey; height: 30px; padding: 5px"
-          v-if="charge_time_elapsed == 'True'"
-        >
-          <center>Time elapsed</center>
-        </div>
-        <div
-          class="col"
-          color="white"
-          style="background-color: grey; height: 30px; padding: 5px"
-          v-else-if="charge_paid == 'True'"
-        >
-          <center>Charge paid</center>
-        </div>
-        <div v-else>
-          <q-linear-progress size="30px" :value="newProgress" color="grey">
-            <q-item-section>
-              <q-item style="padding: 3px">
-                <q-spinner color="white" size="0.8em"></q-spinner
-                ><span style="font-size: 15px; color: white"
-                  ><span class="q-pr-xl q-pl-md"> Awaiting payment...</span>
-                  <span class="q-pl-xl" style="color: white">
-                    {% raw %} {{ newTimeLeft }} {% endraw %}</span
-                  ></span
-                >
-              </q-item>
-            </q-item-section>
-          </q-linear-progress>
-        </div>
-      </div>
-      <div class="col" style="margin: 2px 15px; max-height: 100px">
-        <center>
-          <q-btn flat dense outline @click="copyText('{{ charge.id }}')"
-            >Charge ID: {{ charge.id }}</q-btn
-          >
-        </center>
-        <span
-          ><small
-            >{% raw %} Total to pay: {{ charge_amount }}sats<br />
-            Amount paid: {{ charge_balance }}</small
-          ><br />
-          Amount due: {{ charge_amount - charge_balance }}sats {% endraw %}
-        </span>
-      </div>
-      <q-separator></q-separator>
-      <div class="col">
-        <div class="row">
-          <div class="col">
-            <q-btn
-              flat
-              disable
-              v-if="'{{ charge.lnbitswallet }}' == 'None' || charge_time_elapsed == 'True'"
-              style="color: primary; width: 100%"
-              label="lightning⚡"
-            >
-              <q-tooltip>
-                bitcoin onchain payment method not available
-              </q-tooltip>
-            </q-btn>
-            <q-btn
-              flat
-              v-else
-              @click="payLN"
-              style="color: primary; width: 100%"
-              label="lightning⚡"
-            >
-              <q-tooltip> pay with lightning </q-tooltip>
-            </q-btn>
-          </div>
-          <div class="col">
-            <q-btn
-              flat
-              disable
-              v-if="'{{ charge.onchainwallet }}' == 'None' || charge_time_elapsed == 'True'"
-              style="color: primary; width: 100%"
-              label="onchain⛓️"
-            >
-              <q-tooltip>
-                bitcoin lightning payment method not available
-              </q-tooltip>
-            </q-btn>
-            <q-btn
-              flat
-              v-else
-              @click="payON"
-              style="color: primary; width: 100%"
-              label="onchain⛓️"
-            >
-              <q-tooltip> pay onchain </q-tooltip>
-            </q-btn>
-          </div>
-        </div>
-        <q-separator></q-separator>
-      </div>
-    </div>
-    <q-card class="q-pa-lg" v-if="lnbtc">
-      <q-card-section class="q-pa-none">
-        <div class="text-center q-pt-md">
-          <div v-if="charge_time_elapsed == 'True' && charge_paid == 'False'">
-            <q-icon
-              name="block"
-              style="color: #ccc; font-size: 21.4em"
-            ></q-icon>
-          </div>
-          <div v-else-if="charge_paid == 'True'">
-            <q-icon
-              name="check"
-              style="color: green; font-size: 21.4em"
-            ></q-icon>
-            <q-btn
-              outline
-              v-if="'{{ charge.webhook }}' != 'None'"
-              type="a"
-              href="{{ charge.completelink }}"
-              label="{{ charge.completelinktext }}"
-            ></q-btn>
-          </div>
-          <div v-else>
-            <center>
-              <span class="text-subtitle2"
-                >Pay this <br />
-                lightning-network invoice</span
-              >
-            </center>
-            <a href="lightning://{{ charge.payment_request }}">
-              <q-responsive :ratio="1" class="q-mx-md">
-                <qrcode
-                  :value="'{{ charge.payment_request }}'"
-                  :options="{width: 800}"
-                  class="rounded-borders"
-                ></qrcode>
-              </q-responsive>
-            </a>
-            <div class="row q-mt-lg">
-              <q-btn
-                outline
-                color="grey"
-                @click="copyText('{{ charge.payment_request }}')"
-                >Copy invoice</q-btn
-              >
-            </div>
-          </div>
-        </div>
-      </q-card-section>
-    </q-card>
-    <q-card class="q-pa-lg" v-if="onbtc">
-      <q-card-section class="q-pa-none">
-        <div class="text-center q-pt-md">
-          <div v-if="charge_time_elapsed == 'True' && charge_paid == 'False'">
-            <q-icon
-              name="block"
-              style="color: #ccc; font-size: 21.4em"
-            ></q-icon>
-          </div>
-          <div v-else-if="charge_paid == 'True'">
-            <q-icon
-              name="check"
-              style="color: green; font-size: 21.4em"
-            ></q-icon>
-            <q-btn
-              outline
-              v-if="'{{ charge.webhook }}' != 'None'"
-              type="a"
-              href="{{ charge.completelink }}"
-              label="{{ charge.completelinktext }}"
-            ></q-btn>
-          </div>
-          <div v-else>
-            <center>
-              <span class="text-subtitle2"
-                >Send {{ charge.amount }}sats<br />
-                to this onchain address</span
-              >
-            </center>
-            <a href="bitcoin://{{ charge.onchainaddress }}">
-              <q-responsive :ratio="1" class="q-mx-md">
-                <qrcode
-                  :value="'{{ charge.onchainaddress }}'"
-                  :options="{width: 800}"
-                  class="rounded-borders"
-                ></qrcode>
-              </q-responsive>
-            </a>
-            <div class="row q-mt-lg">
-              <q-btn
-                outline
-                color="grey"
-                @click="copyText('{{ charge.onchainaddress }}')"
-                >Copy address</q-btn
-              >
-            </div>
-          </div>
-        </div>
-      </q-card-section>
-    </q-card>
-  </q-card>
-</div>
-
-{% endblock %} {% block scripts %}
+{% extends "public.html" %} {% block page %} {% endblock %} {% block scripts %}
 <script src="{{ url_for('static', filename='vendor/vue-qrcode@1.0.2/vue-qrcode.min.js') }}"></script>
-<style>
-  .theCard {
-    width: 360px;
-    margin: 10px auto;
-  }
-  .theHeading {
-    margin: 15px;
-    font-size: 25px;
-  }
-</style>
 <script>
   Vue.component(VueQrcode.name, VueQrcode)
 
@@ -237,82 +19,8 @@
         charge_paid: '{{charge.paid}}'
       }
     },
-    methods: {
-      checkBalance: function () {
-        var self = this
-        LNbits.api
-          .request(
-            'GET',
-            '/satspay/api/v1/charges/balance/{{ charge.id }}',
-            'filla'
-          )
-          .then(function (response) {
-            console.log(response.data)
-            self.charge_time_elapsed = response.data.time_elapsed
-            self.charge_amount = response.data.amount
-            self.charge_balance = response.data.balance
-            if (self.charge_balance >= self.charge_amount) {
-              self.charge_paid = 'True'
-            }
-          })
-          .catch(function (error) {
-            LNbits.utils.notifyApiError(error)
-          })
-      },
-      payLN: function () {
-        this.lnbtc = true
-        this.onbtc = false
-      },
-      payON: function () {
-        this.lnbtc = false
-        this.onbtc = true
-      },
-      getTheTime: function () {
-        var timeToComplete =
-          parseInt('{{ charge.time }}') * 60 -
-          (Date.now() / 1000 - parseInt('{{ charge.timestamp }}'))
-        var timeLeft = Quasar.utils.date.formatDate(
-          new Date((timeToComplete - 3600) * 1000),
-          'HH:mm:ss'
-        )
-        this.newTimeLeft = timeLeft
-      },
-      getThePercentage: function () {
-        var timeToComplete =
-          parseInt('{{ charge.time }}') * 60 -
-          (Date.now() / 1000 - parseInt('{{ charge.timestamp }}'))
-        this.newProgress =
-          1 - timeToComplete / (parseInt('{{ charge.time }}') * 60)
-      },
-
-      timerCount: function () {
-        self = this
-        var refreshIntervalId = setInterval(function () {
-          if (self.charge_paid == 'True') {
-            console.log('did this work?')
-            clearInterval(refreshIntervalId)
-          }
-          self.getTheTime()
-          self.getThePercentage()
-          self.counter++
-          if (self.counter % 10 === 0) {
-            self.checkBalance()
-          }
-        }, 1000)
-      }
-    },
-    created: function () {
-      if ('{{ charge.lnbitswallet }}' == 'None') {
-        this.lnbtc = false
-        this.onbtc = true
-      }
-      this.getTheTime()
-      this.getThePercentage()
-      var timerCount = this.timerCount
-      if ('{{ charge.paid }}' == 'False') {
-        timerCount()
-      }
-    }
+    methods: {},
+    created: function () {}
   })
 </script>
 {% endblock %}

lnbits/extensions/copilot/templates/copilot/index.html

@@ -377,145 +377,8 @@
         }
       }
     },
-    methods: {
-      cancelCopilot: function (data) {
-        var self = this
-        self.formDialogCopilot.data.description = ''
-        self.formDialogCopilot.data.onchainwallet = ''
-        self.formDialogCopilot.data.lnbitswallet = ''
-        self.formDialogCopilot.data.time = null
-        self.formDialogCopilot.data.amount = null
-        self.formDialogCopilot.data.webhook = ''
-        self.formDialogCopilot.data.completelink = ''
-        self.formDialogCopilot.show = false
-      },
-
-      getWalletLinks: function () {
-        var self = this
-
-        LNbits.api
-          .request(
-            'GET',
-            '/watchonly/api/v1/wallet',
-            this.g.user.wallets[0].inkey
-          )
-          .then(function (response) {
-            for (i = 0; i < response.data.length; i++) {
-              self.walletLinks.push(response.data[i].id)
-            }
-            return
-          })
-          .catch(function (error) {
-            LNbits.utils.notifyApiError(error)
-          })
-      },
-      closeFormDialog: function () {
-        this.formDialog.data = {
-          is_unique: false
-        }
-      },
-      openQrCodeDialog: function (linkId) {
-        var self = this
-        var getAddresses = this.getAddresses
-        getAddresses(linkId)
-        self.current = linkId
-        self.Addresses.show = true
-      },
-      getCopilots: function () {
-        var self = this
-        var getAddressBalance = this.getAddressBalance
-
-        LNbits.api
-          .request(
-            'GET',
-            '/copilot/api/v1/copilots',
-            this.g.user.wallets[0].inkey
-          )
-          .then(function (response) {
-            self.CopilotLinks = response.data.map(mapCopilot)
-          })
-          .catch(function (error) {
-            LNbits.utils.notifyApiError(error)
-          })
-      },
-      sendFormDataCopilot: function () {
-        var self = this
-        var wallet = this.g.user.wallets[0].adminkey
-        var data = this.formDialogCopilot.data
-        data.amount = parseInt(data.amount)
-        data.time = parseInt(data.time)
-        this.createCopilot(wallet, data)
-      },
-      timerCount: function () {
-        self = this
-        var refreshIntervalId = setInterval(function () {
-          for (i = 0; i < self.CopilotLinks.length - 1; i++) {
-            if (self.CopilotLinks[i]['paid'] == 'True') {
-              setTimeout(function () {
-                LNbits.api
-                  .request(
-                    'GET',
-                    '/copilot/api/v1/copilots/balance/' +
-                      self.CopilotLinks[i]['id'],
-                    'filla'
-                  )
-                  .then(function (response) {})
-              }, 2000)
-            }
-          }
-          self.getCopilots()
-        }, 20000)
-      },
-      createCopilot: function (wallet, data) {
-        var self = this
-
-        LNbits.api
-          .request('POST', '/copilot/api/v1/copilot', wallet, data)
-          .then(function (response) {
-            self.CopilotLinks.push(mapCopilot(response.data))
-            self.formDialogCopilot.show = false
-          })
-          .catch(function (error) {
-            LNbits.utils.notifyApiError(error)
-          })
-      },
-
-      deleteCopilotLink: function (copilotId) {
-        var self = this
-        var link = _.findWhere(this.CopilotLinks, {id: copilotId})
-        LNbits.utils
-          .confirmDialog('Are you sure you want to delete this pay link?')
-          .onOk(function () {
-            LNbits.api
-              .request(
-                'DELETE',
-                '/copilot/api/v1/copilot/' + copilotId,
-                self.g.user.wallets[0].adminkey
-              )
-              .then(function (response) {
-                self.CopilotLinks = _.reject(self.CopilotLinks, function (obj) {
-                  return obj.id === copilotId
-                })
-              })
-              .catch(function (error) {
-                LNbits.utils.notifyApiError(error)
-              })
-          })
-      },
-      exportcopilotCSV: function () {
-        var self = this
-        LNbits.utils.exportCSV(self.CopilotsTable.columns, this.CopilotLinks)
-      }
-    },
-    created: function () {
-      var self = this
-      var getCopilots = this.getCopilots
-      getCopilots()
-      var getWalletLinks = this.getWalletLinks
-      getWalletLinks()
-      var timerCount = this.timerCount
-      timerCount()
-    }
+    methods: {},
+    created: function () {}
   })
 </script>
 {% endblock %}