From c25c63517ac5cae1f833a2ca2806bfafbc3d8529 Mon Sep 17 00:00:00 2001 From: guochao Date: Wed, 16 Oct 2024 17:49:02 +0800 Subject: [PATCH] cargo fmt and some minor formatting --- src/bin/server.rs | 44 +++++++++++++++++++++------------- src/bin/worker.rs | 2 +- src/frontend/app.rs | 3 +-- src/frontend/components.rs | 2 +- src/frontend/components/nav.rs | 25 ++++++++++++++----- src/frontend/pages.rs | 6 ++--- src/frontend/pages/_404.rs | 2 +- src/frontend/pages/index.rs | 3 +-- src/frontend/worker.rs | 2 +- 9 files changed, 56 insertions(+), 33 deletions(-) diff --git a/src/bin/server.rs b/src/bin/server.rs index 903750c..8533e6a 100644 --- a/src/bin/server.rs +++ b/src/bin/server.rs @@ -60,9 +60,13 @@ async fn rendering_pages( None | Some(Route::NotFound) => axum::http::StatusCode::NOT_FOUND, _ => axum::http::StatusCode::OK, }; - + let rendered = renderer.render().await; - (status_code, Html::from(INDEX_PAGE.replace("", &rendered))).into_response() + ( + status_code, + Html::from(INDEX_PAGE.replace("", &rendered)), + ) + .into_response() } #[tracing::instrument] @@ -85,14 +89,19 @@ async fn static_assets(Path(path): Path) -> Response { #[tokio::main] async fn main() -> anyhow::Result<()> { #[cfg(feature = "console-subscriber")] - tracing_subscriber::registry() - .with(console_subscriber::spawn()) - .with(tracing_subscriber::fmt::layer()) - .init(); + { + tracing_subscriber::registry() + .with(console_subscriber::spawn()) + .with(tracing_subscriber::fmt::layer()) + .init(); + tracing::debug!("console subscriber configured successfully"); + } #[cfg(not(feature = "console-subscriber"))] - tracing_subscriber::fmt().init(); - + { + tracing_subscriber::fmt().init(); + tracing::debug!("simple subscriber configured successfully"); + } let api_router = axum::Router::new(); let oauth_router = axum::Router::new(); @@ -107,21 +116,24 @@ async fn main() -> anyhow::Result<()> { // with login .route("/networks", axum::routing::get(rendering_pages)) // nesting router - .nest("/api/", api_router) - .nest("/o/", oauth_router) + .nest("/api", api_router) + .nest("/o", oauth_router) .nest("/sse", sse_router) // fallback .fallback(rendering_pages) .layer( - tower::ServiceBuilder::new().layer( - tower_http::trace::TraceLayer::new_for_http() - .make_span_with(DefaultMakeSpan::new().level(Level::INFO)) - .on_request(DefaultOnRequest::new().level(Level::INFO)) - .on_response(DefaultOnResponse::new().level(Level::INFO)), - ).catch_panic(), + tower::ServiceBuilder::new() + .layer( + tower_http::trace::TraceLayer::new_for_http() + .make_span_with(DefaultMakeSpan::new().level(Level::INFO)) + .on_request(DefaultOnRequest::new().level(Level::INFO)) + .on_response(DefaultOnResponse::new().level(Level::INFO)), + ) + .catch_panic(), ); let listener = tokio::net::TcpListener::bind("0.0.0.0:1234").await?; + tracing::info!("listening on {}", listener.local_addr()?); axum::serve(listener, router).await?; Ok(()) diff --git a/src/bin/worker.rs b/src/bin/worker.rs index e5b5497..f82c3ad 100644 --- a/src/bin/worker.rs +++ b/src/bin/worker.rs @@ -4,4 +4,4 @@ use yew_agent::Registrable; fn main() { worker::Echo::registrar().register(); worker::Counter::registrar().register(); -} \ No newline at end of file +} diff --git a/src/frontend/app.rs b/src/frontend/app.rs index e492d49..6a96d7b 100644 --- a/src/frontend/app.rs +++ b/src/frontend/app.rs @@ -3,7 +3,6 @@ use std::collections::HashMap; use yew::{function_component, html, Html}; use yew_router::history::History; - #[derive(yew_router::Routable, PartialEq, Eq, Clone, Debug)] pub enum Route { #[at("/")] @@ -30,8 +29,8 @@ fn switch(routes: Route) -> Html { #[function_component] pub fn Layout() -> Html { - use yew_router::Switch; use super::components::Nav; + use yew_router::Switch; html! { <>