feat: remove error handler

rust-dd · Sep 3, 2024 · f6e4f1d · f6e4f1d
1 parent 293fa55
commit f6e4f1d
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 151 deletions.
diff --git a/src/app.rs b/src/app.rs
@@ -5,7 +5,6 @@ use leptos_icons::Icon;
 use leptos_meta::*;
 use leptos_router::*;
 
-use crate::error_template::{AppError, ErrorTemplate};
 use crate::{home, post};
 
 #[component]
@@ -51,14 +50,10 @@ pub fn App() -> impl IntoView {
                 </div>
             </header>
             <main class="container flex flex-col gap-8 py-12 px-4 mx-auto mt-16 max-w-5xl md:px-0">
-                <Router fallback=|| {
-                    let mut outside_errors = Errors::default();
-                    outside_errors.insert_with_default_key(AppError::NotFound);
-                    view! { <ErrorTemplate outside_errors /> }.into_view()
-                }>
+                <Router>
                     <Routes>
-                        <Route path="" view=home::Component ssr=SsrMode::Async />
-                        <Route path="/post/:slug" view=post::Component ssr=SsrMode::Async />
+                        <Route path="/" view=home::Component ssr=SsrMode::Async />
+                        <Route path="/post/:slug/" view=post::Component ssr=SsrMode::Async />
                     </Routes>
                 </Router>
             </main>

diff --git a/src/error_template.rs b/src/error_template.rs
diff --git a/src/fileserv.rs b/src/fileserv.rs
diff --git a/src/lib.rs b/src/lib.rs
@@ -2,13 +2,10 @@
 
 pub mod api;
 pub mod app;
-pub mod error_template;
-#[cfg(feature = "ssr")]
-pub mod fileserv;
-#[cfg(feature = "ssr")]
-pub mod redirect;
 pub mod home;
 pub mod post;
+#[cfg(feature = "ssr")]
+pub mod redirect;
 
 #[cfg(feature = "hydrate")]
 #[wasm_bindgen::prelude::wasm_bindgen]

diff --git a/src/main.rs b/src/main.rs
@@ -2,14 +2,14 @@
 #[tokio::main]
 async fn main() {
     use axum::extract::State;
+    use axum::http::StatusCode;
     use axum::response::Response;
     use axum::{routing::get, Router};
     use blog::api::{process_markdown, Post};
     use blog::app::App;
-    use blog::fileserv::file_and_error_handler;
+    use blog::redirect::redirect_www;
     use blog::ssr::AppState;
     use chrono::{DateTime, Utc};
-    use blog::redirect::redirect_www;
     use dotenvy::dotenv;
     use leptos::*;
     use leptos_axum::{generate_route_list, LeptosRoutes};
@@ -138,8 +138,12 @@ async fn main() {
             App,
         )
         .route("/rss.xml", get(rss_handler))
-        .fallback(file_and_error_handler)
-        .layer(tower::ServiceBuilder::new().layer(TraceLayer::new_for_http()).layer(axum::middleware::from_fn(redirect_www)))
+        .fallback((|| (StatusCode::NOT_FOUND, "Not Found".to_string()))())
+        .layer(
+            tower::ServiceBuilder::new()
+                .layer(TraceLayer::new_for_http())
+                .layer(axum::middleware::from_fn(redirect_www)),
+        )
         .with_state(app_state);
 
     let listener = tokio::net::TcpListener::bind(&addr).await.unwrap();

diff --git a/src/post.rs b/src/post.rs
@@ -20,8 +20,8 @@ pub fn Component() -> impl IntoView {
                 post.with(|post| {
                     let post = post.clone().unwrap_or_default();
                     view! {
-                        // <Title text=post.title.to_string() />
-                        // <Meta name="description" content=post.summary.to_string() />
+                        <Title text=post.title.to_string() />
+                        <Meta name="description" content=post.summary.to_string() />
                         // <Meta property="og:type" content="article" />
                         // <Meta property="og:title" content=post.title.to_string() />
                         // <Meta property="og:description" content=post.summary.to_string() />