mirror of
https://github.com/mayswind/ezbookkeeping.git
synced 2026-05-19 09:14:27 +08:00
hide resend verify email button when server disables verify email
This commit is contained in:
@@ -181,7 +181,11 @@ import { useSettingsStore } from '@/stores/setting.js';
|
|||||||
import { useExchangeRatesStore } from '@/stores/exchangeRates.js';
|
import { useExchangeRatesStore } from '@/stores/exchangeRates.js';
|
||||||
|
|
||||||
import assetConstants from '@/consts/asset.js';
|
import assetConstants from '@/consts/asset.js';
|
||||||
import { isUserRegistrationEnabled, isUserForgetPasswordEnabled } from '@/lib/server_settings.js';
|
import {
|
||||||
|
isUserRegistrationEnabled,
|
||||||
|
isUserForgetPasswordEnabled,
|
||||||
|
isUserVerifyEmailEnabled
|
||||||
|
} from '@/lib/server_settings.js';
|
||||||
|
|
||||||
import {
|
import {
|
||||||
mdiEyeOutline,
|
mdiEyeOutline,
|
||||||
@@ -244,6 +248,9 @@ export default {
|
|||||||
},
|
},
|
||||||
currentLanguageName() {
|
currentLanguageName() {
|
||||||
return this.$locale.getCurrentLanguageDisplayName();
|
return this.$locale.getCurrentLanguageDisplayName();
|
||||||
|
},
|
||||||
|
isUserVerifyEmailEnabled() {
|
||||||
|
return isUserVerifyEmailEnabled();
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
setup() {
|
setup() {
|
||||||
@@ -312,7 +319,7 @@ export default {
|
|||||||
}).catch(error => {
|
}).catch(error => {
|
||||||
self.logining = false;
|
self.logining = false;
|
||||||
|
|
||||||
if (error.error && error.error.errorCode === 201020 && error.error.context && error.error.context.email) {
|
if (self.isUserVerifyEmailEnabled && error.error && error.error.errorCode === 201020 && error.error.context && error.error.context.email) {
|
||||||
self.$router.push('/verify_email?email=' + encodeURIComponent(error.error.context.email));
|
self.$router.push('/verify_email?email=' + encodeURIComponent(error.error.context.email));
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -28,7 +28,7 @@
|
|||||||
<span v-if="!loading && emailVerified">{{ $t('Email has been verified') }}</span>
|
<span v-if="!loading && emailVerified">{{ $t('Email has been verified') }}</span>
|
||||||
<span v-if="!loading && !emailVerified">{{ $t('Email has not been verified') }}</span>
|
<span v-if="!loading && !emailVerified">{{ $t('Email has not been verified') }}</span>
|
||||||
<v-btn class="ml-2 px-2" size="small" variant="text" :disabled="loading || resending"
|
<v-btn class="ml-2 px-2" size="small" variant="text" :disabled="loading || resending"
|
||||||
@click="resendVerifyEmail" v-if="!loading && !emailVerified">
|
@click="resendVerifyEmail" v-if="isUserVerifyEmailEnabled && !loading && !emailVerified">
|
||||||
{{ $t('Resend Validation Email') }}
|
{{ $t('Resend Validation Email') }}
|
||||||
<v-progress-circular indeterminate size="18" class="ml-2" v-if="resending"></v-progress-circular>
|
<v-progress-circular indeterminate size="18" class="ml-2" v-if="resending"></v-progress-circular>
|
||||||
</v-btn>
|
</v-btn>
|
||||||
@@ -235,6 +235,7 @@ import { useAccountsStore } from '@/stores/account.js';
|
|||||||
import datetimeConstants from '@/consts/datetime.js';
|
import datetimeConstants from '@/consts/datetime.js';
|
||||||
import { getNameByKeyValue } from '@/lib/common.js';
|
import { getNameByKeyValue } from '@/lib/common.js';
|
||||||
import { getCategorizedAccounts } from '@/lib/account.js';
|
import { getCategorizedAccounts } from '@/lib/account.js';
|
||||||
|
import { isUserVerifyEmailEnabled } from '@/lib/server_settings.js';
|
||||||
|
|
||||||
import {
|
import {
|
||||||
mdiAccount
|
mdiAccount
|
||||||
@@ -317,6 +318,9 @@ export default {
|
|||||||
allTransactionEditScopeTypes() {
|
allTransactionEditScopeTypes() {
|
||||||
return this.$locale.getAllTransactionEditScopeTypes();
|
return this.$locale.getAllTransactionEditScopeTypes();
|
||||||
},
|
},
|
||||||
|
isUserVerifyEmailEnabled() {
|
||||||
|
return isUserVerifyEmailEnabled();
|
||||||
|
},
|
||||||
inputIsNotChanged() {
|
inputIsNotChanged() {
|
||||||
return !!this.inputIsNotChangedProblemMessage;
|
return !!this.inputIsNotChangedProblemMessage;
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
<f7-nav-left :back-link="$t('Back')"></f7-nav-left>
|
<f7-nav-left :back-link="$t('Back')"></f7-nav-left>
|
||||||
<f7-nav-title :title="$t('User Profile')"></f7-nav-title>
|
<f7-nav-title :title="$t('User Profile')"></f7-nav-title>
|
||||||
<f7-nav-right class="navbar-compact-icons">
|
<f7-nav-right class="navbar-compact-icons">
|
||||||
<f7-link icon-f7="ellipsis" :class="{ 'disabled': loading || emailVerified }" @click="showMoreActionSheet = true"></f7-link>
|
<f7-link icon-f7="ellipsis" :class="{ 'disabled': !isUserVerifyEmailEnabled || loading || emailVerified }" @click="showMoreActionSheet = true"></f7-link>
|
||||||
<f7-link :class="{ 'disabled': inputIsNotChanged || inputIsInvalid || saving }" :text="$t('Save')" @click="save"></f7-link>
|
<f7-link :class="{ 'disabled': inputIsNotChanged || inputIsInvalid || saving }" :text="$t('Save')" @click="save"></f7-link>
|
||||||
</f7-nav-right>
|
</f7-nav-right>
|
||||||
</f7-navbar>
|
</f7-navbar>
|
||||||
@@ -212,7 +212,7 @@
|
|||||||
<f7-actions close-by-outside-click close-on-escape :opened="showMoreActionSheet" @actions:closed="showMoreActionSheet = false">
|
<f7-actions close-by-outside-click close-on-escape :opened="showMoreActionSheet" @actions:closed="showMoreActionSheet = false">
|
||||||
<f7-actions-group>
|
<f7-actions-group>
|
||||||
<f7-actions-button :class="{ 'disabled': loading || resending }" @click="resendVerifyEmail"
|
<f7-actions-button :class="{ 'disabled': loading || resending }" @click="resendVerifyEmail"
|
||||||
v-if="!loading && !emailVerified"
|
v-if="isUserVerifyEmailEnabled && !loading && !emailVerified"
|
||||||
>{{ $t('Resend Validation Email') }}</f7-actions-button>
|
>{{ $t('Resend Validation Email') }}</f7-actions-button>
|
||||||
</f7-actions-group>
|
</f7-actions-group>
|
||||||
<f7-actions-group>
|
<f7-actions-group>
|
||||||
@@ -240,6 +240,7 @@ import { useAccountsStore } from '@/stores/account.js';
|
|||||||
|
|
||||||
import { getNameByKeyValue } from '@/lib/common.js';
|
import { getNameByKeyValue } from '@/lib/common.js';
|
||||||
import { getCategorizedAccounts } from '@/lib/account.js';
|
import { getCategorizedAccounts } from '@/lib/account.js';
|
||||||
|
import { isUserVerifyEmailEnabled } from '@/lib/server_settings.js';
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
props: [
|
props: [
|
||||||
@@ -333,6 +334,9 @@ export default {
|
|||||||
currentDayOfWeekName() {
|
currentDayOfWeekName() {
|
||||||
return getNameByKeyValue(this.allWeekDays, this.newProfile.firstDayOfWeek, 'type', 'displayName');
|
return getNameByKeyValue(this.allWeekDays, this.newProfile.firstDayOfWeek, 'type', 'displayName');
|
||||||
},
|
},
|
||||||
|
isUserVerifyEmailEnabled() {
|
||||||
|
return isUserVerifyEmailEnabled();
|
||||||
|
},
|
||||||
inputIsNotChanged() {
|
inputIsNotChanged() {
|
||||||
return !!this.inputIsNotChangedProblemMessage;
|
return !!this.inputIsNotChangedProblemMessage;
|
||||||
},
|
},
|
||||||
|
|||||||
Reference in New Issue
Block a user