manuelcillero/pagetop
manuelcillero/pagetop
1
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

🧑‍💻 Improve regions and components API

Browse source
This commit is contained in:
Manuel Cillero 2024-03-08 22:43:21 +01:00
parent 496c9d375b
commit 3bbad7f6a4
9 changed files with 77 additions and 69 deletions
Download patch file Download diff file Expand all files Collapse all files

50
src/response/page.rs
View file

@ -4,7 +4,7 @@ pub use error::ErrorPage;
pub use actix_web::Result as ResultPage;
use crate::base::action;
use crate::core::component::{AnyComponent, ComponentTrait, MixedComponents};
use crate::core::component::{AnyComponent, ComponentTrait, MixedComponents, MixedOp};
use crate::core::component::{Context, ContextOp};
use crate::core::theme::ComponentsInRegions;
use crate::fn_builder;
@ -26,8 +26,8 @@ pub struct Page {
body_id : OptionId,
body_classes: OptionClasses,
skip_to : OptionId,
regions : ComponentsInRegions,
template : String,
regions : ComponentsInRegions,
}
impl Page {
@ -104,28 +104,34 @@ impl Page {
self
}
#[fn_builder]
pub fn alter_component(&mut self, component: impl ComponentTrait) -> &mut Self {
self.regions.add(AnyComponent::with(component));
self
}
#[fn_builder]
pub fn alter_component_in(
&mut self,
region: &'static str,
component: impl ComponentTrait,
) -> &mut Self {
self.regions.add_in(region, AnyComponent::with(component));
self
}
#[fn_builder]
pub fn alter_template(&mut self, template: &str) -> &mut Self {
self.template = template.to_owned();
self
}
#[fn_builder]
pub fn alter_regions(&mut self, region: &'static str, op: MixedOp) -> &mut Self {
self.regions.alter_components(region, op);
self
}
pub fn with_component(mut self, component: impl ComponentTrait) -> Self {
self.regions
.alter_components("content", MixedOp::Add(AnyComponent::with(component)));
self
}
pub fn with_component_in(
mut self,
region: &'static str,
component: impl ComponentTrait,
) -> Self {
self.regions
.alter_components(region, MixedOp::Add(AnyComponent::with(component)));
self
}
// Page GETTERS.
pub fn title(&mut self) -> Option<String> {
@ -164,14 +170,14 @@ impl Page {
&self.skip_to
}
pub fn components_in(&self, region: &str) -> MixedComponents {
self.regions.get_components(self.context.theme(), region)
}
pub fn template(&self) -> &str {
self.template.as_str()
}
pub fn components_in(&self, region: &str) -> MixedComponents {
self.regions.all_components(self.context.theme(), region)
}
// Page RENDER.
pub fn render(&mut self) -> ResultPage<Markup, ErrorPage> {

4
src/response/page/error.rs
View file

@ -31,8 +31,8 @@ impl fmt::Display for ErrorPage {
let error_page = Page::new(request.clone());
if let Ok(page) = error_page
.with_title(L10n::n("Error FORBIDDEN"))
.with_component(Error403)
.with_template("error")
.with_component(Error403)
.render()
{
write!(f, "{}", page.into_string())
@ -45,8 +45,8 @@ impl fmt::Display for ErrorPage {
let error_page = Page::new(request.clone());
if let Ok(page) = error_page
.with_title(L10n::n("Error RESOURCE NOT FOUND"))
.with_component(Error404)
.with_template("error")
.with_component(Error404)
.render()
{
write!(f, "{}", page.into_string())