Merge pull request #2 from mykovasyl/change-ingredients-array

Change ingredients array

.byebug_history

@@ -1,3 +1,49 @@
+q
+recipe
+recipe.update({ingredients: params[:ingredients]})
+recipe
+params[:ingredients]
+skip
+recipe
+skip
+recipe
+exit
+end
+recipe.update(params[:ingredients])
+params[:ingredients]
+recipe
+skip
+recipeToDelete.destroy
+recipeToDelete = Recipe.find("4")
+skip
+recipe.update({ingredients: params[:ingredients]})
+recipe.update({params[:ingredients]})
+recipe.ingredients
+recipe.title
+recipe.update({ingredients: []})
+recipe.update([])
+recipe
+params[:ingredients]
+skip
+next
+recipe.update({ingredients: [{name: "garlic", amount: 2}, {name: "onion", amount: 3}]})
+recipe.update({someName: [{name: "garlic", amount: 2}, {name: "onion", amount: 3}]})
+recipe.update([{name: "garlic", amount: 2}, {name: "onion", amount: 3}])
+params[:ingredients]
+skip
+recipe.update(ingredients: ["big soup", "little soup"])
+recipe(ingredients: ["big soup", "little soup"])
+recipe
+skip
+params[:sourceURL]
+params[:image]
+params[:readyIn]
+params[:title]
+params{:title}
+params[:ingredients]
+recipe.update({params[:ingredients]})
+recipe.update(params[:ingredients])
+recipe
 skip
 params[:ingredients]
 Recipe.create(params[:ingredients])

app/controllers/recipes_controller.rb

@@ -8,7 +8,7 @@ def index
 
   def create
     recipe = Recipe.create!(new_recipe_params)
-    byebug
+    recipe.update({ingredients: params[:ingredients]})
     render json: recipe, status: :accepted
   end
 
@@ -42,4 +42,4 @@ def find_recipe
     Recipe.find(params[:id])
   end
 
-end
+end

app/models/user.rb

@@ -2,5 +2,9 @@ class User < ApplicationRecord
   has_secure_password
 
   has_many :recipes, dependent: :destroy
+
+  validates :username, presence: true, uniqueness: true
+  validates :password, presence: true
+  validates :password_confirmation, presence: true
 
 end

client/src/components/RandomRecipe.js

@@ -20,13 +20,18 @@ function RandomRecipe({ handleAddRecipe }) {
     )
       .then((resp) => resp.json())
       .then((data) => {
+        let newIngredients = data.recipes[0].extendedIngredients.map(
+          (ingredient) => {
+            return `${ingredient.name}: ${ingredient.amount} ${ingredient.unit}`;
+          }
+        );
         setRecipe({
           title: data.recipes[0].title,
           readyIn: data.recipes[0].readyInMinutes,
           image: data.recipes[0].image,
           summary: data.recipes[0].summary,
           instructions: data.recipes[0].instructions,
-          ingredients: data.recipes[0].extendedIngredients,
+          ingredients: newIngredients,
           sourceURL: data.recipes[0].spoonacularSourceUrl,
           user_id: null,
         });

client/src/components/Recipe.js

@@ -10,15 +10,13 @@ function Recipe({ recipe, handleAddRecipe, handleDeleteRecipe }) {
     summary,
     ingredients,
     instructions,
-    sourceUrl,
+    sourceURL,
     user_id = null,
     id = null,
   } = recipe;
 
   const mappedIngredients = ingredients.map((ingredient) => (
-    <li key={ingredient.name}>
-      {ingredient.name}: {ingredient.amount} {ingredient.unit}
-    </li>
+    <li key={ingredient}>{ingredient}</li>
   ));
 
   function addRecipe() {
@@ -53,7 +51,7 @@ function Recipe({ recipe, handleAddRecipe, handleDeleteRecipe }) {
       <h3>Instructions:</h3>
       <div dangerouslySetInnerHTML={{ __html: instructions }} />
       <p>
-        For more information visit: <a href={sourceUrl}>Spoonacular</a>
+        For more information visit: <a href={sourceURL}>Spoonacular</a>
       </p>
     </div>
   );

db/migrate/20230208222115_create_recipes.rb

@@ -6,9 +6,8 @@ def change
       t.string :image
       t.string :summary
       t.string :instructions
-      t.text :ingredients, array: true, default: []
       t.text :sourceURL
-      t.boolean :liked
+      t.string :ingredients, array: true, default: []
 
       t.timestamps
     end