From b5606f043a008c4c8645b4a9748bf95b46d2e1cf Mon Sep 17 00:00:00 2001 From: Manuel Cillero Date: Sat, 24 Jun 2023 01:03:41 +0200 Subject: [PATCH] =?UTF-8?q?=F0=9F=91=BD=EF=B8=8F=20Aplica=20cambios=20de?= =?UTF-8?q?=20API=20asociados=20a=20componentes?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pagetop-bootsier/src/lib.rs | 6 ++--- pagetop-bulmix/src/lib.rs | 2 +- pagetop-megamenu/src/component.rs | 24 +++++++++---------- pagetop-minimal/src/component/anchor.rs | 8 +++---- pagetop-minimal/src/component/container.rs | 18 +++++++------- .../src/component/form_element/button.rs | 7 +++--- .../src/component/form_element/date.rs | 2 +- .../src/component/form_element/form.rs | 10 ++++---- .../src/component/form_element/hidden.rs | 2 +- .../src/component/form_element/input.rs | 6 ++--- pagetop-minimal/src/component/grid/column.rs | 10 ++++---- pagetop-minimal/src/component/grid/row.rs | 10 ++++---- pagetop-minimal/src/component/heading.rs | 14 +++++------ pagetop-minimal/src/component/icon.rs | 4 ++-- pagetop-minimal/src/component/image.rs | 2 +- pagetop-minimal/src/component/paragraph.rs | 4 ++-- 16 files changed, 65 insertions(+), 64 deletions(-) diff --git a/pagetop-bootsier/src/lib.rs b/pagetop-bootsier/src/lib.rs index 88b07429..976d37d1 100644 --- a/pagetop-bootsier/src/lib.rs +++ b/pagetop-bootsier/src/lib.rs @@ -134,18 +134,18 @@ impl ThemeTrait for Bootsier { div class="media-body" { h1 class="display-4" { ("RESOURCE NOT FOUND") } p class="lead" { - (L10n::t("e404-description", &LOCALE_BOOTSIER).render(rcx)) + (L10n::t("e404-description", &LOCALE_BOOTSIER).prepare(rcx)) } hr class="my-4"; p { - (L10n::t("e404-description", &LOCALE_BOOTSIER).render(rcx)) + (L10n::t("e404-description", &LOCALE_BOOTSIER).prepare(rcx)) } a class="btn btn-primary btn-lg" href="/" role="button" { - (L10n::t("back-homepage", &LOCALE_BOOTSIER).render(rcx)) + (L10n::t("back-homepage", &LOCALE_BOOTSIER).prepare(rcx)) } } } diff --git a/pagetop-bulmix/src/lib.rs b/pagetop-bulmix/src/lib.rs index b792bdb7..59fc8dee 100644 --- a/pagetop-bulmix/src/lib.rs +++ b/pagetop-bulmix/src/lib.rs @@ -41,7 +41,7 @@ impl ThemeTrait for Bulmix { } #[rustfmt::skip] - fn before_render_component( + fn before_prepare_component( &self, component: &mut dyn ComponentTrait, _rcx: &mut RenderContext, diff --git a/pagetop-megamenu/src/component.rs b/pagetop-megamenu/src/component.rs index 974f5d11..41603292 100644 --- a/pagetop-megamenu/src/component.rs +++ b/pagetop-megamenu/src/component.rs @@ -44,29 +44,29 @@ impl ComponentTrait for MegaMenuItem { (self.renderable.check)(rcx) } - fn default_render(&self, rcx: &mut RenderContext) -> Markup { + fn prepare_component(&self, rcx: &mut RenderContext) -> Markup { match self.item_type() { MegaMenuItemType::Void => html! {}, MegaMenuItemType::Label(label) => html! { - li class="label" { a href="#" { (label.render(rcx)) } } + li class="label" { a href="#" { (label.prepare(rcx)) } } }, MegaMenuItemType::Link(label, path) => html! { - li class="link" { a href=(path) { (label.render(rcx)) } } + li class="link" { a href=(path) { (label.prepare(rcx)) } } }, MegaMenuItemType::LinkBlank(label, path) => html! { li class="link_blank" { - a href=(path) target="_blank" { (label.render(rcx)) } + a href=(path) target="_blank" { (label.prepare(rcx)) } } }, MegaMenuItemType::Html(content) => html! { - li class="html" { (content.render(rcx)) } + li class="html" { (content.prepare(rcx)) } }, MegaMenuItemType::Submenu(label, menu) => html! { li class="submenu" { - a href="#" { (label.render(rcx)) } + a href="#" { (label.prepare(rcx)) } ul { - (menu.items().render(rcx)) + (menu.items().prepare(rcx)) } } }, @@ -153,7 +153,7 @@ impl MegaMenuItem { use_handle!(COMPONENT_MEGAMENU); -action_before_render_component!(ACTION_BEFORE_RENDER_MENU for MegaMenu); +action_before_prepare_component!(ACTION_BEFORE_PREPARE_MENU for MegaMenu); #[rustfmt::skip] #[derive(Default)] @@ -187,11 +187,11 @@ impl ComponentTrait for MegaMenu { (self.renderable.check)(rcx) } - fn before_render(&mut self, rcx: &mut RenderContext) { - run_actions_before_render_component(self, rcx); + fn before_prepare(&mut self, rcx: &mut RenderContext) { + run_actions_before_prepare_component(self, rcx); } - fn default_render(&self, rcx: &mut RenderContext) -> Markup { + fn prepare_component(&self, rcx: &mut RenderContext) -> Markup { rcx.alter(ContextOp::AddStyleSheet( StyleSheet::located("/megamenu/css/menu.css").with_version("1.1.1"), )) @@ -207,7 +207,7 @@ impl ComponentTrait for MegaMenu { html! { ul id=(id) class=[self.classes().get()] { - (self.items().render(rcx)) + (self.items().prepare(rcx)) } script type="text/javascript" defer { "jQuery(function(){jQuery('#" (id) "').smartmenus({" diff --git a/pagetop-minimal/src/component/anchor.rs b/pagetop-minimal/src/component/anchor.rs index c854d587..8f3264b9 100644 --- a/pagetop-minimal/src/component/anchor.rs +++ b/pagetop-minimal/src/component/anchor.rs @@ -63,7 +63,7 @@ impl ComponentTrait for Anchor { } #[rustfmt::skip] - fn default_render(&self, rcx: &mut RenderContext) -> Markup { + fn prepare_component(&self, rcx: &mut RenderContext) -> Markup { let target = match &self.target() { AnchorTarget::Blank => Some("_blank"), AnchorTarget::Parent => Some("_parent"), @@ -78,9 +78,9 @@ impl ComponentTrait for Anchor { href=[self.href().get()] target=[target] { - (self.left_icon().render(rcx)) - (" ") span { (self.html().render(rcx)) } (" ") - (self.right_icon().render(rcx)) + (self.left_icon().prepare(rcx)) + (" ") span { (self.html().prepare(rcx)) } (" ") + (self.right_icon().prepare(rcx)) } } } diff --git a/pagetop-minimal/src/component/container.rs b/pagetop-minimal/src/component/container.rs index 8b960967..820383de 100644 --- a/pagetop-minimal/src/component/container.rs +++ b/pagetop-minimal/src/component/container.rs @@ -2,7 +2,7 @@ use pagetop::prelude::*; use_handle!(COMPONENT_CONTAINER); -action_before_render_component!(ACTION_BEFORE_RENDER_CONTAINER for Container); +action_before_prepare_component!(ACTION_BEFORE_PREPARE_CONTAINER for Container); #[derive(Default)] pub enum ContainerType { @@ -50,43 +50,43 @@ impl ComponentTrait for Container { (self.renderable.check)(rcx) } - fn before_render(&mut self, rcx: &mut RenderContext) { - run_actions_before_render_component(self, rcx); + fn before_prepare(&mut self, rcx: &mut RenderContext) { + run_actions_before_prepare_component(self, rcx); } - fn default_render(&self, rcx: &mut RenderContext) -> Markup { + fn prepare_component(&self, rcx: &mut RenderContext) -> Markup { match self.container_type() { ContainerType::Header => html! { header id=[self.id()] class=[self.classes().get()] { div class=[self.inner_classes().get()] { - (self.components().render(rcx)) + (self.components().prepare(rcx)) } } }, ContainerType::Footer => html! { footer id=[self.id()] class=[self.classes().get()] { div class=[self.inner_classes().get()] { - (self.components().render(rcx)) + (self.components().prepare(rcx)) } } }, ContainerType::Main => html! { main id=[self.id()] class=[self.classes().get()] { div class=[self.inner_classes().get()] { - (self.components().render(rcx)) + (self.components().prepare(rcx)) } } }, ContainerType::Section => html! { section id=[self.id()] class=[self.classes().get()] { div class=[self.inner_classes().get()] { - (self.components().render(rcx)) + (self.components().prepare(rcx)) } } }, _ => html! { div id=[self.id()] class=[self.classes().get()] { - (self.components().render(rcx)) + (self.components().prepare(rcx)) } }, } diff --git a/pagetop-minimal/src/component/form_element/button.rs b/pagetop-minimal/src/component/form_element/button.rs index e06a979f..f1cba202 100644 --- a/pagetop-minimal/src/component/form_element/button.rs +++ b/pagetop-minimal/src/component/form_element/button.rs @@ -45,24 +45,25 @@ impl ComponentTrait for Button { (self.renderable.check)(rcx) } - fn default_render(&self, rcx: &mut RenderContext) -> Markup { + fn prepare_component(&self, rcx: &mut RenderContext) -> Markup { let button_type = match self.button_type() { ButtonType::Button => "button", ButtonType::Submit => "submit", ButtonType::Reset => "reset", }; let id = self.name().get().map(|name| concat_string!("edit-", name)); + let value = self.value().prepare(rcx); html! { button type=(button_type) id=[id] class=[self.classes().get()] name=[self.name().get()] - value=(self.value().render(rcx)) + value=(value) autofocus=[self.autofocus().get()] disabled=[self.disabled().get()] { - (self.value().render(rcx)) + (value) } } } diff --git a/pagetop-minimal/src/component/form_element/date.rs b/pagetop-minimal/src/component/form_element/date.rs index 5f42e3ea..6241c8f3 100644 --- a/pagetop-minimal/src/component/form_element/date.rs +++ b/pagetop-minimal/src/component/form_element/date.rs @@ -40,7 +40,7 @@ impl ComponentTrait for Date { (self.renderable.check)(rcx) } - fn default_render(&self, _: &mut RenderContext) -> Markup { + fn prepare_component(&self, _: &mut RenderContext) -> Markup { let id = self.name().get().map(|name| concat_string!("edit-", name)); html! { div class=[self.classes().get()] { diff --git a/pagetop-minimal/src/component/form_element/form.rs b/pagetop-minimal/src/component/form_element/form.rs index 4da7c5d7..a244b633 100644 --- a/pagetop-minimal/src/component/form_element/form.rs +++ b/pagetop-minimal/src/component/form_element/form.rs @@ -2,7 +2,7 @@ use pagetop::prelude::*; use_handle!(COMPONENT_FORM); -action_before_render_component!(ACTION_BEFORE_RENDER_FORM for Form); +action_before_prepare_component!(ACTION_BEFORE_PREPARE_FORM for Form); #[derive(Default)] pub enum FormMethod { @@ -48,11 +48,11 @@ impl ComponentTrait for Form { (self.renderable.check)(rcx) } - fn before_render(&mut self, rcx: &mut RenderContext) { - run_actions_before_render_component(self, rcx); + fn before_prepare(&mut self, rcx: &mut RenderContext) { + run_actions_before_prepare_component(self, rcx); } - fn default_render(&self, rcx: &mut RenderContext) -> Markup { + fn prepare_component(&self, rcx: &mut RenderContext) -> Markup { let method = match self.method() { FormMethod::Post => Some("post".to_owned()), FormMethod::Get => None, @@ -65,7 +65,7 @@ impl ComponentTrait for Form { method=[method] accept-charset=[self.charset().get()] { - div { (self.elements().render(rcx)) } + div { (self.elements().prepare(rcx)) } } } } diff --git a/pagetop-minimal/src/component/form_element/hidden.rs b/pagetop-minimal/src/component/form_element/hidden.rs index 4ae86723..edc813be 100644 --- a/pagetop-minimal/src/component/form_element/hidden.rs +++ b/pagetop-minimal/src/component/form_element/hidden.rs @@ -23,7 +23,7 @@ impl ComponentTrait for Hidden { self.weight } - fn default_render(&self, _: &mut RenderContext) -> Markup { + fn prepare_component(&self, _: &mut RenderContext) -> Markup { let id = self.name().get().map(|name| concat_string!("value-", name)); html! { input type="hidden" id=[id] name=[self.name().get()] value=[self.value().get()]; diff --git a/pagetop-minimal/src/component/form_element/input.rs b/pagetop-minimal/src/component/form_element/input.rs index c29d33ad..cfdee829 100644 --- a/pagetop-minimal/src/component/form_element/input.rs +++ b/pagetop-minimal/src/component/form_element/input.rs @@ -61,7 +61,7 @@ impl ComponentTrait for Input { } #[rustfmt::skip] - fn default_render(&self, rcx: &mut RenderContext) -> Markup { + fn prepare_component(&self, rcx: &mut RenderContext) -> Markup { let type_input = match self.input_type() { InputType::Textfield => "text", InputType::Password => "password", @@ -73,7 +73,7 @@ impl ComponentTrait for Input { let id = self.name().get().map(|name| concat_string!("edit-", name)); html! { div class=[self.classes().get()] { - @if let Some(label) = self.label().optional_render(rcx) { + @if let Some(label) = self.label().prepare_optional(rcx) { label class="form-label" for=[&id] { (label) " " @if self.required().get().is_some() { @@ -98,7 +98,7 @@ impl ComponentTrait for Input { readonly=[self.readonly().get()] required=[self.required().get()] disabled=[self.disabled().get()]; - @if let Some(description) = self.help_text().optional_render(rcx) { + @if let Some(description) = self.help_text().prepare_optional(rcx) { div class="form-text" { (description) } } } diff --git a/pagetop-minimal/src/component/grid/column.rs b/pagetop-minimal/src/component/grid/column.rs index 7655dfa3..8a923562 100644 --- a/pagetop-minimal/src/component/grid/column.rs +++ b/pagetop-minimal/src/component/grid/column.rs @@ -2,7 +2,7 @@ use pagetop::prelude::*; use_handle!(COMPONENT_COLUMN); -action_before_render_component!(ACTION_BEFORE_RENDER_COLUMN for Column); +action_before_prepare_component!(ACTION_BEFORE_PREPARE_COLUMN for Column); const SIZE__DEFAULT: &str = "col-md"; const SIZE__1_OF_12: &str = "col-md-1"; @@ -69,14 +69,14 @@ impl ComponentTrait for Column { (self.renderable.check)(rcx) } - fn before_render(&mut self, rcx: &mut RenderContext) { - run_actions_before_render_component(self, rcx); + fn before_prepare(&mut self, rcx: &mut RenderContext) { + run_actions_before_prepare_component(self, rcx); } - fn default_render(&self, rcx: &mut RenderContext) -> Markup { + fn prepare_component(&self, rcx: &mut RenderContext) -> Markup { html! { div id=[self.id()] class=[self.classes().get()] { - (self.components().render(rcx)) + (self.components().prepare(rcx)) } } } diff --git a/pagetop-minimal/src/component/grid/row.rs b/pagetop-minimal/src/component/grid/row.rs index a7eee37f..689ae545 100644 --- a/pagetop-minimal/src/component/grid/row.rs +++ b/pagetop-minimal/src/component/grid/row.rs @@ -4,7 +4,7 @@ use crate::component::grid; use_handle!(COMPONENT_ROW); -action_before_render_component!(ACTION_BEFORE_RENDER_ROW for Row); +action_before_prepare_component!(ACTION_BEFORE_PREPARE_ROW for Row); #[rustfmt::skip] #[derive(Default)] @@ -38,14 +38,14 @@ impl ComponentTrait for Row { (self.renderable.check)(rcx) } - fn before_render(&mut self, rcx: &mut RenderContext) { - run_actions_before_render_component(self, rcx); + fn before_prepare(&mut self, rcx: &mut RenderContext) { + run_actions_before_prepare_component(self, rcx); } - fn default_render(&self, rcx: &mut RenderContext) -> Markup { + fn prepare_component(&self, rcx: &mut RenderContext) -> Markup { html! { div id=[self.id()] class=[self.classes().get()] { - (self.columns().render(rcx)) + (self.columns().prepare(rcx)) } } } diff --git a/pagetop-minimal/src/component/heading.rs b/pagetop-minimal/src/component/heading.rs index 2b847df4..bb117e10 100644 --- a/pagetop-minimal/src/component/heading.rs +++ b/pagetop-minimal/src/component/heading.rs @@ -61,16 +61,16 @@ impl ComponentTrait for Heading { (self.renderable.check)(rcx) } - fn default_render(&self, rcx: &mut RenderContext) -> Markup { + fn prepare_component(&self, rcx: &mut RenderContext) -> Markup { let id = self.id(); let classes = self.classes().get(); html! { @match &self.heading_type() { - HeadingType::H1 => h1 id=[id] class=[classes] { (self.text().render(rcx)) }, - HeadingType::H2 => h2 id=[id] class=[classes] { (self.text().render(rcx)) }, - HeadingType::H3 => h3 id=[id] class=[classes] { (self.text().render(rcx)) }, - HeadingType::H4 => h4 id=[id] class=[classes] { (self.text().render(rcx)) }, - HeadingType::H5 => h5 id=[id] class=[classes] { (self.text().render(rcx)) }, - HeadingType::H6 => h6 id=[id] class=[classes] { (self.text().render(rcx)) }, + HeadingType::H1 => h1 id=[id] class=[classes] { (self.text().prepare(rcx)) }, + HeadingType::H2 => h2 id=[id] class=[classes] { (self.text().prepare(rcx)) }, + HeadingType::H3 => h3 id=[id] class=[classes] { (self.text().prepare(rcx)) }, + HeadingType::H4 => h4 id=[id] class=[classes] { (self.text().prepare(rcx)) }, + HeadingType::H5 => h5 id=[id] class=[classes] { (self.text().prepare(rcx)) }, + HeadingType::H6 => h6 id=[id] class=[classes] { (self.text().prepare(rcx)) }, }} } diff --git a/pagetop-minimal/src/component/icon.rs b/pagetop-minimal/src/component/icon.rs index d6676c4c..3b4a69ae 100644 --- a/pagetop-minimal/src/component/icon.rs +++ b/pagetop-minimal/src/component/icon.rs @@ -28,13 +28,13 @@ impl ComponentTrait for Icon { (self.renderable.check)(rcx) } - fn before_render(&mut self, rcx: &mut RenderContext) { + fn before_prepare(&mut self, rcx: &mut RenderContext) { rcx.alter(ContextOp::AddStyleSheet( StyleSheet::located("/minimal/icons/bootstrap-icons.css").with_version("1.8.2"), )); } - fn default_render(&self, _: &mut RenderContext) -> Markup { + fn prepare_component(&self, _: &mut RenderContext) -> Markup { html! { i class=[self.classes().get()] {}; } } diff --git a/pagetop-minimal/src/component/image.rs b/pagetop-minimal/src/component/image.rs index e7fc3cd1..5e3c1de5 100644 --- a/pagetop-minimal/src/component/image.rs +++ b/pagetop-minimal/src/component/image.rs @@ -34,7 +34,7 @@ impl ComponentTrait for Image { (self.renderable.check)(rcx) } - fn default_render(&self, _: &mut RenderContext) -> Markup { + fn prepare_component(&self, _: &mut RenderContext) -> Markup { html! { img src=[self.source().get()] diff --git a/pagetop-minimal/src/component/paragraph.rs b/pagetop-minimal/src/component/paragraph.rs index 746c5c28..08654f2e 100644 --- a/pagetop-minimal/src/component/paragraph.rs +++ b/pagetop-minimal/src/component/paragraph.rs @@ -46,13 +46,13 @@ impl ComponentTrait for Paragraph { (self.renderable.check)(rcx) } - fn default_render(&self, rcx: &mut RenderContext) -> Markup { + fn prepare_component(&self, rcx: &mut RenderContext) -> Markup { html! { p id=[self.id()] class=[self.classes().get()] { - (self.components().render(rcx)) + (self.components().prepare(rcx)) } } }