X-Git-Url: http://git.euphorik.ch/?a=blobdiff_plain;f=backend%2Fsrc%2Fmain.rs;h=98bebc9ba1778bc33ff5e1e6a32839a6af7b006e;hb=aedfae1d17d2fd39b3b1f4889723d627fcc79218;hp=b483ce26cab7823e5f28df6f66af397fdd2229b7;hpb=c951ba6d37d525f00c6fb92eb5ab72e1ae311791;p=recipes.git diff --git a/backend/src/main.rs b/backend/src/main.rs index b483ce2..98bebc9 100644 --- a/backend/src/main.rs +++ b/backend/src/main.rs @@ -1,30 +1,31 @@ -use std::io::prelude::*; -use std::{fs::File, env::args}; +use std::fs::File; +use std::sync::Mutex; use actix_files as fs; -use actix_web::{get, web, Responder, middleware, App, HttpServer, HttpResponse, HttpRequest, web::Query}; - +use actix_web::{get, web, Responder, middleware, App, HttpServer, HttpRequest}; use askama_actix::Template; +use chrono::prelude::*; +use clap::Parser; use ron::de::from_reader; use serde::Deserialize; -use itertools::Itertools; - mod consts; -mod model; mod db; +mod hash; +mod model; +mod user; #[derive(Template)] #[template(path = "home.html")] struct HomeTemplate { - recipes: Vec + recipes: Vec<(i32, String)>, } #[derive(Template)] #[template(path = "view_recipe.html")] struct ViewRecipeTemplate { - recipes: Vec, - current_recipe: db::Recipe + recipes: Vec<(i32, String)>, + current_recipe: model::Recipe, } #[derive(Deserialize)] @@ -33,13 +34,16 @@ pub struct Request { } #[get("/")] -async fn home_page(req: HttpRequest) -> impl Responder { - HomeTemplate { recipes: vec![ db::Recipe { title: String::from("Saumon en croûte feuilletée"), id: 1 }, db::Recipe { title: String::from("Croissant au jambon"), id: 2 } ] } +async fn home_page(req: HttpRequest, connection: web::Data) -> impl Responder { + HomeTemplate { recipes: connection.get_all_recipe_titles().unwrap() } // TODO: unwrap. } #[get("/recipe/view/{id}")] -async fn view_page(req: HttpRequest, path: web::Path<(i32,)>) -> impl Responder { - ViewRecipeTemplate { recipes: vec![ db::Recipe { title: String::from("Saumon en croûte feuilletée"), id: 1 }, db::Recipe { title: String::from("Croissant au jambon"), id: 2 } ], current_recipe: db::Recipe { title: String::from("Saumon en croûte feuilletée"), id: 1 } } +async fn view_recipe(req: HttpRequest, path: web::Path<(i32,)>, connection: web::Data) -> impl Responder { + ViewRecipeTemplate { + recipes: connection.get_all_recipe_titles().unwrap(), + current_recipe: connection.get_recipe(path.0).unwrap(), + } } #[derive(Debug, Deserialize)] @@ -72,18 +76,19 @@ async fn main() -> std::io::Result<()> { println!("Configuration: {:?}", config); - // let database_connection = db::create_or_update(); + let db_connection = web::Data::new(db::Connection::new().unwrap()); // TODO: remove unwrap. std::env::set_var("RUST_LOG", "actix_web=info"); let mut server = HttpServer::new( - || { + move || { App::new() .wrap(middleware::Logger::default()) .wrap(middleware::Compress::default()) + .app_data(db_connection.clone()) .service(home_page) - .service(view_page) + .service(view_recipe) .service(fs::Files::new("/static", "static").show_files_listing()) } ); @@ -93,7 +98,37 @@ async fn main() -> std::io::Result<()> { server.run().await } +#[derive(Parser, Debug)] +struct Args { + #[arg(long)] + dbtest: bool +} + fn process_args() -> bool { + let args = Args::parse(); + + if args.dbtest { + match db::Connection::new() { + Ok(con) => { + if let Err(error) = con.execute_file("sql/data_test.sql") { + println!("Error: {:?}", error); + } + // Set the creation datetime to 'now'. + con.execute_sql("UPDATE [User] SET [creation_datetime] = ?1 WHERE [email] = 'paul@test.org'", [Utc::now()]).unwrap(); + }, + Err(error) => { + println!("Error: {:?}", error) + }, + } + + return true; + } + + false + + /* + + fn print_usage() { println!("Usage:"); println!(" {} [--help] [--test]", get_exe_name()); @@ -111,6 +146,6 @@ fn process_args() -> bool { } return true } - false + */ }