diff --git a/pagetop-admin/src/lib.rs b/pagetop-admin/src/lib.rs index cae6cfee..81eb45f4 100644 --- a/pagetop-admin/src/lib.rs +++ b/pagetop-admin/src/lib.rs @@ -33,9 +33,9 @@ impl ModuleTrait for Admin { vec![action!(ActionBeforeRenderPage => before_render_page)] } - fn configure_service(&self, cfg: &mut server::web::ServiceConfig) { + fn configure_service(&self, cfg: &mut service::web::ServiceConfig) { cfg.service( - server::web::scope("/admin").route("", server::web::get().to(summary::summary)), + service::web::scope("/admin").route("", service::web::get().to(summary::summary)), ); } } diff --git a/pagetop-admin/src/summary.rs b/pagetop-admin/src/summary.rs index 42826b4a..8d90bcb6 100644 --- a/pagetop-admin/src/summary.rs +++ b/pagetop-admin/src/summary.rs @@ -4,7 +4,7 @@ use pagetop::prelude::*; use pagetop_megamenu::component::{MegaMenu, MegaMenuItem}; use pagetop_minimal::component::*; -pub async fn summary(request: server::HttpRequest) -> ResultPage { +pub async fn summary(request: service::HttpRequest) -> ResultPage { let top_menu = MegaMenu::new() .with_item(MegaMenuItem::label(L10n::t("module_name", &LOCALE_ADMIN))) .with_item(MegaMenuItem::link( diff --git a/pagetop-aliner/src/lib.rs b/pagetop-aliner/src/lib.rs index 2b807254..d38e3eec 100644 --- a/pagetop-aliner/src/lib.rs +++ b/pagetop-aliner/src/lib.rs @@ -15,7 +15,7 @@ impl ModuleTrait for Aliner { Some(&Aliner) } - fn configure_service(&self, cfg: &mut server::web::ServiceConfig) { + fn configure_service(&self, cfg: &mut service::web::ServiceConfig) { serve_static_files!(cfg, "/aliner", bundle_aliner); } } diff --git a/pagetop-bootsier/src/lib.rs b/pagetop-bootsier/src/lib.rs index 2fe5aca4..4075a821 100644 --- a/pagetop-bootsier/src/lib.rs +++ b/pagetop-bootsier/src/lib.rs @@ -21,7 +21,7 @@ impl ModuleTrait for Bootsier { vec![&pagetop_jquery::JQuery] } - fn configure_service(&self, cfg: &mut server::web::ServiceConfig) { + fn configure_service(&self, cfg: &mut service::web::ServiceConfig) { serve_static_files!(cfg, "/bootsier", bundle_bootsier); } } diff --git a/pagetop-bulmix/src/lib.rs b/pagetop-bulmix/src/lib.rs index b657b58d..d6d00dd5 100644 --- a/pagetop-bulmix/src/lib.rs +++ b/pagetop-bulmix/src/lib.rs @@ -24,7 +24,7 @@ impl ModuleTrait for Bulmix { ] } - fn configure_service(&self, cfg: &mut server::web::ServiceConfig) { + fn configure_service(&self, cfg: &mut service::web::ServiceConfig) { serve_static_files!(cfg, "/bulmix", bundle_bulmix); } } diff --git a/pagetop-homedemo/src/lib.rs b/pagetop-homedemo/src/lib.rs index ff85f2fa..86f10e12 100644 --- a/pagetop-homedemo/src/lib.rs +++ b/pagetop-homedemo/src/lib.rs @@ -26,13 +26,13 @@ impl ModuleTrait for HomeDemo { vec![&pagetop_minimal::Minimal] } - fn configure_service(&self, cfg: &mut server::web::ServiceConfig) { + fn configure_service(&self, cfg: &mut service::web::ServiceConfig) { serve_static_files!(cfg, "/homedemo", bundle_homedemo); - cfg.route("/", server::web::get().to(demo)); + cfg.route("/", service::web::get().to(demo)); } } -async fn demo(request: server::HttpRequest) -> ResultPage { +async fn demo(request: service::HttpRequest) -> ResultPage { Page::new(request) .with_title(L10n::t("page_title", &LOCALE_DEMOHOME)) .with_context(ContextOp::AddStyleSheet(StyleSheet::located( diff --git a/pagetop-jquery/src/lib.rs b/pagetop-jquery/src/lib.rs index 5632b181..103c584c 100644 --- a/pagetop-jquery/src/lib.rs +++ b/pagetop-jquery/src/lib.rs @@ -14,7 +14,7 @@ impl ModuleTrait for JQuery { MODULE_JQUERY } - fn configure_service(&self, cfg: &mut server::web::ServiceConfig) { + fn configure_service(&self, cfg: &mut service::web::ServiceConfig) { serve_static_files!(cfg, "/jquery", bundle_jquery); } } diff --git a/pagetop-megamenu/src/lib.rs b/pagetop-megamenu/src/lib.rs index 414f42c5..5988d189 100644 --- a/pagetop-megamenu/src/lib.rs +++ b/pagetop-megamenu/src/lib.rs @@ -17,7 +17,7 @@ impl ModuleTrait for MegaMenu { vec![&pagetop_jquery::JQuery, &pagetop_minimal::Minimal] } - fn configure_service(&self, cfg: &mut server::web::ServiceConfig) { + fn configure_service(&self, cfg: &mut service::web::ServiceConfig) { serve_static_files!(cfg, "/megamenu", bundle_megamenu); } } diff --git a/pagetop-minimal/src/lib.rs b/pagetop-minimal/src/lib.rs index fb5667f2..1fae15fc 100644 --- a/pagetop-minimal/src/lib.rs +++ b/pagetop-minimal/src/lib.rs @@ -14,7 +14,7 @@ impl ModuleTrait for Minimal { MODULE_MINIMAL } - fn configure_service(&self, cfg: &mut server::web::ServiceConfig) { + fn configure_service(&self, cfg: &mut service::web::ServiceConfig) { serve_static_files!(cfg, "/minimal", bundle_minimal); } } diff --git a/pagetop-node/src/lib.rs b/pagetop-node/src/lib.rs index 882f3ebf..01092e5a 100644 --- a/pagetop-node/src/lib.rs +++ b/pagetop-node/src/lib.rs @@ -22,8 +22,8 @@ impl ModuleTrait for Node { L10n::t("module_description", &LOCALE_NODE) } - fn configure_service(&self, cfg: &mut server::web::ServiceConfig) { - cfg.route("/node", server::web::get().to(node)); + fn configure_service(&self, cfg: &mut service::web::ServiceConfig) { + cfg.route("/node", service::web::get().to(node)); } fn actions(&self) -> Vec { @@ -40,7 +40,7 @@ impl ModuleTrait for Node { } } -async fn node(request: server::HttpRequest) -> ResultPage { +async fn node(request: service::HttpRequest) -> ResultPage { Page::new(request).with_title(L10n::n("Nodo")).render() } diff --git a/pagetop-user/src/lib.rs b/pagetop-user/src/lib.rs index 716d426e..809feffa 100644 --- a/pagetop-user/src/lib.rs +++ b/pagetop-user/src/lib.rs @@ -26,8 +26,8 @@ impl ModuleTrait for User { vec![&pagetop_minimal::Minimal] } - fn configure_service(&self, cfg: &mut server::web::ServiceConfig) { - cfg.route("/user/login", server::web::get().to(login)); + fn configure_service(&self, cfg: &mut service::web::ServiceConfig) { + cfg.route("/user/login", service::web::get().to(login)); } fn migrations(&self) -> Vec { @@ -40,7 +40,7 @@ impl ModuleTrait for User { } } -async fn login(request: server::HttpRequest) -> ResultPage { +async fn login(request: service::HttpRequest) -> ResultPage { Page::new(request) .with_title(L10n::n("Identificación del usuario")) .with_in( diff --git a/pagetop/src/app.rs b/pagetop/src/app.rs index 83e17065..1895089e 100644 --- a/pagetop/src/app.rs +++ b/pagetop/src/app.rs @@ -6,7 +6,7 @@ use crate::core::{module, module::ModuleStaticRef}; use crate::html::Markup; use crate::response::fatal_error::FatalError; use crate::response::page::ResultPage; -use crate::{config, locale, server, trace, LazyStatic}; +use crate::{config, locale, service, trace, LazyStatic}; #[cfg(feature = "database")] use crate::db; @@ -55,8 +55,8 @@ impl Application { // Prepara el servidor web. let secret_key = get_secret_key(); - let server = server::HttpServer::new(move || { - server::App::new() + let server = service::HttpServer::new(move || { + service::App::new() .wrap(tracing_actix_web::TracingLogger::default()) .wrap( SessionMiddleware::builder(CookieSessionStore::default(), secret_key.clone()) @@ -71,7 +71,7 @@ impl Application { .build(), ) .configure(module::all::configure_services) - .default_service(server::web::route().to(service_not_found)) + .default_service(service::web::route().to(service_not_found)) }) .bind(format!( "{}:{}", @@ -123,6 +123,6 @@ fn get_secret_key() -> Key { Key::generate() } -async fn service_not_found(request: server::HttpRequest) -> ResultPage { +async fn service_not_found(request: service::HttpRequest) -> ResultPage { Err(FatalError::NotFound(request)) } diff --git a/pagetop/src/base/theme/basic.rs b/pagetop/src/base/theme/basic.rs index e2ce7b3a..f108c5ea 100644 --- a/pagetop/src/base/theme/basic.rs +++ b/pagetop/src/base/theme/basic.rs @@ -2,7 +2,7 @@ use crate::core::module::ModuleTrait; use crate::core::theme::{ThemeStaticRef, ThemeTrait}; use crate::html::Favicon; use crate::response::page::Page; -use crate::{define_handle, serve_static_files, server, Handle}; +use crate::{define_handle, serve_static_files, service, Handle}; define_handle!(THEME_BASIC); @@ -19,7 +19,7 @@ impl ModuleTrait for Basic { Some(&Basic) } - fn configure_service(&self, cfg: &mut server::web::ServiceConfig) { + fn configure_service(&self, cfg: &mut service::web::ServiceConfig) { serve_static_files!(cfg, "/theme", bundle_theme); } } diff --git a/pagetop/src/core/component/context.rs b/pagetop/src/core/component/context.rs index e9550930..f8ddc97f 100644 --- a/pagetop/src/core/component/context.rs +++ b/pagetop/src/core/component/context.rs @@ -1,7 +1,7 @@ use crate::core::theme::{all::theme_by_single_name, ThemeStaticRef}; use crate::html::{html, Assets, JavaScript, Markup, StyleSheet}; use crate::locale::{LanguageIdentifier, LANGID}; -use crate::server::HttpRequest; +use crate::service::HttpRequest; use crate::{concat_string, config, util, LazyStatic}; use std::collections::HashMap; diff --git a/pagetop/src/core/module/all.rs b/pagetop/src/core/module/all.rs index 7eba9801..428fbfc4 100644 --- a/pagetop/src/core/module/all.rs +++ b/pagetop/src/core/module/all.rs @@ -1,7 +1,7 @@ use crate::core::action::add_action; use crate::core::module::ModuleStaticRef; use crate::core::theme::all::THEMES; -use crate::{server, trace, LazyStatic}; +use crate::{service, trace, LazyStatic}; #[cfg(feature = "database")] use crate::{db::*, run_now}; @@ -142,7 +142,7 @@ pub fn run_migrations() { // CONFIGURE SERVICES ****************************************************************************** -pub fn configure_services(cfg: &mut server::web::ServiceConfig) { +pub fn configure_services(cfg: &mut service::web::ServiceConfig) { for m in ENABLED_MODULES.read().unwrap().iter() { m.configure_service(cfg); } diff --git a/pagetop/src/core/module/definition.rs b/pagetop/src/core/module/definition.rs index 5d8666ea..5b1057f9 100644 --- a/pagetop/src/core/module/definition.rs +++ b/pagetop/src/core/module/definition.rs @@ -1,7 +1,7 @@ use crate::base::component::L10n; use crate::core::action::Action; use crate::core::theme::ThemeStaticRef; -use crate::{server, util, Handle}; +use crate::{service, util, Handle}; #[cfg(feature = "database")] use crate::db::MigrationItem; @@ -49,7 +49,7 @@ pub trait ModuleTrait: BaseModule + Send + Sync { } #[allow(unused_variables)] - fn configure_service(&self, cfg: &mut server::web::ServiceConfig) {} + fn configure_service(&self, cfg: &mut service::web::ServiceConfig) {} } impl BaseModule for M { diff --git a/pagetop/src/lib.rs b/pagetop/src/lib.rs index 9c1412c0..ea806c4b 100644 --- a/pagetop/src/lib.rs +++ b/pagetop/src/lib.rs @@ -80,8 +80,8 @@ pub mod core; // Acciones, componentes, módulos y temas integrados en PageTop. pub mod base; -// API del servidor web. -pub mod server; +// API para operar con los servicios web. +pub mod service; // Tipos de respuestas a peticiones web. pub mod response; diff --git a/pagetop/src/prelude.rs b/pagetop/src/prelude.rs index 0bf665e5..bb028fff 100644 --- a/pagetop/src/prelude.rs +++ b/pagetop/src/prelude.rs @@ -31,8 +31,8 @@ pub use crate::{action, action_before_render_component}; pub use crate::base::component::*; -pub use crate::server; -pub use crate::server::HttpMessage; +pub use crate::service; +pub use crate::service::HttpMessage; pub use crate::response::fatal_error::*; pub use crate::response::{page::*, ResponseError}; diff --git a/pagetop/src/response/fatal_error.rs b/pagetop/src/response/fatal_error.rs index b6eb69df..3994b91c 100644 --- a/pagetop/src/response/fatal_error.rs +++ b/pagetop/src/response/fatal_error.rs @@ -5,8 +5,8 @@ pub use error404::ERROR_404; use crate::base::component::L10n; use crate::response::{page::Page, ResponseError}; -use crate::server::http::{header::ContentType, StatusCode}; -use crate::server::{HttpRequest, HttpResponse}; +use crate::service::http::{header::ContentType, StatusCode}; +use crate::service::{HttpRequest, HttpResponse}; use std::fmt; diff --git a/pagetop/src/response/page/definition.rs b/pagetop/src/response/page/definition.rs index 49bef122..cee80cb5 100644 --- a/pagetop/src/response/page/definition.rs +++ b/pagetop/src/response/page/definition.rs @@ -7,7 +7,7 @@ use crate::locale::{langid_for, LanguageIdentifier}; use crate::response::fatal_error::FatalError; use crate::response::page::action::{ActionBeforeRenderPage, ACTION_BEFORE_RENDER_PAGE}; use crate::response::page::ResultPage; -use crate::{fn_builder, server}; +use crate::{fn_builder, service}; use unic_langid::CharacterDirection; @@ -45,7 +45,7 @@ impl Default for Page { } impl Page { - pub fn new(request: server::HttpRequest) -> Self { + pub fn new(request: service::HttpRequest) -> Self { let mut page = Page::default(); page.context.alter(ContextOp::Request(Some(request))); page diff --git a/pagetop/src/server.rs b/pagetop/src/service.rs similarity index 72% rename from pagetop/src/server.rs rename to pagetop/src/service.rs index 6ceae9e4..2d518e25 100644 --- a/pagetop/src/server.rs +++ b/pagetop/src/service.rs @@ -2,7 +2,7 @@ pub use actix_session::Session; pub use actix_web::{ - cookie, http, web, App, HttpMessage, HttpRequest, HttpResponse, HttpServer, Responder, + cookie, get, http, web, App, HttpMessage, HttpRequest, HttpResponse, HttpServer, Responder, }; pub use actix_web_files::Files as ActixFiles; diff --git a/pagetop/src/util.rs b/pagetop/src/util.rs index 63fd72e9..cedb734d 100644 --- a/pagetop/src/util.rs +++ b/pagetop/src/util.rs @@ -112,10 +112,10 @@ macro_rules! serve_static_files { ( $cfg:ident, $dir:expr, $embed:ident ) => {{ let static_files = &$crate::config::SETTINGS.dev.static_files; if static_files.is_empty() { - $cfg.service($crate::server::ResourceFiles::new($dir, $embed())); + $cfg.service($crate::service::ResourceFiles::new($dir, $embed())); } else { $cfg.service( - $crate::server::ActixFiles::new($dir, $crate::concat_string!(static_files, $dir)) + $crate::service::ActixFiles::new($dir, $crate::concat_string!(static_files, $dir)) .show_files_listing(), ); }