From 418db6b11019da3185188c8d99c51dbb93fa119b Mon Sep 17 00:00:00 2001
From: Bogdan <bogd@live.ru>
Date: Wed, 24 Aug 2022 15:17:50 +0200
Subject: [PATCH] organize web interface files

---
 HTML/{index30.html => app/set_app.html}  |  0
 HTML/espfs.paths                         | 14 ++++++++------
 HTML/ioscr.js                            | 16 ++++++++--------
 HTML/{ => res}/ca_cert.pem               |  0
 HTML/{index40.html => sys/control.html}  |  0
 HTML/{index23.html => sys/set_lora.html} |  0
 HTML/{index41.html => sys/stats.html}    |  0
 components/webguiapp                     |  2 +-
 8 files changed, 17 insertions(+), 15 deletions(-)
 rename HTML/{index30.html => app/set_app.html} (100%)
 rename HTML/{ => res}/ca_cert.pem (100%)
 rename HTML/{index40.html => sys/control.html} (100%)
 rename HTML/{index23.html => sys/set_lora.html} (100%)
 rename HTML/{index41.html => sys/stats.html} (100%)

diff --git a/HTML/index30.html b/HTML/app/set_app.html
similarity index 100%
rename from HTML/index30.html
rename to HTML/app/set_app.html
diff --git a/HTML/espfs.paths b/HTML/espfs.paths
index 7aa12ee..95259d1 100644
--- a/HTML/espfs.paths
+++ b/HTML/espfs.paths
@@ -9,14 +9,11 @@ api/set3.json
 api/stat.json
 api/status.json
 api/tmr.json
-ca_cert.pem
+app
+app/set_app.html
 favicon.ico
 head.inc
 index.html
-index23.html
-index30.html
-index40.html
-index41.html
 ioscr.js
 new
 new/iconsfont.css
@@ -26,12 +23,17 @@ new/ioscr.js
 new/logo.png
 new/main.js
 new/styles.css
+res
+res/ca_cert.pem
 style.css
 sys
+sys/control.html
 sys/reboot.html
 sys/set_eth.html
 sys/set_gprs.html
+sys/set_lora.html
 sys/set_mqtt.html
 sys/set_sys.html
 sys/set_time.html
-sys/set_wifi.html
\ No newline at end of file
+sys/set_wifi.html
+sys/stats.html
\ No newline at end of file
diff --git a/HTML/ioscr.js b/HTML/ioscr.js
index 9fe0d3e..0def4a0 100644
--- a/HTML/ioscr.js
+++ b/HTML/ioscr.js
@@ -22,23 +22,23 @@ xhr.send(null);
 
 function PrintMenu(){
 document.write("<div id='conteiner'><nav id='menu1'><ul>");
-document.write("<li><a href='index.html'>Главная</a></li>");
+document.write("<li><a href='index.html'>Main</a></li>");
 
-document.write("<li><a href='#'>Сервис</a><ul>");
-document.write("<li><a href='index40.html'>Управление</a></li>");
-document.write("<li><a href='index41.html'>Статистика</a></li></ul></li>");
+document.write("<li><a href='#'>Service</a><ul>");
+document.write("<li><a href='sys/control.html'>Control</a></li>");
+document.write("<li><a href='sys/stats.html'>Stats</a></li></ul></li>");
 
-document.write("<li><a href='#'>Настройки</a><ul>");
-document.write("<li><a href='index30.html'>Панель</a></li>");
+document.write("<li><a href='#'>Settings</a><ul>");
+//document.write("<li><a href='app/set_app.html'>Application</a></li>");
 document.write("<li><a href='sys/set_mqtt.html'>MQTT</a></li>");
 document.write("<li><a href='sys/set_sys.html'>System</a></li>");
 document.write("<li><a href='sys/set_time.html'>Time</a></li></ul></li>");
 
-document.write("<li><a href='#'>Сеть</a><ul>");
+document.write("<li><a href='#'>Network</a><ul>");
 document.write("<li><a href='sys/set_eth.html'>Ethernet</a></li>");
 document.write("<li><a href='sys/set_wifi.html'>WiFi</a></li>");
 document.write("<li><a href='sys/set_gprs.html'>GPRS</a></li>");
-document.write("<li><a href='index23.html'>LoRaWAN</a></li></ul></li>");
+//document.write("<li><a href='sys/set_lora.html'>LoRaWAN</a></li></ul></li>");
 document.write("</ul></nav></div>");}
 
 function PrintIPInput(title,name,value){document.write("<tr><td class='rl'>"+title+"</td><td><input type='text' required size='20' name='"+name+"' value='"+value+"' title='IP адрес xxx.xxx.xxx.xxx' pattern='^\\d{1,3}\.\\d{1,3}\.\\d{1,3}\.\\d{1,3}$' /></td></tr>");}
diff --git a/HTML/ca_cert.pem b/HTML/res/ca_cert.pem
similarity index 100%
rename from HTML/ca_cert.pem
rename to HTML/res/ca_cert.pem
diff --git a/HTML/index40.html b/HTML/sys/control.html
similarity index 100%
rename from HTML/index40.html
rename to HTML/sys/control.html
diff --git a/HTML/index23.html b/HTML/sys/set_lora.html
similarity index 100%
rename from HTML/index23.html
rename to HTML/sys/set_lora.html
diff --git a/HTML/index41.html b/HTML/sys/stats.html
similarity index 100%
rename from HTML/index41.html
rename to HTML/sys/stats.html
diff --git a/components/webguiapp b/components/webguiapp
index 267a7de..d229926 160000
--- a/components/webguiapp
+++ b/components/webguiapp
@@ -1 +1 @@
-Subproject commit 267a7de82ac60a1d0a4e8caed0324e8c5600bfd9
+Subproject commit d22992654bbc55ca8a6d316b5da6c0489eb3b387