feature/profile-cards (#391)

* unify format

* pass variables

* remove namespace

* rename

* group-card init

* shuffle + icons

* remove console.logs

* token CRUD

* update changelog

* add profile link

* consolidate mealplan to profile dashboard

* update docs

* add query parameter to search page

* update test routes

* update python depts

* basic token tests

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

mealie/db/database.py

@@ -8,7 +8,7 @@ from mealie.db.models.recipe.recipe import Category, RecipeModel, Tag
 from mealie.db.models.settings import CustomPage, SiteSettings
 from mealie.db.models.sign_up import SignUp
 from mealie.db.models.theme import SiteThemeModel
-from mealie.db.models.users import User
+from mealie.db.models.users import LongLiveToken, User
 from mealie.schema.category import RecipeCategoryResponse, RecipeTagResponse
 from mealie.schema.events import Event as EventSchema
 from mealie.schema.meal import MealPlanInDB
@@ -17,7 +17,7 @@ from mealie.schema.settings import CustomPageOut
 from mealie.schema.settings import SiteSettings as SiteSettingsSchema
 from mealie.schema.sign_up import SignUpOut
 from mealie.schema.theme import SiteTheme
-from mealie.schema.user import GroupInDB, UserInDB
+from mealie.schema.user import GroupInDB, LongLiveTokenInDB, UserInDB
 from sqlalchemy.orm.session import Session
 
 logger = getLogger()
@@ -38,12 +38,16 @@ class _Recipes(BaseDocument):
 
     def count_uncategorized(self, session: Session, count=True, override_schema=None) -> int:
         return self._countr_attribute(
-            session, attribute_name=RecipeModel.recipe_category, attr_match=None, count=True, override_schema=None
+            session,
+            attribute_name=RecipeModel.recipe_category,
+            attr_match=None,
+            count=count,
+            override_schema=override_schema,
         )
 
     def count_untagged(self, session: Session, count=True, override_schema=None) -> int:
         return self._countr_attribute(
-            session, attribute_name=RecipeModel.tags, attr_match=None, count=True, override_schema=None
+            session, attribute_name=RecipeModel.tags, attr_match=None, count=count, override_schema=override_schema
         )
 
 
@@ -102,6 +106,13 @@ class _Users(BaseDocument):
         return self.schema.from_orm(entry)
 
 
+class _LongLiveToken(BaseDocument):
+    def __init__(self) -> None:
+        self.primary_key = "id"
+        self.sql_model = LongLiveToken
+        self.schema = LongLiveTokenInDB
+
+
 class _Groups(BaseDocument):
     def __init__(self) -> None:
         self.primary_key = "id"
@@ -154,6 +165,7 @@ class Database:
         self.categories = _Categories()
         self.tags = _Tags()
         self.users = _Users()
+        self.api_tokens = _LongLiveToken()
         self.sign_ups = _SignUps()
         self.groups = _Groups()
         self.custom_pages = _CustomPages()

mealie/db/models/recipe/ingredient.py

@@ -1,13 +1,14 @@
-import sqlalchemy as sa
 from mealie.db.models.model_base import SqlAlchemyBase
+from sqlalchemy import Column, ForeignKey, Integer, String
 
 
 class RecipeIngredient(SqlAlchemyBase):
     __tablename__ = "recipes_ingredients"
-    id = sa.Column(sa.Integer, primary_key=True)
-    position = sa.Column(sa.Integer)
-    parent_id = sa.Column(sa.Integer, sa.ForeignKey("recipes.id"))
-    ingredient = sa.Column(sa.String)
+    id = Column(Integer, primary_key=True)
+    position = Column(Integer)
+    parent_id = Column(Integer, ForeignKey("recipes.id"))
+    # title = Column(String)
+    ingredient = Column(String)
 
     def update(self, ingredient):
         self.ingredient = ingredient

mealie/db/models/recipe/instruction.py

@@ -1,12 +1,12 @@
-import sqlalchemy as sa
 from mealie.db.models.model_base import SqlAlchemyBase
+from sqlalchemy import Column, ForeignKey, Integer, String
 
 
 class RecipeInstruction(SqlAlchemyBase):
     __tablename__ = "recipe_instructions"
-    id = sa.Column(sa.Integer, primary_key=True)
-    parent_id = sa.Column(sa.Integer, sa.ForeignKey("recipes.id"))
-    position = sa.Column(sa.Integer)
-    type = sa.Column(sa.String, default="")
-    text = sa.Column(sa.String)
-    title = sa.Column(sa.String)
+    id = Column(Integer, primary_key=True)
+    parent_id = Column(Integer, ForeignKey("recipes.id"))
+    position = Column(Integer)
+    type = Column(String, default="")
+    title = Column(String)
+    text = Column(String)

mealie/db/models/recipe/recipe.py

@@ -93,7 +93,6 @@ class RecipeModel(SqlAlchemyBase, BaseMixins):
         recipe_category: list[str] = None,
         tags: list[str] = None,
         date_added: datetime.date = None,
-        date_updated: datetime.datetime = None,
         notes: list[dict] = None,
         rating: int = None,
         org_url: str = None,

mealie/db/models/users.py

@@ -3,11 +3,19 @@ from mealie.db.models.group import Group
 from mealie.db.models.model_base import BaseMixins, SqlAlchemyBase
 from sqlalchemy import Boolean, Column, ForeignKey, Integer, String, orm
 
-# I'm not sure this is necessasry, browser based settings may be sufficient
-# class UserSettings(SqlAlchemyBase, BaseMixins):
-#     __tablename__ = "user_settings"
-#     id = Column(Integer, primary_key=True, index=True)
-#     parent_id = Column(String, ForeignKey("users.id"))
+
+class LongLiveToken(SqlAlchemyBase, BaseMixins):
+    __tablename__ = "long_live_tokens"
+    id = Column(Integer, primary_key=True)
+    parent_id = Column(Integer, ForeignKey("users.id"))
+    name = Column(String, nullable=False)
+    token = Column(String, nullable=False)
+    user = orm.relationship("User")
+
+    def __init__(self, session, name, token, parent_id) -> None:
+        self.name = name
+        self.token = token
+        self.user = User.get_ref(session, parent_id)
 
 
 class User(SqlAlchemyBase, BaseMixins):
@@ -19,6 +27,9 @@ class User(SqlAlchemyBase, BaseMixins):
     group_id = Column(Integer, ForeignKey("groups.id"))
     group = orm.relationship("Group", back_populates="users")
     admin = Column(Boolean, default=False)
+    tokens: list[LongLiveToken] = orm.relationship(
+        LongLiveToken, back_populates="user", cascade="all, delete, delete-orphan", single_parent=True
+    )
 
     def __init__(
         self,
@@ -29,6 +40,8 @@ class User(SqlAlchemyBase, BaseMixins):
         group: str = settings.DEFAULT_GROUP,
         admin=False,
         id=None,
+        *args,
+        **kwargs
     ) -> None:
 
         group = group or settings.DEFAULT_GROUP
@@ -38,7 +51,7 @@ class User(SqlAlchemyBase, BaseMixins):
         self.admin = admin
         self.password = password
 
-    def update(self, full_name, email, group, admin, session=None, id=None, password=None):
+    def update(self, full_name, email, group, admin, session=None, id=None, password=None, *args, **kwargs):
         self.full_name = full_name
         self.email = email
         self.group = Group.get_ref(session, group)
@@ -49,3 +62,7 @@ class User(SqlAlchemyBase, BaseMixins):
 
     def update_password(self, password):
         self.password = password
+
+    @staticmethod
+    def get_ref(session, id: str):
+        return session.query(User).filter(User.id == id).one()