highperfocused/lnbits
1
0
Fork 0
mirror of https://github.com/lnbits/lnbits.git synced 2025-10-10 04:22:35 +02:00
Code Issues Packages Projects Releases Wiki Activity

works

Browse Source
This commit is contained in:
callebtc
2022-11-04 16:44:17 +01:00
committed by dni ⚡
parent ffe6f0d216
commit c79cafb38e
1 changed files with 117 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

189
lnbits/extensions/cashu/templates/cashu/wallet.html
View File

@@ -202,22 +202,25 @@ page_container %}
<q-tab icon="photo_camera" label="Scan" @click="showCamera"> </q-tab> <q-tab icon="photo_camera" label="Scan" @click="showCamera"> </q-tab>
</q-tabs> </q-tabs>
<q-dialog v-model="parse.show" @hide="closeParseDialog"> <q-dialog v-model="payInvoiceData.show" @hide="closeParseDialog">
<q-card class="q-pa-lg q-pt-xl lnbits__dialog-card"> <q-card class="q-pa-lg q-pt-xl lnbits__dialog-card">
<div v-if="parse.invoice"> <div v-if="payInvoiceData.invoice">
<h6 v-if="'{{LNBITS_DENOMINATION}}' != 'sats'" class="q-my-none"> <h6 v-if="'{{LNBITS_DENOMINATION}}' != 'sats'" class="q-my-none">
{% raw %} {{ parseFloat(String(parse.invoice.fsat).replaceAll(",", {% raw %} {{
parseFloat(String(payInvoiceData.invoice.fsat).replaceAll(",",
"")) / 100 }} {% endraw %} {{LNBITS_DENOMINATION}} {% raw %} "")) / 100 }} {% endraw %} {{LNBITS_DENOMINATION}} {% raw %}
</h6> </h6>
<h6 v-else class="q-my-none"> <h6 v-else class="q-my-none">
{{ parse.invoice.fsat }}{% endraw %} {{LNBITS_DENOMINATION}} {% {{ payInvoiceData.invoice.fsat }}{% endraw %}
raw %} {{LNBITS_DENOMINATION}} {% raw %}
</h6> </h6>
<q-separator class="q-my-sm"></q-separator> <q-separator class="q-my-sm"></q-separator>
<p class="text-wrap"> <p class="text-wrap">
<strong>Description:</strong> {{ parse.invoice.description }}<br /> <strong>Description:</strong> {{
<strong>Expire date:</strong> {{ parse.invoice.expireDate }}<br /> payInvoiceData.invoice.description }}<br />
<strong>Hash:</strong> {{ parse.invoice.hash }} <strong>Expire date:</strong> {{ payInvoiceData.invoice.expireDate
}}<br />
<strong>Hash:</strong> {{ payInvoiceData.invoice.hash }}
</p> </p>
{% endraw %} {% endraw %}
<div v-if="canPay" class="row q-mt-lg"> <div v-if="canPay" class="row q-mt-lg">
@@ -235,22 +238,27 @@ page_container %}
> >
</div> </div>
</div> </div>
<div v-else-if="parse.lnurlauth"> <div v-else-if="payInvoiceData.lnurlauth">
{% raw %} {% raw %}
<q-form @submit="authLnurl" class="q-gutter-md"> <q-form @submit="authLnurl" class="q-gutter-md">
<p class="q-my-none text-h6"> <p class="q-my-none text-h6">
Authenticate with <b>{{ parse.lnurlauth.domain }}</b>? Authenticate with <b>{{ payInvoiceData.lnurlauth.domain }}</b>?
</p> </p>
<q-separator class="q-my-sm"></q-separator> <q-separator class="q-my-sm"></q-separator>
<p> <p>
For every website and for every LNbits wallet, a new keypair For every website and for every LNbits wallet, a new keypair
will be deterministically generated so your identity can't be will be deterministically generated so your identity can't be
tied to your LNbits wallet or linked across websites. No other tied to your LNbits wallet or linked across websites. No other
data will be shared with {{ parse.lnurlauth.domain }}. data will be shared with {{ payInvoiceData.lnurlauth.domain }}.
</p>
<p>
Your public key for
<b>{{ payInvoiceData.lnurlauth.domain }}</b> is:
</p> </p>
<p>Your public key for <b>{{ parse.lnurlauth.domain }}</b> is:</p>
<p class="q-mx-xl"> <p class="q-mx-xl">
<code class="text-wrap"> {{ parse.lnurlauth.pubkey }} </code> <code class="text-wrap">
{{ payInvoiceData.lnurlauth.pubkey }}
</code>
</p> </p>
<div class="row q-mt-lg"> <div class="row q-mt-lg">
<q-btn unelevated color="primary" type="submit">Login</q-btn> <q-btn unelevated color="primary" type="submit">Login</q-btn>
@@ -261,37 +269,45 @@ page_container %}
</q-form> </q-form>
{% endraw %} {% endraw %}
</div> </div>
<div v-else-if="parse.lnurlpay"> <div v-else-if="payInvoiceData.lnurlpay">
{% raw %} {% raw %}
<q-form @submit="payLnurl" class="q-gutter-md"> <q-form @submit="payLnurl" class="q-gutter-md">
<p v-if="parse.lnurlpay.fixed" class="q-my-none text-h6"> <p v-if="payInvoiceData.lnurlpay.fixed" class="q-my-none text-h6">
<b>{{ parse.lnurlpay.domain }}</b> is requesting {{ <b>{{ payInvoiceData.lnurlpay.domain }}</b> is requesting {{
parse.lnurlpay.maxSendable | msatoshiFormat }} payInvoiceData.lnurlpay.maxSendable | msatoshiFormat }}
{{LNBITS_DENOMINATION}} {{LNBITS_DENOMINATION}}
<span v-if="parse.lnurlpay.commentAllowed > 0"> <span v-if="payInvoiceData.lnurlpay.commentAllowed > 0">
<br /> <br />
and a {{parse.lnurlpay.commentAllowed}}-char comment and a {{payInvoiceData.lnurlpay.commentAllowed}}-char comment
</span> </span>
</p> </p>
<p v-else class="q-my-none text-h6 text-center"> <p v-else class="q-my-none text-h6 text-center">
<b>{{ parse.lnurlpay.targetUser || parse.lnurlpay.domain }}</b> <b
>{{ payInvoiceData.lnurlpay.targetUser ||
payInvoiceData.lnurlpay.domain }}</b
>
is requesting <br /> is requesting <br />
between between
<b>{{ parse.lnurlpay.minSendable | msatoshiFormat }}</b> and <b
<b>{{ parse.lnurlpay.maxSendable | msatoshiFormat }}</b> >{{ payInvoiceData.lnurlpay.minSendable | msatoshiFormat }}</b
>
and
<b
>{{ payInvoiceData.lnurlpay.maxSendable | msatoshiFormat }}</b
>
{% endraw %} {{LNBITS_DENOMINATION}} {% raw %} {% endraw %} {{LNBITS_DENOMINATION}} {% raw %}
<span v-if="parse.lnurlpay.commentAllowed > 0"> <span v-if="payInvoiceData.lnurlpay.commentAllowed > 0">
<br /> <br />
and a {{parse.lnurlpay.commentAllowed}}-char comment and a {{payInvoiceData.lnurlpay.commentAllowed}}-char comment
</span> </span>
</p> </p>
<q-separator class="q-my-sm"></q-separator> <q-separator class="q-my-sm"></q-separator>
<div class="row"> <div class="row">
<p class="col text-justify text-italic"> <p class="col text-justify text-italic">
{{ parse.lnurlpay.description }} {{ payInvoiceData.lnurlpay.description }}
</p> </p>
<p class="col-4 q-pl-md" v-if="parse.lnurlpay.image"> <p class="col-4 q-pl-md" v-if="payInvoiceData.lnurlpay.image">
<q-img :src="parse.lnurlpay.image" /> <q-img :src="payInvoiceData.lnurlpay.image" />
</p> </p>
</div> </div>
<div class="row"> <div class="row">
@@ -300,26 +316,26 @@ page_container %}
<q-input <q-input
filled filled
dense dense
v-model.number="parse.data.amount" v-model.number="payInvoiceData.data.amount"
type="number" type="number"
label="Amount ({{LNBITS_DENOMINATION}}) *" label="Amount ({{LNBITS_DENOMINATION}}) *"
:min="parse.lnurlpay.minSendable / 1000" :min="payInvoiceData.lnurlpay.minSendable / 1000"
:max="parse.lnurlpay.maxSendable / 1000" :max="payInvoiceData.lnurlpay.maxSendable / 1000"
:readonly="parse.lnurlpay.fixed" :readonly="payInvoiceData.lnurlpay.fixed"
></q-input> ></q-input>
{% raw %} {% raw %}
</div> </div>
<div <div
class="col-8 q-pl-md" class="col-8 q-pl-md"
v-if="parse.lnurlpay.commentAllowed > 0" v-if="payInvoiceData.lnurlpay.commentAllowed > 0"
> >
<q-input <q-input
filled filled
dense dense
v-model="parse.data.comment" v-model="payInvoiceData.data.comment"
:type="parse.lnurlpay.commentAllowed > 64 ? 'textarea' : 'text'" :type="payInvoiceData.lnurlpay.commentAllowed > 64 ? 'textarea' : 'text'"
label="Comment (optional)" label="Comment (optional)"
:maxlength="parse.lnurlpay.commentAllowed" :maxlength="payInvoiceData.lnurlpay.commentAllowed"
></q-input> ></q-input>
</div> </div>
</div> </div>
@@ -336,14 +352,15 @@ page_container %}
</div> </div>
<div v-else> <div v-else>
<q-form <q-form
v-if="!parse.camera.show" v-if="!payInvoiceData.camera.show"
@submit="decodeRequest" @submit="decodeRequest"
class="q-gutter-md" class="q-gutter-md"
> >
<q-input <q-input
ref="pasteInput"
filled filled
dense dense
v-model.trim="parse.data.request" v-model.trim="payInvoiceData.data.request"
type="textarea" type="textarea"
label="Paste an invoice, payment request or lnurl code *" label="Paste an invoice, payment request or lnurl code *"
> >
@@ -352,7 +369,7 @@ page_container %}
<q-btn <q-btn
unelevated unelevated
color="primary" color="primary"
:disable="parse.data.request == ''" :disable="payInvoiceData.data.request == ''"
type="submit" type="submit"
>Read</q-btn >Read</q-btn
> >
@@ -378,7 +395,7 @@ page_container %}
</q-card> </q-card>
</q-dialog> </q-dialog>
<q-dialog v-model="parse.camera.show"> <q-dialog v-model="payInvoiceData.camera.show">
<q-card class="q-pa-lg q-pt-xl"> <q-card class="q-pa-lg q-pt-xl">
<div class="text-center q-mb-lg"> <div class="text-center q-mb-lg">
<qrcode-stream <qrcode-stream
@@ -435,6 +452,7 @@ page_container %}
reverse-fill-mask reverse-fill-mask
autofocus autofocus
class="q-mb-lg" class="q-mb-lg"
@keyup.enter="requestMintButton"
></q-input> ></q-input>
<q-input <q-input
filled filled
@@ -591,7 +609,7 @@ page_container %}
<q-input <q-input
filled filled
dense dense
v-model="payInvoiceData.bolt11" v-model="payInvoiceData.data.request"
label="Paste invoice" label="Paste invoice"
autofocus autofocus
type="textarea" type="textarea"
@@ -692,8 +710,22 @@ page_container %}
}, },
invoiceCheckListener: () => {}, invoiceCheckListener: () => {},
payInvoiceData: { payInvoiceData: {
invoice: '', // invoice: '',
bolt11: '', bolt11: '',
// camera: {
// show: false,
// camera: 'auto'
// }
show: false,
invoice: null,
lnurlpay: null,
lnurlauth: null,
data: {
request: '',
amount: 0,
comment: ''
},
paymentChecker: null,
camera: { camera: {
show: false, show: false,
camera: 'auto' camera: 'auto'
@@ -846,8 +878,8 @@ page_container %}
}, },
canPay: function () { canPay: function () {
if (!this.parse.invoice) return false if (!this.payInvoiceData.invoice) return false
return this.parse.invoice.sat <= this.balance return this.payInvoiceData.invoice.sat <= this.balance
}, },
pendingPaymentsExist: function () { pendingPaymentsExist: function () {
return this.payments.findIndex(payment => payment.pending) !== -1 return this.payments.findIndex(payment => payment.pending) !== -1
@@ -884,10 +916,10 @@ page_container %}
return row.payment_hash + row.amount return row.payment_hash + row.amount
}, },
closeCamera: function () { closeCamera: function () {
this.parse.camera.show = false this.payInvoiceData.camera.show = false
}, },
showCamera: function () { showCamera: function () {
this.parse.camera.show = true this.payInvoiceData.camera.show = true
}, },
showChart: function () { showChart: function () {
this.paymentsChart.show = true this.paymentsChart.show = true
@@ -912,14 +944,15 @@ page_container %}
this.focusInput('setAmount') this.focusInput('setAmount')
}, },
showParseDialog: function () { showParseDialog: function () {
this.parse.show = true this.payInvoiceData.show = true
this.parse.invoice = null this.payInvoiceData.invoice = null
this.parse.lnurlpay = null this.payInvoiceData.lnurlpay = null
this.parse.lnurlauth = null this.payInvoiceData.lnurlauth = null
this.parse.data.request = '' this.payInvoiceData.data.request = ''
this.parse.data.comment = '' this.payInvoiceData.data.comment = ''
this.parse.data.paymentChecker = null this.payInvoiceData.data.paymentChecker = null
this.parse.camera.show = false this.payInvoiceData.camera.show = false
this.focusInput('pasteInput')
}, },
closeReceiveDialog: function () { closeReceiveDialog: function () {
@@ -929,7 +962,7 @@ page_container %}
}, },
closeParseDialog: function () { closeParseDialog: function () {
setTimeout(() => { setTimeout(() => {
clearInterval(this.parse.paymentChecker) clearInterval(this.payInvoiceData.paymentChecker)
}, 10000) }, 10000)
}, },
onPaymentReceived: function (paymentHash) { onPaymentReceived: function (paymentHash) {
@@ -994,33 +1027,43 @@ page_container %}
}) })
}, },
decodeQR: function (res) { decodeQR: function (res) {
this.parse.data.request = res this.payInvoiceData.data.request = res
this.decodeRequest() this.decodeRequest()
this.parse.camera.show = false this.payInvoiceData.camera.show = false
}, },
decodeRequest: function () { decodeRequest: function () {
this.parse.show = true this.payInvoiceData.show = true
let req = this.parse.data.request.toLowerCase() let req = this.payInvoiceData.data.request.toLowerCase()
if (this.parse.data.request.toLowerCase().startsWith('lightning:')) { if (
this.parse.data.request = this.parse.data.request.slice(10) this.payInvoiceData.data.request
} else if (this.parse.data.request.toLowerCase().startsWith('lnurl:')) { .toLowerCase()
this.parse.data.request = this.parse.data.request.slice(6) .startsWith('lightning:')
) {
this.payInvoiceData.data.request = this.payInvoiceData.data.request.slice(
10
)
} else if (
this.payInvoiceData.data.request.toLowerCase().startsWith('lnurl:')
) {
this.payInvoiceData.data.request = this.payInvoiceData.data.request.slice(
6
)
} else if (req.indexOf('lightning=lnurl1') !== -1) { } else if (req.indexOf('lightning=lnurl1') !== -1) {
this.parse.data.request = this.parse.data.request this.payInvoiceData.data.request = this.payInvoiceData.data.request
.split('lightning=')[1] .split('lightning=')[1]
.split('&')[0] .split('&')[0]
} }
if ( if (
this.parse.data.request.toLowerCase().startsWith('lnurl1') || this.payInvoiceData.data.request.toLowerCase().startsWith('lnurl1') ||
this.parse.data.request.match(/[\w.+-~_]+@[\w.+-~_]/) this.payInvoiceData.data.request.match(/[\w.+-~_]+@[\w.+-~_]/)
) { ) {
return return
} }
let invoice let invoice
try { try {
invoice = decode(this.parse.data.request) invoice = decode(this.payInvoiceData.data.request)
} catch (error) { } catch (error) {
this.$q.notify({ this.$q.notify({
timeout: 3000, timeout: 3000,
@@ -1028,7 +1071,7 @@ page_container %}
message: error + '.', message: error + '.',
caption: '400 BAD REQUEST' caption: '400 BAD REQUEST'
}) })
this.parse.show = false this.payInvoiceData.show = false
throw error throw error
return return
} }
@@ -1060,7 +1103,7 @@ page_container %}
} }
}) })
this.parse.invoice = Object.freeze(cleanInvoice) this.payInvoiceData.invoice = Object.freeze(cleanInvoice)
}, },
payInvoice: function () { payInvoice: function () {
let dismissPaymentMsg = this.$q.notify({ let dismissPaymentMsg = this.$q.notify({
@@ -1125,7 +1168,7 @@ page_container %}
showPayInvoiceDialog: function () { showPayInvoiceDialog: function () {
console.log('### showPayInvoiceDialog') console.log('### showPayInvoiceDialog')
this.payInvoiceData.invoice = '' this.payInvoiceData.invoice = ''
this.payInvoiceData.bolt11 = '' this.payInvoiceData.data.request = ''
this.showPayInvoice = true this.showPayInvoice = true
this.payInvoiceData.camera.show = false this.payInvoiceData.camera.show = false
}, },
@@ -1491,7 +1534,7 @@ page_container %}
const payload = { const payload = {
proofs: scndProofs.flat(), proofs: scndProofs.flat(),
amount, amount,
invoice: this.payInvoiceData.bolt11 invoice: this.payInvoiceData.data.request
} }
console.log('#### payload', JSON.stringify(payload)) console.log('#### payload', JSON.stringify(payload))
try { try {
@@ -1506,6 +1549,8 @@ page_container %}
type: 'positive', type: 'positive',
message: 'Invoice paid' message: 'Invoice paid'
}) })
this.payInvoiceData.invoice = null
this.payInvoiceData.show = false
} catch (error) { } catch (error) {
console.error(error) console.error(error)
LNbits.utils.notifyApiError(error) LNbits.utils.notifyApiError(error)
@@ -1645,7 +1690,7 @@ page_container %}
checkInvoice: function () { checkInvoice: function () {
console.log('#### checkInvoice') console.log('#### checkInvoice')
try { try {
const invoice = decode(this.payInvoiceData.bolt11) const invoice = decode(this.payInvoiceData.data.request)
const cleanInvoice = { const cleanInvoice = {
msat: invoice.human_readable_part.amount, msat: invoice.human_readable_part.amount,
@@ -1709,7 +1754,7 @@ page_container %}
// const payload = { // const payload = {
// proofs: proofs.flat(), // proofs: proofs.flat(),
// amount, // amount,
// invoice: this.payInvoiceData.bolt11 // invoice: this.payInvoiceData.data.request
// } // }
// console.log('#### payload', JSON.stringify(payload)) // console.log('#### payload', JSON.stringify(payload))
// try { // try {