new web ui implemented, new REST api implementation prepared

WEBUI/api/stat.json

@@ -0,0 +1,19 @@
+{"time":"~time~",
+"uptime":"~uptime~",
+"wlev":"~wlev~",
+"vlsys":"~vlsys~",
+"vlin":"~vlin~",
+"vlbat":"~vlbat~",
+"ethstat":"~ethstat~",
+"wfstat":"~wfstat~",
+"gsmstat":"~gsmstat~",
+"lrstat":"~lrstat~",
+"mqtt1st":"~mqtt1st~",
+"mqtt2st":"~mqtt2st~",
+"defadp":"~defadp~",
+"freeram":"~freeram~",
+"minram":"~minram~",
+"fver":"~fver~",
+"fverav":"~fverav~",
+"updstat":"~updstat~"
+}

WEBUI/api/status.json

@@ -0,0 +1 @@
+{ "time": "value of time", "uptime": "value of uptime" }

WEBUI/assets/ErrorNotFound.324b6b00.js

@@ -0,0 +1 @@
+import{_ as t,Z as o,$ as s,aa as a,a9 as e,a2 as n,a8 as r}from"./index.ccdce313.js";const c=o({name:"ErrorNotFound"}),l={class:"fullscreen bg-blue text-white text-center q-pa-md flex flex-center"},d=e("div",{style:{"font-size":"30vh"}}," 404 ",-1),i=e("div",{class:"text-h2",style:{opacity:".4"}}," Oops. Nothing here... ",-1);function _(p,f,u,h,x,m){return s(),a("div",l,[e("div",null,[d,i,n(r,{class:"q-mt-xl",color:"white","text-color":"blue",unelevated:"",to:"/",label:"Go Home","no-caps":""})])])}var N=t(c,[["render",_]]);export{N as default};

WEBUI/assets/IndexPage1.2065b9f6.js

@@ -0,0 +1 @@
+import{Q as a}from"./QPage.b9c56a95.js";import{_ as t,Z as s,$ as n,a0 as o,a1 as r,a9 as e}from"./index.ccdce313.js";const c=s({name:"IndexPage1"}),p=e("h1",null,[e("p",null,"First page")],-1);function _(f,l,d,i,x,m){return n(),o(a,{class:"flex flex-center"},{default:r(()=>[p]),_:1})}var g=t(c,[["render",_]]);export{g as default};

WEBUI/assets/IndexPage3.9f6e5504.css

@@ -0,0 +1 @@
+.my-card[data-v-047ec5dc]{width:320px}

WEBUI/assets/IndexPage3.a00386cc.js

@@ -0,0 +1,2 @@
+import{j as q,ag as C,_ as D,Z as b,r as c,$ as n,aa as u,ad as v,ab as _,a2 as s,a1 as d,ah as y,a9 as r,a6 as k,a0 as x,a5 as V,ai as $,a8 as f,ac as j,aj as B}from"./index.ccdce313.js";import{api as g}from"./axios.dc946797.js";function I(){return q(C)}const Q=[{key:"keyname1",val:"10"},{key:"keyname2",val:"20"},{key:"keyname3",val:"30"},{key:"keyname4",val:"40"},{key:"keyname5",val:"50"},{key:"keyname6",val:"60"},{key:"keyname7",val:"70"},{key:"keyname8",val:"80"}],L=b({name:"IndexPage3",setup(){const o=c(`Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod
+        tempor incididunt ut labore et dolore magna aliqua.`),t=c(Q),i=I(),a=c(null);function m(){g.get("/status.json").then(e=>{a.value=e.data,t.value[0].val=a.value.time,t.value[0].key=a.value.uptime,t.value[1].val=a.value.time,t.value[1].key=a.value.uptime}).catch(()=>{i.notify({color:"negative",position:"top",message:"Loading failed",icon:"report_problem"})})}function p(){g.get("/status.json").then(e=>{a.value=e.data}).catch(()=>{i.notify({color:"negative",position:"top",message:"Loading failed",icon:"report_problem"})})}return{lorem:o,myData:t,loadData:m,saveData:p,data:a}}}),P={class:"q-pa-md row items-start q-gutter-md"},w={class:"text-h6"},N={class:"q-pa-md"},S={class:"q-gutter-md"},U={class:"q-pa-md q-gutter-sm"};function E(o,t,i,a,m,p){return n(),u("div",P,[(n(),u(v,null,_(1,e=>s(B,j({flat:"",bordered:"",class:"my-card"},e,{key:e}),{default:d(()=>[s(y,null,{default:d(()=>[r("div",w,"Card "+k(e),1)]),_:2},1024),s(y,{class:"q-pt-none"},{default:d(()=>[r("div",N,[r("div",S,[(n(!0),u(v,null,_(o.myData,l=>(n(),x($,{modelValue:l.val,"onUpdate:modelValue":h=>l.val=h,key:l.key},{default:d(()=>[V(k(l.key),1)]),_:2},1032,["modelValue","onUpdate:modelValue"]))),128))])])]),_:1}),r("div",U,[s(f,{color:"primary",icon:"file_download",label:"Get data",onClick:o.loadData},null,8,["onClick"]),s(f,{color:"primary",icon:"file_upload",label:"Send data",onClick:o.saveData},null,8,["onClick"])])]),_:2},1040)),64))])}var K=D(L,[["render",E],["__scopeId","data-v-047ec5dc"]]);export{K as default};

WEBUI/assets/QPage.b9c56a95.js

@@ -0,0 +1 @@
+import{c as g,j as r,k as t,m as h,N as p,a as s,h as d,d as y,g as f}from"./index.ccdce313.js";var C=g({name:"QPage",props:{padding:Boolean,styleFn:Function},setup(a,{slots:i}){const{proxy:{$q:o}}=f(),e=r(h,t);if(e===t)return console.error("QPage needs to be a deep child of QLayout"),t;if(r(p,t)===t)return console.error("QPage needs to be child of QPageContainer"),t;const c=s(()=>{const n=(e.header.space===!0?e.header.size:0)+(e.footer.space===!0?e.footer.size:0);if(typeof a.styleFn=="function"){const l=e.isContainer.value===!0?e.containerHeight.value:o.screen.height;return a.styleFn(n,l)}return{minHeight:e.isContainer.value===!0?e.containerHeight.value-n+"px":o.screen.height===0?n!==0?`calc(100vh - ${n}px)`:"100vh":o.screen.height-n+"px"}}),u=s(()=>`q-page${a.padding===!0?" q-layout-padding":""}`);return()=>d("main",{class:u.value,style:c.value},y(i.default))}});export{C as Q};

WEBUI/espfs.paths

@@ -1,25 +1,24 @@
+api
+api/stat.json
+api/status.json
 assets
-assets/ErrorNotFound.1a929068.js
-assets/IndexPage.743c5bfb.js
+assets/ErrorNotFound.324b6b00.js
+assets/IndexPage1.2065b9f6.js
+assets/IndexPage2.e385c8fe.js
+assets/IndexPage3.9f6e5504.css
+assets/IndexPage3.a00386cc.js
 assets/KFOkCnqEu92Fr1MmgVxIIzQ.34e9582c.woff
 assets/KFOlCnqEu92Fr1MmEU9fBBc-.9ce7f3ac.woff
 assets/KFOlCnqEu92Fr1MmSU5fBBc-.bf14c7d7.woff
 assets/KFOlCnqEu92Fr1MmWUlfBBc-.e0fd57c0.woff
 assets/KFOlCnqEu92Fr1MmYUtfBBc-.f6537e32.woff
 assets/KFOmCnqEu92Fr1Mu4mxM.f2abf7fb.woff
-assets/MainLayout.77ba4c57.js
-assets/QBtn.3462c190.js
-assets/axios.fb5cd3e5.js
+assets/MainLayout.a514811c.js
+assets/QPage.b9c56a95.js
+assets/axios.dc946797.js
 assets/flUhRq6tzZclQEJ-Vdg-IuiaDsNa.fd84f88b.woff
 assets/flUhRq6tzZclQEJ-Vdg-IuiaDsNcIhQ8tQ.4a4dbc62.woff2
-assets/index.77bd2a1f.js
+assets/index.ccdce313.js
 assets/index.e110aa66.css
-assets/quasar-logo-vertical.55e9c854.svg
-assets/render.c32018ce.js
 favicon.ico
-icons
-icons/favicon-128x128.png
-icons/favicon-16x16.png
-icons/favicon-32x32.png
-icons/favicon-96x96.png
 index.html

components/webguiapp

@@ -1 +1 @@
-Subproject commit 51db5691cea130f8fe5b09c5ca2604942a8b96d0
+Subproject commit c76fe416e0daf3cd096c2f7fe0d6cc265baec5a6

sdkconfig

@@ -1648,16 +1648,16 @@ CONFIG_WEBGUIAPP_WIFI_GATEWAY_STA="192.168.150.1"
 #
 CONFIG_WEBGUIAPP_MQTT_ENABLE=y
 CONFIG_WEBGUIAPP_MQTT_CLIENTS_NUM=2
-# CONFIG_WEBGUIAPP_MQTT_ON is not set
+CONFIG_WEBGUIAPP_MQTT_ON=y
 CONFIG_WEBGUIAPP_MQTT_MAX_TOPIC_LENGTH=128
-CONFIG_WEBGUIAPP_MQTT_SERVER_URL="mqttbroker.com"
+CONFIG_WEBGUIAPP_MQTT_SERVER_URL="openergy.ru"
 CONFIG_WEBGUIAPP_MQTT_SERVER_PORT=1883
 CONFIG_WEBGUIAPP_MQTT_CLIENT_ID_1="DEV1"
 CONFIG_WEBGUIAPP_MQTT_CLIENT_ID_2="DEV2"
 CONFIG_WEBGUIAPP_MQTT_SYSTEM_NAME="SYSTEMNAME"
 CONFIG_WEBGUIAPP_MQTT_GROUP_NAME="GROUPNAME"
-CONFIG_WEBGUIAPP_MQTT_USERNAME="username"
-CONFIG_WEBGUIAPP_MQTT_PASSWORD="password"
+CONFIG_WEBGUIAPP_MQTT_USERNAME="bogd"
+CONFIG_WEBGUIAPP_MQTT_PASSWORD="cd4051"
 CONFIG_WEBGUIAPP_MQTT_DEBUG_LEVEL=1
 # end of MQTT settings
 

sdkconfig.old

@@ -1617,8 +1617,8 @@ CONFIG_WEBGUIAPP_WIFI_ON=y
 CONFIG_WEBGUIAPP_WIFI_DHCP_ON=y
 CONFIG_WEBGUIAPP_WIFI_SSID_AP="YourAP"
 CONFIG_WEBGUIAPP_WIFI_KEY_AP="123456789"
-CONFIG_WEBGUIAPP_WIFI_SSID_STA="YourSTA"
-CONFIG_WEBGUIAPP_WIFI_KEY_STA="123456789"
+CONFIG_WEBGUIAPP_WIFI_SSID_STA="TRS"
+CONFIG_WEBGUIAPP_WIFI_KEY_STA="1285bogd"
 CONFIG_WEBGUIAPP_WIFI_IP_AP="192.168.150.1"
 CONFIG_WEBGUIAPP_WIFI_IP_STA="192.168.150.1"
 CONFIG_WEBGUIAPP_WIFI_MASK_STA="255.255.255.0"