Gitgals/Server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move index to main & make ErrorResponder public

Browse Source
This commit is contained in:
Sebastian H. Gabrielli 2023-12-25 15:51:31 +01:00
parent 5970760055
commit 56f1a1375e
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main.rs
View File

@ -7,6 +7,11 @@ use database::set_up_db;
mod webserver_member; mod webserver_member;
use webserver_member::*; use webserver_member::*;
#[get("/")]
fn index() -> &'static str {
"Hello, world!\nNothing useful is served here."
}
#[launch] #[launch]
async fn rocket() -> _ { async fn rocket() -> _ {
let db = match set_up_db().await { let db = match set_up_db().await {

9
src/webserver_member.rs
View File

@ -15,8 +15,8 @@ use sea_orm::*;
#[derive(Responder)] #[derive(Responder)]
#[response(status = 500, content_type = "text/plain")] #[response(status = 500, content_type = "text/plain")]
struct ErrorResponder { pub struct ErrorResponder {
message: String pub message: String
} }
impl From<DbErr> for ErrorResponder { 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")] #[get("/members")]
pub async fn get_members(db: &State<DatabaseConnection>) -> Result<Json<MultipleMembersStruct>, ErrorResponder> { pub async fn get_members(db: &State<DatabaseConnection>) -> Result<Json<MultipleMembersStruct>, ErrorResponder> {
let db = db as &DatabaseConnection; let db = db as &DatabaseConnection;