From 8845990e046eb27dc71da14d9348c84fed6bd7c1 Mon Sep 17 00:00:00 2001 From: Tyler Chen Date: Tue, 15 Sep 2020 03:29:07 +0000 Subject: [PATCH] feat/ui-layout (#53) Merge branch 'master' of git.bubblev.org:bubblev/bubble-web into feat/ui-layout fix: pass admin without email verification fix: pass admin without email verification Merge branch 'master' of git.bubblev.org:bubblev/bubble-web into feat/ui-layout Merge branch 'master' of git.bubblev.org:bubblev/bubble-web into feat/ui-layout fix: new urls & error on my account page fix: check payment only when config is enabled Merge branch 'master' of git.bubblev.org:bubblev/bubble-web into feat/ui-layout feat: implement support page Merge branch 'master' of git.bubblev.org:bubblev/bubble-web into feat/ui-layout feat: implement legal page feat: app login page feat: update header feat: change header to have more links Merge branch 'master' of git.bubblev.org:bubblev/bubble-web into feat/ui-layout feat: implement Restore page Merge branch 'master' of git.bubblev.org:bubblev/bubble-web into feat/ui-layout Merge branch 'master' of git.bubblev.org:bubblev/bubble-web into feat/ui-layout feat: implement my bubble page Merge branch 'master' of git.bubblev.org:bubblev/bubble-web into feat/ui-layout feat: replace old pages with new pages feat: implement devices page Merge branch 'master' of git.bubblev.org:bubblev/bubble-web into feat/ui-layout Merge branch 'master' of git.bubblev.org:bubblev/bubble-web into feat/ui-layout feat: implement account policy page Merge branch 'master' of git.bubblev.org:bubblev/bubble-web into feat/ui-layout feat: implement payment and bills page Merge branch 'feat/ui-layout' of git.bubblev.org:bubblev/bubble-web into feat/ui-layout feat: change config to accept env files Merge branch 'master' of git.bubblev.org:bubblev/bubble-web into feat/ui-layout feat: make a stripe element component Merge branch 'master' into feat/ui-layout Merge branch 'master' of git.bubblev.org:bubblev/bubble-web into feat/ui-layout feat: implement manage ssh key page feat: set password page feat: implement change password page fix: change design feat: implement my account page feat: implement animation control for launching bubble screen fix: navigating to network page feat: implement Launching bubble page feat: integrate launch bubble api Merge branch 'master' of git.bubblev.org:bubblev/bubble-web into feat/ui-layout Merge branch 'master' of git.bubblev.org:bubblev/bubble-web into feat/ui-layout feat: implement MFA in login Merge branch 'master' of git.bubblev.org:bubblev/bubble-web into feat/ui-layout feat: implement adding ssh key Merge branch 'master' of git.bubblev.org:bubblev/bubble-web into feat/ui-layout fix: showing default values Merge branch 'master' of git.bubblev.org:bubblev/bubble-web into feat/ui-layout Co-authored-by: Tyler Co-authored-by: jonathan Reviewed-on: https://git.bubblev.org/bubblev/bubble-web/pulls/53 --- src/_pages/main/Layout.vue | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/_pages/main/Layout.vue b/src/_pages/main/Layout.vue index d7375e8..a000830 100644 --- a/src/_pages/main/Layout.vue +++ b/src/_pages/main/Layout.vue @@ -56,11 +56,13 @@ export default { currentUser.locale !== null ? currentUser.locale : 'detect'; - this.getPolicyByUserId({ - userId: currentUser.uuid, - messages: this.messages, - errors: this.errors, - }); + if (!currentUser.admin) { + this.getPolicyByUserId({ + userId: currentUser.uuid, + messages: this.messages, + errors: this.errors, + }); + } }, hasVerifiedContact(policy) {