center web app content, remove dead code, left nav boarder radius on …

…button click
postgresml · chillenberger · Oct 12, 2023 · Oct 11, 2023 · Oct 12, 2023 · Oct 12, 2023
commit 8a11d6c58690585bd3939a3390cfe617ed8a8aef
diff --git a/pgml-dashboard/src/components/navbar/mod.rs b/pgml-dashboard/src/components/navbar/mod.rs
@@ -4,7 +4,7 @@ use pgml_components::component;
 use sailfish::TemplateOnce;
 
 #[derive(TemplateOnce)]
-#[template(path = "layout/nav/top.html")]
+#[template(path = "navbar/template.html")]
 pub struct Navbar {
     pub current_user: Option<models::User>,
     pub standalone_dashboard: bool,

diff --git a/pgml-dashboard/src/components/navbar/template.html b/pgml-dashboard/src/components/navbar/template.html
@@ -6,7 +6,6 @@
       <div class="container gap-4">
         <div class="controls">
           <%+ PostgresLogo::new("/") %>
-
           <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
             <span class="navbar-toggler-icon"></span>
           </button>

diff --git a/pgml-dashboard/src/components/navbar_web_app/template.html b/pgml-dashboard/src/components/navbar_web_app/template.html
@@ -19,7 +19,7 @@
 
         <!-- Button to toggle collapsed menu for less than lg screens -->
         <button class="navbar-toggler collapsed topnav-controlls" type="button" data-bs-toggle="collapse" data-bs-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
-          <% include!("../../../templates/components/profile_icon.html"); %>
+          <%+ ProfileIcon::new() %>
         </button>
       </div>
 

diff --git a/pgml-dashboard/static/css/scss/components/_navs.scss b/pgml-dashboard/static/css/scss/components/_navs.scss
@@ -257,6 +257,7 @@
     &:active, :focus, :target, .active {
         background-color: #{$neon-tint-100};
         color: #{$gray-100};
+        border-radius: calc($border-radius / 2);
 
         span {
             color: #{$gray-100};

diff --git a/pgml-dashboard/static/css/scss/layout/_containers.scss b/pgml-dashboard/static/css/scss/layout/_containers.scss
@@ -148,6 +148,6 @@
 
 .webapp-content-max-width-container {
     max-width: $webapp-content-max-width;
-    margin-left: 0px;
+    margin: 0px auto;
     min-height: calc(100vh - $navbar-height - $breadcrumb-height - 1px);
   }
diff --git a/pgml-dashboard/templates/layout/nav/left_web_app.html b/pgml-dashboard/templates/layout/nav/left_web_app.html
diff --git a/pgml-dashboard/templates/layout/nav/top.html b/pgml-dashboard/templates/layout/nav/top.html
diff --git a/pgml-dashboard/templates/layout/nav/top_web_app.html b/pgml-dashboard/templates/layout/nav/top_web_app.html