♻️ Add Favicon in assets and let context manage it

This commit is contained in:
Manuel Cillero 2024-08-04 22:22:38 +02:00
parent 5fb0a1332e
commit ce28bf3e2f
9 changed files with 82 additions and 69 deletions

View file

@ -7,7 +7,7 @@ use crate::base::action;
use crate::core::component::{AnyComponent, AnyOp, ComponentTrait};
use crate::core::component::{AssetsOp, Context};
use crate::fn_builder;
use crate::html::{html, Favicon, Markup, DOCTYPE};
use crate::html::{html, Markup, DOCTYPE};
use crate::html::{ClassesOp, OptionClasses, OptionId, OptionTranslated};
use crate::locale::L10n;
use crate::service::HttpRequest;
@ -20,7 +20,6 @@ pub struct Page {
description : OptionTranslated,
metadata : Vec<(&'static str, &'static str)>,
properties : Vec<(&'static str, &'static str)>,
favicon : Option<Favicon>,
context : Context,
body_id : OptionId,
body_classes: OptionClasses,
@ -35,7 +34,6 @@ impl Page {
description : OptionTranslated::default(),
metadata : Vec::default(),
properties : Vec::default(),
favicon : None,
context : Context::new(request),
body_id : OptionId::default(),
body_classes: OptionClasses::default(),
@ -69,12 +67,6 @@ impl Page {
self
}
#[fn_builder]
pub fn set_favicon(&mut self, favicon: Option<Favicon>) -> &mut Self {
self.favicon = favicon;
self
}
#[fn_builder]
pub fn set_assets(&mut self, op: AssetsOp) -> &mut Self {
self.context.set_assets(op);
@ -145,10 +137,6 @@ impl Page {
&self.properties
}
pub fn favicon(&self) -> &Option<Favicon> {
&self.favicon
}
pub fn context(&mut self) -> &mut Context {
&mut self.context
}