bubblev
/
bubble-web
8
0
Fork 0
Code Issues 0 Pull Requests 0 Releases 0 Wiki Activity
Browse Source

feat/ui-layout (#45) 

Merge branch 'master' of git.bubblev.org:bubblev/bubble-web into feat/ui-layout

feat: implement my bubble page

Merge branch 'master' of git.bubblev.org:bubblev/bubble-web into feat/ui-layout

feat: replace old pages with new pages

feat: implement devices page

Merge branch 'master' of git.bubblev.org:bubblev/bubble-web into feat/ui-layout

Merge branch 'master' of git.bubblev.org:bubblev/bubble-web into feat/ui-layout

feat: implement account policy page

Merge branch 'master' of git.bubblev.org:bubblev/bubble-web into feat/ui-layout

feat: implement payment and bills page

Merge branch 'feat/ui-layout' of git.bubblev.org:bubblev/bubble-web into feat/ui-layout

feat: change config to accept env files

Merge branch 'master' of git.bubblev.org:bubblev/bubble-web into feat/ui-layout

feat: make a stripe element component

Merge branch 'master' into feat/ui-layout

Merge branch 'master' of git.bubblev.org:bubblev/bubble-web into feat/ui-layout

feat: implement manage ssh key page

feat: set password page

feat: implement change password page

fix: change design

feat: implement my account page

feat: implement animation control for launching bubble screen

fix: navigating to network page

feat: implement Launching bubble page

feat: integrate launch bubble api

Merge branch 'master' of git.bubblev.org:bubblev/bubble-web into feat/ui-layout

Merge branch 'master' of git.bubblev.org:bubblev/bubble-web into feat/ui-layout

feat: implement MFA in login

Merge branch 'master' of git.bubblev.org:bubblev/bubble-web into feat/ui-layout

feat: implement adding ssh key

Merge branch 'master' of git.bubblev.org:bubblev/bubble-web into feat/ui-layout

fix: showing default values

Merge branch 'master' of git.bubblev.org:bubblev/bubble-web into feat/ui-layout

feat: implement selector placeholders and default values

Merge branch 'feat/ui-layout' of git.bubblev.org:bubblev/bubble-web into feat/ui-layout

Merge branch 'master' of git.bubblev.org:bubblev/bubble-web into feat/ui-layout

fix: getting user information after setting payment method

Merge branch 'master' into feat/ui-layout

feat: implement setting payment plan in payment page

feat: populate options for advanced settings modal

fix: remove showing advanced settings modal when loading the page

feat: implement Advanced Settings Modal layout

feat: implement modal and selector components

feat: implement launch bubble screen

Merge branch 'master' of git.bubblev.org:bubblev/bubble-web into feat/ui-layout

feat: implement add stripe card

feat: implement login process

Merge branch 'master' of git.bubblev.org:bubblev/bubble-web into feat/ui-layout

feat: implement payment page

feat: implement mail verification screen

Co-authored-by: Tyler <everdev0923@gmail.com>
Co-authored-by: jonathan <jonathan@noreply.git.bubblev.org>
Reviewed-on: https://git.bubblev.org/bubblev/bubble-web/pulls/45
pull/48/head
Tyler Chen 4 years ago
committed by jonathan
parent
631284006b
commit
fd3194c368
4 changed files with 885 additions and 2 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +2
    -1
      package.json
  2. +876
    -0
      src/_pages/main/bubble/Network.vue
  3. +5
    -0
      src/_router/index.js
  4. +2
    -1
      webpack.config.dev.js

+ 2
- 1
package.json View File

@@ -7,7 +7,8 @@
},
"license": "LicenseRef-LICENSE.md",
"scripts": {
"start": "webpack-dev-server --open --env.server=$BUBBLE_API"
"start": "webpack-dev-server --open --env.server=$BUBBLE_API",
"dev": "webpack-dev-server --open --env.server=$MY_BUBBLE_API"
},
"dependencies": {
"lottie-web": "^5.7.1",


+ 876
- 0
src/_pages/main/bubble/Network.vue View File

@@ -0,0 +1,876 @@
<!-- Copyright (c) 2020 Bubble, Inc. All rights reserved. For personal (non-commercial) use, see license: https://getbubblenow.com/bubble-license/ -->
<template>
<div v-if="network" class="bubble-form">
<h4>
{{ network.nickname }} -
<i>{{ messages['msg_network_state_' + network.state] }}</i>
</h4>

<h6 class="alert-danger" v-if="stats && statsError">
{{ messages[stats.messageKey] }}
</h6>

<h6
v-if="
!isSelfNet &&
(isInReadyToRestoreState || network.state === 'running')
"
>
<Button
color="default"
v-if="network.state === 'running'"
:title="messages.message_network_connect"
:onclick="'window.open(\'' + networkAppLoginUrl + '\', \'_blank\')'"
>
{{ messages.message_network_connect }}
</Button>
<Button
color="default"
v-else
:title="messages.message_network_restore"
:onclick="'window.open(\'' + nodeRestoreUrl + '\', \'_blank\')'"
>
{{ messages.message_network_restore }}
</Button>
</h6>

<div
v-if="
stats &&
(network.state === 'created' ||
network.state === 'starting' ||
network.state === 'restoring')
"
>
<!-- adapted from: https://code-boxx.com/simple-vanilla-javascript-progress-bar/ -->
<div v-if="stats.percent" class="progress-wrap">
<div
class="progress-bar"
:style="'width: ' + stats.percent + '%'"
:id="'progressBar_' + networkId"
></div>
<div class="progress-text">
{{
messages.label_percent.parseMessage(this, {
percent: stats.percent,
})
}}
</div>
</div>
<div v-if="!statsError" :id="'progressBar_details_' + networkId">
{{ messages[stats.messageKey] }}
</div>
<hr />
</div>

<div v-if="showSetupHelp">
<h5 v-html="messages.title_launch_help_html"></h5>
<div
v-if="network && network.state === 'running'"
v-html="messages.message_launch_success_help_html"
></div>
<div v-else v-html="messages.message_launch_help_html"></div>
<div v-if="appLinks && addableDeviceTypes">
<div
v-if="network && network.state === 'running'"
v-html="messages.message_launch_success_apps"
></div>
<div v-else v-html="messages.message_launch_help_apps"></div>
<br />
<table border="0" width="100%">
<tr>
<td
v-for="deviceType in addableDeviceTypes"
align="center"
:width="addableDeviceWidth + '%'"
>
<a
target="_blank"
rel="noopener noreferrer"
:href="appLinks[deviceType]"
>
<i
:class="
messages['device_type_icon_' + deviceType] +
' bubble-app-icon'
"
></i
><br />
{{ messages['device_type_' + deviceType] }}
</a>
</td>
</tr>
</table>
</div>
<hr />
<span v-html="messages.message_launch_support.parseMessage(this)"></span>
</div>

<div v-if="isSelfNet && network.state === 'running'">
<div
v-if="
user.admin === true &&
checkingForUpgrade !== null &&
configs &&
configs.jarVersion &&
configs.jarUpgradeAvailable &&
configs.jarUpgradeAvailable.version
"
>
<hr />
<h4>{{ messages.message_jar_upgrade_available }}</h4>
<p>
{{ messages.message_jar_current_version }}
<b>{{ configs.jarVersion }}</b
><br />
{{ messages.message_jar_upgrade_version }}
<b>{{ configs.jarUpgradeAvailable.version }}</b>
</p>
<Button
color="default"
v-if="!upgrading"
:disabled="upgrading"
@click="doUpgrade()"
>
{{ messages.button_label_jar_upgrade }}
</Button>
<Button color="default" v-else-if="upgrading" :disabled="true">
{{ messages.button_label_jar_upgrading }}
</Button>
<p v-if="upgrading">{{ messages.message_jar_upgrading }}</p>
<hr />
</div>
<div v-else-if="user.admin === true && configs && configs.jarVersion">
<hr />
<h6>
{{ messages.message_jar_current_version }}
<b>{{ configs.jarVersion }}</b>
</h6>
<p v-if="checkingForUpgrade">
{{ messages.message_jar_checking_for_upgrade }}
</p>
<hr />
</div>

<Button
color="default"
class="btn btn-primary"
@click="requestRestoreKey()"
:disabled="loading && loading.requestNetworkKeys"
>
{{ messages.link_network_action_request_keys }}
</Button>
<img
v-show="loading && loading.requestNetworkKeys"
:src="loadingImgSrc"
/>
<div v-if="errors.has('networkKeys')" class="invalid-feedback d-block">
{{ errors.first('networkKeys') }}
</div>
<div v-if="networkKeysRequested && networkKeysRequested === networkId">
{{ messages.message_network_action_keys_requested }}
</div>
<hr />
<h5>{{ messages.message_network_action_retrieve_keys }}</h5>
<div class="form-group">
<Input
type="text"
v-model="restoreKeyCode"
v-validate="'required'"
name="restoreKeyCode"
class="form-control"
:placeholder="messages.field_network_key_download_code"
:class="{ 'is-invalid': errors.has('retrieveNetworkKeys') }"
/>
<div v-if="errors.has('retrieveNetworkKeys')" class="invalid-feedback">
{{ errors.first('retrieveNetworkKeys') }}
</div>
</div>
<div class="form-group">
<Input
type="password"
v-model="restoreKeyPassword"
v-validate="'required'"
name="restoreKeyPassword"
class="form-control"
:placeholder="messages.field_network_key_download_password"
:class="{ 'is-invalid': errors.has('password') }"
:autofocus="$route.query.hasOwnProperty('keys_code')"
/>
<div v-if="errors.has('password')" class="invalid-feedback">
{{ errors.first('password') }}
</div>
</div>
<Button
color="default"
@click="retrieveRestoreKey()"
class="btn btn-primary"
:disabled="loading && loading.retrieveNetworkKeys"
>
{{ messages.button_label_retrieve_keys }}
</Button>
<span v-if="backups && backups.length > 0">
{{ messages.label_or }}
<Button
color="default"
@click="fullyPrepareBackupPackage()"
class="btn btn-primary"
:disabled="loading && loading.retrieveNetworkKeys"
>
{{ messages.button_label_download_backup }}
</Button>
</span>
<img
v-show="loading && loading.retrieveNetworkKeys"
:src="loadingImgSrc"
/>
<br /><small v-if="loading && preparingLatestBackup">{{
messages.label_download_backup_note
}}</small>

<span v-html="latestBackupInfoHtml"></span>

<span v-if="allowQueueBackup">
<br />
<Button
color="default"
@click="queueBckup()"
class="btn btn-primary"
:disabled="loading && loading.queueBackup"
>
{{ messages.link_backup_network }}
</Button>
</span>
</div>

<div v-if="network.state === 'stopped'">
<hr />
<div v-if="errors.has('networkRestore')" class="invalid-feedback d-block">
{{ errors.first('networkRestore') }}
</div>

<div v-if="networkNodes && networkNodes.length === 0">
<div v-if="restoreKey" class="alert alert-success">
{{ messages.restore_key_label }} {{ restoreKey }}
</div>
<div v-else>
<Button
color="default"
@click="restoreNet()"
class="btn btn-primary"
:disabled="loading && loading.restoring"
>
{{ messages.button_label_restore }}
</Button>
<img v-show="loading && loading.restoring" :src="loadingImgSrc" />
</div>
{{ messages.button_description_restore }}
</div>
<div
v-else-if="statsError === null"
v-html="messages.restore_not_possible_nodes_exist_html"
/>
</div>

<hr />

<div v-if="isSelfNet">
<div v-if="loading && loading.managingLogFlag">
<img :src="loadingImgSrc" />
</div>
<div else>
<div v-if="logFlag && logFlag.flag">
{{ messages.node_logs_enabled }} {{ messages.node_logs_until }}
{{
messages.date_format_app_data_epoch_time.parseDateMessage(
logFlag.expireAt,
messages
)
}}

<Button
color="default"
@click="disableLogs()"
class="btn btn-primary"
:disabled="loading && loading.managingLogFlag"
>
{{ messages.button_node_logs_disable }}
</Button>
<br /><br />
<v-select
v-model="logsExpirationDays"
name="logsExpirationDays"
style="display: inline-block; min-width: 300px;"
:options="logsExpirationDaysMax"
>
<template v-slot:option="option">
{{ option.label }}
</template>
<template v-slot:selected-option="option">
{{ messages.node_logs_disable_after }}: {{ option.label }}
{{ messages.node_logs_days }}
</template>
</v-select>
<Button
color="default"
@click="enableLogs(logsExpirationDays)"
class="btn btn-primary"
:disabled="loading && loading.managingLogFlag"
>
{{ messages.button_node_logs_set_disable_after }}
</Button>
</div>
<div v-else>
{{ messages.node_logs_disabled }}
<Button
color="default"
@click="enableLogs()"
class="btn btn-primary"
:disabled="loading && loading.managingLogFlag"
>
{{ messages.button_node_logs_enable }}
</Button>
</div>
</div>
</div>

<div v-if="configs.sageLauncher">
<div class="text-danger">
<h4>{{ messages.title_network_danger_zone }}</h4>
</div>
<div v-if="errors.has('node')" class="invalid-feedback d-block">
{{ errors.first('node') }}
</div>
<div v-if="errors.has('accountPlan')" class="invalid-feedback d-block">
{{ errors.first('accountPlan') }}
</div>

<span
v-if="
network.state !== 'stopping' &&
network.state !== 'stopped' &&
backups &&
backups.length > 0
"
>
<div style="border: 2px solid #000;">
<Button
color="default"
@click="stopNet()"
class="btn btn-danger"
:disabled="loading && loading.stopping"
>
{{ messages.link_network_action_stop }}
</Button>
<img v-show="loading && loading.stopping" :src="loadingImgSrc" />
{{ messages.link_network_action_stop_description }}

<!-- the next condition is to prevent this info shown twice on this page -->
<span
v-if="!(isSelfNet && network.state === 'running')"
v-html="latestBackupInfoHtml"
>
</span>
</div>
<br />
</span>
<div style="border: 2px solid #000;">
<Button
color="default"
@click="deleteNet()"
class="btn btn-danger"
:disabled="loading && loading.deleting"
>
{{ messages.link_network_action_delete }}
</Button>
<img v-show="loading && loading.deleting" :src="loadingImgSrc" />
{{ messages.link_network_action_delete_description }}
</div>
</div>
</div>
</template>

<style lang="scss" scoped>
@import '../../../_scss/components/form';
@import '../../../_scss/breakpoints';

.bubble-form {
width: 800px;
}
</style>

<script>
import { mapState, mapActions, mapGetters } from 'vuex';
import { util } from '~/_helpers';
import { loadingImgSrc } from '~/_store';

import { Button, Input } from '~/_components/shared';

export default {
components: {
Button,
Input,
},
data() {
return {
user: util.currentUser(),
networkId: this.$route.params.id,
networkUuid: null,
stats: null,
statsError: false,
refresher: null,
stopRefresher: null,
restoreKeyCode: null,
restoreKeyPassword: null,
loadingImgSrc: loadingImgSrc,
checkingForUpgrade: null,
upgradeRefresher: null,
logsExpirationDays: null,
backupDownloadRefresher: null,
};
},
computed: {
...mapState('networks', [
'network',
'newNodeNotification',
'networkStatuses',
'networkNodes',
'networkKeysRequested',
'deletedNetworkUuid',
'loading',
'restoreKey',
'backups',
'logFlag',
]),
...mapState('system', [
'messages',
'configs',
'appLinks',
'upgradeCheck',
'upgrading',
]),
showSetupHelp() {
return (
this.network !== null &&
this.network.uuid !== this.configs.networkUuid &&
(this.network.state === 'running' ||
this.network.state === 'starting' ||
this.network.state === 'restoring')
);
},
addableDeviceTypes: function() {
if (this.messages && this.messages['!addable_device_types']) {
return this.messages['addable_device_types'].split('|');
}
return [];
},
addableDeviceWidth: function() {
return 100.0 / this.addableDeviceTypes.length;
},
networkAppLoginUrl: function() {
return (
'https://' +
this.network.name +
'.' +
this.network.domainName +
'/appLogin?session=' +
util.currentUser().token +
'&uri=/devices'
);
},
nodeRestoreUrl: function() {
return (
'https://' +
this.networkNodes[0].fqdn +
':' +
this.networkNodes[0].sslPort +
'/restore'
);
},
allowQueueBackup: function() {
if (this.backups === null) return false;
if (this.backups.length === 0) return true;

let lastBackupStatus = this.backups[0].status;
return (
lastBackupStatus !== 'queued' &&
lastBackupStatus !== 'backup_in_progress'
);
},
latestBackupInfoHtml: function() {
if (this.backups === null) {
return (
'<hr/>' +
this.messages.label_latest_backup +
'<img src="' +
loadingImgSrc +
'" />'
);
} else if (this.backups.length === 0) {
return '<hr/>' + this.messages.label_no_latest_backup;
} else {
let lastBackup = this.backups[0];
return (
'<hr/>' +
this.messages.label_latest_backup +
' ' +
lastBackup.label +
' <i>' +
lastBackup.status +
'</i> ' +
this.messages.date_format_app_data_epoch_time.parseDateMessage(
lastBackup.ctime,
this.messages
)
);
}
},
isSelfNet: function() {
return (
this.configs &&
this.configs.networkUuid &&
this.network &&
this.network.uuid === this.configs.networkUuid
);
},
isInReadyToRestoreState: function() {
return (
this.network &&
this.network.state === 'restoring' &&
(!this.stats || this.stats.percent === 100) &&
this.networkNodes &&
this.networkNodes.length === 1
);
},
logsExpirationDaysMax: function() {
return [1, 2, 3, 4, 5, 6, 7];
},
preparingLatestBackup: function() {
return this.loading.preparingLatestBackup;
},
},
methods: {
...mapActions('networks', [
'getNetworkById',
'deleteNetwork',
'getStatusesByNetworkId',
'getNodesByNetworkId',
'stopNetwork',
'queueBackup',
'restoreNetwork',
'deleteNetwork',
'requestNetworkKeys',
'retrieveNetworkKeys',
'getBackups',
'resetRestoreKey',
'getLogFlag',
'disableLog',
'enableLog',
'buildLatestBackupPackage',
'latestBackupBuildingStatus',
'latestBackupDownload',
]),
...mapActions('system', [
'getAppLinks',
'loadSystemConfigs',
'checkForUpgrade',
'upgrade',
]),
refreshStatus(userId) {
this.getNetworkById({
userId: userId,
networkId: this.networkId,
messages: this.messages,
errors: this.errors,
});
this.getStatusesByNetworkId({
userId: userId,
networkId: this.networkId,
messages: this.messages,
errors: this.errors,
});
this.getNodesByNetworkId({
userId: userId,
networkId: this.networkId,
nodes: this.nodes,
messages: this.messages,
errors: this.errors,
});

if (this.logFlag === null || this.refresher === null) {
this.getLogFlag({
networkId: this.networkId,
messages: this.messages,
errors: this.errors,
});
}
if (this.backups === null || this.refresher === null) {
// note about the second part of the condition above: if refreshes is turned on, then fetch backups
// from BE only once
this.getBackups({
userId: userId,
networkId: this.networkId,
messages: this.messages,
errors: this.errors,
});
}
},
startStatusRefresher(user) {
// todo: separate refresher for network -- after "stop" we should refresh the status to show it is stopped
this.refresher = setInterval(() => this.refreshStatus(user.uuid), 5000);
},
clearRefresherInterval(refresherId) {
if (refresherId !== null) {
clearInterval(refresherId);
refresherId = null;
}
},
stopRefreshStatus(userId) {
this.getNetworkById({
userId: userId,
networkId: this.networkId,
messages: this.messages,
errors: this.errors,
});
},
stopNet() {
if (this.networkUuid === null) {
alert(this.messages.network_action_stop_not_ready);
} else {
if (confirm(this.messages.confirmation_network_action_stop)) {
this.errors.clear();
this.stopNetwork({
userId: this.user.uuid,
networkId: this.networkUuid,
messages: this.messages,
errors: this.errors,
});
this.clearRefresherInterval(this.refresher);
this.stopRefresher = setInterval(
() => this.stopRefreshStatus(this.user.uuid),
5000
);
}
}
},
queueBckup() {
this.errors.clear();
this.queueBackup({
userId: this.user.uuid,
networkId: this.networkId,
messages: this.messages,
errors: this.errors,
});
},
restoreNet() {
this.errors.clear();
this.restoreNetwork({
userId: this.user.uuid,
networkId: this.networkId,
messages: this.messages,
errors: this.errors,
});
},
deleteNet() {
if (confirm(this.messages.confirmation_network_action_delete)) {
this.errors.clear();
this.deleteNetwork({
userId: this.user.uuid,
networkId: this.networkId,
messages: this.messages,
errors: this.errors,
});
}
},
requestRestoreKey() {
this.errors.clear();
this.requestNetworkKeys({
userId: this.user.uuid,
networkId: this.networkId,
messages: this.messages,
errors: this.errors,
});
},
retrieveRestoreKey() {
this.errors.clear();
this.retrieveNetworkKeys({
userId: this.user.uuid,
networkId: this.networkId,
code: this.restoreKeyCode,
password: this.restoreKeyPassword,
messages: this.messages,
errors: this.errors,
});
},
retrieveBackupPackageBuildingStatus() {
this.errors.clear();
this.latestBackupBuildingStatus({
userId: this.user.uuid,
networkId: this.networkId,
code: this.restoreKeyCode,
messages: this.messages,
errors: this.errors,
});
},
fullyPrepareBackupPackage() {
this.errors.clear();
this.buildLatestBackupPackage({
userId: this.user.uuid,
networkId: this.networkId,
code: this.restoreKeyCode,
password: this.restoreKeyPassword,
});
this.backupDownloadRefresher = setInterval(
this.retrieveBackupPackageBuildingStatus,
5000
);
},
retrieveBackupPackage() {
this.errors.clear();
this.latestBackupDownload({
userId: this.user.uuid,
networkId: this.networkId,
code: this.restoreKeyCode,
messages: this.messages,
errors: this.errors,
});
},

disableLogs() {
this.errors.clear();
this.disableLog({
networkId: this.networkId,
messages: this.messages,
errors: this.errors,
});
},
enableLogs(expirationDays) {
this.errors.clear();
this.enableLog({
disableInDays: expirationDays,
networkId: this.networkId,
messages: this.messages,
errors: this.errors,
});
},
doUpgrade() {
this.upgrade();
},
},
created() {
const user = util.currentUser();
this.refreshStatus(user.uuid);
this.startStatusRefresher(user);
this.restoreKeyCode = this.$route.query.keys_code;
this.getAppLinks(user.locale);
this.loadSystemConfigs();
},
beforeDestroy() {
this.clearRefresherInterval(this.refresher);
this.clearRefresherInterval(this.stopRefresher);
this.clearRefresherInterval(this.backupDownloadRefresher);
this.resetRestoreKey();
},
watch: {
network(net) {
if (net) {
if (net.uuid === 'Not Found')
this.$router.replace({ path: '/bubbles' });
this.networkUuid = net.uuid;
if (net.state !== 'stopping')
this.clearRefresherInterval(this.stopRefresher);
}
},
networkNodes(nodes) {
// console.log('watch.networkNodes: received: '+JSON.stringify(nodes));
},
networkStatuses(stats) {
// console.log('watch.networkStatuses received: '+JSON.stringify(stats));
let latestStats = null;
if (this.network && stats && stats.length && stats.length > 0) {
for (let i = 0; i < stats.length; i++) {
if (
stats[i].network === this.network.uuid &&
(latestStats === null || stats[i].ctime > latestStats.ctime)
) {
latestStats = stats[i];
}
}
}
if (latestStats !== null) {
this.stats = latestStats;
this.statsError = this.stats.messageKey.startsWith('meter_error_');

let isStatsErrorRetry = this.stats.messageKey.startsWith(
'meter_error_retry_'
);
let isStatsCompleted =
this.stats.percent === 100 ||
this.stats.messageKey.startsWith('meter_completed_');
if ((this.statsError && !isStatsErrorRetry) || isStatsCompleted) {
this.clearRefresherInterval(this.refresher);
}
} else {
// status not found for our network
this.clearRefresherInterval(this.refresher);
}
},
deletedNetworkUuid(uuid) {
if (uuid && this.networkUuid && uuid === this.networkUuid) {
this.$router.replace({ path: '/bubbles' });
}
},
configs(c) {
if (c) {
// console.log('watch.configs received: '+JSON.stringify(c));
if (this.user.admin) {
if (this.upgradeRefresher !== null) {
this.checkingForUpgrade = false;
// console.log('watch.configs: found c.jarVersion=' + c.jarVersion + ', c.jarUpgradeAvailable=' + JSON.stringify(c.jarUpgradeAvailable));
// if there is no longer an upgrade available, then the upgrade succeeded
if (c.jarUpgradeAvailable === null) {
console.log('watch.configs: upgraded, reloading...');
window.location.reload();
}
} else if (c.jarVersion && this.checkingForUpgrade === null) {
this.checkingForUpgrade = true;
this.checkForUpgrade();
}
} else {
// console.log('watch.configs: user is not admin, not checking for upgrade');
}
}
},
upgrading(u) {
// console.log('watch.upgrading received: '+JSON.stringify(u));
if (u) {
if (u && this.upgradeRefresher === null) {
// console.log('watch.upgrading: starting refresher');
const vue = this;
this.upgradeRefresher = window.setInterval(() => {
vue.loadSystemConfigs();
}, 5000);
}
}
},
upgradeCheck(u) {
if (u) {
// console.log('watch.upgradeCheck received: '+JSON.stringify(u)+', setting checkingForUpgrade = true');
this.checkingForUpgrade = true;
const vue = this;
window.setTimeout(() => {
// console.log('reloading system configs in response to upgrade check')
vue.loadSystemConfigs();
this.checkingForUpgrade = false;
}, 10000);
}
},
preparingLatestBackup(isStillPreparing) {
if (this.backupDownloadRefresher && isStillPreparing === false) {
this.clearRefresherInterval(this.backupDownloadRefresher);
this.retrieveBackupPackage();
}
},
},
};
</script>

+ 5
- 0
src/_router/index.js View File

@@ -123,6 +123,11 @@ export const router = new Router({
path: 'devices',
component: () => import('~/_pages/main/account/Devices'),
},

{
path: 'bubble/:id',
component: () => import('~/_pages/main/bubble/Network'),
},
],
},
{


+ 2
- 1
webpack.config.dev.js View File

@@ -8,7 +8,8 @@ module.exports = webpackMerge.merge(require('./webpack.config.js'), {
mode: 'development',
devServer: {
proxy: {
'/api': 'http://beta.bubv.net:8888',
// '/api': 'http://beta.bubv.net:8888',
'/api': 'http://shent-ih538-8m85f-rj97o.bubv.net'
// '/api': 'https://beta.bubv.net/',
},
},


Write Preview
Loading…
Cancel
Save