Adding few stuff related to updates

This commit is contained in:
Félix Aime 2021-02-19 15:31:30 +01:00
parent dc37b6a2da
commit c8d667f5c5
9 changed files with 38 additions and 13 deletions

View File

@ -78,5 +78,12 @@
"tap_msg": "Podeu tocar la tecla USB per iniciar una nova captura.", "tap_msg": "Podeu tocar la tecla USB per iniciar una nova captura.",
"capture_download": "La descàrrega de la captura començarà ...", "capture_download": "La descàrrega de la captura començarà ...",
"start_capture_btn": "Inicia una altra captura" "start_capture_btn": "Inicia una altra captura"
},
"update": {
"tinycheck_needs": "TinyCheck ha d´actualitzar-se a la propera versió",
"please_click": "Feu click al botó de sota per actualitzar",
"the_process": "El procés pot trigar uns minuts, si us plau esperi ...",
"update_finished": "Actualització finalitzada, actualitzant la interfície...",
"update_it": "Actualitzar ara"
} }
} }

View File

@ -78,5 +78,12 @@
"tap_msg": "You can tap the USB key to start a new capture.", "tap_msg": "You can tap the USB key to start a new capture.",
"capture_download": "The capture download is going to start...", "capture_download": "The capture download is going to start...",
"start_capture_btn": "Start another capture" "start_capture_btn": "Start another capture"
},
"update": {
"tinycheck_needs": "TinyCheck needs to be updated to the next version",
"please_click": "Please click on the button below to update it.",
"the_process": "The process can take few minutes, please wait...",
"update_finished": "Update finished, let's refresh the interface...",
"update_it": "Update it now"
} }
} }

View File

@ -78,5 +78,12 @@
"tap_msg": "Puede tocar la llave USB para iniciar una nueva captura", "tap_msg": "Puede tocar la llave USB para iniciar una nueva captura",
"capture_download": "La descarga de la captura va a comenzar ...", "capture_download": "La descarga de la captura va a comenzar ...",
"start_capture_btn": "Iniciar otra captura" "start_capture_btn": "Iniciar otra captura"
},
"update": {
"tinycheck_needs": "TinyCheck debe actualizarse a la próxima versión",
"please_click": "Haga click en el botón de abajo para actualizar",
"the_process": "El proceso puede tardar unos minutos, por favor espere ...",
"update_finished": "Actualización finalizada, actualizando la interfaz...",
"update_it": "Actualizar ahora"
} }
} }

View File

@ -78,5 +78,12 @@
"tap_msg": "Vous pouvez appuyer sur l'animation pour lancer une nouvelle capture.", "tap_msg": "Vous pouvez appuyer sur l'animation pour lancer une nouvelle capture.",
"capture_download": "Le téléchargement de la capture va se lancer...", "capture_download": "Le téléchargement de la capture va se lancer...",
"start_capture_btn": "Lancer une nouvelle capture" "start_capture_btn": "Lancer une nouvelle capture"
},
"update": {
"tinycheck_needs": "TinyCheck doit être mis à jour",
"please_click": "Cliquez sur le bouton ci-dessous pour le mettre à jour",
"the_process": "La mise à jour peut prendre plusieurs minutes, merci d'attendre...",
"update_finished": "Mise à jour finie, vous allez être redirigé...",
"update_it": "Mettre TinyCheck bà jour"
} }
} }

View File

@ -14,7 +14,6 @@ export default {
props: { saved_ssid: String, list_ssids: Array, internet: Boolean }, props: { saved_ssid: String, list_ssids: Array, internet: Boolean },
data() { data() {
return { return {
translation: {},
current_version:"" current_version:""
} }
}, },

View File

@ -99,8 +99,7 @@ export default {
name: 'report', name: 'report',
data() { data() {
return { return {
results: true, results: true
translation: {}
} }
}, },
props: { props: {

View File

@ -20,7 +20,7 @@
}, },
methods: { methods: {
internet_check: function() { internet_check: function() {
axios.get('/api/network/status', { timeout: 10000 }) axios.get('/api/network/status', { timeout: 30000 })
.then(response => { .then(response => {
if (response.data.internet) this.internet = true if (response.data.internet) this.internet = true
if (window.config.iface_out.charAt(0) == 'e') { if (window.config.iface_out.charAt(0) == 'e') {
@ -32,7 +32,7 @@
.catch(err => (console.log(err))) .catch(err => (console.log(err)))
}, },
get_wifi_networks: function() { get_wifi_networks: function() {
axios.get('/api/network/wifi/list', { timeout: 10000 }) axios.get('/api/network/wifi/list', { timeout: 30000 })
.then(response => { .then(response => {
this.list_ssids = response.data.networks this.list_ssids = response.data.networks
this.goto_home(); this.goto_home();

View File

@ -1,11 +1,11 @@
<template> <template>
<div class="center"> <div class="center">
<p><strong>TinyCheck needs to be updated to the next version ({{next_version}}).</strong><br /> <p><strong>{{ $t("update.tinycheck_needs") }} ({{next_version}}).</strong><br />
<span v-if="!update_launched">Please click on the button below to update it.</span> <span v-if="!update_launched">{{ $t("update.please_click") }}</span>
<span v-if="update_launched&&!update_finished">The process can take few minutes, please wait...</span> <span v-if="update_launched&&!update_finished">{{ $t("update.the_process") }}</span>
<span v-if="update_launched&&update_finished" class="color-green"> Update finished, let's refresh the interface...</span> <span v-if="update_launched&&update_finished" class="color-green"> {{ $t("update.update_finished") }}</span>
</p> </p>
<button class="btn btn-primary" :class="[ update_launched ? 'loading' : '' ]" v-on:click="launch_update()" v-if="!update_finished">Update it now</button> <button class="btn btn-primary" :class="[ update_launched ? 'loading' : '' ]" v-on:click="launch_update()" v-if="!update_finished">{{ $t("update.update_it") }}</button>
</div> </div>
</template> </template>
@ -45,7 +45,7 @@
if(response.data.status) { if(response.data.status) {
if(response.data.message == "Update successfully launched"){ if(response.data.message == "Update successfully launched"){
this.update_launched = true this.update_launched = true
this.check_interval = setInterval(function(){ this.check_version(); }.bind(this), 1000); this.check_interval = setInterval(function(){ this.check_version(); }.bind(this), 3000);
} }
} }
}) })

View File

@ -72,8 +72,7 @@ export default {
virtual_keyboard: window.config.virtual_keyboard, virtual_keyboard: window.config.virtual_keyboard,
have_internet: false, have_internet: false,
enter_creds: false, enter_creds: false,
refreshing: false, refreshing: false
translation: {}
} }
}, },
props: { props: {