Move index to main & make ErrorResponder public
This commit is contained in:
parent
5970760055
commit
56f1a1375e
@ -7,6 +7,11 @@ use database::set_up_db;
|
||||
mod webserver_member;
|
||||
use webserver_member::*;
|
||||
|
||||
#[get("/")]
|
||||
fn index() -> &'static str {
|
||||
"Hello, world!\nNothing useful is served here."
|
||||
}
|
||||
|
||||
#[launch]
|
||||
async fn rocket() -> _ {
|
||||
let db = match set_up_db().await {
|
||||
|
||||
@ -15,8 +15,8 @@ use sea_orm::*;
|
||||
|
||||
#[derive(Responder)]
|
||||
#[response(status = 500, content_type = "text/plain")]
|
||||
struct ErrorResponder {
|
||||
message: String
|
||||
pub struct ErrorResponder {
|
||||
pub message: String
|
||||
}
|
||||
|
||||
impl From<DbErr> for ErrorResponder {
|
||||
@ -35,11 +35,6 @@ impl From<&str> for ErrorResponder {
|
||||
}
|
||||
}
|
||||
|
||||
#[get("/")]
|
||||
pub fn index() -> &'static str {
|
||||
"Hello, world!\nNothing useful is served here."
|
||||
}
|
||||
|
||||
#[get("/members")]
|
||||
pub async fn get_members(db: &State<DatabaseConnection>) -> Result<Json<MultipleMembersStruct>, ErrorResponder> {
|
||||
let db = db as &DatabaseConnection;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user