fix the api path compile error
This commit is contained in:
parent
bea8e707a2
commit
2cbcd06c1a
|
@ -0,0 +1,18 @@
|
||||||
|
use warp::{reply::Reply, reject::Rejection, Filter};
|
||||||
|
|
||||||
|
use super::state::SharedState;
|
||||||
|
|
||||||
|
mod get_all;
|
||||||
|
|
||||||
|
pub fn api_root() -> Box<dyn Reply> {
|
||||||
|
Box::new(warp::reply::json(&String::from("{ error: \"You have called the API root of a blek! File instance. Refer to https://git.blek.codes/blek/bfile.git for documentation.\" }")))
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn get_routes(state: SharedState) -> impl Filter<Extract = impl Reply, Error = Rejection> + Clone {
|
||||||
|
let api = warp::path!("api");
|
||||||
|
let api = api
|
||||||
|
.and(warp::path::end())
|
||||||
|
.map(api_root)
|
||||||
|
.or(get_all::get_all_f(state));
|
||||||
|
api
|
||||||
|
}
|
|
@ -0,0 +1,13 @@
|
||||||
|
use warp::{reply::Reply, reject::Rejection, Filter};
|
||||||
|
|
||||||
|
use crate::web::state::SharedState;
|
||||||
|
|
||||||
|
pub async fn get_all(_state: SharedState) -> Result<Box<dyn Reply>, Rejection> {
|
||||||
|
Ok(Box::new(warp::reply::json(&String::from("aaaaa"))))
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn get_all_f(state: SharedState) -> impl Filter<Extract = impl Reply, Error = Rejection> + Clone {
|
||||||
|
warp::path!("get_all")
|
||||||
|
.map(move || state.clone())
|
||||||
|
.and_then(get_all)
|
||||||
|
}
|
|
@ -12,6 +12,7 @@ mod pages;
|
||||||
mod forms;
|
mod forms;
|
||||||
mod state;
|
mod state;
|
||||||
mod rejection;
|
mod rejection;
|
||||||
|
mod api;
|
||||||
|
|
||||||
use state::SharedState;
|
use state::SharedState;
|
||||||
|
|
||||||
|
@ -20,7 +21,8 @@ pub fn routes(state: SharedState) -> impl Filter<Extract = impl Reply, Error = R
|
||||||
let staticpath = staticpath.to_str().unwrap().to_string() + "/static";
|
let staticpath = staticpath.to_str().unwrap().to_string() + "/static";
|
||||||
|
|
||||||
pages::get_routes(state.clone())
|
pages::get_routes(state.clone())
|
||||||
.or(forms::get_routes(state))
|
.or(forms::get_routes(state.clone()))
|
||||||
|
.or(api::get_routes(state))
|
||||||
.or(warp::fs::dir(staticpath.to_string()))
|
.or(warp::fs::dir(staticpath.to_string()))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue