mirror/ezbookkeeping
1
0
Fork 0
mirror of https://github.com/mayswind/ezbookkeeping.git synced 2026-05-17 00:12:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

code refactor

Browse Source
This commit is contained in:
MaysWind
2020-11-02 22:06:18 +08:00
parent ebd2421d57
commit 2440369310
7 changed files with 103 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/views/mobile/users/SessionList.vue
+6 -7
View File
@@ -21,13 +21,12 @@ export default {
},
created() {
const self = this;
const app = self.$f7;
const router = self.$f7router;
app.preloader.show();
self.$showLoading();
self.$services.getTokens().then(response => {
app.preloader.hide();
self.$hideLoading();
const data = response.data;
if (!data || !data.success || !data.result) {
@@ -39,7 +38,7 @@ export default {
self.tokens = data.result;
}).catch(error => {
app.preloader.hide();
self.$hideLoading();
if (error.response && error.response.data && error.response.data.errorMessage) {
self.$alert({ error: error.response.data }, () => {
@@ -59,12 +58,12 @@ export default {
const $$ = app.$;
self.$confirm('Are you sure you want to logout from this session?', () => {
app.preloader.show();
self.$showLoading();
self.$services.revokeToken({
tokenId: token.tokenId
}).then(response => {
app.preloader.hide();
self.$hideLoading();
const data = response.data;
if (!data || !data.success || !data.result) {
@@ -80,7 +79,7 @@ export default {
}
});
}).catch(error => {
app.preloader.hide();
self.$hideLoading();
if (error.response && error.response.data && error.response.data.errorMessage) {
self.$alert({error: error.response.data});
src/views/mobile/users/TwoFactorAuth.vue
+38 -25
View File
@@ -4,13 +4,13 @@
<f7-list v-if="status === true">
<f7-list-item :title="$t('Status')" :after="$t('Enabled')"></f7-list-item>
<f7-list-button @click="regenerateBackupCode(null)">{{ $t('Regenerate Backup Codes') }}</f7-list-button>
<f7-list-button @click="disable(null)">{{ $t('Disable') }}</f7-list-button>
<f7-list-button :class="{ 'disabled': regenerating }" @click="regenerateBackupCode(null)">{{ $t('Regenerate Backup Codes') }}</f7-list-button>
<f7-list-button :class="{ 'disabled': disabling }" @click="disable(null)">{{ $t('Disable') }}</f7-list-button>
</f7-list>
<f7-list v-else-if="status === false">
<f7-list-item :title="$t('Status')" :after="$t('Disabled')"></f7-list-item>
<f7-list-button @click="enable">{{ $t('Enable') }}</f7-list-button>
<f7-list-button :class="{ 'disabled': enabling }" @click="enable">{{ $t('Enable') }}</f7-list-button>
</f7-list>
<f7-sheet
@@ -38,7 +38,7 @@
</f7-list>
<f7-button large fill :class="{ 'disabled': !currentPasscodeForEnable }" :text="$t('Continue')" @click="enableConfirm"></f7-button>
<div class="margin-top text-align-center">
<f7-link @click="showInputPasscodeSheetForEnable = false" :text="$t('Cancel')"></f7-link>
<f7-link :class="{ 'disabled': enableConfirming }" @click="showInputPasscodeSheetForEnable = false" :text="$t('Cancel')"></f7-link>
</div>
</div>
</div>
@@ -66,7 +66,7 @@
</f7-list>
<f7-button large fill :class="{ 'disabled': !currentPasswordForDisable }" :text="$t('Continue')" @click="disable(currentPasswordForDisable)"></f7-button>
<div class="margin-top text-align-center">
<f7-link @click="showInputPasswordSheetForDisable = false" :text="$t('Cancel')"></f7-link>
<f7-link :class="{ 'disabled': disabling }" @click="showInputPasswordSheetForDisable = false" :text="$t('Cancel')"></f7-link>
</div>
</div>
</div>
@@ -94,7 +94,7 @@
</f7-list>
<f7-button large fill :class="{ 'disabled': !currentPasswordForRegenerate }" :text="$t('Continue')" @click="regenerateBackupCode(currentPasswordForRegenerate)"></f7-button>
<div class="margin-top text-align-center">
<f7-link @click="showInputPasswordSheetForRegenerate = false" :text="$t('Cancel')"></f7-link>
<f7-link :class="{ 'disabled': regenerating }" @click="showInputPasswordSheetForRegenerate = false" :text="$t('Cancel')"></f7-link>
</div>
</div>
</div>
@@ -135,6 +135,10 @@ export default {
currentPasswordForDisable: '',
currentPasswordForRegenerate: '',
currentBackupCode: '',
enabling: false,
enableConfirming: false,
disabling: false,
regenerating: false,
showInputPasscodeSheetForEnable: false,
showInputPasswordSheetForDisable: false,
showInputPasswordSheetForRegenerate: false,
@@ -143,13 +147,12 @@ export default {
},
created() {
const self = this;
const app = self.$f7;
const router = self.$f7router;
app.preloader.show();
self.$showLoading();
self.$services.get2FAStatus().then(response => {
app.preloader.hide();
self.$hideLoading();
const data = response.data;
if (!data || !data.success || !data.result || typeof(data.result.enable) !== 'boolean') {
@@ -161,7 +164,7 @@ export default {
self.status = data.result.enable;
}).catch(error => {
app.preloader.hide();
self.$hideLoading();
if (error.response && error.response.data && error.response.data.errorMessage) {
self.$alert({ error: error.response.data }, () => {
@@ -177,15 +180,16 @@ export default {
methods: {
enable() {
const self = this;
const app = self.$f7;
self.new2FAQRCode = '';
self.new2FASecret = '';
app.preloader.show();
self.enabling = true;
self.$showLoading(() => self.enabling);
self.$services.enable2FA().then(response => {
app.preloader.hide();
self.enabling = false;
self.$hideLoading();
const data = response.data;
if (!data || !data.success || !data.result || !data.result.qrcode || !data.result.secret) {
@@ -198,7 +202,8 @@ export default {
self.showInputPasscodeSheetForEnable = true;
}).catch(error => {
app.preloader.hide();
self.enabling = false;
self.$hideLoading();
if (error.response && error.response.data && error.response.data.errorMessage) {
self.$alert({error: error.response.data});
@@ -209,13 +214,16 @@ export default {
},
enableConfirm() {
const self = this;
const app = self.$f7;
self.enableConfirming = true;
self.$showLoading(() => self.enableConfirming);
self.$services.confirmEnable2FA({
secret: self.new2FASecret,
passcode: self.currentPasscodeForEnable
}).then(response => {
app.preloader.hide();
self.enableConfirming = false;
self.$hideLoading();
const data = response.data;
if (!data || !data.success || !data.result || !data.result.token) {
@@ -236,7 +244,8 @@ export default {
self.showBackupCodeSheet = true;
}
}).catch(error => {
app.preloader.hide();
self.enableConfirming = false;
self.$hideLoading();
if (error.response && error.response.data && error.response.data.errorMessage) {
self.$alert({error: error.response.data});
@@ -247,7 +256,6 @@ export default {
},
disable(password) {
const self = this;
const app = self.$f7;
if (!password) {
self.currentPasswordForDisable = '';
@@ -255,12 +263,14 @@ export default {
return;
}
app.preloader.show();
self.disabling = true;
self.$showLoading(() => self.disabling);
self.$services.disable2FA({
password: password
}).then(response => {
app.preloader.hide();
self.disabling = false;
self.$hideLoading();
const data = response.data;
if (!data || !data.success || !data.result) {
@@ -272,7 +282,8 @@ export default {
self.showInputPasswordSheetForDisable = false;
self.$toast('Two factor authentication has been disabled');
}).catch(error => {
app.preloader.hide();
self.disabling = false;
self.$hideLoading();
if (error.response && error.response.data && error.response.data.errorMessage) {
self.$alert({error: error.response.data});
@@ -283,7 +294,6 @@ export default {
},
regenerateBackupCode(password) {
const self = this;
const app = self.$f7;
if (!password) {
self.currentPasswordForRegenerate = '';
@@ -291,12 +301,14 @@ export default {
return;
}
app.preloader.show();
self.regenerating = true;
self.$showLoading(() => self.regenerating);
self.$services.regenerate2FARecoveryCode({
password: password
}).then(response => {
app.preloader.hide();
self.regenerating = false;
self.$hideLoading();
const data = response.data;
if (!data || !data.success || !data.result || !data.result.recoveryCodes || !data.result.recoveryCodes.length) {
@@ -309,7 +321,8 @@ export default {
self.currentBackupCode = data.result.recoveryCodes.join('\n');
self.showBackupCodeSheet = true;
}).catch(error => {
app.preloader.hide();
self.regenerating = false;
self.$hideLoading();
if (error.response && error.response.data && error.response.data.errorMessage) {
self.$alert({error: error.response.data});
src/views/mobile/users/UserProfile.vue
+12 -18
View File
@@ -41,7 +41,7 @@
<f7-list-item class="lab-list-item-error-info" v-if="inputIsInvalid" :footer="$t(inputInvalidProblemMessage)"></f7-list-item>
</f7-list>
<f7-button large fill :class="{ 'disabled': inputIsNotChanged }" :text="$t('Update')" @click="update"></f7-button>
<f7-button large fill :class="{ 'disabled': inputIsNotChanged || updating }" :text="$t('Update')" @click="update"></f7-button>
<f7-sheet
style="height:auto; --f7-sheet-bg-color: #fff;"
@@ -63,7 +63,7 @@
@input="currentPassword = $event.target.value"
></f7-list-input>
</f7-list>
<f7-button large fill :class="{ 'disabled': !currentPassword }" :text="$t('Continue')" @click="update"></f7-button>
<f7-button large fill :class="{ 'disabled': !currentPassword || updating }" :text="$t('Continue')" @click="update"></f7-button>
</div>
</div>
</f7-sheet>
@@ -81,6 +81,7 @@ export default {
email: '',
oldNickname: '',
nickname: '',
updating: false,
showInputPasswordSheet: false
};
},
@@ -114,13 +115,12 @@ export default {
},
created() {
const self = this;
const app = self.$f7;
const router = self.$f7router;
app.preloader.show();
self.$showLoading();
self.$services.getProfile().then(response => {
app.preloader.hide();
self.$hideLoading();
const data = response.data;
if (!data || !data.success || !data.result) {
@@ -136,7 +136,7 @@ export default {
self.email = self.oldEmail
self.nickname = self.oldNickname;
}).catch(error => {
app.preloader.hide();
self.$hideLoading();
if (error.response && error.response.data && error.response.data.errorMessage) {
self.$alert({ error: error.response.data }, () => {
@@ -152,7 +152,6 @@ export default {
methods: {
update() {
const self = this;
const app = self.$f7;
const router = self.$f7router;
self.showInputPasswordSheet = false;
@@ -169,13 +168,8 @@ export default {
return;
}
let hasResponse = false;
setTimeout(() => {
if (!hasResponse) {
app.preloader.show();
}
}, 200);
self.updating = true;
self.$showLoading(() => self.updating);
self.$services.updateProfile({
password: self.password,
@@ -183,8 +177,8 @@ export default {
email: self.email,
nickname: self.nickname
}).then(response => {
hasResponse = true;
app.preloader.hide();
self.updating = false;
self.$hideLoading();
self.currentPassword = '';
const data = response.data;
@@ -205,8 +199,8 @@ export default {
self.$toast('Your profile has been successfully updated');
router.back('/settings', { force: true });
}).catch(error => {
hasResponse = true;
app.preloader.hide();
self.updating = false;
self.$hideLoading();
self.currentPassword = '';
if (error.response && error.response.data && error.response.data.errorMessage) {