Fix folders nesting

include/webserver/WebServer.h

@@ -78,7 +78,7 @@ public slots:
 	QtHttpServer*        _server;
 	bool                 _inited = false;
 
-	const QString        WEBSERVER_DEFAULT_PATH = ":/webconfig";
+	const QString        WEBSERVER_DEFAULT_PATH = ":/www";
 	const QString        WEBSERVER_DEFAULT_CRT_PATH = ":/hyperhdrcrt.pem";
 	const QString        WEBSERVER_DEFAULT_KEY_PATH = ":/hyperhdrkey.pem";
 	quint16              WEBSERVER_DEFAULT_PORT = 8090;

sources/webserver/CMakeLists.txt

@@ -3,12 +3,12 @@ set(CURRENT_HEADER_DIR ${CMAKE_SOURCE_DIR}/include/webserver)
 set(CURRENT_SOURCE_DIR ${CMAKE_SOURCE_DIR}/sources/webserver)
 
 FILE ( GLOB WebConfig_SOURCES "${CURRENT_HEADER_DIR}/*.h"  "${CURRENT_SOURCE_DIR}/*.h"  "${CURRENT_SOURCE_DIR}/*.cpp" )
-FILE ( GLOB_RECURSE webFiles RELATIVE ${CMAKE_BINARY_DIR}  ${CMAKE_SOURCE_DIR}/assets/webconfig/* )
+FILE ( GLOB_RECURSE webFiles RELATIVE ${CMAKE_BINARY_DIR}  ${CMAKE_SOURCE_DIR}/www/* )
 
 FOREACH( f ${webFiles} )
-    STRING ( REPLACE "assets/webconfig/" ";" workingWebFile ${f})
+    STRING ( REPLACE "www/" ";" workingWebFile ${f})
     list(GET workingWebFile -1 fname)
-    SET(HYPERHDR_WEBCONFIG_RES "${HYPERHDR_WEBCONFIG_RES}\n\t\t<file alias=\"/webconfig/${fname}\">${f}</file>")
+    SET(HYPERHDR_WEBCONFIG_RES "${HYPERHDR_WEBCONFIG_RES}\n\t\t<file alias=\"/www/${fname}\">${f}</file>")
 ENDFOREACH()
 CONFIGURE_FILE(${CURRENT_SOURCE_DIR}/WebConfig.qrc.in ${CMAKE_BINARY_DIR}/WebConfig.qrc )
 SET(WebConfig_RESOURCES ${CMAKE_BINARY_DIR}/WebConfig.qrc)

sources/webserver/WebServer.cpp

@@ -121,7 +121,7 @@ void WebServer::handleSettingsUpdate(settings::type type, const QJsonDocument& c
 		_baseUrl = obj["document_root"].toString(WEBSERVER_DEFAULT_PATH);
 
 
-		if ((_baseUrl != ":/webconfig") && !_baseUrl.trimmed().isEmpty())
+		if ((_baseUrl != ":/www") && !_baseUrl.trimmed().isEmpty())
 		{
 			QFileInfo info(_baseUrl);
 			if (!info.exists() || !info.isDir())