AkkomaGang/akkoma-fe
5
13
Fork 64
Code Issues 81 Pull requests 19 Projects Releases 1 Wiki Activity

Merge branch 'feature/redirect-root-by-login-or-not' into 'develop'

Browse source 
Redirect root by login ro not login

See merge request pleroma/pleroma-fe!251
This commit is contained in:
lambda 2018-04-29 14:51:15 +00:00
commit 805410b933
2 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/main.js
View file

@ -98,7 +98,13 @@ window.fetch('/static/config.json')
} }
const routes = [ const routes = [
{ name: 'root', path: '/', redirect: data['defaultPath'] || '/main/all' }, { name: 'root',
path: '/',
redirect: to => {
var redirectRootLogin = data['redirectRootLogin']
var redirectRootNoLogin = data['redirectRootNoLogin']
return (store.state.users.currentUser ? redirectRootLogin : redirectRootNoLogin) || '/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 },

3
static/config.json
View file

@ -2,7 +2,8 @@
"theme": "pleroma-dark", "theme": "pleroma-dark",
"background": "/static/aurora_borealis.jpg", "background": "/static/aurora_borealis.jpg",
"logo": "/static/logo.png", "logo": "/static/logo.png",
"defaultPath": "/main/all", "redirectRootNoLogin": "/main/all",
"redirectRootLogin": "/main/friends",
"chatDisabled": false, "chatDisabled": false,
"showInstanceSpecificPanel": false "showInstanceSpecificPanel": false
} }