update breadcrumb, left nav

chillenberger · chillenberger · commit e2e5e9de8dae · 2024-11-12T16:50:12.000-07:00
diff --git a/pgml-dashboard/src/components/breadcrumbs/template.html b/pgml-dashboard/src/components/breadcrumbs/template.html
@@ -15,15 +15,19 @@
     <ol class="breadcrumb">
       <% if !dropdown_1.links.is_empty() {%>
       <%+ Dropdown::new()
-        .set_nav_items(dropdown_1) %>
+        .set_nav_items(dropdown_1.clone()) %>
       <% } %>
 
       <% if !dropdown_2.links.is_empty() {%>
-      <div class="vr my-1 mx-2"></div>
+        <div class="vr my-1 mx-2"></div>
       <%+ Dropdown::new()
         .set_nav_items(dropdown_2) %>
       <% } %>
 
+      <% if !dropdown_1.links.is_empty() && !links.is_empty() {%>
+      <div class="vr my-1 mx-2"></div> 
+      <% } %>
+
       <% for link in links {
         let active = if link.active {
           "active"
diff --git a/pgml-dashboard/src/components/navigation/left_nav/web_app/mod.rs b/pgml-dashboard/src/components/navigation/left_nav/web_app/mod.rs
@@ -11,10 +11,13 @@ pub struct WebApp {
     pub upper_nav: LeftNavMenu,
     pub lower_nav: LeftNavMenu,
     pub id: Option<String>,
+    pub home_link: String,
 }
 
 impl WebApp {
-    pub fn new(upper_nav: StaticNav) -> WebApp {
+    pub fn new(mut upper_nav: StaticNav) -> WebApp {
+        let home_link = upper_nav.links.remove(0).href;
+
         let mut upper_nav_items = vec![];
         for item in upper_nav.links {
             upper_nav_items.push(LeftNavItem::from_static_nav(&item).into());
@@ -37,6 +40,7 @@ impl WebApp {
             upper_nav,
             lower_nav,
             id: None,
+            home_link,
         }
     }
 
diff --git a/pgml-dashboard/src/components/navigation/left_nav/web_app/template.html b/pgml-dashboard/src/components/navigation/left_nav/web_app/template.html
@@ -1,9 +1,4 @@
-<% 
-  use crate::utils::config;
-  use crate::templates::components::PostgresLogo; 
-  let standalone_dashboard = config::standalone_dashboard();
-  let home_link = if standalone_dashboard {"/"} else {"/deployments"};
-%>
+<% use crate::templates::components::PostgresLogo; %>
 <div class="leftnav-container py-3 font-family-primary" data-controller="navigation-left-nav-web-app" data-turbo-permanent id='<%- id.unwrap_or_else(|| String::from("defaultId"))%>'>
   <nav 
     class="leftnav nav-pills h-100" 
@@ -14,7 +9,7 @@
       <div class="d-flex flex-column h-100">
         <span class="leftnav-collapse collapse" data-extend-bs-collapse-target="stateReference" data-navigation-left-nav-web-app-target="stateReference"></span>
         <div class="leftnav-collapse-affect collapsed overflow-hidden" style="height: 3rem;">
-          <%+ PostgresLogo::new(home_link).collapsable() %>
+          <%+ PostgresLogo::new(&home_link).collapsable() %>
         </div>
         <div class="d-flex flex-column justify-content-between h-100">
           <%+ upper_nav %>
diff --git a/pgml-dashboard/src/components/navigation/left_nav/web_app/web_app.scss b/pgml-dashboard/src/components/navigation/left_nav/web_app/web_app.scss
@@ -1,7 +1,6 @@
 .leftnav-container {
-    position: fixed; 
-    top: $navbar-height; 
-    height: calc( 100vh - $navbar-height );
+    position: fixed;
+    height: 100vh;
     background-color: var(--webapp-nav-bg);
     max-width: $left-nav-w;
     padding-top: 0px;
diff --git a/pgml-dashboard/src/components/navigation/navbar/web_app/template.html b/pgml-dashboard/src/components/navigation/navbar/web_app/template.html
@@ -8,7 +8,7 @@
   let home_link = if standalone_dashboard {"/"} else {"/deployments"};
 %>
 
-  <div class="fixed-top-nav font-family-primary" data-controller="navigation-navbar-web-app">
+  <div class="fixed-top-nav font-family-primary d-block d-lg-none" data-controller="navigation-navbar-web-app">
     <nav class="navbar-web-app horizontal navbar-expand-lg" data-controller="search topnav-web-app">
       
       <div class="controls">
diff --git a/pgml-dashboard/static/css/scss/layout/_containers.scss b/pgml-dashboard/static/css/scss/layout/_containers.scss
@@ -150,7 +150,7 @@
 .webapp-content-max-width-container {
     max-width: $webapp-content-max-width;
     margin: 0px 20px;
-    min-height: calc(100vh - $navbar-height - $breadcrumb-height - 1px);
+    min-height: calc(100vh - $breadcrumb-height - 1px);
     
     @include media-breakpoint-up(md) {
         margin: 0px auto;
diff --git a/pgml-dashboard/templates/layout/web_app_base.html b/pgml-dashboard/templates/layout/web_app_base.html
@@ -19,7 +19,7 @@
                         <%+ WebAppLeftNav::new(product_left_nav.clone())
                             .id(&product_left_nav.unique_id()) %>
     
-                        <div class="clear-from-under-navbar flex-grow-1 min-vw-0 web-app-content-area">
+                        <div class="flex-grow-1 min-vw-0 web-app-content-area">
                             <div class="px-4 px-sm-5 py-3 d-none d-lg-flex" style="position: absolute">
                                 <%- Breadcrumbs::render(org_dropdown, deployment_dropdown, breadcrumbs) %>
                             </div>
