diff --git a/examples/hello-name.rs b/examples/hello-name.rs index c73cd330..fba3c497 100644 --- a/examples/hello-name.rs +++ b/examples/hello-name.rs @@ -15,7 +15,7 @@ async fn hello_name( ) -> ResultPage { let name = path.into_inner(); Page::new(request) - .with_component_in("content", Html::with(html! { h1 { "Hello " (name) "!" } })) + .with_component(Html::with(html! { h1 { "Hello " (name) "!" } })) .render() } diff --git a/examples/hello-world.rs b/examples/hello-world.rs index b1ec2609..bc34a7ab 100644 --- a/examples/hello-world.rs +++ b/examples/hello-world.rs @@ -10,7 +10,7 @@ impl PackageTrait for HelloWorld { async fn hello_world(request: service::HttpRequest) -> ResultPage { Page::new(request) - .with_component_in("content", Html::with(html! { h1 { "Hello World!" } })) + .with_component(Html::with(html! { h1 { "Hello World!" } })) .render() } diff --git a/packages/pagetop-admin/src/summary.rs b/packages/pagetop-admin/src/summary.rs index 9792e3cd..1e2f7305 100644 --- a/packages/pagetop-admin/src/summary.rs +++ b/packages/pagetop-admin/src/summary.rs @@ -154,8 +154,7 @@ pub async fn summary(request: service::HttpRequest) -> ResultPage ResultPage { Page::new(request) .with_title(L10n::n("Identificación del usuario")) - .with_component_in( - "content", + .with_component( Wrapper::new() .with_id("welcome") .add_component(form_login()), diff --git a/src/base/package/welcome.rs b/src/base/package/welcome.rs index 4cb9e99f..2812cc6e 100644 --- a/src/base/package/welcome.rs +++ b/src/base/package/welcome.rs @@ -23,11 +23,11 @@ async fn demo(request: service::HttpRequest) -> ResultPage { "/base/css/welcome.css", ))) .with_body_id("welcome") - .with_component_in("content", hello_world()) - .with_component_in("content", welcome()) - .with_component_in("content", about_pagetop()) - .with_component_in("content", promo_pagetop()) - .with_component_in("content", reporting_issues()) + .with_component(hello_world()) + .with_component(welcome()) + .with_component(about_pagetop()) + .with_component(promo_pagetop()) + .with_component(reporting_issues()) .render() } diff --git a/src/lib.rs b/src/lib.rs index 957bf3e9..8ff51f50 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -42,7 +42,7 @@ //! //! async fn hello_world(request: service::HttpRequest) -> ResultPage { //! Page::new(request) -//! .with_component_in("content", Html::with(html! { h1 { "Hello World!" } })) +//! .with_component(Html::with(html! { h1 { "Hello World!" } })) //! .render() //! } //! diff --git a/src/response/page.rs b/src/response/page.rs index 35fe73c3..ac595594 100644 --- a/src/response/page.rs +++ b/src/response/page.rs @@ -103,6 +103,13 @@ impl Page { self } + #[fn_with] + pub fn alter_component(&mut self, component: impl ComponentTrait) -> &mut Self { + self.regions + .add_component_in("content", ArcAnyComponent::new(component)); + self + } + #[fn_with] pub fn alter_component_in( &mut self, diff --git a/src/response/page/error.rs b/src/response/page/error.rs index 19d86e57..841a7c68 100644 --- a/src/response/page/error.rs +++ b/src/response/page/error.rs @@ -31,7 +31,7 @@ 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_in("content", Error403) + .with_component(Error403) .with_template("error") .render() { @@ -45,7 +45,7 @@ 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_in("content", Error404) + .with_component(Error404) .with_template("error") .render() {