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

🚚 Rename operations with assets in context

Browse source
This commit is contained in:
Manuel Cillero 2024-03-11 23:29:37 +01:00
parent db40ac3321
commit 3d26459843
12 changed files with 67 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/base/component.rs
View file

@ -1,4 +1,4 @@
use crate::core::component::{Context, ContextOp};
use crate::core::component::{AssetsOp, Context};
use crate::html::{JavaScript, StyleSheet};
use crate::{AutoDefault, Weight};
@ -11,23 +11,24 @@ pub const PARAM_BASE_INCLUDE_MENU_ASSETS: &str = "base.include.menu";
pub(crate) fn add_base_assets(cx: &mut Context) {
let weight = cx.get_param::<Weight>(PARAM_BASE_WEIGHT).unwrap_or(-90);
cx.alter(ContextOp::AddStyleSheet(
cx.alter_assets(AssetsOp::AddStyleSheet(
StyleSheet::at("/base/css/root.css")
.with_version("0.0.1")
.with_weight(weight),
)).alter(ContextOp::AddStyleSheet(
))
.alter_assets(AssetsOp::AddStyleSheet(
StyleSheet::at("/base/css/looks.css")
.with_version("0.0.1")
.with_weight(weight),
))
.alter(ContextOp::AddStyleSheet(
.alter_assets(AssetsOp::AddStyleSheet(
StyleSheet::at("/base/css/buttons.css")
.with_version("0.0.2")
.with_weight(weight),
));
if let Some(true) = cx.get_param::<bool>(PARAM_BASE_INCLUDE_ICONS) {
cx.alter(ContextOp::AddStyleSheet(
cx.alter_assets(AssetsOp::AddStyleSheet(
StyleSheet::at("/base/css/icons.min.css")
.with_version("1.11.1")
.with_weight(weight),
@ -35,7 +36,7 @@ pub(crate) fn add_base_assets(cx: &mut Context) {
}
if let Some(true) = cx.get_param::<bool>(PARAM_BASE_INCLUDE_FLEX_ASSETS) {
cx.alter(ContextOp::AddStyleSheet(
cx.alter_assets(AssetsOp::AddStyleSheet(
StyleSheet::at("/base/css/flex.css")
.with_version("0.0.1")
.with_weight(weight),
@ -43,12 +44,12 @@ pub(crate) fn add_base_assets(cx: &mut Context) {
}
if let Some(true) = cx.get_param::<bool>(PARAM_BASE_INCLUDE_MENU_ASSETS) {
cx.alter(ContextOp::AddStyleSheet(
cx.alter_assets(AssetsOp::AddStyleSheet(
StyleSheet::at("/base/css/menu.css")
.with_version("0.0.1")
.with_weight(weight),
))
.alter(ContextOp::AddJavaScript(
.alter_assets(AssetsOp::AddJavaScript(
JavaScript::at("/base/js/menu.js")
.with_version("0.0.1")
.with_weight(weight),

4
src/base/package/welcome.rs
View file

@ -34,8 +34,8 @@ async fn home_lang(
fn home(request: HttpRequest, lang: &'static LanguageIdentifier) -> ResultPage<Markup, ErrorPage> {
Page::new(request)
.with_title(L10n::l("welcome_title"))
.with_context(ContextOp::LangId(lang))
.with_context(ContextOp::AddStyleSheet(StyleSheet::at(
.with_assets(AssetsOp::LangId(lang))
.with_assets(AssetsOp::AddStyleSheet(StyleSheet::at(
"/base/css/welcome.css",
)))
.with_body_id("welcome")

6
src/base/theme/basic.rs
View file

@ -15,13 +15,13 @@ impl PackageTrait for Basic {
impl ThemeTrait for Basic {
fn after_prepare_body(&self, page: &mut Page) {
page.alter_favicon(Some(Favicon::new().with_icon("/base/favicon.ico")))
.alter_context(ContextOp::AddStyleSheet(
.alter_assets(AssetsOp::AddStyleSheet(
StyleSheet::at("/base/css/normalize.min.css")
.with_version("8.0.1")
.with_weight(-90),
))
.alter_context(ContextOp::AddBaseAssets)
.alter_context(ContextOp::AddStyleSheet(
.alter_assets(AssetsOp::AddBaseAssets)
.alter_assets(AssetsOp::AddStyleSheet(
StyleSheet::at("/base/css/basic.css")
.with_version("0.0.1")
.with_weight(-90),

6
src/base/theme/chassis.rs
View file

@ -15,13 +15,13 @@ impl PackageTrait for Chassis {
impl ThemeTrait for Chassis {
fn after_prepare_body(&self, page: &mut Page) {
page.alter_favicon(Some(Favicon::new().with_icon("/base/favicon.ico")))
.alter_context(ContextOp::AddStyleSheet(
.alter_assets(AssetsOp::AddStyleSheet(
StyleSheet::at("/base/css/normalize.min.css")
.with_version("8.0.1")
.with_weight(-90),
))
.alter_context(ContextOp::AddBaseAssets)
.alter_context(ContextOp::AddStyleSheet(
.alter_assets(AssetsOp::AddBaseAssets)
.alter_assets(AssetsOp::AddStyleSheet(
StyleSheet::at("/base/css/chassis.css")
.with_version("0.0.1")
.with_weight(-90),

6
src/base/theme/inception.rs
View file

@ -15,13 +15,13 @@ impl PackageTrait for Inception {
impl ThemeTrait for Inception {
fn after_prepare_body(&self, page: &mut Page) {
page.alter_favicon(Some(Favicon::new().with_icon("/base/favicon.ico")))
.alter_context(ContextOp::AddStyleSheet(
.alter_assets(AssetsOp::AddStyleSheet(
StyleSheet::at("/base/css/normalize.min.css")
.with_version("8.0.1")
.with_weight(-90),
))
.alter_context(ContextOp::AddBaseAssets)
.alter_context(ContextOp::AddStyleSheet(
.alter_assets(AssetsOp::AddBaseAssets)
.alter_assets(AssetsOp::AddStyleSheet(
StyleSheet::at("/base/css/inception.css")
.with_version("0.0.1")
.with_weight(-90),