Skip to content

Commit

Permalink
V 1.2
Browse files Browse the repository at this point in the history 
Fehlermeldungen behoben, optimierung
  • Loading branch information
@timvonfelten
timvonfelten committed Dec 23, 2022
1 parent 5feaf21 commit 2b39b75
Show file tree
Hide file tree
Showing 5 changed files with 29 additions and 44 deletions.
21 changes: 6 additions & 15 deletions src/App.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -162,27 +162,18 @@ const anzahlPizzaButtons = [];
</div>
<h1 className='text-2xl mt-12 pb-4 '>Wichtigste Zutaten:</h1>
<div className='flex flex-wrap text-xl tracking-wider pt-2 pb-2 border-b-2'>
<div className='w-1/2 mt-2 pb-2'>
Mehl:
</div>
<div className='w-1/2 mt-2 pb-2'>
{ingredients.mehl} g
<div className='mt-2 pb-2'>
Mehl: {ingredients.mehl} g
</div>
</div>
<div className='flex flex-wrap text-xl tracking-wider pt-2 pb-2 border-b-2'>
<div className='w-1/2 mt-2 pb-2'>
Tomatensauce:
</div>
<div className='w-1/2 mt-2 pb-2'>
{ingredients.tomatensauce} g
<div className='mt-2 pb-2'>
Tomatensauce: {ingredients.tomatensauce} g
</div>
</div>
<div className='flex flex-wrap text-xl tracking-wider pt-2 pb-2 border-b-2'>
<div className='w-1/2 mt-2 pb-2'>
Mozarella:
</div>
<div className='w-1/2 mt-2 pb-2'>
{ingredients.mozarella} g
<div className='mt-2 pb-2'>
Mozarella: {ingredients.mozarella} g
</div>
</div>
</div>
Expand Down
12 changes: 6 additions & 6 deletions src/components/Ingredients.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@ const Ingredients = (props) => {
for (const ingr in singlePortionIngredients) {
ingredients[ingr] = Math.round(singlePortionIngredients[ingr] * portions);
// Anpassen der Einkaufliste gemäss Auswahl der Pizzasorten
if (ingr === "ruccola"){ ingredients[ingr] = Math.round(singlePortionIngredients[ingr] * props.pizzaSorte.filter(x => x == 2).length) }
if (ingr === "pilze"){ ingredients[ingr] = Math.round(singlePortionIngredients[ingr] * props.pizzaSorte.filter(x => x == 3).length) }
if (ingr === "gemuese"){ ingredients[ingr] = Math.round(singlePortionIngredients[ingr] * props.pizzaSorte.filter(x => x == 4).length) }
if (ingr === "artischocken"){ ingredients[ingr] = Math.round(singlePortionIngredients[ingr] * props.pizzaSorte.filter(x => x == 5).length) }
if (ingr === "ruccola"){ ingredients[ingr] = Math.round(singlePortionIngredients[ingr] * props.pizzaSorte.filter(x => x === "2").length) }
if (ingr === "pilze"){ ingredients[ingr] = Math.round(singlePortionIngredients[ingr] * props.pizzaSorte.filter(x => x === "3").length) }
if (ingr === "gemuese"){ ingredients[ingr] = Math.round(singlePortionIngredients[ingr] * props.pizzaSorte.filter(x => x === "4").length) }
if (ingr === "artischocken"){ ingredients[ingr] = Math.round(singlePortionIngredients[ingr] * props.pizzaSorte.filter(x => x === "5").length) }
}
return ingredients;
};
Expand All @@ -39,8 +39,9 @@ const Ingredients = (props) => {
setIngredients(ingredients);
props.setIngredients(ingredients);
};


useEffect(() => {
useEffect((props, getIngredients) => {
handlePortionChange();
}, [props.portions, props.pizzaSorte]);

Expand All @@ -52,7 +53,6 @@ const Ingredients = (props) => {
return(
<div key={index}>
<h2 className="first-letter:uppercase">{key} {ingredients[key]} g</h2>

</div>
)
})}
Expand Down
20 changes: 6 additions & 14 deletions src/components/Shoppinglist.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@ import React from "react";
import Todo from "./Todo";
import { useState, useEffect } from "react";

var doneCount = 0;

const ShoppingList = (props) => {
const checkList = [
{
Expand Down Expand Up @@ -82,28 +80,24 @@ const ShoppingList = (props) => {

useEffect(() => {
setTodos(checkList);
}, [props.ingredients]);
}, [props.ingredients]); //

// Zählen wie lange alle Elementet sind
const CountCloseTodos = useState(0);
const [opencount, CountOpenTodos] = useState(0);

const progress = (100 / checkList.length) * (doneCount + 1);

// Checks Filter, damit nur jene verwendet werden, welche der aktuellen Kategorie angehören.
const todosfilterd = checkList.filter(
(todo) => todo.category === props.category
);

//todos.filter(todo => todo.category === props.category).map((item, index) => { return blblal
const [todos, setTodos] = useState(todosfilterd);
const [todos, setTodos] = useState(checkList);

// Unerledigte Aufgaben zählen
const countOpen = () => {
const donetodos = todos.filter((item) => {
if (item.text != 0) {
if (item.text !== 0) {
return !item.done;
}
else{
return item.done;
}
});
CountOpenTodos(donetodos.length);
};
Expand All @@ -113,10 +107,8 @@ const ShoppingList = (props) => {
const newTodos = [...todos];
if (newTodos[index].done) {
newTodos[index].done = false;
doneCount--;
} else {
newTodos[index].done = true;
doneCount++;
}
setTodos(newTodos);
};
Expand Down
6 changes: 3 additions & 3 deletions src/components/Steps.js
View file
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
import React, { useState } from 'react';

const Steps = ({time_start, time_end, title, text, ingredient, index, viewIndex, key}) => {
const Steps = ({time_start, time_end, title, text, ingredient, index, viewIndex}) => {

const [open, setOpen] = useState(false)

return (
<div key={key} className= {viewIndex == index ? 'mb-32' :'hidden'}>
<div className= {viewIndex === index ? 'mb-32' :'hidden'}>
<div className="flex justify-between item-center p-4 bg-light text-black"
onClick={() => setOpen(!open)}>
<div className='w-full text-center'>
<p className='text-l font-bold mb-1 tracking-wider uppercase'>{time_start} - {time_end}</p>
<strong className='text-2xl font-bold mb-2 tracking-wider'>{title}</strong>
<p className={ingredient == "" ? "hidden" : 'text-black pt-2 pb-2 tracking-wider'}>{ingredient}</p>
<p className={ingredient === "" ? "hidden" : 'text-black pt-2 pb-2 tracking-wider'}>{ingredient}</p>
<p className="mt-4 mb-10">{text}</p>
</div>
</div>
Expand Down
14 changes: 8 additions & 6 deletions src/components/Timetable.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ const Timetable = (props) => {
time_start: subHours(3.5, finishTime),
time_end:subHours(3, finishTime),
title: "Hauptteig vorbereiten",
ingredient_step: props.ingredients.mehl + " g Mehl | " + props.ingredients.salz + " g Salz | "+ Math.round(props.ingredients.wasser * 0.7) + " ml Wasser",
ingredient_step: Math.round(props.ingredients.mehl * 0.805) + " g Mehl | " + props.ingredients.salz + " g Salz | "+ Math.round(props.ingredients.wasser * 0.7) + " ml Wasser",
text: "Der Poolish wird nun im Wasser aufgelöst, danach wird "+ Math.round(props.ingredients.mehl * 0.805) + " g Mehl hinzugegeben.",
done: false,
},
Expand Down Expand Up @@ -94,7 +94,7 @@ const Timetable = (props) => {
time_end:subHours(0.25, finishTime),
title: "Zutaten vorbereiten",
ingredient_step:"",
text: "Die Zutaten für die Pizza vorbereiten: Tomatensauce mit Basilikum und Salz anrühren, Parmesan reiben, Tomaten schneiden, weitere Zutaten schneiden.",
text: "Die Zutaten für die Pizza vorbereiten: Tomatensauce mit Basilikum und Salz anrühren, Parmesan reiben, Tomaten schneiden, weitere Zutaten schneiden. Den Pizzastein in den Ofen legen und auf maximalen Temperatur vorheizen.",
done: false,
},
{
Expand All @@ -121,19 +121,21 @@ const Timetable = (props) => {
<div>
<div className="w-full m-auto text-center mb-4">
{steps.map((item, index) =>(
<div key={item.id} onClick={() => changeViewIndex(2,index)} className={viewIndex === index ? "w-10 h-10 rounded-full bg-gold inline-block mr-2 ml-2 mb-2 text-center pt-2" : "w-10 h-10 rounded-full bg-light cursor-pointer inline-block mr-2 ml-2 mb-2 text-center pt-2"}>{index+1}</div>
<div key={item.key} onClick={() => changeViewIndex(2,index)} className={viewIndex === index ? "w-10 h-10 rounded-full bg-gold inline-block mr-2 ml-2 mb-2 text-center pt-2" : "w-10 h-10 rounded-full bg-light cursor-pointer inline-block mr-2 ml-2 mb-2 text-center pt-2"}>{index+1}</div>
))}
</div>

<div className="m-0 pb-0">
{steps.map((item, index) => {
return (
<Steps key={item.id} viewIndex={viewIndex} index={index} time_start={item.time_start} time_end={item.time_end} title={item.title} text={item.text} ingredient={item.ingredient_step}></Steps>
<div key={item.key}>
<Steps viewIndex={viewIndex} index={index} time_start={item.time_start} time_end={item.time_end} title={item.title} text={item.text} ingredient={item.ingredient_step}></Steps>
</div>
);
})}
</div>
<div className="h-15 fixed bottom-32 w-full flex justify-center -m-10 -p-20 bg-white">
<div className='h-30 bg-red w-full flex justify-center mb-4 mt-4'>
<div className="h-15 fixed bottom-28 w-full flex justify-center -m-10 -p-20 bg-white">
<div className='h-30 bg-red w-full flex justify-center mb-6 mt-3'>
<button index='0' className={viewIndex === 0 ? 'bg-light text-slate-400 p-4 mr-2 ml-2 tracking-wider cursor-not-allowed' : 'bg-light text-black p-4 mr-2 ml-2 tracking-wider'} onClick={() => changeViewIndex(0)}>zurück</button>
<button index='1' className={viewIndex === 7 ? 'bg-light text-slate-400 p-4 mr-2 ml-2 tracking-wider cursor-not-allowed' : 'bg-light text-black p-4 mr-2 ml-2 tracking-wider'} onClick={() => changeViewIndex(1)}>weiter</button>
</div>
Expand Down

0 comments on commit 2b39b75

Please sign in to comment.