From 7691bf4b2fa1e59da3511cd577a53f70e3548e0d Mon Sep 17 00:00:00 2001
From: Manuel Cillero <manuel@cillero.es>
Date: Sun, 21 May 2023 13:16:32 +0200
Subject: [PATCH] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20El=20contexto=20pasa=20a?=
 =?UTF-8?q?=20ser=20un=20elemento=20m=C3=A1s=20gen=C3=A9rico?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pagetop/src/core.rs                             | 2 +-
 pagetop/src/core/component.rs                   | 3 ---
 pagetop/src/core/component/bundle.rs            | 5 ++---
 pagetop/src/core/component/definition.rs        | 4 +---
 pagetop/src/core/component/html_markup.rs       | 4 ++--
 pagetop/src/core/component/renderable.rs        | 2 +-
 pagetop/src/core/module/theme.rs                | 4 ++--
 pagetop/src/html.rs                             | 3 +++
 pagetop/src/{core/component => html}/context.rs | 0
 pagetop/src/prelude.rs                          | 4 +---
 pagetop/src/response/page/definition.rs         | 4 +++-
 11 files changed, 16 insertions(+), 19 deletions(-)
 rename pagetop/src/{core/component => html}/context.rs (100%)

diff --git a/pagetop/src/core.rs b/pagetop/src/core.rs
index 2f5c0fa2..ebf07e9a 100644
--- a/pagetop/src/core.rs
+++ b/pagetop/src/core.rs
@@ -10,4 +10,4 @@ pub mod component;
 pub mod hook;
 
 // Basic theme.
-mod basic;
+pub(crate) mod basic;
diff --git a/pagetop/src/core/component.rs b/pagetop/src/core/component.rs
index f348ecf3..cd596397 100644
--- a/pagetop/src/core/component.rs
+++ b/pagetop/src/core/component.rs
@@ -1,6 +1,3 @@
-mod context;
-pub use context::{ContextOp, RenderContext};
-
 mod definition;
 pub use definition::{component_mut, component_ref, AnyComponent, BaseComponent, ComponentTrait};
 
diff --git a/pagetop/src/core/component/bundle.rs b/pagetop/src/core/component/bundle.rs
index 3e16092d..0a0e8c95 100644
--- a/pagetop/src/core/component/bundle.rs
+++ b/pagetop/src/core/component/bundle.rs
@@ -1,6 +1,5 @@
-use super::{ComponentTrait, RenderContext};
-
-use crate::html::{html, Markup};
+use crate::core::component::ComponentTrait;
+use crate::html::{html, Markup, RenderContext};
 
 use std::sync::{Arc, RwLock};
 
diff --git a/pagetop/src/core/component/definition.rs b/pagetop/src/core/component/definition.rs
index 4f88e84d..85e7fac8 100644
--- a/pagetop/src/core/component/definition.rs
+++ b/pagetop/src/core/component/definition.rs
@@ -1,6 +1,4 @@
-use super::RenderContext;
-
-use crate::html::{html, Markup};
+use crate::html::{html, Markup, RenderContext};
 use crate::util::single_type_name;
 use crate::Handle;
 
diff --git a/pagetop/src/core/component/html_markup.rs b/pagetop/src/core/component/html_markup.rs
index 3b513707..a4d62d9b 100644
--- a/pagetop/src/core/component/html_markup.rs
+++ b/pagetop/src/core/component/html_markup.rs
@@ -1,5 +1,5 @@
-use crate::core::component::{AnyComponent, ComponentTrait, RenderContext};
-use crate::html::{html, Markup};
+use crate::core::component::{AnyComponent, ComponentTrait};
+use crate::html::{html, Markup, RenderContext};
 use crate::{define_handle, Handle};
 
 define_handle!(HTML_MARKUP);
diff --git a/pagetop/src/core/component/renderable.rs b/pagetop/src/core/component/renderable.rs
index ce2f302c..aef5bb92 100644
--- a/pagetop/src/core/component/renderable.rs
+++ b/pagetop/src/core/component/renderable.rs
@@ -1,4 +1,4 @@
-use crate::core::component::RenderContext;
+use crate::html::RenderContext;
 
 pub type IsRenderable = fn(&RenderContext) -> bool;
 
diff --git a/pagetop/src/core/module/theme.rs b/pagetop/src/core/module/theme.rs
index feeb012d..25fa0720 100644
--- a/pagetop/src/core/module/theme.rs
+++ b/pagetop/src/core/module/theme.rs
@@ -1,7 +1,7 @@
 use super::ModuleTrait;
 
-use crate::core::component::{ComponentTrait, HtmlMarkup, RenderContext};
-use crate::html::{html, Favicon, Markup};
+use crate::core::component::{ComponentTrait, HtmlMarkup};
+use crate::html::{html, Favicon, Markup, RenderContext};
 use crate::response::page::Page;
 use crate::{concat_string, config};
 
diff --git a/pagetop/src/html.rs b/pagetop/src/html.rs
index fcfbbab7..6d07c9eb 100644
--- a/pagetop/src/html.rs
+++ b/pagetop/src/html.rs
@@ -8,6 +8,9 @@ pub use assets::javascript::{JavaScript, ModeJS};
 pub use assets::stylesheet::{StyleSheet, TargetMedia};
 pub use assets::Assets;
 
+mod context;
+pub use context::{ContextOp, RenderContext};
+
 mod favicon;
 pub use favicon::Favicon;
 
diff --git a/pagetop/src/core/component/context.rs b/pagetop/src/html/context.rs
similarity index 100%
rename from pagetop/src/core/component/context.rs
rename to pagetop/src/html/context.rs
diff --git a/pagetop/src/prelude.rs b/pagetop/src/prelude.rs
index f93d7bdb..7d3fd121 100644
--- a/pagetop/src/prelude.rs
+++ b/pagetop/src/prelude.rs
@@ -28,8 +28,6 @@ pub use crate::{hook_action, hook_before_render_component};
 pub use crate::server;
 pub use crate::server::HttpMessage;
 
-pub use crate::response::page::*;
-pub use crate::response::FatalError;
-pub use crate::response::ResponseError;
+pub use crate::response::{page::*, FatalError, ResponseError};
 
 pub use crate::app::Application;
diff --git a/pagetop/src/response/page/definition.rs b/pagetop/src/response/page/definition.rs
index d819dfd2..25adbfb7 100644
--- a/pagetop/src/response/page/definition.rs
+++ b/pagetop/src/response/page/definition.rs
@@ -2,7 +2,9 @@ use super::{BeforeRenderPageHook, ResultPage, HOOK_BEFORE_RENDER_PAGE};
 
 use crate::core::component::*;
 use crate::core::hook::{action_ref, run_actions};
-use crate::html::{html, AttributeValue, Classes, ClassesOp, Favicon, Markup, DOCTYPE};
+use crate::html::{
+    html, AttributeValue, Classes, ClassesOp, ContextOp, Favicon, Markup, RenderContext, DOCTYPE,
+};
 use crate::response::FatalError;
 use crate::{config, fn_builder, locale, server, trace, LazyStatic};