feature/new-recipe-features (#360)

* unify button styles

* fix drag on mobile

* recipe instructions section

* add carbs

* refactor component location

* asset start

* consolidate view/edit components

* asset api

* base dialog event

* Remove 'content'

* remove console.log

* add slug prop

* remove console.log

* recipe assets first pass

* add recipeSettings model

* fix hide/show when no tags/categories

* fix typo

Co-authored-by: hay-kot <hay-kot@pm.me>

mealie/db/models/recipe/assets.py

@@ -0,0 +1,22 @@
+import sqlalchemy as sa
+from mealie.db.models.model_base import SqlAlchemyBase
+
+
+class RecipeAsset(SqlAlchemyBase):
+    __tablename__ = "recipe_assets"
+    id = sa.Column(sa.Integer, primary_key=True)
+    parent_id = sa.Column(sa.String, sa.ForeignKey("recipes.id"))
+    name = sa.Column(sa.String)
+    icon = sa.Column(sa.String)
+    file_name = sa.Column(sa.String)
+
+    def __init__(
+        self,
+        name=None,
+        icon=None,
+        file_name=None,
+    ) -> None:
+        print("Asset Saved", name)
+        self.name = name
+        self.file_name = file_name
+        self.icon = icon

mealie/db/models/recipe/instruction.py

@@ -9,3 +9,4 @@ class RecipeInstruction(SqlAlchemyBase):
     position = sa.Column(sa.Integer)
     type = sa.Column(sa.String, default="")
     text = sa.Column(sa.String)
+    title = sa.Column(sa.String)

mealie/db/models/recipe/nutrition.py

@@ -10,6 +10,7 @@ class Nutrition(SqlAlchemyBase):
     fatContent = sa.Column(sa.String)
     fiberContent = sa.Column(sa.String)
     proteinContent = sa.Column(sa.String)
+    carbohydrateContent = sa.Column(sa.String)
     sodiumContent = sa.Column(sa.String)
     sugarContent = sa.Column(sa.String)
 
@@ -21,6 +22,7 @@ class Nutrition(SqlAlchemyBase):
         proteinContent=None,
         sodiumContent=None,
         sugarContent=None,
+        carbohydrateContent=None,
     ) -> None:
         self.calories = calories
         self.fatContent = fatContent
@@ -28,3 +30,4 @@ class Nutrition(SqlAlchemyBase):
         self.proteinContent = proteinContent
         self.sodiumContent = sodiumContent
         self.sugarContent = sugarContent
+        self.carbohydrateContent = carbohydrateContent

mealie/db/models/recipe/recipe.py

@@ -1,16 +1,17 @@
 import datetime
 from datetime import date
-from typing import List
 
 import sqlalchemy as sa
 import sqlalchemy.orm as orm
 from mealie.db.models.model_base import BaseMixins, SqlAlchemyBase
 from mealie.db.models.recipe.api_extras import ApiExtras
+from mealie.db.models.recipe.assets import RecipeAsset
 from mealie.db.models.recipe.category import Category, recipes2categories
 from mealie.db.models.recipe.ingredient import RecipeIngredient
 from mealie.db.models.recipe.instruction import RecipeInstruction
 from mealie.db.models.recipe.note import Note
 from mealie.db.models.recipe.nutrition import Nutrition
+from mealie.db.models.recipe.settings import RecipeSettings
 from mealie.db.models.recipe.tag import Tag, recipes2tags
 from mealie.db.models.recipe.tool import Tool
 from sqlalchemy.ext.orderinglist import ordering_list
@@ -32,17 +33,18 @@ class RecipeModel(SqlAlchemyBase, BaseMixins):
     cookTime = sa.Column(sa.String)
     recipeYield = sa.Column(sa.String)
     recipeCuisine = sa.Column(sa.String)
-    tools: List[Tool] = orm.relationship("Tool", cascade="all, delete-orphan")
+    tools: list[Tool] = orm.relationship("Tool", cascade="all, delete-orphan")
+    assets: list[RecipeAsset] = orm.relationship("RecipeAsset", cascade="all, delete-orphan")
     nutrition: Nutrition = orm.relationship("Nutrition", uselist=False, cascade="all, delete-orphan")
-    recipeCategory: List = orm.relationship("Category", secondary=recipes2categories, back_populates="recipes")
+    recipeCategory: list = orm.relationship("Category", secondary=recipes2categories, back_populates="recipes")
 
-    recipeIngredient: List[RecipeIngredient] = orm.relationship(
+    recipeIngredient: list[RecipeIngredient] = orm.relationship(
         "RecipeIngredient",
         cascade="all, delete-orphan",
         order_by="RecipeIngredient.position",
         collection_class=ordering_list("position"),
     )
-    recipeInstructions: List[RecipeInstruction] = orm.relationship(
+    recipeInstructions: list[RecipeInstruction] = orm.relationship(
         "RecipeInstruction",
         cascade="all, delete-orphan",
         order_by="RecipeInstruction.position",
@@ -51,12 +53,13 @@ class RecipeModel(SqlAlchemyBase, BaseMixins):
 
     # Mealie Specific
     slug = sa.Column(sa.String, index=True, unique=True)
-    tags: List[Tag] = orm.relationship("Tag", secondary=recipes2tags, back_populates="recipes")
+    settings = orm.relationship("RecipeSettings", uselist=False, cascade="all, delete-orphan")
+    tags: list[Tag] = orm.relationship("Tag", secondary=recipes2tags, back_populates="recipes")
     dateAdded = sa.Column(sa.Date, default=date.today)
-    notes: List[Note] = orm.relationship("Note", cascade="all, delete-orphan")
+    notes: list[Note] = orm.relationship("Note", cascade="all, delete-orphan")
     rating = sa.Column(sa.Integer)
     orgURL = sa.Column(sa.String)
-    extras: List[ApiExtras] = orm.relationship("ApiExtras", cascade="all, delete-orphan")
+    extras: list[ApiExtras] = orm.relationship("ApiExtras", cascade="all, delete-orphan")
 
     @validates("name")
     def validate_name(self, key, name):
@@ -70,22 +73,24 @@ class RecipeModel(SqlAlchemyBase, BaseMixins):
         description: str = None,
         image: str = None,
         recipeYield: str = None,
-        recipeIngredient: List[str] = None,
-        recipeInstructions: List[dict] = None,
+        recipeIngredient: list[str] = None,
+        recipeInstructions: list[dict] = None,
         recipeCuisine: str = None,
         totalTime: str = None,
         prepTime: str = None,
         nutrition: dict = None,
-        tools: list[str] = [],
+        tools: list[str] = None,
         performTime: str = None,
         slug: str = None,
-        recipeCategory: List[str] = None,
-        tags: List[str] = None,
+        recipeCategory: list[str] = None,
+        tags: list[str] = None,
         dateAdded: datetime.date = None,
-        notes: List[dict] = None,
+        notes: list[dict] = None,
         rating: int = None,
         orgURL: str = None,
         extras: dict = None,
+        assets: list = None,
+        settings: dict = None,
         *args,
         **kwargs
     ) -> None:
@@ -95,12 +100,14 @@ class RecipeModel(SqlAlchemyBase, BaseMixins):
         self.recipeCuisine = recipeCuisine
 
         self.nutrition = Nutrition(**nutrition) if self.nutrition else Nutrition()
+
         self.tools = [Tool(tool=x) for x in tools] if tools else []
 
         self.recipeYield = recipeYield
         self.recipeIngredient = [RecipeIngredient(ingredient=ingr) for ingr in recipeIngredient]
+        self.assets = [RecipeAsset(**a) for a in assets]
         self.recipeInstructions = [
-            RecipeInstruction(text=instruc.get("text"), type=instruc.get("@type", None))
+            RecipeInstruction(text=instruc.get("text"), title=instruc.get("title"), type=instruc.get("@type", None))
             for instruc in recipeInstructions
         ]
         self.totalTime = totalTime
@@ -110,6 +117,8 @@ class RecipeModel(SqlAlchemyBase, BaseMixins):
         self.recipeCategory = [Category.create_if_not_exist(session=session, name=cat) for cat in recipeCategory]
 
         # Mealie Specific
+        self.settings = RecipeSettings(**settings) if settings else RecipeSettings()
+        print(self.settings)
         self.tags = [Tag.create_if_not_exist(session=session, name=tag) for tag in tags]
         self.slug = slug
         self.dateAdded = dateAdded
@@ -118,54 +127,6 @@ class RecipeModel(SqlAlchemyBase, BaseMixins):
         self.orgURL = orgURL
         self.extras = [ApiExtras(key=key, value=value) for key, value in extras.items()]
 
-    def update(
-        self,
-        session,
-        name: str = None,
-        description: str = None,
-        image: str = None,
-        recipeYield: str = None,
-        recipeIngredient: List[str] = None,
-        recipeInstructions: List[dict] = None,
-        recipeCuisine: str = None,
-        totalTime: str = None,
-        tools: list[str] = [],
-        prepTime: str = None,
-        performTime: str = None,
-        nutrition: dict = None,
-        slug: str = None,
-        recipeCategory: List[str] = None,
-        tags: List[str] = None,
-        dateAdded: datetime.date = None,
-        notes: List[dict] = None,
-        rating: int = None,
-        orgURL: str = None,
-        extras: dict = None,
-        *args,
-        **kwargs
-    ):
+    def update(self, *args, **kwargs):
         """Updated a database entry by removing nested rows and rebuilds the row through the __init__ functions"""
-
-        self.__init__(
-            session=session,
-            name=name,
-            description=description,
-            image=image,
-            recipeYield=recipeYield,
-            recipeIngredient=recipeIngredient,
-            recipeInstructions=recipeInstructions,
-            totalTime=totalTime,
-            recipeCuisine=recipeCuisine,
-            prepTime=prepTime,
-            performTime=performTime,
-            nutrition=nutrition,
-            tools=tools,
-            slug=slug,
-            recipeCategory=recipeCategory,
-            tags=tags,
-            dateAdded=dateAdded,
-            notes=notes,
-            rating=rating,
-            orgURL=orgURL,
-            extras=extras,
-        )
+        self.__init__(*args, **kwargs)

mealie/db/models/recipe/settings.py

@@ -0,0 +1,18 @@
+import sqlalchemy as sa
+from mealie.db.models.model_base import SqlAlchemyBase
+
+
+class RecipeSettings(SqlAlchemyBase):
+    __tablename__ = "recipe_settings"
+    id = sa.Column(sa.Integer, primary_key=True)
+    parent_id = sa.Column(sa.Integer, sa.ForeignKey("recipes.id"))
+    public = sa.Column(sa.Boolean)
+    show_nutrition = sa.Column(sa.Boolean)
+    show_assets = sa.Column(sa.Boolean)
+    landscape_view = sa.Column(sa.Boolean)
+
+    def __init__(self, public=True, show_nutrition=True, show_assets=True, landscape_view=True) -> None:
+        self.public = public
+        self.show_nutrition = show_nutrition
+        self.show_assets = show_assets
+        self.landscape_view = landscape_view