From 56ff217acc50f22de5abe909e122614d499814e2 Mon Sep 17 00:00:00 2001 From: Dan <39170265+chillenberger@users.noreply.github.com> Date: Tue, 28 Nov 2023 09:48:43 -0700 Subject: [PATCH 3/4] cms layout param --- pgml-dashboard/src/api/cms.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pgml-dashboard/src/api/cms.rs b/pgml-dashboard/src/api/cms.rs index 87dfd45f7..6044186c4 100644 --- a/pgml-dashboard/src/api/cms.rs +++ b/pgml-dashboard/src/api/cms.rs @@ -266,7 +266,7 @@ impl Collection { Some(cluster.context.user.clone()) }; - let mut layout = crate::templates::Layout::new(&title); + let mut layout = crate::templates::Layout::new(&title, Some(cluster.clone())); if let Some(image) = image { // translate relative url into absolute for head social sharing let parts = image.split(".gitbook/assets/").collect::>(); From b3b1eef872d7a07d556854dc37df89176506a3c4 Mon Sep 17 00:00:00 2001 From: Dan <39170265+chillenberger@users.noreply.github.com> Date: Tue, 28 Nov 2023 10:59:24 -0700 Subject: [PATCH 4/4] clean up code, fix notice colors --- .../notifications/banner/banner.scss | 6 ++-- pgml-dashboard/src/lib.rs | 21 ++---------- pgml-dashboard/src/templates/mod.rs | 2 +- pgml-dashboard/src/utils/cookies.rs | 32 +++++++++++++++++++ pgml-dashboard/src/utils/mod.rs | 1 + pgml-dashboard/src/utils/tabs.rs | 11 ++++--- 6 files changed, 46 insertions(+), 27 deletions(-) create mode 100644 pgml-dashboard/src/utils/cookies.rs diff --git a/pgml-dashboard/src/components/notifications/banner/banner.scss b/pgml-dashboard/src/components/notifications/banner/banner.scss index 050a49ef4..2fbeca37b 100644 --- a/pgml-dashboard/src/components/notifications/banner/banner.scss +++ b/pgml-dashboard/src/components/notifications/banner/banner.scss @@ -26,15 +26,15 @@ div[data-controller="notifications-banner"] { filter: brightness(1.5); } } - .tips-features { + .tip { background-color: #{$gray-900}; } .level1 { - background-color: yellow; + background-color: #FFFF00; color: #{$gray-900}; } .level2 { - background-color: orange; + background-color: #FF6929; color: #{$gray-900}; } .level3 { diff --git a/pgml-dashboard/src/lib.rs b/pgml-dashboard/src/lib.rs index 6fab2a227..f96717045 100644 --- a/pgml-dashboard/src/lib.rs +++ b/pgml-dashboard/src/lib.rs @@ -30,6 +30,7 @@ use templates::{ }; use utils::tabs; +use crate::utils::cookies::Notifications; use std::collections::hash_map::DefaultHasher; use std::hash::{Hash, Hasher}; @@ -750,26 +751,10 @@ pub async fn playground(cluster: &Cluster) -> Result { #[get("/notifications/remove_banner?")] pub fn remove_banner(id: String, cookies: &CookieJar<'_>, context: &Cluster) -> ResponseOk { - let mut viewed = match cookies.get_private("session") { - Some(session) => { - match serde_json::from_str::(session.value()).unwrap() - ["notifications"] - .as_array() - { - Some(items) => items - .into_iter() - .map(|x| x.as_str().unwrap().to_string()) - .collect::>(), - _ => vec![], - } - } - None => vec![], - }; + let mut viewed = Notifications::get_viewed(cookies); viewed.push(id); - let mut cookie = Cookie::new("session", format!(r#"{{"notifications": {:?}}}"#, viewed)); - cookie.set_max_age(::time::Duration::weeks(4)); - cookies.add_private(cookie); + Notifications::update_viewed(&viewed, cookies); match context.notifications.as_ref() { Some(notifications) => { diff --git a/pgml-dashboard/src/templates/mod.rs b/pgml-dashboard/src/templates/mod.rs index 55d01f23e..4cd880700 100644 --- a/pgml-dashboard/src/templates/mod.rs +++ b/pgml-dashboard/src/templates/mod.rs @@ -1,8 +1,8 @@ use pgml_components::Component; use std::collections::HashMap; -use components::notifications::banner::Banner; pub use crate::components::{self, cms::index_link::IndexLink, NavLink, StaticNav, StaticNavLink}; +use components::notifications::banner::Banner; use sailfish::TemplateOnce; use sqlx::postgres::types::PgMoney; diff --git a/pgml-dashboard/src/utils/cookies.rs b/pgml-dashboard/src/utils/cookies.rs new file mode 100644 index 000000000..49c4aafe0 --- /dev/null +++ b/pgml-dashboard/src/utils/cookies.rs @@ -0,0 +1,32 @@ +use rocket::http::{Cookie, CookieJar}; +use rocket::serde::json::Json; + +pub struct Notifications {} + +impl Notifications { + pub fn update_viewed(new: &Vec, cookies: &CookieJar<'_>) { + let mut cookie = Cookie::new("session", format!(r#"{{"notifications": {:?}}}"#, new)); + cookie.set_max_age(::time::Duration::weeks(4)); + cookies.add_private(cookie); + } + + pub fn get_viewed(cookies: &CookieJar<'_>) -> Vec { + let mut viewed = match cookies.get_private("session") { + Some(session) => { + match serde_json::from_str::(session.value()).unwrap() + ["notifications"] + .as_array() + { + Some(items) => items + .into_iter() + .map(|x| x.as_str().unwrap().to_string()) + .collect::>(), + _ => vec![], + } + } + None => vec![], + }; + + viewed + } +} diff --git a/pgml-dashboard/src/utils/mod.rs b/pgml-dashboard/src/utils/mod.rs index 78a8a9c72..44e25011d 100644 --- a/pgml-dashboard/src/utils/mod.rs +++ b/pgml-dashboard/src/utils/mod.rs @@ -1,4 +1,5 @@ pub mod config; +pub mod cookies; pub mod datadog; pub mod markdown; pub mod tabs; diff --git a/pgml-dashboard/src/utils/tabs.rs b/pgml-dashboard/src/utils/tabs.rs index 7b271f00c..408eb462a 100644 --- a/pgml-dashboard/src/utils/tabs.rs +++ b/pgml-dashboard/src/utils/tabs.rs @@ -19,16 +19,17 @@ impl<'a> Tabs<'a> { ) -> anyhow::Result { let default = match default { Some(default) => default, - _ => tabs - .get(0) - .ok_or(anyhow!("There must be at least one tab."))? - .name, + _ => { + tabs.get(0) + .ok_or(anyhow!("There must be at least one tab."))? + .name + } }; let active = active .and_then(|name| { let found = tabs.iter().find(|tab| tab.name == name); - + found.map(|tab| tab.name) }) .unwrap_or(default); pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.

Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy