From 21b004fc1e14562b678c65868fb88bbcb354f882 Mon Sep 17 00:00:00 2001
From: Manuel Cillero <manuel@cillero.es>
Date: Mon, 2 May 2022 12:43:39 +0200
Subject: [PATCH] Actualiza y concentra APIs que extienden PageTop

---
 pagetop/src/app/application.rs                    | 3 ++-
 pagetop/src/core/mod.rs                           | 3 +++
 pagetop/src/{ => core}/module/all.rs              | 0
 pagetop/src/{ => core}/module/definition.rs       | 0
 pagetop/src/{ => core}/module/mod.rs              | 0
 pagetop/src/{ => core}/response/mod.rs            | 0
 pagetop/src/{ => core}/response/page/assets.rs    | 2 +-
 pagetop/src/{ => core}/response/page/component.rs | 2 +-
 pagetop/src/{ => core}/response/page/container.rs | 2 +-
 pagetop/src/{ => core}/response/page/mod.rs       | 0
 pagetop/src/{ => core}/response/page/page.rs      | 2 +-
 pagetop/src/{ => core}/theme/all.rs               | 0
 pagetop/src/{ => core}/theme/definition.rs        | 2 +-
 pagetop/src/{ => core}/theme/mod.rs               | 0
 pagetop/src/lib.rs                                | 7 ++-----
 pagetop/src/prelude.rs                            | 8 +++++---
 16 files changed, 17 insertions(+), 14 deletions(-)
 create mode 100644 pagetop/src/core/mod.rs
 rename pagetop/src/{ => core}/module/all.rs (100%)
 rename pagetop/src/{ => core}/module/definition.rs (100%)
 rename pagetop/src/{ => core}/module/mod.rs (100%)
 rename pagetop/src/{ => core}/response/mod.rs (100%)
 rename pagetop/src/{ => core}/response/page/assets.rs (99%)
 rename pagetop/src/{ => core}/response/page/component.rs (97%)
 rename pagetop/src/{ => core}/response/page/container.rs (91%)
 rename pagetop/src/{ => core}/response/page/mod.rs (100%)
 rename pagetop/src/{ => core}/response/page/page.rs (99%)
 rename pagetop/src/{ => core}/theme/all.rs (100%)
 rename pagetop/src/{ => core}/theme/definition.rs (98%)
 rename pagetop/src/{ => core}/theme/mod.rs (100%)

diff --git a/pagetop/src/app/application.rs b/pagetop/src/app/application.rs
index f183bbfc..db8af1a6 100644
--- a/pagetop/src/app/application.rs
+++ b/pagetop/src/app/application.rs
@@ -1,5 +1,6 @@
-use crate::{Lazy, app, base, module, theme, trace};
+use crate::{Lazy, app, base, trace};
 use crate::config::SETTINGS;
+use crate::core::{module, theme};
 
 use std::io::Error;
 use actix_web::middleware::normalize::{NormalizePath, TrailingSlash};
diff --git a/pagetop/src/core/mod.rs b/pagetop/src/core/mod.rs
new file mode 100644
index 00000000..179f3e12
--- /dev/null
+++ b/pagetop/src/core/mod.rs
@@ -0,0 +1,3 @@
+pub mod module;     // API para añadir módulos con nuevas funcionalidades.
+pub mod response;   // Tipos de respuestas web.
+pub mod theme;      // Temas predefinidos y API para crear temas.
diff --git a/pagetop/src/module/all.rs b/pagetop/src/core/module/all.rs
similarity index 100%
rename from pagetop/src/module/all.rs
rename to pagetop/src/core/module/all.rs
diff --git a/pagetop/src/module/definition.rs b/pagetop/src/core/module/definition.rs
similarity index 100%
rename from pagetop/src/module/definition.rs
rename to pagetop/src/core/module/definition.rs
diff --git a/pagetop/src/module/mod.rs b/pagetop/src/core/module/mod.rs
similarity index 100%
rename from pagetop/src/module/mod.rs
rename to pagetop/src/core/module/mod.rs
diff --git a/pagetop/src/response/mod.rs b/pagetop/src/core/response/mod.rs
similarity index 100%
rename from pagetop/src/response/mod.rs
rename to pagetop/src/core/response/mod.rs
diff --git a/pagetop/src/response/page/assets.rs b/pagetop/src/core/response/page/assets.rs
similarity index 99%
rename from pagetop/src/response/page/assets.rs
rename to pagetop/src/core/response/page/assets.rs
index 13c28a0b..7eef7b1a 100644
--- a/pagetop/src/response/page/assets.rs
+++ b/pagetop/src/core/response/page/assets.rs
@@ -1,7 +1,7 @@
 use crate::{Lazy, base, concat_string};
 use crate::config::SETTINGS;
 use crate::html::{Markup, PreEscaped, html};
-use crate::theme::*;
+use crate::core::theme::*;
 
 static DEFAULT_THEME: Lazy<&dyn ThemeTrait> = Lazy::new(|| {
     match theme_by_name(&SETTINGS.app.theme) {
diff --git a/pagetop/src/response/page/component.rs b/pagetop/src/core/response/page/component.rs
similarity index 97%
rename from pagetop/src/response/page/component.rs
rename to pagetop/src/core/response/page/component.rs
index a423707f..aa1160b1 100644
--- a/pagetop/src/response/page/component.rs
+++ b/pagetop/src/core/response/page/component.rs
@@ -1,5 +1,5 @@
 use crate::html::{Markup, html};
-use crate::response::page::PageAssets;
+use crate::core::response::page::PageAssets;
 use crate::util::partial_type_name;
 
 pub use std::any::Any as AnyComponent;
diff --git a/pagetop/src/response/page/container.rs b/pagetop/src/core/response/page/container.rs
similarity index 91%
rename from pagetop/src/response/page/container.rs
rename to pagetop/src/core/response/page/container.rs
index 6cf09607..91c685fd 100644
--- a/pagetop/src/response/page/container.rs
+++ b/pagetop/src/core/response/page/container.rs
@@ -1,5 +1,5 @@
 use crate::html::{Markup, html};
-use crate::response::page::{PageAssets, ComponentTrait, render_component};
+use crate::core::response::page::{PageAssets, ComponentTrait, render_component};
 
 use std::sync::{Arc, RwLock};
 
diff --git a/pagetop/src/response/page/mod.rs b/pagetop/src/core/response/page/mod.rs
similarity index 100%
rename from pagetop/src/response/page/mod.rs
rename to pagetop/src/core/response/page/mod.rs
diff --git a/pagetop/src/response/page/page.rs b/pagetop/src/core/response/page/page.rs
similarity index 99%
rename from pagetop/src/response/page/page.rs
rename to pagetop/src/core/response/page/page.rs
index 2a1f69f4..c23ea9c2 100644
--- a/pagetop/src/response/page/page.rs
+++ b/pagetop/src/core/response/page/page.rs
@@ -1,7 +1,7 @@
 use crate::{Lazy, app, trace};
 use crate::config::SETTINGS;
 use crate::html::*;
-use crate::response::page::*;
+use crate::core::response::page::*;
 
 use std::sync::RwLock;
 use std::collections::HashMap;
diff --git a/pagetop/src/theme/all.rs b/pagetop/src/core/theme/all.rs
similarity index 100%
rename from pagetop/src/theme/all.rs
rename to pagetop/src/core/theme/all.rs
diff --git a/pagetop/src/theme/definition.rs b/pagetop/src/core/theme/definition.rs
similarity index 98%
rename from pagetop/src/theme/definition.rs
rename to pagetop/src/core/theme/definition.rs
index ef21491a..c7d5f855 100644
--- a/pagetop/src/theme/definition.rs
+++ b/pagetop/src/core/theme/definition.rs
@@ -1,7 +1,7 @@
 use crate::{app, concat_string};
 use crate::config::SETTINGS;
 use crate::html::{Markup, html};
-use crate::response::page::{ComponentTrait, Favicon, Page, PageAssets};
+use crate::core::response::page::{ComponentTrait, Favicon, Page, PageAssets};
 use crate::base::component::Chunck;
 use crate::util::partial_type_name;
 
diff --git a/pagetop/src/theme/mod.rs b/pagetop/src/core/theme/mod.rs
similarity index 100%
rename from pagetop/src/theme/mod.rs
rename to pagetop/src/core/theme/mod.rs
diff --git a/pagetop/src/lib.rs b/pagetop/src/lib.rs
index fa2b6ce1..68c23520 100644
--- a/pagetop/src/lib.rs
+++ b/pagetop/src/lib.rs
@@ -18,12 +18,9 @@ pub mod html;       // HTML en código.
 #[cfg(any(feature = "mysql", feature = "postgres", feature = "sqlite"))]
 pub mod db;         // Acceso a base de datos.
 
-pub mod theme;      // Temas predefinidos y API para crear temas.
-pub mod module;     // API para añadir módulos con nuevas funcionalidades.
-pub mod response;   // Tipos de respuestas web.
-
+pub mod core;       // APIs para módulos, respuestas web y temas.
 pub mod app;        // Aplicación y servidor web.
-pub mod base;       // Componentes, Módulos y Temas base.
+pub mod base;       // Base de componentes, módulos y temas.
 pub mod util;       // Macros y funciones útiles.
 
 // Re-exports.
diff --git a/pagetop/src/prelude.rs b/pagetop/src/prelude.rs
index c548f82c..d5190250 100644
--- a/pagetop/src/prelude.rs
+++ b/pagetop/src/prelude.rs
@@ -16,9 +16,11 @@ pub use crate::html::*;
 #[cfg(any(feature = "mysql", feature = "postgres", feature = "sqlite"))]
 pub use crate::{db, db::*, boxed_migration};
 
-pub use crate::theme::*;
-pub use crate::module::*;
-pub use crate::response::page::*;
+pub use crate::core::{
+    module::*,
+    response::page::*,
+    theme::*,
+};
 
 pub use crate::app;
 pub use crate::app::application::{Application, essence};