forgot to make the 404 page return status 404
This commit is contained in:
@@ -1,5 +1,9 @@
|
|||||||
use axum::extract::{Request, State};
|
use axum::{
|
||||||
use maud::{Markup, html};
|
extract::{Request, State},
|
||||||
|
response::{IntoResponse, Response},
|
||||||
|
};
|
||||||
|
use http::StatusCode;
|
||||||
|
use maud::html;
|
||||||
|
|
||||||
use crate::{
|
use crate::{
|
||||||
MnemoState,
|
MnemoState,
|
||||||
@@ -8,13 +12,16 @@ use crate::{
|
|||||||
web::{components::nav::nav, pages::base},
|
web::{components::nav::nav, pages::base},
|
||||||
};
|
};
|
||||||
|
|
||||||
pub async fn page(State(state): State<MnemoState>, req: Request) -> Result<Markup, CompositeError> {
|
pub async fn page(
|
||||||
|
State(state): State<MnemoState>,
|
||||||
|
req: Request,
|
||||||
|
) -> Result<Response, CompositeError> {
|
||||||
let mut conn = state.pool.acquire().await?;
|
let mut conn = state.pool.acquire().await?;
|
||||||
let u = User::authenticate(&mut *conn, req.headers())
|
let u = User::authenticate(&mut *conn, req.headers())
|
||||||
.await
|
.await
|
||||||
.ok()
|
.ok()
|
||||||
.flatten();
|
.flatten();
|
||||||
Ok(base(
|
Ok((StatusCode::NOT_FOUND, base(
|
||||||
"Not Found | Mnemosyne",
|
"Not Found | Mnemosyne",
|
||||||
html!(
|
html!(
|
||||||
(nav(&mut conn, u.as_ref(), req.uri().path()).await)
|
(nav(&mut conn, u.as_ref(), req.uri().path()).await)
|
||||||
@@ -27,5 +34,5 @@ pub async fn page(State(state): State<MnemoState>, req: Request) -> Result<Marku
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
),
|
),
|
||||||
))
|
)).into_response())
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user