🎉 [megamenu] Nuevo componente para PageTop

Cargo.toml

@@ -6,6 +6,7 @@ members = [
     "pagetop-macros",
     "pagetop-build",
     "pagetop-jquery",
+    "pagetop-megamenu",
     # Modules.
     "pagetop-admin",
     "pagetop-user",

pagetop-admin/Cargo.toml

@@ -15,4 +15,6 @@ license = "Apache-2.0 OR MIT"
 
 [dependencies]
 pagetop = { path = "../pagetop", version = "0.0" }
+pagetop-megamenu = { path = "../pagetop-megamenu", version = "0.0" }
+
 maud = "0.24.0"

pagetop-admin/src/lib.rs

@@ -21,15 +21,19 @@ impl ModuleTrait for Admin {
         Some(l("module_description"))
     }
 
-    fn configure_service(&self, cfg: &mut server::web::ServiceConfig) {
-        cfg.service(
-            server::web::scope("/admin").route("", server::web::get().to(summary::summary)),
-        );
+    fn dependencies(&self) -> Vec<ModuleStaticRef> {
+        vec![&pagetop_megamenu::MegaMenu]
     }
 
     fn actions(&self) -> Vec<HookAction> {
         vec![hook_action!(BeforeRenderPageHook => before_render_page)]
     }
+
+    fn configure_service(&self, cfg: &mut server::web::ServiceConfig) {
+        cfg.service(
+            server::web::scope("/admin").route("", server::web::get().to(summary::summary)),
+        );
+    }
 }
 
 fn before_render_page(page: &mut Page) {

pagetop-admin/src/summary.rs

@@ -1,60 +1,58 @@
-//use super::l;
+use super::l;
 use pagetop::prelude::*;
+use pagetop_megamenu::component::{MegaMenu, MegaMenuItem};
 
 pub async fn summary(request: server::HttpRequest) -> ResultPage<Markup, FatalError> {
-    /*
-    let top_menu = Menu::new()
-        .with_item(MenuItem::label(l("module_name").as_str()))
-        .with_item(MenuItem::link("Opción 2", "https://www.google.es"))
-        .with_item(MenuItem::link_blank("Opción 3", "https://www.google.es"))
-        .with_item(MenuItem::submenu(
+    let top_menu = MegaMenu::new()
+        .with_item(MegaMenuItem::label(l("module_name").as_str()))
+        .with_item(MegaMenuItem::link("Opción 2", "https://www.google.es"))
+        .with_item(MegaMenuItem::link_blank("Opción 3", "https://www.google.es"))
+        .with_item(MegaMenuItem::submenu(
             "Submenú 1",
-            Menu::new()
-                .with_item(MenuItem::label("Opción 1"))
-                .with_item(MenuItem::label("Opción 2")),
+            MegaMenu::new()
+                .with_item(MegaMenuItem::label("Opción 1"))
+                .with_item(MegaMenuItem::label("Opción 2")),
         ))
-        .with_item(MenuItem::separator())
-        .with_item(MenuItem::submenu(
+        .with_item(MegaMenuItem::separator())
+        .with_item(MegaMenuItem::submenu(
             "Submenú 2",
-            Menu::new()
-                .with_item(MenuItem::label("Opción 1"))
-                .with_item(MenuItem::label("Opción 2")),
+            MegaMenu::new()
+                .with_item(MegaMenuItem::label("Opción 1"))
+                .with_item(MegaMenuItem::label("Opción 2")),
         ))
-        .with_item(MenuItem::label("Opción 4"));
+        .with_item(MegaMenuItem::label("Opción 4"));
 
-    let side_menu = Menu::new()
-        .with_item(MenuItem::label("Opción 1"))
-        .with_item(MenuItem::link("Opción 2", "https://www.google.es"))
-        .with_item(MenuItem::link_blank("Opción 3", "https://www.google.es"))
-        .with_item(MenuItem::submenu(
+    let side_menu = MegaMenu::new()
+        .with_item(MegaMenuItem::label("Opción 1"))
+        .with_item(MegaMenuItem::link("Opción 2", "https://www.google.es"))
+        .with_item(MegaMenuItem::link_blank("Opción 3", "https://www.google.es"))
+        .with_item(MegaMenuItem::submenu(
             "Submenú 1",
-            Menu::new()
-                .with_item(MenuItem::label("Opción 1"))
-                .with_item(MenuItem::label("Opción 2")),
+            MegaMenu::new()
+                .with_item(MegaMenuItem::label("Opción 1"))
+                .with_item(MegaMenuItem::label("Opción 2")),
         ))
-        .with_item(MenuItem::separator())
-        .with_item(MenuItem::submenu(
+        .with_item(MegaMenuItem::separator())
+        .with_item(MegaMenuItem::submenu(
             "Submenú 2",
-            Menu::new()
-                .with_item(MenuItem::label("Opción 1"))
-                .with_item(MenuItem::label("Opción 2")),
+            MegaMenu::new()
+                .with_item(MegaMenuItem::label("Opción 1"))
+                .with_item(MegaMenuItem::label("Opción 2")),
         ))
-        .with_item(MenuItem::label("Opción 4"));
-    */
+        .with_item(MegaMenuItem::label("Opción 4"));
 
     Page::new(request)
         .with_context(ContextOp::Theme("Bootsier"))
         .with_title("Admin")
-        /*      .with_this_in("top-menu", top_menu)
-                .with_this_in(
-                    "region-content",
-                    grid::Row::new()
-                        .with_column(grid::Column::new().with_component(side_menu))
-                        .with_column(grid::Column::new().with_component(Html::with(html! {
-                            p { "Columna 2"}
-                        }))),
-                )
-        */
+        .with_this_in("top-menu", top_menu)
+        .with_this_in(
+            "region-content",
+            grid::Row::new()
+                .with_column(grid::Column::new().with_component(side_menu))
+                .with_column(grid::Column::new().with_component(Html::with(html! {
+                    p { "Columna 2"}
+                }))),
+        )
         .with_template("admin")
         .render()
 }

pagetop-megamenu/Cargo.toml

@@ -0,0 +1,23 @@
+[package]
+name = "pagetop-megamenu"
+version = "0.0.1"
+edition = "2021"
+
+authors = [
+    "Manuel Cillero <manuel@cillero.es>"
+]
+description = """\
+    Component MegaMenu for PageTop applications.\
+"""
+homepage = "https://pagetop.cillero.es"
+repository = "https://github.com/manuelcillero/pagetop"
+license = "Apache-2.0 OR MIT"
+
+[dependencies]
+pagetop = { path = "../pagetop", version = "0.0" }
+pagetop-jquery = { path = "../pagetop-jquery", version = "0.0" }
+static-files = "0.2.3"
+maud = "0.24.0"
+
+[build-dependencies]
+pagetop-build = { path = "../pagetop-build", version = "0.0" }

pagetop-megamenu/README.md

@@ -0,0 +1,26 @@
+Componente MegaMenu para aplicaciones desarrolladas con **PageTop**.
+
+[PageTop](https://github.com/manuelcillero/pagetop/tree/main/pagetop), es un entorno de desarrollo
+basado en algunos de los *crates* más estables y populares del ecosistema Rust para proporcionar
+APIs, patrones de desarrollo y buenas prácticas para la creación de soluciones web SSR (*Server-Side
+Rendering*).
+
+
+# 🚧 Advertencia
+
+**PageTop** sólo libera actualmente versiones de desarrollo. La API no es estable y los cambios son
+constantes. No puede considerarse preparado hasta que se libere la versión **0.1.0**.
+
+
+# 📜 Licencia
+
+Este proyecto tiene licencia, de hecho tiene dos, puedes aplicar cualquiera de las siguientes a tu
+elección:
+
+* Licencia Apache versión 2.0
+  ([LICENSE-APACHE](https://github.com/manuelcillero/pagetop/blob/main/LICENSE-APACHE) o
+  [http://www.apache.org/licenses/LICENSE-2.0]).
+
+* Licencia MIT
+  ([LICENSE-MIT](https://github.com/manuelcillero/pagetop/blob/main/LICENSE-MIT) o
+  [http://opensource.org/licenses/MIT]).

pagetop-megamenu/build.rs

@@ -0,0 +1,3 @@
+fn main() -> std::io::Result<()> {
+    pagetop_build::bundle_resources("./static", "mengamenu", None)
+}

pagetop-megamenu/src/component.rs

@@ -1,36 +1,36 @@
-use crate::prelude::*;
+use pagetop::prelude::*;
 
-pub_handle!(COMPONENT_MENUITEM);
+pub_handle!(COMPONENT_MEGAMENUITEM);
 
 #[derive(Default)]
-pub enum MenuItemType {
+pub enum MegaMenuItemType {
     #[default]
     Void,
     Label(String),
     Link(String, String),
     LinkBlank(String, String),
     Html(Markup),
-    Submenu(String, Menu),
+    Submenu(String, MegaMenu),
     Separator,
 }
 
-// MenuItem.
+// MegaMenuItem.
 
 #[rustfmt::skip]
 #[derive(Default)]
-pub struct MenuItem {
+pub struct MegaMenuItem {
     weight    : isize,
     renderable: Renderable,
-    item_type : MenuItemType,
+    item_type : MegaMenuItemType,
 }
 
-impl ComponentTrait for MenuItem {
+impl ComponentTrait for MegaMenuItem {
     fn new() -> Self {
-        MenuItem::default()
+        MegaMenuItem::default()
     }
 
     fn handle(&self) -> Handle {
-        COMPONENT_MENUITEM
+        COMPONENT_MEGAMENUITEM
     }
 
     fn weight(&self) -> isize {
@@ -43,23 +43,23 @@ impl ComponentTrait for MenuItem {
 
     fn default_render(&self, rcx: &mut RenderContext) -> Markup {
         match self.item_type() {
-            MenuItemType::Void => html! {},
+            MegaMenuItemType::Void => html! {},
 
-            MenuItemType::Label(label) => html! {
+            MegaMenuItemType::Label(label) => html! {
                 li class="label" { a href="#" { (label) } }
             },
-            MenuItemType::Link(label, path) => html! {
+            MegaMenuItemType::Link(label, path) => html! {
                 li class="link" { a href=(path) { (label) } }
             },
-            MenuItemType::LinkBlank(label, path) => html! {
+            MegaMenuItemType::LinkBlank(label, path) => html! {
                 li class="link_blank" {
                     a href=(path) target="_blank" { (label) }
                 }
             },
-            MenuItemType::Html(html) => html! {
+            MegaMenuItemType::Html(html) => html! {
                 li class="html" { (*html) }
             },
-            MenuItemType::Submenu(label, menu) => html! {
+            MegaMenuItemType::Submenu(label, menu) => html! {
                 li class="submenu" {
                     a href="#" { (label) }
                     ul {
@@ -67,7 +67,7 @@ impl ComponentTrait for MenuItem {
                     }
                 }
             },
-            MenuItemType::Separator => html! {
+            MegaMenuItemType::Separator => html! {
                 li class="separator" { }
             },
         }
@@ -82,50 +82,50 @@ impl ComponentTrait for MenuItem {
     }
 }
 
-impl MenuItem {
+impl MegaMenuItem {
     pub fn label(label: &str) -> Self {
-        MenuItem {
-            item_type: MenuItemType::Label(label.to_owned()),
+        MegaMenuItem {
+            item_type: MegaMenuItemType::Label(label.to_owned()),
             ..Default::default()
         }
     }
 
     pub fn link(label: &str, path: &str) -> Self {
-        MenuItem {
-            item_type: MenuItemType::Link(label.to_owned(), path.to_owned()),
+        MegaMenuItem {
+            item_type: MegaMenuItemType::Link(label.to_owned(), path.to_owned()),
             ..Default::default()
         }
     }
 
     pub fn link_blank(label: &str, path: &str) -> Self {
-        MenuItem {
-            item_type: MenuItemType::LinkBlank(label.to_owned(), path.to_owned()),
+        MegaMenuItem {
+            item_type: MegaMenuItemType::LinkBlank(label.to_owned(), path.to_owned()),
             ..Default::default()
         }
     }
 
     pub fn html(html: Markup) -> Self {
-        MenuItem {
-            item_type: MenuItemType::Html(html),
+        MegaMenuItem {
+            item_type: MegaMenuItemType::Html(html),
             ..Default::default()
         }
     }
 
-    pub fn submenu(label: &str, menu: Menu) -> Self {
-        MenuItem {
-            item_type: MenuItemType::Submenu(label.to_owned(), menu),
+    pub fn submenu(label: &str, menu: MegaMenu) -> Self {
+        MegaMenuItem {
+            item_type: MegaMenuItemType::Submenu(label.to_owned(), menu),
             ..Default::default()
         }
     }
 
     pub fn separator() -> Self {
-        MenuItem {
-            item_type: MenuItemType::Separator,
+        MegaMenuItem {
+            item_type: MegaMenuItemType::Separator,
             ..Default::default()
         }
     }
 
-    // MenuItem BUILDER.
+    // MegaMenuItem BUILDER.
 
     #[fn_builder]
     pub fn alter_weight(&mut self, weight: isize) -> &mut Self {
@@ -139,22 +139,22 @@ impl MenuItem {
         self
     }
 
-    // MenuItem GETTERS.
+    // MegaMenuItem GETTERS.
 
-    pub fn item_type(&self) -> &MenuItemType {
+    pub fn item_type(&self) -> &MegaMenuItemType {
         &self.item_type
     }
 }
 
-// Menu.
+// MegaMenu.
 
-pub_handle!(COMPONENT_MENU);
+pub_handle!(COMPONENT_MEGAMENU);
 
-hook_before_render_component!(HOOK_BEFORE_RENDER_MENU, Menu);
+hook_before_render_component!(HOOK_BEFORE_RENDER_MENU, MegaMenu);
 
 #[rustfmt::skip]
 #[derive(Default)]
-pub struct Menu {
+pub struct MegaMenu {
     weight    : isize,
     renderable: Renderable,
     id        : IdentifierValue,
@@ -163,13 +163,13 @@ pub struct Menu {
     template  : String,
 }
 
-impl ComponentTrait for Menu {
+impl ComponentTrait for MegaMenu {
     fn new() -> Self {
-        Menu::default().with_classes(ClassesOp::SetDefault, "sm sm-clean")
+        MegaMenu::default().with_classes(ClassesOp::SetDefault, "sm sm-clean")
     }
 
     fn handle(&self) -> Handle {
-        COMPONENT_MENU
+        COMPONENT_MEGAMENU
     }
 
     fn weight(&self) -> isize {
@@ -186,17 +186,17 @@ impl ComponentTrait for Menu {
 
     fn default_render(&self, rcx: &mut RenderContext) -> Markup {
         rcx.alter(ContextOp::AddStyleSheet(
-            StyleSheet::located("/theme/menu/css/menu.css").with_version("1.1.1"),
-        ))
-        .alter(ContextOp::AddStyleSheet(
-            StyleSheet::located("/theme/menu/css/menu-clean.css").with_version("1.1.1"),
-        ))
-        .alter(ContextOp::AddJavaScript(
-            JavaScript::located("/theme/menu/js/menu.min.js").with_version("1.1.1"),
-        ))
-        .alter(ContextOp::AddJQuery);
+                StyleSheet::located("/megamenu/css/menu.css").with_version("1.1.1"),
+            ))
+            .alter(ContextOp::AddStyleSheet(
+                StyleSheet::located("/megamenu/css/menu-clean.css").with_version("1.1.1"),
+            ))
+            .alter(ContextOp::AddJavaScript(
+                JavaScript::located("/megamenu/js/menu.min.js").with_version("1.1.1"),
+            ));
+        pagetop_jquery::JQuery::add_jquery(rcx);
 
-        let id = rcx.required_id::<Menu>(self.id());
+        let id = rcx.required_id::<MegaMenu>(self.id());
 
         html! {
             ul id=(id) class=[self.classes().get()] {
@@ -220,8 +220,8 @@ impl ComponentTrait for Menu {
     }
 }
 
-impl Menu {
-    // Menu BUILDER.
+impl MegaMenu {
+    // MegaMenu BUILDER.
 
     #[fn_builder]
     pub fn alter_weight(&mut self, weight: isize) -> &mut Self {
@@ -248,7 +248,7 @@ impl Menu {
     }
 
     #[fn_builder]
-    pub fn alter_item(&mut self, item: MenuItem) -> &mut Self {
+    pub fn alter_item(&mut self, item: MegaMenuItem) -> &mut Self {
         self.items.add(item);
         self
     }
@@ -259,7 +259,7 @@ impl Menu {
         self
     }
 
-    // Menu GETTERS.
+    // MegaMenu GETTERS.
 
     pub fn id(&self) -> &IdentifierValue {
         &self.id

pagetop-megamenu/src/lib.rs

@@ -0,0 +1,23 @@
+use pagetop::prelude::*;
+
+pub mod component;
+
+pub_handle!(MODULE_MEGAMENU);
+
+include!(concat!(env!("OUT_DIR"), "/megamenu.rs"));
+
+pub struct MegaMenu;
+
+impl ModuleTrait for MegaMenu {
+    fn handle(&self) -> Handle {
+        MODULE_MEGAMENU
+    }
+
+    fn dependencies(&self) -> Vec<ModuleStaticRef> {
+        vec![&pagetop_jquery::JQuery]
+    }
+
+    fn configure_service(&self, cfg: &mut server::web::ServiceConfig) {
+        serve_static_files!(cfg, "/megamenu", bundle_megamenu);
+    }
+}

pagetop/src/base/component.rs

@@ -17,8 +17,6 @@ mod block;
 pub use block::{Block, COMPONENT_BLOCK};
 mod image;
 pub use image::{Image, COMPONENT_IMAGE};
-//mod menu;
-//pub use menu::{Menu, MenuItem, MenuItemType, COMPONENT_MENU, COMPONENT_MENUITEM};
 
 pub mod form_element;
 pub use form_element::{Form, FormMethod, COMPONENT_FORM};

pagetop/src/core/component/definition.rs

@@ -75,7 +75,7 @@ pub fn component_mut<C: 'static>(component: &mut dyn ComponentTrait) -> &mut C {
 #[macro_export]
 macro_rules! hook_before_render_component {
     ( $ACTION_HANDLE:ident, $Component:ty ) => {
-        paste::paste! {
+        $crate::paste! {
             $crate::pub_handle!($ACTION_HANDLE);
 
             type Action = fn(&$Component, &mut RenderContext);
@@ -127,7 +127,7 @@ macro_rules! hook_before_render_component {
             }
 
             #[inline(always)]
-            fn before_render_inline(component: &mut $Component, rcx: &mut RenderContext) {
+            pub fn before_render_inline(component: &mut $Component, rcx: &mut RenderContext) {
                 run_actions($ACTION_HANDLE, |action|
                     action_ref::<[< BeforeRender $Component >]>(&**action)
                         .run(component, rcx)

pagetop/src/lib.rs

@@ -42,6 +42,7 @@
 pub use concat_string::concat_string;
 pub use doc_comment::doc_comment;
 pub use once_cell::sync::Lazy as LazyStatic;
+pub use paste::paste;
 pub use tracing_unwrap::ResultExt;
 
 pub use pagetop_macros::fn_builder;

pagetop/src/prelude.rs

@@ -2,7 +2,7 @@
 pub use crate::{concat_string, fn_builder, LazyStatic, ResultExt};
 
 // Macros.
-pub use crate::{args, pub_config, pub_handle, pub_locale, serve_static_files};
+pub use crate::{args, paste, pub_config, pub_handle, pub_locale, serve_static_files};
 
 // Helpers.
 pub use crate::util;