💥 Diferencia entre renderizar y preparar página
This commit is contained in:
parent
97b520340a
commit
a33de4c92b
11 changed files with 111 additions and 46 deletions
|
|
@ -21,7 +21,7 @@ impl ModuleTrait for Basic {
|
|||
}
|
||||
|
||||
impl ThemeTrait for Basic {
|
||||
fn before_render_page(&self, page: &mut Page) {
|
||||
fn before_prepare_page(&self, page: &mut Page) {
|
||||
page.alter_favicon(Some(Favicon::new().with_icon("/theme/favicon.ico")));
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -21,13 +21,9 @@ pub trait ThemeTrait: ModuleTrait + Send + Sync {
|
|||
}
|
||||
|
||||
#[allow(unused_variables)]
|
||||
fn before_render_page(&self, page: &mut Page) {
|
||||
if page.favicon().is_none() {
|
||||
page.alter_favicon(Some(Favicon::new().with_icon("/theme/favicon.ico")));
|
||||
}
|
||||
}
|
||||
fn before_prepare_page(&self, page: &mut Page) {}
|
||||
|
||||
fn render_page_head(&self, page: &mut Page) -> Markup {
|
||||
fn prepare_page_head(&self, page: &mut Page) -> Markup {
|
||||
let title = page.title();
|
||||
let description = page.description();
|
||||
let viewport = "width=device-width, initial-scale=1, shrink-to-fit=no";
|
||||
|
|
@ -64,11 +60,11 @@ pub trait ThemeTrait: ModuleTrait + Send + Sync {
|
|||
}
|
||||
}
|
||||
|
||||
fn render_page_body(&self, page: &mut Page) -> Markup {
|
||||
fn prepare_page_body(&self, page: &mut Page) -> Markup {
|
||||
html! {
|
||||
body class=[page.body_classes().get()] {
|
||||
@for (region, _) in self.regions().iter() {
|
||||
@if let Some(content) = page.render_region(region) {
|
||||
@if let Some(content) = page.prepare_region(region) {
|
||||
#(region) { (content) }
|
||||
}
|
||||
}
|
||||
|
|
@ -76,6 +72,12 @@ pub trait ThemeTrait: ModuleTrait + Send + Sync {
|
|||
}
|
||||
}
|
||||
|
||||
fn after_prepare_page(&self, page: &mut Page) {
|
||||
if page.favicon().is_none() {
|
||||
page.alter_favicon(Some(Favicon::new().with_icon("/theme/favicon.ico")));
|
||||
}
|
||||
}
|
||||
|
||||
#[rustfmt::skip]
|
||||
#[allow(unused_variables)]
|
||||
fn before_render_component(
|
||||
|
|
|
|||
|
|
@ -1,7 +1,10 @@
|
|||
pub use actix_web::Result as ResultPage;
|
||||
|
||||
mod action;
|
||||
pub use action::{ActionBeforeRenderPage, ACTION_BEFORE_RENDER_PAGE};
|
||||
mod before_prepare_page;
|
||||
pub use before_prepare_page::{ActionBeforePreparePage, ACTION_BEFORE_PREPARE_PAGE};
|
||||
|
||||
mod after_prepare_page;
|
||||
pub use after_prepare_page::{ActionAfterPreparePage, ACTION_AFTER_PREPARE_PAGE};
|
||||
|
||||
mod definition;
|
||||
pub use definition::Page;
|
||||
|
|
|
|||
|
|
@ -2,25 +2,25 @@ use crate::core::action::{ActionTrait, AnyAction};
|
|||
use crate::response::page::Page;
|
||||
use crate::{use_handle, Handle};
|
||||
|
||||
use_handle!(ACTION_BEFORE_RENDER_PAGE);
|
||||
use_handle!(ACTION_AFTER_PREPARE_PAGE);
|
||||
|
||||
type Action = fn(&mut Page);
|
||||
|
||||
pub struct ActionBeforeRenderPage {
|
||||
pub struct ActionAfterPreparePage {
|
||||
action: Option<Action>,
|
||||
weight: isize,
|
||||
}
|
||||
|
||||
impl ActionTrait for ActionBeforeRenderPage {
|
||||
impl ActionTrait for ActionAfterPreparePage {
|
||||
fn new() -> Self {
|
||||
ActionBeforeRenderPage {
|
||||
ActionAfterPreparePage {
|
||||
action: None,
|
||||
weight: 0,
|
||||
}
|
||||
}
|
||||
|
||||
fn handle(&self) -> Handle {
|
||||
ACTION_BEFORE_RENDER_PAGE
|
||||
ACTION_AFTER_PREPARE_PAGE
|
||||
}
|
||||
|
||||
fn weight(&self) -> isize {
|
||||
|
|
@ -32,7 +32,7 @@ impl ActionTrait for ActionBeforeRenderPage {
|
|||
}
|
||||
}
|
||||
|
||||
impl ActionBeforeRenderPage {
|
||||
impl ActionAfterPreparePage {
|
||||
pub fn with_action(mut self, action: Action) -> Self {
|
||||
self.action = Some(action);
|
||||
self
|
||||
51
pagetop/src/response/page/before_prepare_page.rs
Normal file
51
pagetop/src/response/page/before_prepare_page.rs
Normal file
|
|
@ -0,0 +1,51 @@
|
|||
use crate::core::action::{ActionTrait, AnyAction};
|
||||
use crate::response::page::Page;
|
||||
use crate::{use_handle, Handle};
|
||||
|
||||
use_handle!(ACTION_BEFORE_PREPARE_PAGE);
|
||||
|
||||
type Action = fn(&mut Page);
|
||||
|
||||
pub struct ActionBeforePreparePage {
|
||||
action: Option<Action>,
|
||||
weight: isize,
|
||||
}
|
||||
|
||||
impl ActionTrait for ActionBeforePreparePage {
|
||||
fn new() -> Self {
|
||||
ActionBeforePreparePage {
|
||||
action: None,
|
||||
weight: 0,
|
||||
}
|
||||
}
|
||||
|
||||
fn handle(&self) -> Handle {
|
||||
ACTION_BEFORE_PREPARE_PAGE
|
||||
}
|
||||
|
||||
fn weight(&self) -> isize {
|
||||
self.weight
|
||||
}
|
||||
|
||||
fn as_ref_any(&self) -> &dyn AnyAction {
|
||||
self
|
||||
}
|
||||
}
|
||||
|
||||
impl ActionBeforePreparePage {
|
||||
pub fn with_action(mut self, action: Action) -> Self {
|
||||
self.action = Some(action);
|
||||
self
|
||||
}
|
||||
|
||||
pub fn with_weight(mut self, weight: isize) -> Self {
|
||||
self.weight = weight;
|
||||
self
|
||||
}
|
||||
|
||||
pub fn run(&self, page: &mut Page) {
|
||||
if let Some(action) = self.action {
|
||||
action(page)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -5,8 +5,9 @@ use crate::core::theme::ComponentsRegions;
|
|||
use crate::html::{html, Classes, ClassesOp, Favicon, Markup, DOCTYPE};
|
||||
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::response::page::{ActionAfterPreparePage, ACTION_AFTER_PREPARE_PAGE};
|
||||
use crate::response::page::{ActionBeforePreparePage, ACTION_BEFORE_PREPARE_PAGE};
|
||||
use crate::{fn_builder, service};
|
||||
|
||||
use unic_langid::CharacterDirection;
|
||||
|
|
@ -154,19 +155,27 @@ impl Page {
|
|||
// Page RENDER.
|
||||
|
||||
pub fn render(&mut self) -> ResultPage<Markup, FatalError> {
|
||||
// Acciones de los módulos antes de renderizar la página.
|
||||
run_actions(ACTION_BEFORE_RENDER_PAGE, |action| {
|
||||
action_ref::<ActionBeforeRenderPage>(&**action).run(self)
|
||||
// Acciones de los módulos antes de preparar la página.
|
||||
run_actions(ACTION_BEFORE_PREPARE_PAGE, |action| {
|
||||
action_ref::<ActionBeforePreparePage>(&**action).run(self)
|
||||
});
|
||||
|
||||
// Acciones del tema antes de renderizar la página.
|
||||
self.context.theme().before_render_page(self);
|
||||
// Acciones del tema antes de preparar la página.
|
||||
self.context.theme().before_prepare_page(self);
|
||||
|
||||
// Primero, renderizar el cuerpo.
|
||||
let body = self.context.theme().render_page_body(self);
|
||||
// Primero, preparar el cuerpo.
|
||||
let body = self.context.theme().prepare_page_body(self);
|
||||
|
||||
// Luego, renderizar la cabecera.
|
||||
let head = self.context.theme().render_page_head(self);
|
||||
// Luego, preparar la cabecera.
|
||||
let head = self.context.theme().prepare_page_head(self);
|
||||
|
||||
// Acciones de los módulos después de preparar la página.
|
||||
run_actions(ACTION_AFTER_PREPARE_PAGE, |action| {
|
||||
action_ref::<ActionAfterPreparePage>(&**action).run(self)
|
||||
});
|
||||
|
||||
// Acciones del tema después de preparar la página.
|
||||
self.context.theme().after_prepare_page(self);
|
||||
|
||||
// Finalmente, renderizar la página.
|
||||
let lang = self.langid().language.as_str();
|
||||
|
|
@ -183,7 +192,7 @@ impl Page {
|
|||
})
|
||||
}
|
||||
|
||||
pub fn render_region(&mut self, region: &str) -> Option<Markup> {
|
||||
pub fn prepare_region(&mut self, region: &str) -> Option<Markup> {
|
||||
let render = self
|
||||
.regions
|
||||
.get_extended_bundle(self.context.theme().single_name(), region)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue