diff --git a/src/App.svelte b/src/App.svelte
index 91ea34a..77248ab 100644
--- a/src/App.svelte
+++ b/src/App.svelte
@@ -3,28 +3,17 @@
//*****************************************************************************************************************************/
import { onMount } from "svelte";
import { Route, router, active } from "tinro";
- router.mode.hash(); // enables hash navigation method
- //router.mode.memory(); // enables in-memory navigation method
- import Chart from "svelte-frappe-charts";
- //import { SvelteToast, toast } from "@zerodevx/svelte-toast";
+ router.mode.hash();
- //const app = new SvelteToast({
- // target: document.body,
- // props: {
- // options: {},
- // },
- //});
-
- import Card from "./components/Card.svelte";
- import Alarm from "./components/Alarm.svelte";
import Modal from "./components/Modal.svelte";
- import Input from "./widgets/Input.svelte";
- import Toggle from "./widgets/Toggle.svelte";
- import Anydata from "./widgets/Anydata.svelte";
- //как ставить и удалять
- //npm install --save svelte-simple-modal
- //npm uninstall svelte-simple-modal
+ import DashboardPage from "./pages/Dashboard.svelte";
+ import ConfigPage from "./pages/Config.svelte";
+ import ConnectionPage from "./pages/Connection.svelte";
+ import UtilitiesPage from "./pages/Utilities.svelte";
+ import LogPage from "./pages/Log.svelte";
+ import ListPage from "./pages/List.svelte";
+ import AboutPage from "./pages/About.svelte";
//****************************************************constants section*********************************************************/
//******************************************************************************************************************************/
@@ -41,21 +30,12 @@
//Flags
let showInput = false;
let showModalFlag = false;
- let hideAllSubParams = true;
+
let additionalParams = false;
//dashboard
let pages = [];
- let datachart = {
- labels: ["Sun", "Mon", "Tues", "Wed", "Thurs", "Fri", "Sat"],
- datasets: [
- {
- values: [10, 12, 3, 9, 8, 15, 9],
- },
- ],
- };
-
//configuration
let configJson = [];
let configJsonFlag = false;
@@ -88,7 +68,7 @@
let selectedDeviceData = undefined;
let deviceList = [];
let flag = true;
- let newDevice = {};
+
let coreMessages = [];
let wsSelected = undefined;
@@ -712,37 +692,6 @@
wsSendMsg(wsSelected, "/scan");
}
- function returnError() {
- let ret = false;
- if (!socketConnected || oneOfJsonPackageError) {
- ret = true;
- }
- return ret;
- }
-
- function returnErrorName() {
- if (!socketConnected) {
- return "Нет соединения";
- } else if (oneOfJsonPackageError) {
- return "Ошибка данных";
- }
- }
-
- function configPageStatus() {
- if (itemsJsonParced && widgetsJsonParced && configJsonParced && settingsJsonParced) {
- return true;
- }
- }
-
- function pushGreen() {
- toast.push("Saved!", {
- theme: {
- "--toastBackground": "#48BB78",
- "--toastProgressBackground": "#2F855A",
- },
- });
- }
-
//*******************************************************initialisation********************************************************************/
onMount(async () => {
console.log("[i]", "mounted");
@@ -813,259 +762,25 @@
{:else}
-
- {#if layoutJson === []}
-
- {/if}
- {#each pages as pagesName, i}
-
- {#each layoutJson as widget, i}
- {#if widget.page === pagesName.page}
- {#if widget.widget === "input"}
- wsPush(ws, topic, status)} />
- {/if}
- {#if widget.widget === "toggle"}
- wsPush(ws, topic, status)} />
- {/if}
- {#if widget.widget === "anydata"}
-
- {/if}
- {/if}
- {/each}
-
- {/each}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
{message.msg}
- {/each}
-
+
-
-
-
-
+ devListSave()} />
-
-
-
-
+ showModal()} syntaxHighlight={(json) => syntaxHighlight(json)} />
{/if}
diff --git a/src/pages/About.svelte b/src/pages/About.svelte
new file mode 100644
index 0000000..d3a2ed7
--- /dev/null
+++ b/src/pages/About.svelte
@@ -0,0 +1,14 @@
+
+
+
+
+
+
diff --git a/src/pages/Config.svelte b/src/pages/Config.svelte
new file mode 100644
index 0000000..5f0b59f
--- /dev/null
+++ b/src/pages/Config.svelte
@@ -0,0 +1,92 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {#if layoutJson === []}
+
+ {/if}
+ {#each pages as pagesName, i}
+
+ {#each layoutJson as widget, i}
+ {#if widget.page === pagesName.page}
+ {#if widget.widget === "input"}
+ wsPush(ws, topic, status)} />
+ {/if}
+ {#if widget.widget === "toggle"}
+ wsPush(ws, topic, status)} />
+ {/if}
+ {#if widget.widget === "anydata"}
+
+ {/if}
+ {/if}
+ {/each}
+
+ {/each}
+
{message.msg}
+ {/each}
+
diff --git a/src/pages/Utilities.svelte b/src/pages/Utilities.svelte
new file mode 100644
index 0000000..2a84f8e
--- /dev/null
+++ b/src/pages/Utilities.svelte
@@ -0,0 +1,17 @@
+
+
+
+
+
diff --git a/src/widgets/Input.svelte b/src/widgets/Input.svelte
index a3b50e6..bc540de 100644
--- a/src/widgets/Input.svelte
+++ b/src/widgets/Input.svelte
@@ -1,6 +1,6 @@
@@ -12,16 +12,16 @@
{#if widget.type == "number"}
- ((widget["send"] = true), wsPushProp(widget.ws, widget.topic, widget.status))} bind:value={widget.status} step="0.1" type="number" />
+ ((widget["send"] = true), wsPush(widget.ws, widget.topic, widget.status))} bind:value={widget.status} step="0.1" type="number" />
{/if}
{#if widget.type == "text"}
- ((widget["send"] = true), wsPushProp(widget.ws, widget.topic, widget.status))} bind:value={widget.status} type="text" />
+ ((widget["send"] = true), wsPush(widget.ws, widget.topic, widget.status))} bind:value={widget.status} type="text" />
{/if}
{#if widget.type == "date"}
- ((widget["send"] = true), wsPushProp(widget.ws, widget.topic, widget.status))} bind:value={widget.status} type="date" />
+ ((widget["send"] = true), wsPush(widget.ws, widget.topic, widget.status))} bind:value={widget.status} type="date" />
{/if}
{#if widget.type == "time"}
- ((widget["send"] = true), wsPushProp(widget.ws, widget.topic, widget.status))} bind:value={widget.status} type="time" />
+ ((widget["send"] = true), wsPush(widget.ws, widget.topic, widget.status))} bind:value={widget.status} type="time" />
{/if}
diff --git a/src/widgets/Toggle.svelte b/src/widgets/Toggle.svelte
index 99d6f78..56f263d 100644
--- a/src/widgets/Toggle.svelte
+++ b/src/widgets/Toggle.svelte
@@ -2,7 +2,7 @@
export let widget;
export let value;
value = value;
- export let wsPushProp = (ws, topic, status) => {};
+ export let wsPush = (ws, topic, status) => {};