👽️ Apply last Handle API changes

drust/src/main.rs

@@ -1,14 +1,10 @@
 use pagetop::prelude::*;
 
-new_handle!(APP_DRUST);
-
 struct Drust;
 
-impl ModuleTrait for Drust {
+impl_handle!(APP_DRUST for Drust);
-    fn handle(&self) -> Handle {
-        APP_DRUST
-    }
 
+impl ModuleTrait for Drust {
     fn dependencies(&self) -> Vec<ModuleRef> {
         vec![
             // Themes.

examples/basics/hello-name/src/main.rs

@@ -1,14 +1,10 @@
 use pagetop::prelude::*;
 
-new_handle!(APP_HELLO_NAME);
-
 struct HelloName;
 
-impl ModuleTrait for HelloName {
+impl_handle!(APP_HELLO_NAME for HelloName);
-    fn handle(&self) -> Handle {
-        APP_HELLO_NAME
-    }
 
+impl ModuleTrait for HelloName {
     fn configure_service(&self, scfg: &mut service::web::ServiceConfig) {
         scfg.service(hello_name);
     }

examples/basics/hello-world/src/main.rs

@@ -1,14 +1,10 @@
 use pagetop::prelude::*;
 
-new_handle!(APP_HELLO_WORLD);
-
 struct HelloWorld;
 
-impl ModuleTrait for HelloWorld {
+impl_handle!(APP_HELLO_WORLD for HelloWorld);
-    fn handle(&self) -> Handle {
-        APP_HELLO_WORLD
-    }
 
+impl ModuleTrait for HelloWorld {
     fn configure_service(&self, scfg: &mut service::web::ServiceConfig) {
         scfg.route("/", service::web::get().to(hello_world));
     }

pagetop-admin/src/lib.rs

@@ -1,18 +1,14 @@
 use pagetop::prelude::*;
 
-new_handle!(MODULE_ADMIN);
-
 new_static_locales!(LOCALES_ADMIN);
 
 mod summary;
 
 pub struct Admin;
 
-impl ModuleTrait for Admin {
+impl_handle!(MODULE_ADMIN for Admin);
-    fn handle(&self) -> Handle {
-        MODULE_ADMIN
-    }
 
+impl ModuleTrait for Admin {
     fn name(&self) -> L10n {
         L10n::t("module_name", &LOCALES_ADMIN)
     }

pagetop-bootsier/src/lib.rs

@@ -1,18 +1,14 @@
 use pagetop::prelude::*;
 
-new_handle!(THEME_BOOTSIER);
-
 new_static_locales!(LOCALES_BOOTSIER);
 
 new_static_files!(bootsier);
 
 pub struct Bootsier;
 
-impl ModuleTrait for Bootsier {
+impl_handle!(THEME_BOOTSIER for Bootsier);
-    fn handle(&self) -> Handle {
-        THEME_BOOTSIER
-    }
 
+impl ModuleTrait for Bootsier {
     fn theme(&self) -> Option<ThemeRef> {
         Some(&Bootsier)
     }
@@ -108,8 +104,8 @@ impl ThemeTrait for Bootsier {
                     _ => {}
                 };
             }
-            COMPONENT_BASE_ANCHOR => {
+            COMPONENT_BASE_BUTTON => {
-                let a = component_as_mut::<Anchor>(component);
+                let a = component_as_mut::<Button>(component);
                 match a.font_size() {
                     FontSize::ExtraLarge => {
                         a.alter_classes(ClassesOp::Replace(a.font_size().to_string()), "fs-1");
@@ -128,6 +124,20 @@ impl ThemeTrait for Bootsier {
                     }
                     _ => {}
                 };
+                match a.anchor_type() {
+                    ButtonType::Link => {
+                        a.alter_classes(
+                            ClassesOp::Replace(a.anchor_type().to_string()),
+                            "btn btn-link",
+                        );
+                    }
+                    ButtonType::Primary => {
+                        a.alter_classes(
+                            ClassesOp::Replace(a.anchor_type().to_string()),
+                            "btn btn-primary",
+                        );
+                    }
+                }
             }
             COMPONENT_BASE_HEADING => {
                 let h = component_as_mut::<Heading>(component);

pagetop-bulmix/src/lib.rs

@@ -1,16 +1,12 @@
 use pagetop::prelude::*;
 
-new_handle!(THEME_BULMIX);
-
 new_static_files!(bulmix);
 
 pub struct Bulmix;
 
-impl ModuleTrait for Bulmix {
+impl_handle!(THEME_BULMIX for Bulmix);
-    fn handle(&self) -> Handle {
-        THEME_BULMIX
-    }
 
+impl ModuleTrait for Bulmix {
     fn theme(&self) -> Option<ThemeRef> {
         Some(&Bulmix)
     }

pagetop-homedemo/src/lib.rs

@@ -1,18 +1,14 @@
 use pagetop::prelude::*;
 
-new_handle!(MODULE_HOMEDEMO);
-
 new_static_locales!(LOCALES_HOMEDEMO);
 
 new_static_files!(homedemo);
 
 pub struct HomeDemo;
 
-impl ModuleTrait for HomeDemo {
+impl_handle!(MODULE_HOMEDEMO for HomeDemo);
-    fn handle(&self) -> Handle {
-        MODULE_HOMEDEMO
-    }
 
+impl ModuleTrait for HomeDemo {
     fn name(&self) -> L10n {
         L10n::t("module_name", &LOCALES_HOMEDEMO)
     }

pagetop-node/src/lib.rs

@@ -1,7 +1,5 @@
 use pagetop::prelude::*;
 
-new_handle!(MODULE_NODE);
-
 new_static_locales!(LOCALES_NODE);
 
 //mod entity;
@@ -9,11 +7,9 @@ mod migration;
 
 pub struct Node;
 
-impl ModuleTrait for Node {
+impl_handle!(MODULE_NODE for Node);
-    fn handle(&self) -> Handle {
-        MODULE_NODE
-    }
 
+impl ModuleTrait for Node {
     fn name(&self) -> L10n {
         L10n::t("module_name", &LOCALES_NODE)
     }

pagetop-user/src/lib.rs

@@ -1,18 +1,14 @@
 use pagetop::prelude::*;
 
-new_handle!(MODULE_USER);
-
 new_static_locales!(LOCALES_USER);
 
 mod migration;
 
 pub struct User;
 
-impl ModuleTrait for User {
+impl_handle!(MODULE_USER for User);
-    fn handle(&self) -> Handle {
-        MODULE_USER
-    }
 
+impl ModuleTrait for User {
     fn name(&self) -> L10n {
         L10n::t("module_name", &LOCALES_USER)
     }

pagetop/tests/server/health_check.rs

@@ -1,14 +1,10 @@
 use pagetop::prelude::*;
 
-new_handle!(MODULE_TEST_SERVER_HEALTH_CHECK);
-
 struct HealthCheck;
 
-impl ModuleTrait for HealthCheck {
+impl_handle!(MODULE_TEST_SERVER_HEALTH_CHECK for HealthCheck);
-    fn handle(&self) -> Handle {
+
-        MODULE_TEST_SERVER_HEALTH_CHECK
+impl ModuleTrait for HealthCheck {}
-    }
-}
 
 #[pagetop::test]
 async fn health_check_works() {