From b3854fe393dbe7472a8eba6dace266ae60ed0645 Mon Sep 17 00:00:00 2001 From: Manuel Cillero Date: Sun, 8 May 2022 13:54:18 +0200 Subject: [PATCH] =?UTF-8?q?Libera=20la=20versi=C3=B3n=20de=20desarrollo=20?= =?UTF-8?q?0.0.14?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- drust/src/main.rs | 8 +++++++- pagetop/Cargo.toml | 2 +- pagetop/src/base/module/demopage/mod.rs | 1 - pagetop/src/core/app/application.rs | 1 - pagetop/src/prelude.rs | 6 ++---- 5 files changed, 10 insertions(+), 8 deletions(-) diff --git a/drust/src/main.rs b/drust/src/main.rs index 6b1f4543..4c210191 100644 --- a/drust/src/main.rs +++ b/drust/src/main.rs @@ -8,7 +8,13 @@ impl AppTrait for Drust { &pagetop_admin::Admin, &pagetop_user::User, &pagetop_node::Node, - &demopage::Demopage, + &pagetop::base::module::demopage::Demopage, + ] + } + + fn themes(&self) -> Vec<&'static dyn ThemeTrait> { + vec![ + &pagetop::base::theme::bulmix::Bulmix, ] } } diff --git a/pagetop/Cargo.toml b/pagetop/Cargo.toml index 912c3477..d044369c 100644 --- a/pagetop/Cargo.toml +++ b/pagetop/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "pagetop" -version = "0.0.12" +version = "0.0.14" edition = "2021" authors = [ diff --git a/pagetop/src/base/module/demopage/mod.rs b/pagetop/src/base/module/demopage/mod.rs index 343b00a0..34fb8ba1 100644 --- a/pagetop/src/base/module/demopage/mod.rs +++ b/pagetop/src/base/module/demopage/mod.rs @@ -26,7 +26,6 @@ impl ModuleTrait for Demopage { async fn demo() -> app::Result { Page::new() - .using_theme("Bulmix") .with_title(l("page_title").as_str()) .add_to("content", hello_world()) .add_to("content", hello_world_original()) diff --git a/pagetop/src/core/app/application.rs b/pagetop/src/core/app/application.rs index 3069aa19..4cb18d39 100644 --- a/pagetop/src/core/app/application.rs +++ b/pagetop/src/core/app/application.rs @@ -34,7 +34,6 @@ impl Application { &base::theme::aliner::Aliner, &base::theme::minimal::Minimal, &base::theme::bootsier::Bootsier, - &base::theme::bulmix::Bulmix, ]); // Registra los temas de la aplicación. theme::all::register_themes(app.themes()); diff --git a/pagetop/src/prelude.rs b/pagetop/src/prelude.rs index d271980c..e9b8a396 100644 --- a/pagetop/src/prelude.rs +++ b/pagetop/src/prelude.rs @@ -1,10 +1,11 @@ //! Re-exporta recursos comunes. -// Macros. +// Macros, globals and helpers. pub use crate::{ args, concat_string, theme_static_files, + util, }; pub use crate::config::SETTINGS; @@ -33,6 +34,3 @@ pub use crate::core::app::application::Application; pub use crate::response::page::*; pub use crate::base::component::*; -pub use crate::base::module::demopage; - -pub use crate::util;