From 80d2a379feb5c9ebe003da38dfbc5e47b8795c4e Mon Sep 17 00:00:00 2001 From: Relintai Date: Sat, 5 Feb 2022 15:30:48 +0100 Subject: [PATCH] Moved html and http from core to a new web folder. --- SConstruct | 1 + backends/drogon/drogon_web_server.h | 2 +- backends/drogon/request.cpp | 2 +- backends/drogon/request.h | 2 +- web/SCsub | 13 +++++++++++++ {core => web}/html/bbcode_parser.cpp | 0 {core => web}/html/bbcode_parser.h | 0 {core => web}/html/form_validator.cpp | 2 +- {core => web}/html/form_validator.h | 0 {core => web}/html/html_builder.cpp | 2 +- {core => web}/html/html_builder.h | 0 {core => web}/html/html_parser.cpp | 0 {core => web}/html/html_parser.h | 0 {core => web}/html/utils.cpp | 0 {core => web}/html/utils.h | 0 {core => web}/http/cookie.cpp | 0 {core => web}/http/cookie.h | 0 {core => web}/http/csrf_token.cpp | 0 {core => web}/http/csrf_token.h | 0 {core => web}/http/http_enums.h | 0 {core => web}/http/http_session.cpp | 0 {core => web}/http/http_session.h | 0 {core => web}/http/middleware.cpp | 0 {core => web}/http/middleware.h | 0 {core => web}/http/request.cpp | 4 ++-- {core => web}/http/request.h | 0 {core => web}/http/session_manager.cpp | 0 {core => web}/http/session_manager.h | 0 {core => web}/http/web_node.cpp | 2 +- {core => web}/http/web_node.h | 0 {core => web}/http/web_root.cpp | 4 ++-- {core => web}/http/web_root.h | 0 {core => web}/http/web_server.cpp | 2 +- {core => web}/http/web_server.h | 0 web_modules/admin_panel/admin_node.cpp | 12 ++++++------ web_modules/admin_panel/admin_node.h | 2 +- web_modules/admin_panel/admin_panel.cpp | 12 ++++++------ web_modules/admin_panel/admin_panel.h | 2 +- web_modules/folder_pages/static_folder_page.cpp | 4 ++-- web_modules/folder_pages/static_folder_page.h | 2 +- web_modules/list_page/list_page.cpp | 4 ++-- web_modules/list_page/list_page.h | 4 ++-- web_modules/message_page/message_page.h | 4 ++-- web_modules/paged_article/paged_article.cpp | 2 +- web_modules/paged_article/paged_article.h | 4 ++-- web_modules/paged_article/paged_articles.cpp | 4 ++-- web_modules/paged_article/paged_articles.h | 4 ++-- .../paged_article/paged_articles_md_index.cpp | 4 ++-- .../paged_article/paged_articles_md_index.h | 2 +- web_modules/rbac/rbac_controller.cpp | 12 ++++++------ web_modules/rbac/rbac_rank.cpp | 2 +- web_modules/rbac_users/rbac_user_controller.cpp | 4 ++-- web_modules/rbac_users/rbac_user_controller.h | 2 +- web_modules/static_pages/static_page.cpp | 4 ++-- web_modules/static_pages/static_page.h | 2 +- web_modules/users/user.cpp | 14 +++++++------- web_modules/users/user_controller.cpp | 12 ++++++------ web_modules/users/user_controller.h | 4 ++-- 58 files changed, 86 insertions(+), 72 deletions(-) create mode 100644 web/SCsub rename {core => web}/html/bbcode_parser.cpp (100%) rename {core => web}/html/bbcode_parser.h (100%) rename {core => web}/html/form_validator.cpp (99%) rename {core => web}/html/form_validator.h (100%) rename {core => web}/html/html_builder.cpp (99%) rename {core => web}/html/html_builder.h (100%) rename {core => web}/html/html_parser.cpp (100%) rename {core => web}/html/html_parser.h (100%) rename {core => web}/html/utils.cpp (100%) rename {core => web}/html/utils.h (100%) rename {core => web}/http/cookie.cpp (100%) rename {core => web}/http/cookie.h (100%) rename {core => web}/http/csrf_token.cpp (100%) rename {core => web}/http/csrf_token.h (100%) rename {core => web}/http/http_enums.h (100%) rename {core => web}/http/http_session.cpp (100%) rename {core => web}/http/http_session.h (100%) rename {core => web}/http/middleware.cpp (100%) rename {core => web}/http/middleware.h (100%) rename {core => web}/http/request.cpp (99%) rename {core => web}/http/request.h (100%) rename {core => web}/http/session_manager.cpp (100%) rename {core => web}/http/session_manager.h (100%) rename {core => web}/http/web_node.cpp (99%) rename {core => web}/http/web_node.h (100%) rename {core => web}/http/web_root.cpp (98%) rename {core => web}/http/web_root.h (100%) rename {core => web}/http/web_server.cpp (93%) rename {core => web}/http/web_server.h (100%) diff --git a/SConstruct b/SConstruct index 7888e8d..e43e11d 100644 --- a/SConstruct +++ b/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"]: diff --git a/backends/drogon/drogon_web_server.h b/backends/drogon/drogon_web_server.h index 2a650ca..92edeb5 100644 --- a/backends/drogon/drogon_web_server.h +++ b/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 diff --git a/backends/drogon/request.cpp b/backends/drogon/request.cpp index 75815ea..31ce77d 100644 --- a/backends/drogon/request.cpp +++ b/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); diff --git a/backends/drogon/request.h b/backends/drogon/request.h index 56e4143..e4a5755 100644 --- a/backends/drogon/request.h +++ b/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 diff --git a/web/SCsub b/web/SCsub new file mode 100644 index 0000000..61d230b --- /dev/null +++ b/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]) diff --git a/core/html/bbcode_parser.cpp b/web/html/bbcode_parser.cpp similarity index 100% rename from core/html/bbcode_parser.cpp rename to web/html/bbcode_parser.cpp diff --git a/core/html/bbcode_parser.h b/web/html/bbcode_parser.h similarity index 100% rename from core/html/bbcode_parser.h rename to web/html/bbcode_parser.h diff --git a/core/html/form_validator.cpp b/web/html/form_validator.cpp similarity index 99% rename from core/html/form_validator.cpp rename to web/html/form_validator.cpp index 29cc6bc..ce4dd77 100644 --- a/core/html/form_validator.cpp +++ b/web/html/form_validator.cpp @@ -1,6 +1,6 @@ #include "form_validator.h" -#include "core/http/request.h" +#include "web/http/request.h" //FormFieldEntry diff --git a/core/html/form_validator.h b/web/html/form_validator.h similarity index 100% rename from core/html/form_validator.h rename to web/html/form_validator.h diff --git a/core/html/html_builder.cpp b/web/html/html_builder.cpp similarity index 99% rename from core/html/html_builder.cpp rename to web/html/html_builder.cpp index 4fa6f5c..eb104c8 100644 --- a/core/html/html_builder.cpp +++ b/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; diff --git a/core/html/html_builder.h b/web/html/html_builder.h similarity index 100% rename from core/html/html_builder.h rename to web/html/html_builder.h diff --git a/core/html/html_parser.cpp b/web/html/html_parser.cpp similarity index 100% rename from core/html/html_parser.cpp rename to web/html/html_parser.cpp diff --git a/core/html/html_parser.h b/web/html/html_parser.h similarity index 100% rename from core/html/html_parser.h rename to web/html/html_parser.h diff --git a/core/html/utils.cpp b/web/html/utils.cpp similarity index 100% rename from core/html/utils.cpp rename to web/html/utils.cpp diff --git a/core/html/utils.h b/web/html/utils.h similarity index 100% rename from core/html/utils.h rename to web/html/utils.h diff --git a/core/http/cookie.cpp b/web/http/cookie.cpp similarity index 100% rename from core/http/cookie.cpp rename to web/http/cookie.cpp diff --git a/core/http/cookie.h b/web/http/cookie.h similarity index 100% rename from core/http/cookie.h rename to web/http/cookie.h diff --git a/core/http/csrf_token.cpp b/web/http/csrf_token.cpp similarity index 100% rename from core/http/csrf_token.cpp rename to web/http/csrf_token.cpp diff --git a/core/http/csrf_token.h b/web/http/csrf_token.h similarity index 100% rename from core/http/csrf_token.h rename to web/http/csrf_token.h diff --git a/core/http/http_enums.h b/web/http/http_enums.h similarity index 100% rename from core/http/http_enums.h rename to web/http/http_enums.h diff --git a/core/http/http_session.cpp b/web/http/http_session.cpp similarity index 100% rename from core/http/http_session.cpp rename to web/http/http_session.cpp diff --git a/core/http/http_session.h b/web/http/http_session.h similarity index 100% rename from core/http/http_session.h rename to web/http/http_session.h diff --git a/core/http/middleware.cpp b/web/http/middleware.cpp similarity index 100% rename from core/http/middleware.cpp rename to web/http/middleware.cpp diff --git a/core/http/middleware.h b/web/http/middleware.h similarity index 100% rename from core/http/middleware.h rename to web/http/middleware.h diff --git a/core/http/request.cpp b/web/http/request.cpp similarity index 99% rename from core/http/request.cpp rename to web/http/request.cpp index b4d8341..4762273 100644 --- a/core/http/request.cpp +++ b/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 Request::get_or_create_session() { diff --git a/core/http/request.h b/web/http/request.h similarity index 100% rename from core/http/request.h rename to web/http/request.h diff --git a/core/http/session_manager.cpp b/web/http/session_manager.cpp similarity index 100% rename from core/http/session_manager.cpp rename to web/http/session_manager.cpp diff --git a/core/http/session_manager.h b/web/http/session_manager.h similarity index 100% rename from core/http/session_manager.h rename to web/http/session_manager.h diff --git a/core/http/web_node.cpp b/web/http/web_node.cpp similarity index 99% rename from core/http/web_node.cpp rename to web/http/web_node.cpp index 62033a7..5634589 100644 --- a/core/http/web_node.cpp +++ b/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 diff --git a/core/http/web_node.h b/web/http/web_node.h similarity index 100% rename from core/http/web_node.h rename to web/http/web_node.h diff --git a/core/http/web_root.cpp b/web/http/web_root.cpp similarity index 98% rename from core/http/web_root.cpp rename to web/http/web_root.cpp index f8f9b64..ac13420 100644 --- a/core/http/web_root.cpp +++ b/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(new SessionSetupMiddleware())); @@ -48,7 +48,7 @@ void WebRoot::setup_middleware() { // _middlewares.push_back(Ref(new RBACDefaultUserSessionSetupMiddleware())); // --- CSRF Token Middlweare --- - // (#include "core/http/csrf_token.h") + // (#include "web/http/csrf_token.h") // Ref csrf_middleware; // csrf_middleware.instance(); diff --git a/core/http/web_root.h b/web/http/web_root.h similarity index 100% rename from core/http/web_root.h rename to web/http/web_root.h diff --git a/core/http/web_server.cpp b/web/http/web_server.cpp similarity index 93% rename from core/http/web_server.cpp rename to web/http/web_server.cpp index 9593717..cfc18fd 100644 --- a/core/http/web_server.cpp +++ b/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; diff --git a/core/http/web_server.h b/web/http/web_server.h similarity index 100% rename from core/http/web_server.h rename to web/http/web_server.h diff --git a/web_modules/admin_panel/admin_node.cpp b/web_modules/admin_panel/admin_node.cpp index 8bfd727..9961fa9 100644 --- a/web_modules/admin_panel/admin_node.cpp +++ b/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) { diff --git a/web_modules/admin_panel/admin_node.h b/web_modules/admin_panel/admin_node.h index d4fa0b6..5d0903f 100644 --- a/web_modules/admin_panel/admin_node.h +++ b/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" diff --git a/web_modules/admin_panel/admin_panel.cpp b/web_modules/admin_panel/admin_panel.cpp index 226387e..1335b68 100644 --- a/web_modules/admin_panel/admin_panel.cpp +++ b/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" diff --git a/web_modules/admin_panel/admin_panel.h b/web_modules/admin_panel/admin_panel.h index 4fcf351..eabe18e 100644 --- a/web_modules/admin_panel/admin_panel.h +++ b/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" diff --git a/web_modules/folder_pages/static_folder_page.cpp b/web_modules/folder_pages/static_folder_page.cpp index f2779d9..89d70b3 100644 --- a/web_modules/folder_pages/static_folder_page.cpp +++ b/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 #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) { } diff --git a/web_modules/folder_pages/static_folder_page.h b/web_modules/folder_pages/static_folder_page.h index b73f57d..167ebab 100644 --- a/web_modules/folder_pages/static_folder_page.h +++ b/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 diff --git a/web_modules/list_page/list_page.cpp b/web_modules/list_page/list_page.cpp index b0c643a..80e9f61 100644 --- a/web_modules/list_page/list_page.cpp +++ b/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 diff --git a/web_modules/list_page/list_page.h b/web_modules/list_page/list_page.h index 4075bc3..7cfd7bd 100644 --- a/web_modules/list_page/list_page.h +++ b/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. diff --git a/web_modules/message_page/message_page.h b/web_modules/message_page/message_page.h index 214c000..2cf5271 100644 --- a/web_modules/message_page/message_page.h +++ b/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 { diff --git a/web_modules/paged_article/paged_article.cpp b/web_modules/paged_article/paged_article.cpp index fa3ffe6..bdd38ca 100644 --- a/web_modules/paged_article/paged_article.cpp +++ b/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 diff --git a/web_modules/paged_article/paged_article.h b/web_modules/paged_article/paged_article.h index 0437014..5b9b793 100644 --- a/web_modules/paged_article/paged_article.h +++ b/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); diff --git a/web_modules/paged_article/paged_articles.cpp b/web_modules/paged_article/paged_articles.cpp index bf824b7..9802974 100644 --- a/web_modules/paged_article/paged_articles.cpp +++ b/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 diff --git a/web_modules/paged_article/paged_articles.h b/web_modules/paged_article/paged_articles.h index c400968..afcc788 100644 --- a/web_modules/paged_article/paged_articles.h +++ b/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 diff --git a/web_modules/paged_article/paged_articles_md_index.cpp b/web_modules/paged_article/paged_articles_md_index.cpp index ff62edf..8094612 100644 --- a/web_modules/paged_article/paged_articles_md_index.cpp +++ b/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(); diff --git a/web_modules/paged_article/paged_articles_md_index.h b/web_modules/paged_article/paged_articles_md_index.h index ebde828..b840b21 100644 --- a/web_modules/paged_article/paged_articles_md_index.h +++ b/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" diff --git a/web_modules/rbac/rbac_controller.cpp b/web_modules/rbac/rbac_controller.cpp index 9107afa..57b2397 100644 --- a/web_modules/rbac/rbac_controller.cpp +++ b/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" diff --git a/web_modules/rbac/rbac_rank.cpp b/web_modules/rbac/rbac_rank.cpp index afaa95d..5a43f0d 100644 --- a/web_modules/rbac/rbac_rank.cpp +++ b/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 RBACRank::match_request(Request *request) { const String &full_path = request->get_path_full(); diff --git a/web_modules/rbac_users/rbac_user_controller.cpp b/web_modules/rbac_users/rbac_user_controller.cpp index 9611b59..deac3f4 100644 --- a/web_modules/rbac_users/rbac_user_controller.cpp +++ b/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" diff --git a/web_modules/rbac_users/rbac_user_controller.h b/web_modules/rbac_users/rbac_user_controller.h index 044ba17..24ec780 100644 --- a/web_modules/rbac_users/rbac_user_controller.h +++ b/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; diff --git a/web_modules/static_pages/static_page.cpp b/web_modules/static_pages/static_page.cpp index 9e1276f..2dfd4fe 100644 --- a/web_modules/static_pages/static_page.cpp +++ b/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) { } diff --git a/web_modules/static_pages/static_page.h b/web_modules/static_pages/static_page.h index f8e79ce..585bb0c 100644 --- a/web_modules/static_pages/static_page.h +++ b/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" /* diff --git a/web_modules/users/user.cpp b/web_modules/users/user.cpp index d716d04..bf2d901 100644 --- a/web_modules/users/user.cpp +++ b/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; diff --git a/web_modules/users/user_controller.cpp b/web_modules/users/user_controller.cpp index 309f6df..76eb6ed 100644 --- a/web_modules/users/user_controller.cpp +++ b/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" diff --git a/web_modules/users/user_controller.h b/web_modules/users/user_controller.h index 4b47544..cdbf90b 100644 --- a/web_modules/users/user_controller.h +++ b/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;