Moved html and http from core to a new web folder.

SConstruct

@@ -274,6 +274,7 @@ if scons_ver >= (4, 0, 0):
 Export("env")
 
 SConscript("core/SCsub")
+SConscript("web/SCsub")
 SConscript("platform/SCsub")
 
 if env_base["databases"]:

backends/drogon/drogon_web_server.h

@@ -1,7 +1,7 @@
 #ifndef DROGON_WEB_SERVER_H
 #define DROGON_WEB_SERVER_H
 
-#include "core/http/web_server.h"
+#include "web/http/web_server.h"
 
 #include "core/object.h"
 #include <functional>

backends/drogon/request.cpp

@@ -2,7 +2,7 @@
 
 #include "drogon_web_server.h"
 
-#include "core/http/cookie.h"
+#include "web/http/cookie.h"
 
 const String DRequest::get_cookie(const String &key) {
 	return request->getCookie(key);

backends/drogon/request.h

@@ -4,7 +4,7 @@
 #include "core/string.h"
 #include "core/containers/vector.h"
 
-#include "core/http/request.h"
+#include "web/http/request.h"
 
 #include <mutex>
 

web/SCsub

@@ -0,0 +1,13 @@
+#!/usr/bin/env python
+
+Import("env")
+
+env.core_sources = []
+
+env.add_source_files(env.core_sources, "*.cpp")
+env.add_source_files(env.core_sources, "./html/*.cpp")
+env.add_source_files(env.core_sources, "./http/*.cpp")
+
+# Build it all as a library
+lib = env.add_library("core", env.core_sources)
+env.Prepend(LIBS=[lib])

web/html/form_validator.cpp

@@ -1,6 +1,6 @@
 #include "form_validator.h"
 
-#include "core/http/request.h"
+#include "web/http/request.h"
 
 //FormFieldEntry
 

web/html/html_builder.cpp

@@ -1,7 +1,7 @@
 #include "html_builder.h"
 #include "core/string.h"
 
-#include "core/http/request.h"
+#include "web/http/request.h"
 
 HTMLTag *HTMLTag::str(const String &str) {
 	result += " " + str;

web/http/request.cpp

@@ -1,11 +1,11 @@
 #include "request.h"
 
-#include "core/http/cookie.h"
+#include "web/http/cookie.h"
 #include "web_server.h"
 
 #include "http_session.h"
 
-#include "core/http/web_root.h"
+#include "web/http/web_root.h"
 #include "session_manager.h"
 
 Ref<HTTPSession> Request::get_or_create_session() {

web/http/web_node.cpp

@@ -4,7 +4,7 @@
 #include "http_enums.h"
 #include "request.h"
 
-#include "core/http/web_server.h"
+#include "web/http/web_server.h"
 #include "core/settings/settings.h"
 
 #ifdef DATABASES_ENABLED

web/http/web_root.cpp

@@ -29,7 +29,7 @@ void WebRoot::setup_middleware() {
 
 	// ---   SessionSetupMiddleware   ---
 	// If you want sessions add this to your inherited class.
-	// (#include "core/http/session_manager.h")
+	// (#include "web/http/session_manager.h")
 
 	// _middlewares.push_back(Ref<SessionSetupMiddleware>(new SessionSetupMiddleware()));
 
@@ -48,7 +48,7 @@ void WebRoot::setup_middleware() {
 	// _middlewares.push_back(Ref<RBACDefaultUserSessionSetupMiddleware>(new RBACDefaultUserSessionSetupMiddleware()));
 
 	// ---   CSRF Token Middlweare    ---
-	// (#include "core/http/csrf_token.h")
+	// (#include "web/http/csrf_token.h")
 
 	// Ref<CSRFTokenMiddleware> csrf_middleware;
 	// csrf_middleware.instance();

web/http/web_server.cpp

@@ -1,7 +1,7 @@
 #include "web_server.h"
 
 #include "request.h"
-#include "core/http/web_node.h"
+#include "web/http/web_node.h"
 
 WebNode *WebServer::get_web_root() {
 	return _web_root;

web_modules/admin_panel/admin_node.cpp

@@ -1,11 +1,11 @@
 #include "admin_node.h"
 
-#include "core/html/form_validator.h"
-#include "core/html/html_builder.h"
-#include "core/http/cookie.h"
-#include "core/http/http_session.h"
-#include "core/http/request.h"
-#include "core/http/session_manager.h"
+#include "web/html/form_validator.h"
+#include "web/html/html_builder.h"
+#include "web/http/cookie.h"
+#include "web/http/http_session.h"
+#include "web/http/request.h"
+#include "web/http/session_manager.h"
 
 void AdminNode::admin_handle_request_main(Request *request) {
 

web_modules/admin_panel/admin_node.h

@@ -1,7 +1,7 @@
 #ifndef ADMIN_NODE_H
 #define ADMIN_NODE_H
 
-#include "core/http/web_node.h"
+#include "web/http/web_node.h"
 
 #include "core/containers/vector.h"
 #include "core/string.h"

web_modules/admin_panel/admin_panel.cpp

@@ -1,11 +1,11 @@
 #include "admin_panel.h"
 
-#include "core/html/form_validator.h"
-#include "core/html/html_builder.h"
-#include "core/http/cookie.h"
-#include "core/http/http_session.h"
-#include "core/http/request.h"
-#include "core/http/session_manager.h"
+#include "web/html/form_validator.h"
+#include "web/html/html_builder.h"
+#include "web/http/cookie.h"
+#include "web/http/http_session.h"
+#include "web/http/request.h"
+#include "web/http/session_manager.h"
 
 #include "admin_node.h"
 

web_modules/admin_panel/admin_panel.h

@@ -1,7 +1,7 @@
 #ifndef ADMIN_PANEL_H
 #define ADMIN_PANEL_H
 
-#include "core/http/web_node.h"
+#include "web/http/web_node.h"
 
 #include "core/string.h"
 #include "core/containers/vector.h"

web_modules/folder_pages/static_folder_page.cpp

@@ -1,11 +1,11 @@
 #include "static_folder_page.h"
 
-#include "core/http/request.h"
+#include "web/http/request.h"
 
 #include <iostream>
 #include "core/file_cache.h"
 #include "core/database/database_manager.h"
-#include "core/html/html_builder.h"
+#include "web/html/html_builder.h"
 
 void StaticFolderPage::handle_request_main(Request *request) {
 }

web_modules/folder_pages/static_folder_page.h

@@ -3,7 +3,7 @@
 
 #include "core/string.h"
 
-#include "core/http/web_node.h"
+#include "web/http/web_node.h"
 
 //StaticFolderPage
 //Just serve files

web_modules/list_page/list_page.cpp

@@ -1,7 +1,7 @@
 #include "list_page.h"
 
-#include "core/html/html_builder.h"
-#include "core/html/utils.h"
+#include "web/html/html_builder.h"
+#include "web/html/utils.h"
 #include "core/math/math.h"
 
 #include <tinydir/tinydir.h>

web_modules/list_page/list_page.h

@@ -4,9 +4,9 @@
 #include "core/containers/vector.h"
 #include "core/string.h"
 
-#include "core/http/web_node.h"
+#include "web/http/web_node.h"
 
-#include "core/http/request.h"
+#include "web/http/request.h"
 
 // This class will load and generate pages from a folder of md files. It supports pagination, 
 // it will put entry_per_page md files per page. It generates html on enter tree, and caches everything.

web_modules/message_page/message_page.h

@@ -4,9 +4,9 @@
 #include "core/containers/vector.h"
 #include "core/string.h"
 
-#include "core/http/web_node.h"
+#include "web/http/web_node.h"
 
-#include "core/http/request.h"
+#include "web/http/request.h"
 
 
 class MessagePage : public WebNode {

web_modules/paged_article/paged_article.cpp

@@ -1,7 +1,7 @@
 #include "paged_article.h"
 
 #include "core/os/directory.h"
-#include "core/html/utils.h"
+#include "web/html/utils.h"
 
 #include <iostream>
 

web_modules/paged_article/paged_article.h

@@ -6,9 +6,9 @@
 #include "core/string.h"
 
 #include "core/file_cache.h"
-#include "core/http/web_node.h"
+#include "web/http/web_node.h"
 
-#include "core/http/request.h"
+#include "web/http/request.h"
 
 class PagedArticle : public WebNode {
 	RCPP_OBJECT(PagedArticle, WebNode);

web_modules/paged_article/paged_articles.cpp

@@ -1,9 +1,9 @@
 #include "paged_articles.h"
 
-#include "core/html/html_builder.h"
+#include "web/html/html_builder.h"
 
 #include "core/os/directory.h"
-#include "core/html/utils.h"
+#include "web/html/utils.h"
 #include "paged_article.h"
 
 #include <iostream>

web_modules/paged_article/paged_articles.h

@@ -5,9 +5,9 @@
 #include "core/string.h"
 
 #include "core/file_cache.h"
-#include "core/http/web_node.h"
+#include "web/http/web_node.h"
 
-#include "core/http/request.h"
+#include "web/http/request.h"
 
 //todo pagination
 

web_modules/paged_article/paged_articles_md_index.cpp

@@ -1,8 +1,8 @@
 #include "paged_articles_md_index.h"
 
-#include "core/http/request.h"
+#include "web/http/request.h"
 
-#include "core/html/html_builder.h"
+#include "web/html/html_builder.h"
 
 void PagedArticlesMDIndex::handle_request_main(Request *request) {
 	const String path = request->get_current_path_segment();

web_modules/paged_article/paged_articles_md_index.h

@@ -3,7 +3,7 @@
 
 #include "core/string.h"
 
-#include "core/http/web_node.h"
+#include "web/http/web_node.h"
 
 #include "web_modules/list_page/list_page.h"
 #include "web_modules/paged_article/paged_article.h"

web_modules/rbac/rbac_controller.cpp

@@ -2,12 +2,12 @@
 
 #include "core/error_macros.h"
 
-#include "core/html/form_validator.h"
-#include "core/html/html_builder.h"
-#include "core/http/cookie.h"
-#include "core/http/http_session.h"
-#include "core/http/request.h"
-#include "core/http/session_manager.h"
+#include "web/html/form_validator.h"
+#include "web/html/html_builder.h"
+#include "web/http/cookie.h"
+#include "web/http/http_session.h"
+#include "web/http/request.h"
+#include "web/http/session_manager.h"
 #include "rbac_default_permissions.h"
 #include "web_modules/users/user.h"
 

web_modules/rbac/rbac_rank.cpp

@@ -1,6 +1,6 @@
 #include "rbac_rank.h"
 
-#include "core/http/request.h"
+#include "web/http/request.h"
 
 Ref<RBACPermission> RBACRank::match_request(Request *request) {
 	const String &full_path = request->get_path_full();

web_modules/rbac_users/rbac_user_controller.cpp

@@ -1,7 +1,7 @@
 #include "rbac_user_controller.h"
 
-#include "core/http/http_session.h"
-#include "core/http/request.h"
+#include "web/http/http_session.h"
+#include "web/http/request.h"
 
 #include "web_modules/rbac/rbac_controller.h"
 #include "web_modules/rbac/rbac_default_permissions.h"

web_modules/rbac_users/rbac_user_controller.h

@@ -3,7 +3,7 @@
 
 #include "web_modules/users/user_controller.h"
 
-#include "core/http/middleware.h"
+#include "web/http/middleware.h"
 
 class Request;
 

web_modules/static_pages/static_page.cpp

@@ -1,8 +1,8 @@
 #include "static_page.h"
 
-#include "core/http/request.h"
+#include "web/http/request.h"
 #include "core/file_cache.h"
-#include "core/html/html_builder.h"
+#include "web/html/html_builder.h"
 
 void StaticPage::handle_request_main(Request *request) {
 }

web_modules/static_pages/static_page.h

@@ -3,7 +3,7 @@
 
 #include "core/string.h"
 
-#include "core/http/web_node.h"
+#include "web/http/web_node.h"
 
 /*
 

web_modules/users/user.cpp

@@ -13,13 +13,13 @@
 #include "core/database/query_result.h"
 #include "core/database/table_builder.h"
 
-#include "core/html/form_validator.h"
-#include "core/html/html_builder.h"
-#include "core/http/cookie.h"
-#include "core/http/http_session.h"
-#include "core/http/request.h"
-#include "core/http/session_manager.h"
-#include "core/html/utils.h"
+#include "web/html/form_validator.h"
+#include "web/html/html_builder.h"
+#include "web/http/cookie.h"
+#include "web/http/http_session.h"
+#include "web/http/request.h"
+#include "web/http/session_manager.h"
+#include "web/html/utils.h"
 
 String User::to_json(rapidjson::Document *into) {
 	rapidjson::Document *document;

web_modules/users/user_controller.cpp

@@ -1,11 +1,11 @@
 #include "user_controller.h"
 
-#include "core/html/form_validator.h"
-#include "core/html/html_builder.h"
-#include "core/http/cookie.h"
-#include "core/http/http_session.h"
-#include "core/http/request.h"
-#include "core/http/session_manager.h"
+#include "web/html/form_validator.h"
+#include "web/html/html_builder.h"
+#include "web/http/cookie.h"
+#include "web/http/http_session.h"
+#include "web/http/request.h"
+#include "web/http/session_manager.h"
 
 #include "core/database/database.h"
 #include "core/database/database_manager.h"

web_modules/users/user_controller.h

@@ -4,10 +4,10 @@
 #include "core/containers/vector.h"
 #include "core/string.h"
 
-#include "core/http/web_node.h"
+#include "web/http/web_node.h"
 
 #include "user.h"
-#include "core/http/middleware.h"
+#include "web/http/middleware.h"
 
 class Request;
 class FormValidator;