aiolabs/lnbits
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity Actions

chore: getting rid of jinja variable in wallet.html (#3547)

Browse source
This commit is contained in:
dni ⚡ 2025-11-21 09:01:53 +01:00 • committed by GitHub
parent 5346ac47b1
commit 3ccefb70fa
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
7 changed files with 19 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

32
lnbits/core/templates/core/wallet.html
View file

@ -16,7 +16,7 @@
<q-card-section style="height: 130px">
<div class="row q-gutter-md">
<div
v-if="isSatsDenomination"
v-if="g.isSatsDenomination"
class="col-1"
style="max-width: 30px"
>
@ -46,7 +46,7 @@
<div class="col-auto">
<div class="text-h3 q-my-none full-width">
<strong
v-text="formatBalance(this.g.wallet.sat)"
v-text="formatBalance(g.wallet.sat)"
class="text-no-wrap"
:style="{fontSize: 'clamp(0.75rem, 10vw, 3rem)', display: 'inline-block', maxWidth: '100%'}"
></strong>
@ -55,7 +55,7 @@
<div class="col-auto">
<lnbits-update-balance
v-if="$q.screen.lt.lg"
:wallet_id="this.g.wallet.id"
:wallet_id="g.wallet.id"
:callback="updateBalanceCallback"
:small_btn="true"
></lnbits-update-balance>
@ -95,7 +95,7 @@
<div class="col-auto">
<lnbits-update-balance
v-if="$q.screen.lt.lg"
:wallet_id="this.g.wallet.id"
:wallet_id="g.wallet.id"
:callback="updateBalanceCallback"
:small_btn="true"
></lnbits-update-balance>
@ -106,7 +106,7 @@
<span
class="text-h5 text-italic"
style="opacity: 0.75"
v-text="formattedBalance + ' {{LNBITS_DENOMINATION}}'"
v-text="formatBalance(g.wallet.sat)"
>
</span>
</div>
@ -114,7 +114,7 @@
<div
class="absolute-right q-pa-md"
v-if="$q.screen.gt.md && g.fiatTracking && '{{ LNBITS_DENOMINATION }}' == 'sats'"
v-if="$q.screen.gt.md && g.fiatTracking && g.isSatsDenomination"
>
<div class="text-bold text-italic">BTC Price</div>
<span
@ -213,7 +213,7 @@
style="position: relative; left: -15px; bottom: -10px"
></q-btn>
<div class="text-subtitle1 q-mt-none q-mb-none">
{{ SITE_TITLE }} Wallet:
<span v-text="$t('wallet')"></span>
<strong><em v-text="g.wallet.name"></em></strong>
</div>
<q-space></q-space>
@ -408,9 +408,7 @@
<div class="col-2"></div>
</div>
</q-card-section>
<q-card-section
v-if="'{{ LNBITS_DENOMINATION }}' == 'sats'"
>
<q-card-section v-if="g.isSatsDenomination">
<div class="row">
<div class="col-6">
<q-select
@ -594,7 +592,7 @@
filled
dense
v-model="receive.data.amount"
:label="$t('amount')+' ({{LNBITS_DENOMINATION}}) *'"
:label="$t('amount') + '(' + denomination + ') *'"
mask="#.##"
fill-mask="0"
reverse-fill-mask
@ -698,9 +696,7 @@
>
<q-item-section avatar>
<q-avatar square>
<img
:src="'{{ static_url_for('static', 'images/logos/lnbits.png') }}'"
/>
<img src="/static/images/logos/lnbits.png" />
</q-avatar>
</q-item-section>
<q-item-section>
@ -719,9 +715,7 @@
>
<q-item-section avatar>
<q-avatar>
<img
:src="'{{ static_url_for('static', 'images/stripe_logo.ico') }}'"
/>
<img src="/static/images/stripe_logo.ico" />
</q-avatar>
</q-item-section>
<q-item-section>
@ -1022,7 +1016,7 @@
<span
v-text="msatoshiFormat(parse.lnurlpay.maxSendable)"
></span>
<span v-text="'{{LNBITS_DENOMINATION}}'"></span>
<span v-text="denomination"></span>
<span v-if="parse.lnurlpay.commentAllowed > 0">
<br />
and a
@ -1038,7 +1032,7 @@
between
<b v-text="msatoshiFormat(parse.lnurlpay.minSendable)"></b> and
<b v-text="msatoshiFormat(parse.lnurlpay.maxSendable)"></b>
<span v-text="'{{LNBITS_DENOMINATION}}'"></span>
<span v-text="denomination"></span>
<span v-if="parse.lnurlpay.commentAllowed > 0">
<br />
and a

2
lnbits/static/bundle-components.min.js vendored
View file

File diff suppressed because one or more lines are too long

2
lnbits/static/bundle.min.js vendored
View file

File diff suppressed because one or more lines are too long

4
lnbits/static/js/globals.js
View file

@ -48,7 +48,9 @@ window.g = Vue.reactive({
'lnbits.backgroundImage',
WINDOW_SETTINGS.LNBITS_DEFAULT_BGIMAGE || ''
),
ads: WINDOW_SETTINGS.AD_SPACE.split(',').map(ad => ad.split(';'))
ads: WINDOW_SETTINGS.AD_SPACE.split(',').map(ad => ad.split(';')),
denomination: WINDOW_SETTINGS.LNBITS_DENOMINATION,
isSatsDenomination: WINDOW_SETTINGS.LNBITS_DENOMINATION == 'sats'
})
window.dateFormat = 'YYYY-MM-DD HH:mm'

2
lnbits/static/js/pages/account.js
View file

@ -579,7 +579,7 @@ window.PageAccount = {
// filter out themes that are not allowed
this.themeOptions = this.themeOptions.filter(theme =>
this.allowedThemes.includes(theme.name)
this.LNBITS_THEME_OPTIONS.includes(theme.name)
)
}
}

10
lnbits/static/js/wallet.js
View file

@ -122,16 +122,6 @@ window.WalletPageLogic = {
}
},
computed: {
formattedBalance() {
if (LNBITS_DENOMINATION != 'sats') {
return LNbits.utils.formatCurrency(
this.g.wallet.sat / 100,
LNBITS_DENOMINATION
)
} else {
return LNbits.utils.formatSat(this.g.wallet.sat)
}
},
canPay() {
if (!this.parse.invoice) return false
if (this.parse.invoice.expired) {

5
lnbits/static/js/windowMixin.js
View file

@ -5,14 +5,9 @@ window.windowMixin = {
api: window._lnbitsApi,
utils: window._lnbitsUtils,
g: window.g,
toggleSubs: true,
isSatsDenomination: WINDOW_SETTINGS['LNBITS_DENOMINATION'] == 'sats',
allowedThemes: WINDOW_SETTINGS['LNBITS_THEME_OPTIONS'],
walletEventListeners: [],
...WINDOW_SETTINGS
}
},
methods: {
openNewWalletDialog(walletType = 'lightning') {
this.g.newWalletType = walletType