🌐 AI搜索 & 代理 主页
Skip to content

Commit c1664d1

Browse files
chillenbergerchillenberger
committed
remove product lower left nav, remove account management nav, style update
1 parent d5d1ac7 commit c1664d1

File tree

8 files changed

+51
-101
lines changed

8 files changed

+51
-101
lines changed

‎pgml-dashboard/src/components/navigation/left_nav/web_app/mod.rs‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,12 @@ use sailfish::TemplateOnce;
66
#[template(path = "navigation/left_nav/web_app/template.html")]
77
pub struct WebApp {
88
pub upper_nav: StaticNav,
9-
pub lower_nav: StaticNav,
109
pub id: Option<String>,
1110
}
1211

1312
impl WebApp {
14-
pub fn new(upper_nav: StaticNav, lower_nav: StaticNav) -> WebApp {
15-
WebApp {
16-
upper_nav,
17-
lower_nav,
18-
id: None,
19-
}
13+
pub fn new(upper_nav: StaticNav) -> WebApp {
14+
WebApp { upper_nav, id: None }
2015
}
2116

2217
pub fn id(mut self, id: &str) -> WebApp {

‎pgml-dashboard/src/components/navigation/left_nav/web_app/template.html‎

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
<% use crate::components::{LeftNavMenu, Dropdown}; %>
2+
<% use crate::components::LeftNavMenu; %>
33
<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"))%>'>
44
<nav
55
class="leftnav nav-pills h-100"
@@ -8,18 +8,9 @@
88
data-action="mousemove@document->navigation-left-nav-web-app#checkIfHover">
99
<div class="d-flex flex-column justify-content-between h-100 menu-container leftnav-collapse-affect collapsed">
1010
<div class="d-flex flex-column">
11-
12-
<!-- <button class="btn btn-left-nav-toggle mb-4" type="button" data-bs-toggle="collapse" data-bs-target=".leftnav-collapse" aria-expanded="true">
13-
<span class="left-nav-toggle-icon material-symbols-outlined leftnav-collapse-affect expanded">
14-
keyboard_double_arrow_left
15-
</span>
16-
<span class="collapse collapse-horizontal leftnav-collapse show" data-extend-bs-collapse-target="stateReference"></span>
17-
</button> -->
18-
1911
<span class="leftnav-collapse collapse" data-extend-bs-collapse-target="stateReference" data-navigation-left-nav-web-app-target="stateReference"></span>
2012
<%+ LeftNavMenu { nav: upper_nav } %>
2113
</div>
22-
<%+ LeftNavMenu { nav: lower_nav} %>
2314
</div>
2415
</nav>
2516
</div>

‎pgml-dashboard/src/components/navigation/navbar/web_app/mod.rs‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,13 @@ use sailfish::TemplateOnce;
66
#[template(path = "navigation/navbar/web_app/template.html")]
77
pub struct WebApp {
88
pub links: Vec<StaticNavLink>,
9-
pub account_management_nav: StaticNav,
109
pub deployment_controls: StaticNav,
1110
}
1211

1312
impl WebApp {
1413
pub fn new(links: Vec<StaticNavLink>, deployment_controls: StaticNav) -> WebApp {
1514
WebApp {
1615
links,
17-
account_management_nav: StaticNav::default(),
1816
deployment_controls,
1917
}
2018
}

‎pgml-dashboard/src/components/navigation/navbar/web_app/template.html‎

Lines changed: 45 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
<%
2-
use crate::utils::config;
3-
use crate::templates::components::GithubIcon;
2+
use crate::utils::config;
43
use crate::templates::components::PostgresLogo;
5-
use crate::components::{Dropdown, ProfileIcon};
4+
use crate::components::Dropdown;
65

76
let standalone_dashboard = config::standalone_dashboard();
87
%>
@@ -60,28 +59,22 @@
6059
<a class="nav-link p-lg-0" href="/blog">Blog</a>
6160
</li>
6261

62+
<% if !standalone_dashboard { %>
6363
<li class="nav-item d-flex align-items-center">
6464
<a class="nav-link p-lg-0" href="/support">Support</a>
6565
</li>
66-
67-
<% if !account_management_nav.links.is_empty() { %>
68-
<li class="d-none d-lg-flex nav-item align-items-center">
69-
<%+
70-
Dropdown::nav(account_management_nav.links.clone())
71-
.icon(ProfileIcon::new().into())
72-
.expandable()
73-
%>
74-
</li>
75-
<li class="nav-item d-flex d-lg-none align-items-center">
76-
<a class="nav-link p-lg-0" data-bs-toggle="collapse" data-bs-target=".horizontal-collapse">Account Management</a>
77-
</li>
7866
<% } %>
67+
68+
<!-- coming back to feedback -->
69+
<!-- <li class="d-none d-lg-flex nav-item align-items-center">
70+
<a class="nav-link p-lg-0" href="/support">Feedback lgscb</a>
71+
</li> -->
7972
</ul>
8073

8174
<!-- Main nav links for less than lg screens -->
82-
<ul class="sub-menu-dropdown mb-2 d-lg-none">
83-
<li class="menu-item d-flex align-items-center">
84-
<button type="text" class="btn-search d-flex justify-content-between w-100 mx-4 mb-4" name="search" data-bs-toggle="modal" data-bs-target="#search" autocomplete="off" data-search-target="searchTrigger" data-action="search#openSearch">
75+
<ul class="sub-menu-dropdown mb-2 d-lg-none d-flex flex-column gap-3">
76+
<li class="nav-item d-flex align-items-center">
77+
<button type="text" class="btn-search d-flex justify-content-between w-100 mx-4 mb-2" name="search" data-bs-toggle="modal" data-bs-target="#search" autocomplete="off" data-search-target="searchTrigger" data-action="search#openSearch">
8578
Search
8679
<span class="material-symbols-outlined">
8780
search
@@ -90,28 +83,29 @@
9083
</li>
9184

9285
<li class="menu-item rounded-0 d-flex align-items-center">
93-
<a href="/docs">Docs</a>
86+
<a class="ps-4" href="/docs">Docs</a>
9487
</li>
9588

9689
<li class="menu-item rounded-0 d-flex align-items-center">
97-
<a href="/blog">Blog</a>
90+
<a class="ps-4" href="/blog">Blog</a>
9891
</li>
9992

93+
<% if !standalone_dashboard { %>
10094
<li class="menu-item rounded-0 d-flex align-items-center">
101-
<a href="/support">Support</a>
95+
<a class="ps-4" href="/support">Support</a>
10296
</li>
97+
<% } %>
10398

104-
<% if !standalone_dashboard { %>
105-
<% if !account_management_nav.links.is_empty() { %>
99+
<!-- coming back to feedback -->
100+
<!-- <% if !standalone_dashboard { %>
106101
<li class="menu-item rounded-0 d-flex align-items-center">
107-
<a href="#" data-bs-toggle="collapse" data-bs-target=".horizontal-collapse">Account Management</a>
102+
<a class="ps-4" href="#" data-bs-toggle="collapse" data-bs-target=".horizontal-collapse">Feedback</a>
108103
</li>
109-
<% } %>
110-
<% } %>
104+
<% } %> -->
111105
</ul>
112106
</div>
113107

114-
<!-- Account management for less than lg screens -->
108+
<!-- Feedback popup for less than lg screens -->
115109
<div class="nav-item collapse-horizontal horizontal-collapse collapse drawer-submenu">
116110
<ul class="sub-menu-dropdown mb-2">
117111
<a class="btn btn-tertiary-web-app ms-4" data-bs-toggle="collapse" data-bs-target=".horizontal-collapse">
@@ -120,41 +114,40 @@
120114
</span>
121115
Back
122116
</a>
123-
<% for item in account_management_nav.links.clone() { %>
124-
<li class="menu-item rounded-0 d-flex align-items-center">
125-
<a class="<% if item.disabled { %>disabled<% } %>" <% if item.disabled { %>
126-
href="" disabled <% } else { %>
127-
href="<%- item.href %>"<% } %>>
128-
<%- item.name %>
129-
</a>
130-
</li>
131-
<% } %>
117+
Feedback form will go here for mobile
132118
</ul>
133119
</div>
134120
</div>
135-
136121

137122
<!-- Left Nav menu for less than large screens -->
138123
<div class="d-lg-none">
139124
<div class="collapse navbar-collapse" id="leftNavItems">
140125
<div class="nav-item w-100 d-flex flex-column flex-lg-row collapse show drawer-submenu">
141-
<ul class="sub-menu-dropdown mb-2 d-lg-none">
142-
<li class="mobile-dashboard-button mx-2 rounded-1 d-flex menu-item">
143-
<a href="/deployments" class="py-2 text-white w-100 text-center">
144-
Dashboard
145-
</a>
146-
</li>
126+
<ul class="sub-menu-dropdown mb-2 d-lg-none d-flex flex-column gap-3">
147127
<% for link in links { %>
148-
<li class="menu-item rounded-0 d-flex align-items-center">
149-
<a
150-
class="<% if link.disabled { %> disabled <% } %> <% if link.active { %> active <% } %> d-flex gap-2"
151-
href="<% if !link.disabled { %> <%= link.href %> <% } %>">
152-
<% if link.icon.as_ref().is_some() { %>
153-
<span class="material-symbols-outlined %>"><%- link.icon.unwrap() %></span>
128+
<% if link.name.to_lowercase() == "dashboard" {%>
129+
<li class="menu-item d-flex mobile-dashboard-button mx-4 rounded-1">
130+
<a
131+
class="py-2 text-white w-100 text-center d-flex gap-2 ps-4 justify-content-center <% if link.disabled { %> disabled <% } %> <% if link.active { %> active <% } %>"
132+
href="<% if !link.disabled { %> <%= link.href %> <% } %>">
133+
<span class="d-flex align-items-center h-100">
134+
<img src="/dashboard/static/images/owl_white.webp" alt="postgresml_owl" width="12" height="16">
135+
</span>
136+
<%= link.name %>
137+
</a>
138+
</li>
139+
<% } else {%>
140+
<li class="menu-item rounded-0 d-flex align-items-center">
141+
<a
142+
class="<% if link.disabled { %> disabled <% } %> <% if link.active { %> active <% } %> d-flex gap-2 ps-4"
143+
href="<% if !link.disabled { %> <%= link.href %> <% } %>">
144+
<% if link.icon.as_ref().is_some() { %>
145+
<span class="material-symbols-outlined %>"><%- link.icon.unwrap() %></span>
146+
<% } %>
147+
<span><%= link.name %></span>
148+
</a>
149+
</li>
154150
<% } %>
155-
<span><%= link.name %></span>
156-
</a>
157-
</li>
158151
<% } %>
159152
</ul>
160153
</div>

‎pgml-dashboard/src/guards.rs‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -48,16 +48,6 @@ impl Cluster {
4848
dropdown_nav: StaticNav {
4949
links: vec![StaticNavLink::new("Local".to_string(), "/dashboard".to_string()).active(true)],
5050
},
51-
account_management_nav: StaticNav {
52-
links: vec![
53-
StaticNavLink::new("Notebooks".to_string(), "/dashboard".to_string()),
54-
StaticNavLink::new("Projects".to_string(), "/dashboard?tab=Projects".to_string()),
55-
StaticNavLink::new("Models".to_string(), "/dashboard?tab=Models".to_string()),
56-
StaticNavLink::new("Snapshots".to_string(), "/dashboard?tab=Snapshots".to_string()),
57-
StaticNavLink::new("Upload data".to_string(), "/dashboard?tab=Upload_Data".to_string()),
58-
StaticNavLink::new("PostgresML.org".to_string(), "https://postgresml.org".to_string()),
59-
],
60-
},
6151
upper_left_nav: StaticNav {
6252
links: vec![
6353
StaticNavLink::new("Notebooks".to_string(), "/dashboard?tab=Notebooks".to_string())
@@ -81,7 +71,6 @@ impl Cluster {
8171
.active(uri.is_some() && uri.clone().unwrap().starts_with("/dashboard?tab=Upload_Data")),
8272
],
8373
},
84-
lower_left_nav: StaticNav::default(),
8574
marketing_footer: MarketingFooter::new().render_once().unwrap(),
8675
head_items: None,
8776
},

‎pgml-dashboard/src/lib.rs‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,7 @@ pub struct Context {
5252
pub user: models::User,
5353
pub cluster: models::Cluster,
5454
pub dropdown_nav: StaticNav,
55-
pub account_management_nav: StaticNav,
5655
pub upper_left_nav: StaticNav,
57-
pub lower_left_nav: StaticNav,
5856
pub marketing_footer: String,
5957
pub head_items: Option<String>,
6058
}

‎pgml-dashboard/src/templates/mod.rs‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -117,9 +117,7 @@ pub struct WebAppBase<'a> {
117117
pub breadcrumbs: Vec<NavLink<'a>>,
118118
pub head: Head,
119119
pub dropdown_nav: StaticNav,
120-
pub account_management_nav: StaticNav,
121120
pub upper_left_nav: StaticNav,
122-
pub lower_left_nav: StaticNav,
123121
pub body_components: Vec<Component>,
124122
}
125123

@@ -130,9 +128,7 @@ impl<'a> WebAppBase<'a> {
130128
WebAppBase {
131129
head,
132130
dropdown_nav: context.dropdown_nav.clone(),
133-
account_management_nav: context.account_management_nav.clone(),
134131
upper_left_nav: context.upper_left_nav.clone(),
135-
lower_left_nav: context.lower_left_nav.clone(),
136132
..Default::default()
137133
}
138134
}

‎pgml-dashboard/templates/layout/web_app_base.html‎

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,9 @@
11
<%
2-
use crate::templates::components::{
3-
Breadcrumbs,
4-
StaticNavLink
5-
};
2+
use crate::templates::components::Breadcrumbs;
63
use crate::components::navigation::navbar::web_app::WebApp as WebAppNavbar;
74
use crate::components::navigation::left_nav::web_app::WebApp as WebAppLeftNav;
85
%>
96

10-
<%
11-
// collect left nav links for for top nav in mobile view
12-
let mut left_nav_links: Vec<StaticNavLink> = Vec::new();
13-
left_nav_links.append(& mut upper_left_nav.links.clone());
14-
left_nav_links.append(& mut lower_left_nav.links.clone());
15-
%>
16-
177
<!DOCTYPE html>
188
<html lang="en-US">
199
<%+ head %>
@@ -24,10 +14,10 @@
2414
<main>
2515
<div class="container-fluid p-0 min-vh-lg-100">
2616
<div class="row gx-0 min-vh-lg-100 gy-0">
27-
<%+ WebAppNavbar::new(left_nav_links, dropdown_nav) %>
17+
<%+ WebAppNavbar::new(upper_left_nav.links.clone(), dropdown_nav) %>
2818

2919
<div class="d-flex">
30-
<%+ WebAppLeftNav::new( upper_left_nav.clone(), lower_left_nav).id(&upper_left_nav.unique_id()) %>
20+
<%+ WebAppLeftNav::new( upper_left_nav.clone()).id(&upper_left_nav.unique_id()) %>
3121

3222
<div class="clear-from-under-navbar flex-grow-1 min-vw-0 web-app-content-area">
3323
<div class="px-4 px-sm-5 py-3" style="position: absolute">

0 commit comments

Comments
 (0)