Add a RON API to search recipes by title + a bit of refactoring
This commit is contained in:
parent
a3f61e3711
commit
084f7ef445
26 changed files with 499 additions and 333 deletions
|
|
@ -1,6 +1,6 @@
|
|||
use std::{cell::RefCell, rc, sync::Mutex};
|
||||
|
||||
use common::{ron_api, utils::substitute};
|
||||
use common::{web_api, utils::substitute};
|
||||
use gloo::{
|
||||
events::{EventListener, EventListenerOptions},
|
||||
net::http::Request,
|
||||
|
|
@ -14,7 +14,7 @@ use web_sys::{
|
|||
};
|
||||
|
||||
use crate::{
|
||||
modal_dialog, request,
|
||||
modal_dialog, request, ron_request,
|
||||
toast::{self, Level},
|
||||
utils::{SelectorExt, by_id, get_current_lang, selector, selector_and_clone},
|
||||
};
|
||||
|
|
@ -36,8 +36,11 @@ pub fn setup_page(recipe_id: i64) {
|
|||
current_title = title.value();
|
||||
let title = title.value();
|
||||
spawn_local(async move {
|
||||
let _ =
|
||||
request::patch::<(), _>(&format!("recipe/{recipe_id}/title"), title).await;
|
||||
let _ = ron_request::patch::<(), _>(
|
||||
&format!("/ron-api/recipe/{recipe_id}/title"),
|
||||
title,
|
||||
)
|
||||
.await;
|
||||
reload_recipes_list(recipe_id).await;
|
||||
});
|
||||
}
|
||||
|
|
@ -55,8 +58,8 @@ pub fn setup_page(recipe_id: i64) {
|
|||
current_description = description.value();
|
||||
let description = description.value();
|
||||
spawn_local(async move {
|
||||
let _ = request::patch::<(), _>(
|
||||
&format!("recipe/{recipe_id}/description"),
|
||||
let _ = ron_request::patch::<(), _>(
|
||||
&format!("/ron-api/recipe/{recipe_id}/description"),
|
||||
description,
|
||||
)
|
||||
.await;
|
||||
|
|
@ -85,9 +88,11 @@ pub fn setup_page(recipe_id: i64) {
|
|||
};
|
||||
current_servings = n;
|
||||
spawn_local(async move {
|
||||
let _ =
|
||||
request::patch::<(), _>(&format!("recipe/{recipe_id}/servings"), servings)
|
||||
.await;
|
||||
let _ = ron_request::patch::<(), _>(
|
||||
&format!("/ron-api/recipe/{recipe_id}/servings"),
|
||||
servings,
|
||||
)
|
||||
.await;
|
||||
});
|
||||
}
|
||||
})
|
||||
|
|
@ -114,8 +119,8 @@ pub fn setup_page(recipe_id: i64) {
|
|||
};
|
||||
current_time = n;
|
||||
spawn_local(async move {
|
||||
let _ = request::patch::<(), _>(
|
||||
&format!("recipe/{recipe_id}/estimated_time"),
|
||||
let _ = ron_request::patch::<(), _>(
|
||||
&format!("/ron-api/recipe/{recipe_id}/estimated_time"),
|
||||
time,
|
||||
)
|
||||
.await;
|
||||
|
|
@ -134,11 +139,11 @@ pub fn setup_page(recipe_id: i64) {
|
|||
if difficulty.value() != current_difficulty {
|
||||
current_difficulty = difficulty.value();
|
||||
let difficulty =
|
||||
ron_api::Difficulty::from_repr(difficulty.value().parse::<u32>().unwrap())
|
||||
.unwrap_or(ron_api::Difficulty::Unknown);
|
||||
web_api::Difficulty::from_repr(difficulty.value().parse::<u32>().unwrap())
|
||||
.unwrap_or(web_api::Difficulty::Unknown);
|
||||
spawn_local(async move {
|
||||
let _ = request::patch::<(), _>(
|
||||
&format!("recipe/{recipe_id}/difficulty"),
|
||||
let _ = ron_request::patch::<(), _>(
|
||||
&format!("/ron-api/recipe/{recipe_id}/difficulty"),
|
||||
difficulty,
|
||||
)
|
||||
.await;
|
||||
|
|
@ -151,7 +156,7 @@ pub fn setup_page(recipe_id: i64) {
|
|||
// Tags.
|
||||
{
|
||||
spawn_local(async move {
|
||||
let tags: Vec<String> = request::get(&format!("recipe/{recipe_id}/tags"))
|
||||
let tags: Vec<String> = ron_request::get(&format!("/ron-api/recipe/{recipe_id}/tags"))
|
||||
.await
|
||||
.unwrap();
|
||||
create_tag_elements(recipe_id, &tags);
|
||||
|
|
@ -161,9 +166,11 @@ pub fn setup_page(recipe_id: i64) {
|
|||
spawn_local(async move {
|
||||
let tag_list: Vec<String> =
|
||||
tags.split_whitespace().map(str::to_lowercase).collect();
|
||||
let _ =
|
||||
request::post::<(), _>(&format!("recipe/{recipe_id}/tags"), Some(&tag_list))
|
||||
.await;
|
||||
let _ = ron_request::post::<(), _>(
|
||||
&format!("/ron-api/recipe/{recipe_id}/tags"),
|
||||
Some(&tag_list),
|
||||
)
|
||||
.await;
|
||||
create_tag_elements(recipe_id, &tag_list);
|
||||
|
||||
by_id::<HtmlInputElement>("input-tags").set_value("");
|
||||
|
|
@ -207,9 +214,11 @@ pub fn setup_page(recipe_id: i64) {
|
|||
current_language = language.value();
|
||||
let language = language.value();
|
||||
spawn_local(async move {
|
||||
let _ =
|
||||
request::patch::<(), _>(&format!("recipe/{recipe_id}/language"), language)
|
||||
.await;
|
||||
let _ = ron_request::patch::<(), _>(
|
||||
&format!("/ron-api/recipe/{recipe_id}/language"),
|
||||
language,
|
||||
)
|
||||
.await;
|
||||
});
|
||||
}
|
||||
})
|
||||
|
|
@ -222,9 +231,11 @@ pub fn setup_page(recipe_id: i64) {
|
|||
EventListener::new(&is_public.clone(), "input", move |_event| {
|
||||
let is_public = is_public.checked();
|
||||
spawn_local(async move {
|
||||
let _ =
|
||||
request::patch::<(), _>(&format!("recipe/{recipe_id}/is_public"), is_public)
|
||||
.await;
|
||||
let _ = ron_request::patch::<(), _>(
|
||||
&format!("/ron-api/recipe/{recipe_id}/is_public"),
|
||||
is_public,
|
||||
)
|
||||
.await;
|
||||
reload_recipes_list(recipe_id).await;
|
||||
});
|
||||
})
|
||||
|
|
@ -249,7 +260,9 @@ pub fn setup_page(recipe_id: i64) {
|
|||
.await
|
||||
.is_some()
|
||||
{
|
||||
if let Ok(()) = request::delete::<_, ()>(&format!("recipe/{recipe_id}"), None).await
|
||||
if let Ok(()) =
|
||||
ron_request::delete::<_, ()>(&format!("/ron-api/recipe/{recipe_id}"), None)
|
||||
.await
|
||||
{
|
||||
window()
|
||||
.location()
|
||||
|
|
@ -271,8 +284,8 @@ pub fn setup_page(recipe_id: i64) {
|
|||
// Load initial groups, steps and ingredients.
|
||||
{
|
||||
spawn_local(async move {
|
||||
let groups: Vec<common::ron_api::Group> =
|
||||
request::get(&format!("recipe/{recipe_id}/groups"))
|
||||
let groups: Vec<common::web_api::Group> =
|
||||
ron_request::get(&format!("/ron-api/recipe/{recipe_id}/groups"))
|
||||
.await
|
||||
.unwrap();
|
||||
|
||||
|
|
@ -299,10 +312,11 @@ pub fn setup_page(recipe_id: i64) {
|
|||
let button_add_group: HtmlInputElement = by_id("input-add-group");
|
||||
EventListener::new(&button_add_group, "click", move |_event| {
|
||||
spawn_local(async move {
|
||||
let id: i64 = request::post::<_, ()>(&format!("recipe/{recipe_id}/group"), None)
|
||||
.await
|
||||
.unwrap();
|
||||
create_group_element(&ron_api::Group {
|
||||
let id: i64 =
|
||||
ron_request::post::<_, ()>(&format!("/ron-api/recipe/{recipe_id}/group"), None)
|
||||
.await
|
||||
.unwrap();
|
||||
create_group_element(&web_api::Group {
|
||||
id,
|
||||
name: "".to_string(),
|
||||
comment: "".to_string(),
|
||||
|
|
@ -314,7 +328,7 @@ pub fn setup_page(recipe_id: i64) {
|
|||
}
|
||||
}
|
||||
|
||||
fn create_group_element(group: &ron_api::Group) -> Element {
|
||||
fn create_group_element(group: &web_api::Group) -> Element {
|
||||
let group_id = group.id;
|
||||
let group_element: Element = selector_and_clone("#hidden-templates .group");
|
||||
group_element.set_id(&format!("group-{}", group.id));
|
||||
|
|
@ -330,7 +344,7 @@ fn create_group_element(group: &ron_api::Group) -> Element {
|
|||
.map(|e| e.id()[6..].parse::<i64>().unwrap())
|
||||
.collect();
|
||||
|
||||
let _ = request::patch::<(), _>("groups/order", ids).await;
|
||||
let _ = ron_request::patch::<(), _>("/ron-api/groups/order", ids).await;
|
||||
});
|
||||
});
|
||||
|
||||
|
|
@ -343,7 +357,9 @@ fn create_group_element(group: &ron_api::Group) -> Element {
|
|||
current_name = name.value();
|
||||
let name = name.value();
|
||||
spawn_local(async move {
|
||||
let _ = request::patch::<(), _>(&format!("group/{group_id}/name"), name).await;
|
||||
let _ =
|
||||
ron_request::patch::<(), _>(&format!("/ron-api/group/{group_id}/name"), name)
|
||||
.await;
|
||||
})
|
||||
}
|
||||
})
|
||||
|
|
@ -358,8 +374,11 @@ fn create_group_element(group: &ron_api::Group) -> Element {
|
|||
current_comment = comment.value();
|
||||
let comment = comment.value();
|
||||
spawn_local(async move {
|
||||
let _ =
|
||||
request::patch::<(), _>(&format!("group/{group_id}/comment"), comment).await;
|
||||
let _ = ron_request::patch::<(), _>(
|
||||
&format!("/ron-api/group/{group_id}/comment"),
|
||||
comment,
|
||||
)
|
||||
.await;
|
||||
});
|
||||
}
|
||||
})
|
||||
|
|
@ -384,7 +403,8 @@ fn create_group_element(group: &ron_api::Group) -> Element {
|
|||
.await
|
||||
.is_some()
|
||||
{
|
||||
let _ = request::delete::<(), ()>(&format!("group/{group_id}"), None).await;
|
||||
let _ = ron_request::delete::<(), ()>(&format!("/ron-api/group/{group_id}"), None)
|
||||
.await;
|
||||
let group_element = by_id::<Element>(&format!("group-{group_id}"));
|
||||
group_element.next_element_sibling().unwrap().remove();
|
||||
group_element.remove();
|
||||
|
|
@ -397,12 +417,13 @@ fn create_group_element(group: &ron_api::Group) -> Element {
|
|||
let add_step_button: HtmlInputElement = group_element.selector(".input-add-step");
|
||||
EventListener::new(&add_step_button, "click", move |_event| {
|
||||
spawn_local(async move {
|
||||
let id: i64 = request::post::<_, ()>(&format!("group/{group_id}/step"), None)
|
||||
.await
|
||||
.unwrap();
|
||||
let id: i64 =
|
||||
ron_request::post::<_, ()>(&format!("/ron-api/group/{group_id}/step"), None)
|
||||
.await
|
||||
.unwrap();
|
||||
create_step_element(
|
||||
&selector::<Element>(&format!("#group-{group_id} .steps")),
|
||||
&ron_api::Step {
|
||||
&web_api::Step {
|
||||
id,
|
||||
action: "".to_string(),
|
||||
ingredients: vec![],
|
||||
|
|
@ -457,9 +478,11 @@ where
|
|||
let tag_span = tag_span.clone();
|
||||
let tag = tag.clone();
|
||||
spawn_local(async move {
|
||||
let _ =
|
||||
request::delete::<(), _>(&format!("recipe/{recipe_id}/tags"), Some(vec![tag]))
|
||||
.await;
|
||||
let _ = ron_request::delete::<(), _>(
|
||||
&format!("/ron-api/recipe/{recipe_id}/tags"),
|
||||
Some(vec![tag]),
|
||||
)
|
||||
.await;
|
||||
tag_span.remove();
|
||||
});
|
||||
})
|
||||
|
|
@ -467,7 +490,7 @@ where
|
|||
}
|
||||
}
|
||||
|
||||
fn create_step_element(group_element: &Element, step: &ron_api::Step) -> Element {
|
||||
fn create_step_element(group_element: &Element, step: &web_api::Step) -> Element {
|
||||
let step_id = step.id;
|
||||
let step_element: Element = selector_and_clone("#hidden-templates .step");
|
||||
step_element.set_id(&format!("step-{}", step.id));
|
||||
|
|
@ -484,7 +507,7 @@ fn create_step_element(group_element: &Element, step: &ron_api::Step) -> Element
|
|||
.map(|e| e.id()[5..].parse::<i64>().unwrap())
|
||||
.collect();
|
||||
|
||||
let _ = request::patch::<(), _>("/steps/order", ids).await;
|
||||
let _ = ron_request::patch::<(), _>("/ron-api/steps/order", ids).await;
|
||||
});
|
||||
});
|
||||
|
||||
|
|
@ -497,7 +520,9 @@ fn create_step_element(group_element: &Element, step: &ron_api::Step) -> Element
|
|||
current_action = action.value();
|
||||
let action = action.value();
|
||||
spawn_local(async move {
|
||||
let _ = request::patch::<(), _>(&format!("/step/{step_id}/action"), action).await;
|
||||
let _ =
|
||||
ron_request::patch::<(), _>(&format!("/ron-api/step/{step_id}/action"), action)
|
||||
.await;
|
||||
});
|
||||
}
|
||||
})
|
||||
|
|
@ -522,7 +547,8 @@ fn create_step_element(group_element: &Element, step: &ron_api::Step) -> Element
|
|||
.await
|
||||
.is_some()
|
||||
{
|
||||
let _ = request::delete::<(), ()>(&format!("step/{step_id}"), None).await;
|
||||
let _ =
|
||||
ron_request::delete::<(), ()>(&format!("/ron-api/step/{step_id}"), None).await;
|
||||
let step_element = by_id::<Element>(&format!("step-{step_id}"));
|
||||
step_element.next_element_sibling().unwrap().remove();
|
||||
step_element.remove();
|
||||
|
|
@ -535,12 +561,13 @@ fn create_step_element(group_element: &Element, step: &ron_api::Step) -> Element
|
|||
let add_ingredient_button: HtmlInputElement = step_element.selector(".input-add-ingredient");
|
||||
EventListener::new(&add_ingredient_button, "click", move |_event| {
|
||||
spawn_local(async move {
|
||||
let id: i64 = request::post::<_, ()>(&format!("step/{step_id}/ingredient"), None)
|
||||
.await
|
||||
.unwrap();
|
||||
let id: i64 =
|
||||
ron_request::post::<_, ()>(&format!("/ron-api/step/{step_id}/ingredient"), None)
|
||||
.await
|
||||
.unwrap();
|
||||
create_ingredient_element(
|
||||
&selector::<Element>(&format!("#step-{} .ingredients", step_id)),
|
||||
&ron_api::Ingredient {
|
||||
&web_api::Ingredient {
|
||||
id,
|
||||
name: "".to_string(),
|
||||
comment: "".to_string(),
|
||||
|
|
@ -555,7 +582,7 @@ fn create_step_element(group_element: &Element, step: &ron_api::Step) -> Element
|
|||
step_element
|
||||
}
|
||||
|
||||
fn create_ingredient_element(step_element: &Element, ingredient: &ron_api::Ingredient) -> Element {
|
||||
fn create_ingredient_element(step_element: &Element, ingredient: &web_api::Ingredient) -> Element {
|
||||
let ingredient_id = ingredient.id;
|
||||
let ingredient_element: Element = selector_and_clone("#hidden-templates .ingredient");
|
||||
ingredient_element.set_id(&format!("ingredient-{}", ingredient.id));
|
||||
|
|
@ -572,7 +599,7 @@ fn create_ingredient_element(step_element: &Element, ingredient: &ron_api::Ingre
|
|||
.map(|e| e.id()[11..].parse::<i64>().unwrap())
|
||||
.collect();
|
||||
|
||||
let _ = request::patch::<(), _>("ingredients/order", ids).await;
|
||||
let _ = ron_request::patch::<(), _>("/ron-api/ingredients/order", ids).await;
|
||||
});
|
||||
});
|
||||
|
||||
|
|
@ -585,8 +612,11 @@ fn create_ingredient_element(step_element: &Element, ingredient: &ron_api::Ingre
|
|||
current_name = name.value();
|
||||
let name = name.value();
|
||||
spawn_local(async move {
|
||||
let _ = request::patch::<(), _>(&format!("ingredient/{ingredient_id}/name"), name)
|
||||
.await;
|
||||
let _ = ron_request::patch::<(), _>(
|
||||
&format!("/ron-api/ingredient/{ingredient_id}/name"),
|
||||
name,
|
||||
)
|
||||
.await;
|
||||
});
|
||||
}
|
||||
})
|
||||
|
|
@ -601,8 +631,8 @@ fn create_ingredient_element(step_element: &Element, ingredient: &ron_api::Ingre
|
|||
current_comment = comment.value();
|
||||
let comment = comment.value();
|
||||
spawn_local(async move {
|
||||
let _ = request::patch::<(), _>(
|
||||
&format!("ingredient/{ingredient_id}/comment"),
|
||||
let _ = ron_request::patch::<(), _>(
|
||||
&format!("/ron-api/ingredient/{ingredient_id}/comment"),
|
||||
comment,
|
||||
)
|
||||
.await;
|
||||
|
|
@ -628,8 +658,11 @@ fn create_ingredient_element(step_element: &Element, ingredient: &ron_api::Ingre
|
|||
let q = if n.is_nan() { None } else { Some(n) };
|
||||
current_quantity = n;
|
||||
spawn_local(async move {
|
||||
let _ = request::patch::<(), _>(&format!("ingredient/{ingredient_id}/quantity"), q)
|
||||
.await;
|
||||
let _ = ron_request::patch::<(), _>(
|
||||
&format!("/ron-api/ingredient/{ingredient_id}/quantity"),
|
||||
q,
|
||||
)
|
||||
.await;
|
||||
});
|
||||
}
|
||||
})
|
||||
|
|
@ -644,8 +677,11 @@ fn create_ingredient_element(step_element: &Element, ingredient: &ron_api::Ingre
|
|||
current_unit = unit.value();
|
||||
let unit = unit.value();
|
||||
spawn_local(async move {
|
||||
let _ = request::patch::<(), _>(&format!("ingredient/{ingredient_id}/unit"), unit)
|
||||
.await;
|
||||
let _ = ron_request::patch::<(), _>(
|
||||
&format!("/ron-api/ingredient/{ingredient_id}/unit"),
|
||||
unit,
|
||||
)
|
||||
.await;
|
||||
});
|
||||
}
|
||||
})
|
||||
|
|
@ -670,8 +706,11 @@ fn create_ingredient_element(step_element: &Element, ingredient: &ron_api::Ingre
|
|||
.await
|
||||
.is_some()
|
||||
{
|
||||
let _ =
|
||||
request::delete::<(), ()>(&format!("ingredient/{ingredient_id}"), None).await;
|
||||
let _ = ron_request::delete::<(), ()>(
|
||||
&format!("/ron-api/ingredient/{ingredient_id}"),
|
||||
None,
|
||||
)
|
||||
.await;
|
||||
let ingredient_element = by_id::<Element>(&format!("ingredient-{ingredient_id}"));
|
||||
ingredient_element.next_element_sibling().unwrap().remove();
|
||||
ingredient_element.remove();
|
||||
|
|
@ -684,19 +723,17 @@ fn create_ingredient_element(step_element: &Element, ingredient: &ron_api::Ingre
|
|||
}
|
||||
|
||||
async fn reload_recipes_list(current_recipe_id: i64) {
|
||||
match Request::get("/fragments/recipes_list")
|
||||
.query([("current_recipe_id", current_recipe_id.to_string())])
|
||||
.send()
|
||||
.await
|
||||
{
|
||||
Err(error) => {
|
||||
toast::show_message_level(Level::Error, &format!("Internal server error: {}", error));
|
||||
}
|
||||
Ok(response) => {
|
||||
let list = document().get_element_by_id("recipes-list").unwrap();
|
||||
list.set_outer_html(&response.text().await.unwrap());
|
||||
}
|
||||
}
|
||||
let fragment: String = request::get_with_params(
|
||||
"/fragments/recipes_list",
|
||||
web_api::RecipesListFragmentsParams {
|
||||
current_recipe_id: Some(current_recipe_id),
|
||||
},
|
||||
)
|
||||
.await
|
||||
.unwrap();
|
||||
|
||||
let list = document().get_element_by_id("recipes-list").unwrap();
|
||||
list.set_outer_html(&fragment);
|
||||
}
|
||||
|
||||
enum CursorPosition {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue