From e559649633090f973f11b67fe2e466c0f2933968 Mon Sep 17 00:00:00 2001 From: benarc Date: Tue, 15 Sep 2020 09:55:26 +0100 Subject: [PATCH] Reverted tasteful button, and started admin table --- lnbits/core/migrations.py | 23 ++++++++++++++++ lnbits/core/static/js/wallet.js | 28 ------------------- lnbits/core/templates/core/wallet.html | 38 +------------------------- 3 files changed, 24 insertions(+), 65 deletions(-) diff --git a/lnbits/core/migrations.py b/lnbits/core/migrations.py index 828d9d4..2c16146 100644 --- a/lnbits/core/migrations.py +++ b/lnbits/core/migrations.py @@ -16,6 +16,29 @@ def m001_initial(db): """ Initial LNbits tables. """ + db.execute( + """ + CREATE TABLE IF NOT EXISTS admin ( + user TEXT NOT NULL, + site_title TEXT NOT NULL, + primary_color TEXT NOT NULL, + secondary_color TEXT NOT NULL, + allowed_users TEXT NOT NULL, + admin_user TEXT NOT NULL, + default_wallet_name TEXT NOT NULL, + data_folder TEXT NOT NULL, + disabled_ext TEXT NOT NULL, + force_https TEXT NOT NULL, + service_fee TEXT NOT NULL, + backend_wallet TEXT NOT NULL, + read_key TEXT NOT NULL, + invoice_key TEXT NOT NULL, + admin_key TEXT NOT NULL, + cert TEXT NOT NULL + ); + """ + ) + db.execute( """ CREATE TABLE IF NOT EXISTS accounts ( diff --git a/lnbits/core/static/js/wallet.js b/lnbits/core/static/js/wallet.js index 65580c1..140ca47 100644 --- a/lnbits/core/static/js/wallet.js +++ b/lnbits/core/static/js/wallet.js @@ -127,12 +127,6 @@ new Vue({ memo: '' } }, - update: { - show: false, - data: { - amount: null - } - }, send: { show: false, invoice: null, @@ -247,14 +241,6 @@ new Vue({ paymentChecker: null } }, - showUpdateDialog: function () { - this.update = { - show: true, - data: { - amount: null - } - } - }, closeReceiveDialog: function () { var checker = this.receive.paymentChecker setTimeout(function () { @@ -298,20 +284,6 @@ new Vue({ self.receive.status = 'pending' }) }, - updateBalance: function () { - var self = this - self.receive.status = 'loading' - LNbits.api - .updateBalance(self.g.wallet, self.update.data.amount) - .then(function (response) { - self.fetchPayments() - self.update.show = false - }) - .catch(function (error) { - LNbits.utils.notifyApiError(error) - self.receive.status = 'pending' - }) - }, decodeQR: function (res) { this.send.data.bolt11 = res this.decodeInvoice() diff --git a/lnbits/core/templates/core/wallet.html b/lnbits/core/templates/core/wallet.html index 9d1f89e..8462122 100644 --- a/lnbits/core/templates/core/wallet.html +++ b/lnbits/core/templates/core/wallet.html @@ -23,19 +23,7 @@

- {% raw %}{{ fbalance }}{% endraw %} sat {% if - admin %} - - Admin top up - - {% endif %} + {% raw %}{{ fbalance }}{% endraw %} sat

@@ -258,30 +246,6 @@ - - - - -
- Top up - Cancel -
-
-
-
-