diff options
author | Romulus Tsai 蔡仲明 <urakagi@gmail.com> | 2020-05-08 09:35:11 +0800 |
---|---|---|
committer | Romulus Tsai 蔡仲明 <urakagi@gmail.com> | 2020-05-08 09:35:11 +0800 |
commit | cfcc73724fcd394150d1b815d0a7a4c466e216b5 (patch) | |
tree | a9648255f14cd8b0e1ad8eee1f8d42337a0668bc /config | |
parent | a3658993128bdddd5d40f792c19281dc5eac51f5 (diff) | |
parent | 533bc045d06269dba2f42cdfe61817a1b3407974 (diff) | |
download | wekan-cfcc73724fcd394150d1b815d0a7a4c466e216b5.tar.gz wekan-cfcc73724fcd394150d1b815d0a7a4c466e216b5.tar.bz2 wekan-cfcc73724fcd394150d1b815d0a7a4c466e216b5.zip |
Merge branch 'master' of https://github.com/wekan/wekan
Diffstat (limited to 'config')
-rw-r--r-- | config/accounts.js | 10 | ||||
-rw-r--r-- | config/router.js | 21 |
2 files changed, 28 insertions, 3 deletions
diff --git a/config/accounts.js b/config/accounts.js index f88f2d83..b19c12b9 100644 --- a/config/accounts.js +++ b/config/accounts.js @@ -38,9 +38,13 @@ AccountsTemplates.configure({ }, }); -['signIn', 'signUp', 'resetPwd', 'forgotPwd', 'enrollAccount'].forEach( - routeName => AccountsTemplates.configureRoute(routeName), -); +[ + 'signIn', + 'signUp', + 'resetPwd', + 'forgotPwd', + 'enrollAccount', +].forEach(routeName => AccountsTemplates.configureRoute(routeName)); // We display the form to change the password in a popup window that already // have a title, so we unset the title automatically displayed by useraccounts. diff --git a/config/router.js b/config/router.js index ad76035b..2e66c67f 100644 --- a/config/router.js +++ b/config/router.js @@ -26,6 +26,27 @@ FlowRouter.route('/', { }, }); +FlowRouter.route('/public', { + name: 'public', + triggersEnter: [AccountsTemplates.ensureSignedIn], + action() { + Session.set('currentBoard', null); + Session.set('currentList', null); + Session.set('currentCard', null); + + Filter.reset(); + EscapeActions.executeAll(); + + Utils.manageCustomUI(); + Utils.manageMatomo(); + + BlazeLayout.render('defaultLayout', { + headerBar: 'boardListHeaderBar', + content: 'boardList', + }); + }, +}); + FlowRouter.route('/b/:id/:slug', { name: 'board', action(params) { |