🎨 Identifier to 4 letters for better composition
This commit is contained in:
parent
aed120f96d
commit
23309b4c84
17 changed files with 35 additions and 35 deletions
|
|
@ -9,8 +9,8 @@ impl ModuleTrait for HelloName {
|
||||||
APP_HELLO_NAME
|
APP_HELLO_NAME
|
||||||
}
|
}
|
||||||
|
|
||||||
fn configure_service(&self, cfg: &mut service::web::ServiceConfig) {
|
fn configure_service(&self, scfg: &mut service::web::ServiceConfig) {
|
||||||
cfg.service(hello_name);
|
scfg.service(hello_name);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -9,8 +9,8 @@ impl ModuleTrait for HelloWorld {
|
||||||
APP_HELLO_WORLD
|
APP_HELLO_WORLD
|
||||||
}
|
}
|
||||||
|
|
||||||
fn configure_service(&self, cfg: &mut service::web::ServiceConfig) {
|
fn configure_service(&self, scfg: &mut service::web::ServiceConfig) {
|
||||||
cfg.route("/", service::web::get().to(hello_world));
|
scfg.route("/", service::web::get().to(hello_world));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -33,8 +33,8 @@ impl ModuleTrait for Admin {
|
||||||
vec![action!(ActionBeforePrepareBody => before_prepare_body)]
|
vec![action!(ActionBeforePrepareBody => before_prepare_body)]
|
||||||
}
|
}
|
||||||
|
|
||||||
fn configure_service(&self, cfg: &mut service::web::ServiceConfig) {
|
fn configure_service(&self, scfg: &mut service::web::ServiceConfig) {
|
||||||
cfg.service(
|
scfg.service(
|
||||||
service::web::scope("/admin").route("", service::web::get().to(summary::summary)),
|
service::web::scope("/admin").route("", service::web::get().to(summary::summary)),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -15,8 +15,8 @@ impl ModuleTrait for Aliner {
|
||||||
Some(&Aliner)
|
Some(&Aliner)
|
||||||
}
|
}
|
||||||
|
|
||||||
fn configure_service(&self, cfg: &mut service::web::ServiceConfig) {
|
fn configure_service(&self, scfg: &mut service::web::ServiceConfig) {
|
||||||
serve_static_files!(cfg, "/aliner", aliner);
|
serve_static_files!(scfg, "/aliner", aliner);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -22,8 +22,8 @@ impl ModuleTrait for Bootsier {
|
||||||
vec![&pagetop_jquery::JQuery]
|
vec![&pagetop_jquery::JQuery]
|
||||||
}
|
}
|
||||||
|
|
||||||
fn configure_service(&self, cfg: &mut service::web::ServiceConfig) {
|
fn configure_service(&self, scfg: &mut service::web::ServiceConfig) {
|
||||||
serve_static_files!(cfg, "/bootsier", bootsier);
|
serve_static_files!(scfg, "/bootsier", bootsier);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -25,8 +25,8 @@ impl ModuleTrait for Bulmix {
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|
||||||
fn configure_service(&self, cfg: &mut service::web::ServiceConfig) {
|
fn configure_service(&self, scfg: &mut service::web::ServiceConfig) {
|
||||||
serve_static_files!(cfg, "/bulmix", bulmix);
|
serve_static_files!(scfg, "/bulmix", bulmix);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -26,9 +26,9 @@ impl ModuleTrait for HomeDemo {
|
||||||
vec![&pagetop_minimal::Minimal]
|
vec![&pagetop_minimal::Minimal]
|
||||||
}
|
}
|
||||||
|
|
||||||
fn configure_service(&self, cfg: &mut service::web::ServiceConfig) {
|
fn configure_service(&self, scfg: &mut service::web::ServiceConfig) {
|
||||||
serve_static_files!(cfg, "/homedemo", homedemo);
|
serve_static_files!(scfg, "/homedemo", homedemo);
|
||||||
cfg.route("/", service::web::get().to(demo));
|
scfg.route("/", service::web::get().to(demo));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -32,8 +32,8 @@ impl ModuleTrait for JQuery {
|
||||||
vec![action!(ActionAfterPrepareBody => after_prepare_body)]
|
vec![action!(ActionAfterPrepareBody => after_prepare_body)]
|
||||||
}
|
}
|
||||||
|
|
||||||
fn configure_service(&self, cfg: &mut service::web::ServiceConfig) {
|
fn configure_service(&self, scfg: &mut service::web::ServiceConfig) {
|
||||||
serve_static_files!(cfg, "/jquery", jquery);
|
serve_static_files!(scfg, "/jquery", jquery);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -32,7 +32,7 @@ impl ModuleTrait for MegaMenu {
|
||||||
vec![&pagetop_jquery::JQuery]
|
vec![&pagetop_jquery::JQuery]
|
||||||
}
|
}
|
||||||
|
|
||||||
fn configure_service(&self, cfg: &mut service::web::ServiceConfig) {
|
fn configure_service(&self, scfg: &mut service::web::ServiceConfig) {
|
||||||
serve_static_files!(cfg, "/megamenu", megamenu);
|
serve_static_files!(scfg, "/megamenu", megamenu);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -33,8 +33,8 @@ impl ModuleTrait for Minimal {
|
||||||
vec![action!(ActionAfterPrepareBody => after_prepare_body, 99)]
|
vec![action!(ActionAfterPrepareBody => after_prepare_body, 99)]
|
||||||
}
|
}
|
||||||
|
|
||||||
fn configure_service(&self, cfg: &mut service::web::ServiceConfig) {
|
fn configure_service(&self, scfg: &mut service::web::ServiceConfig) {
|
||||||
serve_static_files!(cfg, "/minimal", minimal);
|
serve_static_files!(scfg, "/minimal", minimal);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -22,8 +22,8 @@ impl ModuleTrait for Node {
|
||||||
L10n::t("module_description", &LOCALES_NODE)
|
L10n::t("module_description", &LOCALES_NODE)
|
||||||
}
|
}
|
||||||
|
|
||||||
fn configure_service(&self, cfg: &mut service::web::ServiceConfig) {
|
fn configure_service(&self, scfg: &mut service::web::ServiceConfig) {
|
||||||
cfg.route("/node", service::web::get().to(node));
|
scfg.route("/node", service::web::get().to(node));
|
||||||
}
|
}
|
||||||
|
|
||||||
fn actions(&self) -> Vec<Action> {
|
fn actions(&self) -> Vec<Action> {
|
||||||
|
|
|
||||||
|
|
@ -26,8 +26,8 @@ impl ModuleTrait for User {
|
||||||
vec![&pagetop_minimal::Minimal]
|
vec![&pagetop_minimal::Minimal]
|
||||||
}
|
}
|
||||||
|
|
||||||
fn configure_service(&self, cfg: &mut service::web::ServiceConfig) {
|
fn configure_service(&self, scfg: &mut service::web::ServiceConfig) {
|
||||||
cfg.route("/user/login", service::web::get().to(login));
|
scfg.route("/user/login", service::web::get().to(login));
|
||||||
}
|
}
|
||||||
|
|
||||||
fn migrations(&self) -> Vec<MigrationItem> {
|
fn migrations(&self) -> Vec<MigrationItem> {
|
||||||
|
|
|
||||||
|
|
@ -142,8 +142,8 @@ pub fn run_migrations() {
|
||||||
|
|
||||||
// CONFIGURE SERVICES ******************************************************************************
|
// 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() {
|
for m in ENABLED_MODULES.read().unwrap().iter() {
|
||||||
m.configure_service(cfg);
|
m.configure_service(scfg);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -49,7 +49,7 @@ pub trait ModuleTrait: ModuleBase + Send + Sync {
|
||||||
}
|
}
|
||||||
|
|
||||||
#[allow(unused_variables)]
|
#[allow(unused_variables)]
|
||||||
fn configure_service(&self, cfg: &mut service::web::ServiceConfig) {}
|
fn configure_service(&self, scfg: &mut service::web::ServiceConfig) {}
|
||||||
}
|
}
|
||||||
|
|
||||||
impl<M: ?Sized + ModuleTrait> ModuleBase for M {
|
impl<M: ?Sized + ModuleTrait> ModuleBase for M {
|
||||||
|
|
|
||||||
|
|
@ -25,8 +25,8 @@ impl ModuleTrait for DefaultTheme {
|
||||||
Some(&DefaultTheme)
|
Some(&DefaultTheme)
|
||||||
}
|
}
|
||||||
|
|
||||||
fn configure_service(&self, cfg: &mut service::web::ServiceConfig) {
|
fn configure_service(&self, scfg: &mut service::web::ServiceConfig) {
|
||||||
serve_static_files!(cfg, "/theme", theme);
|
serve_static_files!(scfg, "/theme", theme);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -53,8 +53,8 @@
|
||||||
//! APP_HELLO_WORLD
|
//! APP_HELLO_WORLD
|
||||||
//! }
|
//! }
|
||||||
//!
|
//!
|
||||||
//! fn configure_service(&self, cfg: &mut service::web::ServiceConfig) {
|
//! fn configure_service(&self, scfg: &mut service::web::ServiceConfig) {
|
||||||
//! cfg.route("/", service::web::get().to(hello_world));
|
//! scfg.route("/", service::web::get().to(hello_world));
|
||||||
//! }
|
//! }
|
||||||
//! }
|
//! }
|
||||||
//!
|
//!
|
||||||
|
|
|
||||||
|
|
@ -175,16 +175,16 @@ macro_rules! static_files {
|
||||||
|
|
||||||
#[macro_export]
|
#[macro_export]
|
||||||
macro_rules! serve_static_files {
|
macro_rules! serve_static_files {
|
||||||
( $cfg:ident, $path:expr, $bundle:ident ) => {{
|
( $scfg:ident, $path:expr, $bundle:ident ) => {{
|
||||||
$crate::paste! {
|
$crate::paste! {
|
||||||
let static_files = &$crate::config::SETTINGS.dev.static_files;
|
let static_files = &$crate::config::SETTINGS.dev.static_files;
|
||||||
if static_files.is_empty() {
|
if static_files.is_empty() {
|
||||||
$cfg.service($crate::service::ResourceFiles::new(
|
$scfg.service($crate::service::ResourceFiles::new(
|
||||||
$path,
|
$path,
|
||||||
[<static_files_ $bundle>]::$bundle(),
|
[<static_files_ $bundle>]::$bundle(),
|
||||||
));
|
));
|
||||||
} else {
|
} else {
|
||||||
$cfg.service(
|
$scfg.service(
|
||||||
$crate::service::ActixFiles::new(
|
$crate::service::ActixFiles::new(
|
||||||
$path,
|
$path,
|
||||||
$crate::concat_string!(static_files, $path),
|
$crate::concat_string!(static_files, $path),
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue