cargo fmt
This commit is contained in:
+7
-7
@@ -1,12 +1,10 @@
|
||||
use std::sync::Arc;
|
||||
|
||||
use crate::domain::{
|
||||
DomainError, DomainResult, GroceryList, Item, Meal, SessionUser, User,
|
||||
};
|
||||
use crate::domain::{DomainError, DomainResult, GroceryList, Item, Meal, SessionUser, User};
|
||||
use crate::ports::{
|
||||
CategoryRepository, InvitationRepository, ItemRepository, ListRepository, MealIngredientRepository,
|
||||
MealRepository, NewItem, PasswordHasher, RealtimeNotifier, SessionRepository, TokenGenerator,
|
||||
UserRepository,
|
||||
CategoryRepository, InvitationRepository, ItemRepository, ListRepository,
|
||||
MealIngredientRepository, MealRepository, NewItem, PasswordHasher, RealtimeNotifier,
|
||||
SessionRepository, TokenGenerator, UserRepository,
|
||||
};
|
||||
use crate::sqlite::SqliteDatabase;
|
||||
|
||||
@@ -312,7 +310,9 @@ impl MealService {
|
||||
pub async fn create_meal(&self, name: String, description: String) -> DomainResult<Meal> {
|
||||
let meals = Arc::clone(&self.meals);
|
||||
self.db
|
||||
.run(move |txn| Box::pin(async move { meals.create_meal(txn, name, description).await }))
|
||||
.run(move |txn| {
|
||||
Box::pin(async move { meals.create_meal(txn, name, description).await })
|
||||
})
|
||||
.await
|
||||
}
|
||||
|
||||
|
||||
+3
-16
@@ -237,11 +237,7 @@ pub fn meal_picker(meals: &[Meal], list_id: i64, csrf_token: &str) -> Markup {
|
||||
}
|
||||
}
|
||||
|
||||
pub fn meal_form_page(
|
||||
user: &User,
|
||||
meal: Option<&Meal>,
|
||||
csrf_token: &str,
|
||||
) -> Markup {
|
||||
pub fn meal_form_page(user: &User, meal: Option<&Meal>, csrf_token: &str) -> Markup {
|
||||
let (title, action, name, description) = match meal {
|
||||
Some(meal) => (
|
||||
"Edit meal",
|
||||
@@ -276,12 +272,7 @@ pub fn meal_form_page(
|
||||
)
|
||||
}
|
||||
|
||||
pub fn meal_page(
|
||||
user: &User,
|
||||
meal: &Meal,
|
||||
categories: &[Category],
|
||||
csrf_token: &str,
|
||||
) -> Markup {
|
||||
pub fn meal_page(user: &User, meal: &Meal, categories: &[Category], csrf_token: &str) -> Markup {
|
||||
page(
|
||||
&meal.name,
|
||||
Some(user),
|
||||
@@ -743,11 +734,7 @@ fn category_options(categories: &[Category], selected: Option<i64>) -> Markup {
|
||||
}
|
||||
}
|
||||
|
||||
pub fn categories_panel(
|
||||
categories: &[Category],
|
||||
csrf_token: &str,
|
||||
out_of_band: bool,
|
||||
) -> Markup {
|
||||
pub fn categories_panel(categories: &[Category], csrf_token: &str, out_of_band: bool) -> Markup {
|
||||
let panel = html! {
|
||||
div class="panel-heading" {
|
||||
h2 { "Categories" }
|
||||
|
||||
Reference in New Issue
Block a user