From b89a78c0a4e6674a25572a36f14c3bf89a3b2b4f Mon Sep 17 00:00:00 2001
From: bogdan <bogd@live.ru>
Date: Sun, 20 Aug 2023 15:00:44 +0200
Subject: [PATCH] network and helpers moved to webguicomp

---
 CardActions.vue        |  2 +-
 SelectWiFiDialog.vue   |  2 +-
 cards/EthSetCard.vue   |  2 +-
 cards/FirmwareCard.vue |  2 +-
 cards/HomeCard.vue     |  4 ++--
 cards/MQTT1Card.vue    |  2 +-
 cards/MQTT2Card.vue    |  2 +-
 cards/SNTPCard.vue     |  2 +-
 cards/StatCard.vue     |  4 ++--
 cards/SystemCard.vue   |  2 +-
 helpers.js             | 37 +++++++++++++++++++++++++++++++++++++
 network.js             |  2 --
 12 files changed, 49 insertions(+), 14 deletions(-)
 create mode 100644 helpers.js

diff --git a/CardActions.vue b/CardActions.vue
index 8613ebc..5426e70 100644
--- a/CardActions.vue
+++ b/CardActions.vue
@@ -8,6 +8,6 @@
 
 <script setup>
 import { SendAndRequest } from "components/webguicomp/network";
-import { defineProps } from "vue";
+//import { defineProps } from "vue";
 const props = defineProps(['senddata']);
 </script>
diff --git a/SelectWiFiDialog.vue b/SelectWiFiDialog.vue
index 7b56675..6b469e2 100644
--- a/SelectWiFiDialog.vue
+++ b/SelectWiFiDialog.vue
@@ -21,7 +21,7 @@
 
 <script setup>
 import { useDialogPluginComponent } from 'quasar'
-import { PostData } from "boot/network";
+import { PostData } from "components/webguicomp/network";
 import { reactive, ref } from 'vue';
 
 defineEmits([
diff --git a/cards/EthSetCard.vue b/cards/EthSetCard.vue
index 9618587..00fdbdd 100644
--- a/cards/EthSetCard.vue
+++ b/cards/EthSetCard.vue
@@ -24,7 +24,7 @@
 </template>
 <script setup>
 import { reactive } from "vue";
-import { SendAndRequest } from "boot/network";
+import { SendAndRequest } from "components/webguicomp/network";
 import CardActions from "components/webguicomp/CardActions.vue"
 
 defineOptions({
diff --git a/cards/FirmwareCard.vue b/cards/FirmwareCard.vue
index 81e8e14..cfb94f9 100644
--- a/cards/FirmwareCard.vue
+++ b/cards/FirmwareCard.vue
@@ -21,7 +21,7 @@
 
 <script setup>
 import { reactive } from "vue";
-import { SendAndRequest } from "boot/network";
+import { SendAndRequest } from "components/webguicomp/network";
 import CardActions from "components/webguicomp/CardActions.vue"
 
 defineOptions({
diff --git a/cards/HomeCard.vue b/cards/HomeCard.vue
index 8ae266f..8f76344 100644
--- a/cards/HomeCard.vue
+++ b/cards/HomeCard.vue
@@ -16,8 +16,8 @@
 
 <script setup>
 import { computed, onUnmounted, reactive, onMounted } from "vue";
-import { SendAndRequest } from "boot/network";
-import { secondsToHms } from "boot/helpers"
+import { SendAndRequest } from "components/webguicomp//network";
+import { secondsToHms } from "components/webguicomp/helpers"
 
 defineOptions({
   name: 'HomeCard'
diff --git a/cards/MQTT1Card.vue b/cards/MQTT1Card.vue
index 600e480..ea0f281 100644
--- a/cards/MQTT1Card.vue
+++ b/cards/MQTT1Card.vue
@@ -23,7 +23,7 @@
 
 <script setup>
 import { reactive } from "vue";
-import { SendAndRequest } from "boot/network";
+import { SendAndRequest } from "components/webguicomp//network";
 import CardActions from "components/webguicomp/CardActions.vue"
 
 
diff --git a/cards/MQTT2Card.vue b/cards/MQTT2Card.vue
index 25863c3..a4b2e69 100644
--- a/cards/MQTT2Card.vue
+++ b/cards/MQTT2Card.vue
@@ -23,7 +23,7 @@
 
 <script setup>
 import { reactive } from "vue";
-import { SendAndRequest } from "boot/network";
+import { SendAndRequest } from "components/webguicomp//network";
 import CardActions from "components/webguicomp/CardActions.vue"
 
 const init = {
diff --git a/cards/SNTPCard.vue b/cards/SNTPCard.vue
index dae7c60..beb1bac 100644
--- a/cards/SNTPCard.vue
+++ b/cards/SNTPCard.vue
@@ -19,7 +19,7 @@
 
 <script setup>
 import { reactive } from "vue";
-import { SendAndRequest } from "boot/network";
+import { SendAndRequest } from "components/webguicomp/network";
 import CardActions from "components/webguicomp/CardActions.vue"
 
 
diff --git a/cards/StatCard.vue b/cards/StatCard.vue
index 601ddcf..5e4b130 100644
--- a/cards/StatCard.vue
+++ b/cards/StatCard.vue
@@ -30,8 +30,8 @@
 
 <script setup>
 import { computed, onUnmounted, reactive, onMounted } from "vue";
-import { SendAndRequest } from "boot/network";
-import { secondsToHms } from "boot/helpers"
+import { SendAndRequest } from "components/webguicomp/network";
+import { secondsToHms } from "components/webguicomp/helpers"
 
 defineOptions({
   name: 'StatCard'
diff --git a/cards/SystemCard.vue b/cards/SystemCard.vue
index 9ec5524..2697a41 100644
--- a/cards/SystemCard.vue
+++ b/cards/SystemCard.vue
@@ -24,7 +24,7 @@
 
 <script setup>
 import { reactive } from "vue";
-import { SendAndRequest } from "boot/network";
+import { SendAndRequest } from "components/webguicomp/network"
 import CardActions from "components/webguicomp/CardActions.vue"
 
 defineOptions({
diff --git a/helpers.js b/helpers.js
new file mode 100644
index 0000000..54ab76f
--- /dev/null
+++ b/helpers.js
@@ -0,0 +1,37 @@
+import { Dialog } from "quasar";
+
+function secondsToHms(d) {
+  d = Number(d);
+  var dd = Math.floor(d / 86400);
+  var h = Math.floor(d % 86400 / 3600);
+  var m = Math.floor(d % 3600 / 60);
+  var s = Math.floor(d % 3600 % 60);
+  return (' ' + dd + 'd ' + (h < 10 ? "0" : "") + h + ":" + (m < 10 ? "0" : "") + m + ":" + (s < 10 ? "0" : "") + s);
+}
+
+function ShowDelayDialog(mess, time, onexpire) {
+  const dialog = Dialog.create({
+    message: '',
+    progress: true,
+    persistent: true, // we want the user to not be able to close it
+    ok: false // we want the user to not be able to close it
+  })
+
+  let percentage = 0
+  const interval = setInterval(() => {
+    percentage = Math.min(100, percentage + 10000 / time);
+    dialog.update({ message: `${mess} ${percentage}%` })
+
+
+    // if we are done, we're gonna close it
+    if (percentage === 100) {
+      clearInterval(interval)
+      setTimeout(() => {
+        dialog.hide();
+        onexpire();
+      }, 350)
+    }
+  }, 100)
+}
+
+export { secondsToHms, ShowDelayDialog }
diff --git a/network.js b/network.js
index 50ed1bb..709a918 100644
--- a/network.js
+++ b/network.js
@@ -22,8 +22,6 @@ function ShowSaveDialog(apltype) {
   }, 100)
 }
 
-
-
 function PostData(varlist, messtype, applytype, onfinished) {
   var pld = {};
   var data = {};