diff --git a/examples/basics/hello-name/src/main.rs b/examples/basics/hello-name/src/main.rs index f5a2d46b..0af7c2d0 100644 --- a/examples/basics/hello-name/src/main.rs +++ b/examples/basics/hello-name/src/main.rs @@ -9,8 +9,8 @@ impl ModuleTrait for HelloName { APP_HELLO_NAME } - fn configure_service(&self, cfg: &mut service::web::ServiceConfig) { - cfg.service(hello_name); + fn configure_service(&self, scfg: &mut service::web::ServiceConfig) { + scfg.service(hello_name); } } diff --git a/examples/basics/hello-world/src/main.rs b/examples/basics/hello-world/src/main.rs index 905d4b76..176c7304 100644 --- a/examples/basics/hello-world/src/main.rs +++ b/examples/basics/hello-world/src/main.rs @@ -9,8 +9,8 @@ impl ModuleTrait for HelloWorld { APP_HELLO_WORLD } - fn configure_service(&self, cfg: &mut service::web::ServiceConfig) { - cfg.route("/", service::web::get().to(hello_world)); + fn configure_service(&self, scfg: &mut service::web::ServiceConfig) { + scfg.route("/", service::web::get().to(hello_world)); } } diff --git a/pagetop-admin/src/lib.rs b/pagetop-admin/src/lib.rs index 351cd7cf..da8946b3 100644 --- a/pagetop-admin/src/lib.rs +++ b/pagetop-admin/src/lib.rs @@ -33,8 +33,8 @@ impl ModuleTrait for Admin { vec![action!(ActionBeforePrepareBody => before_prepare_body)] } - fn configure_service(&self, cfg: &mut service::web::ServiceConfig) { - cfg.service( + fn configure_service(&self, scfg: &mut service::web::ServiceConfig) { + scfg.service( service::web::scope("/admin").route("", service::web::get().to(summary::summary)), ); } diff --git a/pagetop-aliner/src/lib.rs b/pagetop-aliner/src/lib.rs index 303096ef..6b056f7b 100644 --- a/pagetop-aliner/src/lib.rs +++ b/pagetop-aliner/src/lib.rs @@ -15,8 +15,8 @@ impl ModuleTrait for Aliner { Some(&Aliner) } - fn configure_service(&self, cfg: &mut service::web::ServiceConfig) { - serve_static_files!(cfg, "/aliner", aliner); + fn configure_service(&self, scfg: &mut service::web::ServiceConfig) { + serve_static_files!(scfg, "/aliner", aliner); } } diff --git a/pagetop-bootsier/src/lib.rs b/pagetop-bootsier/src/lib.rs index d8067b24..f9f6dd6e 100644 --- a/pagetop-bootsier/src/lib.rs +++ b/pagetop-bootsier/src/lib.rs @@ -22,8 +22,8 @@ impl ModuleTrait for Bootsier { vec![&pagetop_jquery::JQuery] } - fn configure_service(&self, cfg: &mut service::web::ServiceConfig) { - serve_static_files!(cfg, "/bootsier", bootsier); + fn configure_service(&self, scfg: &mut service::web::ServiceConfig) { + serve_static_files!(scfg, "/bootsier", bootsier); } } diff --git a/pagetop-bulmix/src/lib.rs b/pagetop-bulmix/src/lib.rs index 4467cdb5..680389c8 100644 --- a/pagetop-bulmix/src/lib.rs +++ b/pagetop-bulmix/src/lib.rs @@ -25,8 +25,8 @@ impl ModuleTrait for Bulmix { ] } - fn configure_service(&self, cfg: &mut service::web::ServiceConfig) { - serve_static_files!(cfg, "/bulmix", bulmix); + fn configure_service(&self, scfg: &mut service::web::ServiceConfig) { + serve_static_files!(scfg, "/bulmix", bulmix); } } diff --git a/pagetop-homedemo/src/lib.rs b/pagetop-homedemo/src/lib.rs index 79ec44f4..d37c575e 100644 --- a/pagetop-homedemo/src/lib.rs +++ b/pagetop-homedemo/src/lib.rs @@ -26,9 +26,9 @@ impl ModuleTrait for HomeDemo { vec![&pagetop_minimal::Minimal] } - fn configure_service(&self, cfg: &mut service::web::ServiceConfig) { - serve_static_files!(cfg, "/homedemo", homedemo); - cfg.route("/", service::web::get().to(demo)); + fn configure_service(&self, scfg: &mut service::web::ServiceConfig) { + serve_static_files!(scfg, "/homedemo", homedemo); + scfg.route("/", service::web::get().to(demo)); } } diff --git a/pagetop-jquery/src/lib.rs b/pagetop-jquery/src/lib.rs index efda4aa8..0a4c81b4 100644 --- a/pagetop-jquery/src/lib.rs +++ b/pagetop-jquery/src/lib.rs @@ -32,8 +32,8 @@ impl ModuleTrait for JQuery { vec![action!(ActionAfterPrepareBody => after_prepare_body)] } - fn configure_service(&self, cfg: &mut service::web::ServiceConfig) { - serve_static_files!(cfg, "/jquery", jquery); + fn configure_service(&self, scfg: &mut service::web::ServiceConfig) { + serve_static_files!(scfg, "/jquery", jquery); } } diff --git a/pagetop-megamenu/src/lib.rs b/pagetop-megamenu/src/lib.rs index 749dc6b1..df4848c6 100644 --- a/pagetop-megamenu/src/lib.rs +++ b/pagetop-megamenu/src/lib.rs @@ -32,7 +32,7 @@ impl ModuleTrait for MegaMenu { vec![&pagetop_jquery::JQuery] } - fn configure_service(&self, cfg: &mut service::web::ServiceConfig) { - serve_static_files!(cfg, "/megamenu", megamenu); + fn configure_service(&self, scfg: &mut service::web::ServiceConfig) { + serve_static_files!(scfg, "/megamenu", megamenu); } } diff --git a/pagetop-minimal/src/lib.rs b/pagetop-minimal/src/lib.rs index 99965875..dd029f20 100644 --- a/pagetop-minimal/src/lib.rs +++ b/pagetop-minimal/src/lib.rs @@ -33,8 +33,8 @@ impl ModuleTrait for Minimal { vec![action!(ActionAfterPrepareBody => after_prepare_body, 99)] } - fn configure_service(&self, cfg: &mut service::web::ServiceConfig) { - serve_static_files!(cfg, "/minimal", minimal); + fn configure_service(&self, scfg: &mut service::web::ServiceConfig) { + serve_static_files!(scfg, "/minimal", minimal); } } diff --git a/pagetop-node/src/lib.rs b/pagetop-node/src/lib.rs index c83f71d1..ec21ab8c 100644 --- a/pagetop-node/src/lib.rs +++ b/pagetop-node/src/lib.rs @@ -22,8 +22,8 @@ impl ModuleTrait for Node { L10n::t("module_description", &LOCALES_NODE) } - fn configure_service(&self, cfg: &mut service::web::ServiceConfig) { - cfg.route("/node", service::web::get().to(node)); + fn configure_service(&self, scfg: &mut service::web::ServiceConfig) { + scfg.route("/node", service::web::get().to(node)); } fn actions(&self) -> Vec { diff --git a/pagetop-user/src/lib.rs b/pagetop-user/src/lib.rs index 7ec57e4c..b497063a 100644 --- a/pagetop-user/src/lib.rs +++ b/pagetop-user/src/lib.rs @@ -26,8 +26,8 @@ impl ModuleTrait for User { vec![&pagetop_minimal::Minimal] } - fn configure_service(&self, cfg: &mut service::web::ServiceConfig) { - cfg.route("/user/login", service::web::get().to(login)); + fn configure_service(&self, scfg: &mut service::web::ServiceConfig) { + scfg.route("/user/login", service::web::get().to(login)); } fn migrations(&self) -> Vec { diff --git a/pagetop/src/core/module/all.rs b/pagetop/src/core/module/all.rs index 4bd8b530..1eeb653b 100644 --- a/pagetop/src/core/module/all.rs +++ b/pagetop/src/core/module/all.rs @@ -142,8 +142,8 @@ pub fn run_migrations() { // CONFIGURE SERVICES ****************************************************************************** -pub fn configure_services(cfg: &mut service::web::ServiceConfig) { +pub fn configure_services(scfg: &mut service::web::ServiceConfig) { for m in ENABLED_MODULES.read().unwrap().iter() { - m.configure_service(cfg); + m.configure_service(scfg); } } diff --git a/pagetop/src/core/module/definition.rs b/pagetop/src/core/module/definition.rs index deaa3c7f..76c0a5b5 100644 --- a/pagetop/src/core/module/definition.rs +++ b/pagetop/src/core/module/definition.rs @@ -49,7 +49,7 @@ pub trait ModuleTrait: ModuleBase + Send + Sync { } #[allow(unused_variables)] - fn configure_service(&self, cfg: &mut service::web::ServiceConfig) {} + fn configure_service(&self, scfg: &mut service::web::ServiceConfig) {} } impl ModuleBase for M { diff --git a/pagetop/src/core/theme/default.rs b/pagetop/src/core/theme/default.rs index 523fab9e..71f696d7 100644 --- a/pagetop/src/core/theme/default.rs +++ b/pagetop/src/core/theme/default.rs @@ -25,8 +25,8 @@ impl ModuleTrait for DefaultTheme { Some(&DefaultTheme) } - fn configure_service(&self, cfg: &mut service::web::ServiceConfig) { - serve_static_files!(cfg, "/theme", theme); + fn configure_service(&self, scfg: &mut service::web::ServiceConfig) { + serve_static_files!(scfg, "/theme", theme); } } diff --git a/pagetop/src/lib.rs b/pagetop/src/lib.rs index e9186e64..f6aec646 100644 --- a/pagetop/src/lib.rs +++ b/pagetop/src/lib.rs @@ -53,8 +53,8 @@ //! APP_HELLO_WORLD //! } //! -//! fn configure_service(&self, cfg: &mut service::web::ServiceConfig) { -//! cfg.route("/", service::web::get().to(hello_world)); +//! fn configure_service(&self, scfg: &mut service::web::ServiceConfig) { +//! scfg.route("/", service::web::get().to(hello_world)); //! } //! } //! diff --git a/pagetop/src/util.rs b/pagetop/src/util.rs index 89a38392..ef9dc818 100644 --- a/pagetop/src/util.rs +++ b/pagetop/src/util.rs @@ -175,16 +175,16 @@ macro_rules! static_files { #[macro_export] macro_rules! serve_static_files { - ( $cfg:ident, $path:expr, $bundle:ident ) => {{ + ( $scfg:ident, $path:expr, $bundle:ident ) => {{ $crate::paste! { let static_files = &$crate::config::SETTINGS.dev.static_files; if static_files.is_empty() { - $cfg.service($crate::service::ResourceFiles::new( + $scfg.service($crate::service::ResourceFiles::new( $path, []::$bundle(), )); } else { - $cfg.service( + $scfg.service( $crate::service::ActixFiles::new( $path, $crate::concat_string!(static_files, $path),