manuelcillero/pagetop
manuelcillero/pagetop
1
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

✨ Add new components for page layout

Browse source
This commit is contained in:
Manuel Cillero 2024-03-16 10:16:30 +01:00
parent b6b7d9687b
commit 36c931486d
9 changed files with 126 additions and 96 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/core/component/context.rs
View file

@ -13,6 +13,7 @@ use std::str::FromStr;
pub enum AssetsOp {
LangId(&'static LanguageIdentifier),
Theme(&'static str),
Layout(&'static str),
// Stylesheets.
AddStyleSheet(StyleSheet),
RemoveStyleSheet(&'static str),
@ -34,6 +35,7 @@ pub struct Context {
request : HttpRequest,
langid : &'static LanguageIdentifier,
theme : ThemeRef,
layout : &'static str,
stylesheet: Assets<StyleSheet>, // Stylesheets.
headstyles: Assets<HeadStyles>, // Styles in head.
javascript: Assets<JavaScript>, // JavaScripts.
@ -50,6 +52,7 @@ impl Context {
request,
langid : &LANGID_DEFAULT,
theme : *THEME_DEFAULT,
layout : "default",
stylesheet: Assets::<StyleSheet>::new(), // Stylesheets.
headstyles: Assets::<HeadStyles>::new(), // Styles in head.
javascript: Assets::<JavaScript>::new(), // JavaScripts.
@ -69,6 +72,9 @@ impl Context {
AssetsOp::Theme(theme_name) => {
self.theme = theme_by_single_name(theme_name).unwrap_or(*THEME_DEFAULT);
}
AssetsOp::Layout(layout) => {
self.layout = layout;
}
// Stylesheets.
AssetsOp::AddStyleSheet(css) => { self.stylesheet.add(css); }
@ -118,6 +124,10 @@ impl Context {
self.theme
}
pub fn layout(&self) -> &str {
self.layout
}
pub fn regions(&self) -> &ComponentsInRegions {
&self.regions
}
@ -142,6 +152,10 @@ impl Context {
}
}
pub fn prepare_region(&mut self, region: &str) -> Markup {
self.regions.all_components(self.theme, region).render(self)
}
// Context EXTRAS.
pub fn required_id<T>(&mut self, id: Option<String>) -> String {

2
src/core/theme.rs
View file

@ -1,5 +1,5 @@
mod definition;
pub use definition::{ThemeBuiltInClasses, ThemeRef, ThemeTrait};
pub use definition::{ThemeRef, ThemeTrait};
mod regions;
pub(crate) use regions::ComponentsInRegions;

82
src/core/theme/definition.rs
View file

@ -1,48 +1,13 @@
use crate::core::component::{ComponentTrait, Context};
use crate::base::component::Layout;
use crate::core::component::{ComponentBase, ComponentTrait, Context};
use crate::core::package::PackageTrait;
use crate::html::{html, Favicon, Markup, OptionId};
use crate::html::{html, Favicon, Markup};
use crate::locale::L10n;
use crate::response::page::Page;
use crate::{concat_string, config};
pub type ThemeRef = &'static dyn ThemeTrait;
/// Theme built-in classes used by the default page rendering process.
///
/// The [`ThemeTrait`](crate::core::theme::ThemeTrait) default implementation uses these CSS classes
/// in the [`prepare_region()`](crate::core::theme::ThemeTrait::prepare_region) and
/// [`prepare_body()`](crate::core::theme::ThemeTrait::prepare_body) methods to build the HTML code
/// for regions and page body main containers.
///
/// Theme developers can customize the default implementation of
/// [`builtin_classes()`](crate::core::theme::ThemeTrait::builtin_classes) method to return
/// alternative class name or space-separated class names for each variant, without altering the
/// default page rendering process.
pub enum ThemeBuiltInClasses {
/// Skip to content link. Default is `skip__to_content`.
SkipToContent,
/// Main body wrapper. Default is `body__wrapper`.
BodyWrapper,
/// Main content wrapper. Default is `content__wrapper`.
ContentWrapper,
/// A region container. Default is `region__container`.
RegionContainer,
/// The region inner content. Default is `region__content`.
RegionContent,
}
#[rustfmt::skip]
impl ToString for ThemeBuiltInClasses {
fn to_string(&self) -> String {
match self {
ThemeBuiltInClasses::SkipToContent => String::from("skip__to_content"),
ThemeBuiltInClasses::BodyWrapper => String::from("body__wrapper"),
ThemeBuiltInClasses::ContentWrapper => String::from("content__wrapper"),
ThemeBuiltInClasses::RegionContainer => String::from("region__container"),
ThemeBuiltInClasses::RegionContent => String::from("region__content"),
}
}
}
/// Los temas deben implementar este "trait".
pub trait ThemeTrait: PackageTrait + Send + Sync {
#[rustfmt::skip]
@ -57,34 +22,6 @@ pub trait ThemeTrait: PackageTrait + Send + Sync {
]
}
#[rustfmt::skip]
/// Return the name of the CSS class or space-separated class names associated with each variant
/// of [ThemeBuiltInClasses].
///
/// Theme developers can customize the default implementation of this method to return
/// alternative class name or space-separated class names for each variant, without altering the
/// default page rendering process.
fn builtin_classes(&self, builtin: ThemeBuiltInClasses) -> Option<String> {
Some(builtin.to_string())
}
fn prepare_region(&self, page: &mut Page, region_name: &str) -> Markup {
let render_region = page.components_in(region_name).render(page.context());
if render_region.is_empty() {
return html! {};
}
html! {
div
id=[OptionId::new(region_name).get()]
class=[self.builtin_classes(ThemeBuiltInClasses::RegionContainer)]
{
div class=[self.builtin_classes(ThemeBuiltInClasses::RegionContent)] {
(render_region)
}
}
}
}
#[allow(unused_variables)]
fn before_prepare_body(&self, page: &mut Page) {}
@ -94,20 +31,11 @@ pub trait ThemeTrait: PackageTrait + Send + Sync {
html! {
body id=[page.body_id().get()] class=[page.body_classes().get()] {
@if let Some(skip) = L10n::l("skip_to_content").using(page.context().langid()) {
div class=[self.builtin_classes(ThemeBuiltInClasses::SkipToContent)] {
div class="skip__to_content" {
a href=(skip_to) { (skip) }
}
}
div class=[self.builtin_classes(ThemeBuiltInClasses::BodyWrapper)] {
(self.prepare_region(page, "header"))
(self.prepare_region(page, "pagetop"))
div class=[self.builtin_classes(ThemeBuiltInClasses::ContentWrapper)] {
(self.prepare_region(page, "sidebar_left"))
(self.prepare_region(page, "content"))
(self.prepare_region(page, "sidebar_right"))
}
(self.prepare_region(page, "footer"))
}
(Layout::new().render(page.context()))
}
}
}