Troplo/pleroma-fe
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'serverside-frontend-configuration-2' into 'develop'

Browse source 
serverside-frontend-configuration-2

See merge request pleroma/pleroma-fe!312
This commit is contained in:
kaniini 2018-08-26 06:20:19 +00:00
commit bc4f09b775
1 changed files with 68 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/main.js
View file

@ -95,12 +95,27 @@ window.fetch('/api/statusnet/config.json')
store.dispatch('setOption', { name: 'registrationOpen', value: (registrationClosed === '0') }) store.dispatch('setOption', { name: 'registrationOpen', value: (registrationClosed === '0') })
store.dispatch('setOption', { name: 'textlimit', value: parseInt(textlimit) }) store.dispatch('setOption', { name: 'textlimit', value: parseInt(textlimit) })
store.dispatch('setOption', { name: 'server', value: server }) store.dispatch('setOption', { name: 'server', value: server })
})
window.fetch('/static/config.json') var apiConfig = data.site.pleromafe
window.fetch('/static/config.json')
.then((res) => res.json()) .then((res) => res.json())
.then((data) => { .then((data) => {
const {theme, background, logo, showWhoToFollowPanel, whoToFollowProvider, whoToFollowLink, showInstanceSpecificPanel, scopeOptionsEnabled, collapseMessageWithSubject} = data var staticConfig = data
var theme = (apiConfig.theme || staticConfig.theme)
var background = (apiConfig.background || staticConfig.background)
var logo = (apiConfig.logo || staticConfig.logo)
var redirectRootNoLogin = (apiConfig.redirectRootNoLogin || staticConfig.redirectRootNoLogin)
var redirectRootLogin = (apiConfig.redirectRootLogin || staticConfig.redirectRootLogin)
var chatDisabled = (apiConfig.chatDisabled || staticConfig.chatDisabled)
var showWhoToFollowPanel = (apiConfig.showWhoToFollowPanel || staticConfig.showWhoToFollowPanel)
var whoToFollowProvider = (apiConfig.whoToFollowProvider || staticConfig.whoToFollowProvider)
var whoToFollowLink = (apiConfig.whoToFollowLink || staticConfig.whoToFollowLink)
var showInstanceSpecificPanel = (apiConfig.showInstanceSpecificPanel || staticConfig.showInstanceSpecificPanel)
var scopeOptionsEnabled = (apiConfig.scopeOptionsEnabled || staticConfig.scopeOptionsEnabled)
var collapseMessageWithSubject = (apiConfig.collapseMessageWithSubject || staticConfig.collapseMessageWithSubject)
store.dispatch('setOption', { name: 'theme', value: theme }) store.dispatch('setOption', { name: 'theme', value: theme })
store.dispatch('setOption', { name: 'background', value: background }) store.dispatch('setOption', { name: 'background', value: background })
store.dispatch('setOption', { name: 'logo', value: logo }) store.dispatch('setOption', { name: 'logo', value: logo })
@ -110,7 +125,7 @@ window.fetch('/static/config.json')
store.dispatch('setOption', { name: 'showInstanceSpecificPanel', value: showInstanceSpecificPanel }) store.dispatch('setOption', { name: 'showInstanceSpecificPanel', value: showInstanceSpecificPanel })
store.dispatch('setOption', { name: 'scopeOptionsEnabled', value: scopeOptionsEnabled }) store.dispatch('setOption', { name: 'scopeOptionsEnabled', value: scopeOptionsEnabled })
store.dispatch('setOption', { name: 'collapseMessageWithSubject', value: collapseMessageWithSubject }) store.dispatch('setOption', { name: 'collapseMessageWithSubject', value: collapseMessageWithSubject })
if (data['chatDisabled']) { if (chatDisabled) {
store.dispatch('disableChat') store.dispatch('disableChat')
} }
@ -118,8 +133,6 @@ window.fetch('/static/config.json')
{ name: 'root', { name: 'root',
path: '/', path: '/',
redirect: to => { redirect: to => {
var redirectRootLogin = data['redirectRootLogin']
var redirectRootNoLogin = data['redirectRootNoLogin']
return (store.state.users.currentUser ? redirectRootLogin : redirectRootNoLogin) || '/main/all' return (store.state.users.currentUser ? redirectRootLogin : redirectRootNoLogin) || '/main/all'
}}, }},
{ path: '/main/all', component: PublicAndExternalTimeline }, { path: '/main/all', component: PublicAndExternalTimeline },
@ -156,6 +169,7 @@ window.fetch('/static/config.json')
render: h => h(App) render: h => h(App)
}) })
}) })
})
window.fetch('/static/terms-of-service.html') window.fetch('/static/terms-of-service.html')
.then((res) => res.text()) .then((res) => res.text())