From df486e18c28fa7fa3657a90eafe6d1cd7229f874 Mon Sep 17 00:00:00 2001 From: Hakaba Hitoyo Date: Sun, 29 Apr 2018 17:31:47 +0900 Subject: [PATCH 1/4] add redirectRootNoLogin and redirectRootLogin configuration --- static/config.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/static/config.json b/static/config.json index 9863ec02..5cf4cdec 100644 --- a/static/config.json +++ b/static/config.json @@ -2,7 +2,8 @@ "theme": "pleroma-dark", "background": "/static/aurora_borealis.jpg", "logo": "/static/logo.png", - "defaultPath": "/main/all", + "redirectRootNoLogin": "/main/all", + "redirectRootLogin": "/main/friends", "chatDisabled": false, "showInstanceSpecificPanel": false } From 2a6721ea562226d17e6e893f4fa822a8c20c63cc Mon Sep 17 00:00:00 2001 From: Hakaba Hitoyo Date: Sun, 29 Apr 2018 17:55:23 +0900 Subject: [PATCH 2/4] redirect root by login or not --- src/main.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main.js b/src/main.js index 6f8c00f0..9c79f941 100644 --- a/src/main.js +++ b/src/main.js @@ -98,7 +98,11 @@ window.fetch('/static/config.json') } 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/public', component: PublicTimeline }, { path: '/main/friends', component: FriendsTimeline }, From b1d1c7cfc4a58fa508d2b2e2f092c040c23d99d0 Mon Sep 17 00:00:00 2001 From: Hakaba Hitoyo Date: Sun, 29 Apr 2018 18:07:40 +0900 Subject: [PATCH 3/4] lint --- src/main.js | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/main.js b/src/main.js index 9c79f941..73d73780 100644 --- a/src/main.js +++ b/src/main.js @@ -98,10 +98,12 @@ window.fetch('/static/config.json') } const routes = [ - { name: 'root', path: '/', redirect: to => { - var redirectRootLogin = data['redirectRootLogin'] - var redirectRootNoLogin = data['redirectRootNoLogin'] - return (store.state.users.currentUser? redirectRootLogin: redirectRootNoLogin) || '/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/public', component: PublicTimeline }, From 150b815407c9577d153d309c0362d72725e82c6b Mon Sep 17 00:00:00 2001 From: Hakaba Hitoyo Date: Sun, 29 Apr 2018 18:09:49 +0900 Subject: [PATCH 4/4] lint --- src/main.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main.js b/src/main.js index 73d73780..7ca34adf 100644 --- a/src/main.js +++ b/src/main.js @@ -104,7 +104,7 @@ window.fetch('/static/config.json') var redirectRootLogin = data['redirectRootLogin'] var redirectRootNoLogin = data['redirectRootNoLogin'] return (store.state.users.currentUser ? redirectRootLogin : redirectRootNoLogin) || '/main/all' - }}, + }}, { path: '/main/all', component: PublicAndExternalTimeline }, { path: '/main/public', component: PublicTimeline }, { path: '/main/friends', component: FriendsTimeline },