From f92eb7279dd620b86a780df4ba880b9290e50e5a Mon Sep 17 00:00:00 2001 From: Tyler Chen Date: Tue, 29 Sep 2020 16:06:09 +0000 Subject: [PATCH] fix/missing-functionalities (#65) Merge branch 'master' of git.bubblev.org:bubblev/bubble-web into fix/missing-functionalities fix: login and sign up stuff Merge branch 'master' of git.bubblev.org:bubblev/bubble-web into fix/missing-functionalities fix: page reloading stuff fix: login stuff Merge branch 'master' of git.bubblev.org:bubblev/bubble-web into fix/missing-functionalities fix: sign up and payment check stuff fix: launch bubble screen Merge branch 'master' of git.bubblev.org:bubblev/bubble-web into fix/missing-functionalities Merge branch 'master' of git.bubblev.org:bubblev/bubble-web into fix/missing-functionalities fix: refreshing issue feat: implement devices screen Merge branch 'master' of git.bubblev.org:bubblev/bubble-web into fix/missing-functionalities feat: implement new layout Merge branch 'master' of git.bubblev.org:bubblev/bubble-web into fix/missing-functionalities feat: implement new layout fix: header fix: showing error on add ssh modal fix: login by enter key Co-authored-by: Tyler Reviewed-on: https://git.bubblev.org/bubblev/bubble-web/pulls/65 --- package-lock.json | 42 ++++++++++++++++++++++++++++++++++++++++-- src/_pages/Layout.vue | 20 ++++++++++---------- 2 files changed, 50 insertions(+), 12 deletions(-) diff --git a/package-lock.json b/package-lock.json index dc389d9..b39167f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2524,6 +2524,11 @@ "entities": "^1.1.1" } }, + "dom-walk": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/dom-walk/-/dom-walk-0.1.2.tgz", + "integrity": "sha512-6QvTW9mrGeIegrFXdtQi9pk7O/nSK6lSdXW2eqUspN5LWD7UTji2Fqw5V2YLjBpHEoU9Xl/eUWNpDeZvoyOv2w==" + }, "domain-browser": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-1.2.0.tgz", @@ -3432,6 +3437,15 @@ } } }, + "global": { + "version": "4.4.0", + "resolved": "https://registry.npmjs.org/global/-/global-4.4.0.tgz", + "integrity": "sha512-wv/LAoHdRE3BeTGz53FAamhGlPLhlssK45usmGFThIi4XqnBmjKQ16u+RNbP7WvigRZDxUsM0J3gcQ5yicaL0w==", + "requires": { + "min-document": "^2.19.0", + "process": "^0.11.10" + } + }, "global-modules": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-2.0.0.tgz", @@ -4550,6 +4564,14 @@ "mime-db": "1.44.0" } }, + "min-document": { + "version": "2.19.0", + "resolved": "https://registry.npmjs.org/min-document/-/min-document-2.19.0.tgz", + "integrity": "sha1-e9KC4/WELtKVu3SM3Z8f+iyCRoU=", + "requires": { + "dom-walk": "^0.1.0" + } + }, "minimalistic-assert": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz", @@ -5504,8 +5526,7 @@ "process": { "version": "0.11.10", "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz", - "integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI=", - "dev": true + "integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI=" }, "process-nextick-args": { "version": "2.0.1", @@ -7665,6 +7686,23 @@ "resolved": "https://registry.npmjs.org/vue/-/vue-2.6.10.tgz", "integrity": "sha512-ImThpeNU9HbdZL3utgMCq0oiMzAkt1mcgy3/E6zWC/G6AaQoeuFdsl9nDhTDU3X1R6FK7nsIUuRACVcjI+A2GQ==" }, + "vue-carousel": { + "version": "0.18.0", + "resolved": "https://registry.npmjs.org/vue-carousel/-/vue-carousel-0.18.0.tgz", + "integrity": "sha512-a2zxh7QJioDxNMguqcuJ7TPbfgK5bGDaAXIia7NWxPAWsEvNE4ZtHgsGu40L5Aha4uyjmNKXvleB14QAXFoKig==", + "requires": { + "global": "^4.3.2", + "regenerator-runtime": "^0.12.1", + "vue": "^2.5.17" + }, + "dependencies": { + "regenerator-runtime": { + "version": "0.12.1", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.12.1.tgz", + "integrity": "sha512-odxIc1/vDlo4iZcfXqRYFj0vpXFNoGdKMAUieAlFYO6m/nl5e9KR/beGf41z4a1FI+aQgtjhuaSlDxQ0hmkrHg==" + } + } + }, "vue-click-outside": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/vue-click-outside/-/vue-click-outside-1.1.0.tgz", diff --git a/src/_pages/Layout.vue b/src/_pages/Layout.vue index 10215a1..2105d59 100644 --- a/src/_pages/Layout.vue +++ b/src/_pages/Layout.vue @@ -59,6 +59,7 @@ export default { ...mapActions('paymentMethods', ['getAllAccountPaymentMethods']), initDefaults() { + this.currentUser = util.currentUser(); const selectedLocale = this.currentUser !== null && typeof this.currentUser.locale !== 'undefined' && @@ -120,20 +121,15 @@ export default { watch: { $route() { - this.isPageAvailable = - !this.currentUser || - this.$route.path === '/me/action' || - this.$route.path === '/logout' || - this.$route.path === '/verifyEmail' || - ((this.verifiedContacts || this.currentUser.admin) && - (!this.configs.paymentsEnabled || - this.hasPaymentMethod === true || - this.$route.path === '/payment')); + this.$nextTick(() => { + this.initDefaults(); + }); }, policy(p) { this.verifiedContacts = this.hasVerifiedContact(p); const currentUser = util.currentUser(); + if (!currentUser) return; if (!this.verifiedContacts && !currentUser.admin) { this.navigateToVerifyEmail(); if (this.verifiedContactRefresher === null) { @@ -162,7 +158,11 @@ export default { }, accountPaymentMethods(pms, oldpms) { - if (pms && this.configs.paymentsEnabled) { + if ( + pms && + this.configs.paymentsEnabled && + (this.verifiedContacts || (this.currentUser && this.currentUser.admin)) + ) { const payMethods = []; for (let i = 0; i < pms.length; i++) { const pm = pms[i];