X-Git-Url: http://git.euphorik.ch/?p=recipes.git;a=blobdiff_plain;f=backend%2Fsrc%2Fmain.rs;fp=backend%2Fsrc%2Fmain.rs;h=0d343413a4e754b25b33b55d20af4b400fb67260;hp=df7c44b85e033695c12a663a679c10600d3cab64;hb=0a1631e66c861de2799cd98fc93686ff121c9fce;hpb=cbe276fc0601041b13087a6ffd80c5b126dfbe59 diff --git a/backend/src/main.rs b/backend/src/main.rs index df7c44b..0d34341 100644 --- a/backend/src/main.rs +++ b/backend/src/main.rs @@ -1,24 +1,26 @@ use actix_files as fs; -use actix_web::{web, middleware, App, HttpServer}; +use actix_web::{middleware, web, App, HttpServer}; use chrono::prelude::*; use clap::Parser; use log::error; use data::db; +mod config; mod consts; -mod utils; mod data; +mod email; mod hash; mod model; -mod user; -mod email; -mod config; mod services; +mod user; +mod utils; #[actix_web::main] async fn main() -> std::io::Result<()> { - if process_args() { return Ok(()) } + if process_args() { + return Ok(()); + } std::env::set_var("RUST_LOG", "info,actix_web=info"); env_logger::init(); @@ -32,27 +34,26 @@ async fn main() -> std::io::Result<()> { let db_connection = web::Data::new(db::Connection::new().unwrap()); - let server = - HttpServer::new(move || { - App::new() - .wrap(middleware::Logger::default()) - .wrap(middleware::Compress::default()) - .app_data(db_connection.clone()) - .app_data(config.clone()) - .service(services::home_page) - .service(services::sign_up_get) - .service(services::sign_up_post) - .service(services::sign_up_check_email) - .service(services::sign_up_validation) - .service(services::sign_in_get) - .service(services::sign_in_post) - .service(services::sign_out) - .service(services::view_recipe) - .service(services::edit_recipe) - .service(fs::Files::new("/static", "static")) - .default_service(web::to(services::not_found)) - }); - //.workers(1); + let server = HttpServer::new(move || { + App::new() + .wrap(middleware::Logger::default()) + .wrap(middleware::Compress::default()) + .app_data(db_connection.clone()) + .app_data(config.clone()) + .service(services::home_page) + .service(services::sign_up_get) + .service(services::sign_up_post) + .service(services::sign_up_check_email) + .service(services::sign_up_validation) + .service(services::sign_in_get) + .service(services::sign_in_post) + .service(services::sign_out) + .service(services::view_recipe) + .service(services::edit_recipe) + .service(fs::Files::new("/static", "static")) + .default_service(web::to(services::not_found)) + }); + //.workers(1); server.bind(&format!("0.0.0.0:{}", port))?.run().await } @@ -60,7 +61,7 @@ async fn main() -> std::io::Result<()> { #[derive(Parser, Debug)] struct Args { #[arg(long)] - dbtest: bool + dbtest: bool, } fn process_args() -> bool { @@ -73,11 +74,15 @@ fn process_args() -> bool { eprintln!("{}", error); } // Set the creation datetime to 'now'. - con.execute_sql("UPDATE [User] SET [creation_datetime] = ?1 WHERE [email] = 'paul@test.org'", [Utc::now()]).unwrap(); - }, + con.execute_sql( + "UPDATE [User] SET [creation_datetime] = ?1 WHERE [email] = 'paul@test.org'", + [Utc::now()], + ) + .unwrap(); + } Err(error) => { eprintln!("{}", error); - }, + } } return true;