diff --git a/WEBUI/assets/ErrorNotFound.945dd912.js b/WEBUI/assets/ErrorNotFound.945dd912.js deleted file mode 100644 index cf6628f..0000000 --- a/WEBUI/assets/ErrorNotFound.945dd912.js +++ /dev/null @@ -1 +0,0 @@ -import{_ as t,W as o,X as s,a7 as a,a6 as e,$ as n,a5 as r}from"./index.f4a88b7f.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}; diff --git a/WEBUI/assets/ErrorNotFound.b377d03e.js b/WEBUI/assets/ErrorNotFound.b377d03e.js new file mode 100644 index 0000000..5b0b435 --- /dev/null +++ b/WEBUI/assets/ErrorNotFound.b377d03e.js @@ -0,0 +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}; diff --git a/WEBUI/assets/IndexPage1.fbedabee.js b/WEBUI/assets/IndexPage1.0ce36947.js similarity index 61% rename from WEBUI/assets/IndexPage1.fbedabee.js rename to WEBUI/assets/IndexPage1.0ce36947.js index 1bcd63a..65b5a77 100644 --- a/WEBUI/assets/IndexPage1.fbedabee.js +++ b/WEBUI/assets/IndexPage1.0ce36947.js @@ -1 +1 @@ -import{Q as a}from"./QPage.2c9c9163.js";import{_ as t,W as s,X as n,Y as o,Z as r,a6 as e}from"./index.f4a88b7f.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.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}; diff --git a/WEBUI/assets/IndexPage2.0b79c6d2.js b/WEBUI/assets/IndexPage2.0b79c6d2.js new file mode 100644 index 0000000..83508d0 Binary files /dev/null and b/WEBUI/assets/IndexPage2.0b79c6d2.js differ diff --git a/WEBUI/assets/IndexPage2.afc166ab.js b/WEBUI/assets/IndexPage2.afc166ab.js deleted file mode 100644 index 2c50d9f..0000000 Binary files a/WEBUI/assets/IndexPage2.afc166ab.js and /dev/null differ diff --git a/WEBUI/assets/IndexPage3.542d34ac.js b/WEBUI/assets/IndexPage3.542d34ac.js deleted file mode 100644 index be0d365..0000000 Binary files a/WEBUI/assets/IndexPage3.542d34ac.js and /dev/null differ diff --git a/WEBUI/assets/IndexPage3.8156c5f3.css b/WEBUI/assets/IndexPage3.8156c5f3.css deleted file mode 100644 index 0ba7fbd..0000000 --- a/WEBUI/assets/IndexPage3.8156c5f3.css +++ /dev/null @@ -1 +0,0 @@ -.my-card[data-v-fae0f672]{width:480px} diff --git a/WEBUI/assets/IndexPage3.e1511eb7.js b/WEBUI/assets/IndexPage3.e1511eb7.js new file mode 100644 index 0000000..6cc8191 Binary files /dev/null and b/WEBUI/assets/IndexPage3.e1511eb7.js differ diff --git a/WEBUI/assets/IndexPage3.f4b10b4f.css b/WEBUI/assets/IndexPage3.f4b10b4f.css new file mode 100644 index 0000000..ed3bec1 --- /dev/null +++ b/WEBUI/assets/IndexPage3.f4b10b4f.css @@ -0,0 +1 @@ +.my-card{width:480px} diff --git a/WEBUI/assets/MainLayout.43d7dfc6.js b/WEBUI/assets/MainLayout.43d7dfc6.js deleted file mode 100644 index dae35f9..0000000 Binary files a/WEBUI/assets/MainLayout.43d7dfc6.js and /dev/null differ diff --git a/WEBUI/assets/MainLayout.94853b61.js b/WEBUI/assets/MainLayout.94853b61.js new file mode 100644 index 0000000..ffe8caa Binary files /dev/null and b/WEBUI/assets/MainLayout.94853b61.js differ diff --git a/WEBUI/assets/QItem.19ef06cf.js b/WEBUI/assets/QItem.19ef06cf.js deleted file mode 100644 index 2198b5b..0000000 --- a/WEBUI/assets/QItem.19ef06cf.js +++ /dev/null @@ -1 +0,0 @@ -import{c as b,D as q,F as k,a as l,h as c,d as Q,g,ab as R,ac as S,r as m,ad as $,B as w,p as A}from"./index.f4a88b7f.js";var I=b({name:"QList",props:{...q,bordered:Boolean,dense:Boolean,separator:Boolean,padding:Boolean,tag:{type:String,default:"div"}},setup(e,{slots:i}){const r=g(),u=k(e,r.proxy.$q),o=l(()=>"q-list"+(e.bordered===!0?" q-list--bordered":"")+(e.dense===!0?" q-list--dense":"")+(e.separator===!0?" q-list--separator":"")+(u.value===!0?" q-list--dark":"")+(e.padding===!0?" q-list--padding":""));return()=>c(e.tag,{class:o.value},Q(i.default))}}),P=b({name:"QItem",props:{...q,...R,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:i,emit:r}){const{proxy:{$q:u}}=g(),o=k(e,u),{hasLink:d,linkAttrs:y,linkClass:h,linkTag:B,navigateOnClick:C}=S(),n=m(null),s=m(null),v=l(()=>e.clickable===!0||d.value===!0||e.tag==="label"),a=l(()=>e.disable!==!0&&v.value===!0),L=l(()=>"q-item q-item-type row no-wrap"+(e.dense===!0?" q-item--dense":"")+(o.value===!0?" q-item--dark":"")+(d.value===!0&&e.active===null?h.value:e.active===!0?` q-item--active${e.activeClass!==void 0?` ${e.activeClass}`:""}`:"")+(e.disable===!0?" disabled":"")+(a.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":""):"")),x=l(()=>{if(e.insetLevel===void 0)return null;const t=u.lang.rtl===!0?"Right":"Left";return{["padding"+t]:16+e.insetLevel*56+"px"}});function E(t){a.value===!0&&(s.value!==null&&(t.qKeyEvent!==!0&&document.activeElement===n.value?s.value.focus():document.activeElement===s.value&&n.value.focus()),C(t))}function D(t){if(a.value===!0&&$(t,13)===!0){w(t),t.qKeyEvent=!0;const f=new MouseEvent("click",t);f.qKeyEvent=!0,n.value.dispatchEvent(f)}r("keyup",t)}function K(){const t=A(i.default,[]);return a.value===!0&&t.unshift(c("div",{class:"q-focus-helper",tabindex:-1,ref:s})),t}return()=>{const t={ref:n,class:L.value,style:x.value,role:"listitem",onClick:E,onKeyup:D};return a.value===!0?(t.tabindex=e.tabindex||"0",Object.assign(t,y.value)):v.value===!0&&(t["aria-disabled"]="true"),c(B.value,t,K())}}});export{P as Q,I as a}; diff --git a/WEBUI/assets/QItem.30ec9c8c.js b/WEBUI/assets/QItem.30ec9c8c.js new file mode 100644 index 0000000..1c717e6 --- /dev/null +++ b/WEBUI/assets/QItem.30ec9c8c.js @@ -0,0 +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}; diff --git a/WEBUI/assets/QPage.2c9c9163.js b/WEBUI/assets/QPage.99bb7d33.js similarity index 92% rename from WEBUI/assets/QPage.2c9c9163.js rename to WEBUI/assets/QPage.99bb7d33.js index 527c227..730610c 100644 --- a/WEBUI/assets/QPage.2c9c9163.js +++ b/WEBUI/assets/QPage.99bb7d33.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.f4a88b7f.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.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}; diff --git a/WEBUI/assets/axios.534d8d21.js b/WEBUI/assets/axios.534d8d21.js new file mode 100644 index 0000000..39bbfc7 Binary files /dev/null and b/WEBUI/assets/axios.534d8d21.js differ diff --git a/WEBUI/assets/axios.97234907.js b/WEBUI/assets/axios.97234907.js deleted file mode 100644 index 36ca16a..0000000 Binary files a/WEBUI/assets/axios.97234907.js and /dev/null differ diff --git a/WEBUI/assets/index.bc944420.js b/WEBUI/assets/index.bc944420.js new file mode 100644 index 0000000..0fad2ba Binary files /dev/null and b/WEBUI/assets/index.bc944420.js differ diff --git a/WEBUI/assets/index.f4a88b7f.js b/WEBUI/assets/index.f4a88b7f.js deleted file mode 100644 index 0f378aa..0000000 Binary files a/WEBUI/assets/index.f4a88b7f.js and /dev/null differ diff --git a/WEBUI/espfs.paths b/WEBUI/espfs.paths index b0491f4..8541b8e 100644 --- a/WEBUI/espfs.paths +++ b/WEBUI/espfs.paths @@ -1,24 +1,23 @@ assets -assets/ErrorNotFound.945dd912.js -assets/IndexPage1.fbedabee.js -assets/IndexPage2.afc166ab.js -assets/IndexPage3.542d34ac.js -assets/IndexPage3.8156c5f3.css +assets/ErrorNotFound.b377d03e.js +assets/IndexPage1.0ce36947.js +assets/IndexPage2.0b79c6d2.js +assets/IndexPage3.e1511eb7.js +assets/IndexPage3.f4b10b4f.css 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.43d7dfc6.js -assets/QItem.19ef06cf.js -assets/QPage.2c9c9163.js -assets/axios.97234907.js +assets/MainLayout.94853b61.js +assets/QItem.30ec9c8c.js +assets/QPage.99bb7d33.js +assets/axios.534d8d21.js assets/flUhRq6tzZclQEJ-Vdg-IuiaDsNa.fd84f88b.woff assets/flUhRq6tzZclQEJ-Vdg-IuiaDsNcIhQ8tQ.4a4dbc62.woff2 +assets/index.bc944420.js assets/index.e110aa66.css -assets/index.f4a88b7f.js favicon.ico index.html -sysapi -test.txt \ No newline at end of file +test.json \ No newline at end of file diff --git a/WEBUI/index.html b/WEBUI/index.html index f043250..4cdd2c3 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 new file mode 100644 index 0000000..9553eed --- /dev/null +++ b/WEBUI/test.json @@ -0,0 +1,59 @@ +{ + "data": { + "msgid": 123456789, + "time": "2023-08-02T12:01:32+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 + }] + }, + "error": "SYS_OK_DATA", + "error_descr": "Result successful, data attached" + }, + "signature": "31CB8677DDB45C12C327E6271C50FCED62770768C94764AE79C88C589558000D" +} diff --git a/WEBUI/test.txt b/WEBUI/test.txt deleted file mode 100644 index f98a179..0000000 --- a/WEBUI/test.txt +++ /dev/null @@ -1,43 +0,0 @@ -{ - "data": { - "msgid": 1690805819, - "time": "2023-07-31T12:17:00+00:00", - "messtype": 3, - "payloadtype": 1, - "payload": { - "variables": [ - { - "name": "netname", - "val": "DEVICE_HOSTNAME" - }, - { - "name": "otaurl", - "val": "https://iotronic.cloud/firmware/firmware.bin" - }, - { - "name": "time", - "val": 1690805820 - }, - { - "name": "wifi-sta-ip", - "val": "192.168.99.86" - }, - { - "name": "wifi-ap-ip", - "val": "192.168.150.1" - }, - { - "name": "wifi-sta-mask", - "val": "255.255.255.0" - }, - { - "name": "wifi-sta-gw", - "val": "192.168.99.1" - } - ] - }, - "error": "SYS_OK_DATA", - "error_descr": "Result successful, data attached" - }, - "signature": "BBC236A7F4991E18E23BE6F6C15D712E3D204D9584A76D85F77AD9EFE3A6DCCA" -} \ No newline at end of file diff --git a/sdkconfig b/sdkconfig index e2dbbfe..86c53f0 100644 --- a/sdkconfig +++ b/sdkconfig @@ -251,7 +251,7 @@ CONFIG_APP_COMPILE_TIME_DATE=y # CONFIG_APP_EXCLUDE_PROJECT_VER_VAR is not set # CONFIG_APP_EXCLUDE_PROJECT_NAME_VAR is not set CONFIG_APP_PROJECT_VER_FROM_CONFIG=y -CONFIG_APP_PROJECT_VER="0.0.0.0" +CONFIG_APP_PROJECT_VER="0.0.0.1" CONFIG_APP_RETRIEVE_LEN_ELF_SHA=16 # end of Application manager diff --git a/sdkconfig.old b/sdkconfig.old index a0725a3..e2dbbfe 100644 --- a/sdkconfig.old +++ b/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="RTN16" -CONFIG_WEBGUIAPP_WIFI_KEY_STA="12850000" +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"