commit: 67182daf4aaae85347380f1609c30a8e1fbb7601
parent 6f67f3acaeb97d0bf1fe9b8eba248f8f4a3a261d
Author: neauoire <aliceffekt@gmail.com>
Date: Fri, 20 Dec 2019 12:09:24 -0500
Working on migrating the db
Diffstat:
4 files changed, 15 insertions(+), 12 deletions(-)
diff --git a/src/ingredients.c b/src/ingredients.c
@@ -382,7 +382,7 @@ Ingredient rice_flour = create_ingredient("rice flour", "Rice flour is made from
Ingredient flour = create_ingredient("flour", "Flour is a powder made by grinding raw grains, roots, beans, nuts, or seeds. It is used to make many different foods. Cereal flour is the main ingredient of bread, which is a staple food for most cultures. Wheat is the most common base for flour, as is corn flour and rye flour. Cereal flour consists either of the endosperm, germ, and bran together (<a href='wholegrain_wheat_flour.html'>wholegrain wheat flour</a>) or of the endosperm alone (<a href='all_purpose_flour.html'>all purpose flour</a>).");
-Ingredient all_purpose_flour = create_ingredient("all purpose flour", "All-purpose, or plain flour, has a medium level of gluten protein content.AP has enough protein content for many bread and pizza bases, although artisan bakers often use bread flour and special grade 00 Italian flours. "Plain" also refers to AP's lack of any added leavening agent.");
+Ingredient all_purpose_flour = create_ingredient("all purpose flour", "All-purpose, or plain flour, has a medium level of gluten protein content.AP has enough protein content for many bread and pizza bases, although artisan bakers often use bread flour and special grade 00 Italian flours. \"Plain\" also refers to AP's lack of any added leavening agent.");
Ingredient breadfruit_flour = create_ingredient("breadfruit flour", "The product of dried and ground breadfruit. It it used to make cookies, cakes, <a href='#breadfruit_pasta.html'>pasta</a> and a number of other recipes.");
@@ -432,7 +432,7 @@ Ingredient brown_rice_syrup = create_ingredient("brown rice syrup", "Brown rice
Ingredient rice_vinegar = create_ingredient("rice vinegar", "Rice vinegar is made by fermenting rice, and is often used as a dressing or as seasoning.Rice vinegar comes in a variety of flavors and color, ranging from clear to red, brown and black. The Chinese varieties are stronger, and known as 'rice wine vinegars' while Japanese vinegars are less acidic.");
-Ingredient japanese_rice_vinegar = create_ingredient("japanese rice vinegar", "Japanese Rice vinegar \"komezu\" or simply "su" has a very mild taste, and is either colorless or yellow. Japanese rice vinegar is made from rice.This type of vinegar is less acidic than Chinese varieties, and are used to season rice, and for making \"sunomono\" (vinegar dishes) and \"tsukemono\" (pickles). There are some kinds of Japanese rice vinegars that are 'seasoned', meaning that they have additives like <a href='sake.html'>sake</a>, <a href='salt.html'>salt</a> and <a href='sugar.html'>sugar</a>, for added flavor.");
+Ingredient japanese_rice_vinegar = create_ingredient("japanese rice vinegar", "Japanese Rice vinegar \"komezu\" or simply \"su\" has a very mild taste, and is either colorless or yellow. Japanese rice vinegar is made from rice.This type of vinegar is less acidic than Chinese varieties, and are used to season rice, and for making \"sunomono\" (vinegar dishes) and \"tsukemono\" (pickles). There are some kinds of Japanese rice vinegars that are 'seasoned', meaning that they have additives like <a href='sake.html'>sake</a>, <a href='salt.html'>salt</a> and <a href='sugar.html'>sugar</a>, for added flavor.");
Ingredient balsamic_vinegar = create_ingredient("balsamic vinegar", "Balsamic vinegar, or <b>aceto balsamico</b> is a dark, concentrated, flavoured vinegar from Italy. It is made wholly, or in part from grape must. True balsamic vinegar is rich with a complex flavor that is both sweet and sour.The name \"aceto balsamico\" isn't regulated, but there are 3 in existence that are: Aceto Balsamic Tradizionale di Modena, Aceto Balsamico Tradizionale di Reggio Emilia and Aceto Balsamico di Modena. The two traditional varieties are made from a reduction of pressed Trebbiano and Lambrusco grapes that are aged for many years in wooden barrels (for a minimum of 12yrs), produced exclusively in the province of Modena or the Emilia region around it. Aceto Balsamico di Modena is also made from grape must, but it is blended with wine vinegar, and imitates the traditional product.");
@@ -514,7 +514,7 @@ set_parent(&black_beans, &beans);
set_parent(&green_beans, &beans);
set_parent(&kidney_beans, &beans);
set_parent(&edamame, &soy_beans);
-set_parent(&chickpea_flour, &chickpeas,_flour);
+set_parent(&chickpea_flour, &chickpeas);
set_parent(&green_peas, &peas);
set_parent(&mungbeans, &beans);
set_parent(&red_cabbage, &green_cabbage);
@@ -526,13 +526,13 @@ set_parent(&wakame, &seaweed);
set_parent(&dried_hijiki, &seaweed);
set_parent(&bull_kelp_powder, &seaweed);
set_parent(&nori, &seaweed);
-set_parent(&nori_sheets, &nori,_seaweed);
+set_parent(&nori_sheets, &nori);
set_parent(&shiitake, &mushroom);
set_parent(&crimini, &mushroom);
set_parent(&portobello, &mushroom);
set_parent(&shimeji, &mushroom);
set_parent(&button_mushrooms, &mushroom);
-set_parent(&pumpkin_seeds, &pumpkin,_squash);
+set_parent(&pumpkin_seeds, &pumpkin);
set_parent(&white_sesame_seeds, &sesame_seeds);
set_parent(&black_sesame_seeds, &sesame_seeds);
set_parent(&tahini, &sesame_seeds);
@@ -602,7 +602,7 @@ set_parent(&veganaise, &tofu);
set_parent(&coconut_oil, &coconut);
set_parent(&peppermint_oil, &peppermint);
set_parent(&coconut_milk, &coconut);
-set_parent(&soy_milk, &soy_beans,_edamame,_tofu,_tempeh);
+set_parent(&soy_milk, &soy_beans);
set_parent(&chocolate_chips, &cocoa_beans);
-Ingredient *ingredients[] = {&coffee, &lentils, &beluga_lentils, &brown_lentils, &shelled_hemp_seeds, &tempeh, &peanut_butter, &peanuts, &soy_beans, &beans, &black_beans, &green_beans, &kidney_beans, &edamame, &chickpeas, &chickpea_flour, &peas, &green_peas, &mungbeans, &broccoli, &green_cabbage, &red_cabbage, &kale, &arugula, &cauliflower, &white_cauliflower, &purple_cauliflower, &brussel_sprouts, &daikon, &bok_choy, &radish, &arame, &seaweed, &mushroom, &wakame, &dried_hijiki, &bull_kelp_powder, &nori, &nori_sheets, &shiitake, &crimini, &portobello, &shimeji, &button_mushrooms, &flax_seeds, &sunflower_seeds, &pumpkin_seeds, &sesame_seeds, &white_sesame_seeds, &black_sesame_seeds, &tahini, &pomegranate_seeds, &chia_seeds, &nagaimo, &carrots, &small_heirloom_tomatoes, &heirloom_carrots, &ginger, &ginger_root, &potatoes, &russet_potatoes, &sweet_potatoes, &beets, &golden_beets, &red_beets, &cassava, &garlic, &garlic_powder, &onion, &red_onion, &onion_powder, &yellow_onion, &cucumber, &persian_cucumbers, &eggplant, &zucchini, &chives, &peppers, &green_bell_peppers, &red_bell_peppers, &yellow_bell_peppers, &tomato, &tomato_paste, &avocado, &pumpkin, &olives, &green_olives, &black_olives, &pimento_olives, &palm, &acorn_squash, &artichokes, &asparagus, &bamboo_shoots, &breadfruit, &scallions, &spinach, &alfalfa_sprouts, &dried_raisins, &blackberries, &dried_cranberries, &dried_white_mulberries, &dry_corn_kernels, &pandanus_fruit, &banana, &kiwifruit, &apple, &apples, &lemon, &lemon_zest, &lemon_juice, &orange, &pears, &bartlett_pear, &papaya, &pomegranate, &pomegranate_juice, &mango, &hachiya_persimmon, &persimmon, &dates, °let_noor_dates, &date_caramel, &apricot_jam, &coconut, &ao_nori, &kanten_powder, &turmeric_root, &ground_turmeric, &cinnamon, &rosemary, &basil, &dried_basil, &wasabi_root, &wasabi_powder, &sichuan_peppercorns, &coriander, &mint, &peppermint, &cocoa_beans, &cocoa_powder, &cayenne_pepper, &cayenne_pepper_powder, &anise_seeds, &nutritional_yeast, &vanilla, &vanilla_extract, &nutmeg, &thyme, &poppy_seeds, &paprika, &smoked_paprika, &curry_powder, &tamarind, &cumin_seeds, &mustard_seeds, &dijon_mustard, &black_pepper, &shichimi_togarashi, &gojuchang, &garam_masala, &panko, &carob, &carob_chips, &bay_leaf, &chili_pepper_flakes, &green_chili, &chili_peppers, &hops, &dried_orange_peel, &oregano, &whole_wheat_flour, &buckwheat_groats, &buckwheat_noodles, &buckwheat_flour, &einkorn_wheat_flour, &spelt_flour, &gluten_flour, &corn, &cornmeal, &corn_semolina, &oats, &rolled_oats, &rice, &basmati_rice, &short_grain_white_rice, &black_rice, &puffed_rice, &medium_grain_brown_rice, &black_glutinous_rice, &rice_flour, &flour, &all_purpose_flour, &breadfruit_flour, &wheat_semolina, &beni_shouga, &vegemite, &miso, &red_miso, &white_miso, &tofu, &soft_tofu, &burmese_tofu, &veganaise, &soy_sauce, &sriracha, &mirin, &baking_powder, &bamboo_charcoal_powder, &cornstarch, &active_dry_yeast, &baking_soda, &agar_agar_powder, &arrowroot_starch, &maple_syrup, &brown_rice_syrup, &rice_vinegar, &japanese_rice_vinegar, &balsamic_vinegar, &apple_cider_vinegar, &b12_supplement, &matcha_powder, &houjicha, &wine, &beer, &sake, &coconut_oil, &canola_oil, &olive_oil, &sesame_oil, &peppermint_oil, &fresh_dill, &coconut_milk, &soy_milk, &baguette, &bread_crusts, &vegan_butter, &scoobi_do, &fusilli, &soy_yogurt, &kinako, &corn_tortillas, &fleur_de_sel, &vegetable_bouillon, &water, &sugar, &powdered_sugar, &whole_cane_sugar, &coconut_sugar, &brown_sugar, &salt, &sea_salt, &chocolate_chips };-
\ No newline at end of file
+// Ingredient *ingredients[] = {&coffee, &lentils, &beluga_lentils, &brown_lentils, &shelled_hemp_seeds, &tempeh, &peanut_butter, &peanuts, &soy_beans, &beans, &black_beans, &green_beans, &kidney_beans, &edamame, &chickpeas, &chickpea_flour, &peas, &green_peas, &mungbeans, &broccoli, &green_cabbage, &red_cabbage, &kale, &arugula, &cauliflower, &white_cauliflower, &purple_cauliflower, &brussel_sprouts, &daikon, &bok_choy, &radish, &arame, &seaweed, &mushroom, &wakame, &dried_hijiki, &bull_kelp_powder, &nori, &nori_sheets, &shiitake, &crimini, &portobello, &shimeji, &button_mushrooms, &flax_seeds, &sunflower_seeds, &pumpkin_seeds, &sesame_seeds, &white_sesame_seeds, &black_sesame_seeds, &tahini, &pomegranate_seeds, &chia_seeds, &nagaimo, &carrots, &small_heirloom_tomatoes, &heirloom_carrots, &ginger, &ginger_root, &potatoes, &russet_potatoes, &sweet_potatoes, &beets, &golden_beets, &red_beets, &cassava, &garlic, &garlic_powder, &onion, &red_onion, &onion_powder, &yellow_onion, &cucumber, &persian_cucumbers, &eggplant, &zucchini, &chives, &peppers, &green_bell_peppers, &red_bell_peppers, &yellow_bell_peppers, &tomato, &tomato_paste, &avocado, &pumpkin, &olives, &green_olives, &black_olives, &pimento_olives, &palm, &acorn_squash, &artichokes, &asparagus, &bamboo_shoots, &breadfruit, &scallions, &spinach, &alfalfa_sprouts, &dried_raisins, &blackberries, &dried_cranberries, &dried_white_mulberries, &dry_corn_kernels, &pandanus_fruit, &banana, &kiwifruit, &apple, &apples, &lemon, &lemon_zest, &lemon_juice, &orange, &pears, &bartlett_pear, &papaya, &pomegranate, &pomegranate_juice, &mango, &hachiya_persimmon, &persimmon, &dates, °let_noor_dates, &date_caramel, &apricot_jam, &coconut, &ao_nori, &kanten_powder, &turmeric_root, &ground_turmeric, &cinnamon, &rosemary, &basil, &dried_basil, &wasabi_root, &wasabi_powder, &sichuan_peppercorns, &coriander, &mint, &peppermint, &cocoa_beans, &cocoa_powder, &cayenne_pepper, &cayenne_pepper_powder, &anise_seeds, &nutritional_yeast, &vanilla, &vanilla_extract, &nutmeg, &thyme, &poppy_seeds, &paprika, &smoked_paprika, &curry_powder, &tamarind, &cumin_seeds, &mustard_seeds, &dijon_mustard, &black_pepper, &shichimi_togarashi, &gojuchang, &garam_masala, &panko, &carob, &carob_chips, &bay_leaf, &chili_pepper_flakes, &green_chili, &chili_peppers, &hops, &dried_orange_peel, &oregano, &whole_wheat_flour, &buckwheat_groats, &buckwheat_noodles, &buckwheat_flour, &einkorn_wheat_flour, &spelt_flour, &gluten_flour, &corn, &cornmeal, &corn_semolina, &oats, &rolled_oats, &rice, &basmati_rice, &short_grain_white_rice, &black_rice, &puffed_rice, &medium_grain_brown_rice, &black_glutinous_rice, &rice_flour, &flour, &all_purpose_flour, &breadfruit_flour, &wheat_semolina, &beni_shouga, &vegemite, &miso, &red_miso, &white_miso, &tofu, &soft_tofu, &burmese_tofu, &veganaise, &soy_sauce, &sriracha, &mirin, &baking_powder, &bamboo_charcoal_powder, &cornstarch, &active_dry_yeast, &baking_soda, &agar_agar_powder, &arrowroot_starch, &maple_syrup, &brown_rice_syrup, &rice_vinegar, &japanese_rice_vinegar, &balsamic_vinegar, &apple_cider_vinegar, &b12_supplement, &matcha_powder, &houjicha, &wine, &beer, &sake, &coconut_oil, &canola_oil, &olive_oil, &sesame_oil, &peppermint_oil, &fresh_dill, &coconut_milk, &soy_milk, &baguette, &bread_crusts, &vegan_butter, &scoobi_do, &fusilli, &soy_yogurt, &kinako, &corn_tortillas, &fleur_de_sel, &vegetable_bouillon, &water, &sugar, &powdered_sugar, &whole_cane_sugar, &coconut_sugar, &brown_sugar, &salt, &sea_salt, &chocolate_chips };+
\ No newline at end of file
diff --git a/src/main b/src/main
Binary files differ.
diff --git a/src/main.c b/src/main.c
@@ -3,13 +3,16 @@
#include "ingredient.c"
#include "recipe.c"
+// Ingredient *all_ingredients[];
+// Ingredient *all_recipes[];
+
int main(void) {
#include "ingredients.c"
#include "recipes.c"
#include "builder.c"
- print_recipe(&sweet_sour_lentils);
+ // print_recipe(&sweet_sour_lentils);
return (0);
}
\ No newline at end of file
diff --git a/src/recipes.c b/src/recipes.c
@@ -104,7 +104,7 @@ add_serving(&sweet_and_sour_lentils_sauce, &peanut_butter, "1 tbsp");
add_serving(&sweet_and_sour_lentils_sauce, &maple_syrup, "2 tbsp");
add_serving(&sweet_and_sour_lentils_sauce, &sesame_oil, "1 tsp");
add_serving(&sweet_and_sour_lentils_sauce, &garlic, "3 cloves, minced");
-add_serving(&sweet_and_sour_lentils_sauce, &ginger_root, "1", minced");
+add_serving(&sweet_and_sour_lentils_sauce, &ginger_root, "1\", minced");
add_serving(&sweet_and_sour_lentils_sauce, &arrowroot_starch, "1 tbsp");
add_part(&sweet_and_sour_lentils, &sweet_and_sour_lentils_sauce);
RecipePart sweet_and_sour_lentils_lentils = create_part("lentils");
@@ -117,7 +117,7 @@ add_instruction(&sweet_and_sour_lentils_lentils, "Pour sauce onto lentils, mix w
add_serving(&sweet_and_sour_lentils_lentils, &brown_lentils, "1/2 cup");
add_serving(&sweet_and_sour_lentils_lentils, &vegetable_bouillon, "1 1/2 cups");
add_serving(&sweet_and_sour_lentils_lentils, &carrots, "1, cubed");
-add_serving(&sweet_and_sour_lentils_lentils, &daikon, "2", cubed");
+add_serving(&sweet_and_sour_lentils_lentils, &daikon, "2\", cubed");
add_serving(&sweet_and_sour_lentils_lentils, &chives, "3 stalks");
add_serving(&sweet_and_sour_lentils_lentils, &salt, "1/4 tsp");
add_part(&sweet_and_sour_lentils, &sweet_and_sour_lentils_lentils);
@@ -1278,7 +1278,7 @@ add_serving(&papaya_bruschetta_topping_bruschetta, &salt, "to taste");
add_part(&papaya_bruschetta_topping, &papaya_bruschetta_topping_bruschetta);
// pan fried breadfruit
-Recipe pan_fried_breadfruit = create_recipe("pan fried breadfruit", "dinner", "4 people", 20170703, 1 Hour 30);
+Recipe pan_fried_breadfruit = create_recipe("pan fried breadfruit", "dinner", "4 people", 20170703, 90);
set_description(&pan_fried_breadfruit, "<b>Recipe location:</b> Huahine, Society Islands. French Polynesia.<br /><br />Breadfruit trees are everywhere in French Polynesia, but sometimes the fruit aren’t mature enough to pick. To make things more difficult, grocery stores don’t sell them (they don’t sell fruit at all). The Polynesians don't buy fruit, they don't have to! They have plenty growing on their property. Getting our hands on a breadfruit was no simple task, on every island we would ask the locals, but again the fruit weren’t ready to pick off just yet.<br /><br />Devine and I had breadfruit when we first arrived in Nuku Hiva, the owner of Snack Vaeki prepared some for us. The chef cooked it outside, over hot coals. The taste is hard to describe, it's very potato-ey. We had the cooked breadfruit with some fresh coconut milk - extracted from a fresh coconut before our very eyes. Since then, we’ve been looking to cook it ourselves.<br /><br />recipes/pan.fried.breadfruit.1.jpg<br /><br />Then finally we got our chance! We bought a breadfruit at the Fare street market in Huahine. The seller at the fruit stand gave it a few knocks, and told us it was ready to eat! It was delicious with coconut milk, but we wanted to try something different. We cut the breadfruit into wedges and pan-fried it. We then served it with some button mushrooms, coated with sweetened soy sauce.<br /><br />");
RecipePart pan_fried_breadfruit_breadfruit = create_part("breadfruit");
add_instruction(&pan_fried_breadfruit_breadfruit, "Preheat oven to <u>425F</u>.");
