From aa67ba1b8016697571854f346f99d54af8cd45e4 Mon Sep 17 00:00:00 2001 From: Dmitry Borisenko <49808844+DmitryBorisenko33@users.noreply.github.com> Date: Mon, 25 Oct 2021 16:50:31 +0700 Subject: [PATCH] some changes --- examples/Dashboard.svelte | 1676 ------------------------------------ examples/Setup.svelte | 1696 ------------------------------------- examples/parts.js | 1 - src/App.svelte | 41 +- src/widgets/Input.svelte | 2 +- src/widgets/Toggle.svelte | 18 +- 6 files changed, 26 insertions(+), 3408 deletions(-) delete mode 100644 examples/Dashboard.svelte delete mode 100644 examples/Setup.svelte delete mode 100644 examples/parts.js diff --git a/examples/Dashboard.svelte b/examples/Dashboard.svelte deleted file mode 100644 index e0dfa64..0000000 --- a/examples/Dashboard.svelte +++ /dev/null @@ -1,1676 +0,0 @@ - - - - -{#if connectionType == "MQTT"} - {#if MQTTconnections[1]} -
- -
- {/if} -{:else} -
- - -

- - {#each devices as NetworkDevice, i} - {#if !NetworkDevice.status && NetworkDevice.status != false} -

- {NetworkDevice.deviceIP} - {NetworkDevice.deviceName} waiting -

- {/if} - {#if NetworkDevice.status == true} -

- {NetworkDevice.deviceIP} - {NetworkDevice.deviceName} connected -

- {/if} - {#if NetworkDevice.status == false} -

- {NetworkDevice.deviceIP} - {NetworkDevice.deviceName} disconnected -

- {/if} - {/each} -
-
-{/if} - -
- 🔆 -
- -{#if connectionType == "MQTT"} - {#if connected == false} -
- MQTT -
- {#if MQTTconnections[0].mqtt_port == ""} -
- Для подключения MQTT обязателььно должен быть указан порт "MQTT wss port - (TLS)" -
- {/if} - {/if} - {#if connected == true} -
- MQTT -
- {/if} -{:else if connected == true} -
- localNET -
-{:else} -
- localNET -
-{/if} - -{#if prefics[2]} -
- -
-{/if} - - - -{#if !pages[0]} -

-{/if} - - -

- {#each pages as page, i} - - {/each} -

-{#if newPage == 1} -
- - {#each pages as pagesName, i} - - - {#each wigets as widget, i} - - - {#if !selectedprefics || selectedprefics === widget.prefics} - {#if widget.page === pagesName.page} - - - {#if widget.widget === "toggle"} - - - {/if} - - {#if widget.widget === "anydata"} - - - - {/if} - - {#if widget.widget === "input"} - - - {:else if widget.type === "time"} - - {:else} - - {/if} - {/if} - - {#if widget.widget == "btn"} - - - {/if} - - {#if widget.widget === "select"} - - - {/if} - - {#if widget.widget === "chart"} - - {/if} - - {#if widget.widget === "range"} - - {/if} - - {/if} - {/if} - {/each} -
- {widget.descr} - - - - {#if widget.status == "1"} - - - - {:else} - - - - {/if} - - {#if widget.descrColor} - - {widget.descr} - - {:else} - - {widget.descr} - -
- {!widget.nodeInfo ? "" : widget.nodeInfo} -
-
- {/if} -
- - - - {#if Array.isArray(widget.color) && widget.status} - {#each widget.color as anydataColor, i} - - {#if anydataColor.level && widget.status < anydataColor.level && widget.status > widget.color[i - 1].level && i > 0} - {Math.round(widget.status * 10) / 10 - ? Math.round(widget.status * 10) / 10 - : widget.status}{!widget.after - ? "" - : widget.after} - {/if} - {/each} - - {:else if widget.color && widget.status} - {Math.round(widget.status * 10) / 10 - ? Math.round(widget.status * 10) / 10 - : widget.status}{widget.after} - - {:else if !widget.status} - ... - - {:else if widget.status} - {Math.round(widget.status * 10) / 10 - ? Math.round(widget.status * 10) / 10 - : widget.status}{!widget.after - ? "" - : widget.after} - {:else} - - {!widget.status ? "" : widget.status}{!widget.after - ? "" - : widget.after} - - {/if} - {widget.descr} - {#if widget.type === "number"} - -
- - - -
-
-
- -
-
- -
{widget.descr} - - {#if widget.status != 0 && widget.status != 1} -
- {:else} -
- {/if} -
{widget.descr} - - {#if widget.status == 0} -
- {:else} -
- {/if} -
- {#if widget.status} - {#if widget.topic.includes("_2")} - - {:else if !widget.topic.includes("_1")} - {widget.descr} - - {/if} - {/if} - -
- {widget.descr} - {widget.status / 10} - {widget.after} -
- - -
-
- {/each} -
-
-{/if} - - -

-
developed by: avaks@meef.ru
- - diff --git a/examples/Setup.svelte b/examples/Setup.svelte deleted file mode 100644 index fbe7291..0000000 --- a/examples/Setup.svelte +++ /dev/null @@ -1,1696 +0,0 @@ - - - - {#if connectionType == "MQTT"}{:else} -
- - -

- - {#each devices as NetworkDevice, i} - {#if !NetworkDevice.status && NetworkDevice.status != false} -

- {NetworkDevice.deviceIP} - {NetworkDevice.deviceName} waiting -

- {/if} - {#if NetworkDevice.status == true} -

- {NetworkDevice.deviceIP} - {NetworkDevice.deviceName} connected -

- {/if} - {#if NetworkDevice.status == false} -

- {NetworkDevice.deviceIP} - {NetworkDevice.deviceName} disconnected -

- {/if} - {/each} -
-
- {/if} - {#if connectionType == "MQTT"} -
- MQTT -
- {:else} -
- localNET -
- {/if} - -
- 🔆 -
- - {#if Conf != ""} - - Network Map - - {#if NetworkMap == ""} - Файл с картой сети еще не создан - {/if} -
Навсех добавляемых ESP должнабыть такая же прошивка !!!
- - - {#if NetworkMap != ""} - {#each NetworkMap as espconf, m} - - - - - - {/each} - - - - - - - {:else} - - - - - {/if} -
IP - Name
IPName
IPName
-
-
После добавления ESP нажмите "F5" что обновить страницу
-
- - Select ESP - - - - - - - WIFI - {#if edit == true} - - - - - - - - - - -
- - - - - - - - - - - - -
- - - - - - -
ESP name - - ?
WIFI name?
WIFI password?
AP name?
- {/if} -
- - - - Users - {#if edit == true} - - - - - - - - - - - - - -
WEB admin login?
WEB admin password?
- {/if} -
- - - - Time - {#if edit == true} - - - - - - - - - - - - - -
Time Zone?
NTP server?
- {/if} -
- - - - MQTT - Готовые шаблоны - - - - - {#if edit == true} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - -




- - - Rreserve MQTT -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
MQTT server?
MQTT port (TCP)?
MQTT wss port (TLS)?
mqttPrefix?
mqttUser?
mqttPass?
mqttPath?
Web dashbord over MQTT -
- - - - - - - - - - - {#if Conf[i].webMQTT == true} - - - {(urlMQTT = Cookies.get("urlMQTT"))} - {/if} -
-
?
MQTT server ?
MQTT port?
MQTT wss port?
mqttPrefix?
mqttUser?
mqttPass?
mqttPath?
- {/if} -
- - - - Telegram - {#if edit == true} - -
- - - - - - - - - - - - - - - - - - -
- - - - - - - - - - -
Enable Telegram - - - {#if Conf[i]["telegonof"] == 0} - {(Conf[i]["telegonof"] = false)} - {:else} - {(Conf[i]["telegonof"] = true)} - {/if} - ?
Enable incoming messages - - - {#if Conf[i]["teleginput"] == 0} - {(Conf[i]["teleginput"] = false)} - {:else} - {(Conf[i]["teleginput"] = true)} - {/if} - ?
Auto get chat ID - - {#if Conf[i]["autos"] == 0} - {(Conf[i]["autos"] = false)} - {:else} - {(Conf[i]["autos"] = true)} - {/if} - ?
Telegram API token?
Telegram chat ID?
- {/if} -
- - - - UART - {#if edit == true} - - - - - - - - - - -
- - - - - - - - - - - - - - - -
Enable UART - - ?
Send all messages to UART?
UART speed?
PIN TX?
PIN RX?
- {/if} -
- - - - Developer settings - {#if edit == true} - - - - - - - - - - - - - - - - - {:else} - - {/if} - - - - - - - {:else} - - {/if} - - - - -
Update server?
Split point graphs?
Use a dark theme - {#if Conf[i]["darktheme"] == "false"} - ?
Console LOG - {#if Conf[i]["consolelog"] == "false"} - ?
- {/if} -
- - - Editor - {#if edit == true} -
- - - - -

- -

-
- {/if} -
- {:else} -

- {/if} -

-
developed by avaks@meef.ru
- - - diff --git a/examples/parts.js b/examples/parts.js deleted file mode 100644 index 43ee04e..0000000 --- a/examples/parts.js +++ /dev/null @@ -1 +0,0 @@ -{syntaxHighlight(JSON.stringify(wigets))} \ No newline at end of file diff --git a/src/App.svelte b/src/App.svelte index 649ce7d..ed1a4e0 100644 --- a/src/App.svelte +++ b/src/App.svelte @@ -246,32 +246,15 @@ @tailwind utilities; @layer components { - .btn-indigo { - @apply py-2 px-4 bg-indigo-500 text-white font-semibold rounded-lg shadow-md hover:bg-indigo-700 focus:outline-none focus:ring-2 focus:ring-indigo-400 focus:ring-opacity-75; - } - .block-psn-center { - @apply grid place-items-center mx-2 sm:my-auto; - } - .card2 { - @apply w-11/12 sm:w-8/12 md:w-6/12 lg:w-5/12 2xl:w-4/12 p-2 sm:p-2 md:p-2 lg:p-2 xl:px-8 xl:py-4 2xl:px-8 2xl:py-4 my-2 bg-white rounded-lg shadow-md lg:shadow-lg; - } - .widget-input { - @apply content-center pr-4 py-1 bg-gray-200 appearance-none border-2 border-gray-200 rounded w-full text-gray-700 leading-tight focus:outline-none focus:bg-white text-right; - } - .json-input { - @apply content-center pr-4 py-1 bg-gray-200 appearance-none border-2 border-gray-200 rounded w-full text-gray-700 leading-tight focus:outline-none focus:bg-white focus:border-indigo-500; - } - .widget-after { - @apply pr-4 block text-gray-500 font-bold md:text-right; - } + /*==================================================cards grid=====================================================*/ + /* grid for cards */ .cards-grid { @apply grid gap-4 grid-cols-1 sm:grid-cols-2 lg:grid-cols-3 xl:grid-cols-3 2xl:grid-cols-3 justify-items-center; } + /* grid for cards for full screen */ .cards-grid-inline { @apply grid grid-cols-1 justify-items-center; } - /*==================================================cards grid=====================================================*/ - /*=============================================card and items inside===============================================*/ /* 1. paddig and style for card */ .card { @@ -300,11 +283,21 @@ @apply pr-4 text-gray-500 font-bold; } /* 6. widget width*/ - .widget-width { + .widget-width-input { @apply w-full sm:w-1/3 lg:w-1/3 xl:w-1/3 2xl:w-1/3; } - .widget-width-1-3 { - @apply w-1/3; + .widget-width-toggle { + @apply flex justify-end w-1/3; + } + /*====================================================others=====================================================*/ + .btn-indigo { + @apply py-2 px-4 bg-indigo-500 text-white font-semibold rounded-lg shadow-md hover:bg-indigo-700 focus:outline-none focus:ring-2 focus:ring-indigo-400 focus:ring-opacity-75; + } + .widget-input { + @apply content-center pr-4 py-1 bg-gray-200 appearance-none border-2 border-gray-200 rounded w-full text-gray-700 leading-tight focus:outline-none focus:bg-white text-right; + } + .json-input { + @apply content-center pr-4 py-1 bg-gray-200 appearance-none border-2 border-gray-200 rounded w-full text-gray-700 leading-tight focus:outline-none focus:bg-white focus:border-indigo-500; } } @@ -427,6 +420,6 @@ /* Toggle */ input:checked ~ .dot { transform: translateX(100%); - background-color: #48bb78; + /* background-color: #48bb78;*/ } diff --git a/src/widgets/Input.svelte b/src/widgets/Input.svelte index 19579f5..e1094db 100644 --- a/src/widgets/Input.svelte +++ b/src/widgets/Input.svelte @@ -11,7 +11,7 @@ -
+
{#if widget.type == "number"} ((widget["send"] = true), WSpush(widget.ws, widget.topic, widget.status))} bind:value={widget.status} step="0.1" type="number" /> {/if} diff --git a/src/widgets/Toggle.svelte b/src/widgets/Toggle.svelte index a4f81ac..90f0ae3 100644 --- a/src/widgets/Toggle.svelte +++ b/src/widgets/Toggle.svelte @@ -11,15 +11,13 @@
-
-
-