mirrors/lnbits-legend
1
0
Fork 0
mirror of https://github.com/lnbits/lnbits-legend.git synced 2024-11-19 18:11:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

feat: only dhow disclaimer if SERVICE_FEE has been set

Browse Source
This commit is contained in:
Eneko Illarramendi 2020-04-23 21:25:46 +02:00
parent f02526585f
commit 897644956a
4 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lnbits/core/static/js/wallet.js
View File

@ -347,8 +347,9 @@ new Vue({
created: function () { created: function () {
this.fetchPayments(); this.fetchPayments();
setTimeout(this.checkPendingPayments(), 1200); setTimeout(this.checkPendingPayments(), 1200);
},
if (!this.$q.localStorage.getItem('lnbits.disclaimerShown')) { mounted: function () {
if (this.$refs.disclaimer && !this.$q.localStorage.getItem('lnbits.disclaimerShown')) {
this.disclaimerDialog.show = true; this.disclaimerDialog.show = true;
this.$q.localStorage.set('lnbits.disclaimerShown', true); this.$q.localStorage.set('lnbits.disclaimerShown', true);
} }

25
lnbits/core/templates/core/wallet.html
View File

@ -242,15 +242,18 @@
</q-card> </q-card>
</q-dialog> </q-dialog>
<q-dialog v-model="disclaimerDialog.show"> {% if service_fee > 0 %}
<q-card class="q-pa-lg"> <div ref="disclaimer"></div>
<h6 class="q-my-md text-deep-purple">Warning</h6> <q-dialog v-model="disclaimerDialog.show">
<p>Login functionality to be released in v0.2, for now, <strong>make sure you bookmark this page for future access to your wallet</strong>!</p> <q-card class="q-pa-lg">
<p>This service is in BETA, and we hold no responsibility for people losing access to funds. To encourage you to run your own LNbits installation, any balance on {% raw %}{{ disclaimerDialog.location.host }}{% endraw %} will incur a charge of <strong>1% service fee</strong> per week.</p> <h6 class="q-my-md text-deep-purple">Warning</h6>
<div class="row q-mt-lg"> <p>Login functionality to be released in v0.2, for now, <strong>make sure you bookmark this page for future access to your wallet</strong>!</p>
<q-btn outline color="grey" @click="copyText(disclaimerDialog.location.href)">Copy wallet URL</q-btn> <p>This service is in BETA, and we hold no responsibility for people losing access to funds. To encourage you to run your own LNbits installation, any balance on {% raw %}{{ disclaimerDialog.location.host }}{% endraw %} will incur a charge of <strong>{{ service_fee }}% service fee</strong> per week.</p>
<q-btn v-close-popup flat color="grey" class="q-ml-auto">I understand</q-btn> <div class="row q-mt-lg">
</div> <q-btn outline color="grey" @click="copyText(disclaimerDialog.location.href)">Copy wallet URL</q-btn>
</q-card> <q-btn v-close-popup flat color="grey" class="q-ml-auto">I understand</q-btn>
</q-dialog> </div>
</q-card>
</q-dialog>
{% endif %}
{% endblock %} {% endblock %}

4
lnbits/core/views/generic.py
View File

@ -4,6 +4,7 @@ from os import path
from lnbits.core import core_app from lnbits.core import core_app
from lnbits.decorators import check_user_exists, validate_uuids from lnbits.decorators import check_user_exists, validate_uuids
from lnbits.helpers import Status from lnbits.helpers import Status
from lnbits.settings import SERVICE_FEE
from ..crud import ( from ..crud import (
create_account, create_account,
@ -48,6 +49,7 @@ def wallet():
user_id = request.args.get("usr", type=str) user_id = request.args.get("usr", type=str)
wallet_id = request.args.get("wal", type=str) wallet_id = request.args.get("wal", type=str)
wallet_name = request.args.get("nme", type=str) wallet_name = request.args.get("nme", type=str)
service_fee = int(SERVICE_FEE) if int(SERVICE_FEE) == SERVICE_FEE else SERVICE_FEE
# just wallet_name: create a new user, then create a new wallet for user with wallet_name # just wallet_name: create a new user, then create a new wallet for user with wallet_name
# just user_id: return the first user wallet or create one if none found (with default wallet_name) # just user_id: return the first user wallet or create one if none found (with default wallet_name)
@ -71,7 +73,7 @@ def wallet():
if wallet_id not in user.wallet_ids: if wallet_id not in user.wallet_ids:
abort(Status.FORBIDDEN, "Not your wallet.") abort(Status.FORBIDDEN, "Not your wallet.")
return render_template("core/wallet.html", user=user, wallet=user.get_wallet(wallet_id)) return render_template("core/wallet.html", user=user, wallet=user.get_wallet(wallet_id), service_fee=service_fee)
@core_app.route("/deletewallet") @core_app.route("/deletewallet")

4
lnbits/settings.py
View File

@ -1,8 +1,6 @@
import importlib import importlib
import os import os
from decimal import Decimal
wallets_module = importlib.import_module("lnbits.wallets") wallets_module = importlib.import_module("lnbits.wallets")
wallet_class = getattr(wallets_module, os.getenv("LNBITS_BACKEND_WALLET_CLASS", "LntxbotWallet")) wallet_class = getattr(wallets_module, os.getenv("LNBITS_BACKEND_WALLET_CLASS", "LntxbotWallet"))
@ -13,4 +11,4 @@ LNBITS_DATA_FOLDER = os.getenv("LNBITS_DATA_FOLDER", os.path.join(LNBITS_PATH, "
WALLET = wallet_class() WALLET = wallet_class()
DEFAULT_WALLET_NAME = os.getenv("LNBITS_DEFAULT_WALLET_NAME", "LNbits wallet") DEFAULT_WALLET_NAME = os.getenv("LNBITS_DEFAULT_WALLET_NAME", "LNbits wallet")
FORCE_HTTPS = os.getenv("LNBITS_FORCE_HTTPS", "1") == "1" FORCE_HTTPS = os.getenv("LNBITS_FORCE_HTTPS", "1") == "1"
SERVICE_FEE = Decimal(os.getenv("LNBITS_SERVICE_FEE", "0.0")) SERVICE_FEE = float(os.getenv("LNBITS_SERVICE_FEE", "0.0"))