diff --git a/src/views/emojiPacks/components/NewEmojiUploader.vue b/src/views/emojiPacks/components/NewEmojiUploader.vue index 8bb431a2..f364b49e 100644 --- a/src/views/emojiPacks/components/NewEmojiUploader.vue +++ b/src/views/emojiPacks/components/NewEmojiUploader.vue @@ -44,6 +44,9 @@ export default { isDesktop() { return this.$store.state.app.device === 'desktop' }, + isMobile() { + return this.$store.state.app.device === 'mobile' + }, shortcodePresent() { return this.shortcode.trim() === '' } diff --git a/src/views/emojiPacks/components/SingleEmojiEditor.vue b/src/views/emojiPacks/components/SingleEmojiEditor.vue index d66bd48d..cd0eeb7f 100644 --- a/src/views/emojiPacks/components/SingleEmojiEditor.vue +++ b/src/views/emojiPacks/components/SingleEmojiEditor.vue @@ -95,6 +95,9 @@ export default { isDesktop() { return this.$store.state.app.device === 'desktop' }, + isMobile() { + return this.$store.state.app.device === 'mobile' + }, localPacks() { return this.$store.state.emojiPacks.localPacks }, diff --git a/src/views/settings/components/Frontend.vue b/src/views/settings/components/Frontend.vue index 48493e01..188a74ca 100644 --- a/src/views/settings/components/Frontend.vue +++ b/src/views/settings/components/Frontend.vue @@ -3,6 +3,10 @@ + + + + {{ $t('settings.assets') }} @@ -70,12 +74,6 @@ export default { frontendData() { return _.get(this.settings.settings, [':pleroma', ':frontend_configurations']) || {} }, - markup() { - return this.settings.description.find(setting => setting.key === ':markup') - }, - markupData() { - return _.get(this.settings.settings, [':pleroma', ':markup']) || {} - }, isMobile() { return this.$store.state.app.device === 'mobile' }, @@ -93,6 +91,18 @@ export default { }, loading() { return this.settings.loading + }, + markup() { + return this.settings.description.find(setting => setting.key === ':markup') + }, + markupData() { + return _.get(this.settings.settings, [':pleroma', ':markup']) || {} + }, + staticFe() { + return this.settings.description.find(setting => setting.key === ':static_fe') + }, + staticFeData() { + return _.get(this.settings.settings, [':pleroma', ':static_fe']) || {} } }, methods: { diff --git a/src/views/settings/components/Http.vue b/src/views/settings/components/Http.vue index a12a1efa..a94000b2 100644 --- a/src/views/settings/components/Http.vue +++ b/src/views/settings/components/Http.vue @@ -3,10 +3,6 @@ - - - - {{ $t('settings.corsPlug') }} @@ -86,12 +82,6 @@ export default { loading() { return this.settings.loading }, - teslaAdapter() { - return this.settings.description.find(setting => setting.group === ':tesla') - }, - teslaAdapterData() { - return _.get(this.settings.settings, [':tesla']) || {} - }, webCacheTtl() { return this.settings.description.find(setting => setting.key === ':web_cache_ttl') }, diff --git a/src/views/settings/components/Inputs.vue b/src/views/settings/components/Inputs.vue index 9b6da5e9..581324d9 100644 --- a/src/views/settings/components/Inputs.vue +++ b/src/views/settings/components/Inputs.vue @@ -187,7 +187,7 @@ export default { return Array.isArray(this.data[':icons']) ? this.data[':icons'] : [] }, inputValue() { - if ([':esshd', ':cors_plug', ':quack', ':http_signatures', ':tesla'].includes(this.settingGroup.group) && + if ([':esshd', ':cors_plug', ':quack', ':http_signatures', ':tesla', ':swoosh'].includes(this.settingGroup.group) && this.data[this.setting.key]) { return this.setting.type === 'atom' && this.data[this.setting.key].value[0] === ':' ? this.data[this.setting.key].value.substr(1) diff --git a/src/views/settings/components/Instance.vue b/src/views/settings/components/Instance.vue index eb8eb34b..f87c7736 100644 --- a/src/views/settings/components/Instance.vue +++ b/src/views/settings/components/Instance.vue @@ -23,6 +23,14 @@ + + + + + + + +
Submit
@@ -50,6 +58,12 @@ export default { adminTokenData() { return _.get(this.settings.settings, [':pleroma', ':admin_token']) || {} }, + feed() { + return this.settings.description.find(setting => setting.key === ':feed') + }, + feedData() { + return _.get(this.settings.settings, [':pleroma', ':feed']) || {} + }, fetchInitialPosts() { return this.settings.description.find(setting => setting.key === ':fetch_initial_posts') }, @@ -97,6 +111,12 @@ export default { }, scheduledActivityData() { return _.get(this.settings.settings, [':pleroma', 'Pleroma.ScheduledActivity']) || {} + }, + uriSchemes() { + return this.settings.description.find(setting => setting.key === ':uri_schemes') + }, + uriSchemesData() { + return _.get(this.settings.settings, [':pleroma', ':uri_schemes']) || {} } }, methods: { diff --git a/src/views/settings/components/MRF.vue b/src/views/settings/components/MRF.vue index a5e05eb1..7528c8b2 100644 --- a/src/views/settings/components/MRF.vue +++ b/src/views/settings/components/MRF.vue @@ -29,6 +29,14 @@ + + + + + + + +
Submit
@@ -66,6 +74,12 @@ export default { loading() { return this.settings.loading }, + modules() { + return this.settings.description.find(setting => setting.key === ':modules') + }, + modulesData() { + return _.get(this.settings.settings, [':pleroma', ':modules']) || {} + }, mrfSimple() { return this.settings.description.find(setting => setting.key === ':mrf_simple') }, @@ -90,6 +104,12 @@ export default { mrfKeywordData() { return _.get(this.settings.settings, [':pleroma', ':mrf_keyword']) || {} }, + mrfObjectAge() { + return this.settings.description.find(setting => setting.key === ':mrf_object_age') + }, + mrfObjectAgeData() { + return _.get(this.settings.settings, [':pleroma', ':mrf_object_age']) || {} + }, mrfSubchain() { return this.settings.description.find(setting => setting.key === ':mrf_subchain') }, diff --git a/src/views/settings/components/Mailer.vue b/src/views/settings/components/Mailer.vue index 2eb4db08..1624eff2 100644 --- a/src/views/settings/components/Mailer.vue +++ b/src/views/settings/components/Mailer.vue @@ -4,6 +4,10 @@
+ + + + @@ -61,6 +65,12 @@ export default { mailerData() { return _.get(this.settings.settings, [':pleroma', 'Pleroma.Emails.Mailer']) || {} }, + swoosh() { + return this.settings.description.find(setting => setting.group === ':swoosh') + }, + swooshData() { + return _.get(this.settings.settings, [':swoosh']) || {} + }, userEmail() { return this.settings.description.find(setting => setting.key === 'Pleroma.Emails.UserEmail') },