Merge branch 'master' into fix/missing-functionalities Merge branch 'master' of git.bubblev.org:bubblev/bubble-web into fix/missing-functionalities fix: issues Merge branch 'master' of git.bubblev.org:bubblev/bubble-web into fix/missing-functionalities fix: unnecessary api calls and add missing functionalities on profile page Merge branch 'master' of git.bubblev.org:bubblev/bubble-web into fix/missing-functionalities fix: login 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: jonathan <jonathan@noreply.git.bubblev.org> Co-authored-by: Tyler <everdev0923@gmail.com> Reviewed-on: https://git.bubblev.org/bubblev/bubble-web/pulls/69pull/72/head
@@ -3,7 +3,7 @@ | |||||
"title_get_help": "Get Help", | "title_get_help": "Get Help", | ||||
"title_legal_stuff": "Legal Stuff", | "title_legal_stuff": "Legal Stuff", | ||||
"title_about_bubble": "About Bubble", | "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/" | |||||
} | } |
@@ -21,7 +21,7 @@ | |||||
class="text-white link" | class="text-white link" | ||||
v-for="item in footerLinks" | v-for="item in footerLinks" | ||||
:key="item" | :key="item" | ||||
:to="messages[`link_${item}`]" | |||||
:href="messages[`link_${item}`]" | |||||
> | > | ||||
{{ messages[`title_${item}`] }} | {{ messages[`title_${item}`] }} | ||||
</a> | </a> | ||||
@@ -33,7 +33,9 @@ | |||||
</template> | </template> | ||||
</v-select> | </v-select> | ||||
<div class="d-flex align-items-center justify-content-center mb-3"> | |||||
<div | |||||
class="d-flex align-items-center justify-content-center mb-3 flex-wrap" | |||||
> | |||||
<a | <a | ||||
v-if="appLinks" | v-if="appLinks" | ||||
target="_blank" | target="_blank" | ||||
@@ -282,7 +282,11 @@ | |||||
@click="launchBubble" | @click="launchBubble" | ||||
:disabled="loading() || !isComplete" | :disabled="loading() || !isComplete" | ||||
> | > | ||||
{{ messages.button_label_launch }} | |||||
{{ | |||||
submitted === true && loading() | |||||
? messages.button_label_launching_bubble | |||||
: messages.button_label_launch_bubble | |||||
}} | |||||
</Button> | </Button> | ||||
</div> | </div> | ||||
</div> | </div> | ||||
@@ -19,10 +19,14 @@ | |||||
{{ device.name }} | {{ device.name }} | ||||
</p> | </p> | ||||
<div v-if="device.status.lastHandshakeTime" class="device-text"> | <div v-if="device.status.lastHandshakeTime" class="device-text"> | ||||
<hr /> | |||||
{{ messages.label_field_device_connection_handshake }}: | {{ messages.label_field_device_connection_handshake }}: | ||||
<span v-if="device.status.lastHandshakeDays"> | <span v-if="device.status.lastHandshakeDays"> | ||||
{{ device.status.lastHandshakeDays }}{{ messages.units_days }} | |||||
{{ device.status.lastHandshakeDays }} | |||||
{{ | |||||
device.status.lastHandshakeDays === 1 | |||||
? messages.units_day | |||||
: messages.units_days | |||||
}} | |||||
</span> | </span> | ||||
<span | <span | ||||
v-else-if=" | v-else-if=" | ||||
@@ -62,55 +66,53 @@ | |||||
</div> | </div> | ||||
<div v-if="device.status.ip" class="device-text"> | <div v-if="device.status.ip" class="device-text"> | ||||
{{ device.status.ip }} | {{ device.status.ip }} | ||||
<div v-if="device.status.location"> | |||||
<hr /> | |||||
<span | |||||
v-if=" | |||||
device.status.location.city && | |||||
device.status.location.region && | |||||
device.status.location.country | |||||
" | |||||
> | |||||
{{ device.status.location.city }}, | |||||
{{ device.status.location.region }}, | |||||
{{ messages['country_' + device.status.location.country] }} | |||||
</span> | |||||
<span | |||||
v-else-if=" | |||||
</div> | |||||
<div v-if="device.status.location" class="device-text"> | |||||
<span | |||||
v-if=" | |||||
device.status.location.city && | |||||
device.status.location.region && | device.status.location.region && | ||||
device.status.location.country | |||||
" | |||||
> | |||||
{{ device.status.location.region }}, | |||||
{{ messages['country_' + device.status.location.country] }} | |||||
</span> | |||||
<span | |||||
v-else-if=" | |||||
device.status.location.city && | |||||
device.status.location.country | |||||
" | |||||
> | |||||
{{ device.status.location.city }}, | |||||
{{ messages['country_' + device.status.location.country] }} | |||||
</span> | |||||
<span v-else-if="device.status.location.country"> | |||||
{{ messages['country_' + device.status.location.country] }} | |||||
</span> | |||||
<span | |||||
v-else-if=" | |||||
device.status.location.city && device.status.location.region | |||||
" | |||||
> | |||||
{{ device.status.location.city }}, | |||||
{{ device.status.location.region }} | |||||
</span> | |||||
<span v-else-if="device.status.location.region"> | |||||
{{ device.status.location.region }} | |||||
</span> | |||||
<span v-else-if="device.status.location.city"> | |||||
{{ device.status.location.city }} | |||||
</span> | |||||
</div> | |||||
device.status.location.country | |||||
" | |||||
> | |||||
{{ device.status.location.city }}, | |||||
{{ device.status.location.region }}, | |||||
{{ messages['country_' + device.status.location.country] }} | |||||
</span> | |||||
<span | |||||
v-else-if=" | |||||
device.status.location.region && | |||||
device.status.location.country | |||||
" | |||||
> | |||||
{{ device.status.location.region }}, | |||||
{{ messages['country_' + device.status.location.country] }} | |||||
</span> | |||||
<span | |||||
v-else-if=" | |||||
device.status.location.city && device.status.location.country | |||||
" | |||||
> | |||||
{{ device.status.location.city }}, | |||||
{{ messages['country_' + device.status.location.country] }} | |||||
</span> | |||||
<span v-else-if="device.status.location.country"> | |||||
{{ messages['country_' + device.status.location.country] }} | |||||
</span> | |||||
<span | |||||
v-else-if=" | |||||
device.status.location.city && device.status.location.region | |||||
" | |||||
> | |||||
{{ device.status.location.city }}, | |||||
{{ device.status.location.region }} | |||||
</span> | |||||
<span v-else-if="device.status.location.region"> | |||||
{{ device.status.location.region }} | |||||
</span> | |||||
<span v-else-if="device.status.location.city"> | |||||
{{ device.status.location.city }} | |||||
</span> | |||||
</div> | </div> | ||||
<a @click="showDetails(device)" class="device-details"> | <a @click="showDetails(device)" class="device-details"> | ||||
{{ messages.label_button_detail }} | {{ messages.label_button_detail }} | ||||
@@ -147,7 +149,7 @@ | |||||
.device-text { | .device-text { | ||||
color: #666; | color: #666; | ||||
font-size: 14px; | |||||
font-size: 12px; | |||||
line-height: 20px; | line-height: 20px; | ||||
margin-bottom: 8px; | margin-bottom: 8px; | ||||
} | } | ||||
@@ -11,7 +11,7 @@ | |||||
:key="index" | :key="index" | ||||
class="col-lg-6 col-md-6 col-sm-12 my-4 px-3" | class="col-lg-6 col-md-6 col-sm-12 my-4 px-3" | ||||
> | > | ||||
<a :href="messages[`legal_${item}_link`]"> | |||||
<a :href="messages[`legal_${item}_link`]" target="_blank"> | |||||
<div class="h-100 card-container"> | <div class="h-100 card-container"> | ||||
<div class="d-flex justify-content-between align-items-center"> | <div class="d-flex justify-content-between align-items-center"> | ||||
<span>{{ messages[`legal_${item}`] }}</span> | <span>{{ messages[`legal_${item}`] }}</span> | ||||
@@ -24,7 +24,11 @@ | |||||
@click="launchBubble" | @click="launchBubble" | ||||
:disabled="loading()" | :disabled="loading()" | ||||
> | > | ||||
{{ messages.button_label_launch_bubble }} | |||||
{{ | |||||
submitted === true && loading() | |||||
? messages.button_label_launching_bubble | |||||
: messages.button_label_launch_bubble | |||||
}} | |||||
</Button> | </Button> | ||||
<a class="mt-3 btn-modal" href="#" @click="openSettingsModal"> | <a class="mt-3 btn-modal" href="#" @click="openSettingsModal"> | ||||
@@ -205,6 +209,7 @@ export default { | |||||
if (this.accountPlan.sendMetrics === null) | if (this.accountPlan.sendMetrics === null) | ||||
this.accountPlan.sendMetrics = true; | this.accountPlan.sendMetrics = true; | ||||
} | } | ||||
this.submitted = true; | |||||
this.addPlanAndStartNetwork({ | this.addPlanAndStartNetwork({ | ||||
userId: this.user.uuid, | userId: this.user.uuid, | ||||
accountPlan: this.accountPlan, | accountPlan: this.accountPlan, | ||||
@@ -336,7 +336,9 @@ | |||||
</div> | </div> | ||||
</div> | </div> | ||||
<form @submit.prevent="updateProfile"> | |||||
<hr /> | |||||
<form v-if="!configs.sageLauncher" @submit.prevent="updateProfile"> | |||||
<h3>{{ messages.field_label_auto_update_policy }}</h3> | <h3>{{ messages.field_label_auto_update_policy }}</h3> | ||||
<Checkbox | <Checkbox | ||||
@@ -405,6 +407,7 @@ | |||||
</div> | </div> | ||||
<br /> | <br /> | ||||
</span> | </span> | ||||
<div style="border: 2px solid #000;"> | <div style="border: 2px solid #000;"> | ||||
<Button | <Button | ||||
color="default" | color="default" | ||||