Skip to content

Commit 1e372af

Browse files
chillenbergerchillenberger
committed
checkpoint
1 parent db92b1c commit 1e372af

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+677
-338
lines changed

‎pgml-dashboard/Cargo.lock

Lines changed: 38 additions & 36 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎pgml-dashboard/src/api/cms.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1013,7 +1013,7 @@ async fn demo(search: Option<String>) -> Result<Response, Error> {
10131013

10141014
#[cfg(debug_assertions)]
10151015
{
1016-
use crate::components::dropdown::{DropdownFrame, DropdownItems};
1016+
use crate::components::inputs::dropdown::block::index::{DropdownFrame, DropdownItems};
10171017
use crate::components::inputs::text::search::SearchOption;
10181018
if let Some(search) = search {
10191019
let candidates = vec!["hello", "world", "foo", "bar"]

‎pgml-dashboard/src/components/breadcrumbs/breadcrumbs.scss

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,5 +32,11 @@
3232
opacity: 1;
3333
color: #{$gray-600};
3434
width: 2px;
35+
transform: rotate(20deg);
36+
}
37+
38+
39+
.btn-tertiary-web-app {
40+
font-weight: $font-weight-normal;
3541
}
3642
}

‎pgml-dashboard/src/components/breadcrumbs/mod.rs

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,25 @@
11
use crate::components::NavLink;
2+
use crate::components::StaticNav;
23
use pgml_components::component;
34
use sailfish::TemplateOnce;
45

56
#[derive(TemplateOnce)]
67
#[template(path = "breadcrumbs/template.html")]
78
pub struct Breadcrumbs<'a> {
9+
pub dropdown_1: StaticNav,
10+
pub dropdown_2: StaticNav,
811
pub links: Vec<NavLink<'a>>,
912
}
1013

1114
impl<'a> Breadcrumbs<'a> {
12-
pub fn render(links: Vec<NavLink<'a>>) -> String {
13-
Breadcrumbs { links }.render_once().unwrap()
15+
pub fn render(dropdown_1: StaticNav, dropdown_2: StaticNav, links: Vec<NavLink<'a>>) -> String {
16+
Breadcrumbs {
17+
dropdown_1,
18+
dropdown_2,
19+
links,
20+
}
21+
.render_once()
22+
.unwrap()
1423
}
1524
}
1625

‎pgml-dashboard/src/components/breadcrumbs/template.html

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<%
22
use crate::utils::config;
33
use crate::utils::urls;
4+
use crate::components::inputs::dropdown::inline::index::Index as Dropdown;
45

56
let home_uri = if config::standalone_dashboard() {
67
urls::deployment_notebooks()
@@ -12,15 +13,15 @@
1213
<nav>
1314
<nav aria-label="breadcrumb z-1">
1415
<ol class="breadcrumb">
15-
<li class="breadcrumb-item body-regular-text <% if links.is_empty() {%>active<% } %>">
16-
<a class="d-flex gap-2 align-items-center" href="<%- home_uri %>">
17-
<span class="icon-owl icomoon"></span>
18-
Home
19-
</a>
20-
</li>
16+
<% if !dropdown_1.links.is_empty() {%>
17+
<%+ Dropdown::new()
18+
.set_nav_items(dropdown_1) %>
19+
<% } %>
2120

22-
<% if !links.is_empty() {%>
21+
<% if !dropdown_2.links.is_empty() {%>
2322
<div class="vr my-1 mx-2"></div>
23+
<%+ Dropdown::new()
24+
.set_nav_items(dropdown_2) %>
2425
<% } %>
2526

2627
<% for link in links {

‎pgml-dashboard/src/components/dropdown/dropdown.scss

Lines changed: 0 additions & 114 deletions
This file was deleted.

‎pgml-dashboard/src/components/dropdown/template.html

Lines changed: 0 additions & 48 deletions
This file was deleted.

‎pgml-dashboard/src/components/dropdown/dropdown_frame.html renamed to ‎pgml-dashboard/src/components/inputs/dropdown/block/index/dropdown_frame.html

File renamed without changes.

‎pgml-dashboard/src/components/dropdown/dropdown_items.html renamed to ‎pgml-dashboard/src/components/inputs/dropdown/block/index/dropdown_items.html

File renamed without changes.

0 commit comments

Comments
 (0)
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