mirror of
https://github.com/array-in-a-matrix/foodie.git
synced 2024-06-16 03:17:02 -04:00
Merge remote-tracking branch 'refs/remotes/origin/dev' into dev
asd the commit.
This commit is contained in:
commit
452bd2a703
|
@ -17,9 +17,8 @@ export default function Ingredient({ingredient, ingredientChecked}) {
|
|||
}
|
||||
return (
|
||||
<div style = {divStyle} className="card">
|
||||
<div className="input-group-text">
|
||||
<div className="card-body">
|
||||
<label>
|
||||
<input type="checkbox" checked={ingredient.complete} onChange={handleIngredientClicked}></input>
|
||||
{" " +ingredient.name}
|
||||
</label>
|
||||
<label style={amountStyle}>
|
||||
|
|
|
@ -4,7 +4,6 @@ import Ingredient from './Ingredient'
|
|||
export default function ReceipeList({ingredients, ingredientChecked}) {
|
||||
return (
|
||||
ingredients.map(ingredient => {
|
||||
|
||||
return <Ingredient key = {ingredient.id} ingredient = {ingredient} ingredientChecked={ingredientChecked}/>
|
||||
})
|
||||
)
|
||||
|
|
|
@ -70,7 +70,7 @@ function FridgeList({ingredients, setIngredients, updatePerc}) {
|
|||
|
||||
return(<>
|
||||
<h1 style={heading}>Ingredient List</h1>
|
||||
<div style={{marginLeft: "10px"}}>
|
||||
<div style={{marginLeft: "5%"}}>
|
||||
<div className="input-group mb-3">
|
||||
<input ref={ingredientNameRef}type="text" placeholder="Ingredient" className="form-control" style={{width:"50px"}}></input>
|
||||
<span style={spanStyle}>x</span>
|
||||
|
@ -80,8 +80,9 @@ function FridgeList({ingredients, setIngredients, updatePerc}) {
|
|||
<button onClick={handleAddIngredient} className="btn btn-dark">Add Ingredient</button>
|
||||
<button onClick={handleClear} className="btn btn-danger" style={{marginLeft: "10px"}}>Clear Ingredients</button>
|
||||
</div>
|
||||
|
||||
<IngredientList ingredients = {ingredients} ingredientChecked={ingredientChecked}></IngredientList>
|
||||
</div>
|
||||
<IngredientList ingredients = {ingredients} ingredientChecked={ingredientChecked}></IngredientList>
|
||||
</>
|
||||
)
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue