forked from AkkomaGang/akkoma-fe
Merge branch 'feature/configurable-default-path' into 'develop'
Feature/configurable default path See merge request pleroma/pleroma-fe!173
This commit is contained in:
commit
222b0aa982
2 changed files with 38 additions and 36 deletions
33
src/main.js
33
src/main.js
|
@ -63,8 +63,24 @@ const store = new Vuex.Store({
|
||||||
strict: process.env.NODE_ENV !== 'production'
|
strict: process.env.NODE_ENV !== 'production'
|
||||||
})
|
})
|
||||||
|
|
||||||
|
const i18n = new VueI18n({
|
||||||
|
locale: currentLocale,
|
||||||
|
fallbackLocale: 'en',
|
||||||
|
messages
|
||||||
|
})
|
||||||
|
|
||||||
|
window.fetch('/static/config.json')
|
||||||
|
.then((res) => res.json())
|
||||||
|
.then((data) => {
|
||||||
|
const {name, theme, background, logo, registrationOpen} = data
|
||||||
|
store.dispatch('setOption', { name: 'name', value: name })
|
||||||
|
store.dispatch('setOption', { name: 'theme', value: theme })
|
||||||
|
store.dispatch('setOption', { name: 'background', value: background })
|
||||||
|
store.dispatch('setOption', { name: 'logo', value: logo })
|
||||||
|
store.dispatch('setOption', { name: 'registrationOpen', value: registrationOpen })
|
||||||
|
|
||||||
const routes = [
|
const routes = [
|
||||||
{ name: 'root', path: '/', redirect: '/main/all' },
|
{ name: 'root', path: '/', redirect: data['defaultPath'] || '/main/all' },
|
||||||
{ path: '/main/all', component: PublicAndExternalTimeline },
|
{ path: '/main/all', component: PublicAndExternalTimeline },
|
||||||
{ path: '/main/public', component: PublicTimeline },
|
{ path: '/main/public', component: PublicTimeline },
|
||||||
{ path: '/main/friends', component: FriendsTimeline },
|
{ path: '/main/friends', component: FriendsTimeline },
|
||||||
|
@ -88,12 +104,6 @@ const router = new VueRouter({
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|
||||||
const i18n = new VueI18n({
|
|
||||||
locale: currentLocale,
|
|
||||||
fallbackLocale: 'en',
|
|
||||||
messages
|
|
||||||
})
|
|
||||||
|
|
||||||
/* eslint-disable no-new */
|
/* eslint-disable no-new */
|
||||||
new Vue({
|
new Vue({
|
||||||
router,
|
router,
|
||||||
|
@ -102,15 +112,6 @@ new Vue({
|
||||||
el: '#app',
|
el: '#app',
|
||||||
render: h => h(App)
|
render: h => h(App)
|
||||||
})
|
})
|
||||||
|
|
||||||
window.fetch('/static/config.json')
|
|
||||||
.then((res) => res.json())
|
|
||||||
.then(({name, theme, background, logo, registrationOpen}) => {
|
|
||||||
store.dispatch('setOption', { name: 'name', value: name })
|
|
||||||
store.dispatch('setOption', { name: 'theme', value: theme })
|
|
||||||
store.dispatch('setOption', { name: 'background', value: background })
|
|
||||||
store.dispatch('setOption', { name: 'logo', value: logo })
|
|
||||||
store.dispatch('setOption', { name: 'registrationOpen', value: registrationOpen })
|
|
||||||
})
|
})
|
||||||
|
|
||||||
window.fetch('/static/terms-of-service.html')
|
window.fetch('/static/terms-of-service.html')
|
||||||
|
|
|
@ -3,5 +3,6 @@
|
||||||
"theme": "pleroma-dark",
|
"theme": "pleroma-dark",
|
||||||
"background": "/static/bg.jpg",
|
"background": "/static/bg.jpg",
|
||||||
"logo": "/static/logo.png",
|
"logo": "/static/logo.png",
|
||||||
"registrationOpen": false
|
"registrationOpen": false,
|
||||||
|
"defaultPath": "/main/all"
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue