fix: remove nostr message
This commit is contained in:
@@ -44,7 +44,6 @@ class UsersSettings(LNbitsSettings):
|
|||||||
lnbits_require_user_activation: bool = Field(default=False)
|
lnbits_require_user_activation: bool = Field(default=False)
|
||||||
|
|
||||||
lnbits_user_activation_by_email: bool = Field(default=False)
|
lnbits_user_activation_by_email: bool = Field(default=False)
|
||||||
lnbits_user_activation_by_nostr: bool = Field(default=False)
|
|
||||||
lnbits_user_activation_by_payment: bool = Field(default=False)
|
lnbits_user_activation_by_payment: bool = Field(default=False)
|
||||||
lnbits_user_activation_by_invitation_code: bool = Field(default=False)
|
lnbits_user_activation_by_invitation_code: bool = Field(default=False)
|
||||||
|
|
||||||
@@ -1198,7 +1197,6 @@ class PublicSettings(BaseModel):
|
|||||||
wallet_featured_button_url: str | None = Field(alias="walletFeaturedButtonUrl")
|
wallet_featured_button_url: str | None = Field(alias="walletFeaturedButtonUrl")
|
||||||
wallet_featured_button_icon: str | None = Field(alias="walletFeaturedButtonIcon")
|
wallet_featured_button_icon: str | None = Field(alias="walletFeaturedButtonIcon")
|
||||||
lnbits_user_activation_by_email: bool = Field(alias="userActivationByEmail")
|
lnbits_user_activation_by_email: bool = Field(alias="userActivationByEmail")
|
||||||
lnbits_user_activation_by_nostr: bool = Field(alias="userActivationByNostr")
|
|
||||||
lnbits_user_activation_by_payment: bool = Field(alias="userActivationByPayment")
|
lnbits_user_activation_by_payment: bool = Field(alias="userActivationByPayment")
|
||||||
lnbits_user_activation_by_invitation_code: bool = Field(
|
lnbits_user_activation_by_invitation_code: bool = Field(
|
||||||
alias="userActivationByInvitationCode"
|
alias="userActivationByInvitationCode"
|
||||||
@@ -1255,7 +1253,6 @@ class PublicSettings(BaseModel):
|
|||||||
walletFeaturedButtonUrl=settings.lnbits_wallet_featured_button_url,
|
walletFeaturedButtonUrl=settings.lnbits_wallet_featured_button_url,
|
||||||
walletFeaturedButtonIcon=settings.lnbits_wallet_featured_button_icon,
|
walletFeaturedButtonIcon=settings.lnbits_wallet_featured_button_icon,
|
||||||
userActivationByEmail=settings.lnbits_user_activation_by_email,
|
userActivationByEmail=settings.lnbits_user_activation_by_email,
|
||||||
userActivationByNostr=settings.lnbits_user_activation_by_nostr,
|
|
||||||
userActivationByPayment=settings.lnbits_user_activation_by_payment,
|
userActivationByPayment=settings.lnbits_user_activation_by_payment,
|
||||||
userActivationByInvitationCode=settings.lnbits_user_activation_by_invitation_code,
|
userActivationByInvitationCode=settings.lnbits_user_activation_by_invitation_code,
|
||||||
)
|
)
|
||||||
|
|||||||
+1
-1
File diff suppressed because one or more lines are too long
@@ -451,8 +451,7 @@ window.app.component('username-password', {
|
|||||||
confirmationMethod: 'code',
|
confirmationMethod: 'code',
|
||||||
confirmationEmail: '',
|
confirmationEmail: '',
|
||||||
confirmationCode: this.invitationCode || '',
|
confirmationCode: this.invitationCode || '',
|
||||||
showConfirmationCode: false,
|
showConfirmationCode: false
|
||||||
nostrConfirmationIdentifier: ''
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
@@ -567,26 +566,17 @@ window.app.component('username-password', {
|
|||||||
this.confirmationMethod !== 'code' ||
|
this.confirmationMethod !== 'code' ||
|
||||||
this.confirmationCode.length > 0
|
this.confirmationCode.length > 0
|
||||||
|
|
||||||
const nostrOk =
|
|
||||||
this.confirmationMethodsCount === 0 ||
|
|
||||||
this.confirmationMethod !== 'nostr' ||
|
|
||||||
this.nostrConfirmationIdentifier.length > 0
|
|
||||||
|
|
||||||
console.log('### disableRegister', {
|
console.log('### disableRegister', {
|
||||||
usernameOK,
|
usernameOK,
|
||||||
passwordOK,
|
passwordOK,
|
||||||
passwordsMatch,
|
passwordsMatch,
|
||||||
codeOk,
|
codeOk
|
||||||
nostrOk
|
|
||||||
})
|
})
|
||||||
return (
|
return !usernameOK || !passwordOK || !passwordsMatch || !codeOk
|
||||||
!usernameOK || !passwordOK || !passwordsMatch || !codeOk || !nostrOk
|
|
||||||
)
|
|
||||||
},
|
},
|
||||||
confirmationMethodsCount() {
|
confirmationMethodsCount() {
|
||||||
const methods = [
|
const methods = [
|
||||||
this.g.settings.userActivationByEmail,
|
this.g.settings.userActivationByEmail,
|
||||||
this.g.settings.userActivationByNostr,
|
|
||||||
this.g.settings.userActivationByPayment,
|
this.g.settings.userActivationByPayment,
|
||||||
this.g.settings.userActivationByInvitationCode
|
this.g.settings.userActivationByInvitationCode
|
||||||
]
|
]
|
||||||
|
|||||||
@@ -836,12 +836,6 @@ include('components/lnbits-error.vue') %}
|
|||||||
icon="bolt"
|
icon="bolt"
|
||||||
label="Payment"
|
label="Payment"
|
||||||
></q-tab>
|
></q-tab>
|
||||||
<q-tab
|
|
||||||
v-if="g.settings.userActivationByNostr"
|
|
||||||
name="nostr"
|
|
||||||
icon="bolt"
|
|
||||||
label="Nostr"
|
|
||||||
></q-tab>
|
|
||||||
<q-tab
|
<q-tab
|
||||||
v-if="g.settings.userActivationByEmail"
|
v-if="g.settings.userActivationByEmail"
|
||||||
name="email"
|
name="email"
|
||||||
@@ -883,25 +877,7 @@ include('components/lnbits-error.vue') %}
|
|||||||
<q-tab-panel name="payment">
|
<q-tab-panel name="payment">
|
||||||
<div>payment</div>
|
<div>payment</div>
|
||||||
</q-tab-panel>
|
</q-tab-panel>
|
||||||
<q-tab-panel name="nostr" class="q-pa-none">
|
|
||||||
<div
|
|
||||||
class="q-my-md q-pa-sm text-body2 text-grey-4 bg-grey-9 rounded-borders"
|
|
||||||
>
|
|
||||||
<q-icon name="info" color="orange-4" class="q-mr-xs"></q-icon>
|
|
||||||
You will receive a confirmation link at the provided Nostr
|
|
||||||
identifier or NPub.
|
|
||||||
</div>
|
|
||||||
<div>
|
|
||||||
<q-input
|
|
||||||
dense
|
|
||||||
filled
|
|
||||||
v-model="nostrConfirmationIdentifier"
|
|
||||||
:label="$t('nostr_identifier')"
|
|
||||||
:hint="$t('nostr_identifier_hint')"
|
|
||||||
>
|
|
||||||
</q-input>
|
|
||||||
</div>
|
|
||||||
</q-tab-panel>
|
|
||||||
<q-tab-panel name="email" class="q-pa-none">
|
<q-tab-panel name="email" class="q-pa-none">
|
||||||
<div>
|
<div>
|
||||||
<q-input
|
<q-input
|
||||||
|
|||||||
@@ -264,53 +264,6 @@
|
|||||||
</q-card>
|
</q-card>
|
||||||
</q-expansion-item>
|
</q-expansion-item>
|
||||||
<q-separator></q-separator>
|
<q-separator></q-separator>
|
||||||
<q-expansion-item header-class="text-primary text-bold">
|
|
||||||
<template v-slot:header>
|
|
||||||
<q-item-section avatar>
|
|
||||||
<q-avatar>
|
|
||||||
<q-img
|
|
||||||
src="/static/images/logos/nostr.svg"
|
|
||||||
class="bg-primary"
|
|
||||||
></q-img>
|
|
||||||
</q-avatar>
|
|
||||||
</q-item-section>
|
|
||||||
|
|
||||||
<q-item-section> Nostr </q-item-section>
|
|
||||||
|
|
||||||
<q-item-section side>
|
|
||||||
<div class="row items-center">
|
|
||||||
<q-toggle
|
|
||||||
size="md"
|
|
||||||
:label="
|
|
||||||
formData.lnbits_user_activation_by_nostr
|
|
||||||
? $t('enabled')
|
|
||||||
: $t('disabled')
|
|
||||||
"
|
|
||||||
v-model="formData.lnbits_user_activation_by_nostr"
|
|
||||||
color="green"
|
|
||||||
unchecked-icon="clear"
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
</q-item-section>
|
|
||||||
</template>
|
|
||||||
|
|
||||||
<q-card class="q-pb-xl">
|
|
||||||
<q-card-section>
|
|
||||||
<div
|
|
||||||
class="q-my-md q-pa-sm text-body2 text-grey-4 bg-grey-9 rounded-borders"
|
|
||||||
>
|
|
||||||
<q-icon
|
|
||||||
name="info"
|
|
||||||
color="orange-4"
|
|
||||||
size="18px"
|
|
||||||
class="q-mr-xs"
|
|
||||||
></q-icon>
|
|
||||||
Users will receive a confirmation code via Nostr.
|
|
||||||
</div>
|
|
||||||
</q-card-section>
|
|
||||||
</q-card>
|
|
||||||
</q-expansion-item>
|
|
||||||
<q-separator></q-separator>
|
|
||||||
<q-expansion-item header-class="text-primary text-bold">
|
<q-expansion-item header-class="text-primary text-bold">
|
||||||
<template v-slot:header>
|
<template v-slot:header>
|
||||||
<q-item-section avatar>
|
<q-item-section avatar>
|
||||||
|
|||||||
Reference in New Issue
Block a user