From 3d5e5795a077743f98ef19bdbb9c5a29cc34c917 Mon Sep 17 00:00:00 2001 From: Relintai Date: Sun, 21 Nov 2021 14:41:40 +0100 Subject: [PATCH] Renamed and cleaned up the wep app class to WPApplication. --- HEADS | 2 +- app/ccms_application.cpp | 282 --------------------------------------- app/ccms_application.h | 56 -------- app/wp_application.cpp | 112 ++++++++++++++++ app/wp_application.h | 34 +++++ 5 files changed, 147 insertions(+), 339 deletions(-) delete mode 100644 app/ccms_application.cpp delete mode 100644 app/ccms_application.h create mode 100644 app/wp_application.cpp create mode 100644 app/wp_application.h diff --git a/HEADS b/HEADS index 3b8f12a..67a29d8 100644 --- a/HEADS +++ b/HEADS @@ -1 +1 @@ -{"engine": {"master": "e32593da4c31a550d755623b0566d0a0908a3bce"}} \ No newline at end of file +{"engine": {"master": "557c2a3934fda8bcc76be3bde525bead5adcaead"}} \ No newline at end of file diff --git a/app/ccms_application.cpp b/app/ccms_application.cpp deleted file mode 100644 index 4cf89ae..0000000 --- a/app/ccms_application.cpp +++ /dev/null @@ -1,282 +0,0 @@ -#include "ccms_application.h" - -#include "core/http/request.h" - -#include - -#include "core/file_cache.h" - -#include "core/http/handler_instance.h" - -#include "core/database/database_manager.h" - -#include "core/html/html_builder.h" -#include "core/http/http_session.h" -#include "core/http/session_manager.h" - -#include "modules/users/user.h" -//#include "modules/users/user_controller.h" -#include "modules/rbac_users/rbac_user_controller.h" - -#include "modules/admin_panel/admin_panel.h" -#include "modules/rbac/rbac_controller.h" -#include "modules/rbac/rbac_model.h" - -bool CCMSApplication::is_logged_in(Request *request) { - if (!request->session) { - return false; - } - - Ref u = request->reference_data["user"]; - - return u.is_valid(); -} - -void CCMSApplication::index(Object *instance, Request *request) { - add_menu(request, MENUENTRY_NEWS); - - /* - - - - - 2): ?> - - - - - - - - - - - */ - - //dynamic_cast(instance)->index(request); - request->body += "test"; - request->compile_and_send_body(); -} - -void CCMSApplication::session_middleware_func(Object *instance, Request *request) { -} - -void CCMSApplication::add_menu(Request *request, const MenuEntries index) { - request->head += menu_head; - - HTMLBuilder b; - - HTMLTag *t; - - /* - -
- -
- -*/ - - b.div()->cls("menu_base"); - { - b.div()->cls("left"); - { - b.div()->cls("menu_news"); - { - b.a()->href("/news/index"); - b.w("News"); - b.ca(); - } - b.cdiv(); - - b.div()->cls("menu_mail"); - { - b.a()->href("/mail/inbox"); - b.w("Mails"); - //if ($newmail) echo '!'; - b.ca(); - } - b.cdiv(); - - b.div()->cls("menu_hero"); - { - b.a()->href("/hero/selected"); - b.w("Hero"); - b.ca(); - } - b.cdiv(); - - b.div()->cls("menu_village"); - { - b.a()->href("/village/selected"); - b.w("Village"); //villagename - b.ca(); - } - b.cdiv(); - - b.div()->cls("menu_sel_village"); - { - b.a()->href("/village/select"); - b.w("v"); - b.ca(); - } - b.cdiv(); - - /* - -
- [] -
- - */ - - /* - -
- -
- - */ - } - b.cdiv(); - - b.div()->cls("right"); - { - /* - 4): ?> -
- GM -
- - */ - - /* - 5): //dev+?> -
- Admin -
- - */ - - b.div()->cls("menu_alliance_menu"); - { - b.a()->href("/alliance/alliance_menu"); - b.w("Alliances"); - b.ca(); - } - b.cdiv(); - - b.div()->cls("menu_forum"); - { - b.a()->href("/forum/index"); - b.w("Forum"); - b.ca(); - } - b.cdiv(); - - b.div()->cls("menu_settings"); - { - b.a()->href("/user/settings"); - b.w("Settings"); - b.ca(); - } - b.cdiv(); - - b.div()->cls("menu_logout"); - { - b.a()->href("/user/logout"); - b.w("Logout"); - b.ca(); - } - b.cdiv(); - } - b.cdiv(); - - b.div()->cls("nofloat"); - b.cdiv(); - } - - b.cdiv(); - b.div()->cls("main"); - b.write_tag(); - - request->body += b.result; - - request->footer = footer; -} - -void CCMSApplication::village_page_func(Object *instance, Request *request) { - add_menu(request, MENUENTRY_VILLAGE); - - //dynamic_cast(instance)->index(request); - request->body += "test"; - request->compile_and_send_body(); -} - -void CCMSApplication::admin_page_func(Object *instance, Request *request) { - AdminPanel::get_singleton()->handle_request_main(request); -} - -void CCMSApplication::user_page_func(Object *instance, Request *request) { - if (is_logged_in(request)) { - add_menu(request, MENUENTRY_SETTINGS); - } - - UserController::get_singleton()->handle_request_default(request); -} - -void CCMSApplication::setup_routes() { - DWebApplication::setup_routes(); - - index_func = HandlerInstance(index); - main_route_map["admin"] = HandlerInstance(admin_page_func); - main_route_map["user"] = HandlerInstance(user_page_func); -} - -void CCMSApplication::setup_middleware() { - middlewares.push_back(HandlerInstance(::SessionManager::session_setup_middleware)); - //middlewares.push_back(HandlerInstance(::UserController::user_session_setup_middleware)); - //middlewares.push_back(HandlerInstance(::RBACUserController::rbac_user_session_setup_middleware)); - middlewares.push_back(HandlerInstance(::RBACUserController::rbac_default_user_session_middleware)); - - DWebApplication::setup_middleware(); -} - -void CCMSApplication::migrate() { -} - -void CCMSApplication::compile_menu() { - HTMLBuilder bh; - - bh.meta()->charset_utf_8(); - bh.meta()->name("description")->content("RPG browsergame"); - bh.meta()->name("keywords")->content("RPG,browsergame,Mourne,game,play"); - bh.title(); - bh.w("Mourne"); - bh.ctitle(); - - bh.link()->rel_stylesheet()->href("/css/base.css"); - bh.link()->rel_stylesheet()->href("/css/menu.css"); - bh.write_tag(); - - menu_head = bh.result; - - HTMLBuilder bf; - - bf.cdiv(); - bf.footer(); - bf.cfooter(); - - footer = bf.result; -} - -CCMSApplication::CCMSApplication() : - DWebApplication() { - - compile_menu(); -} - -CCMSApplication::~CCMSApplication() { -} - -std::string CCMSApplication::menu_head = ""; -std::string CCMSApplication::footer = ""; diff --git a/app/ccms_application.h b/app/ccms_application.h deleted file mode 100644 index 92bbda5..0000000 --- a/app/ccms_application.h +++ /dev/null @@ -1,56 +0,0 @@ -#ifndef CCMS_APPLICATION_H -#define CCMS_APPLICATION_H - -//#include "core/http/web_application.h" -#include "core/object.h" -#include "modules/drogon/web_application.h" - -#undef LOG_TRACE -#undef LOG_WARN - -class CCMSApplication : public DWebApplication { -public: - enum MenuEntries { - MENUENTRY_NEWS = 0, - MENUENTRY_MAIL, - MENUENTRY_HERO, - MENUENTRY_VILLAGE, - MENUENTRY_SELECT_VILLAGE, - MENUENTRY_ALLIANCE, - MENUENTRY_ALLIANCE_MENU, - MENUENTRY_FORUM, - MENUENTRY_CHANGELOG, - MENUENTRY_SETTINGS, - MENUENTRY_LOGOUT, - - MENUENTRY_MAX, - }; - -public: - static bool is_logged_in(Request *request); - - static void index(Object *instance, Request *request); - - static void session_middleware_func(Object *instance, Request *request); - - static void add_menu(Request *request, const MenuEntries index); - - static void village_page_func(Object *instance, Request *request); - static void admin_page_func(Object *instance, Request *request); - static void user_page_func(Object *instance, Request *request); - - virtual void setup_routes(); - virtual void setup_middleware(); - - virtual void migrate(); - - void compile_menu(); - - CCMSApplication(); - ~CCMSApplication(); - - static std::string menu_head; - static std::string footer; -}; - -#endif \ No newline at end of file diff --git a/app/wp_application.cpp b/app/wp_application.cpp new file mode 100644 index 0000000..cfb3820 --- /dev/null +++ b/app/wp_application.cpp @@ -0,0 +1,112 @@ +#include "wp_application.h" + +#include "core/http/request.h" + +#include + +#include "core/file_cache.h" + +#include "core/http/handler_instance.h" + +#include "core/database/database_manager.h" + +#include "core/html/html_builder.h" +#include "core/http/http_session.h" +#include "core/http/session_manager.h" + +void WPApplication::index(Object *instance, Request *request) { + + request->body += "test"; + request->compile_and_send_body(); +} + +void WPApplication::blog(Object *instance, Request *request) { + request->body += "test"; + request->compile_and_send_body(); +} + +void WPApplication::routing_middleware(Object *instance, Request *request) { + std::string path = request->get_path_full(); + + WPApplication *app = Object::cast_to(instance); + + if (FileCache::get_singleton()->wwwroot_has_file(path)) { + app->send_file(path, request); + + return; + } + + HandlerInstance handler_data; + handler_data.instance = instance; + + if (request->get_path_segment_count() == 0) { + handler_data.handler_func = index; + } else { + const std::string main_route = request->get_current_path_segment(); + + request->push_path(); + + if (main_route == "blog") { + handler_data.handler_func = blog; + } + } + + if (!handler_data.handler_func) { + app->send_error(404, request); + + return; + } + + request->handler_instance = handler_data; + request->next_stage(); +} + +void WPApplication::setup_routes() { + DWebApplication::setup_routes(); + + index_func = HandlerInstance(index); +} + +void WPApplication::setup_middleware() { + middlewares.push_back(HandlerInstance(routing_middleware, this)); +} + +void WPApplication::migrate() { +} + +void WPApplication::compile_menu() { + HTMLBuilder bh; + + bh.meta()->charset_utf_8(); + bh.meta()->name("description")->content("RPG browsergame"); + bh.meta()->name("keywords")->content("RPG,browsergame,Mourne,game,play"); + bh.title(); + bh.w("Mourne"); + bh.ctitle(); + + bh.link()->rel_stylesheet()->href("/css/base.css"); + bh.link()->rel_stylesheet()->href("/css/menu.css"); + bh.write_tag(); + + menu_head = bh.result; + + HTMLBuilder bf; + + bf.cdiv(); + bf.footer(); + bf.cfooter(); + + footer = bf.result; +} + +WPApplication::WPApplication() : + DWebApplication() { + + compile_menu(); +} + +WPApplication::~WPApplication() { +} + +std::string WPApplication::menu_head = ""; +std::string WPApplication::footer = ""; diff --git a/app/wp_application.h b/app/wp_application.h new file mode 100644 index 0000000..0af17b3 --- /dev/null +++ b/app/wp_application.h @@ -0,0 +1,34 @@ +#ifndef WP_APPLICATION_H +#define WP_APPLICATION_H + +//#include "core/http/web_application.h" +#include "core/object.h" +#include "modules/drogon/web_application.h" + +#undef LOG_TRACE +#undef LOG_WARN + +class WPApplication : public DWebApplication { + RCPP_OBJECT(WPApplication, DWebApplication); + +public: + static void index(Object *instance, Request *request); + static void blog(Object *instance, Request *request); + + static void routing_middleware(Object *instance, Request *request); + + virtual void setup_routes(); + virtual void setup_middleware(); + + virtual void migrate(); + + void compile_menu(); + + WPApplication(); + ~WPApplication(); + + static std::string menu_head; + static std::string footer; +}; + +#endif \ No newline at end of file