From c8d667f5c5fbff32d209a47af94368a5ae80795a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20Aime?= Date: Fri, 19 Feb 2021 15:31:30 +0100 Subject: [PATCH] Adding few stuff related to updates --- app/frontend/src/locales/cat.json | 7 +++++++ app/frontend/src/locales/en.json | 7 +++++++ app/frontend/src/locales/es.json | 7 +++++++ app/frontend/src/locales/fr.json | 7 +++++++ app/frontend/src/views/home.vue | 1 - app/frontend/src/views/report.vue | 3 +-- app/frontend/src/views/splash-screen.vue | 4 ++-- app/frontend/src/views/update.vue | 12 ++++++------ app/frontend/src/views/wifi-select.vue | 3 +-- 9 files changed, 38 insertions(+), 13 deletions(-) diff --git a/app/frontend/src/locales/cat.json b/app/frontend/src/locales/cat.json index a21d106..07d182c 100644 --- a/app/frontend/src/locales/cat.json +++ b/app/frontend/src/locales/cat.json @@ -78,5 +78,12 @@ "tap_msg": "Podeu tocar la tecla USB per iniciar una nova captura.", "capture_download": "La descàrrega de la captura començarà ...", "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" } } \ No newline at end of file diff --git a/app/frontend/src/locales/en.json b/app/frontend/src/locales/en.json index 9a4097b..b418328 100644 --- a/app/frontend/src/locales/en.json +++ b/app/frontend/src/locales/en.json @@ -78,5 +78,12 @@ "tap_msg": "You can tap the USB key to start a new capture.", "capture_download": "The capture download is going to start...", "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" } } \ No newline at end of file diff --git a/app/frontend/src/locales/es.json b/app/frontend/src/locales/es.json index f12ef84..e1519aa 100644 --- a/app/frontend/src/locales/es.json +++ b/app/frontend/src/locales/es.json @@ -78,5 +78,12 @@ "tap_msg": "Puede tocar la llave USB para iniciar una nueva captura", "capture_download": "La descarga de la captura va a comenzar ...", "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" } } \ No newline at end of file diff --git a/app/frontend/src/locales/fr.json b/app/frontend/src/locales/fr.json index 855ac23..900a04b 100644 --- a/app/frontend/src/locales/fr.json +++ b/app/frontend/src/locales/fr.json @@ -78,5 +78,12 @@ "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...", "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" } } \ No newline at end of file diff --git a/app/frontend/src/views/home.vue b/app/frontend/src/views/home.vue index d5dc838..d65b728 100644 --- a/app/frontend/src/views/home.vue +++ b/app/frontend/src/views/home.vue @@ -14,7 +14,6 @@ export default { props: { saved_ssid: String, list_ssids: Array, internet: Boolean }, data() { return { - translation: {}, current_version:"" } }, diff --git a/app/frontend/src/views/report.vue b/app/frontend/src/views/report.vue index d445c04..ced0259 100644 --- a/app/frontend/src/views/report.vue +++ b/app/frontend/src/views/report.vue @@ -99,8 +99,7 @@ export default { name: 'report', data() { return { - results: true, - translation: {} + results: true } }, props: { diff --git a/app/frontend/src/views/splash-screen.vue b/app/frontend/src/views/splash-screen.vue index d61362e..91188b0 100644 --- a/app/frontend/src/views/splash-screen.vue +++ b/app/frontend/src/views/splash-screen.vue @@ -20,7 +20,7 @@ }, methods: { internet_check: function() { - axios.get('/api/network/status', { timeout: 10000 }) + axios.get('/api/network/status', { timeout: 30000 }) .then(response => { if (response.data.internet) this.internet = true if (window.config.iface_out.charAt(0) == 'e') { @@ -32,7 +32,7 @@ .catch(err => (console.log(err))) }, get_wifi_networks: function() { - axios.get('/api/network/wifi/list', { timeout: 10000 }) + axios.get('/api/network/wifi/list', { timeout: 30000 }) .then(response => { this.list_ssids = response.data.networks this.goto_home(); diff --git a/app/frontend/src/views/update.vue b/app/frontend/src/views/update.vue index 10a7a67..e249e7a 100644 --- a/app/frontend/src/views/update.vue +++ b/app/frontend/src/views/update.vue @@ -1,11 +1,11 @@ @@ -45,7 +45,7 @@ if(response.data.status) { if(response.data.message == "Update successfully launched"){ 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); } } }) diff --git a/app/frontend/src/views/wifi-select.vue b/app/frontend/src/views/wifi-select.vue index 50c2d9c..a76eb1e 100644 --- a/app/frontend/src/views/wifi-select.vue +++ b/app/frontend/src/views/wifi-select.vue @@ -72,8 +72,7 @@ export default { virtual_keyboard: window.config.virtual_keyboard, have_internet: false, enter_creds: false, - refreshing: false, - translation: {} + refreshing: false } }, props: {