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

♻️ Major refactor for improved base asset use

Browse source
This commit is contained in:
Manuel Cillero 2023-10-15 21:03:54 +02:00
parent c2ea399635
commit 2015bb77f0
34 changed files with 244 additions and 1863 deletions
Download patch file Download diff file Expand all files Collapse all files

1
pagetop-bootsier/Cargo.toml
View file

@ -15,7 +15,6 @@ license = "Apache-2.0 OR MIT"
[dependencies]
pagetop = { version = "0.0", path = "../pagetop" }
pagetop-jquery = { version = "0.0", path = "../pagetop-jquery" }
static-files = "0.2.3"
[build-dependencies]

43
pagetop-bootsier/src/lib.rs
View file

@ -1,5 +1,4 @@
use pagetop::prelude::*;
use pagetop_jquery::JQuery;
new_handle!(THEME_BOOTSIER);
@ -18,10 +17,6 @@ impl ModuleTrait for Bootsier {
Some(&Bootsier)
}
fn dependencies(&self) -> Vec<ModuleRef> {
vec![&pagetop_jquery::JQuery]
}
fn configure_service(&self, scfg: &mut service::web::ServiceConfig) {
static_files_service!(scfg, "/bootsier", bootsier);
}
@ -53,7 +48,7 @@ impl ThemeTrait for Bootsier {
"content"
] {
@if let Some(content) = page.prepare_region(region) {
#(region) { (content) }
#(region) class="region" { (content) }
}
}
}
@ -71,31 +66,31 @@ impl ThemeTrait for Bootsier {
html! {
body class=[page.body_classes().get()] {
@if header.is_some() {
#header { (header.unwrap()) }
#header class="region" { (header.unwrap()) }
}
@if nav_branding.is_some() {
#nav_branding { (nav_branding.unwrap()) }
#nav_branding class="region" { (nav_branding.unwrap()) }
}
@if nav_main.is_some() {
#nav_main { (nav_main.unwrap()) }
#nav_main class="region" { (nav_main.unwrap()) }
}
@if nav_additional.is_some() {
#nav_additional { (nav_additional.unwrap()) }
#nav_additional class="region" { (nav_additional.unwrap()) }
}
@if breadcrumb.is_some() {
#breadcrumb { (breadcrumb.unwrap()) }
#breadcrumb class="region" { (breadcrumb.unwrap()) }
}
@if content.is_some() {
#content { (content.unwrap()) }
#content class="region" { (content.unwrap()) }
}
@if sidebar_first.is_some() {
#sidebar_first { (sidebar_first.unwrap()) }
#sidebar_first class="region" { (sidebar_first.unwrap()) }
}
@if sidebar_second.is_some() {
#sidebar_second { (sidebar_second.unwrap()) }
#sidebar_second class="region" { (sidebar_second.unwrap()) }
}
@if footer.is_some() {
#footer { (footer.unwrap()) }
#footer class="region" { (footer.unwrap()) }
}
}
}
@ -104,7 +99,7 @@ impl ThemeTrait for Bootsier {
}
fn after_prepare_body(&self, page: &mut Page) {
page.alter_favicon(Some(Favicon::new().with_icon("/theme/favicon.ico")))
page.alter_favicon(Some(Favicon::new().with_icon("/base/favicon.ico")))
.alter_context(ContextOp::AddStyleSheet(
StyleSheet::at("/bootsier/css/bootstrap.min.css")
.with_version("5.1.3")
@ -114,20 +109,8 @@ impl ThemeTrait for Bootsier {
JavaScript::at("/bootsier/js/bootstrap.bundle.min.js")
.with_version("5.1.3")
.with_weight(-99),
));
if let Some(true) = page.context().get_param::<bool>(PARAM_INCLUDE_FLEX) {
page.alter_context(ContextOp::AddStyleSheet(
StyleSheet::at("/theme/css/flex.css").with_version("0.0.0"),
));
}
if let Some(true) = page.context().get_param::<bool>(PARAM_INCLUDE_ICONS) {
page.alter_context(ContextOp::AddStyleSheet(
StyleSheet::at("/theme/icons/bootstrap-icons.css").with_version("1.8.2"),
));
}
JQuery.enable_jquery(page.context());
))
.alter_context(ContextOp::AddAssetsForBase);
}
fn render_component(&self, component: &dyn ComponentTrait, cx: &mut Context) -> Option<Markup> {