diff --git a/src/_assets/pre_auth_messages.json b/src/_assets/pre_auth_messages.json index bac8ec1..55bb0e1 100644 --- a/src/_assets/pre_auth_messages.json +++ b/src/_assets/pre_auth_messages.json @@ -3,7 +3,7 @@ "title_get_help": "Get Help", "title_legal_stuff": "Legal Stuff", "title_about_bubble": "About Bubble", - "link_get_help": "https://example.com/get_help", - "link_legal_stuff": "https://example.com/legal_stuff", - "link_about_bubble": "https://example.com/about_bubble" + "link_get_help": "/support", + "link_legal_stuff": "/legal", + "link_about_bubble": "https://getbubblenow.com/about-us/" } diff --git a/src/_components/layout/Footer.vue b/src/_components/layout/Footer.vue index d79d9c2..5e68bf9 100644 --- a/src/_components/layout/Footer.vue +++ b/src/_components/layout/Footer.vue @@ -21,7 +21,7 @@ class="text-white link" v-for="item in footerLinks" :key="item" - :to="messages[`link_${item}`]" + :href="messages[`link_${item}`]" > {{ messages[`title_${item}`] }} diff --git a/src/_components/modals/DeviceDetail.vue b/src/_components/modals/DeviceDetail.vue index 083ad26..a2c69ee 100644 --- a/src/_components/modals/DeviceDetail.vue +++ b/src/_components/modals/DeviceDetail.vue @@ -33,7 +33,9 @@ -
+
- {{ messages.button_label_launch }} + {{ + submitted === true && loading() + ? messages.button_label_launching_bubble + : messages.button_label_launch_bubble + }}
diff --git a/src/_pages/main/account/Devices.vue b/src/_pages/main/account/Devices.vue index 930dcbb..dc98a51 100644 --- a/src/_pages/main/account/Devices.vue +++ b/src/_pages/main/account/Devices.vue @@ -19,10 +19,14 @@ {{ device.name }}

-
{{ messages.label_field_device_connection_handshake }}: - {{ device.status.lastHandshakeDays }}{{ messages.units_days }} + {{ device.status.lastHandshakeDays }}  + {{ + device.status.lastHandshakeDays === 1 + ? messages.units_day + : messages.units_days + }} {{ device.status.ip }} -
-
- - {{ device.status.location.city }}, - {{ device.status.location.region }}, - {{ messages['country_' + device.status.location.country] }} - - + - {{ device.status.location.region }}, - {{ messages['country_' + device.status.location.country] }} - - - {{ device.status.location.city }}, - {{ messages['country_' + device.status.location.country] }} - - - {{ messages['country_' + device.status.location.country] }} - - - {{ device.status.location.city }}, - {{ device.status.location.region }} - - - {{ device.status.location.region }} - - - {{ device.status.location.city }} - -
+ device.status.location.country + " + > + {{ device.status.location.city }}, + {{ device.status.location.region }}, + {{ messages['country_' + device.status.location.country] }} +
+ + {{ device.status.location.region }}, + {{ messages['country_' + device.status.location.country] }} + + + {{ device.status.location.city }}, + {{ messages['country_' + device.status.location.country] }} + + + {{ messages['country_' + device.status.location.country] }} + + + {{ device.status.location.city }}, + {{ device.status.location.region }} + + + {{ device.status.location.region }} + + + {{ device.status.location.city }} +
{{ messages.label_button_detail }} @@ -147,7 +149,7 @@ .device-text { color: #666; - font-size: 14px; + font-size: 12px; line-height: 20px; margin-bottom: 8px; } diff --git a/src/_pages/main/account/Legal.vue b/src/_pages/main/account/Legal.vue index 57c8dd0..e3d898b 100644 --- a/src/_pages/main/account/Legal.vue +++ b/src/_pages/main/account/Legal.vue @@ -11,7 +11,7 @@ :key="index" class="col-lg-6 col-md-6 col-sm-12 my-4 px-3" > - +
{{ messages[`legal_${item}`] }} diff --git a/src/_pages/main/bubble/LaunchBubble.vue b/src/_pages/main/bubble/LaunchBubble.vue index af71e26..a67f1a8 100644 --- a/src/_pages/main/bubble/LaunchBubble.vue +++ b/src/_pages/main/bubble/LaunchBubble.vue @@ -24,7 +24,11 @@ @click="launchBubble" :disabled="loading()" > - {{ messages.button_label_launch_bubble }} + {{ + submitted === true && loading() + ? messages.button_label_launching_bubble + : messages.button_label_launch_bubble + }} @@ -205,6 +209,7 @@ export default { if (this.accountPlan.sendMetrics === null) this.accountPlan.sendMetrics = true; } + this.submitted = true; this.addPlanAndStartNetwork({ userId: this.user.uuid, accountPlan: this.accountPlan, diff --git a/src/_pages/main/bubble/Network.vue b/src/_pages/main/bubble/Network.vue index 32855af..cee9ca8 100644 --- a/src/_pages/main/bubble/Network.vue +++ b/src/_pages/main/bubble/Network.vue @@ -336,7 +336,9 @@
-
+
+ +

{{ messages.field_label_auto_update_policy }}


+