🎨 Reestructuración según componentes "minimal"

Cargo.toml

@@ -8,15 +8,16 @@ members = [
     "pagetop-jquery",
     "pagetop-homedemo",
     "pagetop-megamenu",
+    # Components.
+    "pagetop-minimal",
+    # Themes.
+    "pagetop-aliner",
+    "pagetop-bootsier",
+    "pagetop-bulmix",
     # Modules.
     "pagetop-admin",
     "pagetop-user",
     "pagetop-node",
-    # Themes.
-    "pagetop-minimal",
-    "pagetop-aliner",
-    "pagetop-bootsier",
-    "pagetop-bulmix",
 ]
 
 exclude = [

README.md

@@ -52,23 +52,13 @@ El repositorio se organiza en un *workspace* con los siguientes subproyectos:
 * **[pagetop-homedemo](https://github.com/manuelcillero/pagetop/tree/main/pagetop-homedemo)**,
   módulo que muestra una página de inicio de demostración para presentar **PageTop**.
 
-## Módulos
+## Componentes
 
-* **[pagetop-admin](https://github.com/manuelcillero/pagetop/tree/main/pagetop-admin)**, módulo que
+* **[pagetop-minimal](https://github.com/manuelcillero/pagetop/tree/main/pagetop-minimal)**,
-  proporciona a otros módulos un lugar común donde presentar a los administradores sus opciones de
+  proporciona un conjunto básico de componentes para la composición de páginas.
-  configuración.
-
-* **[pagetop-user](https://github.com/manuelcillero/pagetop/tree/main/pagetop-user)**, módulo para
-  añadir gestión de usuarios, roles, permisos y sesiones en aplicaciones desarrolladas con PageTop.
-
-* **[pagetop-node](https://github.com/manuelcillero/pagetop/tree/main/pagetop-node)**, módulo para
-  crear, extender o personalizar los tipos de contenido que puede administrar un sitio web.
 
 ## Temas
 
-* **[pagetop-minimal](https://github.com/manuelcillero/pagetop/tree/main/pagetop-minimal)**, tema de
-  prueba con un conjunto mínimo de estilos para ver la composición básica de páginas y componentes.
-
 * **[pagetop-aliner](https://github.com/manuelcillero/pagetop/tree/main/pagetop-aliner)**, tema de
   prueba con un conjunto básico de estilos que delimita con cajas los elementos HTML para visualizar
   esquemáticamente la composición de páginas y componentes.
@@ -81,6 +71,18 @@ El repositorio se organiza en un *workspace* con los siguientes subproyectos:
   utiliza el *framework* [Bulma](https://bulma.io/) para la composición de páginas y visualización
   de componentes.
 
+## Módulos
+
+* **[pagetop-admin](https://github.com/manuelcillero/pagetop/tree/main/pagetop-admin)**, módulo que
+  proporciona a otros módulos un lugar común donde presentar a los administradores sus opciones de
+  configuración.
+
+* **[pagetop-user](https://github.com/manuelcillero/pagetop/tree/main/pagetop-user)**, módulo para
+  añadir gestión de usuarios, roles, permisos y sesiones en aplicaciones desarrolladas con PageTop.
+
+* **[pagetop-node](https://github.com/manuelcillero/pagetop/tree/main/pagetop-node)**, módulo para
+  crear, extender o personalizar los tipos de contenido que puede administrar un sitio web.
+
 ## Aplicación
 
 * **[drust](https://github.com/manuelcillero/pagetop/tree/main/drust)**, es una aplicación

drust/Cargo.toml

@@ -14,15 +14,14 @@ repository = "https://github.com/manuelcillero/pagetop"
 license = "Apache-2.0 OR MIT"
 
 [dependencies]
-actix-web = "4.3.1"
+actix-web = "4"
-pagetop = { path = "../pagetop", version = "0.0", features = ["mysql"], default-features = false }
+pagetop = { version = "0.0", path = "../pagetop", features = ["mysql"], default-features = false }
-# Modules.
-pagetop-homedemo = { path = "../pagetop-homedemo", version = "0.0" }
-pagetop-admin = { path = "../pagetop-admin", version = "0.0" }
-pagetop-user = { path = "../pagetop-user", version = "0.0" }
-pagetop-node = { path = "../pagetop-node", version = "0.0" }
 # Themes.
-pagetop-minimal = { path = "../pagetop-minimal", version = "0.0" }
+pagetop-aliner = { version = "0.0", path = "../pagetop-aliner" }
-pagetop-aliner = { path = "../pagetop-aliner", version = "0.0" }
+pagetop-bootsier = { version = "0.0", path = "../pagetop-bootsier" }
-pagetop-bootsier = { path = "../pagetop-bootsier", version = "0.0" }
+pagetop-bulmix = { version = "0.0", path = "../pagetop-bulmix" }
-pagetop-bulmix = { path = "../pagetop-bulmix", version = "0.0" }
+# Modules.
+pagetop-homedemo = { version = "0.0", path = "../pagetop-homedemo" }
+pagetop-admin = { version = "0.0", path = "../pagetop-admin" }
+pagetop-user = { version = "0.0", path = "../pagetop-user" }
+pagetop-node = { version = "0.0", path = "../pagetop-node" }

drust/config/local.toml

@@ -1,6 +1,5 @@
 [app]
 #theme = "Aliner"
-#theme = "Minimal"
 theme = "Bootsier"
 #theme = "Bulmix"
 language = "es-ES"

drust/src/main.rs

@@ -11,16 +11,15 @@ impl ModuleTrait for Drust {
 
     fn dependencies(&self) -> Vec<ModuleStaticRef> {
         vec![
+            // Themes.
+            &pagetop_aliner::Aliner,
+            &pagetop_bootsier::Bootsier,
+            &pagetop_bulmix::Bulmix,
             // Modules.
             &pagetop_homedemo::HomeDemo,
             &pagetop_admin::Admin,
             &pagetop_user::User,
             &pagetop_node::Node,
-            // Themes.
-            &pagetop_minimal::Minimal,
-            &pagetop_aliner::Aliner,
-            &pagetop_bootsier::Bootsier,
-            &pagetop_bulmix::Bulmix,
         ]
     }
 

pagetop-aliner/Cargo.toml

@@ -15,9 +15,9 @@ repository = "https://github.com/manuelcillero/pagetop"
 license = "Apache-2.0 OR MIT"
 
 [dependencies]
-pagetop = { path = "../pagetop", version = "0.0" }
+pagetop = { version = "0.0", path = "../pagetop" }
 static-files = "0.2.3"
 maud = "0.25.0"
 
 [build-dependencies]
-pagetop-build = { path = "../pagetop-build", version = "0.0" }
+pagetop-build = { version = "0.0", path = "../pagetop-build" }

pagetop-bootsier/Cargo.toml

@@ -14,10 +14,10 @@ repository = "https://github.com/manuelcillero/pagetop"
 license = "Apache-2.0 OR MIT"
 
 [dependencies]
-pagetop = { path = "../pagetop", version = "0.0" }
+pagetop = { version = "0.0", path = "../pagetop" }
-pagetop-jquery = { path = "../pagetop-jquery", version = "0.0" }
+pagetop-jquery = { version = "0.0", path = "../pagetop-jquery" }
 static-files = "0.2.3"
 maud = "0.25.0"
 
 [build-dependencies]
-pagetop-build = { path = "../pagetop-build", version = "0.0" }
+pagetop-build = { version = "0.0", path = "../pagetop-build" }

pagetop-bootsier/src/lib.rs

@@ -42,8 +42,8 @@ impl ThemeTrait for Bootsier {
         pagetop_jquery::JQuery::add_jquery(page.context());
     }
 
-    fn error_404_not_found(&self) -> Container {
+    fn error_404_not_found(&self) -> HtmlMarkup {
-        Container::new().with_component(Html::with(html! {
+        HtmlMarkup::new().with(html! {
             div class="jumbotron" {
                 div class="media" {
                     img
@@ -66,6 +66,6 @@ impl ThemeTrait for Bootsier {
                     }
                 }
             }
-        }))
+        })
     }
 }

pagetop-jquery/Cargo.toml

@@ -15,8 +15,8 @@ repository = "https://github.com/manuelcillero/pagetop"
 license = "Apache-2.0 OR MIT"
 
 [dependencies]
-pagetop = { path = "../pagetop", version = "0.0" }
+pagetop = { version = "0.0", path = "../pagetop" }
 static-files = "0.2.3"
 
 [build-dependencies]
-pagetop-build = { path = "../pagetop-build", version = "0.0" }
+pagetop-build = { version = "0.0", path = "../pagetop-build" }

pagetop-megamenu/Cargo.toml

@@ -14,10 +14,10 @@ repository = "https://github.com/manuelcillero/pagetop"
 license = "Apache-2.0 OR MIT"
 
 [dependencies]
-pagetop = { path = "../pagetop", version = "0.0" }
+pagetop = { version = "0.0", path = "../pagetop" }
-pagetop-jquery = { path = "../pagetop-jquery", version = "0.0" }
+pagetop-jquery = { version = "0.0", path = "../pagetop-jquery" }
 static-files = "0.2.3"
 maud = "0.25.0"
 
 [build-dependencies]
-pagetop-build = { path = "../pagetop-build", version = "0.0" }
+pagetop-build = { version = "0.0", path = "../pagetop-build" }

pagetop-node/Cargo.toml

@@ -15,4 +15,4 @@ repository = "https://github.com/manuelcillero/pagetop"
 license = "Apache-2.0 OR MIT"
 
 [dependencies]
-pagetop = { path = "../pagetop", version = "0.0", features = ["database"], default-features = false }
+pagetop = { version = "0.0", path = "../pagetop", features = ["database"], default-features = false }