Skip to content
Snippets Groups Projects
Commit 9508c2c1 authored by Angelina Filippova's avatar Angelina Filippova
Browse files

Add new groups of settings: mrfObjectAge, modules, swoosh, uriSchemes, feed, staticFe

parent dbc3bc11
No related branches found
No related tags found
No related merge requests found
Pipeline #23120 passed
...@@ -3,6 +3,10 @@ ...@@ -3,6 +3,10 @@
<el-form ref="frontendData" :model="frontendData" :label-width="labelWidth"> <el-form ref="frontendData" :model="frontendData" :label-width="labelWidth">
<setting :setting-group="frontend" :data="frontendData"/> <setting :setting-group="frontend" :data="frontendData"/>
</el-form> </el-form>
<el-form ref="staticFeData" :model="staticFeData" :label-width="labelWidth">
<setting :setting-group="staticFe" :data="staticFeData"/>
</el-form>
<el-divider class="divider thick-line"/>
<el-form ref="assetsData" :model="assetsData" :label-width="labelWidth"> <el-form ref="assetsData" :model="assetsData" :label-width="labelWidth">
<el-form-item class="grouped-settings-header"> <el-form-item class="grouped-settings-header">
<span class="label-font">{{ $t('settings.assets') }}</span> <span class="label-font">{{ $t('settings.assets') }}</span>
...@@ -70,12 +74,6 @@ export default { ...@@ -70,12 +74,6 @@ export default {
frontendData() { frontendData() {
return _.get(this.settings.settings, [':pleroma', ':frontend_configurations']) || {} 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() { isMobile() {
return this.$store.state.app.device === 'mobile' return this.$store.state.app.device === 'mobile'
}, },
...@@ -93,6 +91,18 @@ export default { ...@@ -93,6 +91,18 @@ export default {
}, },
loading() { loading() {
return this.settings.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: { methods: {
......
...@@ -187,7 +187,7 @@ export default { ...@@ -187,7 +187,7 @@ export default {
return Array.isArray(this.data[':icons']) ? this.data[':icons'] : [] return Array.isArray(this.data[':icons']) ? this.data[':icons'] : []
}, },
inputValue() { 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]) { this.data[this.setting.key]) {
return this.setting.type === 'atom' && this.data[this.setting.key].value[0] === ':' return this.setting.type === 'atom' && this.data[this.setting.key].value[0] === ':'
? this.data[this.setting.key].value.substr(1) ? this.data[this.setting.key].value.substr(1)
......
...@@ -23,6 +23,14 @@ ...@@ -23,6 +23,14 @@
<el-form ref="pleromaUser" :model="pleromaUserData" :label-width="labelWidth"> <el-form ref="pleromaUser" :model="pleromaUserData" :label-width="labelWidth">
<setting :setting-group="pleromaUser" :data="pleromaUserData"/> <setting :setting-group="pleromaUser" :data="pleromaUserData"/>
</el-form> </el-form>
<el-divider class="divider thick-line"/>
<el-form ref="uriSchemes" :model="uriSchemesData" :label-width="labelWidth">
<setting :setting-group="uriSchemes" :data="uriSchemesData"/>
</el-form>
<el-divider class="divider thick-line"/>
<el-form ref="feed" :model="feedData" :label-width="labelWidth">
<setting :setting-group="feed" :data="feedData"/>
</el-form>
<div class="submit-button-container"> <div class="submit-button-container">
<el-button class="submit-button" type="primary" @click="onSubmit">Submit</el-button> <el-button class="submit-button" type="primary" @click="onSubmit">Submit</el-button>
</div> </div>
...@@ -50,6 +58,12 @@ export default { ...@@ -50,6 +58,12 @@ export default {
adminTokenData() { adminTokenData() {
return _.get(this.settings.settings, [':pleroma', ':admin_token']) || {} 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() { fetchInitialPosts() {
return this.settings.description.find(setting => setting.key === ':fetch_initial_posts') return this.settings.description.find(setting => setting.key === ':fetch_initial_posts')
}, },
...@@ -97,6 +111,12 @@ export default { ...@@ -97,6 +111,12 @@ export default {
}, },
scheduledActivityData() { scheduledActivityData() {
return _.get(this.settings.settings, [':pleroma', 'Pleroma.ScheduledActivity']) || {} 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: { methods: {
......
...@@ -29,6 +29,14 @@ ...@@ -29,6 +29,14 @@
<el-form ref="mrfVocabulary" :model="mrfVocabularyData" :label-width="labelWidth"> <el-form ref="mrfVocabulary" :model="mrfVocabularyData" :label-width="labelWidth">
<setting :setting-group="mrfVocabulary" :data="mrfVocabularyData"/> <setting :setting-group="mrfVocabulary" :data="mrfVocabularyData"/>
</el-form> </el-form>
<el-divider class="divider thick-line"/>
<el-form ref="mrfObjectAge" :model="mrfObjectAgeData" :label-width="labelWidth">
<setting :setting-group="mrfObjectAge" :data="mrfObjectAgeData"/>
</el-form>
<el-divider class="divider thick-line"/>
<el-form ref="modules" :model="modulesData" :label-width="labelWidth">
<setting :setting-group="modules" :data="modulesData"/>
</el-form>
<div class="submit-button-container"> <div class="submit-button-container">
<el-button class="submit-button" type="primary" @click="onSubmit">Submit</el-button> <el-button class="submit-button" type="primary" @click="onSubmit">Submit</el-button>
</div> </div>
...@@ -66,6 +74,12 @@ export default { ...@@ -66,6 +74,12 @@ export default {
loading() { loading() {
return this.settings.loading return this.settings.loading
}, },
modules() {
return this.settings.description.find(setting => setting.key === ':modules')
},
modulesData() {
return _.get(this.settings.settings, [':pleroma', ':modules']) || {}
},
mrfSimple() { mrfSimple() {
return this.settings.description.find(setting => setting.key === ':mrf_simple') return this.settings.description.find(setting => setting.key === ':mrf_simple')
}, },
...@@ -90,6 +104,12 @@ export default { ...@@ -90,6 +104,12 @@ export default {
mrfKeywordData() { mrfKeywordData() {
return _.get(this.settings.settings, [':pleroma', ':mrf_keyword']) || {} 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() { mrfSubchain() {
return this.settings.description.find(setting => setting.key === ':mrf_subchain') return this.settings.description.find(setting => setting.key === ':mrf_subchain')
}, },
......
...@@ -4,6 +4,10 @@ ...@@ -4,6 +4,10 @@
<setting :setting-group="mailer" :data="mailerData"/> <setting :setting-group="mailer" :data="mailerData"/>
</el-form> </el-form>
<el-divider class="divider thick-line"/> <el-divider class="divider thick-line"/>
<el-form ref="swoosh" :model="swooshData" :label-width="labelWidth">
<setting :setting-group="swoosh" :data="swooshData"/>
</el-form>
<el-divider class="divider thick-line"/>
<el-form ref="emailNotifications" :model="emailNotificationsData" :label-width="labelWidth"> <el-form ref="emailNotifications" :model="emailNotificationsData" :label-width="labelWidth">
<setting :setting-group="emailNotifications" :data="emailNotificationsData"/> <setting :setting-group="emailNotifications" :data="emailNotificationsData"/>
</el-form> </el-form>
...@@ -61,6 +65,12 @@ export default { ...@@ -61,6 +65,12 @@ export default {
mailerData() { mailerData() {
return _.get(this.settings.settings, [':pleroma', 'Pleroma.Emails.Mailer']) || {} 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() { userEmail() {
return this.settings.description.find(setting => setting.key === 'Pleroma.Emails.UserEmail') return this.settings.description.find(setting => setting.key === 'Pleroma.Emails.UserEmail')
}, },
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment