From ee6457acf6f384f36e4a740c2d8e65c6ee7806aa Mon Sep 17 00:00:00 2001 From: Manuel Cillero Date: Mon, 29 Jun 2026 20:41:06 +0200 Subject: [PATCH] =?UTF-8?q?=F0=9F=94=A7=20Adapta=20ejemplos=20a=20la=20nue?= =?UTF-8?q?va=20estructura=20de=20`bs::`?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- examples/form-controls.rs | 28 ++++++----- examples/navbar-menus.rs | 97 ++++++++++++++++++++++----------------- 2 files changed, 68 insertions(+), 57 deletions(-) diff --git a/examples/form-controls.rs b/examples/form-controls.rs index 172de633..4c16b619 100644 --- a/examples/form-controls.rs +++ b/examples/form-controls.rs @@ -1,6 +1,4 @@ use pagetop::prelude::*; - -use pagetop_bootsier::theme::form; use pagetop_bootsier::theme::*; include_locales!(LOC from "examples/locale"); @@ -145,18 +143,18 @@ async fn form_controls(request: HttpRequest) -> Result { ) // Botones de acción. .with_child(Button::submit(L10n::t("btn_submit", &LOC)).with_prop( - PropsOp::add_classes(classes::ButtonColor::solid( - Color::Primary, + PropsOp::add_classes(class::ButtonColor::solid( + token::Color::Primary, )), )) .with_child(Button::reset(L10n::t("btn_reset", &LOC)).with_prop( - PropsOp::add_classes(classes::ButtonColor::outline( - Color::Secondary, + PropsOp::add_classes(class::ButtonColor::outline( + token::Color::Secondary, )), )) .with_child( Button::plain(L10n::t("btn_cancel", &LOC)).with_prop( - PropsOp::add_classes(classes::ButtonColor::link()), + PropsOp::add_classes(class::ButtonColor::link()), ), ), ), @@ -269,18 +267,18 @@ async fn form_controls(request: HttpRequest) -> Result { ) // Botones de acción. .with_child(Button::submit(L10n::t("btn_submit", &LOC)).with_prop( - PropsOp::add_classes(classes::ButtonColor::solid( - Color::Primary, + PropsOp::add_classes(class::ButtonColor::solid( + token::Color::Primary, )), )) .with_child(Button::reset(L10n::t("btn_reset", &LOC)).with_prop( - PropsOp::add_classes(classes::ButtonColor::outline( - Color::Secondary, + PropsOp::add_classes(class::ButtonColor::outline( + token::Color::Secondary, )), )) .with_child( Button::plain(L10n::t("btn_cancel", &LOC)).with_prop( - PropsOp::add_classes(classes::ButtonColor::link()), + PropsOp::add_classes(class::ButtonColor::link()), ), ), ), @@ -423,17 +421,17 @@ fn form_lists() -> Form { // Botones de acción. .with_child( Button::submit(L10n::t("btn_submit", &LOC)).with_prop(PropsOp::add_classes( - classes::ButtonColor::solid(Color::Primary), + class::ButtonColor::solid(token::Color::Primary), )), ) .with_child( Button::reset(L10n::t("btn_reset", &LOC)).with_prop(PropsOp::add_classes( - classes::ButtonColor::outline(Color::Secondary), + class::ButtonColor::outline(token::Color::Secondary), )), ) .with_child( Button::plain(L10n::t("btn_cancel", &LOC)) - .with_prop(PropsOp::add_classes(classes::ButtonColor::link())), + .with_prop(PropsOp::add_classes(class::ButtonColor::link())), ) } diff --git a/examples/navbar-menus.rs b/examples/navbar-menus.rs index 06c4ed36..025a75b3 100644 --- a/examples/navbar-menus.rs +++ b/examples/navbar-menus.rs @@ -1,5 +1,4 @@ use pagetop::prelude::*; - use pagetop_bootsier::theme::*; include_locales!(LOC from "examples/locale"); @@ -16,84 +15,98 @@ impl Extension for SuperMenu { } fn initialize(&self) { - let navbar_menu = Navbar::brand_left(navbar::Brand::new()) - .with_expand(BreakPoint::LG) - .with_item(navbar::Item::nav( - Nav::new() - .with_item(nav::Item::link(L10n::t("menus_item_link", &LOC), |cx| { - cx.route("/") - })) - .with_item(nav::Item::link_blank( + let navbar_menu = bs::Navbar::brand_left(bs::navbar::Brand::new()) + .with_expand(token::BreakPoint::LG) + .with_item(bs::navbar::Item::nav( + bs::Nav::new() + .with_item(bs::nav::Item::link( + L10n::t("menus_item_link", &LOC), + |cx| cx.route("/"), + )) + .with_item(bs::nav::Item::link_blank( L10n::t("menus_item_blank", &LOC), |_| "https://docs.rs/pagetop".into(), )) - .with_item(nav::Item::dropdown( - Dropdown::new() + .with_item(bs::nav::Item::dropdown( + bs::Dropdown::new() .with_title(L10n::t("menus_test_title", &LOC)) - .with_item(dropdown::Item::header(L10n::t("menus_dev_header", &LOC))) - .with_item(dropdown::Item::link( + .with_item(bs::dropdown::Item::header(L10n::t( + "menus_dev_header", + &LOC, + ))) + .with_item(bs::dropdown::Item::link( L10n::t("menus_dev_getting_started", &LOC), |cx| cx.route("/dev/getting-started"), )) - .with_item(dropdown::Item::link( + .with_item(bs::dropdown::Item::link( L10n::t("menus_dev_guides", &LOC), |cx| cx.route("/dev/guides"), )) - .with_item(dropdown::Item::link_blank( + .with_item(bs::dropdown::Item::link_blank( L10n::t("menus_dev_forum", &LOC), |_| "https://forum.example.dev".into(), )) - .with_item(dropdown::Item::divider()) - .with_item(dropdown::Item::header(L10n::t("menus_sdk_header", &LOC))) - .with_item(dropdown::Item::link( + .with_item(bs::dropdown::Item::divider()) + .with_item(bs::dropdown::Item::header(L10n::t( + "menus_sdk_header", + &LOC, + ))) + .with_item(bs::dropdown::Item::link( L10n::t("menus_sdk_rust", &LOC), |cx| cx.route("/dev/sdks/rust"), )) - .with_item(dropdown::Item::link(L10n::t("menus_sdk_js", &LOC), |cx| { - cx.route("/dev/sdks/js") - })) - .with_item(dropdown::Item::link( + .with_item(bs::dropdown::Item::link( + L10n::t("menus_sdk_js", &LOC), + |cx| cx.route("/dev/sdks/js"), + )) + .with_item(bs::dropdown::Item::link( L10n::t("menus_sdk_python", &LOC), |cx| cx.route("/dev/sdks/python"), )) - .with_item(dropdown::Item::divider()) - .with_item(dropdown::Item::header(L10n::t("menus_plugin_header", &LOC))) - .with_item(dropdown::Item::link( + .with_item(bs::dropdown::Item::divider()) + .with_item(bs::dropdown::Item::header(L10n::t( + "menus_plugin_header", + &LOC, + ))) + .with_item(bs::dropdown::Item::link( L10n::t("menus_plugin_auth", &LOC), |cx| cx.route("/dev/sdks/rust/plugins/auth"), )) - .with_item(dropdown::Item::link( + .with_item(bs::dropdown::Item::link( L10n::t("menus_plugin_cache", &LOC), |cx| cx.route("/dev/sdks/rust/plugins/cache"), )) - .with_item(dropdown::Item::divider()) - .with_item(dropdown::Item::label(L10n::t("menus_item_label", &LOC))) - .with_item(dropdown::Item::link_disabled( + .with_item(bs::dropdown::Item::divider()) + .with_item(bs::dropdown::Item::label(L10n::t("menus_item_label", &LOC))) + .with_item(bs::dropdown::Item::link_disabled( L10n::t("menus_item_disabled", &LOC), |cx| cx.route("#"), )), )) - .with_item(nav::Item::link_disabled( + .with_item(bs::nav::Item::link_disabled( L10n::t("menus_item_disabled", &LOC), |cx| cx.route("#"), )), )) - .with_item(navbar::Item::nav( - Nav::new() - .with_prop(PropsOp::add_classes( - classes::Margin::with(Side::Start, ScaleSize::Auto).to_class(), + .with_item(bs::navbar::Item::nav( + bs::Nav::new() + .with_prop(PropsOp::add_classes(class::Margin::with( + token::Side::Start, + token::ScaleSize::Auto, + ))) + .with_item(bs::nav::Item::link( + L10n::t("menus_item_sign_up", &LOC), + |cx| cx.route("/auth/sign-up"), )) - .with_item(nav::Item::link(L10n::t("menus_item_sign_up", &LOC), |cx| { - cx.route("/auth/sign-up") - })) - .with_item(nav::Item::link(L10n::t("menus_item_login", &LOC), |cx| { - cx.route("/auth/login") - })), + .with_item(bs::nav::Item::link( + L10n::t("menus_item_login", &LOC), + |cx| cx.route("/auth/login"), + )), )); InRegion::Global(&DefaultRegion::Header).add( - Container::new() - .with_width(container::Width::FluidMax(UnitValue::RelRem(75.0))) + bs::Container::new() + .with_width(bs::container::Width::FluidMax(UnitValue::RelRem(75.0))) .with_child(navbar_menu), ); }