From 7d06cdec19ebd1f2a46b3c44c00d5334fde87e0a Mon Sep 17 00:00:00 2001 From: Manuel Cillero Date: Fri, 13 May 2022 18:59:33 +0200 Subject: [PATCH] =?UTF-8?q?Actualiza=20estructura=20de=20archivos=20a=20nu?= =?UTF-8?q?eva=20edici=C3=B3n?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/{migration/mod.rs => migration.rs} | 0 .../src/{migration/mod.rs => migration.rs} | 0 pagetop/src/{base/mod.rs => base.rs} | 0 .../base/{component/mod.rs => component.rs} | 0 .../base/component/{form/mod.rs => form.rs} | 0 .../base/component/{grid/mod.rs => grid.rs} | 0 pagetop/src/base/{module/mod.rs => module.rs} | 0 .../module/{demopage/mod.rs => demopage.rs} | 0 pagetop/src/base/{theme/mod.rs => theme.rs} | 0 .../base/theme/{aliner/mod.rs => aliner.rs} | 0 .../theme/{bootsier/mod.rs => bootsier.rs} | 0 .../base/theme/{bulmix/mod.rs => bulmix.rs} | 0 .../base/theme/{minimal/mod.rs => minimal.rs} | 0 pagetop/src/{core/mod.rs => core.rs} | 0 pagetop/src/core/{app/mod.rs => app.rs} | 0 .../src/core/app/{banner/mod.rs => banner.rs} | 31 ++----------------- pagetop/src/core/app/banner/figfont.rs | 30 ++++++++++++++++++ .../core/{component/mod.rs => component.rs} | 0 pagetop/src/core/{hook/mod.rs => hook.rs} | 0 pagetop/src/core/{module/mod.rs => module.rs} | 0 pagetop/src/core/{theme/mod.rs => theme.rs} | 0 pagetop/src/{html/mod.rs => html.rs} | 0 pagetop/src/{response/mod.rs => response.rs} | 0 pagetop/src/response/{page/mod.rs => page.rs} | 4 +-- .../response/page/{page.rs => definition.rs} | 0 25 files changed, 35 insertions(+), 30 deletions(-) rename pagetop-node/src/{migration/mod.rs => migration.rs} (100%) rename pagetop-user/src/{migration/mod.rs => migration.rs} (100%) rename pagetop/src/{base/mod.rs => base.rs} (100%) rename pagetop/src/base/{component/mod.rs => component.rs} (100%) rename pagetop/src/base/component/{form/mod.rs => form.rs} (100%) rename pagetop/src/base/component/{grid/mod.rs => grid.rs} (100%) rename pagetop/src/base/{module/mod.rs => module.rs} (100%) rename pagetop/src/base/module/{demopage/mod.rs => demopage.rs} (100%) rename pagetop/src/base/{theme/mod.rs => theme.rs} (100%) rename pagetop/src/base/theme/{aliner/mod.rs => aliner.rs} (100%) rename pagetop/src/base/theme/{bootsier/mod.rs => bootsier.rs} (100%) rename pagetop/src/base/theme/{bulmix/mod.rs => bulmix.rs} (100%) rename pagetop/src/base/theme/{minimal/mod.rs => minimal.rs} (100%) rename pagetop/src/{core/mod.rs => core.rs} (100%) rename pagetop/src/core/{app/mod.rs => app.rs} (100%) rename pagetop/src/core/app/{banner/mod.rs => banner.rs} (52%) create mode 100644 pagetop/src/core/app/banner/figfont.rs rename pagetop/src/core/{component/mod.rs => component.rs} (100%) rename pagetop/src/core/{hook/mod.rs => hook.rs} (100%) rename pagetop/src/core/{module/mod.rs => module.rs} (100%) rename pagetop/src/core/{theme/mod.rs => theme.rs} (100%) rename pagetop/src/{html/mod.rs => html.rs} (100%) rename pagetop/src/{response/mod.rs => response.rs} (100%) rename pagetop/src/response/{page/mod.rs => page.rs} (66%) rename pagetop/src/response/page/{page.rs => definition.rs} (100%) diff --git a/pagetop-node/src/migration/mod.rs b/pagetop-node/src/migration.rs similarity index 100% rename from pagetop-node/src/migration/mod.rs rename to pagetop-node/src/migration.rs diff --git a/pagetop-user/src/migration/mod.rs b/pagetop-user/src/migration.rs similarity index 100% rename from pagetop-user/src/migration/mod.rs rename to pagetop-user/src/migration.rs diff --git a/pagetop/src/base/mod.rs b/pagetop/src/base.rs similarity index 100% rename from pagetop/src/base/mod.rs rename to pagetop/src/base.rs diff --git a/pagetop/src/base/component/mod.rs b/pagetop/src/base/component.rs similarity index 100% rename from pagetop/src/base/component/mod.rs rename to pagetop/src/base/component.rs diff --git a/pagetop/src/base/component/form/mod.rs b/pagetop/src/base/component/form.rs similarity index 100% rename from pagetop/src/base/component/form/mod.rs rename to pagetop/src/base/component/form.rs diff --git a/pagetop/src/base/component/grid/mod.rs b/pagetop/src/base/component/grid.rs similarity index 100% rename from pagetop/src/base/component/grid/mod.rs rename to pagetop/src/base/component/grid.rs diff --git a/pagetop/src/base/module/mod.rs b/pagetop/src/base/module.rs similarity index 100% rename from pagetop/src/base/module/mod.rs rename to pagetop/src/base/module.rs diff --git a/pagetop/src/base/module/demopage/mod.rs b/pagetop/src/base/module/demopage.rs similarity index 100% rename from pagetop/src/base/module/demopage/mod.rs rename to pagetop/src/base/module/demopage.rs diff --git a/pagetop/src/base/theme/mod.rs b/pagetop/src/base/theme.rs similarity index 100% rename from pagetop/src/base/theme/mod.rs rename to pagetop/src/base/theme.rs diff --git a/pagetop/src/base/theme/aliner/mod.rs b/pagetop/src/base/theme/aliner.rs similarity index 100% rename from pagetop/src/base/theme/aliner/mod.rs rename to pagetop/src/base/theme/aliner.rs diff --git a/pagetop/src/base/theme/bootsier/mod.rs b/pagetop/src/base/theme/bootsier.rs similarity index 100% rename from pagetop/src/base/theme/bootsier/mod.rs rename to pagetop/src/base/theme/bootsier.rs diff --git a/pagetop/src/base/theme/bulmix/mod.rs b/pagetop/src/base/theme/bulmix.rs similarity index 100% rename from pagetop/src/base/theme/bulmix/mod.rs rename to pagetop/src/base/theme/bulmix.rs diff --git a/pagetop/src/base/theme/minimal/mod.rs b/pagetop/src/base/theme/minimal.rs similarity index 100% rename from pagetop/src/base/theme/minimal/mod.rs rename to pagetop/src/base/theme/minimal.rs diff --git a/pagetop/src/core/mod.rs b/pagetop/src/core.rs similarity index 100% rename from pagetop/src/core/mod.rs rename to pagetop/src/core.rs diff --git a/pagetop/src/core/app/mod.rs b/pagetop/src/core/app.rs similarity index 100% rename from pagetop/src/core/app/mod.rs rename to pagetop/src/core/app.rs diff --git a/pagetop/src/core/app/banner/mod.rs b/pagetop/src/core/app/banner.rs similarity index 52% rename from pagetop/src/core/app/banner/mod.rs rename to pagetop/src/core/app/banner.rs index 1cce7146..a4dfd5b3 100644 --- a/pagetop/src/core/app/banner/mod.rs +++ b/pagetop/src/core/app/banner.rs @@ -1,35 +1,10 @@ -use crate::Lazy; +mod figfont; +use figfont::FIGFONT; + use crate::config::SETTINGS; -use figlet_rs::FIGfont; use substring::Substring; -static FIGFONT: Lazy = Lazy::new(|| { - let slant = include_str!("slant.flf"); - let small = include_str!("small.flf"); - let speed = include_str!("speed.flf"); - let starwars = include_str!("starwars.flf"); - - FIGfont::from_content( - match SETTINGS.app.startup_banner.to_lowercase().as_str() { - "off" => slant, - "slant" => slant, - "small" => small, - "speed" => speed, - "starwars" => starwars, - _ => { - println!( - "\n FIGfont \"{}\" not found for banner. {}. {}.", - SETTINGS.app.startup_banner, - "Using \"Slant\"", - "Check the settings file", - ); - slant - } - } - ).unwrap() -}); - pub fn print_on_startup() { if SETTINGS.app.startup_banner.to_lowercase() != "off" { if let Some((term_width, _)) = term_size::dimensions() { diff --git a/pagetop/src/core/app/banner/figfont.rs b/pagetop/src/core/app/banner/figfont.rs new file mode 100644 index 00000000..8fe0a4e7 --- /dev/null +++ b/pagetop/src/core/app/banner/figfont.rs @@ -0,0 +1,30 @@ +use crate::Lazy; +use crate::config::SETTINGS; + +use figlet_rs::FIGfont; + +pub static FIGFONT: Lazy = Lazy::new(|| { + let slant = include_str!("slant.flf"); + let small = include_str!("small.flf"); + let speed = include_str!("speed.flf"); + let starwars = include_str!("starwars.flf"); + + FIGfont::from_content( + match SETTINGS.app.startup_banner.to_lowercase().as_str() { + "off" => slant, + "slant" => slant, + "small" => small, + "speed" => speed, + "starwars" => starwars, + _ => { + println!( + "\n FIGfont \"{}\" not found for banner. {}. {}.", + SETTINGS.app.startup_banner, + "Using \"Slant\"", + "Check the settings file", + ); + slant + } + } + ).unwrap() +}); diff --git a/pagetop/src/core/component/mod.rs b/pagetop/src/core/component.rs similarity index 100% rename from pagetop/src/core/component/mod.rs rename to pagetop/src/core/component.rs diff --git a/pagetop/src/core/hook/mod.rs b/pagetop/src/core/hook.rs similarity index 100% rename from pagetop/src/core/hook/mod.rs rename to pagetop/src/core/hook.rs diff --git a/pagetop/src/core/module/mod.rs b/pagetop/src/core/module.rs similarity index 100% rename from pagetop/src/core/module/mod.rs rename to pagetop/src/core/module.rs diff --git a/pagetop/src/core/theme/mod.rs b/pagetop/src/core/theme.rs similarity index 100% rename from pagetop/src/core/theme/mod.rs rename to pagetop/src/core/theme.rs diff --git a/pagetop/src/html/mod.rs b/pagetop/src/html.rs similarity index 100% rename from pagetop/src/html/mod.rs rename to pagetop/src/html.rs diff --git a/pagetop/src/response/mod.rs b/pagetop/src/response.rs similarity index 100% rename from pagetop/src/response/mod.rs rename to pagetop/src/response.rs diff --git a/pagetop/src/response/page/mod.rs b/pagetop/src/response/page.rs similarity index 66% rename from pagetop/src/response/page/mod.rs rename to pagetop/src/response/page.rs index 82c5d7da..5f517471 100644 --- a/pagetop/src/response/page/mod.rs +++ b/pagetop/src/response/page.rs @@ -4,5 +4,5 @@ pub use hook::{ BeforeRenderPageHook, }; -mod page; -pub use page::Page; +mod definition; +pub use definition::Page; diff --git a/pagetop/src/response/page/page.rs b/pagetop/src/response/page/definition.rs similarity index 100% rename from pagetop/src/response/page/page.rs rename to pagetop/src/response/page/definition.rs