From fd36bb27642e535c13bfcc2800b04dc8c3d9f735 Mon Sep 17 00:00:00 2001 From: Bogdan Date: Sun, 28 Aug 2022 16:13:44 +0200 Subject: [PATCH] web interface updated --- HTML/adapters.html | 15 ++++++++++----- HTML/espfs.paths | 1 + HTML/index.html | 42 +++++++++++++++++++++++++++++++++++++++--- HTML/res.js | 25 ++++++++----------------- HTML/services.html | 13 +++++-------- HTML/system.html | 38 +++++++++++++++++++------------------- components/webguiapp | 2 +- 7 files changed, 83 insertions(+), 53 deletions(-) diff --git a/HTML/adapters.html b/HTML/adapters.html index 761db7b..4cfb20c 100644 --- a/HTML/adapters.html +++ b/HTML/adapters.html @@ -72,7 +72,9 @@
GPRS
- -

- + PrintLabel('DNS3:','~flgsmdns~'); + PrintSep(); + PrintSaveFail('~status_fail~'); + PrintSaveBtn('gprs'); PrintApplyBtn('gprs');} + else + PrintLabel("GPRS is not supported by the hardware",""); +
diff --git a/HTML/espfs.paths b/HTML/espfs.paths index 97044b2..d709e10 100644 --- a/HTML/espfs.paths +++ b/HTML/espfs.paths @@ -14,6 +14,7 @@ favicon.ico iconsfont.css iconsfont.woff2 index.html +info.html logo.png main.js reboot.html diff --git a/HTML/index.html b/HTML/index.html index 23108de..90aea82 100644 --- a/HTML/index.html +++ b/HTML/index.html @@ -20,19 +20,28 @@
-
Application 1
+
+
+
YOUR BRAND DEVICE NAME


+ ?
+ Uptime:?

+ Signal WiFi:?
+








+
-
Application 2
+
+











-
Application 3
+
+











@@ -44,5 +53,32 @@ showMenu('header-toggle','navbar'); linkColor.forEach(l => l.addEventListener('click', colorLink)) + + \ No newline at end of file diff --git a/HTML/res.js b/HTML/res.js index e6f4676..23a69b6 100644 --- a/HTML/res.js +++ b/HTML/res.js @@ -40,36 +40,27 @@ var hedmen = `
- - CONNECTION + + SETTINGS
- Adapters + Network Services + System
-
- - - DEVICE - - - -
-
- Maintain -
-
-
- + diff --git a/HTML/services.html b/HTML/services.html index 6e92d52..e0d1d5c 100644 --- a/HTML/services.html +++ b/HTML/services.html @@ -32,12 +32,8 @@


-
- -

Ошибка формата данных!


-
- -
+ @@ -55,16 +51,17 @@ PrintTextInput('Логин','clnm1','~clname1~',3,31); PrintTextInput('Пароль','clps1','~clpass1~',3,31); PrintSep(); + if(~ifc_mq2~){ PrintCheckBox('Включить MQTT 2','mqttenb2','~mqtten2~',null); PrintTextInput('URL шлюза сообщений','cld2','~ipcld2~',3,31); PrintInt('Порт шлюза сообщений','mprt2','~mport2~',1000,65534); PrintTextInput('ID станции','idd2','~idcld2~',3,31); PrintTextInput('Корневая тема','top2','~topic2~',3,31); PrintTextInput('Логин','clnm2','~clname2~',3,31); - PrintTextInput('Пароль','clps2','~clpass2~',3,31); + PrintTextInput('Пароль','clps2','~clpass2~',3,31);} + PrintSaveBtn('mqtt'); PrintApplyBtn('mqtt') diff --git a/HTML/system.html b/HTML/system.html index 6696d62..8ce48bf 100644 --- a/HTML/system.html +++ b/HTML/system.html @@ -18,45 +18,45 @@
-
+
SYSTEM
-
URL файла обновления:
+ PrintTextInput('User name:','lgn','~login~', 3, 31 ); + PrintTextInput('User password:','psn','~pass~', 5, 31 ); + PrintCheckBox('Enable OTA update','ota','~ota~',null); +
Update firmware URL:
+ PrintLabel('Firmware version:','~fver~'); + PrintLabel('IDF version:','~idfver~'); + PrintLabel('Built date:','~builddate~'); + PrintLabel('Serial number:','~serial10~'); - - - + + +
-
+
STAT
- + - - + + - - + +
Ethernet:?
WiFi:?
GPRS:?
Основной адаптер:?
Current net adapter:?
MQTT соединение 1:?
MQTT соединение 2:?
MQTT connection 1:?
MQTT connection 2:?
Свободной памяти:?
Минимум памяти:?
Free RAM:?
Minimal free RAM :?
@@ -64,7 +64,7 @@
-
+
CONTROL

diff --git a/components/webguiapp b/components/webguiapp index 34be6b7..ee9c573 160000 --- a/components/webguiapp +++ b/components/webguiapp @@ -1 +1 @@ -Subproject commit 34be6b7dab4f342fcf2d8778471ea7bb357c53c2 +Subproject commit ee9c5730324a6bd4aeddbd53010367ac139057a6