From dbba7517d415e465812c629844024063770e01b0 Mon Sep 17 00:00:00 2001 From: Tyler Chen Date: Fri, 25 Sep 2020 22:50:04 +0000 Subject: [PATCH 1/2] fix/missing-functionalities (#61) 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/61 --- package-lock.json | 42 ++++++- src/_components/layout/Sidebar.vue | 22 +++- src/_pages/Layout.vue | 169 ++++++++++++++++++++++++++++- src/_pages/auth/Register.vue | 4 +- src/_pages/auth/VerifyEmail.vue | 2 +- src/_pages/main/Layout.vue | 166 +++++----------------------- src/_router/index.js | 24 +--- 7 files changed, 258 insertions(+), 171 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/_components/layout/Sidebar.vue b/src/_components/layout/Sidebar.vue index 12a07ea..6944fd8 100644 --- a/src/_components/layout/Sidebar.vue +++ b/src/_components/layout/Sidebar.vue @@ -31,7 +31,11 @@ -
+ - + @@ -281,7 +293,7 @@ export default { closeMenu() { console.log('click.nativeed'); this.menuVisible = false; - } + }, }, }; diff --git a/src/_pages/Layout.vue b/src/_pages/Layout.vue index bafb6f0..0b472f0 100644 --- a/src/_pages/Layout.vue +++ b/src/_pages/Layout.vue @@ -1,8 +1,173 @@ diff --git a/src/_pages/auth/Register.vue b/src/_pages/auth/Register.vue index 1ef32e8..cd45bf5 100644 --- a/src/_pages/auth/Register.vue +++ b/src/_pages/auth/Register.vue @@ -220,6 +220,7 @@ export default { paymentMethodObject: null, confirmPassword: '', submitted: false, + preferredPlan: null, }; }, @@ -314,6 +315,7 @@ export default { receivePromotionalMessages: this.receivePromotionalMessages, agreeToTerms: this.agreeToTerms, promoCode: this.promoCode, + preferredPlan: this.preferredPlan, }, messages: this.messages, errors: this.errors, @@ -346,7 +348,7 @@ export default { }, plan(p) { if (p.uuid) { - this.user.preferredPlan = p.uuid; + this.preferredPlan = p.uuid; } }, configs(configs) { diff --git a/src/_pages/auth/VerifyEmail.vue b/src/_pages/auth/VerifyEmail.vue index e58bd16..d49b74c 100644 --- a/src/_pages/auth/VerifyEmail.vue +++ b/src/_pages/auth/VerifyEmail.vue @@ -56,7 +56,7 @@ import { mapState, mapActions } from 'vuex'; import Lottie from 'lottie-web'; -import { util } from '~/_helpers' +import { util } from '~/_helpers'; import { Features } from '~/_components/sections'; // convenience methods diff --git a/src/_pages/main/Layout.vue b/src/_pages/main/Layout.vue index d839626..35a941a 100644 --- a/src/_pages/main/Layout.vue +++ b/src/_pages/main/Layout.vue @@ -1,6 +1,6 @@