diff --git a/Cargo.toml b/Cargo.toml index 8cfaeb70..81b9a99a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "pagetop" -version = "0.0.55" +version = "0.0.56" edition = "2021" description = "An opinionated web framework to build modular Server-Side Rendering web solutions." @@ -36,8 +36,8 @@ itoa = "1.0.11" nom = "7.1.3" paste = "1.0.15" substring = "1.4.5" -term_size = "0.3.2" -toml = "0.8.16" +terminal_size = "0.3.0" +toml = "0.8.19" tracing = "0.1.40" tracing-appender = "0.2.3" @@ -48,7 +48,7 @@ fluent-templates = "0.9.4" unic-langid = { version = "0.9.5", features = ["macros"] } actix-web = "4" -actix-session = { version = "0.9.0", features = ["cookie-session"] } +actix-session = { version = "0.10.0", features = ["cookie-session"] } actix-web-files = { package = "actix-files", version = "0.6.6" } actix-web-static-files = "4.0.1" diff --git a/src/app.rs b/src/app.rs index 06e5df1d..a9bc6246 100644 --- a/src/app.rs +++ b/src/app.rs @@ -61,12 +61,14 @@ impl Application { // Displays the application banner based on the configuration. fn show_banner() { + use terminal_size::{terminal_size, Width}; + if config::SETTINGS.app.startup_banner.to_lowercase() != "off" { // Application name, formatted for the terminal width if necessary. let mut app_name = config::SETTINGS.app.name.to_string(); - if let Some((term_width, _)) = term_size::dimensions() { + if let Some((Width(term_width), _)) = terminal_size() { if term_width >= 80 { - let maxlen = (term_width / 10) - 2; + let maxlen: usize = ((term_width / 10) - 2).into(); let mut app = app_name.substring(0, maxlen).to_owned(); if app_name.len() > maxlen { app = format!("{app}..."); diff --git a/src/base/theme/basic.rs b/src/base/theme/basic.rs index 8a0c94e5..af66ffaf 100644 --- a/src/base/theme/basic.rs +++ b/src/base/theme/basic.rs @@ -14,9 +14,9 @@ impl PackageTrait for Basic { impl ThemeTrait for Basic { fn after_prepare_body(&self, page: &mut Page) { - page.set_assets(AssetsOp::SetFavicon( - Some(Favicon::new().with_icon("/base/favicon.ico")), - )) + page.set_assets(AssetsOp::SetFavicon(Some( + Favicon::new().with_icon("/base/favicon.ico"), + ))) .set_assets(AssetsOp::AddStyleSheet( StyleSheet::from("/base/css/normalize.min.css") .with_version("8.0.1") diff --git a/src/base/theme/chassis.rs b/src/base/theme/chassis.rs index 94353e42..2776154e 100644 --- a/src/base/theme/chassis.rs +++ b/src/base/theme/chassis.rs @@ -14,9 +14,9 @@ impl PackageTrait for Chassis { impl ThemeTrait for Chassis { fn after_prepare_body(&self, page: &mut Page) { - page.set_assets(AssetsOp::SetFavicon( - Some(Favicon::new().with_icon("/base/favicon.ico")), - )) + page.set_assets(AssetsOp::SetFavicon(Some( + Favicon::new().with_icon("/base/favicon.ico"), + ))) .set_assets(AssetsOp::AddStyleSheet( StyleSheet::from("/base/css/normalize.min.css") .with_version("8.0.1") diff --git a/src/base/theme/inception.rs b/src/base/theme/inception.rs index 4d493c02..b786bcea 100644 --- a/src/base/theme/inception.rs +++ b/src/base/theme/inception.rs @@ -14,9 +14,9 @@ impl PackageTrait for Inception { impl ThemeTrait for Inception { fn after_prepare_body(&self, page: &mut Page) { - page.set_assets(AssetsOp::SetFavicon( - Some(Favicon::new().with_icon("/base/favicon.ico")), - )) + page.set_assets(AssetsOp::SetFavicon(Some( + Favicon::new().with_icon("/base/favicon.ico"), + ))) .set_assets(AssetsOp::AddStyleSheet( StyleSheet::from("/base/css/normalize.min.css") .with_version("8.0.1")