summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorsyuilo <syuilotan@yahoo.co.jp>2018-11-05 10:32:45 +0900
committersyuilo <syuilotan@yahoo.co.jp>2018-11-05 10:32:45 +0900
commit42ac7b954da8216ca572adb82d5a354148769422 (patch)
treeec26352938da1a27e0187d5d057af4f977e5db39 /src
parent[Client] Fix error (diff)
downloadmisskey-42ac7b954da8216ca572adb82d5a354148769422.tar.gz
misskey-42ac7b954da8216ca572adb82d5a354148769422.tar.bz2
misskey-42ac7b954da8216ca572adb82d5a354148769422.zip
Improve admin panel usability
Diffstat (limited to 'src')
-rw-r--r--src/client/app/admin/views/announcements.vue10
-rw-r--r--src/client/app/admin/views/emoji.vue49
-rw-r--r--src/client/app/admin/views/instance.vue15
3 files changed, 58 insertions, 16 deletions
diff --git a/src/client/app/admin/views/announcements.vue b/src/client/app/admin/views/announcements.vue
index 0e983c5a97..926426844d 100644
--- a/src/client/app/admin/views/announcements.vue
+++ b/src/client/app/admin/views/announcements.vue
@@ -54,9 +54,15 @@ export default Vue.extend({
(this as any).api('admin/update-meta', {
broadcasts: this.announcements
}).then(() => {
- //(this as any).os.apis.dialog({ text: `Saved` });
+ this.$swal({
+ type: 'success',
+ text: '%i18n:@saved%'
+ });
}).catch(e => {
- //(this as any).os.apis.dialog({ text: `Failed ${e}` });
+ this.$swal({
+ type: 'error',
+ text: e
+ });
});
}
}
diff --git a/src/client/app/admin/views/emoji.vue b/src/client/app/admin/views/emoji.vue
index 7bcd905314..249028b22e 100644
--- a/src/client/app/admin/views/emoji.vue
+++ b/src/client/app/admin/views/emoji.vue
@@ -69,15 +69,22 @@ export default Vue.extend({
url: this.url,
aliases: this.aliases.split(' ')
}).then(() => {
- //(this as any).os.apis.dialog({ text: `Added` });
+ this.$swal({
+ type: 'success',
+ text: '%i18n:@add-emoji.added%'
+ });
this.fetchEmojis();
}).catch(e => {
- //(this as any).os.apis.dialog({ text: `Failed ${e}` });
+ this.$swal({
+ type: 'error',
+ text: e
+ });
});
},
fetchEmojis() {
(this as any).api('admin/emoji/list').then(emojis => {
+ emojis.reverse();
emojis.forEach(e => e.aliases = (e.aliases || []).join(' '));
this.emojis = emojis;
});
@@ -90,20 +97,40 @@ export default Vue.extend({
url: emoji.url,
aliases: emoji.aliases.split(' ')
}).then(() => {
- //(this as any).os.apis.dialog({ text: `Updated` });
+ this.$swal({
+ type: 'success',
+ text: '%i18n:@updated%'
+ });
}).catch(e => {
- //(this as any).os.apis.dialog({ text: `Failed ${e}` });
+ this.$swal({
+ type: 'error',
+ text: e
+ });
});
},
removeEmoji(emoji) {
- (this as any).api('admin/emoji/remove', {
- id: emoji.id
- }).then(() => {
- //(this as any).os.apis.dialog({ text: `Removed` });
- this.fetchEmojis();
- }).catch(e => {
- //(this as any).os.apis.dialog({ text: `Failed ${e}` });
+ this.$swal({
+ type: 'warning',
+ text: '%i18n:@remove-emoji.are-you-sure%'.replace('$1', emoji.name),
+ showCancelButton: true
+ }).then(res => {
+ if (!res.value) return;
+
+ (this as any).api('admin/emoji/remove', {
+ id: emoji.id
+ }).then(() => {
+ this.$swal({
+ type: 'success',
+ text: '%i18n:@remove-emoji.removed%'
+ });
+ this.fetchEmojis();
+ }).catch(e => {
+ this.$swal({
+ type: 'error',
+ text: e
+ });
+ });
});
}
}
diff --git a/src/client/app/admin/views/instance.vue b/src/client/app/admin/views/instance.vue
index e712c5c80d..85ef0a60c4 100644
--- a/src/client/app/admin/views/instance.vue
+++ b/src/client/app/admin/views/instance.vue
@@ -56,7 +56,10 @@ export default Vue.extend({
(this as any).api('admin/invite').then(x => {
this.inviteCode = x.code;
}).catch(e => {
- //(this as any).os.apis.dialog({ text: `Failed ${e}` });
+ this.$swal({
+ type: 'error',
+ text: e
+ });
});
},
@@ -68,9 +71,15 @@ export default Vue.extend({
name: this.name,
description: this.description
}).then(() => {
- //(this as any).os.apis.dialog({ text: `Saved` });
+ this.$swal({
+ type: 'success',
+ text: '%i18n:@saved%'
+ });
}).catch(e => {
- //(this as any).os.apis.dialog({ text: `Failed ${e}` });
+ this.$swal({
+ type: 'error',
+ text: e
+ });
});
}
}