Blatt18 (#179)

* Python Black Formatierung umgesetzt

* Fix typo in findRecipes function parameter name

* Add import statement for Database module in RecipeSUCUK.py

* Upgrade actions/checkout from v4 to v5 in CI configuration files

* Correct directory name in README and update email variable for clarity

* Improve grammar and punctuation in README description

* Refactor CSS class names for consistency and clarity (#171)

* Refactor CSS class names for consistency and clarity

* Refactor CSS variables for improved readability and consistency

* Remove unnecessary stylelint directive for cleaner CSS

* Refactor variable names for consistency in recipe filtering functions

* Fix css

* Upgrade CodeQL action versions from v3 to v4 in CI configuration

* Pin npm dependencies to specific versions for stability and update versions (#174)

* Pin npm dependencies to specific versions for stability

* Remove duplicate npm dependencies for cleaner package management

* added the format Ingridients function to Ingridient.yp and removed it from RecipeSUCUK and RecipeNameFinder

* fixed some additional error in naming

* Pin bcrypt, python-jose, and python-multipart to specific versions for consistency

* Potential fix for pull request finding

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>

* Add popup class aliases for legacy profile dialogs

---------

Co-authored-by: PrussianBaron <goebelsamuel@gmail.com>
Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>

Author: 4 people

README.md

@@ -2,7 +2,7 @@
 [![ci.yml](https://github.com/GalacticCodeGambit/LazyCook/actions/workflows/ci.yml/badge.svg)](https://github.com/GalacticCodeGambit/LazyCook/actions/workflows/ci.yml)
 [![lint.yml](https://github.com/GalacticCodeGambit/LazyCook/actions/workflows/lint.yml/badge.svg)](https://github.com/GalacticCodeGambit/LazyCook/actions/workflows/lint.yml)
 
-LazyCook soll eine Webanwendung sein. Die es ermöglichen, seine vorhandenen Zutaten einzutragen, und darauf soll LazyCook dir mögliche Rezepte/Gerichte vorschlagen, die du aus diesen Zutaten gemacht werden können.
+LazyCook soll eine Webanwendung sein, die es ermöglicht, vorhandene Zutaten einzutragen. Darauf basierend soll LazyCook mögliche Rezepte/Gerichte vorschlagen, die du aus diesen Zutaten machen kannst.
 ## Features
 - [x] [#23](https://github.com/GalacticCodeGambit/LazyCook/issues/23) Zutaten hinzufügen können 
 - [x] [#24](https://github.com/GalacticCodeGambit/LazyCook/issues/24) Zutaten entfernen können  

project/backend/Database.py

@@ -266,7 +266,7 @@ def addIngredient(name: str, amountType: str) -> int:
         return cur.lastrowid
 
 
-def getIngridientByName(name: str):
+def getIngredientByName(name: str):
     with getDB() as con:
         cur = con.cursor()
         cur.execute(

project/backend/EmailService.py

@@ -72,4 +72,3 @@ def sendPasswordResetEmail(to_email: str, name: str, resetLink: str) -> None:
     except Exception as e:
         print(f"E-Mail Fehler: {e}")
         raise
-

project/backend/Ingredient.py

@@ -1,5 +1,5 @@
 from typing import List, Dict, Any
-from Database import addIngredient
+from Database import addIngredient, getAllIngredientsForRecipe
 
 
 class Ingredient:
@@ -35,3 +35,12 @@ def saveInDB(self):
                 return False
             else:
                 return True
+
+    def formatIngredients(id: int) -> list[Ingredient]:
+        IngredientsRaw = getAllIngredientsForRecipe(id)
+        Ingredients = []
+        for IngredientRaw in IngredientsRaw:
+            Ingredients.append(
+                Ingredient(IngredientRaw["name"], IngredientRaw["amount"])
+            )
+        return Ingredients

project/backend/Recipe.py

@@ -1,5 +1,5 @@
 from Ingredient import Ingredient
-from Database import addIngredientToRecipe, addRecipe, getIngridientByName
+from Database import addIngredientToRecipe, addRecipe, getIngredientByName
 
 
 class Recipe:
@@ -15,12 +15,12 @@ def __init__(self, name: str, ingredients: list[Ingredient], description: str):
 
     def saveInDB(self) -> bool:
         rid = addRecipe(self.__name, self.__description, None)
-        for ingridient in self.__ingredients:
-            result = getIngridientByName(ingridient.getName())
+        for ingredient in self.__ingredients:
+            result = getIngredientByName(ingredient.getName())
             if not result:
                 return False
-            zid = result['id']
-            addIngredientToRecipe(zid, rid, ingridient.getAmount())
+            zid = result["id"]
+            addIngredientToRecipe(zid, rid, ingredient.getAmount())
         return True
 
     def getName(self) -> str:

project/backend/RecipeSUCUK.py

@@ -1,7 +1,7 @@
 # SUCUK = Search for Uncomplicated Cooking and User-friendly Kitchen recipes
 from Ingredient import Ingredient
 from Recipe import Recipe
-from Database import getAllRecipes, getAllIngredientsForRecipe
+from Database import getAllRecipes
 
 
 def findRecipes(ingredients: list[Ingredient]) -> list[Recipe]:
@@ -33,21 +33,13 @@ def __initRecipes() -> list[Recipe]:
     for recipeRaw in recipesRaw:
         recipe = Recipe(
             recipeRaw["name"],
-            __formatIngredients(recipeRaw["id"]),
+            Ingredient.formatIngredients(recipeRaw["id"]),
             recipeRaw["description"],
         )
         recipes.append(recipe)
     return recipes
 
 
-def __formatIngredients(id: int) -> list[Ingredient]:
-    IngredientsRaw = getAllIngredientsForRecipe(id)
-    Ingredients = []
-    for IngredientRaw in IngredientsRaw:
-        Ingredients.append(Ingredient(IngredientRaw["name"], IngredientRaw["amount"]))
-    return Ingredients
-
-
 if __name__ == "__main__":
     ini = []
     ini.append(Ingredient("Linguine", 10))

project/backend/SearchRecipeNames.py

@@ -1,4 +1,4 @@
-from Database import getAllRecipes, getAllIngredientsForRecipe
+from Database import getAllRecipes
 from Ingredient import Ingredient
 from Recipe import Recipe
 
@@ -12,16 +12,8 @@ def getMatchingRecipeNames(searchTerm: str) -> list[Recipe]:
             matchingRecipes.append(
                 Recipe(
                     recipe["name"],
-                    __formatIngredients(recipe["id"]),
+                    Ingredient.formatIngredients(recipe["id"]),
                     recipe["description"],
                 )
             )
     return matchingRecipes
-
-
-def __formatIngredients(id: int) -> list[Ingredient]:
-    IngredientsRaw = getAllIngredientsForRecipe(id)
-    Ingredients = []
-    for IngredientRaw in IngredientsRaw:
-        Ingredients.append(Ingredient(IngredientRaw["name"], IngredientRaw["amount"]))
-    return Ingredients

project/backend/requirements.txt

@@ -2,8 +2,8 @@
 fastapi[standard]==0.121.1
 uvicorn[standard]==0.38.0
 gunicorn==23.0.0
-bcrypt
-python-jose[cryptography]
-python-multipart
+bcrypt==5.0.0
+python-jose[cryptography]==3.5.0
+python-multipart==0.0.27
 pytest==9.0.3
 pytest-cov==6.0.0

project/frontend/app/recipeFinder/style.css

@@ -81,7 +81,8 @@
     gap: 20px;
 }
 
-.popup-title {
+.popup-title,
+.popup__title {
     font-size: 20px;
     font-weight: 600;
     color: #111;
@@ -90,16 +91,19 @@
     margin: 0;
 }
 
-.popup-fields {
+.popup-fields,
+.popup__fields {
     display: flex;
     gap: 10px;
 }
 
-.popup-fields-stacked {
+.popup-fields-stacked,
+.popup__fields--stacked {
     flex-direction: column;
 }
 
-.popup-input {
+.popup-input,
+.popup__input {
     flex: 1;
     padding: 10px 12px;
     border-radius: 6px;