Merge branch 'master' into StreamerCopilot

lnbits/extensions/events/templates/events/display.html

@@ -41,10 +41,14 @@
 
     <q-card v-show="ticketLink.show" class="q-pa-lg">
       <div class="text-center q-mb-lg">
-        <a :href="ticketLink.data.link" target="_blank">
-          <q-btn unelevated size="xl" color="deep-purple"
-            >Link to your ticket!</q-btn
-          ></a
+        <q-btn
+          unelevated
+          size="xl"
+          :href="ticketLink.data.link"
+          target="_blank"
+          color="deep-purple"
+          type="a"
+          >Link to your ticket!</q-btn
         >
         <br /><br />
         <p>You'll be redirected in a few moments...</p>

lnbits/extensions/events/templates/events/index.html

@@ -176,22 +176,29 @@
   <q-dialog v-model="formDialog.show" position="top">
     <q-card class="q-pa-lg q-pt-xl lnbits__dialog-card">
       <q-form @submit="sendEventData" class="q-gutter-md">
-        <q-select
-          filled
-          dense
-          emit-value
-          v-model="formDialog.data.wallet"
-          :options="g.user.walletOptions"
-          label="Wallet *"
-        >
-        </q-select>
-        <q-input
-          filled
-          dense
-          v-model.trim="formDialog.data.name"
-          type="name"
-          label="Name of event "
-        ></q-input>
+        <div class="row">
+          <div class="col">
+            <q-input
+              filled
+              dense
+              v-model.trim="formDialog.data.name"
+              type="name"
+              label="Title of event "
+            ></q-input>
+          </div>
+          <div class="col q-pl-sm">
+            <q-select
+              filled
+              dense
+              emit-value
+              v-model="formDialog.data.wallet"
+              :options="g.user.walletOptions"
+              label="Wallet *"
+            >
+            </q-select>
+          </div>
+        </div>
+
         <q-input
           filled
           dense
@@ -199,41 +206,63 @@
           type="textarea"
           label="Info about the event "
         ></q-input>
-        <q-input
-          filled
-          dense
-          v-model.trim="formDialog.data.closing_date"
-          type="date"
-          label="Closing for tickets "
-        ></q-input>
-        <q-input
-          filled
-          dense
-          v-model.trim="formDialog.data.event_start_date"
-          type="date"
-          label="Event begins "
-        ></q-input>
-        <q-input
-          filled
-          dense
-          v-model.trim="formDialog.data.event_end_date"
-          type="date"
-          label="Event ends "
-        ></q-input>
-        <q-input
-          filled
-          dense
-          v-model.number="formDialog.data.amount_tickets"
-          type="number"
-          label="Amount of tickets "
-        ></q-input>
-        <q-input
-          filled
-          dense
-          v-model.number="formDialog.data.price_per_ticket"
-          type="number"
-          label="Price per ticket "
-        ></q-input>
+        <div class="row">
+          <div class="col-4">Ticket closing date</div>
+          <div class="col-8">
+            <q-input
+              filled
+              dense
+              v-model.trim="formDialog.data.closing_date"
+              type="date"
+            ></q-input>
+          </div>
+        </div>
+
+        <div class="row">
+          <div class="col-4">Event begins</div>
+          <div class="col-8">
+            <q-input
+              filled
+              dense
+              v-model.trim="formDialog.data.event_start_date"
+              type="date"
+            ></q-input>
+          </div>
+        </div>
+
+        <div class="row">
+          <div class="col-4">Event ends</div>
+          <div class="col-8">
+            <q-input
+              filled
+              dense
+              v-model.trim="formDialog.data.event_end_date"
+              type="date"
+            ></q-input>
+          </div>
+        </div>
+
+        <div class="row">
+          <div class="col">
+            <q-input
+              filled
+              dense
+              v-model.number="formDialog.data.amount_tickets"
+              type="number"
+              label="Amount of tickets "
+            ></q-input>
+          </div>
+          <div class="col q-pl-sm">
+            <q-input
+              filled
+              dense
+              v-model.number="formDialog.data.price_per_ticket"
+              type="number"
+              label="Price per ticket "
+            ></q-input>
+          </div>
+        </div>
+
         <div class="row q-mt-lg">
           <q-btn
             v-if="formDialog.data.id"

lnbits/extensions/satspay/templates/satspay/display.html

@@ -10,7 +10,7 @@
           class="col"
           color="white"
           style="background-color: grey; height: 30px; padding: 5px"
-          v-if="charge_time_elapsed == 'True'"
+          v-if="timetoComplete < 1"
         >
           <center>Time elapsed</center>
         </div>
@@ -106,7 +106,7 @@
     <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'">
+          <div v-if="timetoComplete < 1 && charge_paid == 'False'">
             <q-icon
               name="block"
               style="color: #ccc; font-size: 21.4em"
@@ -156,7 +156,7 @@
     <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'">
+          <div v-if="timetoComplete < 1 && charge_paid == 'False'">
             <q-icon
               name="block"
               style="color: #ccc; font-size: 21.4em"
@@ -229,6 +229,7 @@
         newProgress: 0.4,
         counter: 1,
         newTimeLeft: '',
+        timetoComplete: 100,
         lnbtc: true,
         onbtc: false,
         charge_time_elapsed: '{{charge.time_elapsed}}',
@@ -247,7 +248,6 @@
             '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
@@ -271,6 +271,7 @@
         var timeToComplete =
           parseInt('{{ charge.time }}') * 60 -
           (Date.now() / 1000 - parseInt('{{ charge.timestamp }}'))
+        this.timetoComplete = timeToComplete
         var timeLeft = Quasar.utils.date.formatDate(
           new Date((timeToComplete - 3600) * 1000),
           'HH:mm:ss'
@@ -288,8 +289,7 @@
       timerCount: function () {
         self = this
         var refreshIntervalId = setInterval(function () {
-          if (self.charge_paid == 'True') {
-            console.log('did this work?')
+          if (self.charge_paid == 'True' || self.timetoComplete < 1) {
             clearInterval(refreshIntervalId)
           }
           self.getTheTime()