From 6acbf823ae6f7ea519cfec9e2eb32498adbf1b3e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?dni=20=E2=9A=A1?= Date: Tue, 12 Sep 2023 21:05:43 +0200 Subject: [PATCH] [CHORE] bugfix formatting prettier (#1936) --- lnbits/core/templates/admin/_tab_funding.html | 66 ++++++-- lnbits/core/templates/admin/index.html | 157 +++++++++++++----- 2 files changed, 171 insertions(+), 52 deletions(-) diff --git a/lnbits/core/templates/admin/_tab_funding.html b/lnbits/core/templates/admin/_tab_funding.html index 48c5c4e4..d6d52037 100644 --- a/lnbits/core/templates/admin/_tab_funding.html +++ b/lnbits/core/templates/admin/_tab_funding.html @@ -31,8 +31,13 @@

Active Funding (Requires server restart)

- +
@@ -40,20 +45,36 @@

Invoice Expiry

- +

Fee reserve

- +
- +
@@ -64,13 +85,30 @@

Funding Sources (Requires server restart)

- - + + - - + + @@ -78,4 +116,4 @@
- \ No newline at end of file + diff --git a/lnbits/core/templates/admin/index.html b/lnbits/core/templates/admin/index.html index f75a443d..56c247e0 100644 --- a/lnbits/core/templates/admin/index.html +++ b/lnbits/core/templates/admin/index.html @@ -2,26 +2,63 @@ %} {% block page %}
- - {%raw%}{{ $t('save_tooltip') }}{%endraw%} + + {%raw%}{{ $t('save_tooltip') }}{%endraw%} - + - - {%raw%}{{ $t('restart_tooltip') }}{%endraw%} + + {%raw%}{{ $t('restart_tooltip') }}{%endraw%} - + - + {%raw%}{{ $t('add_funds_tooltip') }}{%endraw%} - + {%raw%}{{ $t('reset_defaults_tooltip') }}{%endraw%}
@@ -33,15 +70,35 @@
- + - + - + - + - +
@@ -65,20 +122,43 @@
- +
- +
- + - +
@@ -137,19 +217,19 @@ tab: 'funding', needsRestart: false, prettyFunding: new Map([ - ["VoidWallet", "Void Wallet"], - ["FakeWallet", "Fake Wallet"], - ["CoreLightningWallet", "Core Lightning"], - ["CoreLightningRestWallet", "Core Lightning"], - ["LndRestWallet", "Lightning Network Daemon (LND Rest)"], - ["LndWallet", "Lightning Network Daemon (LND)"], - ["LnTipsWallet", "LN.Tips"], - ["LNPayWallet", "LN Pay"], - ["EclairWallet", "Eclair (ACINQ)"], - ["LNbitsWallet", "LNBits"], - ["OpenNodeWallet", "OpenNode"], - ["ClicheWallet", "Cliche (NBD)"], - ["SparkWallet", "Spark"] + ['VoidWallet', 'Void Wallet'], + ['FakeWallet', 'Fake Wallet'], + ['CoreLightningWallet', 'Core Lightning'], + ['CoreLightningRestWallet', 'Core Lightning'], + ['LndRestWallet', 'Lightning Network Daemon (LND Rest)'], + ['LndWallet', 'Lightning Network Daemon (LND)'], + ['LnTipsWallet', 'LN.Tips'], + ['LNPayWallet', 'LN Pay'], + ['EclairWallet', 'Eclair (ACINQ)'], + ['LNbitsWallet', 'LNBits'], + ['OpenNodeWallet', 'OpenNode'], + ['ClicheWallet', 'Cliche (NBD)'], + ['SparkWallet', 'Spark'] ]), funding_sources: new Map([ ['VoidWallet', null], @@ -406,7 +486,7 @@ '/api/v1/ws/' + digestHex this.ws = new WebSocket(localUrl) - this.ws.addEventListener('message', async ({ data }) => { + this.ws.addEventListener('message', async ({data}) => { this.logs.push(data.toString()) const scrollArea = this.$refs.logScroll if (scrollArea) { @@ -545,7 +625,7 @@ .then(response => { this.isSuperUser = response.data.is_super_user || false this.settings = response.data - this.formData = { ...this.settings } + this.formData = {...this.settings} this.updateFundingData() this.getNotifications() }) @@ -568,16 +648,17 @@ .then(response => { this.needsRestart = this.settings.lnbits_backend_wallet_class !== - this.formData.lnbits_backend_wallet_class || + this.formData.lnbits_backend_wallet_class || this.settings.lnbits_killswitch !== - this.formData.lnbits_killswitch + this.formData.lnbits_killswitch this.settings = this.formData this.formData = _.clone(this.settings) this.updateFundingData() this.$q.notify({ type: 'positive', - message: `Success! Settings changed! ${this.needsRestart ? 'Restart required!' : '' - }`, + message: `Success! Settings changed! ${ + this.needsRestart ? 'Restart required!' : '' + }`, icon: null }) }) @@ -616,4 +697,4 @@ } }) -{% endblock %} \ No newline at end of file +{% endblock %}