diff --git a/src/web/AmsWebServer.cpp b/src/web/AmsWebServer.cpp index 07e49b83..fd8afbd1 100644 --- a/src/web/AmsWebServer.cpp +++ b/src/web/AmsWebServer.cpp @@ -16,6 +16,7 @@ #include "root/ntp_html.h" #include "root/gpio_html.h" #include "root/debugging_html.h" +#include "root/restart_html.h" #include "root/restartwait_html.h" #include "root/boot_css.h" #include "root/gaugemeter_js.h" @@ -50,7 +51,7 @@ void AmsWebServer::setup(AmsConfiguration* config, MQTTClient* mqtt) { server.on("/config-mqtt", HTTP_GET, std::bind(&AmsWebServer::configMqttHtml, this)); server.on("/config-web", HTTP_GET, std::bind(&AmsWebServer::configWebHtml, this)); server.on("/config-domoticz",HTTP_GET, std::bind(&AmsWebServer::configDomoticzHtml, this)); - server.on("/config-entsoe",HTTP_GET, std::bind(&AmsWebServer::configEntsoeHtml, this)); + server.on("/entsoe",HTTP_GET, std::bind(&AmsWebServer::configEntsoeHtml, this)); server.on("/boot.css", HTTP_GET, std::bind(&AmsWebServer::bootCss, this)); server.on("/gaugemeter.js", HTTP_GET, std::bind(&AmsWebServer::gaugemeterJs, this)); server.on("/github.svg", HTTP_GET, std::bind(&AmsWebServer::githubSvg, this)); @@ -65,6 +66,8 @@ void AmsWebServer::setup(AmsConfiguration* config, MQTTClient* mqtt) { server.on("/firmware", HTTP_GET, std::bind(&AmsWebServer::firmwareHtml, this)); server.on("/firmware", HTTP_POST, std::bind(&AmsWebServer::uploadPost, this), std::bind(&AmsWebServer::firmwareUpload, this)); server.on("/upgrade", HTTP_GET, std::bind(&AmsWebServer::firmwareDownload, this)); + server.on("/restart", HTTP_GET, std::bind(&AmsWebServer::restartHtml, this)); + server.on("/restart", HTTP_POST, std::bind(&AmsWebServer::restartPost, this)); server.on("/restart-wait", HTTP_GET, std::bind(&AmsWebServer::restartWaitHtml, this)); server.on("/is-alive", HTTP_GET, std::bind(&AmsWebServer::isAliveCheck, this)); @@ -1311,6 +1314,31 @@ void AmsWebServer::firmwareDownload() { } } +void AmsWebServer::restartHtml() { + printD("Serving /restart.html over http..."); + + if(!checkSecurity(1)) + return; + + server.sendHeader("Cache-Control", "no-cache, no-store, must-revalidate"); + server.sendHeader("Pragma", "no-cache"); + + server.setContentLength(RESTART_HTML_LEN + HEAD_HTML_LEN + FOOT_HTML_LEN); + server.send_P(200, "text/html", HEAD_HTML); + server.sendContent_P(RESTART_HTML); + server.sendContent_P(FOOT_HTML); +} + +void AmsWebServer::restartPost() { + if(!checkSecurity(1)) + return; + + printD("Setting restart flag and redirecting"); + performRestart = true; + server.sendHeader("Location","/restart-wait"); + server.send(303); +} + void AmsWebServer::restartWaitHtml() { printD("Serving /restart-wait.html over http..."); diff --git a/src/web/AmsWebServer.h b/src/web/AmsWebServer.h index fa6c62cd..6e45c6ec 100644 --- a/src/web/AmsWebServer.h +++ b/src/web/AmsWebServer.h @@ -88,6 +88,8 @@ private: void firmwareHtml(); void firmwareUpload(); void firmwareDownload(); + void restartHtml(); + void restartPost(); void restartWaitHtml(); void isAliveCheck(); diff --git a/web/application.js b/web/application.js index 3cd59039..a3732eb4 100644 --- a/web/application.js +++ b/web/application.js @@ -114,9 +114,7 @@ $(function() { case '/price': $('#config-price-link').addClass('active'); break; - case '/config-meter': - $('#config-meter-link').addClass('active'); - break; + case '/config-meter': case '/config-wifi': case '/config-mqtt': case '/mqtt-ca': @@ -125,11 +123,14 @@ $(function() { case '/config-domoticz': case '/config-web': case '/ntp': + case '/entsoe': + $('#config-link').addClass('active'); + break; case '/gpio': case '/debugging': case '/firmware': case '/reset': - $('#config-system-link').addClass('active'); + $('#system-link').addClass('active'); break; } diff --git a/web/configmeter.html b/web/configmeter.html index 84712e04..5f7fd0db 100644 --- a/web/configmeter.html +++ b/web/configmeter.html @@ -1,6 +1,7 @@
+
Meter
diff --git a/web/head.html b/web/head.html index 64273661..2b2fd101 100644 --- a/web/head.html +++ b/web/head.html @@ -59,32 +59,39 @@
  • Energy Price
    • -
  • - Meter -
  • - -
    +
    + Meter WiFi MQTT Web NTP - GPIO -
    - ENTSO-E API -
    - Debugging - Firmware - Factory reset + ENTSO-E API
    Documentation
    • +
  • +
    + +
    + GPIO + Debugging + Firmware +
    + Restart + Factory reset +
    +
    +
    • diff --git a/web/restart.html b/web/restart.html new file mode 100644 index 00000000..fb5c277d --- /dev/null +++ b/web/restart.html @@ -0,0 +1,14 @@ + +
    +
    Are you sure you want restart?
    +
    +
    +
    +
    + Back +
    +
    + +
    +
    +