From 08facab09f83f6ccf94c12c6352063c1508b69e4 Mon Sep 17 00:00:00 2001
From: Dmitry Borisenko <49808844+DmitryBorisenko33@users.noreply.github.com>
Date: Sun, 14 Aug 2022 17:13:49 +0200
Subject: [PATCH] =?UTF-8?q?toggle=20=D0=B2=20=D0=BF=D1=80=D0=BE=D1=86?=
 =?UTF-8?q?=D0=B5=D1=81=D1=81=D0=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/index.html         |  2 +-
 src/App.svelte            | 18 ++++++++++++------
 src/widgets/Toggle.svelte | 11 ++++++++++-
 3 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/public/index.html b/public/index.html
index 1fee065..92bec14 100644
--- a/public/index.html
+++ b/public/index.html
@@ -4,7 +4,7 @@
 	<meta charset='utf-8'>
 	<meta name='viewport' content='width=device-width,initial-scale=1'>
 
-	<title>IoT Manager 4.1.2</title>
+	<title>IoT Manager 4.1.3</title>
 
 	<link rel='icon' type='image/png' href='/favicon.ico'>
 	<link rel='stylesheet' href='/build/bundle.css'>
diff --git a/src/App.svelte b/src/App.svelte
index b3ab781..2f02591 100644
--- a/src/App.svelte
+++ b/src/App.svelte
@@ -40,8 +40,8 @@
 
   //****************************************************variable section**********************************************************/
   //******************************************************************************************************************************/
-  let myip = document.location.hostname;
-  //let myip = "192.168.88.224";
+  //let myip = document.location.hostname;
+  let myip = "192.168.88.228";
 
   //Flags
   let firstDevListRequest = true;
@@ -497,16 +497,17 @@
     reader.readAsText(bb);
     reader.onload = () => {
       let devLayout = JSON.parse(reader.result);
-      udateStatusOfDevWidgets(devLayout);
+      udateStatusOfDevWidgets(devLayout, ws);
       layoutJson = layoutJson.concat(devLayout);
       sortingLayout();
     };
   }
 
-  function udateStatusOfDevWidgets(devLayout) {
+  function udateStatusOfDevWidgets(devLayout, ws) {
     for (const [key, value] of Object.entries(paramsJson)) {
       for (let i = 0; i < devLayout.length; i++) {
         let topic = devLayout[i].topic;
+        devLayout[i].ws = ws;
         topic = topic.substring(topic.lastIndexOf("/") + 1, topic.length);
         if (key === topic) {
           console.log("[i]", "value " + topic + " updated");
@@ -686,8 +687,12 @@
 
   function wsPush(ws, topic, status) {
     let msg = topic + " " + status;
-    if (debug) console.log("[i]", "send to ws msg:", msg);
-    wsSendMsg(ws, msg);
+    if (debug) console.log("[i]", "ws: ", ws, msg);
+    //if (ws) {
+    wsSendMsg(ws, "/control| " + status); //  "/tst|"
+    //} else {
+    //  console.log("[i]", "ws undefined");
+    //}
   }
 
   function wsTestMsgTask() {
@@ -1117,6 +1122,7 @@
           <Route path="/">
             <DashboardPage show={dashReady} layoutJson={layoutJson} pages={pages} wsPush={(ws, topic, status) => wsPush(ws, topic, status)} />
             <!--<button class="btn-lg" on:click={() => createFinalLayout()}>{"Test"}</button>-->
+            <textarea value={JSON.stringify(layoutJson)} class="ipt-big h-40 w-full" />
           </Route>
           <Route path="/config">
             <ConfigPage show={configReady} configJson={configJson} widgetsJson={widgetsJson} itemsJson={itemsJson} bind:scenarioTxt saveConfig={() => saveConfig()} rebootEsp={() => rebootEsp()} />
diff --git a/src/widgets/Toggle.svelte b/src/widgets/Toggle.svelte
index b8b7c60..f3587b7 100644
--- a/src/widgets/Toggle.svelte
+++ b/src/widgets/Toggle.svelte
@@ -1,7 +1,11 @@
 <script>
+  import App from "../App.svelte";
+
   export let widget;
   export let value;
+
   value = value;
+
   export let wsPush = (ws, topic, status) => {};
 </script>
 
@@ -13,10 +17,15 @@
   <div class="flex justify-end w-1/3">
     <label for={widget.topic} class="items-center cursor-pointer">
       <div class="relative">
-        <input on:change={() => ((widget["send"] = true), wsPush(widget.ws, widget.topic, widget.status))} bind:value={widget.status} id={widget.topic} type="checkbox" class="sr-only" />
+        <input on:change={() => ((widget["send"] = true), wsPush(widget.ws, widget.topic, widget.status))} bind:checked={widget.status} id={widget.topic} type="checkbox" class="sr-only" />
         <div class="block bg-gray-600 w-10 h-6 rounded-full" />
         <div class="dot {widget['send'] == true ? 'bg-red-400' : 'bg-white'} absolute left-1 top-1  w-4 h-4 rounded-full transition" />
       </div>
+      {#if widget.status}
+        <p>yes</p>
+      {:else}
+        <p>no</p>
+      {/if}
     </label>
   </div>
 </div>