From c2b69fa539f14fff213702294bec0937d7fd2641 Mon Sep 17 00:00:00 2001 From: Manuel Cillero Date: Thu, 5 May 2022 23:23:47 +0200 Subject: [PATCH] =?UTF-8?q?Actualiza=20nomenclatura=20en=20c=C3=B3digo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pagetop-admin/src/lib.rs | 2 +- pagetop-node/src/lib.rs | 2 +- pagetop-user/src/lib.rs | 26 ++++++++++++------------- pagetop/src/api/component/container.rs | 4 ++-- pagetop/src/api/component/definition.rs | 4 ++-- pagetop/src/api/module/all.rs | 2 +- pagetop/src/api/module/definition.rs | 2 +- pagetop/src/base/module/demopage/mod.rs | 2 +- pagetop/src/response/page/page.rs | 3 +-- 9 files changed, 23 insertions(+), 24 deletions(-) diff --git a/pagetop-admin/src/lib.rs b/pagetop-admin/src/lib.rs index 56d34e1c..5ca91531 100644 --- a/pagetop-admin/src/lib.rs +++ b/pagetop-admin/src/lib.rs @@ -15,7 +15,7 @@ impl ModuleTrait for Admin { Some(l("module_description")) } - fn configure_module(&self, cfg: &mut app::web::ServiceConfig) { + fn configure_service(&self, cfg: &mut app::web::ServiceConfig) { cfg.service( app::web::scope("/admin") .route("", app::web::get().to(summary::summary)) diff --git a/pagetop-node/src/lib.rs b/pagetop-node/src/lib.rs index 1f879f36..3f8bff18 100644 --- a/pagetop-node/src/lib.rs +++ b/pagetop-node/src/lib.rs @@ -16,7 +16,7 @@ impl ModuleTrait for Node { Some(l("module_description")) } - fn configure_module(&self, cfg: &mut app::web::ServiceConfig) { + fn configure_service(&self, cfg: &mut app::web::ServiceConfig) { cfg.route("/node", app::web::get().to(node)); } diff --git a/pagetop-user/src/lib.rs b/pagetop-user/src/lib.rs index a36c0e6f..557ecdac 100644 --- a/pagetop-user/src/lib.rs +++ b/pagetop-user/src/lib.rs @@ -15,7 +15,7 @@ impl ModuleTrait for User { Some(l("module_description")) } - fn configure_module(&self, cfg: &mut app::web::ServiceConfig) { + fn configure_service(&self, cfg: &mut app::web::ServiceConfig) { cfg.route("/user/login", app::web::get().to(login)); } @@ -29,6 +29,18 @@ impl ModuleTrait for User { } } +async fn login() -> app::Result { + Page::new() + .with_title( + "Identificación del usuario" + ) + .add_to("content", Container::new() + .with_id("welcome") + .add(form_login()) + ) + .render() +} + fn form_login() -> Form { Form::new() .with_id("user-login") @@ -47,15 +59,3 @@ fn form_login() -> Form { ) .add(form::Button::submit(l("login").as_str())) } - -async fn login() -> app::Result { - Page::new() - .with_title( - "Identificación del usuario" - ) - .add_to("content", Container::new() - .with_id("welcome") - .add(form_login()) - ) - .render() -} diff --git a/pagetop/src/api/component/container.rs b/pagetop/src/api/component/container.rs index 5ca41056..5008a94d 100644 --- a/pagetop/src/api/component/container.rs +++ b/pagetop/src/api/component/container.rs @@ -1,5 +1,5 @@ use crate::html::{Markup, html}; -use super::{PageAssets, ComponentTrait, render_component}; +use super::{ComponentTrait, PageAssets}; use std::sync::{Arc, RwLock}; @@ -26,7 +26,7 @@ impl PageContainer { components.sort_by_key(|c| c.read().unwrap().weight()); html! { @for c in components.iter() { - (render_component(&mut *c.write().unwrap(), assets)) + (super::render_component(&mut *c.write().unwrap(), assets)) } } } diff --git a/pagetop/src/api/component/definition.rs b/pagetop/src/api/component/definition.rs index a6b2ea7c..a7e6decb 100644 --- a/pagetop/src/api/component/definition.rs +++ b/pagetop/src/api/component/definition.rs @@ -1,8 +1,8 @@ use crate::html::{Markup, html}; -use crate::util; use crate::api::action::{action_ref, run_actions}; -use super::PageAssets; +use crate::util; use super::{ACTION_BEFORE_RENDER_COMPONENT, ActionBeforeRenderComponent}; +use super::PageAssets; pub use std::any::Any as AnyComponent; diff --git a/pagetop/src/api/module/all.rs b/pagetop/src/api/module/all.rs index 3d5d9a77..6c7948de 100644 --- a/pagetop/src/api/module/all.rs +++ b/pagetop/src/api/module/all.rs @@ -34,7 +34,7 @@ fn add_to(list: &mut Vec<&dyn ModuleTrait>, module: &'static dyn ModuleTrait) { pub fn modules(cfg: &mut app::web::ServiceConfig) { for m in MODULES.read().unwrap().iter() { - m.configure_module(cfg); + m.configure_service(cfg); } } diff --git a/pagetop/src/api/module/definition.rs b/pagetop/src/api/module/definition.rs index eb07350c..d1c213e3 100644 --- a/pagetop/src/api/module/definition.rs +++ b/pagetop/src/api/module/definition.rs @@ -23,7 +23,7 @@ pub trait ModuleTrait: BaseModule + Send + Sync { } #[allow(unused_variables)] - fn configure_module(&self, cfg: &mut app::web::ServiceConfig) { + fn configure_service(&self, cfg: &mut app::web::ServiceConfig) { } fn actions(&self) -> Vec { diff --git a/pagetop/src/base/module/demopage/mod.rs b/pagetop/src/base/module/demopage/mod.rs index 34ac79b7..55ed6d56 100644 --- a/pagetop/src/base/module/demopage/mod.rs +++ b/pagetop/src/base/module/demopage/mod.rs @@ -13,7 +13,7 @@ impl ModuleTrait for Demopage { Some(l("module_description")) } - fn configure_module(&self, cfg: &mut app::web::ServiceConfig) { + fn configure_service(&self, cfg: &mut app::web::ServiceConfig) { cfg.route("/", app::web::get().to(demo)); } } diff --git a/pagetop/src/response/page/page.rs b/pagetop/src/response/page/page.rs index 13944810..206224ec 100644 --- a/pagetop/src/response/page/page.rs +++ b/pagetop/src/response/page/page.rs @@ -3,11 +3,10 @@ use crate::config::SETTINGS; use crate::html::*; use crate::api::action::{action_ref, run_actions}; use crate::api::component::*; +use super::{ACTION_BEFORE_RENDER_PAGE, ActionBeforeRenderPage}; use std::collections::HashMap; -use super::{ACTION_BEFORE_RENDER_PAGE, ActionBeforeRenderPage}; - static DEFAULT_LANGUAGE: Lazy> = Lazy::new(|| { let language = SETTINGS.app.language[..2].to_lowercase(); if !language.is_empty() {