Remove emoji packs from router and add it to Settings tab

This commit is contained in:
Angelina Filippova 2019-10-05 02:15:26 +03:00
parent d2d9866191
commit 4e2b24ea4b
3 changed files with 7 additions and 17 deletions

View file

@ -312,7 +312,8 @@ export default {
rateLimiters: 'Rate limiters', rateLimiters: 'Rate limiters',
database: 'Database', database: 'Database',
other: 'Other', other: 'Other',
success: 'Settings changed successfully!' success: 'Settings changed successfully!',
emojiPacks: 'Emoji packs'
}, },
invites: { invites: {
inviteTokens: 'Invite tokens', inviteTokens: 'Invite tokens',

View file

@ -63,20 +63,6 @@ const moderationLog = {
] ]
} }
const emojiPacksDisabled = disabledFeatures.includes('emoji-packs')
const emojiPacks = {
path: '/emoji-packs',
component: Layout,
children: [
{
path: 'index',
component: () => import('@/views/emoji-packs/index'),
name: 'Emoji packs',
meta: { title: 'emoji-packs', icon: 'settings', noCache: true }
}
]
}
export const constantRouterMap = [ export const constantRouterMap = [
{ {
path: '/redirect', path: '/redirect',
@ -144,7 +130,6 @@ export const asyncRouterMap = [
...(invitesDisabled ? [] : [invites]), ...(invitesDisabled ? [] : [invites]),
...(moderationLogDisabled ? [] : [moderationLog]), ...(moderationLogDisabled ? [] : [moderationLog]),
...(settingsDisabled ? [] : [settings]), ...(settingsDisabled ? [] : [settings]),
...(emojiPacksDisabled ? [] : [emojiPacks]),
{ {
path: '/users/:id', path: '/users/:id',
component: Layout, component: Layout,

View file

@ -23,6 +23,9 @@
<el-tab-pane :label="$t('settings.endpoint')"> <el-tab-pane :label="$t('settings.endpoint')">
<endpoint/> <endpoint/>
</el-tab-pane> </el-tab-pane>
<el-tab-pane :label="$t('settings.emojiPacks')">
<emoji-packs/>
</el-tab-pane>
<el-tab-pane :label="$t('settings.frontend')"> <el-tab-pane :label="$t('settings.frontend')">
<frontend/> <frontend/>
</el-tab-pane> </el-tab-pane>
@ -71,9 +74,10 @@
<script> <script>
import { ActivityPub, Authentication, AutoLinker, Captcha, Database, Endpoint, Esshd, Frontend, Gopher, Http, Instance, JobQueue, Logger, Mailer, MediaProxy, Metadata, Mrf, Other, RateLimiters, Upload, WebPush } from './components' import { ActivityPub, Authentication, AutoLinker, Captcha, Database, Endpoint, Esshd, Frontend, Gopher, Http, Instance, JobQueue, Logger, Mailer, MediaProxy, Metadata, Mrf, Other, RateLimiters, Upload, WebPush } from './components'
import EmojiPacks from '../emojiPacks/index'
export default { export default {
components: { ActivityPub, Authentication, AutoLinker, Captcha, Database, Endpoint, Esshd, Frontend, Gopher, Http, Instance, JobQueue, Logger, Mailer, MediaProxy, Metadata, Mrf, Other, RateLimiters, Upload, WebPush }, components: { ActivityPub, Authentication, AutoLinker, Captcha, Database, Endpoint, EmojiPacks, Esshd, Frontend, Gopher, Http, Instance, JobQueue, Logger, Mailer, MediaProxy, Metadata, Mrf, Other, RateLimiters, Upload, WebPush },
computed: { computed: {
isMobile() { isMobile() {
return this.$store.state.app.device === 'mobile' return this.$store.state.app.device === 'mobile'