Update info page (#1420)

* consolidate info page

* use new REST API

* .

* .

* .

* .

* .

* .

* .

* Make sure after the reboot we go to the overview page

* .

* Update server_main.cpp
This commit is contained in:
CaCO3
2022-11-28 18:51:11 +01:00
committed by GitHub
parent 7b0e6200d6
commit 524d800a0a
8 changed files with 91 additions and 125 deletions

View File

@@ -58,7 +58,7 @@ function doBackup() {
// Get hostname
try {
var xhttp = new XMLHttpRequest();
xhttp.open("GET", "/version?type=Hostname", false);
xhttp.open("GET", "/info?type=Hostname", false);
xhttp.send();
hostname = xhttp.responseText;
}

View File

@@ -19,7 +19,7 @@ function LoadHostname() {
// var xhttp = new XMLHttpRequest();
try {
url = _basepath + '/version?type=Hostname';
url = _basepath + '/info?type=Hostname';
xhttp.open("GET", url, true);
xhttp.send();
@@ -52,7 +52,7 @@ function LoadFwVersion() {
});
try {
url = _basepath + '/version?type=GitBaseBranch';
url = _basepath + '/info?type=FirmwareVersion';
xhttp.open("GET", url, true);
xhttp.send();
}
@@ -78,7 +78,7 @@ function LoadWebUiVersion() {
});
try {
url = _basepath + '/version?type=HTMLVersion';
url = _basepath + '/info?type=HTMLVersion';
xhttp.open("GET", url, true);
xhttp.send();
}

View File

@@ -25,20 +25,55 @@ div {
</head>
<body style="font-family: arial; padding: 0px 10px;">
<h3>Current</h3>
<h3>Runtime Information</h3>
<table style="font-family: arial">
<tr>
<td>
Last restart:
</td>
<td>
<div id="gitbranch">
<div id="starttime">
<object data="/starttime"></object>
</div>
</td>
</tr>
</table>
<h3>Build Info</h3>
<table style="font-family: arial">
<tr>
<td>
Firmware Version:
</td>
<td>
<div id="firmware" style="width: 700px">
<object data="/info?type=FirmwareVersion" style="width: 700px"></object>
</div>
</td>
</tr>
<tr>
<td>
Firmware Build Time:
</td>
<td>
<div id="build-time">
<object data="/info?type=BuildTime"></object>
</div>
</td>
</tr>
<tr>
<td>
Web Interface Version:
</td>
<td>
<div id="web-ui" style="width: 700px">
<object data="/info?type=HTMLVersion" style="width: 700px"></object>
</div>
</td>
</tr>
</table>
<h3>Host Info</h3>
<table style="font-family: arial">
@@ -47,8 +82,8 @@ div {
Hostname:
</td>
<td>
<div id="gitbranch">
<object data="/version?type=Hostname"></object>
<div id="Hostname">
<object data="/info?type=Hostname"></object>
</div>
</td>
</tr>
@@ -57,8 +92,8 @@ div {
IP-Address:
</td>
<td>
<div id="gitbranch">
<object data="/version?type=IP"></object>
<div id="IP">
<object data="/info?type=IP"></object>
</div>
</td>
</tr>
@@ -67,71 +102,13 @@ div {
WLan-SSID:
</td>
<td>
<div id="gitbranch">
<object data="/version?type=SSID"></object>
<div id="SSID">
<object data="/info?type=SSID"></object>
</div>
</td>
</tr>
</table>
<h3>Version Info</h3>
<table style="font-family: arial">
<tr>
<td>
Git-Branch:
</td>
<td>
<div id="gitbranch">
<object data="/version?type=GitBranch"></object>
</div>
</td>
</tr>
<tr>
<td>
Git-Tag:
</td>
<td>
<div>
<object data="/version?type=GitTag"></object>
</div>
</td>
</tr>
<tr>
<td>
Git-Revision:
</td>
<td>
<div>
<object data="/version?type=GitRevision"></object>
</div>
</td>
</tr>
<tr>
<td>
Build Time:
</td>
<td>
<div>
<object data="/version?type=BuildTime"></object>
</div>
</td>
</tr>
<tr>
<td>
HTML Version:
</td>
<td>
<div>
<object data="/version?type=HTMLVersion"></object>
</div>
</td>
</tr>
</table>
<h3>SD Card Info</h3>
<table style="font-family: arial">
<tr>
@@ -140,7 +117,7 @@ div {
</td>
<td>
<div id="SDCardManufacturer">
<object data="/version?type=SDCardManufacturer"></object>
<object data="/info?type=SDCardManufacturer"></object>
</div>
</td>
</tr>
@@ -150,7 +127,7 @@ div {
</td>
<td>
<div id="SDCardName">
<object data="/version?type=SDCardName"></object>
<object data="/info?type=SDCardName"></object>
</div>
</td>
</tr>
@@ -160,7 +137,7 @@ div {
</td>
<td>
<div id="SDCardCapacity">
<object data="/version?type=SDCardCapacity"></object>
<object data="/info?type=SDCardCapacity"></object>
</div>
</td>
</tr>
@@ -170,7 +147,7 @@ div {
</td>
<td>
<div id="SDCardSectorSize">
<object data="/version?type=SDCardSectorSize"></object>
<object data="/info?type=SDCardSectorSize"></object>
</div>
</td>
</tr>
@@ -180,7 +157,7 @@ div {
</td>
<td>
<div id="SDPartitionSize">
<object data="/version?type=SDCardPartitionSize"></object>
<object data="/info?type=SDCardPartitionSize"></object>
</div>
</td>
</tr>
@@ -190,7 +167,7 @@ div {
</td>
<td>
<div id="SDFreePartitionSpace">
<object data="/version?type=SDCardFreePartitionSpace"></object>
<object data="/info?type=SDCardFreePartitionSpace"></object>
</div>
</td>
</tr>
@@ -200,7 +177,7 @@ div {
</td>
<td>
<div id="SDCardPartitionAllocationSize">
<object data="/version?type=SDCardPartitionAllocationSize"></object>
<object data="/info?type=SDCardPartitionAllocationSize"></object>
</div>
</td>
</tr>

View File

@@ -89,7 +89,7 @@ function init(){
function doRebootAfterUpdate() {
if (confirm("Update completed!\nThe ESP32 will reboot now!")) {
if (confirm("Upload completed!\nThe device will reboot now and complete the update.\nThis will take up to 180s!")) {
var stringota = "/reboot";
window.location = stringota;
window.location.href = stringota;
@@ -132,7 +132,7 @@ function prepareOnServer() {
return;
}
document.getElementById("status").innerText = "Status: Preparations on ESP32";
document.getElementById("status").innerText = "Status: Preparations on device";
document.getElementById("doUpdate").disabled = true;
var xhttp = new XMLHttpRequest();
@@ -199,7 +199,7 @@ function upload() {
function extract() {
document.getElementById("status").innerText = "Status: Processing on ESP32 (takes up to 3 minutes)...";
document.getElementById("status").innerText = "Status: Processing on device (takes up to 3 minutes)...";
var xhttp = new XMLHttpRequest();
/* first delete the old firmware */
@@ -210,6 +210,7 @@ function extract() {
document.getElementById("status").innerText = "Status: Update completed!";
document.getElementById("doUpdate").disabled = true;
document.getElementById("newfile").disabled = false;
document.cookie = "overview.html"; // Make sure after the reboot we go to the overview page
if (xhttp.responseText.startsWith("reboot"))
{