break nav into smaller pieces

Cargo.toml

@@ -103,7 +103,7 @@ rustls-pemfile = "2.1.0"
 tokio-rustls = "0.25.0"
 tokio-util = "0.7.10"
 tokio = { version = "1.36.0", features = ["full"] }
-sqlx = { version = "0.7.3", default_features = false, features = ["sqlx-postgres"] }
+sqlx = { version = "0.7.3", default-features = false, features = ["sqlx-postgres"] }
 sea-orm = { version = "0.12.12", features = [ "sqlx-postgres", "sqlx-sqlite", "runtime-tokio-rustls", "macros" ] }
 sea-orm-migration = { version = "0.12.6", features = [ "sqlx-postgres", "runtime-tokio-rustls" ] }
 uuid = { version = "1.6.1", features = ["v4", "serde"] }

lapdev-api/src/organization.rs

@@ -104,7 +104,7 @@ pub async fn create_organization(
 
 pub async fn delete_organization(
     TypedHeader(cookie): TypedHeader<Cookie>,
-    Path((_, org_id)): Path<(String, Uuid)>,
+    Path(org_id): Path<Uuid>,
     State(state): State<CoreState>,
     info: RequestInfo,
 ) -> Result<Response, ApiError> {
@@ -169,7 +169,7 @@ pub async fn delete_organization(
 
 pub async fn update_org_name(
     TypedHeader(cookie): TypedHeader<Cookie>,
-    Path((_, org_id)): Path<(String, Uuid)>,
+    Path(org_id): Path<Uuid>,
     State(state): State<CoreState>,
     info: RequestInfo,
     Json(update_org): Json<UpdateOrganizationName>,

lapdev-api/src/router.rs

@@ -20,7 +20,8 @@ use crate::{
     workspace,
 };
 
-static STATIC_DIR: include_dir::Dir = include_dir::include_dir!("lapdev-dashboard/dist");
+static STATIC_DIR: include_dir::Dir =
+    include_dir::include_dir!("$CARGO_MANIFEST_DIR/../lapdev-dashboard/dist");
 
 fn private_routes() -> Router<CoreState> {
     Router::new()
@@ -34,8 +35,8 @@ fn private_routes() -> Router<CoreState> {
         )
 }
 
-fn v1_api_routes() -> Router<CoreState> {
-    Router::new()
+fn v1_api_routes(additional_router: Option<Router<CoreState>>) -> Router<CoreState> {
+    let router = Router::new()
         .route("/cluster_info", get(admin::get_cluster_info))
         .route("/auth_providers", get(admin::get_auth_providers))
         .route("/hostnames", get(admin::get_hostnames))
@@ -193,20 +194,28 @@ fn v1_api_routes() -> Router<CoreState> {
             delete(machine_type::delete_machine_type),
         )
         .route("/admin/users", get(admin::get_cluster_users))
-        .route("/admin/users/:user_id", put(admin::update_cluster_user))
+        .route("/admin/users/:user_id", put(admin::update_cluster_user));
+    if let Some(additional) = additional_router {
+        router.merge(additional)
+    } else {
+        router
+    }
 }
 
-fn main_routes() -> Router<CoreState> {
+fn main_routes(additional_router: Option<Router<CoreState>>) -> Router<CoreState> {
     Router::new()
-        .nest("/v1", v1_api_routes())
+        .nest("/v1", v1_api_routes(additional_router))
         .nest("/private", private_routes())
 }
 
-pub async fn build_router(state: CoreState) -> Router<()> {
+pub async fn build_router(
+    state: CoreState,
+    additional_router: Option<Router<CoreState>>,
+) -> Router<()> {
     Router::new()
         .route("/", any(handle_catch_all))
         .route("/*0", any(handle_catch_all))
-        .nest("/api", main_routes())
+        .nest("/api", main_routes(additional_router))
         .with_state(state)
         .layer(SecureClientIpSource::ConnectInfo.into_extension())
 }

lapdev-api/src/server.rs

@@ -1,7 +1,7 @@
 use std::{path::PathBuf, sync::Arc};
 
 use anyhow::{anyhow, Context, Result};
-use axum::extract::Request;
+use axum::{extract::Request, Router};
 use clap::Parser;
 use futures_util::pin_mut;
 use hyper::body::Incoming;
@@ -37,7 +37,7 @@ struct Cli {
     config_file: Option<PathBuf>,
 }
 
-pub async fn run() -> Result<()> {
+pub async fn run(additional_router: Option<Router<CoreState>>) -> Result<()> {
     let cli = Cli::parse();
     let config_file = cli
         .config_file
@@ -72,7 +72,7 @@ pub async fn run() -> Result<()> {
     }
 
     let state = CoreState::new(conductor, ssh_proxy_port).await;
-    let app = router::build_router(state.clone()).await;
+    let app = router::build_router(state.clone(), additional_router).await;
     let certs = state.certs.clone();
 
     {

lapdev-conductor/src/rpc.rs

@@ -1,7 +1,7 @@
 use anyhow::Result;
 use lapdev_common::{BuildTarget, PrebuildUpdateEvent, RunningWorkspace, WorkspaceUpdateEvent};
 use lapdev_db::entities;
-use lapdev_rpc::{error::ApiError, ConductorService, WorkspaceServiceClient};
+use lapdev_rpc::{error::ApiError, ConductorService};
 use sea_orm::{ActiveModelTrait, ActiveValue};
 use tarpc::context;
 use uuid::Uuid;
@@ -12,7 +12,6 @@ use crate::Conductor;
 pub struct ConductorRpc {
     pub ws_host_id: Uuid,
     pub conductor: Conductor,
-    pub ws_client: WorkspaceServiceClient,
 }
 
 impl ConductorService for ConductorRpc {

lapdev-conductor/src/server.rs

@@ -433,7 +433,6 @@ impl Conductor {
 
         let rpc = ConductorRpc {
             ws_host_id: id,
-            ws_client: ws_client.clone(),
             conductor: self.clone(),
         };
 

lapdev-dashboard/src/app.rs

@@ -34,8 +34,7 @@ async fn get_cluster_info() -> Result<ClusterInfo> {
     Ok(info)
 }
 
-#[component]
-pub fn App() -> impl IntoView {
+pub fn set_context() {
     let login_counter = create_rw_signal(0);
     provide_context(login_counter);
 
@@ -45,12 +44,6 @@ pub fn App() -> impl IntoView {
     );
     provide_context(login);
 
-    let login = create_local_resource(
-        move || login_counter.get(),
-        |_| async move { get_login().await.ok() },
-    );
-    provide_context(login);
-
     let cluster_info =
         create_local_resource(move || (), |_| async move { get_cluster_info().await.ok() });
     let cluster_info = Signal::derive(move || cluster_info.get().flatten());
@@ -68,7 +61,11 @@ pub fn App() -> impl IntoView {
         account: create_rw_signal(pathname.starts_with("/account")),
     };
     provide_context(nav_expanded);
+}
 
+#[component]
+pub fn App() -> impl IntoView {
+    set_context();
     view! {
         <Router>
             <Routes>

lapdev-dashboard/src/lib.rs

@@ -1,15 +1,14 @@
-mod account;
-mod app;
-mod audit_log;
-mod cluster;
-mod datepicker;
-mod license;
-mod modal;
-mod nav;
-mod organization;
-mod project;
-mod quota;
-mod ssh_key;
-mod usage;
-mod workspace;
-pub use app::App;
+pub mod account;
+pub mod app;
+pub mod audit_log;
+pub mod cluster;
+pub mod datepicker;
+pub mod license;
+pub mod modal;
+pub mod nav;
+pub mod organization;
+pub mod project;
+pub mod quota;
+pub mod ssh_key;
+pub mod usage;
+pub mod workspace;

lapdev-dashboard/src/main.rs

@@ -1,4 +1,4 @@
-use lapdev_dashboard::App;
+use lapdev_dashboard::app::App;
 use leptos::{mount_to_body, view};
 
 pub fn main() {