diff --git a/WEBUI/assets/ErrorNotFound.b377d03e.js b/WEBUI/assets/ErrorNotFound.6a50e849.js similarity index 88% rename from WEBUI/assets/ErrorNotFound.b377d03e.js rename to WEBUI/assets/ErrorNotFound.6a50e849.js index 5b0b435..22ba410 100644 --- a/WEBUI/assets/ErrorNotFound.b377d03e.js +++ b/WEBUI/assets/ErrorNotFound.6a50e849.js @@ -1 +1 @@ -import{_ as t,V as o,W as s,a4 as a,a3 as e,Z as r,a2 as n}from"./index.bc944420.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... four-ow-four ",-1);function _(f,p,u,h,x,m){return s(),a("div",l,[e("div",null,[d,i,r(n,{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}; +import{_ as t,V as o,W as s,a4 as a,a3 as e,Z as r,a2 as n}from"./index.79e5a4f1.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... four-ow-four ",-1);function _(f,p,u,h,x,m){return s(),a("div",l,[e("div",null,[d,i,r(n,{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}; diff --git a/WEBUI/assets/IndexPage1.0ce36947.js b/WEBUI/assets/IndexPage1.7c1ce256.js similarity index 61% rename from WEBUI/assets/IndexPage1.0ce36947.js rename to WEBUI/assets/IndexPage1.7c1ce256.js index 65b5a77..587152c 100644 --- a/WEBUI/assets/IndexPage1.0ce36947.js +++ b/WEBUI/assets/IndexPage1.7c1ce256.js @@ -1 +1 @@ -import{Q as a}from"./QPage.99bb7d33.js";import{_ as t,V as s,W as n,X as o,Y as r,a3 as e}from"./index.bc944420.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 h=t(c,[["render",_]]);export{h as default}; +import{Q as a}from"./QPage.c638f617.js";import{_ as t,V as s,W as n,X as o,Y as r,a3 as e}from"./index.79e5a4f1.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 h=t(c,[["render",_]]);export{h as default}; diff --git a/WEBUI/assets/IndexPage2.0b79c6d2.js b/WEBUI/assets/IndexPage2.0b79c6d2.js deleted file mode 100644 index 83508d0..0000000 Binary files a/WEBUI/assets/IndexPage2.0b79c6d2.js and /dev/null differ diff --git a/WEBUI/assets/IndexPage2.bd357740.js b/WEBUI/assets/IndexPage2.bd357740.js new file mode 100644 index 0000000..1c79370 Binary files /dev/null and b/WEBUI/assets/IndexPage2.bd357740.js differ diff --git a/WEBUI/assets/IndexPage3.9097562c.js b/WEBUI/assets/IndexPage3.9097562c.js new file mode 100644 index 0000000..459153c Binary files /dev/null and b/WEBUI/assets/IndexPage3.9097562c.js differ diff --git a/WEBUI/assets/IndexPage3.e1511eb7.js b/WEBUI/assets/IndexPage3.e1511eb7.js deleted file mode 100644 index 6cc8191..0000000 Binary files a/WEBUI/assets/IndexPage3.e1511eb7.js and /dev/null differ diff --git a/WEBUI/assets/MainLayout.573016b1.js b/WEBUI/assets/MainLayout.573016b1.js new file mode 100644 index 0000000..23e0b26 Binary files /dev/null and b/WEBUI/assets/MainLayout.573016b1.js differ diff --git a/WEBUI/assets/MainLayout.94853b61.js b/WEBUI/assets/MainLayout.94853b61.js deleted file mode 100644 index ffe8caa..0000000 Binary files a/WEBUI/assets/MainLayout.94853b61.js and /dev/null differ diff --git a/WEBUI/assets/QItem.30ec9c8c.js b/WEBUI/assets/QItem.b7c366d4.js similarity index 96% rename from WEBUI/assets/QItem.30ec9c8c.js rename to WEBUI/assets/QItem.b7c366d4.js index 1c717e6..475d0a8 100644 --- a/WEBUI/assets/QItem.30ec9c8c.js +++ b/WEBUI/assets/QItem.b7c366d4.js @@ -1 +1 @@ -import{a8 as L,c as v,a as i,h as c,d as q,u as S,a9 as I,q as R,aa as E,r as b,g as Q,ab as A,D as K,p as D}from"./index.bc944420.js";function $(){if(window.getSelection!==void 0){const e=window.getSelection();e.empty!==void 0?e.empty():e.removeAllRanges!==void 0&&(e.removeAllRanges(),L.is.mobile!==!0&&e.addRange(document.createRange()))}else document.selection!==void 0&&document.selection.empty()}function j(e,a,n){return n<=a?a:Math.min(n,Math.max(a,e))}function M(e,a,n){if(n<=a)return a;const u=n-a+1;let l=a+(e-a)%u;return lparseInt(e.lines,10)),u=i(()=>"q-item__label"+(e.overline===!0?" q-item__label--overline text-overline":"")+(e.caption===!0?" q-item__label--caption text-caption":"")+(e.header===!0?" q-item__label--header":"")+(n.value===1?" ellipsis":"")),l=i(()=>e.lines!==void 0&&n.value>1?{overflow:"hidden",display:"-webkit-box","-webkit-box-orient":"vertical","-webkit-line-clamp":n.value}:null);return()=>c("div",{style:l.value,class:u.value},q(a.default))}}),T=v({name:"QItemSection",props:{avatar:Boolean,thumbnail:Boolean,side:Boolean,top:Boolean,noWrap:Boolean},setup(e,{slots:a}){const n=i(()=>`q-item__section column q-item__section--${e.avatar===!0||e.side===!0||e.thumbnail===!0?"side":"main"}`+(e.top===!0?" q-item__section--top justify-start":" justify-center")+(e.avatar===!0?" q-item__section--avatar":"")+(e.thumbnail===!0?" q-item__section--thumbnail":"")+(e.noWrap===!0?" q-item__section--nowrap":""));return()=>c("div",{class:n.value},q(a.default))}}),z=v({name:"QItem",props:{...S,...I,tag:{type:String,default:"div"},active:{type:Boolean,default:null},clickable:Boolean,dense:Boolean,insetLevel:Number,tabindex:[String,Number],focused:Boolean,manualFocus:Boolean},emits:["click","keyup"],setup(e,{slots:a,emit:n}){const{proxy:{$q:u}}=Q(),l=R(e,u),{hasLink:d,linkAttrs:k,linkClass:g,linkTag:y,navigateOnClick:h}=E(),s=b(null),r=b(null),m=i(()=>e.clickable===!0||d.value===!0||e.tag==="label"),o=i(()=>e.disable!==!0&&m.value===!0),_=i(()=>"q-item q-item-type row no-wrap"+(e.dense===!0?" q-item--dense":"")+(l.value===!0?" q-item--dark":"")+(d.value===!0&&e.active===null?g.value:e.active===!0?` q-item--active${e.activeClass!==void 0?` ${e.activeClass}`:""}`:"")+(e.disable===!0?" disabled":"")+(o.value===!0?" q-item--clickable q-link cursor-pointer "+(e.manualFocus===!0?"q-manual-focusable":"q-focusable q-hoverable")+(e.focused===!0?" q-manual-focusable--focused":""):"")),w=i(()=>{if(e.insetLevel===void 0)return null;const t=u.lang.rtl===!0?"Right":"Left";return{["padding"+t]:16+e.insetLevel*56+"px"}});function B(t){o.value===!0&&(r.value!==null&&(t.qKeyEvent!==!0&&document.activeElement===s.value?r.value.focus():document.activeElement===r.value&&s.value.focus()),h(t))}function x(t){if(o.value===!0&&A(t,13)===!0){K(t),t.qKeyEvent=!0;const f=new MouseEvent("click",t);f.qKeyEvent=!0,s.value.dispatchEvent(f)}n("keyup",t)}function C(){const t=D(a.default,[]);return o.value===!0&&t.unshift(c("div",{class:"q-focus-helper",tabindex:-1,ref:r})),t}return()=>{const t={ref:s,class:_.value,style:w.value,role:"listitem",onClick:B,onKeyup:x};return o.value===!0?(t.tabindex=e.tabindex||"0",Object.assign(t,k.value)):m.value===!0&&(t["aria-disabled"]="true"),c(y.value,t,C())}}});export{N as Q,T as a,j as b,$ as c,z as d,M as n}; +import{a8 as L,c as v,a as i,h as c,d as q,u as S,a9 as I,q as R,aa as E,r as b,g as Q,ab as A,D as K,p as D}from"./index.79e5a4f1.js";function $(){if(window.getSelection!==void 0){const e=window.getSelection();e.empty!==void 0?e.empty():e.removeAllRanges!==void 0&&(e.removeAllRanges(),L.is.mobile!==!0&&e.addRange(document.createRange()))}else document.selection!==void 0&&document.selection.empty()}function j(e,a,n){return n<=a?a:Math.min(n,Math.max(a,e))}function M(e,a,n){if(n<=a)return a;const u=n-a+1;let l=a+(e-a)%u;return lparseInt(e.lines,10)),u=i(()=>"q-item__label"+(e.overline===!0?" q-item__label--overline text-overline":"")+(e.caption===!0?" q-item__label--caption text-caption":"")+(e.header===!0?" q-item__label--header":"")+(n.value===1?" ellipsis":"")),l=i(()=>e.lines!==void 0&&n.value>1?{overflow:"hidden",display:"-webkit-box","-webkit-box-orient":"vertical","-webkit-line-clamp":n.value}:null);return()=>c("div",{style:l.value,class:u.value},q(a.default))}}),T=v({name:"QItemSection",props:{avatar:Boolean,thumbnail:Boolean,side:Boolean,top:Boolean,noWrap:Boolean},setup(e,{slots:a}){const n=i(()=>`q-item__section column q-item__section--${e.avatar===!0||e.side===!0||e.thumbnail===!0?"side":"main"}`+(e.top===!0?" q-item__section--top justify-start":" justify-center")+(e.avatar===!0?" q-item__section--avatar":"")+(e.thumbnail===!0?" q-item__section--thumbnail":"")+(e.noWrap===!0?" q-item__section--nowrap":""));return()=>c("div",{class:n.value},q(a.default))}}),z=v({name:"QItem",props:{...S,...I,tag:{type:String,default:"div"},active:{type:Boolean,default:null},clickable:Boolean,dense:Boolean,insetLevel:Number,tabindex:[String,Number],focused:Boolean,manualFocus:Boolean},emits:["click","keyup"],setup(e,{slots:a,emit:n}){const{proxy:{$q:u}}=Q(),l=R(e,u),{hasLink:d,linkAttrs:k,linkClass:g,linkTag:y,navigateOnClick:h}=E(),s=b(null),r=b(null),m=i(()=>e.clickable===!0||d.value===!0||e.tag==="label"),o=i(()=>e.disable!==!0&&m.value===!0),_=i(()=>"q-item q-item-type row no-wrap"+(e.dense===!0?" q-item--dense":"")+(l.value===!0?" q-item--dark":"")+(d.value===!0&&e.active===null?g.value:e.active===!0?` q-item--active${e.activeClass!==void 0?` ${e.activeClass}`:""}`:"")+(e.disable===!0?" disabled":"")+(o.value===!0?" q-item--clickable q-link cursor-pointer "+(e.manualFocus===!0?"q-manual-focusable":"q-focusable q-hoverable")+(e.focused===!0?" q-manual-focusable--focused":""):"")),w=i(()=>{if(e.insetLevel===void 0)return null;const t=u.lang.rtl===!0?"Right":"Left";return{["padding"+t]:16+e.insetLevel*56+"px"}});function B(t){o.value===!0&&(r.value!==null&&(t.qKeyEvent!==!0&&document.activeElement===s.value?r.value.focus():document.activeElement===r.value&&s.value.focus()),h(t))}function x(t){if(o.value===!0&&A(t,13)===!0){K(t),t.qKeyEvent=!0;const f=new MouseEvent("click",t);f.qKeyEvent=!0,s.value.dispatchEvent(f)}n("keyup",t)}function C(){const t=D(a.default,[]);return o.value===!0&&t.unshift(c("div",{class:"q-focus-helper",tabindex:-1,ref:r})),t}return()=>{const t={ref:s,class:_.value,style:w.value,role:"listitem",onClick:B,onKeyup:x};return o.value===!0?(t.tabindex=e.tabindex||"0",Object.assign(t,k.value)):m.value===!0&&(t["aria-disabled"]="true"),c(y.value,t,C())}}});export{N as Q,T as a,j as b,$ as c,z as d,M as n}; diff --git a/WEBUI/assets/QPage.99bb7d33.js b/WEBUI/assets/QPage.c638f617.js similarity index 92% rename from WEBUI/assets/QPage.99bb7d33.js rename to WEBUI/assets/QPage.c638f617.js index 730610c..79fffe2 100644 --- a/WEBUI/assets/QPage.99bb7d33.js +++ b/WEBUI/assets/QPage.c638f617.js @@ -1 +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.bc944420.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}; +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.79e5a4f1.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}; diff --git a/WEBUI/assets/axios.534d8d21.js b/WEBUI/assets/axios.534d8d21.js deleted file mode 100644 index 39bbfc7..0000000 Binary files a/WEBUI/assets/axios.534d8d21.js and /dev/null differ diff --git a/WEBUI/assets/axios.fc27647c.js b/WEBUI/assets/axios.fc27647c.js new file mode 100644 index 0000000..effaf8f Binary files /dev/null and b/WEBUI/assets/axios.fc27647c.js differ diff --git a/WEBUI/assets/index.bc944420.js b/WEBUI/assets/index.79e5a4f1.js similarity index 61% rename from WEBUI/assets/index.bc944420.js rename to WEBUI/assets/index.79e5a4f1.js index 0fad2ba..f2fcf23 100644 Binary files a/WEBUI/assets/index.bc944420.js and b/WEBUI/assets/index.79e5a4f1.js differ diff --git a/WEBUI/espfs.paths b/WEBUI/espfs.paths index 8541b8e..181fcd6 100644 --- a/WEBUI/espfs.paths +++ b/WEBUI/espfs.paths @@ -1,8 +1,8 @@ assets -assets/ErrorNotFound.b377d03e.js -assets/IndexPage1.0ce36947.js -assets/IndexPage2.0b79c6d2.js -assets/IndexPage3.e1511eb7.js +assets/ErrorNotFound.6a50e849.js +assets/IndexPage1.7c1ce256.js +assets/IndexPage2.bd357740.js +assets/IndexPage3.9097562c.js assets/IndexPage3.f4b10b4f.css assets/KFOkCnqEu92Fr1MmgVxIIzQ.34e9582c.woff assets/KFOlCnqEu92Fr1MmEU9fBBc-.9ce7f3ac.woff @@ -10,13 +10,13 @@ assets/KFOlCnqEu92Fr1MmSU5fBBc-.bf14c7d7.woff assets/KFOlCnqEu92Fr1MmWUlfBBc-.e0fd57c0.woff assets/KFOlCnqEu92Fr1MmYUtfBBc-.f6537e32.woff assets/KFOmCnqEu92Fr1Mu4mxM.f2abf7fb.woff -assets/MainLayout.94853b61.js -assets/QItem.30ec9c8c.js -assets/QPage.99bb7d33.js -assets/axios.534d8d21.js +assets/MainLayout.573016b1.js +assets/QItem.b7c366d4.js +assets/QPage.c638f617.js +assets/axios.fc27647c.js assets/flUhRq6tzZclQEJ-Vdg-IuiaDsNa.fd84f88b.woff assets/flUhRq6tzZclQEJ-Vdg-IuiaDsNcIhQ8tQ.4a4dbc62.woff2 -assets/index.bc944420.js +assets/index.79e5a4f1.js assets/index.e110aa66.css favicon.ico index.html diff --git a/WEBUI/index.html b/WEBUI/index.html index 4cdd2c3..0588af4 100644 --- a/WEBUI/index.html +++ b/WEBUI/index.html @@ -1,3 +1,3 @@ -ESP32 web interface +ESP32 web interface
\ No newline at end of file diff --git a/WEBUI/test.json b/WEBUI/test.json index 9553eed..3863407 100644 --- a/WEBUI/test.json +++ b/WEBUI/test.json @@ -1,59 +1,32 @@ { "data": { - "msgid": 123456789, - "time": "2023-08-02T12:01:32+00:00", + "msgid": 1691059877, + "time": "2023-08-03T10:51:17+00:00", "messtype": 3, "payloadtype": 1, "payload": { - "variables": [{ - "name": "wifi-mode", - "val": 3 - }, { - "name": "wifi-sta-ip", - "val": "192.168.99.86" - }, { - "name": "wifi-sta-mask", - "val": "255.255.255.0" - }, { - "name": "wifi-sta-gw", - "val": "192.168.99.1" - }, { - "name": "wifi-ap-ip", - "val": "192.168.150.1" - }, { - "name": "wifi-dns1", - "val": "8.8.8.8" - }, { - "name": "wifi-dns2", - "val": "8.8.4.4" - }, { - "name": "wifi-dns3", - "val": "1.1.1.1" - }, { - "name": "wifi-sta-ssid", - "val": "YourSTA" - }, { - "name": "wifi-sta-key", - "val": "123456789" - }, { - "name": "wifi-ap-ssid", - "val": "YourAP_EFCD5174" - }, { - "name": "wifi-ap-key", - "val": "123456789" - }, { - "name": "wifi-enab", - "val": 1 - }, { - "name": "wifi-isdhcp", - "val": 1 - }, { - "name": "wifi-power", - "val": 0 - }] + "variables": { + "wifi_enab": true, + "wifi_mode": 2, + "wifi_power": 80, + "wifi_ap_ssid": "YourAP_9E9ED380", + "wifi_ap_key": "123456789", + "wifi_ap_ip": "192.168.150.1", + "wifi_sta_ssid": "TRS", + "wifi_sta_key": "1285bogd", + "wifi_isdhcp": true, + "wifi_sta_ip": "192.168.99.89", + "wifi_sta_mask": "255.255.255.0", + "wifi_sta_gw": "192.168.99.1", + "wifi_dns1": "8.8.8.8", + "wifi_dns2": "8.8.4.4", + "wifi_dns3": "1.1.1.1", + "wifi_sta_mac": "ESP_ERR_NOT_FOUND", + "wifi_ap_mac": "ESP_ERR_NOT_FOUND" + } }, "error": "SYS_OK_DATA", "error_descr": "Result successful, data attached" }, - "signature": "31CB8677DDB45C12C327E6271C50FCED62770768C94764AE79C88C589558000D" + "signature": "29B50ED1B829202D2E5306592766E7C55B71A9F4CB9449765404AD4572724E7D" } diff --git a/components/webguiapp b/components/webguiapp index 7f59cd0..933beae 160000 --- a/components/webguiapp +++ b/components/webguiapp @@ -1 +1 @@ -Subproject commit 7f59cd090466a0ecdf204f9fb917582c9f4a8675 +Subproject commit 933beaef55a08c0607fae0a4e1e8860b9bebe6fa