Content-Length: 39100 | pFad | http://github.com/postgresml/postgresml/pull/1048.patch

thub.com From d722b51c28c0b6c70749e587d6f388bc78cfb249 Mon Sep 17 00:00:00 2001 From: Dan <39170265+chillenberger@users.noreply.github.com> Date: Fri, 22 Sep 2023 12:39:57 -0600 Subject: [PATCH 1/7] create select component from dropdown --- .../src/components/dropdown/dropdown.scss | 6 +- pgml-dashboard/src/components/dropdown/mod.rs | 46 ++++++- .../src/components/dropdown/template.html | 13 +- pgml-dashboard/src/components/inputs/mod.rs | 4 + .../src/components/inputs/select/mod.rs | 111 +++++++++++++++ .../src/components/inputs/select/option.html | 4 + .../src/components/inputs/select/select.scss | 3 + .../inputs/select/select_controller.js | 11 ++ .../components/inputs/select/template.html | 33 +++++ .../inputs/text/editable_header/mod.rs | 40 +----- .../components/left_nav_web_app/template.html | 2 +- pgml-dashboard/src/components/mod.rs | 3 + .../components/navbar_web_app/template.html | 2 +- .../dropdown_link/dropdown_link.scss | 3 + .../navigation/dropdown_link/mod.rs | 17 +++ .../navigation/dropdown_link/template.html | 8 ++ .../src/components/navigation/mod.rs | 4 + pgml-dashboard/src/components/stimulus/mod.rs | 10 ++ .../stimulus/stimulus_action/mod.rs | 126 ++++++++++++++++++ .../stimulus/stimulus_action/template.html | 1 + .../stimulus/stimulus_target/mod.rs | 36 +++++ .../stimulus/stimulus_target/template.html | 1 + pgml-dashboard/static/css/modules.scss | 2 + .../static/css/scss/abstracts/variables.scss | 23 +++- .../templates/content/playground.html | 31 +++-- 25 files changed, 472 insertions(+), 68 deletions(-) create mode 100644 pgml-dashboard/src/components/inputs/select/mod.rs create mode 100644 pgml-dashboard/src/components/inputs/select/option.html create mode 100644 pgml-dashboard/src/components/inputs/select/select.scss create mode 100644 pgml-dashboard/src/components/inputs/select/select_controller.js create mode 100644 pgml-dashboard/src/components/inputs/select/template.html create mode 100644 pgml-dashboard/src/components/navigation/dropdown_link/dropdown_link.scss create mode 100644 pgml-dashboard/src/components/navigation/dropdown_link/mod.rs create mode 100644 pgml-dashboard/src/components/navigation/dropdown_link/template.html create mode 100644 pgml-dashboard/src/components/stimulus/mod.rs create mode 100644 pgml-dashboard/src/components/stimulus/stimulus_action/mod.rs create mode 100644 pgml-dashboard/src/components/stimulus/stimulus_action/template.html create mode 100644 pgml-dashboard/src/components/stimulus/stimulus_target/mod.rs create mode 100644 pgml-dashboard/src/components/stimulus/stimulus_target/template.html diff --git a/pgml-dashboard/src/components/dropdown/dropdown.scss b/pgml-dashboard/src/components/dropdown/dropdown.scss index 79c0d89ba..8d73f49ad 100644 --- a/pgml-dashboard/src/components/dropdown/dropdown.scss +++ b/pgml-dashboard/src/components/dropdown/dropdown.scss @@ -48,6 +48,10 @@ --bs-btn-active-color: #{$gray-100}; --bs-btn-hover-color: #{$gray-100}; + &.error { + border-color: #{$error}; + } + .material-symbols-outlined { color: #{$neon-shade-100}; } @@ -73,7 +77,7 @@ } .menu-item { - a { + a, div { padding: 8px 12px; overflow: hidden; text-overflow: ellipsis; diff --git a/pgml-dashboard/src/components/dropdown/mod.rs b/pgml-dashboard/src/components/dropdown/mod.rs index a53394e1b..77f71b1ce 100644 --- a/pgml-dashboard/src/components/dropdown/mod.rs +++ b/pgml-dashboard/src/components/dropdown/mod.rs @@ -1,3 +1,5 @@ +use crate::components::navigation::dropdown_link::DropdownLink; +use crate::components::stimulus::stimulus_target::StimulusTarget; use pgml_components::component; use pgml_components::Component; use sailfish::TemplateOnce; @@ -21,35 +23,57 @@ pub struct Dropdown { //github.com/ The currently selected value. value: DropdownValue, - //github.com/ The list of dropdown links to render. - links: Vec, + //github.com/ The list of dropdown items to render. + items: Vec, //github.com/ Position of the dropdown menu. offset: String, - //github.com/ Whether or not the dropdown is collapsble. + //github.com/ Whether or not the dropdown is collapsable. collapsable: bool, offset_collapsed: String, //github.com/ Where the dropdown menu should appear menu_position: String, expandable: bool, + + //github.com/ target to control value + value_target: StimulusTarget, } impl Dropdown { - pub fn new(links: Vec) -> Self { + pub fn new() -> Self { + Dropdown { + items: Vec::new(), + value: DropdownValue::Text("Dropdown".to_owned().into()), + offset: "0, 10".to_owned(), + offset_collapsed: "68, -44".to_owned(), + menu_position: "".to_owned(), + ..Default::default() + } + } + + pub fn nav(links: Vec) -> Self { let binding = links .iter() .filter(|link| link.active) .collect::>(); + let active = binding.first(); let value = if let Some(active) = active { active.name.to_owned() } else { - "Menu".to_owned() + "Dropdown Nav".to_owned() }; + + let mut items = Vec::new(); + for link in links { + let item = DropdownLink::new(link); + items.push(item.into()); + } + Dropdown { - links, + items, value: DropdownValue::Text(value.into()), offset: "0, 10".to_owned(), offset_collapsed: "68, -44".to_owned(), @@ -58,6 +82,11 @@ impl Dropdown { } } + pub fn items(mut self, items: Vec) -> Self { + self.items = items; + self + } + pub fn text(mut self, value: Component) -> Self { self.value = DropdownValue::Text(value); self @@ -97,6 +126,11 @@ impl Dropdown { self.expandable = true; self } + + pub fn value_target(mut self, value_target: StimulusTarget) -> Self { + self.value_target = value_target; + self + } } component!(Dropdown); diff --git a/pgml-dashboard/src/components/dropdown/template.html b/pgml-dashboard/src/components/dropdown/template.html index ace19b342..f2dd0217c 100644 --- a/pgml-dashboard/src/components/dropdown/template.html +++ b/pgml-dashboard/src/components/dropdown/template.html @@ -19,7 +19,8 @@ role="button" data-bs-toggle="dropdown" data-bs-offset="<%= offset %>" - aria-expanded="false"> + aria-expanded="false" + <%- value_target %>> <%+ text %> expand_more @@ -42,14 +43,8 @@ <% } %>
    - <% for link in links { %> -
  • - <% if link.disabled { %> - <%= link.name %> - <% } else { %> - <%= link.name %> - <% } %> -
    • + <% for item in items { %> + <%+ item %> <% } %>
diff --git a/pgml-dashboard/src/components/inputs/mod.rs b/pgml-dashboard/src/components/inputs/mod.rs index 4036ea229..d46fc79a1 100644 --- a/pgml-dashboard/src/components/inputs/mod.rs +++ b/pgml-dashboard/src/components/inputs/mod.rs @@ -5,5 +5,9 @@ pub mod range_group; pub use range_group::RangeGroup; +// src/components/inputs/select +pub mod select; +pub use select::Select; + // src/components/inputs/text pub mod text; diff --git a/pgml-dashboard/src/components/inputs/select/mod.rs b/pgml-dashboard/src/components/inputs/select/mod.rs new file mode 100644 index 000000000..43e671f5c --- /dev/null +++ b/pgml-dashboard/src/components/inputs/select/mod.rs @@ -0,0 +1,111 @@ +use crate::components::stimulus::stimulus_action::{StimulusAction, StimulusEvents}; +use pgml_components::component; +use pgml_components::Component; +use sailfish::TemplateOnce; + +#[derive(TemplateOnce, Default)] +#[template(path = "inputs/select/template.html")] +pub struct Select { + options: Vec, + value: String, + offset: String, + collapsable: bool, + offset_collapsed: String, + menu_position: String, + expandable: bool, + name: String, +} + +impl Select { + pub fn new() -> Select { + Select { + options: Vec::new(), + value: "Select".to_owned(), + offset: "0, 10".to_owned(), + offset_collapsed: "68, -44".to_owned(), + menu_position: "".to_owned(), + name: "input_name".to_owned(), + ..Default::default() + } + .options(vec![ + "option1".to_owned(), + "option2".to_owned(), + "option3".to_owned(), + ]) + } + + pub fn options(mut self, values: Vec) -> Self { + let mut options = Vec::new(); + self.value = values.first().unwrap().to_owned(); + + for value in values { + let item = Option::new( + value, + StimulusAction::new() + .controller("inputs-select") + .method("choose") + .action(StimulusEvents::Click), + ); + options.push(item.into()); + } + + self.options = options; + self + } + + pub fn name(mut self, name: &str) -> Self { + self.name = name.to_owned(); + self + } + + pub fn text(mut self, value: String) -> Self { + self.value = value; + self + } + + pub fn collapsable(mut self) -> Self { + self.collapsable = true; + self + } + + pub fn menu_end(mut self) -> Self { + self.menu_position = "dropdown-menu-end".to_owned(); + self + } + + pub fn menu_start(mut self) -> Self { + self.menu_position = "dropdown-menu-start".to_owned(); + self + } + + pub fn offset(mut self, offset: &str) -> Self { + self.offset = offset.to_owned(); + self + } + + pub fn offset_collapsed(mut self, offset: &str) -> Self { + self.offset_collapsed = offset.to_owned(); + self + } + + pub fn expandable(mut self) -> Self { + self.expandable = true; + self + } +} + +#[derive(TemplateOnce)] +#[template(path = "inputs/select/option.html")] +pub struct Option { + value: String, + action: StimulusAction, +} + +impl Option { + pub fn new(value: String, action: StimulusAction) -> Self { + Option { value, action } + } +} + +component!(Option); +component!(Select); diff --git a/pgml-dashboard/src/components/inputs/select/option.html b/pgml-dashboard/src/components/inputs/select/option.html new file mode 100644 index 000000000..a2186a3a2 --- /dev/null +++ b/pgml-dashboard/src/components/inputs/select/option.html @@ -0,0 +1,4 @@ + +
  • + +
    • diff --git a/pgml-dashboard/src/components/inputs/select/select.scss b/pgml-dashboard/src/components/inputs/select/select.scss new file mode 100644 index 000000000..b0821cd7e --- /dev/null +++ b/pgml-dashboard/src/components/inputs/select/select.scss @@ -0,0 +1,3 @@ +div[data-controller="inputs-select"] { + +} diff --git a/pgml-dashboard/src/components/inputs/select/select_controller.js b/pgml-dashboard/src/components/inputs/select/select_controller.js new file mode 100644 index 000000000..15a34269b --- /dev/null +++ b/pgml-dashboard/src/components/inputs/select/select_controller.js @@ -0,0 +1,11 @@ +import { Controller } from '@hotwired/stimulus' + +export default class extends Controller { + static targets = ["input", "value"] + + choose(e) { + this.inputTarget.value = e.target.innerHTML + this.valueTarget.innerHTML = e.target.innerHTML + } + +} diff --git a/pgml-dashboard/src/components/inputs/select/template.html b/pgml-dashboard/src/components/inputs/select/template.html new file mode 100644 index 000000000..39193e10e --- /dev/null +++ b/pgml-dashboard/src/components/inputs/select/template.html @@ -0,0 +1,33 @@ +<% +use crate::components::dropdown::Dropdown; +use crate::components::stimulus::stimulus_target::StimulusTarget; +%> +
    + + <% let mut dropdown = Dropdown::new() + .items(options) + .offset(&offset) + .offset_collapsed(&offset_collapsed) + .text(value.clone().into()); + + if menu_position == "dropdown-menu-end" { + dropdown = dropdown.menu_end(); + } else if menu_position == "dropdown-menu-start" { + dropdown = dropdown.menu_start(); + } + + if collapsable { + dropdown = dropdown.collapsable(); + } + + if expandable { + dropdown = dropdown.expandable(); + } + + dropdown = dropdown.value_target(StimulusTarget::new().controller("inputs-select").name("value")); + %> + + <%+ dropdown %> + + +
    diff --git a/pgml-dashboard/src/components/inputs/text/editable_header/mod.rs b/pgml-dashboard/src/components/inputs/text/editable_header/mod.rs index 36e0626d7..04e190535 100644 --- a/pgml-dashboard/src/components/inputs/text/editable_header/mod.rs +++ b/pgml-dashboard/src/components/inputs/text/editable_header/mod.rs @@ -1,5 +1,5 @@ +use crate::components::stimulus::stimulus_target::StimulusTarget; use pgml_components::component; -use sailfish::runtime::{Buffer, Render}; use sailfish::TemplateOnce; use std::fmt; @@ -25,44 +25,6 @@ impl fmt::Display for Headers { } } -pub struct StimulusTarget { - controller: Option, - target_name: Option, -} - -impl StimulusTarget { - pub fn new() -> StimulusTarget { - StimulusTarget { - controller: None, - target_name: None, - } - } - - pub fn controller(mut self, controller: &str) -> Self { - self.controller = Some(controller.to_string()); - self - } - - pub fn target_name(mut self, target_name: &str) -> Self { - self.target_name = Some(target_name.to_string()); - self - } -} - -impl Render for StimulusTarget { - fn render(&self, b: &mut Buffer) -> Result<(), sailfish::RenderError> { - if self.controller.is_none() || self.target_name.is_none() { - return format!("").render(b); - } - format!( - "data-{}-target=\"{}\"", - self.controller.to_owned().unwrap(), - self.target_name.to_owned().unwrap() - ) - .render(b) - } -} - #[derive(TemplateOnce)] #[template(path = "inputs/text/editable_header/template.html")] pub struct EditableHeader { diff --git a/pgml-dashboard/src/components/left_nav_web_app/template.html b/pgml-dashboard/src/components/left_nav_web_app/template.html index 881db504d..8d1abfaa8 100644 --- a/pgml-dashboard/src/components/left_nav_web_app/template.html +++ b/pgml-dashboard/src/components/left_nav_web_app/template.html @@ -12,7 +12,7 @@
    - <%+ Dropdown::new(dropdown_nav.links).collapsable() %> + <%+ Dropdown::nav(dropdown_nav.links).collapsable() %>
    <%+ LeftNavMenu { nav: upper_nav } %> diff --git a/pgml-dashboard/src/components/mod.rs b/pgml-dashboard/src/components/mod.rs index 8e1afcc56..e3ca9bd6f 100644 --- a/pgml-dashboard/src/components/mod.rs +++ b/pgml-dashboard/src/components/mod.rs @@ -67,6 +67,9 @@ pub use static_nav::StaticNav; pub mod static_nav_link; pub use static_nav_link::StaticNavLink; +// src/components/stimulus +pub mod stimulus; + // src/components/tables pub mod tables; diff --git a/pgml-dashboard/src/components/navbar_web_app/template.html b/pgml-dashboard/src/components/navbar_web_app/template.html index c716e6d9e..3de2dd009 100644 --- a/pgml-dashboard/src/components/navbar_web_app/template.html +++ b/pgml-dashboard/src/components/navbar_web_app/template.html @@ -60,7 +60,7 @@ <% if !account_management_nav.links.is_empty() { %>
  • <%+ - Dropdown::new(account_management_nav.links.clone()) + Dropdown::nav(account_management_nav.links.clone()) .icon(ProfileIcon::new().into()) .expandable() %> diff --git a/pgml-dashboard/src/components/navigation/dropdown_link/dropdown_link.scss b/pgml-dashboard/src/components/navigation/dropdown_link/dropdown_link.scss new file mode 100644 index 000000000..8c2811c80 --- /dev/null +++ b/pgml-dashboard/src/components/navigation/dropdown_link/dropdown_link.scss @@ -0,0 +1,3 @@ +div[data-controller="navigation-dropdown-link"] { + +} diff --git a/pgml-dashboard/src/components/navigation/dropdown_link/mod.rs b/pgml-dashboard/src/components/navigation/dropdown_link/mod.rs new file mode 100644 index 000000000..f90b5bc14 --- /dev/null +++ b/pgml-dashboard/src/components/navigation/dropdown_link/mod.rs @@ -0,0 +1,17 @@ +use crate::components::StaticNavLink; +use pgml_components::component; +use sailfish::TemplateOnce; + +#[derive(TemplateOnce, Default)] +#[template(path = "navigation/dropdown_link/template.html")] +pub struct DropdownLink { + link: StaticNavLink, +} + +impl DropdownLink { + pub fn new(link: StaticNavLink) -> Self { + DropdownLink { link } + } +} + +component!(DropdownLink); diff --git a/pgml-dashboard/src/components/navigation/dropdown_link/template.html b/pgml-dashboard/src/components/navigation/dropdown_link/template.html new file mode 100644 index 000000000..928a5c12a --- /dev/null +++ b/pgml-dashboard/src/components/navigation/dropdown_link/template.html @@ -0,0 +1,8 @@ + +
  • + <% if link.disabled { %> + <%= link.name %> + <% } else { %> + <%= link.name %> + <% } %> +
    • diff --git a/pgml-dashboard/src/components/navigation/mod.rs b/pgml-dashboard/src/components/navigation/mod.rs index e615f8406..920aa100d 100644 --- a/pgml-dashboard/src/components/navigation/mod.rs +++ b/pgml-dashboard/src/components/navigation/mod.rs @@ -1,5 +1,9 @@ // This file is automatically generated. // You shouldn't modify it manually. +// src/components/navigation/dropdown_link +pub mod dropdown_link; +pub use dropdown_link::DropdownLink; + // src/components/navigation/tabs pub mod tabs; diff --git a/pgml-dashboard/src/components/stimulus/mod.rs b/pgml-dashboard/src/components/stimulus/mod.rs new file mode 100644 index 000000000..f96318031 --- /dev/null +++ b/pgml-dashboard/src/components/stimulus/mod.rs @@ -0,0 +1,10 @@ +// This file is automatically generated. +// You shouldn't modify it manually. + +// src/components/stimulus/stimulus_action +pub mod stimulus_action; +pub use stimulus_action::StimulusAction; + +// src/components/stimulus/stimulus_target +pub mod stimulus_target; +pub use stimulus_target::StimulusTarget; diff --git a/pgml-dashboard/src/components/stimulus/stimulus_action/mod.rs b/pgml-dashboard/src/components/stimulus/stimulus_action/mod.rs new file mode 100644 index 000000000..f8b93407f --- /dev/null +++ b/pgml-dashboard/src/components/stimulus/stimulus_action/mod.rs @@ -0,0 +1,126 @@ +use sailfish::runtime::{Buffer, Render}; +use std::fmt; +use std::str::FromStr; + +#[derive(Debug, Clone)] +pub enum StimulusEvents { + Click, + Change, + Submit, + Input, + Toggle, +} + +impl fmt::Display for StimulusEvents { + fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { + match *self { + StimulusEvents::Click => write!(f, "click"), + StimulusEvents::Change => write!(f, "change"), + StimulusEvents::Submit => write!(f, "submit"), + StimulusEvents::Input => write!(f, "input"), + StimulusEvents::Toggle => write!(f, "toggle"), + } + } +} + +impl FromStr for StimulusEvents { + type Err = (); + + fn from_str(input: &str) -> Result { + match input { + "click" => Ok(StimulusEvents::Click), + "change" => Ok(StimulusEvents::Change), + "submit" => Ok(StimulusEvents::Submit), + "input" => Ok(StimulusEvents::Input), + "toggle" => Ok(StimulusEvents::Toggle), + _ => Err(()), + } + } +} + +#[derive(Debug, Clone)] +pub struct StimulusAction { + pub controller: String, + pub method: String, + pub action: Option, +} + +impl StimulusAction { + pub fn new() -> Self { + Self { + controller: String::new(), + method: String::new(), + action: None, + } + } + + pub fn controller(mut self, controller: &str) -> Self { + self.controller = controller.to_string(); + self + } + + pub fn method(mut self, method: &str) -> Self { + self.method = method.to_string(); + self + } + + pub fn action(mut self, action: StimulusEvents) -> Self { + self.action = Some(action); + self + } +} + +impl fmt::Display for StimulusAction { + fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { + match &self.action { + Some(action) => write!(f, "{}->{}#{}", action, self.controller, self.method), + None => write!(f, "{}#{}", self.controller, self.method), + } + } +} + +impl Render for StimulusAction { + fn render(&self, b: &mut Buffer) -> Result<(), sailfish::RenderError> { + if self.controller.len() == 0 || self.method.len() == 0 { + return format!("").render(b); + } + match &self.action { + Some(action) => format!("{}->{}#{}", action, self.controller, self.method).render(b), + None => format!("{}#{}", self.controller, self.method).render(b), + } + } +} + +impl FromStr for StimulusAction { + type Err = (); + + fn from_str(input: &str) -> Result { + let cleaned = input.replace(" ", ""); + let mut out: Vec<&str> = cleaned.split("->").collect(); + + match out.len() { + 1 => { + let mut command: Vec<&str> = out.pop().unwrap().split("#").collect(); + match command.len() { + 2 => Ok(StimulusAction::new() + .method(command.pop().unwrap()) + .controller(command.pop().unwrap()) + .clone()), + _ => Err(()), + } + } + 2 => { + let mut command: Vec<&str> = out.pop().unwrap().split("#").collect(); + match command.len() { + 2 => Ok(StimulusAction::new() + .action(StimulusEvents::from_str(out.pop().unwrap()).unwrap()) + .method(command.pop().unwrap()) + .controller(command.pop().unwrap()) + .clone()), + _ => Err(()), + } + } + _ => Err(()), + } + } +} diff --git a/pgml-dashboard/src/components/stimulus/stimulus_action/template.html b/pgml-dashboard/src/components/stimulus/stimulus_action/template.html new file mode 100644 index 000000000..8b1378917 --- /dev/null +++ b/pgml-dashboard/src/components/stimulus/stimulus_action/template.html @@ -0,0 +1 @@ + diff --git a/pgml-dashboard/src/components/stimulus/stimulus_target/mod.rs b/pgml-dashboard/src/components/stimulus/stimulus_target/mod.rs new file mode 100644 index 000000000..d012eb76d --- /dev/null +++ b/pgml-dashboard/src/components/stimulus/stimulus_target/mod.rs @@ -0,0 +1,36 @@ +use sailfish::runtime::{Buffer, Render}; + +#[derive(Debug, Clone, Default)] +pub struct StimulusTarget { + pub controller: Option, + pub name: Option, +} + +impl StimulusTarget { + pub fn new() -> Self { + Self { + ..Default::default() + } + } + + pub fn controller(mut self, controller: &str) -> Self { + self.controller = Some(controller.to_string()); + self + } + + pub fn name(mut self, name: &str) -> Self { + self.name = Some(name.to_string()); + self + } +} + +impl Render for StimulusTarget { + fn render(&self, b: &mut Buffer) -> Result<(), sailfish::RenderError> { + match (self.controller.as_ref(), self.name.as_ref()) { + (Some(controller), Some(name)) => { + format!("data-{}-target=\"{}\"", controller, name).render(b) + } + _ => format!("").render(b), + } + } +} diff --git a/pgml-dashboard/src/components/stimulus/stimulus_target/template.html b/pgml-dashboard/src/components/stimulus/stimulus_target/template.html new file mode 100644 index 000000000..8b1378917 --- /dev/null +++ b/pgml-dashboard/src/components/stimulus/stimulus_target/template.html @@ -0,0 +1 @@ + diff --git a/pgml-dashboard/static/css/modules.scss b/pgml-dashboard/static/css/modules.scss index a33a6fafe..7283d82ac 100644 --- a/pgml-dashboard/static/css/modules.scss +++ b/pgml-dashboard/static/css/modules.scss @@ -3,11 +3,13 @@ @import "../../src/components/dropdown/dropdown.scss"; @import "../../src/components/inputs/range_group/range_group.scss"; +@import "../../src/components/inputs/select/select.scss"; @import "../../src/components/inputs/text/editable_header/editable_header.scss"; @import "../../src/components/left_nav_menu/left_nav_menu.scss"; @import "../../src/components/left_nav_web_app/left_nav_web_app.scss"; @import "../../src/components/modal/modal.scss"; @import "../../src/components/navbar/navbar.scss"; +@import "../../src/components/navigation/dropdown_link/dropdown_link.scss"; @import "../../src/components/navigation/tabs/tab/tab.scss"; @import "../../src/components/navigation/tabs/tabs/tabs.scss"; @import "../../src/components/postgres_logo/postgres_logo.scss"; diff --git a/pgml-dashboard/static/css/scss/abstracts/variables.scss b/pgml-dashboard/static/css/scss/abstracts/variables.scss index 2bd8d0983..f2cb64d45 100644 --- a/pgml-dashboard/static/css/scss/abstracts/variables.scss +++ b/pgml-dashboard/static/css/scss/abstracts/variables.scss @@ -52,7 +52,27 @@ $teal-tint-900: #002c33; $teal-tint-1000: #001619; // Peach Scale +$peach-shade-100: #E9467A; +$peach-shade-200: #D13F6D; +$peach-shade-300: #BA3861; +$peach-shade-400: #A33155; +$peach-shade-500: #882A49; +$peach-shade-600: #74233D; +$peach-shade-700: #5D1C30; +$peach-shade-800: #451524; +$peach-shade-900: #2E0E18; +$peach-shade-1000: #17070C; + $peach-tint-100: #E9467A; +$peach-tint-200: #EB5887; +$peach-tint-300: #ED6A94; +$peach-tint-400: #EF7DA1; +$peach-tint-500: #F190AF; +$peach-tint-600: #F4A2BC; +$peach-tint-700: #F6B5C9; +$peach-tint-800: #F8C7D7; +$peach-tint-900: #FADAE4; +$peach-tint-1000: #FCECF1; // Slate Scale $slate-tint-100: #9185FF; @@ -80,7 +100,8 @@ $slate-shade-1000: #0E0D19; // Colors $primary: #0D0D0E; $secondary: $gray-100; -$danger: #ff4136; +$danger: $peach-shade-100; +$error: $peach-shade-100; $purple: $slate-tint-100; $pink: #e7477c; $hp-white: #{$gray-200}; diff --git a/pgml-dashboard/templates/content/playground.html b/pgml-dashboard/templates/content/playground.html index ad77c829d..c56721159 100644 --- a/pgml-dashboard/templates/content/playground.html +++ b/pgml-dashboard/templates/content/playground.html @@ -2,7 +2,9 @@ use crate::components::tables::large::*; use crate::components::navigation::tabs::*; use crate::components::inputs::range_group::RangeGroup; -use crate::components::inputs::text::editable_header::{EditableHeader, Headers, StimulusTarget}; +use crate::components::inputs::text::editable_header::{EditableHeader, Headers}; +use crate::components::stimulus::stimulus_target::StimulusTarget; +use crate::components::inputs::select::Select; %>
    @@ -21,26 +23,29 @@

    Dropdowns

    - <%+ Dropdown::new( + <%+ Dropdown::nav( vec![ - StaticNavLink::new("Test".into(), "#test".into()) + StaticNavLink::new("Test1".into(), "#test1".into()), + StaticNavLink::new("Test2".into(), "#test2".into()), + StaticNavLink::new("Starts Active".into(), "#test".into()).active(true) ] ).collapsable() .icon(ProfileIcon::new().into()) %>
    - <%+ Dropdown::new( + <%+ Dropdown::nav( vec![ - StaticNavLink::new("Test".into(), "#test".into()) + StaticNavLink::new("Test1".into(), "#test1".into()), + StaticNavLink::new("Test2".into(), "#test2".into()), + StaticNavLink::new("Starts Active".into(), "#test".into()).active(true) ] - ).collapsable() - .text("Dropdown".into()) %> + ).collapsable() %>
    - <%+ Dropdown::new( + <%+ Dropdown::nav( vec![ StaticNavLink::new("Really long title in the dropdown".into(), "#test".into()), - StaticNavLink::new("Normal link".into(), "#test".into()) + StaticNavLink::new("Normal link".into(), "#test".into()), ] ).collapsable() .text("Really long name in the dropdown".into()) %> @@ -141,7 +146,7 @@

    Inputs

    .input_target( StimulusTarget::new() .controller("some-existing-controller") - .target_name("desired-target-name") + .name("desired-target-name") ) %>
    this is a thing that takes up space @@ -150,3 +155,9 @@

    Inputs

    + +
    + <%+ Select::new() + .options(vec!["option_pg1".to_owned(), "option2".to_owned(), "option3".to_owned()]) + .name("selectName") %> +
    From d63e4d83aa4fa8d17fc471039e8fd03f11189e03 Mon Sep 17 00:00:00 2001 From: Dan <39170265+chillenberger@users.noreply.github.com> Date: Fri, 22 Sep 2023 13:24:34 -0600 Subject: [PATCH 2/7] correct dropdown padding --- pgml-dashboard/src/components/dropdown/dropdown.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/pgml-dashboard/src/components/dropdown/dropdown.scss b/pgml-dashboard/src/components/dropdown/dropdown.scss index 8d73f49ad..938595b94 100644 --- a/pgml-dashboard/src/components/dropdown/dropdown.scss +++ b/pgml-dashboard/src/components/dropdown/dropdown.scss @@ -39,6 +39,7 @@ display: flex; justify-content: space-between; font-weight: $font-weight-normal; + padding: 16px 20px; --bs-btn-border-color: transparent; --bs-btn-border-width: 1px; From 56596c54b418b07161230c1b3e6d238cf90c7b64 Mon Sep 17 00:00:00 2001 From: Dan <39170265+chillenberger@users.noreply.github.com> Date: Fri, 22 Sep 2023 13:32:00 -0600 Subject: [PATCH 3/7] fix disappearing expand icon --- pgml-dashboard/src/components/dropdown/template.html | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pgml-dashboard/src/components/dropdown/template.html b/pgml-dashboard/src/components/dropdown/template.html index f2dd0217c..fb554d4da 100644 --- a/pgml-dashboard/src/components/dropdown/template.html +++ b/pgml-dashboard/src/components/dropdown/template.html @@ -19,9 +19,8 @@ role="button" data-bs-toggle="dropdown" data-bs-offset="<%= offset %>" - aria-expanded="false" - <%- value_target %>> - <%+ text %> + aria-expanded="false"> + ><%+ text %> expand_more From 5335763d335e6f26e6413a028a49f75441abd467 Mon Sep 17 00:00:00 2001 From: Dan <39170265+chillenberger@users.noreply.github.com> Date: Mon, 25 Sep 2023 16:39:50 -0600 Subject: [PATCH 4/7] turn off auto complete on input header --- .../src/components/inputs/text/editable_header/template.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pgml-dashboard/src/components/inputs/text/editable_header/template.html b/pgml-dashboard/src/components/inputs/text/editable_header/template.html index c9586eda7..65681507e 100644 --- a/pgml-dashboard/src/components/inputs/text/editable_header/template.html +++ b/pgml-dashboard/src/components/inputs/text/editable_header/template.html @@ -6,7 +6,7 @@ <%= value %> - > From 3ce6e260ef12958e2ec51084cc7899d3e8e5aa6f Mon Sep 17 00:00:00 2001 From: Dan <39170265+chillenberger@users.noreply.github.com> Date: Mon, 2 Oct 2023 08:38:56 -0600 Subject: [PATCH 5/7] typo edit --- .../blog/how-to-improve-search-results-with-machine-learning.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pgml-dashboard/content/blog/how-to-improve-search-results-with-machine-learning.md b/pgml-dashboard/content/blog/how-to-improve-search-results-with-machine-learning.md index 2011dd3dd..e78c1b615 100644 --- a/pgml-dashboard/content/blog/how-to-improve-search-results-with-machine-learning.md +++ b/pgml-dashboard/content/blog/how-to-improve-search-results-with-machine-learning.md @@ -216,7 +216,7 @@ This is considered a Supervised Learning problem, because we have a labeled data ### Training Data -First things first, we need to record some user clicks on our search results. We'll create a new table to store our training data, which are the observed inputs and output of our new relevance function. In a real system, we'd probably have separate tables to record **sessions**, **searches**, **results**, **clicks** and other events, but for simplicity in this example, we'll just record the exact information we need to train our model in a single table. Everytime we perform a search, we'll record the `ts_rank` for the both the **title** and **body**, and whether the user **clicked** on the result. +First things first, we need to record some user clicks on our search results. We'll create a new table to store our training data, which are the observed inputs and output of our new relevance function. In a real system, we'd probably have separate tables to record **sessions**, **searches**, **results**, **clicks** and other events, but for simplicity in this example, we'll just record the exact information we need to train our model in a single table. Everytime we perform a search, we'll record the `ts_rank` for both the **title** and **body**, and whether the user **clicked** on the result. !!! generic From 5be03a0e58af385710b94229a6fffb3d3913bd0c Mon Sep 17 00:00:00 2001 From: Dan <39170265+chillenberger@users.noreply.github.com> Date: Tue, 3 Oct 2023 08:59:44 -0600 Subject: [PATCH 6/7] web app content container mobile padding fix --- pgml-dashboard/templates/layout/web_app_base.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pgml-dashboard/templates/layout/web_app_base.html b/pgml-dashboard/templates/layout/web_app_base.html index 46f7afd44..ae588f3ef 100644 --- a/pgml-dashboard/templates/layout/web_app_base.html +++ b/pgml-dashboard/templates/layout/web_app_base.html @@ -36,7 +36,7 @@ <%- Breadcrumbs::render( breadcrumbs ) %>
    -
    +
    <%- content.unwrap_or_default() %>
    From 0ac4c8ac99f669d4f9febd99b28aca7702755bff Mon Sep 17 00:00:00 2001 From: Dan <39170265+chillenberger@users.noreply.github.com> Date: Tue, 3 Oct 2023 09:48:41 -0600 Subject: [PATCH 7/7] dropdown overflow and left nav z-index fix --- pgml-dashboard/src/components/dropdown/template.html | 2 +- pgml-dashboard/static/css/scss/components/_navs.scss | 1 + pgml-dashboard/templates/layout/web_app_base.html | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pgml-dashboard/src/components/dropdown/template.html b/pgml-dashboard/src/components/dropdown/template.html index fb554d4da..697b834db 100644 --- a/pgml-dashboard/src/components/dropdown/template.html +++ b/pgml-dashboard/src/components/dropdown/template.html @@ -41,7 +41,7 @@
    <% } %> -
      +
        <% for item in items { %> <%+ item %> <% } %> diff --git a/pgml-dashboard/static/css/scss/components/_navs.scss b/pgml-dashboard/static/css/scss/components/_navs.scss index 56763bf40..5f8b703d5 100644 --- a/pgml-dashboard/static/css/scss/components/_navs.scss +++ b/pgml-dashboard/static/css/scss/components/_navs.scss @@ -177,6 +177,7 @@ border-right: 1px solid #{$gray-500}; max-width: $left-nav-w; padding-top: 0px; + z-index: $zindex-fixed; @include media-breakpoint-down(lg) { display: none; diff --git a/pgml-dashboard/templates/layout/web_app_base.html b/pgml-dashboard/templates/layout/web_app_base.html index ae588f3ef..62cdb94a5 100644 --- a/pgml-dashboard/templates/layout/web_app_base.html +++ b/pgml-dashboard/templates/layout/web_app_base.html @@ -27,7 +27,7 @@ <%- NavbarWebApp::render(left_nav_links, account_management_nav ) %>
        -
        +
        <%- LeftNavWebApp::render( upper_left_nav, lower_left_nav, dropdown_nav ) %>








        ApplySandwichStrip

        pFad - (p)hone/(F)rame/(a)nonymizer/(d)eclutterfier!      Saves Data!


        --- a PPN by Garber Painting Akron. With Image Size Reduction included!

        Fetched URL: http://github.com/postgresml/postgresml/pull/1048.patch

        Alternative Proxies:

        Alternative Proxy

        pFad Proxy

        pFad v3 Proxy

        pFad v4 Proxy