diff --git a/pagetop-minimal/src/component.rs b/pagetop-minimal/src/component.rs index 222993aa..1aeef5fb 100644 --- a/pagetop-minimal/src/component.rs +++ b/pagetop-minimal/src/component.rs @@ -15,6 +15,8 @@ mod image; pub use image::{Image, COMPONENT_IMAGE}; mod block; pub use block::{Block, COMPONENT_BLOCK}; +mod poweredby; +pub use poweredby::{PoweredBy, PoweredByLogo, COMPONENT_POWEREDBY}; pub mod form_element; pub use form_element::{Form, FormMethod, COMPONENT_FORM}; diff --git a/pagetop-minimal/src/component/block.rs b/pagetop-minimal/src/component/block.rs index ad8c9047..26de537f 100644 --- a/pagetop-minimal/src/component/block.rs +++ b/pagetop-minimal/src/component/block.rs @@ -46,9 +46,9 @@ impl ComponentTrait for Block { PrepareMarkup::With(html! { div id=(id) class=[self.classes().get()] { @if let Some(title) = self.title().get() { - h2 class="block__title" { (title) } + h2 class="block-title" { (title) } } - div class="block__body" { + div class="block-body" { (self.components().prepare(cx)) } } diff --git a/pagetop-minimal/src/component/poweredby.rs b/pagetop-minimal/src/component/poweredby.rs new file mode 100644 index 00000000..e50f3b3c --- /dev/null +++ b/pagetop-minimal/src/component/poweredby.rs @@ -0,0 +1,143 @@ +use crate::{Minimal, LOCALES_MINIMAL}; + +use pagetop::prelude::*; + +create_handle!(COMPONENT_POWEREDBY); + +#[derive(Default, Eq, PartialEq)] +pub enum PoweredByLogo { + #[default] + None, + Color, + LineDark, + LineLight, + Line(u8, u8, u8), +} + +#[rustfmt::skip] +#[derive(Default)] +pub struct PoweredBy { + weight : Weight, + renderable: Renderable, + copyright : Option, + logo : PoweredByLogo, +} + +impl ComponentTrait for PoweredBy { + fn new() -> Self { + let year = Utc::now().format("%Y").to_string(); + let c = concat_string!(year, " © ", config::SETTINGS.app.name); + PoweredBy { + copyright: Some(c), + ..Default::default() + } + } + + fn handle(&self) -> Handle { + COMPONENT_POWEREDBY + } + + fn id(&self) -> Option { + Some("poweredby".to_owned()) + } + + fn weight(&self) -> Weight { + self.weight + } + + fn is_renderable(&self, cx: &Context) -> bool { + (self.renderable.check)(cx) + } + + fn prepare_component(&self, cx: &mut Context) -> PrepareMarkup { + Minimal.load_assets(cx); + + let mut credits = L10n::e("poweredby_pagetop", &LOCALES_MINIMAL).with_arg( + "pagetop_link", + "PageTop", + ); + + let logo = match self.logo() { + PoweredByLogo::Color => { + let logo_txt = L10n::t("pagetop_logo", &LOCALES_MINIMAL); + html! { + (" ") + span class="pagetop-logo" aria-label=[logo_txt.into_string(cx)] { + img src="/minimal/pagetop-logo.svg" alt=[logo_txt.into_string(cx)] {} + } + } + } + PoweredByLogo::LineDark => self.logo_line(10, 11, 9, cx), + PoweredByLogo::LineLight => self.logo_line(255, 255, 255, cx), + PoweredByLogo::Line(r, g, b) => self.logo_line(*r, *g, *b, cx), + _ => html! {}, + }; + + PrepareMarkup::With(html! { + div id=[self.id()] { + @if let Some(c) = self.copyright() { + span class="copyright" { (c) (".") } (" ") + } + span class="powered" { (credits.prepare(cx)) (logo) } + } + }) + } +} + +impl PoweredBy { + // PoweredBy BUILDER. + + #[fn_builder] + pub fn alter_weight(&mut self, value: Weight) -> &mut Self { + self.weight = value; + self + } + + #[fn_builder] + pub fn alter_renderable(&mut self, check: IsRenderable) -> &mut Self { + self.renderable.check = check; + self + } + + #[fn_builder] + pub fn alter_copyright(&mut self, copyright: Option>) -> &mut Self { + self.copyright = match copyright { + Some(c) => Some(c.into()), + _ => None, + }; + self + } + + #[fn_builder] + pub fn alter_logo(&mut self, logo: PoweredByLogo) -> &mut Self { + self.logo = logo; + self + } + + // PoweredBy GETTERS. + + pub fn copyright(&self) -> &Option { + &self.copyright + } + + pub fn logo(&self) -> &PoweredByLogo { + &self.logo + } + + // PoweredBy PRIVATE. + + fn logo_line(&self, r: u8, g: u8, b: u8, cx: &mut Context) -> Markup { + let logo_txt = L10n::t("pagetop_logo", &LOCALES_MINIMAL); + let logo_rgb = format!("rgb({},{},{})", r, g, b); + html! { + (" ") + span class="pagetop-logo" aria-label=[logo_txt.into_string(cx)] { + svg viewBox="0 0 1614 1614" xmlns="http://www.w3.org/2000/svg" role="img" { + path fill=(logo_rgb) d="M 1573,357 L 1415,357 C 1400,357 1388,369 1388,383 L 1388,410 1335,410 1335,357 C 1335,167 1181,13 992,13 L 621,13 C 432,13 278,167 278,357 L 278,410 225,410 225,383 C 225,369 213,357 198,357 L 40,357 C 25,357 13,369 13,383 L 13,648 C 13,662 25,674 40,674 L 198,674 C 213,674 225,662 225,648 L 225,621 278,621 278,1256 C 278,1446 432,1600 621,1600 L 992,1600 C 1181,1600 1335,1446 1335,1256 L 1335,621 1388,621 1388,648 C 1388,662 1400,674 1415,674 L 1573,674 C 1588,674 1600,662 1600,648 L 1600,383 C 1600,369 1588,357 1573,357 L 1573,357 1573,357 Z M 66,410 L 172,410 172,621 66,621 66,410 66,410 Z M 1282,357 L 1282,488 C 1247,485 1213,477 1181,464 L 1196,437 C 1203,425 1199,409 1186,401 1174,394 1158,398 1150,411 L 1133,440 C 1105,423 1079,401 1056,376 L 1075,361 C 1087,352 1089,335 1079,324 1070,313 1054,311 1042,320 L 1023,335 C 1000,301 981,263 967,221 L 1011,196 C 1023,189 1028,172 1021,160 1013,147 997,143 984,150 L 953,168 C 945,136 941,102 940,66 L 992,66 C 1152,66 1282,197 1282,357 L 1282,357 1282,357 Z M 621,66 L 674,66 674,225 648,225 C 633,225 621,237 621,251 621,266 633,278 648,278 L 674,278 674,357 648,357 C 633,357 621,369 621,383 621,398 633,410 648,410 L 674,410 674,489 648,489 C 633,489 621,501 621,516 621,530 633,542 648,542 L 664,542 C 651,582 626,623 600,662 583,653 563,648 542,648 469,648 410,707 410,780 410,787 411,794 412,801 388,805 361,806 331,806 L 331,357 C 331,197 461,66 621,66 L 621,66 621,66 Z M 621,780 C 621,824 586,859 542,859 498,859 463,824 463,780 463,736 498,701 542,701 586,701 621,736 621,780 L 621,780 621,780 Z M 225,463 L 278,463 278,569 225,569 225,463 225,463 Z M 992,1547 L 621,1547 C 461,1547 331,1416 331,1256 L 331,859 C 367,859 400,858 431,851 454,888 495,912 542,912 615,912 674,853 674,780 674,747 662,718 642,695 675,645 706,594 720,542 L 780,542 C 795,542 807,530 807,516 807,501 795,489 780,489 L 727,489 727,410 780,410 C 795,410 807,398 807,383 807,369 795,357 780,357 L 727,357 727,278 780,278 C 795,278 807,266 807,251 807,237 795,225 780,225 L 727,225 727,66 887,66 C 889,111 895,155 905,196 L 869,217 C 856,224 852,240 859,253 864,261 873,266 882,266 887,266 891,265 895,263 L 921,248 C 937,291 958,331 983,367 L 938,403 C 926,412 925,429 934,440 939,447 947,450 954,450 960,450 966,448 971,444 L 1016,408 C 1043,438 1074,465 1108,485 L 1084,527 C 1076,539 1081,555 1093,563 1098,565 1102,566 1107,566 1116,566 1125,561 1129,553 L 1155,509 C 1194,527 1237,538 1282,541 L 1282,1256 C 1282,1416 1152,1547 992,1547 L 992,1547 992,1547 Z M 1335,463 L 1388,463 1388,569 1335,569 1335,463 1335,463 Z M 1441,410 L 1547,410 1547,621 1441,621 1441,410 1441,410 Z" {} + path fill=(logo_rgb) d="M 1150,1018 L 463,1018 C 448,1018 436,1030 436,1044 L 436,1177 C 436,1348 545,1468 701,1468 L 912,1468 C 1068,1468 1177,1348 1177,1177 L 1177,1044 C 1177,1030 1165,1018 1150,1018 L 1150,1018 1150,1018 Z M 912,1071 L 1018,1071 1018,1124 912,1124 912,1071 912,1071 Z M 489,1071 L 542,1071 542,1124 489,1124 489,1071 489,1071 Z M 701,1415 L 700,1415 C 701,1385 704,1352 718,1343 731,1335 759,1341 795,1359 802,1363 811,1363 818,1359 854,1341 882,1335 895,1343 909,1352 912,1385 913,1415 L 912,1415 701,1415 701,1415 701,1415 Z M 1124,1177 C 1124,1296 1061,1384 966,1408 964,1365 958,1320 922,1298 894,1281 856,1283 807,1306 757,1283 719,1281 691,1298 655,1320 649,1365 647,1408 552,1384 489,1296 489,1177 L 569,1177 C 583,1177 595,1165 595,1150 L 595,1071 859,1071 859,1150 C 859,1165 871,1177 886,1177 L 1044,1177 C 1059,1177 1071,1165 1071,1150 L 1071,1071 1124,1071 1124,1177 1124,1177 1124,1177 Z" {} + path fill=(logo_rgb) d="M 1071,648 C 998,648 939,707 939,780 939,853 998,912 1071,912 1144,912 1203,853 1203,780 1203,707 1144,648 1071,648 L 1071,648 1071,648 Z M 1071,859 C 1027,859 992,824 992,780 992,736 1027,701 1071,701 1115,701 1150,736 1150,780 1150,824 1115,859 1071,859 L 1071,859 1071,859 Z" {} + } + } + } + } +} diff --git a/pagetop-minimal/src/lib.rs b/pagetop-minimal/src/lib.rs index b0d14ac3..37ecd1a4 100644 --- a/pagetop-minimal/src/lib.rs +++ b/pagetop-minimal/src/lib.rs @@ -1,12 +1,19 @@ use pagetop::prelude::*; pub mod component; -pub mod module; create_handle!(MODULE_MINIMAL); +static_locales!(LOCALES_MINIMAL); + static_files!(minimal); +// Library version. +const VERSION_MINIMAL: &str = env!("CARGO_PKG_VERSION"); + +// Context parameter. +const PARAM_MINIMAL_ASSETS: &str = "minimal.assets"; + pub struct Minimal; impl ModuleTrait for Minimal { @@ -14,7 +21,35 @@ impl ModuleTrait for Minimal { MODULE_MINIMAL } + fn name(&self) -> L10n { + L10n::t("module_name", &LOCALES_MINIMAL) + } + + fn description(&self) -> L10n { + L10n::t("module_description", &LOCALES_MINIMAL) + } + + fn actions(&self) -> Vec { + vec![action!(ActionAfterPrepareBody => after_prepare_body, 99)] + } + fn configure_service(&self, cfg: &mut service::web::ServiceConfig) { serve_static_files!(cfg, "/minimal", minimal); } } + +impl Minimal { + pub(crate) fn load_assets(&self, cx: &mut Context) -> &Self { + cx.set_param::(PARAM_MINIMAL_ASSETS, true); + self + } +} + +fn after_prepare_body(page: &mut Page) { + if let Some(true) = page.context().get_param::(PARAM_MINIMAL_ASSETS) { + page.context().alter(ContextOp::AddStyleSheet( + StyleSheet::at("/minimal/css/minimal.css") + .with_version(VERSION_MINIMAL) + )); + } +} diff --git a/pagetop-minimal/src/locale/en-US/module.ftl b/pagetop-minimal/src/locale/en-US/module.ftl new file mode 100644 index 00000000..28ef3779 --- /dev/null +++ b/pagetop-minimal/src/locale/en-US/module.ftl @@ -0,0 +1,6 @@ +module_name = Minimal components +module_description = Minimal set of components for page composition. + +# PoweredBy component. +poweredby_pagetop = Powered by {$pagetop_link} +pagetop_logo = PageTop logo diff --git a/pagetop-minimal/src/locale/es-ES/module.ftl b/pagetop-minimal/src/locale/es-ES/module.ftl new file mode 100644 index 00000000..3eeb46df --- /dev/null +++ b/pagetop-minimal/src/locale/es-ES/module.ftl @@ -0,0 +1,6 @@ +module_name = Componentes Minimal +module_description = Conjunto mínimo de componentes para la composición de páginas. + +# PoweredBy component. +poweredby_pagetop = Funciona con {$pagetop_link} +pagetop_logo = Logotipo de PageTop diff --git a/pagetop-minimal/src/module.rs b/pagetop-minimal/src/module.rs deleted file mode 100644 index b9a0e3e0..00000000 --- a/pagetop-minimal/src/module.rs +++ /dev/null @@ -1 +0,0 @@ -pub mod menu; diff --git a/pagetop-minimal/src/module/menu.rs b/pagetop-minimal/src/module/menu.rs deleted file mode 100644 index 49ed13d7..00000000 --- a/pagetop-minimal/src/module/menu.rs +++ /dev/null @@ -1,21 +0,0 @@ -use pagetop::prelude::*; - -create_handle!(MODULE_MENU); - -static_locales!(LOCALES_MENU in "src/module/menu/locales"); - -pub struct Menu; - -impl ModuleTrait for Menu { - fn handle(&self) -> Handle { - MODULE_MENU - } - - fn name(&self) -> L10n { - L10n::t("module_name", &LOCALES_MENU) - } - - fn description(&self) -> L10n { - L10n::t("module_description", &LOCALES_MENU) - } -} diff --git a/pagetop-minimal/src/module/menu/locales/en-US/menu.ftl b/pagetop-minimal/src/module/menu/locales/en-US/menu.ftl deleted file mode 100644 index b35e9677..00000000 --- a/pagetop-minimal/src/module/menu/locales/en-US/menu.ftl +++ /dev/null @@ -1,2 +0,0 @@ -module_name = Menu -module_description = ... diff --git a/pagetop-minimal/src/module/menu/locales/es-ES/menu.ftl b/pagetop-minimal/src/module/menu/locales/es-ES/menu.ftl deleted file mode 100644 index a36de8ac..00000000 --- a/pagetop-minimal/src/module/menu/locales/es-ES/menu.ftl +++ /dev/null @@ -1,2 +0,0 @@ -module_name = Menú -module_description = ... diff --git a/pagetop-minimal/static/css/minimal.css b/pagetop-minimal/static/css/minimal.css new file mode 100644 index 00000000..8f674cbf --- /dev/null +++ b/pagetop-minimal/static/css/minimal.css @@ -0,0 +1,10 @@ +/* PoweredBy component */ +#poweredby { + text-align: center; +} +#poweredby .pagetop-logo img, +#poweredby .pagetop-logo svg { + margin-left: .275em; + height: 1.275em; + vertical-align: middle; +} diff --git a/pagetop-minimal/static/pagetop-logo.svg b/pagetop-minimal/static/pagetop-logo.svg new file mode 100644 index 00000000..3666bf3a --- /dev/null +++ b/pagetop-minimal/static/pagetop-logo.svg @@ -0,0 +1,14 @@ + + + + + + + + + + + + + +