From 6319a93d005ef2175576095ed1c6f79aaa191b39 Mon Sep 17 00:00:00 2001 From: ThatOneCalculator Date: Mon, 14 Nov 2022 17:21:48 -0800 Subject: [PATCH] admin page fixes --- package.json | 2 +- .../client/src/pages/admin/email-settings.vue | 1 + packages/client/src/pages/admin/emojis.vue | 42 ++++++++++--------- 3 files changed, 24 insertions(+), 21 deletions(-) diff --git a/package.json b/package.json index ffa05a0a1f..4c111f54fd 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "calckey", - "version": "12.119.0-calc.13-rc.2", + "version": "12.119.0-calc.13-rc.3", "codename": "aqua", "repository": { "type": "git", diff --git a/packages/client/src/pages/admin/email-settings.vue b/packages/client/src/pages/admin/email-settings.vue index a38fa7ff92..96667effb1 100644 --- a/packages/client/src/pages/admin/email-settings.vue +++ b/packages/client/src/pages/admin/email-settings.vue @@ -107,6 +107,7 @@ function save() { const headerActions = $computed(() => [{ asFullButton: true, + icon: 'ph-test-tube-bold ph-lg', text: i18n.ts.testEmail, handler: testEmail, }, { diff --git a/packages/client/src/pages/admin/emojis.vue b/packages/client/src/pages/admin/emojis.vue index fa50c3e3b9..f02a8b9b79 100644 --- a/packages/client/src/pages/admin/emojis.vue +++ b/packages/client/src/pages/admin/emojis.vue @@ -175,17 +175,17 @@ const menu = (ev: MouseEvent) => { action: async () => { os.api('export-custom-emojis', { }) - .then(() => { - os.alert({ - type: 'info', - text: i18n.ts.exportRequested, + .then(() => { + os.alert({ + type: 'info', + text: i18n.ts.exportRequested, + }); + }).catch((err) => { + os.alert({ + type: 'error', + text: err.message, + }); }); - }).catch((err) => { - os.alert({ - type: 'error', - text: err.message, - }); - }); }, }, { icon: 'ph-upload-simple-bold ph-lg', @@ -195,17 +195,17 @@ const menu = (ev: MouseEvent) => { os.api('admin/emoji/import-zip', { fileId: file.id, }) - .then(() => { - os.alert({ - type: 'info', - text: i18n.ts.importRequested, + .then(() => { + os.alert({ + type: 'info', + text: i18n.ts.importRequested, + }); + }).catch((err) => { + os.alert({ + type: 'error', + text: err.message, + }); }); - }).catch((err) => { - os.alert({ - type: 'error', - text: err.message, - }); - }); }, }], ev.currentTarget ?? ev.target); }; @@ -282,9 +282,11 @@ const headerActions = $computed(() => [{ const headerTabs = $computed(() => [{ key: 'local', + icon: 'ph-hand-fist-bold ph-lg', title: i18n.ts.local, }, { key: 'remote', + icon: 'ph-planet-bold ph-lg', title: i18n.ts.remote, }]);