diff --git a/Cargo.lock b/Cargo.lock index 20087bf..b3cb7b2 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1569,7 +1569,7 @@ checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" [[package]] name = "pagetop" -version = "0.0.14" +version = "0.0.13" dependencies = [ "actix-files", "actix-session", @@ -1582,7 +1582,6 @@ dependencies = [ "figlet-rs", "fluent-templates", "itoa", - "pagetop-build", "pagetop-macros", "parking_lot", "pastey", diff --git a/Cargo.toml b/Cargo.toml index 476168d..87b7f69 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "pagetop" -version = "0.0.14" +version = "0.0.13" edition = "2021" description = """\ @@ -42,7 +42,7 @@ static-files.workspace = true serde = { version = "1.0", features = ["derive"] } -pagetop-macros.workspace = true +pagetop-macros = { version = "0.0", path = "helpers/pagetop-macros" } [features] default = [] @@ -51,8 +51,6 @@ testing = [] [dev-dependencies] tempfile = "3.20.0" -[build-dependencies] -pagetop-build.workspace = true [workspace] @@ -70,6 +68,3 @@ authors = ["Manuel Cillero "] [workspace.dependencies] static-files = "0.2.5" - -pagetop-build = { version = "0.0", path = "helpers/pagetop-build" } -pagetop-macros = { version = "0.0", path = "helpers/pagetop-macros" } diff --git a/build.rs b/build.rs deleted file mode 100644 index 85e02e0..0000000 --- a/build.rs +++ /dev/null @@ -1,7 +0,0 @@ -use pagetop_build::StaticFilesBundle; - -fn main() -> std::io::Result<()> { - StaticFilesBundle::from_dir("./static", None) - .with_name("assets") - .build() -} diff --git a/helpers/pagetop-build/src/lib.rs b/helpers/pagetop-build/src/lib.rs index b0a13f3..e125c59 100644 --- a/helpers/pagetop-build/src/lib.rs +++ b/helpers/pagetop-build/src/lib.rs @@ -230,9 +230,15 @@ impl StaticFilesBundle { // Guarda el archivo CSS compilado en el directorio temporal. let css_path = temp_dir.join(target_name); File::create(&css_path) - .unwrap_or_else(|_| panic!("Failed to create CSS file `{}`", css_path.display())) + .expect(&format!( + "Failed to create CSS file `{}`", + css_path.display() + )) .write_all(css_content.as_bytes()) - .unwrap_or_else(|_| panic!("Failed to write CSS content to `{}`", css_path.display())); + .expect(&format!( + "Failed to write CSS content to `{}`", + css_path.display() + )); // Identifica el directorio temporal de recursos. StaticFilesBundle { diff --git a/src/core/extension/all.rs b/src/core/extension/all.rs index f061044..d5c452a 100644 --- a/src/core/extension/all.rs +++ b/src/core/extension/all.rs @@ -1,7 +1,7 @@ use crate::core::action::add_action; use crate::core::extension::ExtensionRef; use crate::core::theme::all::THEMES; -use crate::{global, include_files, include_files_service, service, trace}; +use crate::{/*global, include_files, include_files_service, */ service, trace}; use parking_lot::RwLock; @@ -125,13 +125,13 @@ pub fn initialize_extensions() { // CONFIGURA LOS SERVICIOS ************************************************************************* -include_files!(assets); +//include_files!(assets); pub fn configure_services(scfg: &mut service::web::ServiceConfig) { for extension in ENABLED_EXTENSIONS.read().iter() { extension.configure_service(scfg); } - include_files_service!( + /*include_files_service!( scfg, assets => "/", [&global::SETTINGS.dev.pagetop_project_dir, "static"] - ); + );*/ } diff --git a/src/global.rs b/src/global.rs index faa9c2f..3f78b50 100644 --- a/src/global.rs +++ b/src/global.rs @@ -12,9 +12,6 @@ include_config!(SETTINGS: Settings => [ "app.language" => "en-US", "app.startup_banner" => "Slant", - // [dev] - "dev.pagetop_project_dir" => "", - // [log] "log.enabled" => true, "log.tracing" => "Info", @@ -30,11 +27,10 @@ include_config!(SETTINGS: Settings => [ ]); #[derive(Debug, Deserialize)] -/// Ajustes para las secciones globales [`[app]`](App), [`[dev]`](Dev), [`[log]`](Log) y -/// [`[server]`](Server) de [`SETTINGS`]. +/// Ajustes para las secciones globales [`[app]`](App), [`[log]`](Log) y [`[server]`](Server) de +/// [`SETTINGS`]. pub struct Settings { pub app: App, - pub dev: Dev, pub log: Log, pub server: Server, } @@ -58,16 +54,6 @@ pub struct App { pub run_mode: String, } -#[derive(Debug, Deserialize)] -/// Sección `[Dev]` de la configuración. Forma parte de [`Settings`]. -pub struct Dev { - /// Los archivos estáticos requeridos por `PageTop` se integran por defecto en el binario - /// ejecutable. Sin embargo, durante el desarrollo puede resultar útil servirlos desde su propio - /// directorio para evitar recompilar cada vez que se modifican. En ese caso, este ajuste debe - /// indicar la ruta absoluta al directorio raíz del proyecto. - pub pagetop_project_dir: String, -} - #[derive(Debug, Deserialize)] /// Sección `[log]` de la configuración. Forma parte de [`Settings`]. pub struct Log { diff --git a/src/service.rs b/src/service.rs index 68c8d5d..6897a43 100644 --- a/src/service.rs +++ b/src/service.rs @@ -9,9 +9,6 @@ pub use actix_web::dev::ServiceResponse as Response; pub use actix_web::{cookie, http, rt, web}; pub use actix_web::{App, Error, HttpMessage, HttpRequest, HttpResponse, HttpServer}; -pub use actix_web_files::Files as ActixFiles; -pub use actix_web_static_files::ResourceFiles; - #[doc(hidden)] pub use actix_web::test;