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/modals/LaunchBubbleSettingsModal.vue b/src/_components/modals/LaunchBubbleSettingsModal.vue index fa8ce30..6e6eff1 100644 --- a/src/_components/modals/LaunchBubbleSettingsModal.vue +++ b/src/_components/modals/LaunchBubbleSettingsModal.vue @@ -24,7 +24,7 @@ v-validate="'required'" :placeholder="messages.field_label_network_type" :options="networkTypeOptions" - v-model="networkType" + v-model="accountPlan.launchType" label="name" :reduce="(option) => option.value" > @@ -37,7 +37,14 @@ -
+
{ + this.accountPlan.name = this.getDefaultName(); + }); + } + }, domains(doms) { if (doms && doms[0]) { if (this.accountPlan.domain == null || this.accountPlan.domain === '') @@ -612,7 +637,7 @@ export default { newNodeNotification(nn) { if (nn && nn.uuid) { this.$router.push({ - path: '/launching-bubble/' + nn.networkName, + path: '/bubble/' + nn.networkName, }); this.submitted = false; } diff --git a/src/_pages/main/account/ChangePassword.vue b/src/_pages/main/account/ChangePassword.vue index 8337823..084aae5 100644 --- a/src/_pages/main/account/ChangePassword.vue +++ b/src/_pages/main/account/ChangePassword.vue @@ -11,9 +11,19 @@
+
+ {{ alertMessage }} +
-
+
{{ messages['field_label_' + contact.type] }}: {{ contact.info }}
@@ -109,7 +119,7 @@ @click="changePass" :disabled="loading()" > - {{ messages.button_label_change_password }} + {{ messages.button_label_resetPassword }}
@@ -168,6 +178,7 @@ export default { computed: { ...mapState('users', ['user', 'policy', 'changePasswordResponse']), ...mapState('system', ['messages']), + ...mapState('alert', { alertType: 'type', alertMessage: 'message' }), }, methods: { ...mapActions({ alertSuccess: 'alert/success', alertError: 'alert/error' }), diff --git a/src/_pages/main/bubble/LaunchBubble.vue b/src/_pages/main/bubble/LaunchBubble.vue index 09ba288..af71e26 100644 --- a/src/_pages/main/bubble/LaunchBubble.vue +++ b/src/_pages/main/bubble/LaunchBubble.vue @@ -89,6 +89,7 @@ export default { locale: util.currentUser().locale, timezone: '', plan: 'bubble', + launchType: 'node', footprint: 'Worldwide', sshKey: '', paymentMethodObject: { @@ -167,6 +168,7 @@ export default { initDefaults() { const currentUser = util.currentUser(); + this.accountPlan.name = currentUser.email.split('@')[0]; this.getAllAccountPaymentMethods({ userId: currentUser.uuid, messages: this.messages,