pleroma-fe

commit: 805410b9336829e8a079b2c3978199f6362a8cab
parent: 462eeb90b945711b995726d908d001a6d21735e7
Author: lambda <pleromagit@rogerbraun.net>
Date:   Sun, 29 Apr 2018 14:51:15 +0000

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

Redirect root by login ro not login

See merge request pleroma/pleroma-fe!251
Diffstat:
M
src/main.js
8
+++++++-
M
static/config.json
3
++-

2 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/src/main.js b/src/main.js
@@ -98,7 +98,13 @@ 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 },
diff --git 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
 }