Updates

adrianromero · Nov 22, 2023 · cd5a7b0 · cd5a7b0
1 parent 6544c83
commit cd5a7b0
Show file tree

Hide file tree

Showing 5 changed files with 315 additions and 339 deletions.
diff --git a/assets/index-326fc11c.js → assets/index-81c941e3.js b/assets/index-326fc11c.js → assets/index-81c941e3.js
diff --git a/index.html b/index.html
@@ -8,7 +8,7 @@
     <meta name="description" content="MYHELLOIOT MQTT Dashboard" />
     <link rel="apple-touch-icon" href="/myhelloiot/logo192.png" />
     <title>MYHELLOIOT</title>
-    <script type="module" crossorigin src="/myhelloiot/assets/index-326fc11c.js"></script>
+    <script type="module" crossorigin src="/myhelloiot/assets/index-81c941e3.js"></script>
     <link rel="stylesheet" href="/myhelloiot/assets/index-b901b94b.css">
   <link rel="manifest" href="/myhelloiot/manifest.webmanifest"><script id="vite-plugin-pwa:register-sw" src="/myhelloiot/registerSW.js"></script></head>
   <body>

diff --git a/resources/basic/connectinfo.json b/resources/basic/connectinfo.json
@@ -1,21 +1,27 @@
 {
-  "url": "ws://localhost:9001",
-  "keepalive": 60,
-  "protocolVersion": 4,
-  "clean": true,
-  "connectTimeout": 30000,
-  "reconnectPeriod": 1000,
-  "will": false,
-  "willtopic": "",
-  "willqos": 0,
-  "willretain": false,
-  "willpayload": "",
-  "dashboard": {
-    "name": "dashboard.jsx",
-    "type": "text/jsx"
-  },
-  "dashboardcss": {
-    "name": "dashboard.css",
-    "type": "text/css"
+  "type": "REMOTE",
+  "mqtt": {
+    "username": "",
+    "password": "",
+    "clientId": "",
+    "url": "ws://localhost:9001",
+    "keepalive": 60,
+    "protocolVersion": 4,
+    "clean": true,
+    "connectTimeout": 30000,
+    "reconnectPeriod": 1000,
+    "will": false,
+    "willtopic": "",
+    "willqos": 0,
+    "willretain": false,
+    "willpayload": "",
+    "dashboard": {
+      "name": "dashboard.jsx",
+      "type": "text/jsx"
+    },
+    "dashboardcss": {
+      "name": "dashboard.css",
+      "type": "text/css"
+    }
   }
 }
diff --git a/resources/basic/dashboard.jsx b/resources/basic/dashboard.jsx
@@ -3,70 +3,40 @@
 }
 
 <DashboardPage title="Basic units">
-  <Card title="Temperature pub/sub">
-    <InputUnit
-      pubtopic="myhelloiot/temperature"
-      puboptions={{ retain: true }}
-      subtopic="myhelloiot/temperature"
-      format={NumberValueFormat({
-        style: "unit",
-        unit: "celsius",
-      })}
-    />
-  </Card>
+  <InputCard
+    title="Temperature pub/sub"
+    topic="myhelloiot/temperature"
+    puboptions={{ retain: true }}
+    format={Celsius()}
+  />
   <Card title="Select temperature">
-    <ViewUnit
-      subtopic="myhelloiot/temperature"
-      format={NumberIconFormat({
-        style: "unit",
-        unit: "celsius",
-      })}
-    />
+    <ViewUnit topic="myhelloiot/temperature" format={Celsius()} />
     <SliderUnit
-      pubtopic="myhelloiot/temperature"
+      topic="myhelloiot/temperature"
       puboptions={{ retain: true }}
-      subtopic="myhelloiot/temperature"
-      limits={{ min: -10, max: 60, step: 1 }}
+      format={Celsius()}
     />
   </Card>
   <Card title="Temperature buttons">
-    <ButtonTopic
-      pubtopic="myhelloiot/temperature"
+    <ButtonUnit
+      topic="myhelloiot/temperature"
       puboptions={{ retain: true }}
-      subtopic="myhelloiot/temperature"
-      format={NumberIconValueFormat({
-        style: "unit",
-        unit: "celsius",
-        min: -10,
-        max: 60,
-        step: 1,
-      })}
+      format={Celsius()}
       icon="+"
     />
-    <ButtonTopic
-      pubtopic="myhelloiot/temperature"
+    <ButtonUnit
+      topic="myhelloiot/temperature"
       puboptions={{ retain: true }}
-      subtopic="myhelloiot/temperature"
-      format={NumberIconValueFormat({
-        style: "unit",
-        unit: "celsius",
-        min: -10,
-        max: 60,
-        step: -1,
-      })}
+      format={Celsius({ step: -1 })}
       icon="-"
     />
   </Card>
-  <Card title="Dashboard gauge card">
-    <ViewUnit
-      subtopic="myhelloiot/temperature"
-      format={DashboardIconFormat(
-        { title: "Dashboard gauge", min: -10, max: 60 },
-        {
-          style: "unit",
-          unit: "celsius",
-        }
-      )}
-    />
-  </Card>
+  <ViewCard
+    title="Dashboard gauge card"
+    topic="myhelloiot/temperature"
+    format={DashboardIconFormat({
+      title: "Dashboard gauge",
+      ...Celsius(),
+    })}
+  />
 </DashboardPage>;
diff --git a/sw.js b/sw.js