Merge branch 'mealie-next' into reset-scroll-position

reset scroll position
2025-12-30 09:58:33 -05:00 · 2025-07-12 01:32:32 +02:00 · 2025-07-11 23:29:09 +00:00
478 changed files with 39757 additions and 41566 deletions
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -11,7 +11,7 @@
      // Use -bullseye variants on local on arm64/Apple Silicon.
      "VARIANT": "3.12-bullseye",
      // Options
-      "NODE_VERSION": "22"
+      "NODE_VERSION": "20"
    }
  },
  "mounts": [
--- a/.github/workflows/build-package.yml
+++ b/.github/workflows/build-package.yml
@@ -19,7 +19,7 @@ jobs:
      - name: Setup node env 🏗
        uses: actions/setup-node@v4.0.0
        with:
-          node-version: 22
+          node-version: 20
          check-latest: true

      - name: Get yarn cache directory path 🛠
--- a/.github/workflows/e2e.yml
+++ b/.github/workflows/e2e.yml
@@ -13,7 +13,7 @@ jobs:
    - uses: actions/checkout@v4
    - uses: actions/setup-node@v4
      with:
-        node-version: 22
+        node-version: 20
        cache: 'yarn'
        cache-dependency-path: ./tests/e2e/yarn.lock
    - name: Set up Docker Buildx
--- a/.github/workflows/locale-sync.yml
+++ b/.github/workflows/locale-sync.yml
@@ -86,7 +86,7 @@ jobs:

          # Add and commit changes
          git add .
-          git commit -m "chore: crowdin locale sync"
+          git commit -m "chore: automatic locale sync"

          # Push the branch
          git push origin "$BRANCH_NAME"
@@ -96,10 +96,9 @@ jobs:
          # Create PR using GitHub CLI with explicit repository
          gh pr create \
            --repo "${{ github.repository }}" \
-            --title "chore(l10n): Crowdin locale sync" \
+            --title "chore: automatic locale sync" \
            --base "$BASE_BRANCH" \
            --head "$BRANCH_NAME" \
-            --label "l10n" \
            --body "## Summary

          Automatically generated locale updates from the weekly sync job.
--- a/.github/workflows/pull-request-lint.yml
+++ b/.github/workflows/pull-request-lint.yml
@@ -31,7 +31,6 @@ jobs:
            deps
            auto
            l10n
-            config
          # Configure that a scope must always be provided.
          requireScope: false
          # If the PR contains one of these newline-delimited labels, the
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -17,7 +17,7 @@ jobs:
    name: Build Package
    uses: ./.github/workflows/build-package.yml
    with:
-      tag: ${{ github.event.release.tag_name }}
+      tag: release

  publish:
    permissions:
@@ -77,7 +77,7 @@ jobs:
          sed -i 's/:v[0-9]*.[0-9]*.[0-9]*/:v${{ env.VERSION_NUM }}/' docs/docs/documentation/getting-started/installation/sqlite.md
          sed -i 's/:v[0-9]*.[0-9]*.[0-9]*/:v${{ env.VERSION_NUM }}/' docs/docs/documentation/getting-started/installation/postgres.md
          sed -i 's/^version = "[^"]*"/version = "${{ env.VERSION_NUM }}"/' pyproject.toml
-          sed -i 's/\("version": "\)[^"]*"/\1${{ env.VERSION_NUM }}"/' frontend/package.json
+          sed -i 's/^\s*"version": "[^"]*"/"version": "${{ env.VERSION_NUM }}"/' frontend/package.json

      - name: Create Pull Request
        uses: peter-evans/create-pull-request@v6
--- a/.github/workflows/test-frontend.yml
+++ b/.github/workflows/test-frontend.yml
@@ -14,7 +14,7 @@ jobs:
      - name: Setup node env 🏗
        uses: actions/setup-node@v4.0.0
        with:
-          node-version: 22
+          node-version: 20
          check-latest: true

      - name: Get yarn cache directory path 🛠
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -1,6 +1,6 @@
 repos:
  - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v6.0.0
+    rev: v5.0.0
    hooks:
      - id: check-yaml
        exclude: "mkdocs.yml"
@@ -12,7 +12,7 @@ repos:
        exclude: ^tests/data/
  - repo: https://github.com/astral-sh/ruff-pre-commit
    # Ruff version.
-    rev: v0.13.3
+    rev: v0.12.2
    hooks:
      - id: ruff
      - id: ruff-format
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -59,11 +59,8 @@
    "netlify.toml": "runtime.txt",
    "README.md": "LICENSE, SECURITY.md"
  },
-  "[typescript]": {
-    "editor.formatOnSave": true
-  },
  "[vue]": {
-    "editor.formatOnSave": true
+    "editor.formatOnSave": false
  },
  "[python]": {
    "editor.formatOnSave": true,
--- a/Taskfile.yml
+++ b/Taskfile.yml
@@ -71,7 +71,6 @@ tasks:
    desc: run code generators
    cmds:
      - poetry run python dev/code-generation/main.py {{ .CLI_ARGS }}
-      - task: docs:gen
      - task: py:format

  dev:services:
@@ -88,8 +87,6 @@ tasks:
      - rm -r ./dev/data/recipes/
      - rm -r ./dev/data/users/
      - rm -f ./dev/data/mealie*.db
-      - rm -f ./dev/data/mealie*.db-shm
-      - rm -f ./dev/data/mealie*.db-wal
      - rm -f ./dev/data/mealie.log
      - rm -f ./dev/data/.secret

--- a/cliff.toml
+++ b/cliff.toml
@@ -35,7 +35,7 @@ conventional_commits = true
 filter_unconventional = true
 # regex for preprocessing the commit messages
 commit_preprocessors = [
-    { pattern = '\((\w+\s)?#([0-9]+)\)', replace = "([#${2}](https://github.com/mealie-recipes/mealie/issues/${2}))"},
+    { pattern = '\((\w+\s)?#([0-9]+)\)', replace = "([#${2}](https://github.com/hay-kot/mealie/issues/${2}))"},
 ]
 # regex for parsing and grouping commits
 commit_parsers = [
--- a/dev/code-generation/gen_py_pytest_data_paths.py
+++ b/dev/code-generation/gen_py_pytest_data_paths.py
@@ -1,4 +1,3 @@
-import subprocess
 from dataclasses import dataclass
 from pathlib import Path

@@ -106,16 +105,12 @@ def main():
    # Flatten list of lists
    all_children = [item for sublist in all_children for item in sublist]

-    out_path = GENERATED / "__init__.py"
    render_python_template(
        TEMPLATE,
-        out_path,
+        GENERATED / "__init__.py",
        {"children": all_children},
    )

-    subprocess.run(["poetry", "run", "ruff", "check", str(out_path), "--fix"])
-    subprocess.run(["poetry", "run", "ruff", "format", str(out_path)])
-

 if __name__ == "__main__":
    main()
--- a/dev/code-generation/gen_py_schema_exports.py
+++ b/dev/code-generation/gen_py_schema_exports.py
@@ -1,6 +1,5 @@
 import pathlib
 import re
-import subprocess
 from dataclasses import dataclass, field

 from utils import PROJECT_DIR, log, render_python_template
@@ -85,23 +84,16 @@ def find_modules(root: pathlib.Path) -> list[Modules]:
    return modules


-def main() -> None:
+def main():
    modules = find_modules(SCHEMA_PATH)

-    template_paths: list[pathlib.Path] = []
    for module in modules:
        log.debug(f"Module: {module.directory.name}")
        for file in module.files:
            log.debug(f"  File: {file.import_path}")
            log.debug(f"    Classes: [{', '.join(file.classes)}]")

-        template_path = module.directory / "__init__.py"
-        template_paths.append(template_path)
-        render_python_template(template, template_path, {"module": module})
-
-    path_args = (str(p) for p in template_paths)
-    subprocess.run(["poetry", "run", "ruff", "check", *path_args, "--fix"])
-    subprocess.run(["poetry", "run", "ruff", "format", *path_args])
+        render_python_template(template, module.directory / "__init__.py", {"module": module})


 if __name__ == "__main__":
--- a/dev/code-generation/gen_ts_locales.py
+++ b/dev/code-generation/gen_ts_locales.py
@@ -173,36 +173,15 @@ the code generation ID is hardcoded into the script and required in the nuxt con


 def inject_nuxt_values():
-    datetime_files = list(datetime_dir.glob("*.json"))
-    datetime_files.sort()
-
-    datetime_imports = []
-    datetime_object_entries = []
-
-    for match in datetime_files:
-        # Convert locale name to camelCase variable name (e.g., "en-US" -> "enUS")
-        var_name = match.stem.replace("-", "")
-
-        # Generate import statement
-        import_line = f'import * as {var_name} from "./lang/dateTimeFormats/{match.name}";'
-        datetime_imports.append(import_line)
-
-        # Generate object entry
-        object_entry = f'  "{match.stem}": {var_name},'
-        datetime_object_entries.append(object_entry)
-
-    all_date_locales = datetime_imports + ["", "const datetimeFormats = {"] + datetime_object_entries + ["};"]
+    all_date_locales = [
+        f'"{match.stem}": require("./lang/dateTimeFormats/{match.name}"),' for match in datetime_dir.glob("*.json")
+    ]

    all_langs = []
    for match in locales_dir.glob("*.json"):
-        match_data = LOCALE_DATA.get(match.stem)
-        match_dir = match_data.dir if match_data else "ltr"
-
-        lang_string = f'{{ code: "{match.stem}", file: "{match.name.replace(".json", ".ts")}", dir: "{match_dir}" }},'
+        lang_string = f'{{ code: "{match.stem}", file: "{match.name.replace(".json", ".ts")}" }},'
        all_langs.append(lang_string)

-    all_langs.sort()
-
    log.debug(f"injecting locales into nuxt config -> {nuxt_config}")
    inject_inline(nuxt_config, CodeKeys.nuxt_local_messages, all_langs)
    inject_inline(i18n_config, CodeKeys.nuxt_local_dates, all_date_locales)
--- a/dev/code-generation/gen_ts_types.py
+++ b/dev/code-generation/gen_ts_types.py
@@ -1,5 +1,4 @@
 import re
-import subprocess
 from pathlib import Path

 from jinja2 import Template
@@ -9,8 +8,8 @@ from utils import log
 # ============================================================

 template = """// This Code is auto generated by gen_ts_types.py
-{% for name in global %}import type {{ name }} from "@/components/global/{{ name }}.vue";
-{% endfor %}{% for name in layout %}import type {{ name }} from "@/components/layout/{{ name }}.vue";
+{% for name in global %}import {{ name }} from "@/components/global/{{ name }}.vue";
+{% endfor %}{% for name in layout %}import {{ name }} from "@/components/layout/{{ name }}.vue";
 {% endfor %}
 declare module "vue" {
  export interface GlobalComponents {
@@ -190,7 +189,6 @@ def generate_typescript_types() -> None:  # noqa: C901
    skipped_dirs: list[Path] = []
    failed_modules: list[Path] = []

-    out_paths: list[Path] = []
    for module in schema_path.iterdir():
        if module.is_dir() and module.stem in ignore_dirs:
            skipped_dirs.append(module)
@@ -207,18 +205,10 @@ def generate_typescript_types() -> None:  # noqa: C901
            path_as_module = path_to_module(module)
            generate_typescript_defs(path_as_module, str(out_path), exclude=("MealieModel"))  # type: ignore
            clean_output_file(out_path)
-            out_paths.append(out_path)
        except Exception:
            failed_modules.append(module)
            log.exception(f"Module Error: {module}")

-    # Run ESLint --fix on the files to clean up any formatting issues
-    subprocess.run(
-        ["yarn", "lint", "--fix", *(str(path) for path in out_paths)],
-        check=True,
-        cwd=PROJECT_DIR / "frontend",
-    )
-
    log.debug("\n📁 Skipped Directories:")
    for skipped_dir in skipped_dirs:
        log.debug(f"   📁 {skipped_dir.name}")
--- a/dev/code-generation/utils/template.py
+++ b/dev/code-generation/utils/template.py
@@ -1,4 +1,5 @@
 import logging
+import subprocess
 from dataclasses import dataclass
 from pathlib import Path

@@ -22,6 +23,11 @@ def render_python_template(template_file: Path | str, dest: Path, data: dict):

    dest.write_text(text)

+    # lint/format file with Ruff
+    log.info(f"Formatting {dest}")
+    subprocess.run(["poetry", "run", "ruff", "check", str(dest), "--fix"])
+    subprocess.run(["poetry", "run", "ruff", "format", str(dest)])
+

@dataclass
 class CodeSlicer:
@@ -31,7 +37,7 @@ class CodeSlicer:
    indentation: str | None
    text: list[str]

-    _next_line: int | None = None
+    _next_line = None

    def purge_lines(self) -> None:
        start = self.start + 1
--- a/dev/scripts/all_recipes_stress_test.py
+++ b/dev/scripts/all_recipes_stress_test.py
@@ -44,6 +44,7 @@ def recipe_data(name: str, slug: str, id: str, userId: str, groupId: str) -> dic
                "note": "1 cup unsalted butter, cut into cubes",
                "unit": None,
                "food": None,
+                "disableAmount": True,
                "quantity": 1,
                "originalText": None,
                "referenceId": "ea3b6702-9532-4fbc-a40b-f99917831c26",
@@ -53,6 +54,7 @@ def recipe_data(name: str, slug: str, id: str, userId: str, groupId: str) -> dic
                "note": "1 cup light brown sugar",
                "unit": None,
                "food": None,
+                "disableAmount": True,
                "quantity": 1,
                "originalText": None,
                "referenceId": "c5bbfefb-1e23-4ffd-af88-c0363a0fae82",
@@ -62,6 +64,7 @@ def recipe_data(name: str, slug: str, id: str, userId: str, groupId: str) -> dic
                "note": "1/2 cup granulated white sugar",
                "unit": None,
                "food": None,
+                "disableAmount": True,
                "quantity": 1,
                "originalText": None,
                "referenceId": "034f481b-c426-4a17-b983-5aea9be4974b",
@@ -71,6 +74,7 @@ def recipe_data(name: str, slug: str, id: str, userId: str, groupId: str) -> dic
                "note": "2 large eggs",
                "unit": None,
                "food": None,
+                "disableAmount": True,
                "quantity": 1,
                "originalText": None,
                "referenceId": "37c1f796-3bdb-4856-859f-dbec90bc27e4",
@@ -80,6 +84,7 @@ def recipe_data(name: str, slug: str, id: str, userId: str, groupId: str) -> dic
                "note": "2 tsp vanilla extract",
                "unit": None,
                "food": None,
+                "disableAmount": True,
                "quantity": 1,
                "originalText": None,
                "referenceId": "85561ace-f249-401d-834c-e600a2f6280e",
@@ -89,6 +94,7 @@ def recipe_data(name: str, slug: str, id: str, userId: str, groupId: str) -> dic
                "note": "1/2 cup creamy peanut butter",
                "unit": None,
                "food": None,
+                "disableAmount": True,
                "quantity": 1,
                "originalText": None,
                "referenceId": "ac91bda0-e8a8-491a-976a-ae4e72418cfd",
@@ -98,6 +104,7 @@ def recipe_data(name: str, slug: str, id: str, userId: str, groupId: str) -> dic
                "note": "1 tsp cornstarch",
                "unit": None,
                "food": None,
+                "disableAmount": True,
                "quantity": 1,
                "originalText": None,
                "referenceId": "4d1256b3-115e-4475-83cd-464fbc304cb0",
@@ -107,6 +114,7 @@ def recipe_data(name: str, slug: str, id: str, userId: str, groupId: str) -> dic
                "note": "1 tsp baking soda",
                "unit": None,
                "food": None,
+                "disableAmount": True,
                "quantity": 1,
                "originalText": None,
                "referenceId": "64627441-39f9-4ee3-8494-bafe36451d12",
@@ -116,6 +124,7 @@ def recipe_data(name: str, slug: str, id: str, userId: str, groupId: str) -> dic
                "note": "1/2 tsp salt",
                "unit": None,
                "food": None,
+                "disableAmount": True,
                "quantity": 1,
                "originalText": None,
                "referenceId": "7ae212d0-3cd1-44b0-899e-ec5bd91fd384",
@@ -125,6 +134,7 @@ def recipe_data(name: str, slug: str, id: str, userId: str, groupId: str) -> dic
                "note": "1 cup cake flour",
                "unit": None,
                "food": None,
+                "disableAmount": True,
                "quantity": 1,
                "originalText": None,
                "referenceId": "06967994-8548-4952-a8cc-16e8db228ebd",
@@ -134,6 +144,7 @@ def recipe_data(name: str, slug: str, id: str, userId: str, groupId: str) -> dic
                "note": "2 cups all-purpose flour",
                "unit": None,
                "food": None,
+                "disableAmount": True,
                "quantity": 1,
                "originalText": None,
                "referenceId": "bdb33b23-c767-4465-acf8-3b8e79eb5691",
@@ -143,6 +154,7 @@ def recipe_data(name: str, slug: str, id: str, userId: str, groupId: str) -> dic
                "note": "2 cups peanut butter chips",
                "unit": None,
                "food": None,
+                "disableAmount": True,
                "quantity": 1,
                "originalText": None,
                "referenceId": "12ba0af8-affd-4fb2-9cca-6f1b3e8d3aef",
@@ -152,6 +164,7 @@ def recipe_data(name: str, slug: str, id: str, userId: str, groupId: str) -> dic
                "note": "1½ cups Reese's Pieces candies",
                "unit": None,
                "food": None,
+                "disableAmount": True,
                "quantity": 1,
                "originalText": None,
                "referenceId": "4bdc0598-a3eb-41ee-8af0-4da9348fbfe2",
@@ -208,6 +221,7 @@ def recipe_data(name: str, slug: str, id: str, userId: str, groupId: str) -> dic
            "showAssets": False,
            "landscapeView": False,
            "disableComments": False,
+            "disableAmount": True,
            "locked": False,
        },
        "assets": [],
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,8 +1,7 @@
 ###############################################
 # Frontend Build
 ###############################################
-FROM node:22@sha256:2bb201f33898d2c0ce638505b426f4dd038cc00e5b2b4cbba17b069f0fff1496 \
-    AS frontend-builder
+FROM node:20 AS frontend-builder

 WORKDIR /frontend

@@ -21,8 +20,7 @@ RUN yarn generate
 ###############################################
 # Base Image - Python
 ###############################################
-FROM python:3.12-slim@sha256:2267adc248a477c1f1a852a07a5a224d42abe54c28aafa572efa157dfb001bba \
-    AS python-base
+FROM python:3.12-slim AS python-base

 ENV MEALIE_HOME="/app"

@@ -134,7 +132,7 @@ RUN apt-get update \
    gosu \
    iproute2 \
    libldap-common \
-    libldap2 \
+    libldap-2.5 \
    && rm -rf /var/lib/apt/lists/*

 # create directory used for Docker Secrets
--- a/docs/docs/contributors/developers-guide/starting-dev-server.md
+++ b/docs/docs/contributors/developers-guide/starting-dev-server.md
@@ -34,7 +34,7 @@ Make sure the VSCode Dev Containers extension is installed, then select "Dev Con

 - [Python 3.12](https://www.python.org/downloads/)
 - [Poetry](https://python-poetry.org/docs/#installation)
- [Node](https://nodejs.org/en/)
+- [Node v16.x](https://nodejs.org/en/)
 - [yarn](https://classic.yarnpkg.com/lang/en/docs/install/#mac-stable)
 - [task](https://taskfile.dev/#/installation)

@@ -45,7 +45,7 @@ Once the prerequisites are installed you can cd into the project base directory
 === "Linux / macOS"

    ```bash
-    # Navigate To The Root Directory
+    # Naviate To The Root Directory
    cd /path/to/project

    # Utilize the Taskfile to Install Dependencies
--- a/docs/docs/documentation/community-guide/bring-api.md
+++ b/docs/docs/documentation/community-guide/bring-api.md
@@ -1,5 +1,5 @@
 !!! info
-    This guide was submitted by a community member. Find something wrong? Submit a PR to get it fixed!
+This guide was submitted by a community member. Find something wrong? Submit a PR to get it fixed!

 Mealie supports adding the ingredients of a recipe to your [Bring](https://www.getbring.com/) shopping list, as you can
 see [here](https://docs.mealie.io/documentation/getting-started/features/#recipe-actions).
--- a/docs/docs/documentation/community-guide/home-assistant.md
+++ b/docs/docs/documentation/community-guide/home-assistant.md
@@ -1,26 +1,26 @@
 !!! info
-    This guide was submitted by a community member. Find something wrong? Submit a PR to get it fixed!
+  This guide was submitted by a community member. Find something wrong? Submit a PR to get it fixed!

 In a lot of ways, Home Assistant is why this project exists! Since Mealie has a robust API it makes it a great fit for interacting with Home Assistant and pulling information into your dashboard.

-## Display Today's Meal in Lovelace
+### Display Today's Meal in Lovelace

 You can use the Mealie API to get access to meal plans in Home Assistant like in the image below.

 ![api-extras-gif](../../assets/img/home-assistant-card.png)

-## Steps:
+Steps:

-### 1. Get your API Token
+#### 1. Get your API Token

-Create an API token from Mealie's User Settings page (see [this page](https://docs.mealie.io/documentation/getting-started/api-usage/#getting-a-token) to learn how).
+Create an API token from Mealie's User Settings page (https://hay-kot.github.io/mealie/documentation/users-groups/user-settings/#api-key-generation)

-### 2. Create Home Assistant Sensors
+#### 2. Create Home Assistant Sensors

 Create REST sensors in home assistant to get the details of today's meal.
 We will create sensors to get the name and ID of the first meal in today's meal plan (note that this may not be what is wanted if there is more than one meal planned for the day). We need the ID as well as the name to be able to retrieve the image for the meal.

-Make sure the url and port (`http://mealie:9000`) matches your installation's address and _API_ port.
+Make sure the url and port (`http://mealie:9000` ) matches your installation's address and _API_ port.

 ```yaml
 rest:
@@ -40,7 +40,7 @@ rest:
        unique_id: mealie_todays_meal_id
 ```

-### 3. Create a Camera Entity
+#### 3. Create a Camera Entity

 We will create a camera entity to display the image of today's meal in Lovelace.

@@ -52,7 +52,7 @@ In the still image url field put in:
 Under the entity page for the new camera, rename it.
 e.g. `camera.mealie_todays_meal_image`

-### 4. Create a Lovelace Card
+#### 4. Create a Lovelace Card

 Create a picture entity card and set the entity to `mealie_todays_meal` and the camera entity to `camera.mealie_todays_meal_image` or set in the yaml directly.

@@ -76,4 +76,4 @@ card_mod:
 ```

 !!! tip
-    Due to how Home Assistant works with images, I had to include the additional styling to get the images to not appear distorted. This requires an [additional installation](https://github.com/thomasloven/lovelace-card-mod) from HACS.
+Due to how Home Assistant works with images, I had to include the additional styling to get the images to not appear distorted. This requires an [additional installation](https://github.com/thomasloven/lovelace-card-mod) from HACS.
--- a/docs/docs/documentation/community-guide/import-recipe-bookmarklet.md
+++ b/docs/docs/documentation/community-guide/import-recipe-bookmarklet.md
@@ -12,10 +12,12 @@ var url = document.URL.endsWith('/') ?
    document.URL;
 var mealie = "http://localhost:8080";
 var group_slug = "home" // Change this to your group slug. You can obtain this from your URL after logging-in to Mealie
+var use_keywords= "&use_keywords=1" // Optional - use keywords from recipe - update to "" if you don't want that
+var edity = "&edit=1" // Optional - keep in edit mode - update to "" if you don't want that

 if (mealie.slice(-1) === "/") {
    mealie = mealie.slice(0, -1)
 }
-var dest = mealie + "/g/" + group_slug + "/r/create/url?recipe_import_url=" + url;
+var dest = mealie + "/g/" + group_slug + "/r/create/url?recipe_import_url=" + url + use_keywords + edity;
 window.open(dest, "_blank");
 ```
--- a/docs/docs/documentation/community-guide/ios-shortcut.md
+++ b/docs/docs/documentation/community-guide/ios-shortcut.md
@@ -1,10 +1,9 @@
 !!! info
-    This guide was submitted by a community member. Find something wrong? Submit a PR to get it fixed!
+  This guide was submitted by a community member. Find something wrong? Submit a PR to get it fixed!

 An easy way to add recipes to Mealie from an Apple device is via an Apple Shortcut. This is a short guide to install an configure a shortcut able to add recipes via a link or image(s). 

-!!! note
-    If adding via images make sure to enable [Mealie's OpenAI Integration](https://docs.mealie.io/documentation/getting-started/installation/open-ai/)
+*Note: if adding via images make sure to enable [Mealie's openai integration](https://docs.mealie.io/documentation/getting-started/installation/open-ai/)*

 ## Javascript can only be run via Shortcuts on the Safari browser on MacOS and iOS. If you do not use Safari you may skip this section
 Some sites have begun blocking AI scraping bots, inadvertently blocking the recipe scraping library Mealie uses as well. To circumvent this, the shortcut uses javascript to capture the raw html loaded in the browser and sends that to mealie when possible.
@@ -17,13 +16,12 @@ Settings app -> apps -> Shortcuts -> Advanced -> Allow Running Scripts

 Shortcuts app -> Settings (CMD ,) -> Advanced -> Allow Running Scripts

-## Initial Setup
+## Initial setup
 An API key is needed to authenticate with mealie. To create an api key for a user, navigate to http://YOUR_MEALIE_URL/user/profile/api-tokens. Alternatively you can create a key via the mealie home page by clicking the user's profile pic in the top left -> Api Tokens

 The shortcut can be installed via **[This link](https://www.icloud.com/shortcuts/52834724050b42aebe0f2efd8d067360)**. Upon install, replace "MEALIE_API_KEY" with the API key generated previously and "MEALIE_URI" with the full URL used to access your mealie instance e.g. "http://10.0.0.5:9000" or "https://mealie.domain.com".

-## Using the Shortcut
+## Using the shortcut
 Once installed, the shortcut will automatically appear as an option when sharing an image or webpage. It can also be useful to add the shortcut to the home screen of your device. If selected from the home screen or shortcuts app, a menu will appear with prompts to import via **taking photo(s)**, **selecting photo(s)**, **scanning a URL**, or **pasting a URL**. 

-!!! note
-    Despite the Mealie API being able to accept multiple recipe images for import it is currently impossible to send multiple files in 1 web request via Shortcuts. Instead, the shortcut combines the images into a singular, vertically-concatenated image to send to mealie. This can result in slightly less-accurate text recognition.
+*Note: despite the mealie API being able to accept multiple recipe images for import it is currently impossible to send multiple files in 1 web request via Shortcuts. Instead, the shortcut combines the images into a singular, vertically-concatenated image to send to mealie. This can result in slightly less-accurate text recognition.*
--- a/docs/docs/documentation/community-guide/n8n-backup-automation.md
+++ b/docs/docs/documentation/community-guide/n8n-backup-automation.md
@@ -1,77 +1,71 @@
 # Automating Backups with n8n

 !!! info
-    This guide was submitted by a community member. Find something wrong? Submit a PR to get it fixed!
+This guide was submitted by a community member. Find something wrong? Submit a PR to get it fixed!

-[n8n](https://github.com/n8n-io/n8n) is a free and source-available fair-code licensed workflow automation tool. It's an alternative to tools like Zapier or Make, allowing you to use a UI to create automated workflows.
+> [n8n](https://github.com/n8n-io/n8n) is a free and source-available fair-code licensed workflow automation tool. Alternative to Zapier or Make, allowing you to use a UI to create automated workflows.

 This example workflow:

-1. Creates a Mealie backup every morning via an API call
-2. Keeps the last 7 backups, deleting older ones
+1. Backups Mealie every morning via an API call
+2. Deletes all but the last 7 backups

-!!! warning "Important"
-    This only automates the backup function, this does not backup your data to anywhere except your local instance. Please make sure you are backing up your data to an external source.
+> [!CAUTION]
+> This only automates the backup function, this does not backup your data to anywhere except your local instance. Please make sure you are backing up your data to an external source.

+---

 ![screenshot](../../assets/img/n8n/n8n-mealie-backup.png)

-## Setup
+# Setup

-### Deploying n8n
+## Deploying n8n

 Follow the relevant guide in the [n8n Documentation](https://docs.n8n.io/)

-### Importing n8n workflow
+## Importing n8n workflow

 1. In n8n, add a new workflow
 2. In the top right hit the 3 dot menu and select 'Import from URL...'

-    ![screenshot](../../assets/img/n8n/n8n-workflow-import.png)
+![screenshot](../../assets/img/n8n/n8n-workflow-import.png)

-3. Paste `https://github.com/mealie-recipes/mealie/blob/mealie-next/docs/docs/assets/other/n8n/n8n-mealie-backup.json` and click 'Import'
+3. Paste `https://github.com/mealie-recipes/mealie/blob/mealie-next/docs/docs/assets/other/n8n/n8n-mealie-backup.json` and click Import
 4. Click through the nodes and update the URLs for your environment

-### API Credentials
+## API Credentials

 #### Generate Mealie API Token

-1. Head to `<YOUR MEALIE INSTANCE>/user/profile/api-tokens`
-
-    !!! tip
-        If you dont see this screen make sure that "Show advanced features" is checked under `<YOUR MEALIE INSTANCE>/user/profile/edit`
-
-2. Under token name, enter the name of the token (for example, 'n8n') and hit 'Generate'
-
+1. Head to https://mealie.example.com/user/profile/api-tokens
+   > If you dont see this screen make sure that "Show advanced features" is checked under https://mealie.example.com/user/profile/edit
+2. Under token name, enter the name of the token i.e. 'n8n' and hit Generate
 3. Copy and keep this API Token somewhere safe, this is like your password!

-!!! tip
-    You can use your normal user for this, but assuming you're an admin you could also choose to create a user named n8n and generate the API key against that user.
+> You can use your normal user for this, but assuming you're an admin you could also choose to create a user named n8n and generate the API key against that user.

 #### Setup Credentials in n8n

-See also [n8n Docs](https://docs.n8n.io/credentials/add-edit-credentials/).
+> [n8n Docs](https://docs.n8n.io/credentials/add-edit-credentials/)

 1. Create a new "Header Auth" Credential

-    ![screenshot](../../assets/img/n8n/n8n-cred-app.png)
+![screenshot](../../assets/img/n8n/n8n-cred-app.png)

 2. In the connection screen set - Name as `Authorization` - Value as `Bearer {INSERT MEALIE API KEY}`

-    ![screenshot](../../assets/img/n8n/n8n-cred-connection.png)
+![screenshot](../../assets/img/n8n/n8n-cred-connection.png)

 3. In the workflow you created, for the "Run Backup", "Get All backups", and "Delete Oldies" nodes, update:
+   - Authentication to `Generic Credential Type`
+   - Generic Auth Type to `Header Auth`
+   - Header Auth to `Mealie API` or whatever you named your credentials

-    - Authentication to `Generic Credential Type`
-    - Generic Auth Type to `Header Auth`
-    - Header Auth to `Mealie API` or whatever you named your credentials
+![screenshot](../../assets/img/n8n/n8n-workflow-auth.png)

-    ![screenshot](../../assets/img/n8n/n8n-workflow-auth.png)
+## Notification Node

-### Notification Node
-
-!!! warning "Important"
-    Please use error notifications of some kind. It's very easy to set and forget an automation, then have the worst happen and lose data.
+> Please use error notifications of some kind. It's very easy to set and forget an automation, then have the worst happen and lose data.

 [ntfy](https://github.com/binwiederhier/ntfy) is a great open source, self-hostable tool for sending notifications.

--- a/docs/docs/documentation/community-guide/swag.md
+++ b/docs/docs/documentation/community-guide/swag.md
@@ -1,10 +1,11 @@
 # Using SWAG as Reverse Proxy

 !!! info
-    This guide was submitted by a community member. Find something wrong? Submit a PR to get it fixed!
+	This guide was submitted by a community member. Find something wrong? Submit a PR to get it fixed!

-To make the setup of a Reverse Proxy much easier, Linuxserver.io developed [SWAG](https://github.com/linuxserver/docker-swag).

+
+To make the setup of a Reverse Proxy much easier, Linuxserver.io developed [SWAG](https://github.com/linuxserver/docker-swag)
 SWAG - Secure Web Application Gateway (formerly known as letsencrypt, no relation to Let's Encrypt™) sets up an Nginx web server and reverse proxy with PHP support and a built-in certbot client that automates free SSL server certificate generation and renewal processes (Let's Encrypt and ZeroSSL). It also contains fail2ban for intrusion prevention.

 ## Step 1: Get a domain
--- a/docs/docs/documentation/getting-started/faq.md
+++ b/docs/docs/documentation/getting-started/faq.md
@@ -72,7 +72,7 @@
    Mealie allows you to link ingredients to specific steps in a recipe, ensuring you know exactly when to add each ingredient during the cooking process.

    **Link Ingredients to Steps in a Recipe**
-
+    
    1. Go to a recipe
    2. Click the Edit button/icon
    3. Scroll down to the step you want to link ingredients to
@@ -82,7 +82,7 @@
    7. Click 'Save' on the Recipe

    You can optionally link the same ingredient to multiple steps, which is useful for prepping an ingredient in one step and using it in another.
-
+    
 ??? question "What is fuzzy search and how do I use it?"

    ### What is fuzzy search and how do I use it?
@@ -111,7 +111,7 @@

    You can change the theme by settings the environment variables.

-    - [Backend Config - Theming](./installation/backend-config.md#theming)
+    - [Backend Config - Themeing](./installation/backend-config.md#themeing)


 ??? question "How can I change the login session timeout?"
@@ -233,7 +233,7 @@

    ### How can I use Mealie externally

-    Exposing Mealie or any service to the internet can pose significant security risks. Before proceeding, carefully evaluate the potential impacts on your system. Due to the unique nature of each network, we cannot provide specific steps for your setup.
+    Exposing Mealie or any service to the internet can pose significant security risks. Before proceeding, carefully evaluate the potential impacts on your system. Due to the unique nature of each network, we cannot provide specific steps for your setup. 

    There is a community guide available for one way to potentially set this up, and you could reach out on Discord for further discussion on what may be best for your network.

@@ -267,7 +267,7 @@

    ### Why setup Email?

-    Mealie uses email to send account invites and password resets. If you don't use these features, you don't need to set up email. There are also other methods to perform these actions that do not require the setup of Email.
+    Mealie uses email to send account invites and password resets. If you don't use these features, you don't need to set up email. There are also other methods to perform these actions that do not require the setup of Email. 

    Email settings can be adjusted via environment variables on the backend container:

--- a/docs/docs/documentation/getting-started/features.md
+++ b/docs/docs/documentation/getting-started/features.md
@@ -87,7 +87,6 @@ The shopping lists feature is a great way to keep track of what you need to buy
 Managing shopping lists can be done from the Sidebar > Shopping Lists. 

 Here you will be able to:
-
 - See items already on the Shopping List
 - See linked recipes with ingredients
    - Toggling via the 'Pot' icon will show you the linked recipe, allowing you to click to access it. 
@@ -118,7 +117,6 @@ Mealie is designed to integrate with many different external services. There are
 ### Notifiers

 Notifiers are event-driven notifications sent when specific actions are performed within Mealie. Some actions include:
-
 - Creating / Updating a recipe
 - Adding items to a shopping list
 - Creating a new mealplan
@@ -200,7 +198,6 @@ Mealie lets you fully customize how you organize your users. You can use Groups
 Groups are fully isolated instances of Mealie. Think of a goup as a completely separate, fully self-contained site. There is no data shared between groups. Each group has its own users, recipes, tags, categories, etc. A user logged-in to one group cannot make any changes to another.

 Common use cases for groups include:
-
 - Hosting multiple instances of Mealie for others who want to keep their data private and secure
 - Creating completely isolated recipe pools

@@ -209,7 +206,6 @@ Common use cases for groups include:
 Households are subdivisions within a single Group. Households maintain their own users and settings, while sharing their recipes with other households. Households also share organizers (tags, categories, etc.) with the entire group. Meal Plans, Shopping Lists, and Integrations are only accessible within a household.

 Common use cases for households include:
-
 - Sharing a common recipe pool amongst families
 - Maintaining separate meal plans and shopping lists from other households
 - Maintaining separate integrations and customizations from other households
--- a/docs/docs/documentation/getting-started/installation/backend-config.md
+++ b/docs/docs/documentation/getting-started/installation/backend-config.md
@@ -11,7 +11,7 @@
 | DEFAULT_GROUP                 |         Home          | The default group for users                                                                        |
 | DEFAULT_HOUSEHOLD             |        Family         | The default household for users in each group                                                      |
 | BASE_URL                      | http://localhost:8080 | Used for Notifications                                                                             |
-| TOKEN_TIME                    |          48           | The time in hours that a login/auth token is valid. Must be <= 87600 (10 years, in hours).         |
+| TOKEN_TIME                    |          48           | The time in hours that a login/auth token is valid                                                 |
 | API_PORT                      |         9000          | The port exposed by backend API. **Do not change this if you're running in Docker**                |
 | API_DOCS                      |         True          | Turns on/off access to the API documentation locally                                               |
 | TZ                            |          UTC          | Must be set to get correct date/time on the server                                                 |
@@ -32,16 +32,15 @@

 ### Database

- | Variables                                               | Default  | Description                                                                                                                                                                                                                      |
- |---------------------------------------------------------|:--------:|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
- | DB_ENGINE                                               |  sqlite  | Optional: 'sqlite', 'postgres'                                                                                                                                                                                                   |
- | SQLITE_MIGRATE_JOURNAL_WAL                              |  False   | If set to true, switches SQLite's journal mode to WAL, which allows for multiple concurrent accesses. This can be useful when you have a decent amount of concurrency or when using certain remote storage systems such as Ceph. |
- | POSTGRES_USER<super>[&dagger;][secrets]</super>         |  mealie  | Postgres database user                                                                                                                                                                                                           |
- | POSTGRES_PASSWORD<super>[&dagger;][secrets]</super>     |  mealie  | Postgres database password                                                                                                                                                                                                       |
- | POSTGRES_SERVER<super>[&dagger;][secrets]</super>       | postgres | Postgres database server address                                                                                                                                                                                                 |
- | POSTGRES_PORT<super>[&dagger;][secrets]</super>         |   5432   | Postgres database port                                                                                                                                                                                                           |
- | POSTGRES_DB<super>[&dagger;][secrets]</super>           |  mealie  | Postgres database name                                                                                                                                                                                                           |
- | POSTGRES_URL_OVERRIDE<super>[&dagger;][secrets]</super> |   None   | Optional Postgres URL override to use instead of POSTGRES\_\* variables                                                                                                                                                          |
+ | Variables                                               | Default  | Description                                                             |
+ | ------------------------------------------------------- | :------: | ----------------------------------------------------------------------- |
+ | DB_ENGINE                                               |  sqlite  | Optional: 'sqlite', 'postgres'                                          |
+ | POSTGRES_USER<super>[&dagger;][secrets]</super>         |  mealie  | Postgres database user                                                  |
+ | POSTGRES_PASSWORD<super>[&dagger;][secrets]</super>     |  mealie  | Postgres database password                                              |
+ | POSTGRES_SERVER<super>[&dagger;][secrets]</super>       | postgres | Postgres database server address                                        |
+ | POSTGRES_PORT<super>[&dagger;][secrets]</super>         |   5432   | Postgres database port                                                  |
+ | POSTGRES_DB<super>[&dagger;][secrets]</super>           |  mealie  | Postgres database name                                                  |
+ | POSTGRES_URL_OVERRIDE<super>[&dagger;][secrets]</super> |   None   | Optional Postgres URL override to use instead of POSTGRES\_\* variables |

 ### Email

@@ -132,19 +131,12 @@ For custom mapping variables (e.g. OPENAI_CUSTOM_HEADERS) you should pass values
 | OPENAI_ENABLE_IMAGE_SERVICES                      |  True   | Whether to enable OpenAI image services, such as creating recipes via image. Leave this enabled unless your custom model doesn't support it, or you want to reduce costs     |
 | OPENAI_WORKERS                                    |    2    | Number of OpenAI workers per request. Higher values may increase processing speed, but will incur additional API costs                                                       |
 | OPENAI_SEND_DATABASE_DATA                         |  True   | Whether to send Mealie data to OpenAI to improve request accuracy. This will incur additional API costs                                                                      |
-| OPENAI_REQUEST_TIMEOUT                            |   300   | The number of seconds to wait for an OpenAI request to complete before cancelling the request. Leave this empty unless you're running into timeout issues on slower hardware |
+| OPENAI_REQUEST_TIMEOUT                            |   60    | The number of seconds to wait for an OpenAI request to complete before cancelling the request. Leave this empty unless you're running into timeout issues on slower hardware |

 ### Theming

 Setting the following environmental variables will change the theme of the frontend. Note that the themes are the same for all users. This is a break-change when migration from v0.x.x -> 1.x.x.

-!!! info
-    If you're setting these variables but not seeing these changes persist, try removing the `#` character. Also, depending on which syntax you're using, double-check you're using quotes correctly.
-
-    If using YAML mapping syntax, be sure to include quotes around these values, otherwise they will be treated as comments in your YAML file:<br>`THEME_LIGHT_PRIMARY: '#E58325'` or  `THEME_LIGHT_PRIMARY: 'E58325'`
-
-    If using YAML sequence syntax, don't include any quotes:<br>`THEME_LIGHT_PRIMARY=#E58325` or `THEME_LIGHT_PRIMARY=E58325`
-
 | Variables             | Default | Description                 |
 | --------------------- | :-----: | --------------------------- |
 | THEME_LIGHT_PRIMARY   | #E58325 | Light Theme Config Variable |
--- a/docs/docs/documentation/getting-started/installation/installation-checklist.md
+++ b/docs/docs/documentation/getting-started/installation/installation-checklist.md
@@ -31,7 +31,7 @@ To deploy mealie on your local network, it is highly recommended to use Docker t
 We've gone through a few versions of Mealie v1 deployment targets. We have settled on a single container deployment, and we've begun publishing the nightly container on github containers. If you're looking to move from the old nightly (split containers _or_ the omni image) to the new nightly, there are a few things you need to do:

 1. Take a backup just in case!
-2. Replace the image for the API container with `ghcr.io/mealie-recipes/mealie:v3.3.1`
+2. Replace the image for the API container with `ghcr.io/mealie-recipes/mealie:v3.0.0`
 3. Take the external port from the frontend container and set that as the port mapped to port `9000` on the new container. The frontend is now served on port 9000 from the new container, so it will need to be mapped for you to have access.
 4. Restart the container

@@ -60,7 +60,7 @@ The following steps were tested on a Ubuntu 20.04 server, but should work for mo

 ## Step 3: Customizing The `docker-compose.yaml` files.

-After you've decided how to set up your files, it's important to set a few ENV variables to ensure that you can use all the features of Mealie. Verify that:
+After you've decided setup the files it's important to set a few ENV variables to ensure that you can use all the features of Mealie. I recommend that you verify and check that:

 - [x] You've configured the relevant ENV variables for your database selection in the `docker-compose.yaml` files.
 - [x] You've configured the [SMTP server settings](./backend-config.md#email) (used for invitations, password resets, etc). You can setup a [google app password](https://support.google.com/accounts/answer/185833?hl=en) if you want to send email via gmail.
@@ -117,7 +117,7 @@ The latest tag provides the latest released image of Mealie.

 ---

-**These tags are no longer updated**
+**These tags no are long updated**

 `mealie:frontend-v1.0.0beta-x` **and** `mealie:api-v1.0.0beta-x`

--- a/docs/docs/documentation/getting-started/installation/postgres.md
+++ b/docs/docs/documentation/getting-started/installation/postgres.md
@@ -1,8 +1,5 @@
 # Installing with PostgreSQL

-!!! Warning
-    When upgrading postgresql major versions, manual steps are required [Postgres#37](https://github.com/docker-library/postgres/issues/37).
-
 PostgreSQL might be considered if you need to support many concurrent users. In addition, some features are only enabled on PostgreSQL, such as fuzzy search.

 **For Environment Variable Configuration, see** [Backend Configuration](./backend-config.md)
@@ -10,7 +7,7 @@ PostgreSQL might be considered if you need to support many concurrent users. In
 ```yaml
 services:
  mealie:
-    image: ghcr.io/mealie-recipes/mealie:v3.3.1 # (3)
+    image: ghcr.io/mealie-recipes/mealie:v3.0.0 # (3)
    container_name: mealie
    restart: always
    ports:
@@ -41,7 +38,7 @@ services:

  postgres:
    container_name: postgres
-    image: postgres:17
+    image: postgres:15
    restart: always
    volumes:
      - mealie-pgdata:/var/lib/postgresql/data
@@ -49,7 +46,6 @@ services:
      POSTGRES_PASSWORD: mealie
      POSTGRES_USER: mealie
      PGUSER: mealie
-      POSTGRES_DB: mealie
    healthcheck:
      test: ["CMD", "pg_isready"]
      interval: 30s
--- a/docs/docs/documentation/getting-started/installation/sqlite.md
+++ b/docs/docs/documentation/getting-started/installation/sqlite.md
@@ -11,7 +11,7 @@ SQLite is a popular, open source, self-contained, zero-configuration database th
 ```yaml
 services:
  mealie:
-    image: ghcr.io/mealie-recipes/mealie:v3.3.1 # (3)
+    image: ghcr.io/mealie-recipes/mealie:v3.0.0 # (3)
    container_name: mealie
    restart: always
    ports:
--- a/docs/docs/documentation/getting-started/roadmap.md
+++ b/docs/docs/documentation/getting-started/roadmap.md
@@ -2,3 +2,6 @@

 ## Feature Requests
 [Please request new features on Github](https://github.com/mealie-recipes/mealie/discussions/new?category=feature-request)
+
+## Progress
+See the [Github Projects page](https://github.com/users/hay-kot/projects/2) to see what is currently being worked on
--- a/docs/docs/documentation/getting-started/updating.md
+++ b/docs/docs/documentation/getting-started/updating.md
@@ -4,7 +4,7 @@
    You MUST read the release notes prior to upgrading your container. Mealie has a robust backup and restore system for managing your data. Pre-v1.0.0 versions of Mealie use a different database structure, so if you are upgrading from pre-v1.0.0 to v1.0.0, you MUST backup your data and then re-import it. Even if you are already on v1.0.0, it is strongly recommended to backup all data before updating.

    ### Before Upgrading
-     - [Read The Release Notes](https://github.com/mealie-recipes/mealie/releases)
+     - Read The Release Notes
     - Identify Breaking Changes
     - Create a Backup and Download from the UI
     - Upgrade
--- a/docs/docs/documentation/getting-started/usage/backups-and-restoring.md
+++ b/docs/docs/documentation/getting-started/usage/backups-and-restoring.md
@@ -1,10 +1,10 @@
 # Backups and Restores

-Mealie provides an integrated mechanic for doing full installation backups of the database.
+Mealie provides an integrated mechanic for doing full installation backups of the database. 

-Navigate to Settings > Admin Settings > Backups or manually by adding `/admin/backups` to your instance URL.
+Navigate to Settings > Backups or manually by adding `/admin/backups` to your instance URL.

-From this page, you will be able to:
+From this page, you will be able to: 

 - See a list of available backups
 - Create a backup
@@ -39,7 +39,7 @@ Restoring the Database when using Postgres requires Mealie to be configured with
 ```sql
 ALTER USER mealie WITH SUPERUSER;

-- Run restore from Mealie
+# Run restore from Mealie

 ALTER USER mealie WITH NOSUPERUSER;
 ```
--- a/docs/docs/documentation/getting-started/usage/permissions-and-public-access.md
+++ b/docs/docs/documentation/getting-started/usage/permissions-and-public-access.md
@@ -1,7 +1,6 @@
 # Permissions and Public Access

 Mealie provides various levels of user access and permissions. This includes:
-
 - Authentication and registration ([LDAP](../authentication/ldap.md) and [OpenID Connect](../authentication/oidc.md) are both supported)
 - Customizable user permissions
 - Fine-tuned public access for non-users
@@ -9,12 +8,12 @@ Mealie provides various levels of user access and permissions. This includes:
 ## Customizable User Permissions

 Each user can be configured to have varying levels of access. Some of these permissions include:
-
 - Access to Administrator tools
 - Access to inviting other users
 - Access to manage their group and group data

-Administrators can configure these settings on the User Management page (navigate to Settings > Admin Settings > Users or append `/admin/manage/users` to your instance URL).
+Administrators can navigate to the Settings page and access the User Management page to configure these settings.
+

 [User Management Demo](https://demo.mealie.io/admin/manage/users){ .md-button .md-button--primary }

@@ -23,8 +22,8 @@ Administrators can configure these settings on the User Management page (navigat
 By default, groups and households are set to private, meaning only logged-in users may access the group/household. In order for a recipe to be viewable by public (not logged-in) users, three criteria must be met:

 1. The group must not be private
-2. The household must not be private, _and_ the household setting for allowing users outside of your group to see your recipes must be enabled. These can be toggled on the Household Management page (navigate to Settings > Admin Settings > Households or append `/admin/manage/households` to your instance URL)
-3. The recipe must be set to public. This can be toggled for each recipe individually, or in bulk using the Recipe Data Management page
+2. The household must not be private, *and* the household setting for allowing users outside of your group to see your recipes must be enabled. These can be toggled on the Household Settings page
+2. The recipe must be set to public. This can be toggled for each recipe individually, or in bulk using the Recipe Data Management page

 Additionally, if the group is not private, public users can view all public group data (public recipes, public cookbooks, etc.) from the home page ([e.g. the demo home page](https://demo.mealie.io/g/home)).

--- a/docs/docs/overrides/api.html
+++ b/docs/docs/overrides/api.html
--- a/docs/docs/overrides/home.html
+++ b/docs/docs/overrides/home.html
@@ -351,7 +351,7 @@
 <!-- Custom narrow footer -->
 <div class="md-footer-meta__inner md-grid">
  <div class="md-footer-social">
-    <a class="md-footer-social__link" href="https://github.com/mealie-recipes/mealie" rel="noopener" target="_blank"
+    <a class="md-footer-social__link" href="https://github.com/hay-kot/mealie" rel="noopener" target="_blank"
      title="github.com">
      <svg style="width: 32px; height: 32px" viewBox="0 0 480 512" xmlns="http://www.w3.org/2000/svg">
        <path
--- a/docs/mkdocs.yml
+++ b/docs/mkdocs.yml
@@ -86,7 +86,7 @@ nav:

      - Community Guides:
          - Bring API without internet exposure: "documentation/community-guide/bring-api.md"
-          - Automating Backups with n8n: "documentation/community-guide/n8n-backup-automation.md"
+          - Automate Backups with n8n: "documentation/community-guide/n8n-backup-automation.md"
          - Bulk Url Import: "documentation/community-guide/bulk-url-import.md"
          - Home Assistant: "documentation/community-guide/home-assistant.md"
          - Import Bookmarklet: "documentation/community-guide/import-recipe-bookmarklet.md"
--- a/frontend/assets/main.css
+++ b/frontend/assets/main.css
@@ -37,7 +37,7 @@
 }

 .handle {
-  cursor: grab !important;
+  cursor: grab;
 }

 .hidden {
--- a/frontend/components/Domain/Cookbook/CookbookEditor.vue
+++ b/frontend/components/Domain/Cookbook/CookbookEditor.vue
@@ -44,54 +44,78 @@
  </div>
 </template>

-<script setup lang="ts">
+<script lang="ts">
+import type { ReadCookBook } from "~/lib/api/types/cookbook";
 import { Organizer } from "~/lib/api/types/non-generated";
 import QueryFilterBuilder from "~/components/Domain/QueryFilterBuilder.vue";
 import type { FieldDefinition } from "~/composables/use-query-filter-builder";
-import type { ReadCookBook } from "~/lib/api/types/cookbook";

-const modelValue = defineModel<ReadCookBook>({ required: true });
-const i18n = useI18n();
-const cookbook = toRef(modelValue);
-function handleInput(value: string | undefined) {
-  cookbook.value.queryFilterString = value || "";
-}
+export default defineNuxtComponent({
+  components: { QueryFilterBuilder },
+  props: {
+    modelValue: {
+      type: Object as () => ReadCookBook,
+      required: true,
+    },
+    actions: {
+      type: Object as () => any,
+      required: true,
+    },
+  },
+  emits: ["update:modelValue"],
+  setup(props, { emit }) {
+    const i18n = useI18n();

-const fieldDefs: FieldDefinition[] = [
-  {
-    name: "recipe_category.id",
-    label: i18n.t("category.categories"),
-    type: Organizer.Category,
+    const cookbook = toRef(() => props.modelValue);
+
+    function handleInput(value: string | undefined) {
+      cookbook.value.queryFilterString = value || "";
+      emit("update:modelValue", cookbook.value);
+    }
+
+    const fieldDefs: FieldDefinition[] = [
+      {
+        name: "recipe_category.id",
+        label: i18n.t("category.categories"),
+        type: Organizer.Category,
+      },
+      {
+        name: "tags.id",
+        label: i18n.t("tag.tags"),
+        type: Organizer.Tag,
+      },
+      {
+        name: "recipe_ingredient.food.id",
+        label: i18n.t("recipe.ingredients"),
+        type: Organizer.Food,
+      },
+      {
+        name: "tools.id",
+        label: i18n.t("tool.tools"),
+        type: Organizer.Tool,
+      },
+      {
+        name: "household_id",
+        label: i18n.t("household.households"),
+        type: Organizer.Household,
+      },
+      {
+        name: "created_at",
+        label: i18n.t("general.date-created"),
+        type: "date",
+      },
+      {
+        name: "updated_at",
+        label: i18n.t("general.date-updated"),
+        type: "date",
+      },
+    ];
+
+    return {
+      cookbook,
+      handleInput,
+      fieldDefs,
+    };
  },
-  {
-    name: "tags.id",
-    label: i18n.t("tag.tags"),
-    type: Organizer.Tag,
-  },
-  {
-    name: "recipe_ingredient.food.id",
-    label: i18n.t("recipe.ingredients"),
-    type: Organizer.Food,
-  },
-  {
-    name: "tools.id",
-    label: i18n.t("tool.tools"),
-    type: Organizer.Tool,
-  },
-  {
-    name: "household_id",
-    label: i18n.t("household.households"),
-    type: Organizer.Household,
-  },
-  {
-    name: "created_at",
-    label: i18n.t("general.date-created"),
-    type: "date",
-  },
-  {
-    name: "updated_at",
-    label: i18n.t("general.date-updated"),
-    type: "date",
-  },
-];
+});
 </script>
--- a/frontend/components/Domain/Cookbook/CookbookPage.vue
+++ b/frontend/components/Domain/Cookbook/CookbookPage.vue
@@ -17,6 +17,7 @@
      <v-card-text>
        <CookbookEditor
          v-model="editTarget"
+          :actions="actions"
        />
      </v-card-text>
    </BaseDialog>
@@ -32,9 +33,9 @@
      >
        <div class="d-flex align-center w-100 mb-2">
          <v-toolbar-title class="headline mb-0">
-            <v-icon size="large" class="mr-3">
-              {{ $globals.icons.pages }}
-            </v-icon>
+          <v-icon size="large" class="mr-3">
+            {{ $globals.icons.pages }}
+          </v-icon>
            {{ book.name }}
          </v-toolbar-title>
          <BaseButton
@@ -64,67 +65,90 @@
  </div>
 </template>

-<script setup lang="ts">
+<script lang="ts">
 import { useLazyRecipes } from "~/composables/recipes";
 import RecipeCardSection from "@/components/Domain/Recipe/RecipeCardSection.vue";
 import { useCookbookStore } from "~/composables/store/use-cookbook-store";
 import { useCookbook } from "~/composables/use-group-cookbooks";
 import { useLoggedInState } from "~/composables/use-logged-in-state";
-import type { ReadCookBook } from "~/lib/api/types/cookbook";
+import type { RecipeCookBook } from "~/lib/api/types/cookbook";
 import CookbookEditor from "~/components/Domain/Cookbook/CookbookEditor.vue";

-const $auth = useMealieAuth();
-const { isOwnGroup } = useLoggedInState();
+export default defineNuxtComponent({
+  components: { RecipeCardSection, CookbookEditor },
+  setup() {
+    const $auth = useMealieAuth();
+    const { isOwnGroup } = useLoggedInState();

-const route = useRoute();
-const groupSlug = computed(() => route.params.groupSlug as string || $auth.user.value?.groupSlug || "");
+    const route = useRoute();
+    const groupSlug = computed(() => route.params.groupSlug as string || $auth.user.value?.groupSlug || "");

-const { recipes, appendRecipes, assignSorted, removeRecipe, replaceRecipes } = useLazyRecipes(isOwnGroup.value ? null : groupSlug.value);
-const slug = route.params.slug as string;
-const { getOne } = useCookbook(isOwnGroup.value ? null : groupSlug.value);
-const { actions } = useCookbookStore();
-const router = useRouter();
+    const { recipes, appendRecipes, assignSorted, removeRecipe, replaceRecipes } = useLazyRecipes(isOwnGroup.value ? null : groupSlug.value);
+    const slug = route.params.slug as string;
+    const { getOne } = useCookbook(isOwnGroup.value ? null : groupSlug.value);
+    const { actions } = useCookbookStore();
+    const router = useRouter();

-const book = getOne(slug);
+    const tab = ref(null);
+    const book = getOne(slug);

-const isOwnHousehold = computed(() => {
-  if (!($auth.user.value && book.value?.householdId)) {
-    return false;
-  }
+    const isOwnHousehold = computed(() => {
+      if (!($auth.user.value && book.value?.householdId)) {
+        return false;
+      }

-  return $auth.user.value.householdId === book.value.householdId;
-});
-const canEdit = computed(() => isOwnGroup.value && isOwnHousehold.value);
+      return $auth.user.value.householdId === book.value.householdId;
+    });
+    const canEdit = computed(() => isOwnGroup.value && isOwnHousehold.value);

-const dialogStates = reactive({
-  edit: false,
-});
+    const dialogStates = reactive({
+      edit: false,
+    });

-const editTarget = ref<ReadCookBook | null>(null);
-function handleEditCookbook() {
-  dialogStates.edit = true;
-  editTarget.value = book.value;
-}
+    const editTarget = ref<RecipeCookBook | null>(null);
+    function handleEditCookbook() {
+      dialogStates.edit = true;
+      editTarget.value = book.value;
+    }

-async function editCookbook() {
-  if (!editTarget.value) {
-    return;
-  }
-  const response = await actions.updateOne(editTarget.value);
+    async function editCookbook() {
+      if (!editTarget.value) {
+        return;
+      }
+      const response = await actions.updateOne(editTarget.value);

-  if (response?.slug && book.value?.slug !== response?.slug) {
-    // if name changed, redirect to new slug
-    router.push(`/g/${route.params.groupSlug}/cookbooks/${response?.slug}`);
-  }
-  else {
-    // otherwise reload the page, since the recipe criteria changed
-    router.go(0);
-  }
-  dialogStates.edit = false;
-  editTarget.value = null;
-}
+      if (response?.slug && book.value?.slug !== response?.slug) {
+        // if name changed, redirect to new slug
+        router.push(`/g/${route.params.groupSlug}/cookbooks/${response?.slug}`);
+      }
+      else {
+        // otherwise reload the page, since the recipe criteria changed
+        router.go(0);
+      }
+      dialogStates.edit = false;
+      editTarget.value = null;
+    }

-useSeoMeta({
-  title: book?.value?.name || "Cookbook",
+    useSeoMeta({
+      title: book?.value?.name || "Cookbook",
+    });
+
+    return {
+      book,
+      slug,
+      tab,
+      appendRecipes,
+      assignSorted,
+      recipes,
+      removeRecipe,
+      replaceRecipes,
+      canEdit,
+      dialogStates,
+      editTarget,
+      handleEditCookbook,
+      editCookbook,
+      actions,
+    };
+  },
 });
 </script>
--- a/frontend/components/Domain/Group/GroupExportData.vue
+++ b/frontend/components/Domain/Group/GroupExportData.vue
@@ -20,33 +20,45 @@
  </v-data-table>
 </template>

-<script setup lang="ts">
+<script lang="ts">
 import { parseISO, formatDistanceToNow } from "date-fns";
 import type { GroupDataExport } from "~/lib/api/types/group";

-defineProps<{
-  exports: GroupDataExport[];
-}>();
+export default defineNuxtComponent({
+  props: {
+    exports: {
+      type: Array as () => GroupDataExport[],
+      required: true,
+    },
+  },
+  setup() {
+    const i18n = useI18n();

-const i18n = useI18n();
+    const headers = [
+      { title: i18n.t("export.export"), value: "name" },
+      { title: i18n.t("export.file-name"), value: "filename" },
+      { title: i18n.t("export.size"), value: "size" },
+      { title: i18n.t("export.link-expires"), value: "expires" },
+      { title: "", value: "actions" },
+    ];

-const headers = [
-  { title: i18n.t("export.export"), value: "name" },
-  { title: i18n.t("export.file-name"), value: "filename" },
-  { title: i18n.t("export.size"), value: "size" },
-  { title: i18n.t("export.link-expires"), value: "expires" },
-  { title: "", value: "actions" },
-];
+    function getTimeToExpire(timeString: string) {
+      const expiresAt = parseISO(timeString);

-function getTimeToExpire(timeString: string) {
-  const expiresAt = parseISO(timeString);
+      return formatDistanceToNow(expiresAt, {
+        addSuffix: false,
+      });
+    }

-  return formatDistanceToNow(expiresAt, {
-    addSuffix: false,
-  });
-}
+    function downloadData(_: any) {
+      console.log("Downloading data...");
+    }

-function downloadData(_: any) {
-  console.log("Downloading data...");
-}
+    return {
+      downloadData,
+      headers,
+      getTimeToExpire,
+    };
+  },
+});
 </script>
--- a/frontend/components/Domain/Group/GroupPreferencesEditor.vue
+++ b/frontend/components/Domain/Group/GroupPreferencesEditor.vue
@@ -9,10 +9,30 @@
  </div>
 </template>

-<script setup lang="ts">
-import type { ReadGroupPreferences } from "~/lib/api/types/user";
+<script lang="ts">
+export default defineNuxtComponent({
+  props: {
+    modelValue: {
+      type: Object,
+      required: true,
+    },
+  },
+  emits: ["update:modelValue"],
+  setup(props, context) {
+    const preferences = computed({
+      get() {
+        return props.modelValue;
+      },
+      set(val) {
+        context.emit("update:modelValue", val);
+      },
+    });

-const preferences = defineModel<ReadGroupPreferences>({ required: true });
+    return {
+      preferences,
+    };
+  },
+});
 </script>

 <style lang="scss" scoped></style>
--- a/frontend/components/Domain/Household/GroupHouseholdSelector.vue
+++ b/frontend/components/Domain/Household/GroupHouseholdSelector.vue
@@ -0,0 +1,91 @@
+<template>
+  <v-select
+    v-model="selected"
+    :items="households"
+    :label="label"
+    :hint="description"
+    :persistent-hint="!!description"
+    item-title="name"
+    :multiple="multiselect"
+    :prepend-inner-icon="$globals.icons.household"
+    return-object
+  >
+    <template #chip="data">
+      <v-chip
+        :key="data.index"
+        class="ma-1"
+        :input-value="data.item"
+        size="small"
+        closable
+        label
+        color="accent"
+        dark
+        @click:close="removeByIndex(data.index)"
+      >
+        {{ data.item.raw.name || data.item }}
+      </v-chip>
+    </template>
+  </v-select>
+</template>
+
+<script lang="ts">
+import { useHouseholdStore } from "~/composables/store/use-household-store";
+
+interface HouseholdLike {
+  id: string;
+  name: string;
+}
+
+export default defineNuxtComponent({
+  props: {
+    modelValue: {
+      type: Array as () => HouseholdLike[],
+      required: true,
+    },
+    multiselect: {
+      type: Boolean,
+      default: false,
+    },
+    description: {
+      type: String,
+      default: "",
+    },
+  },
+  emits: ["update:modelValue"],
+  setup(props, context) {
+    const selected = computed({
+      get: () => props.modelValue,
+      set: (val) => {
+        context.emit("update:modelValue", val);
+      },
+    });
+
+    onMounted(() => {
+      if (selected.value === undefined) {
+        selected.value = [];
+      }
+    });
+
+    const i18n = useI18n();
+    const label = computed(
+      () => props.multiselect ? i18n.t("household.households") : i18n.t("household.household"),
+    );
+
+    const { store: households } = useHouseholdStore();
+    function removeByIndex(index: number) {
+      if (selected.value === undefined) {
+        return;
+      }
+      const newSelected = selected.value.filter((_, i) => i !== index);
+      selected.value = [...newSelected];
+    }
+
+    return {
+      selected,
+      label,
+      households,
+      removeByIndex,
+    };
+  },
+});
+</script>
--- a/frontend/components/Domain/Household/GroupMealPlanDayContextMenu.vue
+++ b/frontend/components/Domain/Household/GroupMealPlanDayContextMenu.vue
@@ -18,7 +18,7 @@
      :open-on-hover="mdAndUp"
      content-class="d-print-none"
    >
-      <template #activator="{ props: activatorProps }">
+      <template #activator="{ props }">
        <v-btn
          :class="{ 'rounded-circle': fab }"
          :size="fab ? 'small' : undefined"
@@ -26,7 +26,7 @@
          :icon="!fab"
          variant="text"
          dark
-          v-bind="activatorProps"
+          v-bind="props"
          @click.prevent
        >
          <v-icon>{{ icon }}</v-icon>
@@ -50,7 +50,7 @@
  </div>
 </template>

-<script setup lang="ts">
+<script lang="ts">
 import type { Recipe } from "~/lib/api/types/recipe";
 import RecipeDialogAddToShoppingList from "~/components/Domain/Recipe/RecipeDialogAddToShoppingList.vue";
 import type { ShoppingListSummary } from "~/lib/api/types/household";
@@ -64,84 +64,101 @@ export interface ContextMenuItem {
  isPublic: boolean;
 }

-interface Props {
-  recipes?: Recipe[];
-  menuTop?: boolean;
-  fab?: boolean;
-  color?: string;
-  menuIcon?: string | null;
-}
-const props = withDefaults(defineProps<Props>(), {
-  recipes: () => [],
-  menuTop: true,
-  fab: false,
-  color: "primary",
-  menuIcon: null,
-});
-
-const emit = defineEmits<{
-  [key: string]: [];
-}>();
-
-const { mdAndUp } = useDisplay();
-
-const i18n = useI18n();
-const { $globals } = useNuxtApp();
-const api = useUserApi();
-
-const state = reactive({
-  loading: false,
-  shoppingListDialog: false,
-  menuItems: [
-    {
-      title: i18n.t("recipe.add-to-list"),
-      icon: $globals.icons.cartCheck,
-      color: undefined,
-      event: "shoppingList",
-      isPublic: false,
-    },
-  ],
-});
-
-const { shoppingListDialog, menuItems } = toRefs(state);
-
-const icon = props.menuIcon || $globals.icons.dotsVertical;
-
-const shoppingLists = ref<ShoppingListSummary[]>();
-const recipesWithScales = computed(() => {
-  return props.recipes.map((recipe) => {
-    return {
-      scale: 1,
-      ...recipe,
-    };
-  });
-});
-
-async function getShoppingLists() {
-  const { data } = await api.shopping.lists.getAll(1, -1, { orderBy: "name", orderDirection: "asc" });
-  if (data) {
-    shoppingLists.value = data.items as ShoppingListSummary[] ?? [];
-  }
-}
-
-// eslint-disable-next-line @typescript-eslint/no-invalid-void-type
-const eventHandlers: { [key: string]: () => void | Promise<any> } = {
-  shoppingList: () => {
-    getShoppingLists();
-    state.shoppingListDialog = true;
+export default defineNuxtComponent({
+  components: {
+    RecipeDialogAddToShoppingList,
  },
-};
+  props: {
+    recipes: {
+      type: Array as () => Recipe[],
+      default: () => [],
+    },
+    menuTop: {
+      type: Boolean,
+      default: true,
+    },
+    fab: {
+      type: Boolean,
+      default: false,
+    },
+    color: {
+      type: String,
+      default: "primary",
+    },
+    menuIcon: {
+      type: String,
+      default: null,
+    },
+  },
+  setup(props, context) {
+    const { mdAndUp } = useDisplay();

-function contextMenuEventHandler(eventKey: string) {
-  const handler = eventHandlers[eventKey];
+    const i18n = useI18n();
+    const { $globals } = useNuxtApp();
+    const api = useUserApi();

-  if (handler && typeof handler === "function") {
-    handler();
-    state.loading = false;
-    return;
-  }
+    const state = reactive({
+      loading: false,
+      shoppingListDialog: false,
+      menuItems: [
+        {
+          title: i18n.t("recipe.add-to-list"),
+          icon: $globals.icons.cartCheck,
+          color: undefined,
+          event: "shoppingList",
+          isPublic: false,
+        },
+      ],
+    });

-  emit(eventKey);
-  state.loading = false;
-}
+    const icon = props.menuIcon || $globals.icons.dotsVertical;
+
+    const shoppingLists = ref<ShoppingListSummary[]>();
+    const recipesWithScales = computed(() => {
+      return props.recipes.map((recipe) => {
+        return {
+          scale: 1,
+          ...recipe,
+        };
+      });
+    });
+
+    async function getShoppingLists() {
+      const { data } = await api.shopping.lists.getAll(1, -1, { orderBy: "name", orderDirection: "asc" });
+      if (data) {
+        shoppingLists.value = data.items as ShoppingListSummary[] ?? [];
+      }
+    }
+
+    // eslint-disable-next-line @typescript-eslint/no-invalid-void-type
+    const eventHandlers: { [key: string]: () => void | Promise<any> } = {
+      shoppingList: () => {
+        getShoppingLists();
+        state.shoppingListDialog = true;
+      },
+    };
+
+    function contextMenuEventHandler(eventKey: string) {
+      const handler = eventHandlers[eventKey];
+
+      if (handler && typeof handler === "function") {
+        handler();
+        state.loading = false;
+        return;
+      }
+
+      context.emit(eventKey);
+      state.loading = false;
+    }
+
+    return {
+      ...toRefs(state),
+      contextMenuEventHandler,
+      icon,
+      recipesWithScales,
+      shoppingLists,
+      mdAndUp,
+    };
+  },
+});
 </script>
--- a/frontend/components/Domain/Household/GroupMealPlanRuleForm.vue
+++ b/frontend/components/Domain/Household/GroupMealPlanRuleForm.vue
@@ -5,12 +5,12 @@
      style="gap: 10px"
    >
      <v-select
-        v-model="day"
+        v-model="inputDay"
        :items="MEAL_DAY_OPTIONS"
        :label="$t('meal-plan.rule-day')"
      />
      <v-select
-        v-model="entryType"
+        v-model="inputEntryType"
        :items="MEAL_TYPE_OPTIONS"
        :label="$t('meal-plan.meal-type')"
      />
@@ -19,104 +19,157 @@
    <div class="mb-5">
      <QueryFilterBuilder
        :field-defs="fieldDefs"
-        :initial-query-filter="props.queryFilter"
+        :initial-query-filter="queryFilter"
        @input="handleQueryFilterInput"
      />
    </div>

    <!-- TODO: proper pluralization of inputDay -->
    {{ $t('meal-plan.this-rule-will-apply', {
-      dayCriteria: day === "unset" ? $t('meal-plan.to-all-days') : $t('meal-plan.on-days', [day]),
-      mealTypeCriteria: entryType === "unset" ? $t('meal-plan.for-all-meal-types') : $t('meal-plan.for-type-meal-types', [entryType]),
+      dayCriteria: inputDay === "unset" ? $t('meal-plan.to-all-days') : $t('meal-plan.on-days', [inputDay]),
+      mealTypeCriteria: inputEntryType === "unset" ? $t('meal-plan.for-all-meal-types') : $t('meal-plan.for-type-meal-types', [inputEntryType]),
    }) }}
  </div>
 </template>

-<script setup lang="ts">
+<script lang="ts">
 import QueryFilterBuilder from "~/components/Domain/QueryFilterBuilder.vue";
 import type { FieldDefinition } from "~/composables/use-query-filter-builder";
 import { Organizer } from "~/lib/api/types/non-generated";
 import type { QueryFilterJSON } from "~/lib/api/types/response";

-interface Props {
-  queryFilter?: QueryFilterJSON | null;
-  showHelp?: boolean;
-}
-const props = withDefaults(defineProps<Props>(), {
-  queryFilter: null,
-  showHelp: false,
+export default defineNuxtComponent({
+  components: {
+    QueryFilterBuilder,
+  },
+  props: {
+    day: {
+      type: String,
+      default: "unset",
+    },
+    entryType: {
+      type: String,
+      default: "unset",
+    },
+    queryFilterString: {
+      type: String,
+      default: "",
+    },
+    queryFilter: {
+      type: Object as () => QueryFilterJSON,
+      default: null,
+    },
+    showHelp: {
+      type: Boolean,
+      default: false,
+    },
+  },
+  emits: ["update:day", "update:entry-type", "update:query-filter-string"],
+  setup(props, context) {
+    const i18n = useI18n();
+
+    const MEAL_TYPE_OPTIONS = [
+      { title: i18n.t("meal-plan.breakfast"), value: "breakfast" },
+      { title: i18n.t("meal-plan.lunch"), value: "lunch" },
+      { title: i18n.t("meal-plan.dinner"), value: "dinner" },
+      { title: i18n.t("meal-plan.side"), value: "side" },
+      { title: i18n.t("meal-plan.type-any"), value: "unset" },
+    ];
+
+    const MEAL_DAY_OPTIONS = [
+      { title: i18n.t("general.monday"), value: "monday" },
+      { title: i18n.t("general.tuesday"), value: "tuesday" },
+      { title: i18n.t("general.wednesday"), value: "wednesday" },
+      { title: i18n.t("general.thursday"), value: "thursday" },
+      { title: i18n.t("general.friday"), value: "friday" },
+      { title: i18n.t("general.saturday"), value: "saturday" },
+      { title: i18n.t("general.sunday"), value: "sunday" },
+      { title: i18n.t("meal-plan.day-any"), value: "unset" },
+    ];
+
+    const inputDay = computed({
+      get: () => {
+        return props.day;
+      },
+      set: (val) => {
+        context.emit("update:day", val);
+      },
+    });
+
+    const inputEntryType = computed({
+      get: () => {
+        return props.entryType;
+      },
+      set: (val) => {
+        context.emit("update:entry-type", val);
+      },
+    });
+
+    const inputQueryFilterString = computed({
+      get: () => {
+        return props.queryFilterString;
+      },
+      set: (val) => {
+        context.emit("update:query-filter-string", val);
+      },
+    });
+
+    function handleQueryFilterInput(value: string | undefined) {
+      inputQueryFilterString.value = value || "";
+    };
+
+    const fieldDefs: FieldDefinition[] = [
+      {
+        name: "recipe_category.id",
+        label: i18n.t("category.categories"),
+        type: Organizer.Category,
+      },
+      {
+        name: "tags.id",
+        label: i18n.t("tag.tags"),
+        type: Organizer.Tag,
+      },
+      {
+        name: "recipe_ingredient.food.id",
+        label: i18n.t("recipe.ingredients"),
+        type: Organizer.Food,
+      },
+      {
+        name: "tools.id",
+        label: i18n.t("tool.tools"),
+        type: Organizer.Tool,
+      },
+      {
+        name: "household_id",
+        label: i18n.t("household.households"),
+        type: Organizer.Household,
+      },
+      {
+        name: "last_made",
+        label: i18n.t("general.last-made"),
+        type: "date",
+      },
+      {
+        name: "created_at",
+        label: i18n.t("general.date-created"),
+        type: "date",
+      },
+      {
+        name: "updated_at",
+        label: i18n.t("general.date-updated"),
+        type: "date",
+      },
+    ];
+
+    return {
+      MEAL_TYPE_OPTIONS,
+      MEAL_DAY_OPTIONS,
+      inputDay,
+      inputEntryType,
+      inputQueryFilterString,
+      handleQueryFilterInput,
+      fieldDefs,
+    };
+  },
 });
-
-const day = defineModel<string>("day", { default: "unset" });
-const entryType = defineModel<string>("entryType", { default: "unset" });
-const queryFilterString = defineModel<string>("queryFilterString", { default: "" });
-
-const i18n = useI18n();
-
-const MEAL_TYPE_OPTIONS = [
-  { title: i18n.t("meal-plan.breakfast"), value: "breakfast" },
-  { title: i18n.t("meal-plan.lunch"), value: "lunch" },
-  { title: i18n.t("meal-plan.dinner"), value: "dinner" },
-  { title: i18n.t("meal-plan.side"), value: "side" },
-  { title: i18n.t("meal-plan.type-any"), value: "unset" },
-];
-
-const MEAL_DAY_OPTIONS = [
-  { title: i18n.t("general.monday"), value: "monday" },
-  { title: i18n.t("general.tuesday"), value: "tuesday" },
-  { title: i18n.t("general.wednesday"), value: "wednesday" },
-  { title: i18n.t("general.thursday"), value: "thursday" },
-  { title: i18n.t("general.friday"), value: "friday" },
-  { title: i18n.t("general.saturday"), value: "saturday" },
-  { title: i18n.t("general.sunday"), value: "sunday" },
-  { title: i18n.t("meal-plan.day-any"), value: "unset" },
-];
-
-function handleQueryFilterInput(value: string | undefined) {
-  console.warn("handleQueryFilterInput called with value:", value);
-  queryFilterString.value = value || "";
-}
-
-const fieldDefs: FieldDefinition[] = [
-  {
-    name: "recipe_category.id",
-    label: i18n.t("category.categories"),
-    type: Organizer.Category,
-  },
-  {
-    name: "tags.id",
-    label: i18n.t("tag.tags"),
-    type: Organizer.Tag,
-  },
-  {
-    name: "recipe_ingredient.food.id",
-    label: i18n.t("recipe.ingredients"),
-    type: Organizer.Food,
-  },
-  {
-    name: "tools.id",
-    label: i18n.t("tool.tools"),
-    type: Organizer.Tool,
-  },
-  {
-    name: "household_id",
-    label: i18n.t("household.households"),
-    type: Organizer.Household,
-  },
-  {
-    name: "last_made",
-    label: i18n.t("general.last-made"),
-    type: "date",
-  },
-  {
-    name: "created_at",
-    label: i18n.t("general.date-created"),
-    type: "date",
-  },
-  {
-    name: "updated_at",
-    label: i18n.t("general.date-updated"),
-    type: "date",
-  },
-];
 </script>
--- a/frontend/components/Domain/Household/GroupWebhookEditor.vue
+++ b/frontend/components/Domain/Household/GroupWebhookEditor.vue
@@ -16,11 +16,11 @@
        :label="$t('settings.webhooks.webhook-url')"
        variant="underlined"
      />
-      <v-text-field
+      <v-time-picker
        v-model="scheduledTime"
-        type="time"
-        clearable
-        variant="underlined"
+        class="elevation-2"
+        ampm-in-title
+        format="ampm"
      />
    </v-card-text>
    <v-card-actions class="py-0 justify-end">
@@ -50,43 +50,52 @@
  </div>
 </template>

-<script setup lang="ts">
+<script lang="ts">
 import type { ReadWebhook } from "~/lib/api/types/household";
 import { timeLocalToUTC, timeUTCToLocal } from "~/composables/use-group-webhooks";

-const props = defineProps<{
-  webhook: ReadWebhook;
-}>();
-
-const emit = defineEmits<{
-  delete: [id: string];
-  save: [webhook: ReadWebhook];
-  test: [id: string];
-}>();
-
-const i18n = useI18n();
-const itemUTC = ref<string>(props.webhook.scheduledTime);
-const itemLocal = ref<string>(timeUTCToLocal(props.webhook.scheduledTime));
-
-const scheduledTime = computed({
-  get() {
-    return itemLocal.value;
+export default defineNuxtComponent({
+  props: {
+    webhook: {
+      type: Object as () => ReadWebhook,
+      required: true,
+    },
  },
-  set(v: string) {
-    itemUTC.value = timeLocalToUTC(v);
-    itemLocal.value = v;
+  emits: ["delete", "save", "test"],
+  setup(props, { emit }) {
+    const i18n = useI18n();
+    const itemUTC = ref<string>(props.webhook.scheduledTime);
+    const itemLocal = ref<string>(timeUTCToLocal(props.webhook.scheduledTime));
+
+    const scheduledTime = computed({
+      get() {
+        return itemLocal.value;
+      },
+      set(v: string) {
+        itemUTC.value = timeLocalToUTC(v);
+        itemLocal.value = v;
+      },
+    });
+
+    const webhookCopy = ref({ ...props.webhook });
+
+    function handleSave() {
+      webhookCopy.value.scheduledTime = itemLocal.value;
+      emit("save", webhookCopy.value);
+    }
+
+    // Set page title using useSeoMeta
+    useSeoMeta({
+      title: i18n.t("settings.webhooks.webhooks"),
+    });
+
+    return {
+      webhookCopy,
+      scheduledTime,
+      handleSave,
+      itemUTC,
+      itemLocal,
+    };
  },
 });
-
-const webhookCopy = ref({ ...props.webhook });
-
-function handleSave() {
-  webhookCopy.value.scheduledTime = itemLocal.value;
-  emit("save", webhookCopy.value);
-}
-
-// Set page title using useSeoMeta
-useSeoMeta({
-  title: i18n.t("settings.webhooks.webhooks"),
-});
 </script>
--- a/frontend/components/Domain/Household/HouseholdPreferencesEditor.vue
+++ b/frontend/components/Domain/Household/HouseholdPreferencesEditor.vue
@@ -1,116 +1,146 @@
 <template>
-  <div v-if="preferences">
-    <BaseCardSectionTitle :title="$t('household.household-preferences')" />
-    <div class="mb-6">
-      <v-checkbox v-model="preferences.privateHousehold" hide-details density="compact" :label="$t('household.private-household')" color="primary" />
-      <div class="ml-8">
-        <p class="text-subtitle-2 my-0 py-0">
-          {{ $t("household.private-household-description") }}
-        </p>
-        <DocLink class="mt-2" link="/documentation/getting-started/faq/#how-do-private-groups-and-recipes-work" />
-      </div>
-    </div>
-    <div class="mb-6">
-      <v-checkbox v-model="preferences.lockRecipeEditsFromOtherHouseholds" hide-details density="compact" :label="$t('household.lock-recipe-edits-from-other-households')" color="primary" />
-      <div class="ml-8">
-        <p class="text-subtitle-2 my-0 py-0">
-          {{ $t("household.lock-recipe-edits-from-other-households-description") }}
-        </p>
-      </div>
-    </div>
-    <v-select
-      v-model="preferences.firstDayOfWeek"
-      :prepend-icon="$globals.icons.calendarWeekBegin"
-      :items="allDays"
-      item-title="name"
-      item-value="value"
-      :label="$t('settings.first-day-of-week')"
-      variant="underlined"
-      flat
-    />
+	<div v-if="preferences">
+		<BaseCardSectionTitle :title="$t('household.household-preferences')" />
+		<div class="mb-6">
+			<v-checkbox v-model="preferences.privateHousehold" hide-details density="compact" :label="$t('household.private-household')" color="primary" />
+			<div class="ml-8">
+				<p class="text-subtitle-2 my-0 py-0">
+					{{ $t("household.private-household-description") }}
+				</p>
+				<DocLink class="mt-2" link="/documentation/getting-started/faq/#how-do-private-groups-and-recipes-work" />
+			</div>
+		</div>
+		<div class="mb-6">
+			<v-checkbox v-model="preferences.lockRecipeEditsFromOtherHouseholds" hide-details density="compact" :label="$t('household.lock-recipe-edits-from-other-households')" color="primary" />
+			<div class="ml-8">
+				<p class="text-subtitle-2 my-0 py-0">
+					{{ $t("household.lock-recipe-edits-from-other-households-description") }}
+				</p>
+			</div>
+		</div>
+		<v-select
+			v-model="preferences.firstDayOfWeek"
+			:prepend-icon="$globals.icons.calendarWeekBegin"
+			:items="allDays"
+			item-title="name"
+			item-value="value"
+			:label="$t('settings.first-day-of-week')"
+			variant="underlined"
+			flat
+		/>

-    <BaseCardSectionTitle class="mt-5" :title="$t('household.household-recipe-preferences')" />
-    <div class="preference-container">
-      <div v-for="p in recipePreferences" :key="p.key">
-        <v-checkbox v-model="preferences[p.key]" hide-details density="compact" :label="p.label" color="primary" />
-        <p class="ml-8 text-subtitle-2 my-0 py-0">
-          {{ p.description }}
-        </p>
-      </div>
-    </div>
-  </div>
+		<BaseCardSectionTitle class="mt-5" :title="$t('household.household-recipe-preferences')" />
+		<div class="preference-container">
+			<div v-for="p in recipePreferences" :key="p.key">
+				<v-checkbox v-model="preferences[p.key]" hide-details density="compact" :label="p.label" color="primary" />
+				<p class="ml-8 text-subtitle-2 my-0 py-0">
+					{{ p.description }}
+				</p>
+			</div>
+		</div>
+	</div>
 </template>

-<script setup lang="ts">
+<script lang="ts">
 import type { ReadHouseholdPreferences } from "~/lib/api/types/household";

-const preferences = defineModel<ReadHouseholdPreferences>({ required: true });
-const i18n = useI18n();
+export default defineNuxtComponent({
+  props: {
+    modelValue: {
+      type: Object,
+      required: true,
+    },
+  },
+  emits: ["update:modelValue"],
+  setup(props, context) {
+    const i18n = useI18n();

-type Preference = {
-  key: keyof ReadHouseholdPreferences;
-  label: string;
-  description: string;
-};
+		type Preference = {
+		  key: keyof ReadHouseholdPreferences;
+		  label: string;
+		  description: string;
+		};

-const recipePreferences: Preference[] = [
-  {
-    key: "recipePublic",
-    label: i18n.t("group.allow-users-outside-of-your-group-to-see-your-recipes"),
-    description: i18n.t("group.allow-users-outside-of-your-group-to-see-your-recipes-description"),
-  },
-  {
-    key: "recipeShowNutrition",
-    label: i18n.t("group.show-nutrition-information"),
-    description: i18n.t("group.show-nutrition-information-description"),
-  },
-  {
-    key: "recipeShowAssets",
-    label: i18n.t("group.show-recipe-assets"),
-    description: i18n.t("group.show-recipe-assets-description"),
-  },
-  {
-    key: "recipeLandscapeView",
-    label: i18n.t("group.default-to-landscape-view"),
-    description: i18n.t("group.default-to-landscape-view-description"),
-  },
-  {
-    key: "recipeDisableComments",
-    label: i18n.t("group.disable-users-from-commenting-on-recipes"),
-    description: i18n.t("group.disable-users-from-commenting-on-recipes-description"),
-  },
-];
+		const recipePreferences: Preference[] = [
+		  {
+		    key: "recipePublic",
+		    label: i18n.t("group.allow-users-outside-of-your-group-to-see-your-recipes"),
+		    description: i18n.t("group.allow-users-outside-of-your-group-to-see-your-recipes-description"),
+		  },
+		  {
+		    key: "recipeShowNutrition",
+		    label: i18n.t("group.show-nutrition-information"),
+		    description: i18n.t("group.show-nutrition-information-description"),
+		  },
+		  {
+		    key: "recipeShowAssets",
+		    label: i18n.t("group.show-recipe-assets"),
+		    description: i18n.t("group.show-recipe-assets-description"),
+		  },
+		  {
+		    key: "recipeLandscapeView",
+		    label: i18n.t("group.default-to-landscape-view"),
+		    description: i18n.t("group.default-to-landscape-view-description"),
+		  },
+		  {
+		    key: "recipeDisableComments",
+		    label: i18n.t("group.disable-users-from-commenting-on-recipes"),
+		    description: i18n.t("group.disable-users-from-commenting-on-recipes-description"),
+		  },
+		  {
+		    key: "recipeDisableAmount",
+		    label: i18n.t("group.disable-organizing-recipe-ingredients-by-units-and-food"),
+		    description: i18n.t("group.disable-organizing-recipe-ingredients-by-units-and-food-description"),
+		  },
+		];

-const allDays = [
-  {
-    name: i18n.t("general.sunday"),
-    value: 0,
+		const allDays = [
+		  {
+		    name: i18n.t("general.sunday"),
+		    value: 0,
+		  },
+		  {
+		    name: i18n.t("general.monday"),
+		    value: 1,
+		  },
+		  {
+		    name: i18n.t("general.tuesday"),
+		    value: 2,
+		  },
+		  {
+		    name: i18n.t("general.wednesday"),
+		    value: 3,
+		  },
+		  {
+		    name: i18n.t("general.thursday"),
+		    value: 4,
+		  },
+		  {
+		    name: i18n.t("general.friday"),
+		    value: 5,
+		  },
+		  {
+		    name: i18n.t("general.saturday"),
+		    value: 6,
+		  },
+		];
+
+		const preferences = computed({
+		  get() {
+		    return props.modelValue;
+		  },
+		  set(val) {
+		    context.emit("update:modelValue", val);
+		  },
+		});
+
+		return {
+		  allDays,
+		  preferences,
+		  recipePreferences,
+		};
  },
-  {
-    name: i18n.t("general.monday"),
-    value: 1,
-  },
-  {
-    name: i18n.t("general.tuesday"),
-    value: 2,
-  },
-  {
-    name: i18n.t("general.wednesday"),
-    value: 3,
-  },
-  {
-    name: i18n.t("general.thursday"),
-    value: 4,
-  },
-  {
-    name: i18n.t("general.friday"),
-    value: 5,
-  },
-  {
-    name: i18n.t("general.saturday"),
-    value: 6,
-  },
-];
+});
 </script>

 <style lang="css">
--- a/frontend/components/Domain/QueryFilterBuilder.vue
+++ b/frontend/components/Domain/QueryFilterBuilder.vue
@@ -147,7 +147,7 @@
                :model-value="field.value"
                type="number"
                variant="underlined"
-                @update:model-value="setFieldValue(field, index, $event)"
+                @:model-value="setFieldValue(field, index, $event)"
              />
              <v-checkbox
                v-else-if="field.type === 'boolean'"
@@ -163,14 +163,14 @@
                max-width="290px"
                min-width="auto"
              >
-                <template #activator="{ props: activatorProps }">
+                <template #activator="{ props }">
                  <v-text-field
                    v-model="field.value"
                    persistent-hint
                    :prepend-icon="$globals.icons.calendar"
                    variant="underlined"
                    color="primary"
-                    v-bind="activatorProps"
+                    v-bind="props"
                    readonly
                  />
                </template>
@@ -184,53 +184,53 @@
              </v-menu>
              <RecipeOrganizerSelector
                v-else-if="field.type === Organizer.Category"
-                v-model="field.organizers"
+                :model-value="field.organizers"
                :selector-type="Organizer.Category"
                :show-add="false"
                :show-label="false"
                :show-icon="false"
                variant="underlined"
-                @update:model-value="setFieldOrganizers(field, index, $event)"
+                @update:model-value="setOrganizerValues(field, index, $event)"
              />
              <RecipeOrganizerSelector
                v-else-if="field.type === Organizer.Tag"
-                v-model="field.organizers"
+                :model-value="field.organizers"
                :selector-type="Organizer.Tag"
                :show-add="false"
                :show-label="false"
                :show-icon="false"
                variant="underlined"
-                @update:model-value="setFieldOrganizers(field, index, $event)"
+                @update:model-value="setOrganizerValues(field, index, $event)"
              />
              <RecipeOrganizerSelector
                v-else-if="field.type === Organizer.Tool"
-                v-model="field.organizers"
+                :model-value="field.organizers"
                :selector-type="Organizer.Tool"
                :show-add="false"
                :show-label="false"
                :show-icon="false"
                variant="underlined"
-                @update:model-value="setFieldOrganizers(field, index, $event)"
+                @update:model-value="setOrganizerValues(field, index, $event)"
              />
              <RecipeOrganizerSelector
                v-else-if="field.type === Organizer.Food"
-                v-model="field.organizers"
+                :model-value="field.organizers"
                :selector-type="Organizer.Food"
                :show-add="false"
                :show-label="false"
                :show-icon="false"
                variant="underlined"
-                @update:model-value="setFieldOrganizers(field, index, $event)"
+                @update:model-value="setOrganizerValues(field, index, $event)"
              />
              <RecipeOrganizerSelector
                v-else-if="field.type === Organizer.Household"
-                v-model="field.organizers"
+                :model-value="field.organizers"
                :selector-type="Organizer.Household"
                :show-add="false"
                :show-label="false"
                :show-icon="false"
                variant="underlined"
-                @update:model-value="setFieldOrganizers(field, index, $event)"
+                @update:model-value="setOrganizerValues(field, index, $event)"
              />
            </v-col>
            <!-- right parenthesis -->
@@ -297,7 +297,7 @@
  </v-card>
 </template>

-<script setup lang="ts">
+<script lang="ts">
 import { VueDraggable } from "vue-draggable-plus";
 import { useDebounceFn } from "@vueuse/core";
 import { useHouseholdSelf } from "~/composables/use-households";
@@ -307,344 +307,365 @@ import type { LogicalOperator, QueryFilterJSON, QueryFilterJSONPart, RelationalK
 import { useCategoryStore, useFoodStore, useHouseholdStore, useTagStore, useToolStore } from "~/composables/store";
 import { type Field, type FieldDefinition, type FieldValue, type OrganizerBase, useQueryFilterBuilder } from "~/composables/use-query-filter-builder";

-const props = defineProps({
-  fieldDefs: {
-    type: Array as () => FieldDefinition[],
-    required: true,
+export default defineNuxtComponent({
+  components: {
+    VueDraggable,
+    RecipeOrganizerSelector,
  },
-  initialQueryFilter: {
-    type: Object as () => QueryFilterJSON | null,
-    default: null,
+  props: {
+    fieldDefs: {
+      type: Array as () => FieldDefinition[],
+      required: true,
+    },
+    initialQueryFilter: {
+      type: Object as () => QueryFilterJSON | null,
+      default: null,
+    },
  },
-});
+  emits: ["input", "inputJSON"],
+  setup(props, context) {
+    const { household } = useHouseholdSelf();
+    const { logOps, relOps, buildQueryFilterString, getFieldFromFieldDef, isOrganizerType } = useQueryFilterBuilder();

-const emit = defineEmits<{
-  (event: "input", value: string | undefined): void;
-  (event: "inputJSON", value: QueryFilterJSON | undefined): void;
-}>();
+    const firstDayOfWeek = computed(() => {
+      return household.value?.preferences?.firstDayOfWeek || 0;
+    });

-const { household } = useHouseholdSelf();
-const { logOps, relOps, buildQueryFilterString, getFieldFromFieldDef, isOrganizerType } = useQueryFilterBuilder();
+    const state = reactive({
+      showAdvanced: false,
+      qfValid: false,
+      datePickers: [] as boolean[],
+      drag: false,
+    });

-const firstDayOfWeek = computed(() => {
-  return household.value?.preferences?.firstDayOfWeek || 0;
-});
-
-const state = reactive({
-  showAdvanced: false,
-  qfValid: false,
-  datePickers: [] as boolean[],
-  drag: false,
-});
-const { showAdvanced, datePickers, drag } = toRefs(state);
-
-const storeMap = {
-  [Organizer.Category]: useCategoryStore(),
-  [Organizer.Tag]: useTagStore(),
-  [Organizer.Tool]: useToolStore(),
-  [Organizer.Food]: useFoodStore(),
-  [Organizer.Household]: useHouseholdStore(),
-};
-
-function onDragEnd(event: any) {
-  state.drag = false;
-
-  const oldIndex: number = event.oldIndex;
-  const newIndex: number = event.newIndex;
-  state.datePickers[oldIndex] = false;
-  state.datePickers[newIndex] = false;
-}
-
-// add id to fields to prevent reactivity issues
-type FieldWithId = Field & { id: number };
-const fields = ref<FieldWithId[]>([]);
-
-const uid = ref(1); // init uid to pass to fields
-function useUid() {
-  return uid.value++;
-}
-function addField(field: FieldDefinition) {
-  fields.value.push({
-    ...getFieldFromFieldDef(field),
-    id: useUid(),
-  });
-  state.datePickers.push(false);
-}
-
-function setField(index: number, fieldLabel: string) {
-  state.datePickers[index] = false;
-  const fieldDef = props.fieldDefs.find(fieldDef => fieldDef.label === fieldLabel);
-  if (!fieldDef) {
-    return;
-  }
-
-  const resetValue = (fieldDef.type !== fields.value[index].type) || (fieldDef.fieldOptions !== fields.value[index].fieldOptions);
-  const updatedField = { ...fields.value[index], ...fieldDef };
-
-  // we have to set this explicitly since it might be undefined
-  updatedField.fieldOptions = fieldDef.fieldOptions;
-
-  fields.value[index] = {
-    ...getFieldFromFieldDef(updatedField, resetValue),
-    id: fields.value[index].id, // keep the id
-  };
-}
-
-function setLeftParenthesisValue(field: FieldWithId, index: number, value: string) {
-  fields.value[index].leftParenthesis = value;
-}
-
-function setRightParenthesisValue(field: FieldWithId, index: number, value: string) {
-  fields.value[index].rightParenthesis = value;
-}
-
-function setLogicalOperatorValue(field: FieldWithId, index: number, value: LogicalOperator | undefined) {
-  if (!value) {
-    value = logOps.value.AND.value;
-  }
-
-  fields.value[index].logicalOperator = value ? logOps.value[value] : undefined;
-}
-
-function setRelationalOperatorValue(field: FieldWithId, index: number, value: RelationalKeyword | RelationalOperator) {
-  fields.value[index].relationalOperatorValue = relOps.value[value];
-}
-
-function setFieldValue(field: FieldWithId, index: number, value: FieldValue) {
-  state.datePickers[index] = false;
-  fields.value[index].value = value;
-}
-
-function setFieldValues(field: FieldWithId, index: number, values: FieldValue[]) {
-  fields.value[index].values = values;
-}
-
-function setFieldOrganizers(field: FieldWithId, index: number, organizers: OrganizerBase[]) {
-  fields.value[index].organizers = organizers;
-  // Sync the values array with the organizers array
-  fields.value[index].values = organizers.map(org => org.id?.toString() || "").filter(id => id);
-}
-
-function removeField(index: number) {
-  fields.value.splice(index, 1);
-  state.datePickers.splice(index, 1);
-}
-
-const fieldsUpdater = useDebounceFn((/* newFields: typeof fields.value */) => {
-  /* newFields.forEach((field, index) => {
-    const updatedField = getFieldFromFieldDef(field);
-    fields.value[index] = updatedField; // recursive!!!
-  }); */
-
-  const qf = buildQueryFilterString(fields.value, state.showAdvanced);
-  if (qf) {
-    console.debug(`Set query filter: ${qf}`);
-  }
-  state.qfValid = !!qf;
-
-  emit("input", qf || undefined);
-  emit("inputJSON", qf ? buildQueryFilterJSON() : undefined);
-}, 500);
-
-watch(fields, fieldsUpdater, { deep: true });
-
-async function hydrateOrganizers(field: FieldWithId, _index: number) {
-  if (!field.values?.length || !isOrganizerType(field.type)) {
-    return;
-  }
-
-  const { store, actions } = storeMap[field.type];
-  if (!store.value.length) {
-    await actions.refresh();
-  }
-
-  const organizers = field.values.map((value) => {
-    const organizer = store.value.find(item => item?.id?.toString() === value);
-    if (!organizer) {
-      console.error(`Could not find organizer with id ${value}`);
-      return undefined;
-    }
-    return organizer;
-  });
-
-  field.organizers = organizers.filter(organizer => organizer !== undefined) as OrganizerBase[];
-  return field;
-}
-
-function initFieldsError(error = "") {
-  if (error) {
-    console.error(error);
-  }
-
-  fields.value = [];
-  if (props.fieldDefs.length) {
-    addField(props.fieldDefs[0]);
-  }
-}
-
-async function initializeFields() {
-  if (!props.initialQueryFilter?.parts?.length) {
-    return initFieldsError();
-  }
-
-  const initFields: FieldWithId[] = [];
-  let error = false;
-
-  for (const [index, part] of props.initialQueryFilter.parts.entries()) {
-    const fieldDef = props.fieldDefs.find(fieldDef => fieldDef.name === part.attributeName);
-    if (!fieldDef) {
-      error = true;
-      return initFieldsError(`Invalid query filter; unknown attribute name "${part.attributeName || ""}"`);
-    }
-
-    const field: FieldWithId = {
-      ...getFieldFromFieldDef(fieldDef),
-      id: useUid(),
-    };
-    field.leftParenthesis = part.leftParenthesis || field.leftParenthesis;
-    field.rightParenthesis = part.rightParenthesis || field.rightParenthesis;
-    field.logicalOperator = part.logicalOperator
-      ? logOps.value[part.logicalOperator]
-      : field.logicalOperator;
-    field.relationalOperatorValue = part.relationalOperator
-      ? relOps.value[part.relationalOperator]
-      : field.relationalOperatorValue;
-
-    if (field.leftParenthesis || field.rightParenthesis) {
-      state.showAdvanced = true;
-    }
-
-    if (field.fieldOptions?.length || isOrganizerType(field.type)) {
-      if (typeof part.value === "string") {
-        field.values = part.value ? [part.value] : [];
-      }
-      else {
-        field.values = part.value || [];
-      }
-
-      if (isOrganizerType(field.type)) {
-        await hydrateOrganizers(field, index);
-      }
-    }
-    else if (field.type === "boolean") {
-      const boolString = part.value || "false";
-      field.value = (
-        boolString[0].toLowerCase() === "t"
-        || boolString[0].toLowerCase() === "y"
-        || boolString[0] === "1"
-      );
-    }
-    else if (field.type === "number") {
-      field.value = Number(part.value as string || "0");
-      if (isNaN(field.value)) {
-        error = true;
-        return initFieldsError(`Invalid query filter; invalid number value "${(part.value || "").toString()}"`);
-      }
-    }
-    else if (field.type === "date") {
-      field.value = part.value as string || "";
-      const date = new Date(field.value);
-      if (isNaN(date.getTime())) {
-        error = true;
-        return initFieldsError(`Invalid query filter; invalid date value "${(part.value || "").toString()}"`);
-      }
-    }
-    else {
-      field.value = part.value as string || "";
-    }
-
-    initFields.push(field);
-  }
-
-  if (initFields.length && !error) {
-    fields.value = initFields;
-  }
-  else {
-    initFieldsError();
-  }
-}
-
-onMounted(async () => {
-  try {
-    await initializeFields();
-  }
-  catch (error) {
-    initFieldsError(`Error initializing fields: ${(error || "").toString()}`);
-  }
-});
-
-function buildQueryFilterJSON(): QueryFilterJSON {
-  const parts = fields.value.map((field) => {
-    const part: QueryFilterJSONPart = {
-      attributeName: field.name,
-      leftParenthesis: field.leftParenthesis,
-      rightParenthesis: field.rightParenthesis,
-      logicalOperator: field.logicalOperator?.value,
-      relationalOperator: field.relationalOperatorValue?.value,
+    const storeMap = {
+      [Organizer.Category]: useCategoryStore(),
+      [Organizer.Tag]: useTagStore(),
+      [Organizer.Tool]: useToolStore(),
+      [Organizer.Food]: useFoodStore(),
+      [Organizer.Household]: useHouseholdStore(),
    };

-    if (field.fieldOptions?.length || isOrganizerType(field.type)) {
-      part.value = field.values.map(value => value.toString());
-    }
-    else if (field.type === "boolean") {
-      part.value = field.value ? "true" : "false";
-    }
-    else {
-      part.value = (field.value || "").toString();
+    function onDragEnd(event: any) {
+      state.drag = false;
+
+      const oldIndex: number = event.oldIndex;
+      const newIndex: number = event.newIndex;
+      state.datePickers[oldIndex] = false;
+      state.datePickers[newIndex] = false;
    }

-    return part;
-  });
+		// add id to fields to prevent reactivity issues
+		type FieldWithId = Field & { id: number };
+		const fields = ref<FieldWithId[]>([]);

-  const qfJSON = { parts } as QueryFilterJSON;
-  console.debug(`Built query filter JSON: ${JSON.stringify(qfJSON)}`);
-  return qfJSON;
-}
+		const uid = ref(1); // init uid to pass to fields
+		function useUid() {
+		  return uid.value++;
+		}
+		function addField(field: FieldDefinition) {
+		  fields.value.push({
+		    ...getFieldFromFieldDef(field),
+		    id: useUid(),
+		  });
+		  state.datePickers.push(false);
+		};

-const config = computed(() => {
-  const baseColMaxWidth = 55;
-  return {
-    col: {
-      class: "d-flex justify-center align-end field-col pa-1",
-    },
-    select: {
-      textClass: "d-flex justify-center text-center",
-    },
-    items: {
-      icon: {
-        cols: 1,
-        style: "width: fit-content;",
-      },
-      leftParens: {
-        cols: state.showAdvanced ? 1 : 0,
-        style: `min-width: ${state.showAdvanced ? baseColMaxWidth : 0}px;`,
-      },
-      logicalOperator: {
-        cols: 1,
-        style: `min-width: ${baseColMaxWidth}px;`,
-      },
-      fieldName: {
-        cols: state.showAdvanced ? 2 : 3,
-        style: `min-width: ${state.showAdvanced ? baseColMaxWidth * 2 : baseColMaxWidth * 3}px;`,
-      },
-      relationalOperator: {
-        cols: 2,
-        style: `min-width: ${baseColMaxWidth * 2}px;`,
-      },
-      fieldValue: {
-        cols: state.showAdvanced ? 3 : 4,
-        style: `min-width: ${state.showAdvanced ? baseColMaxWidth * 2 : baseColMaxWidth * 3}px;`,
-      },
-      rightParens: {
-        cols: state.showAdvanced ? 1 : 0,
-        style: `min-width: ${state.showAdvanced ? baseColMaxWidth : 0}px;`,
-      },
-      fieldActions: {
-        cols: 1,
-        style: `min-width: ${baseColMaxWidth}px;`,
-      },
-    },
-  };
+		function setField(index: number, fieldLabel: string) {
+		  state.datePickers[index] = false;
+		  const fieldDef = props.fieldDefs.find(fieldDef => fieldDef.label === fieldLabel);
+		  if (!fieldDef) {
+		    return;
+		  }
+
+		  const resetValue = (fieldDef.type !== fields.value[index].type) || (fieldDef.fieldOptions !== fields.value[index].fieldOptions);
+		  const updatedField = { ...fields.value[index], ...fieldDef };
+
+		  // we have to set this explicitly since it might be undefined
+		  updatedField.fieldOptions = fieldDef.fieldOptions;
+
+		  fields.value[index] = {
+		    ...getFieldFromFieldDef(updatedField, resetValue),
+		    id: fields.value[index].id, // keep the id
+		  };
+		}
+
+		function setLeftParenthesisValue(field: FieldWithId, index: number, value: string) {
+		  fields.value[index].leftParenthesis = value;
+		}
+
+		function setRightParenthesisValue(field: FieldWithId, index: number, value: string) {
+		  fields.value[index].rightParenthesis = value;
+		}
+
+		function setLogicalOperatorValue(field: FieldWithId, index: number, value: LogicalOperator | undefined) {
+		  if (!value) {
+		    value = logOps.value.AND.value;
+		  }
+
+		  fields.value[index].logicalOperator = value ? logOps.value[value] : undefined;
+		}
+
+		function setRelationalOperatorValue(field: FieldWithId, index: number, value: RelationalKeyword | RelationalOperator) {
+		  fields.value[index].relationalOperatorValue = relOps.value[value];
+		}
+
+		function setFieldValue(field: FieldWithId, index: number, value: FieldValue) {
+		  state.datePickers[index] = false;
+		  fields.value[index].value = value;
+		}
+
+		function setFieldValues(field: FieldWithId, index: number, values: FieldValue[]) {
+		  fields.value[index].values = values;
+		}
+
+		function setOrganizerValues(field: FieldWithId, index: number, values: OrganizerBase[]) {
+		  setFieldValues(field, index, values.map(value => value.id.toString()));
+		  fields.value[index].organizers = values;
+		}
+
+		function removeField(index: number) {
+		  fields.value.splice(index, 1);
+		  state.datePickers.splice(index, 1);
+		};
+
+		const fieldsUpdater = useDebounceFn((/* newFields: typeof fields.value */) => {
+		  /* newFields.forEach((field, index) => {
+				const updatedField = getFieldFromFieldDef(field);
+				fields.value[index] = updatedField; // recursive!!!
+			}); */
+
+		  const qf = buildQueryFilterString(fields.value, state.showAdvanced);
+		  if (qf) {
+		    console.debug(`Set query filter: ${qf}`);
+		  }
+		  state.qfValid = !!qf;
+
+		  context.emit("input", qf || undefined);
+		  context.emit("inputJSON", qf ? buildQueryFilterJSON() : undefined);
+		}, 500);
+
+		watch(fields, fieldsUpdater, { deep: true });
+
+		async function hydrateOrganizers(field: FieldWithId, index: number) {
+		  if (!field.values?.length || !isOrganizerType(field.type)) {
+		    return;
+		  }
+
+		  field.organizers = [];
+
+		  const { store, actions } = storeMap[field.type];
+		  if (!store.value.length) {
+		    await actions.refresh();
+		  }
+
+		  const organizers = field.values.map((value) => {
+		    const organizer = store.value.find(item => item?.id?.toString() === value);
+		    if (!organizer) {
+		      console.error(`Could not find organizer with id ${value}`);
+		      return undefined;
+		    }
+		    return organizer;
+		  });
+		  field.organizers = organizers.filter(organizer => organizer !== undefined) as OrganizerBase[];
+		  setOrganizerValues(field, index, field.organizers);
+		}
+
+		function initFieldsError(error = "") {
+		  if (error) {
+		    console.error(error);
+		  }
+
+		  fields.value = [];
+		  if (props.fieldDefs.length) {
+		    addField(props.fieldDefs[0]);
+		  }
+		}
+
+		function initializeFields() {
+		  if (!props.initialQueryFilter?.parts?.length) {
+		    return initFieldsError();
+		  };
+
+		  const initFields: FieldWithId[] = [];
+		  let error = false;
+		  props.initialQueryFilter.parts.forEach((part: QueryFilterJSONPart, index: number) => {
+		    const fieldDef = props.fieldDefs.find(fieldDef => fieldDef.name === part.attributeName);
+		    if (!fieldDef) {
+		      error = true;
+		      return initFieldsError(`Invalid query filter; unknown attribute name "${part.attributeName || ""}"`);
+		    }
+
+		    const field: FieldWithId = {
+		      ...getFieldFromFieldDef(fieldDef),
+		      id: useUid(),
+		    };
+		    field.leftParenthesis = part.leftParenthesis || field.leftParenthesis;
+		    field.rightParenthesis = part.rightParenthesis || field.rightParenthesis;
+		    field.logicalOperator = part.logicalOperator
+		      ? logOps.value[part.logicalOperator]
+		      : field.logicalOperator;
+		    field.relationalOperatorValue = part.relationalOperator
+		      ? relOps.value[part.relationalOperator]
+		      : field.relationalOperatorValue;
+
+		    if (field.leftParenthesis || field.rightParenthesis) {
+		      state.showAdvanced = true;
+		    }
+
+		    if (field.fieldOptions?.length || isOrganizerType(field.type)) {
+		      if (typeof part.value === "string") {
+		        field.values = part.value ? [part.value] : [];
+		      }
+		      else {
+		        field.values = part.value || [];
+		      }
+
+		      if (isOrganizerType(field.type)) {
+		        hydrateOrganizers(field, index);
+		      }
+		    }
+		    else if (field.type === "boolean") {
+		      const boolString = part.value || "false";
+		      field.value = (
+		        boolString[0].toLowerCase() === "t"
+		        || boolString[0].toLowerCase() === "y"
+		        || boolString[0] === "1"
+		      );
+		    }
+		    else if (field.type === "number") {
+		      field.value = Number(part.value as string || "0");
+		      if (isNaN(field.value)) {
+		        error = true;
+		        return initFieldsError(`Invalid query filter; invalid number value "${(part.value || "").toString()}"`);
+		      }
+		    }
+		    else if (field.type === "date") {
+		      field.value = part.value as string || "";
+		      const date = new Date(field.value);
+		      if (isNaN(date.getTime())) {
+		        error = true;
+		        return initFieldsError(`Invalid query filter; invalid date value "${(part.value || "").toString()}"`);
+		      }
+		    }
+		    else {
+		      field.value = part.value as string || "";
+		    }
+
+		    initFields.push(field);
+		  });
+
+		  if (initFields.length && !error) {
+		    fields.value = initFields;
+		  }
+		  else {
+		    initFieldsError();
+		  }
+		};
+
+		try {
+		  initializeFields();
+		}
+		catch (error) {
+		  initFieldsError(`Error initializing fields: ${(error || "").toString()}`);
+		}
+
+		function buildQueryFilterJSON(): QueryFilterJSON {
+		  const parts = fields.value.map((field) => {
+		    const part: QueryFilterJSONPart = {
+		      attributeName: field.name,
+		      leftParenthesis: field.leftParenthesis,
+		      rightParenthesis: field.rightParenthesis,
+		      logicalOperator: field.logicalOperator?.value,
+		      relationalOperator: field.relationalOperatorValue?.value,
+		    };
+
+		    if (field.fieldOptions?.length || isOrganizerType(field.type)) {
+		      part.value = field.values.map(value => value.toString());
+		    }
+		    else if (field.type === "boolean") {
+		      part.value = field.value ? "true" : "false";
+		    }
+		    else {
+		      part.value = (field.value || "").toString();
+		    }
+
+		    return part;
+		  });
+
+		  const qfJSON = { parts } as QueryFilterJSON;
+		  console.debug(`Built query filter JSON: ${JSON.stringify(qfJSON)}`);
+		  return qfJSON;
+		}
+
+		const config = computed(() => {
+		  const baseColMaxWidth = 55;
+		  return {
+		    col: {
+		      class: "d-flex justify-center align-end field-col pa-1",
+		    },
+		    select: {
+		      textClass: "d-flex justify-center text-center",
+		    },
+		    items: {
+		      icon: {
+		        cols: 1,
+		        style: "width: fit-content;",
+		      },
+		      leftParens: {
+		        cols: state.showAdvanced ? 1 : 0,
+		        style: `min-width: ${state.showAdvanced ? baseColMaxWidth : 0}px;`,
+		      },
+		      logicalOperator: {
+		        cols: 1,
+		        style: `min-width: ${baseColMaxWidth}px;`,
+		      },
+		      fieldName: {
+		        cols: state.showAdvanced ? 2 : 3,
+		        style: `min-width: ${state.showAdvanced ? baseColMaxWidth * 2 : baseColMaxWidth * 3}px;`,
+		      },
+		      relationalOperator: {
+		        cols: 2,
+		        style: `min-width: ${baseColMaxWidth * 2}px;`,
+		      },
+		      fieldValue: {
+		        cols: state.showAdvanced ? 3 : 4,
+		        style: `min-width: ${state.showAdvanced ? baseColMaxWidth * 2 : baseColMaxWidth * 3}px;`,
+		      },
+		      rightParens: {
+		        cols: state.showAdvanced ? 1 : 0,
+		        style: `min-width: ${state.showAdvanced ? baseColMaxWidth : 0}px;`,
+		      },
+		      fieldActions: {
+		        cols: 1,
+		        style: `min-width: ${baseColMaxWidth}px;`,
+		      },
+		    },
+		  };
+		});
+
+		return {
+		  Organizer,
+		  ...toRefs(state),
+		  logOps,
+		  relOps,
+		  config,
+		  firstDayOfWeek,
+		  onDragEnd,
+		  // Fields
+		  fields,
+		  addField,
+		  setField,
+		  setLeftParenthesisValue,
+		  setRightParenthesisValue,
+		  setLogicalOperatorValue,
+		  setRelationalOperatorValue,
+		  setFieldValue,
+		  setFieldValues,
+		  setOrganizerValues,
+		  removeField,
+		};
+  },
 });
 </script>

--- a/frontend/components/Domain/Recipe/RecipeActionMenu.vue
+++ b/frontend/components/Domain/Recipe/RecipeActionMenu.vue
@@ -5,14 +5,8 @@
    density="compact"
    elevation="0"
  >
-    <BaseDialog
-      v-model="deleteDialog"
-      :title="$t('recipe.delete-recipe')"
-      color="error"
-      :icon="$globals.icons.alertCircle"
-      can-confirm
-      @confirm="emitDelete()"
-    >
+    <BaseDialog v-model="deleteDialog" :title="$t('recipe.delete-recipe')" color="error"
+      :icon="$globals.icons.alertCircle" can-confirm @confirm="emitDelete()">
      <v-card-text>
        {{ $t("recipe.delete-confirmation") }}
      </v-card-text>
@@ -21,17 +15,10 @@
    <v-spacer />
    <div v-if="!open" class="custom-btn-group ma-1">
      <RecipeFavoriteBadge v-if="loggedIn" color="info" button-style :recipe-id="recipe.id!" show-always />
-      <RecipeTimelineBadge
-        v-if="loggedIn"
-        class="ml-1"
-        color="info"
-        button-style
-        :slug="recipe.slug"
-        :recipe-name="recipe.name!"
-      />
+      <RecipeTimelineBadge v-if="loggedIn" class="ml-1" color="info" button-style :slug="recipe.slug" :recipe-name="recipe.name!" />
      <div v-if="loggedIn">
-        <v-tooltip v-if="canEdit" location="bottom" color="info">
-          <template #activator="{ props: tooltipProps }">
+        <v-tooltip v-if="canEdit" bottom color="info">
+          <template #activator="{ props }">
            <v-btn
              icon
              variant="flat"
@@ -39,7 +26,7 @@
              size="small"
              color="info"
              class="ml-1"
-              v-bind="tooltipProps"
+              v-bind="props"
              @click="$emit('edit', true)"
            >
              <v-icon size="x-large">
@@ -99,8 +86,8 @@
  </v-toolbar>
 </template>

-<script setup lang="ts">
-import RecipeContextMenu from "./RecipeContextMenu/RecipeContextMenu.vue";
+<script lang="ts">
+import RecipeContextMenu from "./RecipeContextMenu.vue";
 import RecipeFavoriteBadge from "./RecipeFavoriteBadge.vue";
 import RecipeTimelineBadge from "./RecipeTimelineBadge.vue";
 import type { Recipe } from "~/lib/api/types/recipe";
@@ -110,75 +97,103 @@ const DELETE_EVENT = "delete";
 const CLOSE_EVENT = "close";
 const JSON_EVENT = "json";

-interface Props {
-  recipe: Recipe;
-  slug: string;
-  recipeScale?: number;
-  open: boolean;
-  name: string;
-  loggedIn?: boolean;
-  recipeId: string;
-  canEdit?: boolean;
-}
-withDefaults(defineProps<Props>(), {
-  recipeScale: 1,
-  loggedIn: false,
-  canEdit: false,
+export default defineNuxtComponent({
+  components: { RecipeContextMenu, RecipeFavoriteBadge, RecipeTimelineBadge },
+  props: {
+    recipe: {
+      required: true,
+      type: Object as () => Recipe,
+    },
+    slug: {
+      required: true,
+      type: String,
+    },
+    recipeScale: {
+      type: Number,
+      default: 1,
+    },
+    open: {
+      required: true,
+      type: Boolean,
+    },
+    name: {
+      required: true,
+      type: String,
+    },
+    loggedIn: {
+      type: Boolean,
+      default: false,
+    },
+    recipeId: {
+      required: true,
+      type: String,
+    },
+    canEdit: {
+      type: Boolean,
+      default: false,
+    },
+  },
+  emits: ["print", "input", "delete", "close", "edit"],
+  setup(_, context) {
+    const deleteDialog = ref(false);
+
+    const i18n = useI18n();
+    const { $globals } = useNuxtApp();
+    const editorButtons = [
+      {
+        text: i18n.t("general.delete"),
+        icon: $globals.icons.delete,
+        event: DELETE_EVENT,
+        color: "error",
+      },
+      {
+        text: i18n.t("general.json"),
+        icon: $globals.icons.codeBraces,
+        event: JSON_EVENT,
+        color: "accent",
+      },
+      {
+        text: i18n.t("general.close"),
+        icon: $globals.icons.close,
+        event: CLOSE_EVENT,
+        color: "",
+      },
+      {
+        text: i18n.t("general.save"),
+        icon: $globals.icons.save,
+        event: SAVE_EVENT,
+        color: "success",
+      },
+    ];
+
+    function emitHandler(event: string) {
+      switch (event) {
+        case CLOSE_EVENT:
+          context.emit(CLOSE_EVENT);
+          context.emit("input", false);
+          break;
+        case DELETE_EVENT:
+          deleteDialog.value = true;
+          break;
+        default:
+          context.emit(event);
+          break;
+      }
+    }
+
+    function emitDelete() {
+      context.emit(DELETE_EVENT);
+      context.emit("input", false);
+    }
+
+    return {
+      deleteDialog,
+      editorButtons,
+      emitHandler,
+      emitDelete,
+    };
+  },
 });
-
-const emit = defineEmits(["print", "input", "delete", "close", "edit"]);
-
-const deleteDialog = ref(false);
-
-const i18n = useI18n();
-const { $globals } = useNuxtApp();
-
-const editorButtons = [
-  {
-    text: i18n.t("general.delete"),
-    icon: $globals.icons.delete,
-    event: DELETE_EVENT,
-    color: "error",
-  },
-  {
-    text: i18n.t("general.json"),
-    icon: $globals.icons.codeBraces,
-    event: JSON_EVENT,
-    color: "accent",
-  },
-  {
-    text: i18n.t("general.close"),
-    icon: $globals.icons.close,
-    event: CLOSE_EVENT,
-    color: "",
-  },
-  {
-    text: i18n.t("general.save"),
-    icon: $globals.icons.save,
-    event: SAVE_EVENT,
-    color: "success",
-  },
-];
-
-function emitHandler(event: string) {
-  switch (event) {
-    case CLOSE_EVENT:
-      emit("close");
-      emit("input", false);
-      break;
-    case DELETE_EVENT:
-      deleteDialog.value = true;
-      break;
-    default:
-      emit(event as any);
-      break;
-  }
-}
-
-function emitDelete() {
-  emit("delete");
-  emit("input", false);
-}
 </script>

 <style scoped>
--- a/frontend/components/Domain/Recipe/RecipeAssets.vue
+++ b/frontend/components/Domain/Recipe/RecipeAssets.vue
@@ -15,7 +15,7 @@
        >
          <template #prepend>
            <div class="ma-auto">
-              <v-tooltip location="bottom">
+              <v-tooltip bottom>
                <template #activator="{ props: tooltipProps }">
                  <v-icon v-bind="tooltipProps">
                    {{ getIconDefinition(item.icon).icon }}
--- a/frontend/components/Domain/Recipe/RecipeCard.vue
+++ b/frontend/components/Domain/Recipe/RecipeCard.vue
@@ -1,146 +1,178 @@
 <template>
  <!-- Wrap v-hover with a div to provide a proper DOM element for the transition -->
-  <div>
-    <v-hover
-      v-slot="{ isHovering, props: hoverProps }"
-      :open-delay="50"
-    >
-      <v-card
-        v-bind="hoverProps"
-        :class="{ 'on-hover': isHovering }"
-        :style="{ cursor }"
-        :elevation="isHovering ? 12 : 2"
-        :to="recipeRoute"
-        :min-height="imageHeight + 75"
-        @click.self="$emit('click')"
+  <v-lazy>
+    <div>
+      <v-hover
+        v-slot="{ isHovering, props }"
+        :open-delay="50"
      >
-        <RecipeCardImage
-          :icon-size="imageHeight"
-          :height="imageHeight"
-          :slug="slug"
-          :recipe-id="recipeId"
-          size="small"
-          :image-version="image"
+        <v-card
+          v-bind="props"
+          :class="{ 'on-hover': isHovering }"
+          :style="{ cursor }"
+          :elevation="isHovering ? 12 : 2"
+          :to="recipeRoute"
+          :min-height="imageHeight + 75"
+          @click.self="$emit('click')"
        >
-          <v-expand-transition v-if="description">
-            <div
-              v-if="isHovering"
-              class="d-flex transition-fast-in-fast-out bg-secondary v-card--reveal"
-              style="height: 100%"
-            >
-              <v-card-text class="v-card--text-show white--text">
-                <div class="descriptionWrapper">
-                  <SafeMarkdown :source="description" />
-                </div>
-              </v-card-text>
-            </div>
-          </v-expand-transition>
-        </RecipeCardImage>
-        <v-card-title class="mb-n3 px-4">
-          <div class="headerClass">
-            {{ name }}
-          </div>
-        </v-card-title>
-
-        <slot name="actions">
-          <v-card-actions
-            v-if="showRecipeContent"
-            class="px-1"
+          <RecipeCardImage
+            :icon-size="imageHeight"
+            :height="imageHeight"
+            :slug="slug"
+            :recipe-id="recipeId"
+            size="small"
+            :image-version="image"
          >
-            <RecipeFavoriteBadge
-              v-if="isOwnGroup"
-              class="absolute"
-              :recipe-id="recipeId"
-              show-always
-            />
-            <div v-else class="px-1" /> <!-- Empty div to keep the layout consistent -->
+            <v-expand-transition v-if="description">
+              <div
+                v-if="isHovering"
+                class="d-flex transition-fast-in-fast-out bg-secondary v-card--reveal"
+                style="height: 100%"
+              >
+                <v-card-text class="v-card--text-show white--text">
+                  <div class="descriptionWrapper">
+                    <SafeMarkdown :source="description" />
+                  </div>
+                </v-card-text>
+              </div>
+            </v-expand-transition>
+          </RecipeCardImage>
+          <v-card-title class="mb-n3 px-4">
+            <div class="headerClass">
+              {{ name }}
+            </div>
+          </v-card-title>

-            <RecipeCardRating
-              :model-value="rating"
-              :recipe-id="recipeId"
-            />
-            <v-spacer />
-            <RecipeChips
-              :truncate="true"
-              :items="tags"
-              :title="false"
-              :limit="2"
-              small
-              url-prefix="tags"
-              v-bind="$attrs"
-            />
+          <slot name="actions">
+            <v-card-actions
+              v-if="showRecipeContent"
+              class="px-1"
+            >
+              <RecipeFavoriteBadge
+                v-if="isOwnGroup"
+                class="absolute"
+                :recipe-id="recipeId"
+                show-always
+              />
+              <div v-else class="px-1" /> <!-- Empty div to keep the layout consistent -->

-            <!-- If we're not logged-in, no items display, so we hide this menu -->
-            <RecipeContextMenu
-              v-if="isOwnGroup && showRecipeContent"
-              color="grey-darken-2"
-              :slug="slug"
-              :menu-icon="$globals.icons.dotsVertical"
-              :name="name"
-              :recipe-id="recipeId"
-              :use-items="{
-                delete: false,
-                edit: false,
-                download: true,
-                mealplanner: true,
-                shoppingList: true,
-                print: false,
-                printPreferences: false,
-                share: true,
-              }"
-              @deleted="$emit('delete', slug)"
-            />
-          </v-card-actions>
-        </slot>
-        <slot />
-      </v-card>
-    </v-hover>
-  </div>
+              <RecipeRating
+                class="ml-n2"
+                :value="rating"
+                :recipe-id="recipeId"
+                :slug="slug"
+                small
+              />
+              <v-spacer />
+              <RecipeChips
+                :truncate="true"
+                :items="tags"
+                :title="false"
+                :limit="2"
+                small
+                url-prefix="tags"
+                v-bind="$attrs"
+              />
+
+              <!-- If we're not logged-in, no items display, so we hide this menu -->
+              <RecipeContextMenu
+                v-if="isOwnGroup"
+                color="grey-darken-2"
+                :slug="slug"
+                :name="name"
+                :recipe-id="recipeId"
+                :use-items="{
+                  delete: false,
+                  edit: false,
+                  download: true,
+                  mealplanner: true,
+                  shoppingList: true,
+                  print: false,
+                  printPreferences: false,
+                  share: true,
+                }"
+                @delete="$emit('delete', slug)"
+              />
+            </v-card-actions>
+          </slot>
+          <slot />
+        </v-card>
+      </v-hover>
+    </div>
+  </v-lazy>
 </template>

-<script setup lang="ts">
+<script lang="ts">
 import RecipeFavoriteBadge from "./RecipeFavoriteBadge.vue";
 import RecipeChips from "./RecipeChips.vue";
-import RecipeContextMenu from "./RecipeContextMenu/RecipeContextMenu.vue";
+import RecipeContextMenu from "./RecipeContextMenu.vue";
 import RecipeCardImage from "./RecipeCardImage.vue";
-import RecipeCardRating from "./RecipeCardRating.vue";
+import RecipeRating from "./RecipeRating.vue";
 import { useLoggedInState } from "~/composables/use-logged-in-state";

-interface Props {
-  name: string;
-  slug: string;
-  description?: string | null;
-  rating?: number;
-  ratingColor?: string;
-  image?: string;
-  tags?: Array<any>;
-  recipeId: string;
-  imageHeight?: number;
-}
-const props = withDefaults(defineProps<Props>(), {
-  description: null,
-  rating: 0,
-  ratingColor: "secondary",
-  image: "abc123",
-  tags: () => [],
-  imageHeight: 200,
+export default defineNuxtComponent({
+  components: { RecipeFavoriteBadge, RecipeChips, RecipeContextMenu, RecipeRating, RecipeCardImage },
+  props: {
+    name: {
+      type: String,
+      required: true,
+    },
+    slug: {
+      type: String,
+      required: true,
+    },
+    description: {
+      type: String,
+      default: null,
+    },
+    rating: {
+      type: Number,
+      required: false,
+      default: 0,
+    },
+    ratingColor: {
+      type: String,
+      default: "secondary",
+    },
+    image: {
+      type: String,
+      required: false,
+      default: "abc123",
+    },
+    tags: {
+      type: Array,
+      default: () => [],
+    },
+    recipeId: {
+      required: true,
+      type: String,
+    },
+    imageHeight: {
+      type: Number,
+      default: 200,
+    },
+  },
+  emits: ["click", "delete"],
+  setup(props) {
+    const $auth = useMealieAuth();
+    const { isOwnGroup } = useLoggedInState();
+
+    const route = useRoute();
+    const groupSlug = computed(() => route.params.groupSlug || $auth.user.value?.groupSlug || "");
+    const showRecipeContent = computed(() => props.recipeId && props.slug);
+    const recipeRoute = computed<string>(() => {
+      return showRecipeContent.value ? `/g/${groupSlug.value}/r/${props.slug}` : "";
+    });
+    const cursor = computed(() => showRecipeContent.value ? "pointer" : "auto");
+
+    return {
+      isOwnGroup,
+      recipeRoute,
+      showRecipeContent,
+      cursor,
+    };
+  },
 });
-
-defineEmits<{
-  click: [];
-  delete: [slug: string];
-}>();
-
-const $auth = useMealieAuth();
-const { isOwnGroup } = useLoggedInState();
-
-const route = useRoute();
-const groupSlug = computed(() => route.params.groupSlug || $auth.user.value?.groupSlug || "");
-const showRecipeContent = computed(() => props.recipeId && props.slug);
-const recipeRoute = computed<string>(() => {
-  return showRecipeContent.value ? `/g/${groupSlug.value}/r/${props.slug}` : "";
-});
-const cursor = computed(() => showRecipeContent.value ? "pointer" : "auto");
 </script>

 <style>
@@ -165,7 +197,6 @@ const cursor = computed(() => showRecipeContent.value ? "pointer" : "auto");
  display: -webkit-box;
  -webkit-box-orient: vertical;
  -webkit-line-clamp: 8;
-  line-clamp: 8;
  overflow: hidden;
 }
 </style>
--- a/frontend/components/Domain/Recipe/RecipeCardImage.vue
+++ b/frontend/components/Domain/Recipe/RecipeCardImage.vue
@@ -28,60 +28,84 @@
  </div>
 </template>

-<script setup lang="ts">
-import { useStaticRoutes } from "~/composables/api";
+<script lang="ts">
+import { useStaticRoutes, useUserApi } from "~/composables/api";

-interface Props {
-  tiny?: boolean | null;
-  small?: boolean | null;
-  large?: boolean | null;
-  iconSize?: number | string;
-  slug?: string | null;
-  recipeId: string;
-  imageVersion?: string | null;
-  height?: number | string;
-}
-const props = withDefaults(defineProps<Props>(), {
-  tiny: null,
-  small: null,
-  large: null,
-  iconSize: 100,
-  slug: null,
-  imageVersion: null,
-  height: "100%",
-});
-
-defineEmits<{
-  click: [];
-}>();
-
-const { recipeImage, recipeSmallImage, recipeTinyImage } = useStaticRoutes();
-
-const fallBackImage = ref(false);
-const imageSize = computed(() => {
-  if (props.tiny) return "tiny";
-  if (props.small) return "small";
-  if (props.large) return "large";
-  return "large";
-});
-
-watch(
-  () => props.recipeId,
-  () => {
-    fallBackImage.value = false;
+export default defineNuxtComponent({
+  props: {
+    tiny: {
+      type: Boolean,
+      default: null,
+    },
+    small: {
+      type: Boolean,
+      default: null,
+    },
+    large: {
+      type: Boolean,
+      default: null,
+    },
+    iconSize: {
+      type: [Number, String],
+      default: 100,
+    },
+    slug: {
+      type: String,
+      default: null,
+    },
+    recipeId: {
+      type: String,
+      required: true,
+    },
+    imageVersion: {
+      type: String,
+      default: null,
+    },
+    height: {
+      type: [Number, String],
+      default: "100%",
+    },
  },
-);
+  emits: ["click"],
+  setup(props) {
+    const api = useUserApi();

-function getImage(recipeId: string) {
-  switch (imageSize.value) {
-    case "tiny":
-      return recipeTinyImage(recipeId, props.imageVersion);
-    case "small":
-      return recipeSmallImage(recipeId, props.imageVersion);
-    case "large":
-      return recipeImage(recipeId, props.imageVersion);
-  }
-}
+    const { recipeImage, recipeSmallImage, recipeTinyImage } = useStaticRoutes();
+
+    const fallBackImage = ref(false);
+    const imageSize = computed(() => {
+      if (props.tiny) return "tiny";
+      if (props.small) return "small";
+      if (props.large) return "large";
+      return "large";
+    });
+
+    watch(
+      () => props.recipeId,
+      () => {
+        fallBackImage.value = false;
+      },
+    );
+
+    function getImage(recipeId: string) {
+      switch (imageSize.value) {
+        case "tiny":
+          return recipeTinyImage(recipeId, props.imageVersion);
+        case "small":
+          return recipeSmallImage(recipeId, props.imageVersion);
+        case "large":
+          return recipeImage(recipeId, props.imageVersion);
+      }
+    }
+
+    return {
+      api,
+      fallBackImage,
+      imageSize,
+      getImage,
+    };
+  },
+});
 </script>

 <style scoped>
--- a/frontend/components/Domain/Recipe/RecipeCardMobile.vue
+++ b/frontend/components/Domain/Recipe/RecipeCardMobile.vue
@@ -3,10 +3,7 @@
    <v-expand-transition>
      <v-card
        :ripple="false"
-        :class="[
-          isFlat ? 'mx-auto flat' : 'mx-auto',
-          { 'disable-highlight': disableHighlight },
-        ]"
+        :class="isFlat ? 'mx-auto flat' : 'mx-auto'"
        :style="{ cursor }"
        hover
        height="100%"
@@ -87,11 +84,13 @@
                class="ma-0 pa-0"
              />
              <div v-else class="my-0 px-1 py-0" /> <!-- Empty div to keep the layout consistent -->
-              <RecipeCardRating
+              <RecipeRating
                v-if="showRecipeContent"
                :class="[{ 'pb-2': !isOwnGroup }, 'ml-n2']"
-                :model-value="rating"
+                :value="rating"
                :recipe-id="recipeId"
+                :slug="slug"
+                small
              />

              <!-- If we're not logged-in, no items display, so we hide this menu -->
@@ -116,7 +115,7 @@
                @deleted="$emit('delete', slug)"
              />
            </v-card-actions>
-          </slot>
+            </slot>
        </v-list-item>
        <slot />
      </v-card>
@@ -124,52 +123,86 @@
  </div>
 </template>

-<script setup lang="ts">
+<script lang="ts">
 import RecipeFavoriteBadge from "./RecipeFavoriteBadge.vue";
-import RecipeContextMenu from "./RecipeContextMenu/RecipeContextMenu.vue";
+import RecipeContextMenu from "./RecipeContextMenu.vue";
 import RecipeCardImage from "./RecipeCardImage.vue";
-import RecipeCardRating from "./RecipeCardRating.vue";
+import RecipeRating from "./RecipeRating.vue";
 import RecipeChips from "./RecipeChips.vue";
 import { useLoggedInState } from "~/composables/use-logged-in-state";

-interface Props {
-  name: string;
-  slug: string;
-  description: string;
-  rating?: number;
-  image?: string;
-  tags?: Array<any>;
-  recipeId: string;
-  vertical?: boolean;
-  isFlat?: boolean;
-  height?: number;
-  disableHighlight?: boolean;
-}
-const props = withDefaults(defineProps<Props>(), {
-  rating: 0,
-  image: "abc123",
-  tags: () => [],
-  vertical: false,
-  isFlat: false,
-  height: 150,
-  disableHighlight: false,
+export default defineNuxtComponent({
+  components: {
+    RecipeFavoriteBadge,
+    RecipeContextMenu,
+    RecipeRating,
+    RecipeCardImage,
+    RecipeChips,
+  },
+  props: {
+    name: {
+      type: String,
+      required: true,
+    },
+    slug: {
+      type: String,
+      required: true,
+    },
+    description: {
+      type: String,
+      required: true,
+    },
+    rating: {
+      type: Number,
+      default: 0,
+    },
+    image: {
+      type: String,
+      required: false,
+      default: "abc123",
+    },
+    tags: {
+      type: Array,
+      default: () => [],
+    },
+    recipeId: {
+      type: String,
+      required: true,
+    },
+    vertical: {
+      type: Boolean,
+      default: false,
+    },
+    isFlat: {
+      type: Boolean,
+      default: false,
+    },
+    height: {
+      type: [Number],
+      default: 150,
+    },
+  },
+  emits: ["selected", "delete"],
+  setup(props) {
+    const $auth = useMealieAuth();
+    const { isOwnGroup } = useLoggedInState();
+
+    const route = useRoute();
+    const groupSlug = computed(() => route.params.groupSlug || $auth.user.value?.groupSlug || "");
+    const showRecipeContent = computed(() => props.recipeId && props.slug);
+    const recipeRoute = computed<string>(() => {
+      return showRecipeContent.value ? `/g/${groupSlug.value}/r/${props.slug}` : "";
+    });
+    const cursor = computed(() => showRecipeContent.value ? "pointer" : "auto");
+
+    return {
+      isOwnGroup,
+      recipeRoute,
+      showRecipeContent,
+      cursor,
+    };
+  },
 });
-
-defineEmits<{
-  selected: [];
-  delete: [slug: string];
-}>();
-
-const $auth = useMealieAuth();
-const { isOwnGroup } = useLoggedInState();
-
-const route = useRoute();
-const groupSlug = computed(() => route.params.groupSlug || $auth.user.value?.groupSlug || "");
-const showRecipeContent = computed(() => props.recipeId && props.slug);
-const recipeRoute = computed<string>(() => {
-  return showRecipeContent.value ? `/g/${groupSlug.value}/r/${props.slug}` : "";
-});
-const cursor = computed(() => showRecipeContent.value ? "pointer" : "auto");
 </script>

 <style scoped>
@@ -208,8 +241,4 @@ const cursor = computed(() => showRecipeContent.value ? "pointer" : "auto");
  box-shadow: none !important;
  background-color: transparent !important;
 }
-
-.disable-highlight :deep(.v-card__overlay) {
-  opacity: 0 !important;
-}
 </style>
--- a/frontend/components/Domain/Recipe/RecipeCardRating.vue
+++ b/frontend/components/Domain/Recipe/RecipeCardRating.vue
@@ -1,101 +0,0 @@
-<template>
-  <div class="rating-display">
-    <span
-      v-for="(star, index) in ratingDisplay"
-      :key="index"
-      class="star"
-      :class="{
-        'star-half': star === 'half',
-        'text-secondary': !useGroupStyle,
-        'text-grey-darken-1': useGroupStyle,
-      }"
-    >
-      <!-- We render both the full and empty stars for "half" stars because they're layered over each other -->
-      <span
-        v-if="star === 'empty' || star === 'half'"
-        class="star-empty"
-      >
-        ☆
-      </span>
-      <span
-        v-if="star === 'full' || star === 'half'"
-        class="star-full"
-      >
-        ★
-      </span>
-    </span>
-  </div>
-</template>
-
-<script setup lang="ts">
-import { useLoggedInState } from "~/composables/use-logged-in-state";
-import { useUserSelfRatings } from "~/composables/use-users";
-
-type Star = "full" | "half" | "empty";
-
-const props = defineProps({
-  modelValue: {
-    type: Number,
-    default: 0,
-  },
-  recipeId: {
-    type: String,
-    default: "",
-  },
-});
-
-const { isOwnGroup } = useLoggedInState();
-const { userRatings } = useUserSelfRatings();
-
-const userRating = computed(() => {
-  return userRatings.value.find(r => r.recipeId === props.recipeId)?.rating ?? undefined;
-});
-
-const ratingValue = computed(() => userRating.value || props.modelValue || 0);
-const useGroupStyle = computed(() => isOwnGroup.value && !userRating.value && props.modelValue);
-const ratingDisplay = computed<Star[]>(
-  () => {
-    const stars: Star[] = [];
-
-    for (let i = 0; i < 5; i++) {
-      const diff = ratingValue.value - i;
-      if (diff >= 1) {
-        stars.push("full");
-      }
-      else if (diff >= 0.25) { // round to half star if rating is at least 0.25 but not quite a full star
-        stars.push("half");
-      }
-      else {
-        stars.push("empty");
-      }
-    }
-
-    return stars;
-  },
-);
-</script>
-
-<style lang="scss" scoped>
-.rating-display {
-  display: inline-flex;
-  align-items: center;
-  gap: 1px;
-
-  .star {
-    font-size: 18px;
-    transition: color 0.2s ease;
-    user-select: none;
-    position: relative;
-    display: inline-block;
-    &.star-half {
-      .star-full {
-        position: absolute;
-        left: 0;
-        top: 0;
-        width: 50%;
-        overflow: hidden;
-      }
-    }
-  }
-}
-</style>
--- a/frontend/components/Domain/Recipe/RecipeCardSection.vue
+++ b/frontend/components/Domain/Recipe/RecipeCardSection.vue
@@ -36,11 +36,11 @@
        offset-y
        start
      >
-        <template #activator="{ props: activatorProps }">
+        <template #activator="{ props }">
          <v-btn
            variant="text"
            :icon="$vuetify.display.xs"
-            v-bind="activatorProps"
+            v-bind="props"
            :loading="sortLoading"
          >
            <v-icon :start="!$vuetify.display.xs">
@@ -123,6 +123,7 @@
              :image="recipe.image!"
              :tags="recipe.tags!"
              :recipe-id="recipe.id!"
+              @click="handleRecipeNavigation"
            />
          </v-col>
        </v-row>
@@ -147,6 +148,7 @@
              :image="recipe.image!"
              :tags="recipe.tags!"
              :recipe-id="recipe.id!"
+              @selected="handleRecipeNavigation"
            />
          </v-col>
        </v-row>
@@ -162,7 +164,7 @@
  </div>
 </template>

-<script setup lang="ts">
+<script lang="ts">
 import { useThrottleFn } from "@vueuse/core";
 import RecipeCard from "./RecipeCard.vue";
 import RecipeCardMobile from "./RecipeCardMobile.vue";
@@ -171,247 +173,346 @@ import { useLazyRecipes } from "~/composables/recipes";
 import type { Recipe } from "~/lib/api/types/recipe";
 import { useUserSortPreferences } from "~/composables/use-users/preferences";
 import type { RecipeSearchQuery } from "~/lib/api/user/recipes/recipe";
+import { useRecipeListState } from "~/composables/recipe-page/use-recipe-list-state";

 const REPLACE_RECIPES_EVENT = "replaceRecipes";
 const APPEND_RECIPES_EVENT = "appendRecipes";

-interface Props {
-  disableToolbar?: boolean;
-  disableSort?: boolean;
-  icon?: string | null;
-  title?: string | null;
-  singleColumn?: boolean;
-  recipes?: Recipe[];
-  query?: RecipeSearchQuery | null;
-}
-const props = withDefaults(defineProps<Props>(), {
-  disableToolbar: false,
-  disableSort: false,
-  icon: null,
-  title: null,
-  singleColumn: false,
-  recipes: () => [],
-  query: null,
-});
-
-const emit = defineEmits<{
-  replaceRecipes: [recipes: Recipe[]];
-  appendRecipes: [recipes: Recipe[]];
-}>();
-
-const display = useDisplay();
-const preferences = useUserSortPreferences();
-
-const EVENTS = {
-  az: "az",
-  rating: "rating",
-  created: "created",
-  updated: "updated",
-  lastMade: "lastMade",
-  shuffle: "shuffle",
-};
-
-const $auth = useMealieAuth();
-const { $globals } = useNuxtApp();
-const { isOwnGroup } = useLoggedInState();
-const useMobileCards = computed(() => {
-  return display.smAndDown.value || preferences.value.useMobileCards;
-});
-
-const displayTitleIcon = computed(() => {
-  return props.icon || $globals.icons.tags;
-});
-
-const sortLoading = ref(false);
-
-const route = useRoute();
-const groupSlug = computed(() => route.params.groupSlug as string || $auth.user.value?.groupSlug || "");
-
-const page = ref(1);
-const perPage = 32;
-const hasMore = ref(true);
-const ready = ref(false);
-const loading = ref(false);
-
-const { fetchMore, getRandom } = useLazyRecipes(isOwnGroup.value ? null : groupSlug.value);
-const router = useRouter();
-
-const queryFilter = computed(() => {
-  return props.query?.queryFilter || null;
-
-  // TODO: allow user to filter out null values when ordering by a value that may be null (such as lastMade)
-
-  // const orderBy = props.query?.orderBy || preferences.value.orderBy;
-  // const orderByFilter = preferences.value.filterNull && orderBy ? `${orderBy} IS NOT NULL` : null;
-
-  // if (props.query.queryFilter && orderByFilter) {
-  //   return `(${props.query.queryFilter}) AND ${orderByFilter}`;
-  // } else if (props.query.queryFilter) {
-  //   return props.query.queryFilter;
-  // } else {
-  //   return orderByFilter;
-  // }
-});
-
-async function fetchRecipes(pageCount = 1) {
-  const orderDir = props.query?.orderDirection || preferences.value.orderDirection;
-  const orderByNullPosition = props.query?.orderByNullPosition || orderDir === "asc" ? "first" : "last";
-  return await fetchMore(
-    page.value,
-    perPage * pageCount,
-    props.query?.orderBy || preferences.value.orderBy,
-    orderDir,
-    orderByNullPosition,
-    props.query,
-    // we use a computed queryFilter to filter out recipes that have a null value for the property we're sorting by
-    queryFilter.value,
-  );
-}
-
-onMounted(async () => {
-  await initRecipes();
-  ready.value = true;
-});
-
-let lastQuery: string | undefined = JSON.stringify(props.query);
-watch(
-  () => props.query,
-  async (newValue: RecipeSearchQuery | undefined | null) => {
-    const newValueString = JSON.stringify(newValue);
-    if (lastQuery !== newValueString) {
-      lastQuery = newValueString;
-      ready.value = false;
-      await initRecipes();
-      ready.value = true;
-    }
+export default defineNuxtComponent({
+  components: {
+    RecipeCard,
+    RecipeCardMobile,
  },
-);
+  props: {
+    disableToolbar: {
+      type: Boolean,
+      default: false,
+    },
+    disableSort: {
+      type: Boolean,
+      default: false,
+    },
+    icon: {
+      type: String,
+      default: null,
+    },
+    title: {
+      type: String,
+      default: null,
+    },
+    singleColumn: {
+      type: Boolean,
+      default: false,
+    },
+    recipes: {
+      type: Array as () => Recipe[],
+      default: () => [],
+    },
+    query: {
+      type: Object as () => RecipeSearchQuery,
+      default: null,
+    },
+  },
+  setup(props, context) {
+    const { $vuetify } = useNuxtApp();
+    const preferences = useUserSortPreferences();

-async function initRecipes() {
-  page.value = 1;
-  hasMore.value = true;
+    const EVENTS = {
+      az: "az",
+      rating: "rating",
+      created: "created",
+      updated: "updated",
+      lastMade: "lastMade",
+      shuffle: "shuffle",
+    };

-  // we double-up the first call to avoid a bug with large screens that render
-  // the entire first page without scrolling, preventing additional loading
-  const newRecipes = await fetchRecipes(page.value + 1);
-  if (newRecipes.length < perPage) {
-    hasMore.value = false;
-  }
+    const $auth = useMealieAuth();
+    const { $globals } = useNuxtApp();
+    const { isOwnGroup } = useLoggedInState();
+    const useMobileCards = computed(() => {
+      return $vuetify.display.smAndDown.value || preferences.value.useMobileCards;
+    });

-  // since we doubled the first call, we also need to advance the page
-  page.value = page.value + 1;
+    const displayTitleIcon = computed(() => {
+      return props.icon || $globals.icons.tags;
+    });

-  emit(REPLACE_RECIPES_EVENT, newRecipes);
-}
+    const state = reactive({
+      sortLoading: false,
+    });

-const infiniteScroll = useThrottleFn(async () => {
-  if (!hasMore.value || loading.value) {
-    return;
-  }
+    const route = useRoute();
+    const groupSlug = computed(() => route.params.groupSlug as string || $auth.user.value?.groupSlug || "");

-  loading.value = true;
-  page.value = page.value + 1;
+    const recipeListState = useRecipeListState(props.query);

-  const newRecipes = await fetchRecipes();
-  if (newRecipes.length < perPage) {
-    hasMore.value = false;
-  }
-  if (newRecipes.length) {
-    emit(APPEND_RECIPES_EVENT, newRecipes);
-  }
+    const page = ref(recipeListState.state.page || 1);
+    const perPage = 32;
+    const hasMore = ref(recipeListState.state.hasMore);
+    const ready = ref(false);
+    const loading = ref(false);

-  loading.value = false;
-}, 500);
+    const { fetchMore, getRandom } = useLazyRecipes(isOwnGroup.value ? null : groupSlug.value);
+    const router = useRouter();

-async function sortRecipes(sortType: string) {
-  if (sortLoading.value || loading.value) {
-    return;
-  }
+    const queryFilter = computed(() => {
+      return props.query.queryFilter || null;

-  function setter(
-    orderBy: string,
-    ascIcon: string,
-    descIcon: string,
-    defaultOrderDirection = "asc",
-    filterNull = false,
-  ) {
-    if (preferences.value.orderBy !== orderBy) {
-      preferences.value.orderBy = orderBy;
-      preferences.value.orderDirection = defaultOrderDirection;
-      preferences.value.filterNull = filterNull;
+      // TODO: allow user to filter out null values when ordering by a value that may be null (such as lastMade)
+
+      // const orderBy = props.query?.orderBy || preferences.value.orderBy;
+      // const orderByFilter = preferences.value.filterNull && orderBy ? `${orderBy} IS NOT NULL` : null;
+
+      // if (props.query.queryFilter && orderByFilter) {
+      //   return `(${props.query.queryFilter}) AND ${orderByFilter}`;
+      // } else if (props.query.queryFilter) {
+      //   return props.query.queryFilter;
+      // } else {
+      //   return orderByFilter;
+      // }
+    });
+
+    async function fetchRecipes(pageCount = 1) {
+      const orderDir = props.query?.orderDirection || preferences.value.orderDirection;
+      const orderByNullPosition = props.query?.orderByNullPosition || orderDir === "asc" ? "first" : "last";
+      return await fetchMore(
+        page.value,
+        perPage * pageCount,
+        props.query?.orderBy || preferences.value.orderBy,
+        orderDir,
+        orderByNullPosition,
+        props.query,
+        // we use a computed queryFilter to filter out recipes that have a null value for the property we're sorting by
+        queryFilter.value,
+      );
    }
-    else {
-      preferences.value.orderDirection = preferences.value.orderDirection === "asc" ? "desc" : "asc";
+
+    // Save scroll position
+    const throttledScrollSave = useThrottleFn(() => {
+      recipeListState.saveScrollPosition();
+    }, 1000);
+
+    onMounted(async () => {
+      window.addEventListener("scroll", throttledScrollSave);
+
+      // cached state with scroll position
+      if (recipeListState.hasValidState() && recipeListState.isQueryMatch(props.query)) {
+        // Restore from cached state
+        page.value = recipeListState.state.page;
+        hasMore.value = recipeListState.state.hasMore;
+        ready.value = recipeListState.state.ready;
+
+        // Emit cached recipes
+        context.emit(REPLACE_RECIPES_EVENT, recipeListState.state.recipes);
+
+        // Restore scroll position after recipes are rendered
+        nextTick(() => {
+          recipeListState.restoreScrollPosition();
+        });
+      }
+      else {
+        // Initialize fresh recipes
+        await initRecipes();
+      }
+      ready.value = true;
+    });
+
+    let lastQuery: string | undefined = JSON.stringify(props.query);
+    watch(
+      () => props.query,
+      async (newValue: RecipeSearchQuery | undefined) => {
+        const newValueString = JSON.stringify(newValue);
+        if (lastQuery !== newValueString) {
+          lastQuery = newValueString;
+
+          // Save scroll position before query change
+          recipeListState.saveScrollPosition();
+
+          ready.value = false;
+          await initRecipes();
+          ready.value = true;
+        }
+      },
+    );
+
+    async function initRecipes() {
+      page.value = 1;
+      hasMore.value = true;
+
+      // we double-up the first call to avoid a bug with large screens that render
+      // the entire first page without scrolling, preventing additional loading
+      const newRecipes = await fetchRecipes(page.value + 1);
+      if (newRecipes.length < perPage) {
+        hasMore.value = false;
+      }
+
+      // since we doubled the first call, we also need to advance the page
+      page.value = page.value + 1;
+
+      // Save state after fetching recipes
+      recipeListState.saveState({
+        recipes: newRecipes,
+        page: page.value,
+        hasMore: hasMore.value,
+        ready: true,
+      });
+
+      context.emit(REPLACE_RECIPES_EVENT, newRecipes);
    }
-    preferences.value.sortIcon = preferences.value.orderDirection === "asc" ? ascIcon : descIcon;
-  }

-  switch (sortType) {
-    case EVENTS.az:
-      setter(
-        "name",
-        $globals.icons.sortAlphabeticalAscending,
-        $globals.icons.sortAlphabeticalDescending,
-        "asc",
-        false,
-      );
-      break;
-    case EVENTS.rating:
-      setter("rating", $globals.icons.sortAscending, $globals.icons.sortDescending, "desc", true);
-      break;
-    case EVENTS.created:
-      setter(
-        "created_at",
-        $globals.icons.sortCalendarAscending,
-        $globals.icons.sortCalendarDescending,
-        "desc",
-        false,
-      );
-      break;
-    case EVENTS.updated:
-      setter("updated_at", $globals.icons.sortClockAscending, $globals.icons.sortClockDescending, "desc", false);
-      break;
-    case EVENTS.lastMade:
-      setter(
-        "last_made",
-        $globals.icons.sortCalendarAscending,
-        $globals.icons.sortCalendarDescending,
-        "desc",
-        true,
-      );
-      break;
-    default:
-      console.log("Unknown Event", sortType);
-      return;
-  }
+    const infiniteScroll = useThrottleFn(async () => {
+      if (!hasMore.value || loading.value) {
+        return;
+      }

-  // reset pagination
-  page.value = 1;
-  hasMore.value = true;
+      loading.value = true;
+      page.value = page.value + 1;

-  sortLoading.value = true;
-  loading.value = true;
+      const newRecipes = await fetchRecipes();
+      if (newRecipes.length < perPage) {
+        hasMore.value = false;
+      }
+      if (newRecipes.length) {
+        // Update cached state with new recipes
+        const allRecipes = [...(recipeListState.state.recipes || []), ...newRecipes] as Recipe[];
+        recipeListState.saveState({
+          recipes: allRecipes,
+          page: page.value,
+          hasMore: hasMore.value,
+        });

-  // fetch new recipes
-  const newRecipes = await fetchRecipes();
-  emit(REPLACE_RECIPES_EVENT, newRecipes);
+        context.emit(APPEND_RECIPES_EVENT, newRecipes);
+      }

-  sortLoading.value = false;
-  loading.value = false;
-}
+      loading.value = false;
+    }, 500);

-async function navigateRandom() {
-  const recipe = await getRandom(props.query, queryFilter.value);
-  if (!recipe?.slug) {
-    return;
-  }
+    async function sortRecipes(sortType: string) {
+      if (state.sortLoading || loading.value) {
+        return;
+      }

-  router.push(`/g/${groupSlug.value}/r/${recipe.slug}`);
-}
+      function setter(
+        orderBy: string,
+        ascIcon: string,
+        descIcon: string,
+        defaultOrderDirection = "asc",
+        filterNull = false,
+      ) {
+        if (preferences.value.orderBy !== orderBy) {
+          preferences.value.orderBy = orderBy;
+          preferences.value.orderDirection = defaultOrderDirection;
+          preferences.value.filterNull = filterNull;
+        }
+        else {
+          preferences.value.orderDirection = preferences.value.orderDirection === "asc" ? "desc" : "asc";
+        }
+        preferences.value.sortIcon = preferences.value.orderDirection === "asc" ? ascIcon : descIcon;
+      }

-function toggleMobileCards() {
-  preferences.value.useMobileCards = !preferences.value.useMobileCards;
-}
+      switch (sortType) {
+        case EVENTS.az:
+          setter(
+            "name",
+            $globals.icons.sortAlphabeticalAscending,
+            $globals.icons.sortAlphabeticalDescending,
+            "asc",
+            false,
+          );
+          break;
+        case EVENTS.rating:
+          setter("rating", $globals.icons.sortAscending, $globals.icons.sortDescending, "desc", true);
+          break;
+        case EVENTS.created:
+          setter(
+            "created_at",
+            $globals.icons.sortCalendarAscending,
+            $globals.icons.sortCalendarDescending,
+            "desc",
+            false,
+          );
+          break;
+        case EVENTS.updated:
+          setter("updated_at", $globals.icons.sortClockAscending, $globals.icons.sortClockDescending, "desc", false);
+          break;
+        case EVENTS.lastMade:
+          setter(
+            "last_made",
+            $globals.icons.sortCalendarAscending,
+            $globals.icons.sortCalendarDescending,
+            "desc",
+            true,
+          );
+          break;
+        default:
+          console.log("Unknown Event", sortType);
+          return;
+      }
+
+      // reset pagination
+      page.value = 1;
+      hasMore.value = true;
+
+      state.sortLoading = true;
+      loading.value = true;
+
+      // fetch new recipes
+      const newRecipes = await fetchRecipes();
+
+      // Update cached state
+      recipeListState.saveState({
+        recipes: newRecipes,
+        page: page.value,
+        hasMore: hasMore.value,
+        ready: true,
+      });
+
+      context.emit(REPLACE_RECIPES_EVENT, newRecipes);
+
+      state.sortLoading = false;
+      loading.value = false;
+    }
+
+    async function navigateRandom() {
+      const recipe = await getRandom(props.query, queryFilter.value);
+      if (!recipe?.slug) {
+        return;
+      }
+
+      router.push(`/g/${groupSlug.value}/r/${recipe.slug}`);
+    }
+
+    function toggleMobileCards() {
+      preferences.value.useMobileCards = !preferences.value.useMobileCards;
+    }
+
+    // Save scroll position when component is unmounted or when navigating away
+    onBeforeUnmount(() => {
+      recipeListState.saveScrollPosition();
+      window.removeEventListener("scroll", throttledScrollSave);
+    });
+
+    // Save scroll position when navigating to recipe pages
+    function handleRecipeNavigation() {
+      recipeListState.saveScrollPosition();
+    }
+
+    return {
+      ...toRefs(state),
+      displayTitleIcon,
+      EVENTS,
+      infiniteScroll,
+      ready,
+      loading,
+      navigateRandom,
+      preferences,
+      sortRecipes,
+      toggleMobileCards,
+      useMobileCards,
+      handleRecipeNavigation,
+    };
+  },
+});
 </script>

 <style>
--- a/frontend/components/Domain/Recipe/RecipeChips.vue
+++ b/frontend/components/Domain/Recipe/RecipeChips.vue
@@ -23,38 +23,66 @@
  </div>
 </template>

-<script setup lang="ts">
+<script lang="ts">
 import type { RecipeCategory, RecipeTag, RecipeTool } from "~/lib/api/types/recipe";

 export type UrlPrefixParam = "tags" | "categories" | "tools";

-interface Props {
-  truncate?: boolean;
-  items?: RecipeCategory[] | RecipeTag[] | RecipeTool[];
-  title?: boolean;
-  urlPrefix?: UrlPrefixParam;
-  limit?: number;
-  small?: boolean;
-  maxWidth?: string | null;
-}
-const props = withDefaults(defineProps<Props>(), {
-  truncate: false,
-  items: () => [],
-  title: false,
-  urlPrefix: "categories",
-  limit: 999,
-  small: false,
-  maxWidth: null,
-});
+export default defineNuxtComponent({
+  props: {
+    truncate: {
+      type: Boolean,
+      default: false,
+    },
+    items: {
+      type: Array as () => RecipeCategory[] | RecipeTag[] | RecipeTool[],
+      default: () => [],
+    },
+    title: {
+      type: Boolean,
+      default: false,
+    },
+    urlPrefix: {
+      type: String as () => UrlPrefixParam,
+      default: "categories",
+    },
+    limit: {
+      type: Number,
+      default: 999,
+    },
+    small: {
+      type: Boolean,
+      default: false,
+    },
+    maxWidth: {
+      type: String,
+      default: null,
+    },
+  },
+  emits: ["item-selected"],
+  setup(props) {
+    const $auth = useMealieAuth();

-defineEmits(["item-selected"]);
-function truncateText(text: string, length = 20, clamp = "...") {
-  if (!props.truncate) return text;
-  const node = document.createElement("div");
-  node.innerHTML = text;
-  const content = node.textContent || "";
-  return content.length > length ? content.slice(0, length) + clamp : content;
-}
+    const route = useRoute();
+    const groupSlug = computed(() => route.params.groupSlug || $auth.user.value?.groupSlug || "");
+    const baseRecipeRoute = computed<string>(() => {
+      return `/g/${groupSlug.value}`;
+    });
+
+    function truncateText(text: string, length = 20, clamp = "...") {
+      if (!props.truncate) return text;
+      const node = document.createElement("div");
+      node.innerHTML = text;
+      const content = node.textContent || "";
+      return content.length > length ? content.slice(0, length) + clamp : content;
+    }
+
+    return {
+      baseRecipeRoute,
+      truncateText,
+    };
+  },
+});
 </script>

 <style></style>
--- a/frontend/components/Domain/Recipe/RecipeContextMenu.vue
+++ b/frontend/components/Domain/Recipe/RecipeContextMenu.vue
@@ -0,0 +1,528 @@
+<template>
+  <div class="text-center">
+    <!-- Recipe Share Dialog -->
+    <RecipeDialogShare v-model="shareDialog" :recipe-id="recipeId" :name="name" />
+    <RecipeDialogPrintPreferences v-model="printPreferencesDialog" :recipe="recipeRef" />
+    <BaseDialog
+      v-model="recipeDeleteDialog"
+      :title="$t('recipe.delete-recipe')"
+      color="error"
+      :icon="$globals.icons.alertCircle"
+      can-confirm
+      @confirm="deleteRecipe()"
+    >
+      <v-card-text>
+        {{ $t("recipe.delete-confirmation") }}
+      </v-card-text>
+    </BaseDialog>
+    <BaseDialog
+      v-model="recipeDuplicateDialog"
+      :title="$t('recipe.duplicate')"
+      color="primary"
+      :icon="$globals.icons.duplicate"
+      can-confirm
+      @confirm="duplicateRecipe()"
+    >
+      <v-card-text>
+        <v-text-field
+          v-model="recipeName"
+          density="compact"
+          :label="$t('recipe.recipe-name')"
+          autofocus
+          @keyup.enter="duplicateRecipe()"
+        />
+      </v-card-text>
+    </BaseDialog>
+    <BaseDialog
+      v-model="mealplannerDialog"
+      :title="$t('recipe.add-recipe-to-mealplan')"
+      color="primary"
+      :icon="$globals.icons.calendar"
+      can-confirm
+      @confirm="addRecipeToPlan()"
+    >
+      <v-card-text>
+        <v-menu
+          v-model="pickerMenu"
+          :close-on-content-click="false"
+          transition="scale-transition"
+          offset-y
+          max-width="290px"
+          min-width="auto"
+        >
+          <template #activator="{ props }">
+            <v-text-field
+              v-model="newMealdateString"
+              :label="$t('general.date')"
+              :prepend-icon="$globals.icons.calendar"
+              v-bind="props"
+              readonly
+            />
+          </template>
+          <v-date-picker
+            v-model="newMealdate"
+            hide-header
+            :first-day-of-week="firstDayOfWeek"
+            :local="$i18n.locale"
+             @update:model-value="pickerMenu = false"
+          />
+        </v-menu>
+        <v-select
+          v-model="newMealType"
+          :return-object="false"
+          :items="planTypeOptions"
+          :label="$t('recipe.entry-type')"
+          item-title="text"
+          item-value="value"
+        />
+      </v-card-text>
+    </BaseDialog>
+    <RecipeDialogAddToShoppingList
+      v-if="shoppingLists && recipeRefWithScale"
+      v-model="shoppingListDialog"
+      :recipes="[recipeRefWithScale]"
+      :shopping-lists="shoppingLists"
+    />
+    <v-menu
+      offset-y
+      start
+      :bottom="!menuTop"
+      :nudge-bottom="!menuTop ? '5' : '0'"
+      :top="menuTop"
+      :nudge-top="menuTop ? '5' : '0'"
+      allow-overflow
+      close-delay="125"
+      :open-on-hover="$vuetify.display.mdAndUp"
+      content-class="d-print-none"
+    >
+      <template #activator="{ props }">
+        <v-btn
+          icon
+          :variant="fab ? 'flat' : undefined"
+          :rounded="fab ? 'circle' : undefined"
+          :size="fab ? 'small' : undefined"
+          :color="fab ? 'info' : 'secondary'"
+          :fab="fab"
+          v-bind="props"
+          @click.prevent
+        >
+          <v-icon
+          :size="!fab ? undefined : 'x-large'"
+          :color="fab ? 'white' : 'secondary'"
+        >
+          {{ icon }}
+        </v-icon>
+        </v-btn>
+      </template>
+      <v-list density="compact">
+        <v-list-item v-for="(item, index) in menuItems" :key="index" @click="contextMenuEventHandler(item.event)">
+          <template #prepend>
+            <v-icon :color="item.color">
+              {{ item.icon }}
+            </v-icon>
+          </template>
+          <v-list-item-title>{{ item.title }}</v-list-item-title>
+        </v-list-item>
+        <div v-if="useItems.recipeActions && recipeActions && recipeActions.length">
+          <v-divider />
+          <v-list-group @click.stop>
+            <template #activator="{ props }">
+              <v-list-item-title v-bind="props">
+                {{ $t("recipe.recipe-actions") }}
+              </v-list-item-title>
+            </template>
+            <v-list density="compact" class="ma-0 pa-0">
+              <v-list-item
+                v-for="(action, index) in recipeActions"
+                :key="index"
+                class="pl-6"
+                @click="executeRecipeAction(action)"
+              >
+                <v-list-item-title>
+                  {{ action.title }}
+                </v-list-item-title>
+              </v-list-item>
+            </v-list>
+          </v-list-group>
+        </div>
+      </v-list>
+    </v-menu>
+  </div>
+</template>
+
+<script lang="ts">
+import RecipeDialogAddToShoppingList from "./RecipeDialogAddToShoppingList.vue";
+import RecipeDialogPrintPreferences from "./RecipeDialogPrintPreferences.vue";
+import RecipeDialogShare from "./RecipeDialogShare.vue";
+import { useLoggedInState } from "~/composables/use-logged-in-state";
+import { useUserApi } from "~/composables/api";
+import { useGroupRecipeActions } from "~/composables/use-group-recipe-actions";
+import { useHouseholdSelf } from "~/composables/use-households";
+import { alert } from "~/composables/use-toast";
+import { usePlanTypeOptions } from "~/composables/use-group-mealplan";
+import type { Recipe } from "~/lib/api/types/recipe";
+import type { GroupRecipeActionOut, ShoppingListSummary } from "~/lib/api/types/household";
+import type { PlanEntryType } from "~/lib/api/types/meal-plan";
+import { useDownloader } from "~/composables/api/use-downloader";
+
+export interface ContextMenuIncludes {
+  delete: boolean;
+  edit: boolean;
+  download: boolean;
+  duplicate: boolean;
+  mealplanner: boolean;
+  shoppingList: boolean;
+  print: boolean;
+  printPreferences: boolean;
+  share: boolean;
+  recipeActions: boolean;
+}
+
+export interface ContextMenuItem {
+  title: string;
+  icon: string;
+  color: string | undefined;
+  event: string;
+  isPublic: boolean;
+}
+
+export default defineNuxtComponent({
+  components: {
+    RecipeDialogAddToShoppingList,
+    RecipeDialogPrintPreferences,
+    RecipeDialogShare,
+  },
+  props: {
+    useItems: {
+      type: Object as () => ContextMenuIncludes,
+      default: () => ({
+        delete: true,
+        edit: true,
+        download: true,
+        duplicate: false,
+        mealplanner: true,
+        shoppingList: true,
+        print: true,
+        printPreferences: true,
+        share: true,
+        recipeActions: true,
+      }),
+    },
+    // Append items are added at the end of the useItems list
+    appendItems: {
+      type: Array as () => ContextMenuItem[],
+      default: () => [],
+    },
+    // Append items are added at the beginning of the useItems list
+    leadingItems: {
+      type: Array as () => ContextMenuItem[],
+      default: () => [],
+    },
+    menuTop: {
+      type: Boolean,
+      default: true,
+    },
+    fab: {
+      type: Boolean,
+      default: false,
+    },
+    color: {
+      type: String,
+      default: "primary",
+    },
+    slug: {
+      type: String,
+      required: true,
+    },
+    menuIcon: {
+      type: String,
+      default: null,
+    },
+    name: {
+      required: true,
+      type: String,
+    },
+    recipe: {
+      type: Object as () => Recipe,
+      default: undefined,
+    },
+    recipeId: {
+      required: true,
+      type: String,
+    },
+    recipeScale: {
+      type: Number,
+      default: 1,
+    },
+  },
+  emits: ["delete"],
+  setup(props, context) {
+    const api = useUserApi();
+
+    const state = reactive({
+      printPreferencesDialog: false,
+      shareDialog: false,
+      recipeDeleteDialog: false,
+      mealplannerDialog: false,
+      shoppingListDialog: false,
+      recipeDuplicateDialog: false,
+      recipeName: props.name,
+      loading: false,
+      menuItems: [] as ContextMenuItem[],
+      newMealdate: new Date(Date.now() - new Date().getTimezoneOffset() * 60000),
+      newMealType: "dinner" as PlanEntryType,
+      pickerMenu: false,
+    });
+
+    const newMealdateString = computed(() => {
+      return state.newMealdate.toISOString().substring(0, 10);
+    });
+
+    const i18n = useI18n();
+    const $auth = useMealieAuth();
+    const { $globals } = useNuxtApp();
+    const { household } = useHouseholdSelf();
+    const { isOwnGroup } = useLoggedInState();
+
+    const route = useRoute();
+    const groupSlug = computed(() => route.params.groupSlug || $auth.user.value?.groupSlug || "");
+
+    const firstDayOfWeek = computed(() => {
+      return household.value?.preferences?.firstDayOfWeek || 0;
+    });
+
+    // ===========================================================================
+    // Context Menu Setup
+
+    const defaultItems: { [key: string]: ContextMenuItem } = {
+      edit: {
+        title: i18n.t("general.edit"),
+        icon: $globals.icons.edit,
+        color: undefined,
+        event: "edit",
+        isPublic: false,
+      },
+      delete: {
+        title: i18n.t("general.delete"),
+        icon: $globals.icons.delete,
+        color: undefined,
+        event: "delete",
+        isPublic: false,
+      },
+      download: {
+        title: i18n.t("general.download"),
+        icon: $globals.icons.download,
+        color: undefined,
+        event: "download",
+        isPublic: false,
+      },
+      duplicate: {
+        title: i18n.t("general.duplicate"),
+        icon: $globals.icons.duplicate,
+        color: undefined,
+        event: "duplicate",
+        isPublic: false,
+      },
+      mealplanner: {
+        title: i18n.t("recipe.add-to-plan"),
+        icon: $globals.icons.calendar,
+        color: undefined,
+        event: "mealplanner",
+        isPublic: false,
+      },
+      shoppingList: {
+        title: i18n.t("recipe.add-to-list"),
+        icon: $globals.icons.cartCheck,
+        color: undefined,
+        event: "shoppingList",
+        isPublic: false,
+      },
+      print: {
+        title: i18n.t("general.print"),
+        icon: $globals.icons.printer,
+        color: undefined,
+        event: "print",
+        isPublic: true,
+      },
+      printPreferences: {
+        title: i18n.t("general.print-preferences"),
+        icon: $globals.icons.printerSettings,
+        color: undefined,
+        event: "printPreferences",
+        isPublic: true,
+      },
+      share: {
+        title: i18n.t("general.share"),
+        icon: $globals.icons.shareVariant,
+        color: undefined,
+        event: "share",
+        isPublic: false,
+      },
+    };
+
+    // Get Default Menu Items Specified in Props
+    for (const [key, value] of Object.entries(props.useItems)) {
+      if (value) {
+        const item = defaultItems[key];
+        if (item && (item.isPublic || isOwnGroup.value)) {
+          state.menuItems.push(item);
+        }
+      }
+    }
+
+    // Add leading and Appending Items
+    state.menuItems = [...state.menuItems, ...props.leadingItems, ...props.appendItems];
+
+    const icon = props.menuIcon || $globals.icons.dotsVertical;
+
+    // ===========================================================================
+    // Context Menu Event Handler
+
+    const shoppingLists = ref<ShoppingListSummary[]>();
+    const recipeRef = ref<Recipe | undefined>(props.recipe);
+    const recipeRefWithScale = computed(() =>
+      recipeRef.value ? { scale: props.recipeScale, ...recipeRef.value } : undefined,
+    );
+
+    async function getShoppingLists() {
+      const { data } = await api.shopping.lists.getAll(1, -1, { orderBy: "name", orderDirection: "asc" });
+      if (data) {
+        shoppingLists.value = data.items ?? [];
+      }
+    }
+
+    async function refreshRecipe() {
+      const { data } = await api.recipes.getOne(props.slug);
+      if (data) {
+        recipeRef.value = data;
+      }
+    }
+
+    const router = useRouter();
+    const groupRecipeActionsStore = useGroupRecipeActions();
+
+    async function executeRecipeAction(action: GroupRecipeActionOut) {
+      if (!props.recipe) return;
+      const response = await groupRecipeActionsStore.execute(action, props.recipe, props.recipeScale);
+
+      if (action.actionType === "post") {
+        if (!response?.error) {
+          alert.success(i18n.t("events.message-sent"));
+        }
+        else {
+          alert.error(i18n.t("events.something-went-wrong"));
+        }
+      }
+    }
+
+    async function deleteRecipe() {
+      const { data } = await api.recipes.deleteOne(props.slug);
+      if (data?.slug) {
+        router.push(`/g/${groupSlug.value}`);
+      }
+      context.emit("delete", props.slug);
+    }
+
+    const download = useDownloader();
+
+    async function handleDownloadEvent() {
+      const { data } = await api.recipes.getZipToken(props.slug);
+
+      if (data) {
+        download(api.recipes.getZipRedirectUrl(props.slug, data.token), `${props.slug}.zip`);
+      }
+    }
+
+    async function addRecipeToPlan() {
+      const { response } = await api.mealplans.createOne({
+        date: newMealdateString.value,
+        entryType: state.newMealType,
+        title: "",
+        text: "",
+        recipeId: props.recipeId,
+      });
+
+      if (response?.status === 201) {
+        alert.success(i18n.t("recipe.recipe-added-to-mealplan") as string);
+      }
+      else {
+        alert.error(i18n.t("recipe.failed-to-add-recipe-to-mealplan") as string);
+      }
+    }
+
+    async function duplicateRecipe() {
+      const { data } = await api.recipes.duplicateOne(props.slug, state.recipeName);
+      if (data && data.slug) {
+        router.push(`/g/${groupSlug.value}/r/${data.slug}`);
+      }
+    }
+
+    // Note: Print is handled as an event in the parent component
+    // eslint-disable-next-line @typescript-eslint/no-invalid-void-type
+    const eventHandlers: { [key: string]: () => void | Promise<any> } = {
+      delete: () => {
+        state.recipeDeleteDialog = true;
+      },
+      edit: () => router.push(`/g/${groupSlug.value}/r/${props.slug}` + "?edit=true"),
+      download: handleDownloadEvent,
+      duplicate: () => {
+        state.recipeDuplicateDialog = true;
+      },
+      mealplanner: () => {
+        state.mealplannerDialog = true;
+      },
+      printPreferences: async () => {
+        if (!recipeRef.value) {
+          await refreshRecipe();
+        }
+        state.printPreferencesDialog = true;
+      },
+      shoppingList: () => {
+        const promises: Promise<void>[] = [getShoppingLists()];
+        if (!recipeRef.value) {
+          promises.push(refreshRecipe());
+        }
+
+        Promise.allSettled(promises).then(() => {
+          state.shoppingListDialog = true;
+        });
+      },
+      share: () => {
+        state.shareDialog = true;
+      },
+    };
+
+    function contextMenuEventHandler(eventKey: string) {
+      const handler = eventHandlers[eventKey];
+
+      if (handler && typeof handler === "function") {
+        handler();
+        state.loading = false;
+        return;
+      }
+
+      context.emit(eventKey);
+      state.loading = false;
+    }
+
+    const planTypeOptions = usePlanTypeOptions();
+
+    return {
+      ...toRefs(state),
+      newMealdateString,
+      recipeRef,
+      recipeRefWithScale,
+      executeRecipeAction,
+      recipeActions: groupRecipeActionsStore.recipeActions,
+      shoppingLists,
+      duplicateRecipe,
+      contextMenuEventHandler,
+      deleteRecipe,
+      addRecipeToPlan,
+      icon,
+      planTypeOptions,
+      firstDayOfWeek,
+    };
+  },
+});
+</script>
--- a/frontend/components/Domain/Recipe/RecipeContextMenu/RecipeContextMenu.vue
+++ b/frontend/components/Domain/Recipe/RecipeContextMenu/RecipeContextMenu.vue
@@ -1,145 +0,0 @@
-<template>
-  <div class="text-center">
-    <v-menu
-      offset-y
-      start
-      :eager="isMenuContentLoaded"
-      :bottom="!menuTop"
-      :nudge-bottom="!menuTop ? '5' : '0'"
-      :top="menuTop"
-      :nudge-top="menuTop ? '5' : '0'"
-      allow-overflow
-      close-delay="125"
-      :open-on-hover="$vuetify.display.mdAndUp"
-      content-class="d-print-none"
-      @update:model-value="onMenuToggle"
-    >
-      <template #activator="{ props: activatorProps }">
-        <v-btn
-          icon
-          :variant="fab ? 'flat' : undefined"
-          :rounded="fab ? 'circle' : undefined"
-          :size="fab ? 'small' : undefined"
-          :color="fab ? 'info' : 'secondary'"
-          :fab="fab"
-          v-bind="activatorProps"
-          @click.prevent
-          @mouseenter="onHover"
-        >
-          <v-icon
-            :size="!fab ? undefined : 'x-large'"
-            :color="fab ? 'white' : 'secondary'"
-          >
-            {{ icon }}
-          </v-icon>
-        </v-btn>
-      </template>
-
-      <RecipeContextMenuContent
-        v-if="isMenuContentLoaded"
-        v-bind="contentProps"
-        @print="$emit('print')"
-        @deleted="$emit('deleted', $event)"
-      />
-    </v-menu>
-  </div>
-</template>
-
-<script setup lang="ts">
-import type { Recipe } from "~/lib/api/types/recipe";
-
-interface ContextMenuIncludes {
-  delete?: boolean;
-  edit?: boolean;
-  download?: boolean;
-  duplicate?: boolean;
-  mealplanner?: boolean;
-  shoppingList?: boolean;
-  print?: boolean;
-  printPreferences?: boolean;
-  share?: boolean;
-  recipeActions?: boolean;
-}
-
-interface ContextMenuItem {
-  title: string;
-  icon: string;
-  color?: string;
-  event: string;
-  isPublic: boolean;
-}
-
-interface Props {
-  useItems?: ContextMenuIncludes;
-  appendItems?: ContextMenuItem[];
-  leadingItems?: ContextMenuItem[];
-  menuTop?: boolean;
-  fab?: boolean;
-  color?: string;
-  slug: string;
-  menuIcon?: string | null;
-  name: string;
-  recipe?: Recipe;
-  recipeId: string;
-  recipeScale?: number;
-}
-
-const props = withDefaults(defineProps<Props>(), {
-  useItems: () => ({
-    delete: true,
-    edit: true,
-    download: true,
-    duplicate: false,
-    mealplanner: true,
-    shoppingList: true,
-    print: true,
-    printPreferences: true,
-    share: true,
-    recipeActions: true,
-  }),
-  appendItems: () => [],
-  leadingItems: () => [],
-  menuTop: true,
-  fab: false,
-  color: "primary",
-  menuIcon: null,
-  recipe: undefined,
-  recipeScale: 1,
-});
-
-defineEmits<{
-  [key: string]: any;
-  print: [];
-  deleted: [slug: string];
-}>();
-
-const { $globals } = useNuxtApp();
-
-const isMenuContentLoaded = ref(false);
-
-const icon = computed(() => {
-  return props.menuIcon || $globals.icons.dotsVertical;
-});
-
-// Props to pass to the content component (excluding internal wrapper props)
-const contentProps = computed(() => {
-  const { ...rest } = props;
-  return rest;
-});
-
-function onHover() {
-  if (!isMenuContentLoaded.value) {
-    isMenuContentLoaded.value = true;
-  }
-}
-
-function onMenuToggle(isOpen: boolean) {
-  if (isOpen && !isMenuContentLoaded.value) {
-    isMenuContentLoaded.value = true;
-  }
-}
-
-const RecipeContextMenuContent = defineAsyncComponent(
-  () => import("./RecipeContextMenuContent.vue"),
-);
-</script>
--- a/frontend/components/Domain/Recipe/RecipeContextMenu/RecipeContextMenuContent.vue
+++ b/frontend/components/Domain/Recipe/RecipeContextMenu/RecipeContextMenuContent.vue
@@ -1,461 +0,0 @@
-<template>
-  <RecipeDialogShare v-model="shareDialog" :recipe-id="recipeId" :name="name" />
-  <RecipeDialogPrintPreferences v-model="printPreferencesDialog" :recipe="recipeRef" />
-  <BaseDialog
-    v-model="recipeDeleteDialog"
-    :title="$t('recipe.delete-recipe')"
-    color="error"
-    :icon="$globals.icons.alertCircle"
-    can-confirm
-    @confirm="deleteRecipe()"
-  >
-    <v-card-text>
-      <template v-if="isAdminAndNotOwner">
-        {{ $t("recipe.admin-delete-confirmation") }}
-      </template>
-      <template v-else>
-        {{ $t("recipe.delete-confirmation") }}
-      </template>
-    </v-card-text>
-  </BaseDialog>
-  <BaseDialog
-    v-model="recipeDuplicateDialog"
-    :title="$t('recipe.duplicate')"
-    color="primary"
-    :icon="$globals.icons.duplicate"
-    can-confirm
-    @confirm="duplicateRecipe()"
-  >
-    <v-card-text>
-      <v-text-field
-        v-model="recipeName"
-        density="compact"
-        :label="$t('recipe.recipe-name')"
-        autofocus
-        @keyup.enter="duplicateRecipe()"
-      />
-    </v-card-text>
-  </BaseDialog>
-  <BaseDialog
-    v-model="mealplannerDialog"
-    :title="$t('recipe.add-recipe-to-mealplan')"
-    color="primary"
-    :icon="$globals.icons.calendar"
-    can-confirm
-    @confirm="addRecipeToPlan()"
-  >
-    <v-card-text>
-      <v-menu
-        v-model="pickerMenu"
-        :close-on-content-click="false"
-        transition="scale-transition"
-        offset-y
-        max-width="290px"
-        min-width="auto"
-      >
-        <template #activator="{ props: activatorProps }">
-          <v-text-field
-            v-model="newMealdateString"
-            :label="$t('general.date')"
-            :prepend-icon="$globals.icons.calendar"
-            v-bind="activatorProps"
-            readonly
-          />
-        </template>
-        <v-date-picker
-          v-model="newMealdate"
-          hide-header
-          :first-day-of-week="firstDayOfWeek"
-          :local="$i18n.locale"
-          @update:model-value="pickerMenu = false"
-        />
-      </v-menu>
-      <v-select
-        v-model="newMealType"
-        :return-object="false"
-        :items="planTypeOptions"
-        :label="$t('recipe.entry-type')"
-        item-title="text"
-        item-value="value"
-      />
-    </v-card-text>
-  </BaseDialog>
-  <RecipeDialogAddToShoppingList
-    v-if="shoppingLists && recipeRefWithScale"
-    v-model="shoppingListDialog"
-    :recipes="[recipeRefWithScale]"
-    :shopping-lists="shoppingLists"
-  />
-
-  <v-list density="compact">
-    <v-list-item v-for="(item, index) in menuItems" :key="index" @click="contextMenuEventHandler(item.event)">
-      <template #prepend>
-        <v-icon :color="item.color">
-          {{ item.icon }}
-        </v-icon>
-      </template>
-      <v-list-item-title>{{ item.title }}</v-list-item-title>
-    </v-list-item>
-    <div v-if="useItems.recipeActions && recipeActions && recipeActions.length">
-      <v-divider />
-      <v-list-item
-        v-for="(action, index) in recipeActions"
-        :key="index"
-        @click="executeRecipeAction(action)"
-      >
-        <template #prepend>
-          <v-icon color="undefined">
-            {{ $globals.icons.linkVariantPlus }}
-          </v-icon>
-        </template>
-        <v-list-item-title>
-          {{ action.title }}
-        </v-list-item-title>
-      </v-list-item>
-    </div>
-  </v-list>
-</template>
-
-<script setup lang="ts">
-import RecipeDialogAddToShoppingList from "~/components/Domain/Recipe/RecipeDialogAddToShoppingList.vue";
-import RecipeDialogPrintPreferences from "~/components/Domain/Recipe/RecipeDialogPrintPreferences.vue";
-import RecipeDialogShare from "~/components/Domain/Recipe/RecipeDialogShare.vue";
-import { useLoggedInState } from "~/composables/use-logged-in-state";
-import { useUserApi } from "~/composables/api";
-import { useGroupRecipeActions } from "~/composables/use-group-recipe-actions";
-import { useHouseholdSelf } from "~/composables/use-households";
-import { alert } from "~/composables/use-toast";
-import { usePlanTypeOptions } from "~/composables/use-group-mealplan";
-import type { Recipe } from "~/lib/api/types/recipe";
-import type { GroupRecipeActionOut, ShoppingListSummary } from "~/lib/api/types/household";
-import type { PlanEntryType } from "~/lib/api/types/meal-plan";
-import { useDownloader } from "~/composables/api/use-downloader";
-
-export interface ContextMenuIncludes {
-  delete: boolean;
-  edit: boolean;
-  download: boolean;
-  duplicate: boolean;
-  mealplanner: boolean;
-  shoppingList: boolean;
-  print: boolean;
-  printPreferences: boolean;
-  share: boolean;
-  recipeActions: boolean;
-}
-
-export interface ContextMenuItem {
-  title: string;
-  icon: string;
-  color: string | undefined;
-  event: string;
-  isPublic: boolean;
-}
-
-interface Props {
-  useItems?: ContextMenuIncludes;
-  appendItems?: ContextMenuItem[];
-  leadingItems?: ContextMenuItem[];
-  menuTop?: boolean;
-  fab?: boolean;
-  color?: string;
-  slug: string;
-  menuIcon?: string | null;
-  name: string;
-  recipe?: Recipe;
-  recipeId: string;
-  recipeScale?: number;
-}
-const props = withDefaults(defineProps<Props>(), {
-  useItems: () => ({
-    delete: true,
-    edit: true,
-    download: true,
-    duplicate: false,
-    mealplanner: true,
-    shoppingList: true,
-    print: true,
-    printPreferences: true,
-    share: true,
-    recipeActions: true,
-  }),
-  appendItems: () => [],
-  leadingItems: () => [],
-  menuTop: true,
-  fab: false,
-  color: "primary",
-  menuIcon: null,
-  recipe: undefined,
-  recipeScale: 1,
-});
-
-const emit = defineEmits<{
-  [key: string]: any;
-  deleted: [slug: string];
-}>();
-
-const api = useUserApi();
-
-const printPreferencesDialog = ref(false);
-const shareDialog = ref(false);
-const recipeDeleteDialog = ref(false);
-const mealplannerDialog = ref(false);
-const shoppingListDialog = ref(false);
-const recipeDuplicateDialog = ref(false);
-const recipeName = ref(props.name);
-const loading = ref(false);
-const menuItems = ref<ContextMenuItem[]>([]);
-const newMealdate = ref(new Date());
-const newMealType = ref<PlanEntryType>("dinner");
-const pickerMenu = ref(false);
-
-const newMealdateString = computed(() => {
-  // Format the date to YYYY-MM-DD in the same timezone as newMealdate
-  const year = newMealdate.value.getFullYear();
-  const month = String(newMealdate.value.getMonth() + 1).padStart(2, "0");
-  const day = String(newMealdate.value.getDate()).padStart(2, "0");
-  return `${year}-${month}-${day}`;
-});
-
-const i18n = useI18n();
-const $auth = useMealieAuth();
-const { $globals } = useNuxtApp();
-const { household } = useHouseholdSelf();
-const { isOwnGroup } = useLoggedInState();
-
-const route = useRoute();
-const groupSlug = computed(() => route.params.groupSlug || $auth.user.value?.groupSlug || "");
-
-const firstDayOfWeek = computed(() => {
-  return household.value?.preferences?.firstDayOfWeek || 0;
-});
-
-// ===========================================================================
-// Context Menu Setup
-
-const defaultItems: { [key: string]: ContextMenuItem } = {
-  edit: {
-    title: i18n.t("general.edit"),
-    icon: $globals.icons.edit,
-    color: undefined,
-    event: "edit",
-    isPublic: false,
-  },
-  delete: {
-    title: i18n.t("general.delete"),
-    icon: $globals.icons.delete,
-    color: undefined,
-    event: "delete",
-    isPublic: false,
-  },
-  download: {
-    title: i18n.t("general.download"),
-    icon: $globals.icons.download,
-    color: undefined,
-    event: "download",
-    isPublic: false,
-  },
-  duplicate: {
-    title: i18n.t("general.duplicate"),
-    icon: $globals.icons.duplicate,
-    color: undefined,
-    event: "duplicate",
-    isPublic: false,
-  },
-  mealplanner: {
-    title: i18n.t("recipe.add-to-plan"),
-    icon: $globals.icons.calendar,
-    color: undefined,
-    event: "mealplanner",
-    isPublic: false,
-  },
-  shoppingList: {
-    title: i18n.t("recipe.add-to-list"),
-    icon: $globals.icons.cartCheck,
-    color: undefined,
-    event: "shoppingList",
-    isPublic: false,
-  },
-  print: {
-    title: i18n.t("general.print"),
-    icon: $globals.icons.printer,
-    color: undefined,
-    event: "print",
-    isPublic: true,
-  },
-  printPreferences: {
-    title: i18n.t("general.print-preferences"),
-    icon: $globals.icons.printerSettings,
-    color: undefined,
-    event: "printPreferences",
-    isPublic: true,
-  },
-  share: {
-    title: i18n.t("general.share"),
-    icon: $globals.icons.shareVariant,
-    color: undefined,
-    event: "share",
-    isPublic: false,
-  },
-};
-
-// Add leading and Appending Items
-menuItems.value = [...menuItems.value, ...props.leadingItems, ...props.appendItems];
-
-// ===========================================================================
-// Context Menu Event Handler
-
-const shoppingLists = ref<ShoppingListSummary[]>();
-const recipeRef = ref<Recipe | undefined>(props.recipe);
-const recipeRefWithScale = computed(() =>
-  recipeRef.value ? { scale: props.recipeScale, ...recipeRef.value } : undefined,
-);
-const isAdminAndNotOwner = computed(() => {
-  return (
-    $auth.user.value?.admin
-    && $auth.user.value?.id !== recipeRef.value?.userId
-  );
-});
-const canDelete = computed(() => {
-  const user = $auth.user.value;
-  const recipe = recipeRef.value;
-  return user && recipe && (user.admin || user.id === recipe.userId);
-});
-
-// Get Default Menu Items Specified in Props
-for (const [key, value] of Object.entries(props.useItems)) {
-  if (!value) continue;
-
-  // Skip delete if not allowed
-  if (key === "delete" && !canDelete.value) continue;
-
-  const item = defaultItems[key];
-  if (item && (item.isPublic || isOwnGroup.value)) {
-    menuItems.value.push(item);
-  }
-}
-
-async function getShoppingLists() {
-  const { data } = await api.shopping.lists.getAll(1, -1, { orderBy: "name", orderDirection: "asc" });
-  if (data) {
-    shoppingLists.value = data.items ?? [];
-  }
-}
-
-async function refreshRecipe() {
-  const { data } = await api.recipes.getOne(props.slug);
-  if (data) {
-    recipeRef.value = data;
-  }
-}
-
-const router = useRouter();
-const groupRecipeActionsStore = useGroupRecipeActions();
-
-async function executeRecipeAction(action: GroupRecipeActionOut) {
-  if (!props.recipe) return;
-  const response = await groupRecipeActionsStore.execute(action, props.recipe, props.recipeScale);
-
-  if (action.actionType === "post") {
-    if (!response?.error) {
-      alert.success(i18n.t("events.message-sent"));
-    }
-    else {
-      alert.error(i18n.t("events.something-went-wrong"));
-    }
-  }
-}
-
-async function deleteRecipe() {
-  const { data } = await api.recipes.deleteOne(props.slug);
-  if (data?.slug) {
-    router.push(`/g/${groupSlug.value}`);
-  }
-  emit("deleted", props.slug);
-}
-
-const download = useDownloader();
-
-async function handleDownloadEvent() {
-  const { data } = await api.recipes.getZipToken(props.slug);
-
-  if (data) {
-    download(api.recipes.getZipRedirectUrl(props.slug, data.token), `${props.slug}.zip`);
-  }
-}
-
-async function addRecipeToPlan() {
-  const { response } = await api.mealplans.createOne({
-    date: newMealdateString.value,
-    entryType: newMealType.value,
-    title: "",
-    text: "",
-    recipeId: props.recipeId,
-  });
-
-  if (response?.status === 201) {
-    alert.success(i18n.t("recipe.recipe-added-to-mealplan") as string);
-  }
-  else {
-    alert.error(i18n.t("recipe.failed-to-add-recipe-to-mealplan") as string);
-  }
-}
-
-async function duplicateRecipe() {
-  const { data } = await api.recipes.duplicateOne(props.slug, recipeName.value);
-  if (data && data.slug) {
-    router.push(`/g/${groupSlug.value}/r/${data.slug}`);
-  }
-}
-
-// Note: Print is handled as an event in the parent component
-// eslint-disable-next-line @typescript-eslint/no-invalid-void-type
-const eventHandlers: { [key: string]: () => void | Promise<any> } = {
-  delete: () => {
-    recipeDeleteDialog.value = true;
-  },
-  edit: () => router.push(`/g/${groupSlug.value}/r/${props.slug}` + "?edit=true"),
-  download: handleDownloadEvent,
-  duplicate: () => {
-    recipeDuplicateDialog.value = true;
-  },
-  mealplanner: () => {
-    mealplannerDialog.value = true;
-  },
-  printPreferences: async () => {
-    if (!recipeRef.value) {
-      await refreshRecipe();
-    }
-    printPreferencesDialog.value = true;
-  },
-  shoppingList: () => {
-    const promises: Promise<void>[] = [getShoppingLists()];
-    if (!recipeRef.value) {
-      promises.push(refreshRecipe());
-    }
-
-    Promise.allSettled(promises).then(() => {
-      shoppingListDialog.value = true;
-    });
-  },
-  share: () => {
-    shareDialog.value = true;
-  },
-};
-
-function contextMenuEventHandler(eventKey: string) {
-  const handler = eventHandlers[eventKey];
-
-  if (handler && typeof handler === "function") {
-    handler();
-    loading.value = false;
-    return;
-  }
-
-  emit(eventKey);
-  loading.value = false;
-}
-
-const planTypeOptions = usePlanTypeOptions();
-const recipeActions = groupRecipeActionsStore.recipeActions;
-</script>
--- a/frontend/components/Domain/Recipe/RecipeDataAliasManagerDialog.vue
+++ b/frontend/components/Domain/Recipe/RecipeDataAliasManagerDialog.vue
@@ -1,15 +1,8 @@
 <template>
  <div>
-    <BaseDialog
-      v-model="dialog"
-      :title="$t('data-pages.manage-aliases')"
-      :icon="$globals.icons.edit"
-      :submit-icon="$globals.icons.check"
-      :submit-text="$t('general.confirm')"
-      can-submit
-      @submit="saveAliases"
-      @cancel="$emit('cancel')"
-    >
+    <BaseDialog v-model="dialog" :title="$t('data-pages.manage-aliases')" :icon="$globals.icons.edit"
+      :submit-icon="$globals.icons.check" :submit-text="$t('general.confirm')" can-submit @submit="saveAliases"
+      @cancel="$emit('cancel')">
      <v-card-text>
        <v-container>
          <v-row v-for="alias, i in aliases" :key="i">
@@ -17,16 +10,13 @@
              <v-text-field v-model="alias.name" :label="$t('general.name')" :rules="[validators.required]" />
            </v-col>
            <v-col cols="2">
-              <BaseButtonGroup
-                :buttons="[
-                  {
-                    icon: $globals.icons.delete,
-                    text: $t('general.delete'),
-                    event: 'delete',
-                  },
-                ]"
-                @delete="deleteAlias(i)"
-              />
+              <BaseButtonGroup :buttons="[
+                {
+                  icon: $globals.icons.delete,
+                  text: $t('general.delete'),
+                  event: 'delete',
+                },
+              ]" @delete="deleteAlias(i)" />
            </v-col>
          </v-row>
        </v-container>
@@ -43,7 +33,7 @@
  </div>
 </template>

-<script setup lang="ts">
+<script lang="ts">
 import { whenever } from "@vueuse/core";
 import { validators } from "~/composables/use-validators";
 import type { IngredientFood, IngredientUnit } from "~/lib/api/types/recipe";
@@ -52,66 +42,86 @@ export interface GenericAlias {
  name: string;
 }

-interface Props {
-  data: IngredientFood | IngredientUnit;
-}
-
-const props = defineProps<Props>();
-
-const emit = defineEmits<{
-  submit: [aliases: GenericAlias[]];
-  cancel: [];
-}>();
-
-// V-Model Support
-const dialog = defineModel<boolean>({ default: false });
-
-function createAlias() {
-  aliases.value.push({
-    name: "",
-  });
-}
-
-function deleteAlias(index: number) {
-  aliases.value.splice(index, 1);
-}
-
-const aliases = ref<GenericAlias[]>(props.data.aliases || []);
-function initAliases() {
-  aliases.value = [...props.data.aliases || []];
-  if (!aliases.value.length) {
-    createAlias();
-  }
-}
-
-initAliases();
-whenever(
-  () => dialog.value,
-  () => {
-    initAliases();
+export default defineNuxtComponent({
+  props: {
+    modelValue: {
+      type: Boolean,
+      default: false,
+    },
+    data: {
+      type: Object as () => IngredientFood | IngredientUnit,
+      required: true,
+    },
  },
-);
+  emits: ["submit", "update:modelValue", "cancel"],
+  setup(props, context) {
+    // V-Model Support
+    const dialog = computed({
+      get: () => {
+        return props.modelValue;
+      },
+      set: (val) => {
+        context.emit("update:modelValue", val);
+      },
+    });

-function saveAliases() {
-  const seenAliasNames: string[] = [];
-  const keepAliases: GenericAlias[] = [];
-  aliases.value.forEach((alias) => {
-    if (
-      !alias.name
-      || alias.name === props.data.name
-      || alias.name === props.data.pluralName
-      || alias.name === props.data.abbreviation
-      || alias.name === props.data.pluralAbbreviation
-      || seenAliasNames.includes(alias.name)
-    ) {
-      return;
+    function createAlias() {
+      aliases.value.push({
+        name: "",
+      });
    }

-    keepAliases.push(alias);
-    seenAliasNames.push(alias.name);
-  });
+    function deleteAlias(index: number) {
+      aliases.value.splice(index, 1);
+    }

-  aliases.value = keepAliases;
-  emit("submit", keepAliases);
-}
+    const aliases = ref<GenericAlias[]>(props.data.aliases || []);
+    function initAliases() {
+      aliases.value = [...props.data.aliases || []];
+      if (!aliases.value.length) {
+        createAlias();
+      }
+    }
+
+    initAliases();
+    whenever(
+      () => props.modelValue,
+      () => {
+        initAliases();
+      },
+    );
+
+    function saveAliases() {
+      const seenAliasNames: string[] = [];
+      const keepAliases: GenericAlias[] = [];
+      aliases.value.forEach((alias) => {
+        if (
+          !alias.name
+          || alias.name === props.data.name
+          || alias.name === props.data.pluralName
+          || alias.name === props.data.abbreviation
+          || alias.name === props.data.pluralAbbreviation
+          || seenAliasNames.includes(alias.name)
+        ) {
+          return;
+        }
+
+        keepAliases.push(alias);
+        seenAliasNames.push(alias.name);
+      });
+
+      aliases.value = keepAliases;
+      context.emit("submit", keepAliases);
+    }
+
+    return {
+      aliases,
+      createAlias,
+      dialog,
+      deleteAlias,
+      saveAliases,
+      validators,
+    };
+  },
+});
 </script>
--- a/frontend/components/Domain/Recipe/RecipeDataTable.vue
+++ b/frontend/components/Domain/Recipe/RecipeDataTable.vue
@@ -3,13 +3,12 @@
    v-model="selected"
    item-key="id"
    show-select
-    :sort-by="sortBy"
+    :sort-by="[{ key: 'dateAdded', order: 'desc' }]"
    :headers="headers"
    :items="recipes"
    :items-per-page="15"
    class="elevation-0"
    :loading="loading"
-    return-object
  >
    <template #[`item.name`]="{ item }">
      <a
@@ -62,7 +61,7 @@
  </v-data-table>
 </template>

-<script setup lang="ts">
+<script lang="ts">
 import UserAvatar from "../User/UserAvatar.vue";
 import RecipeChip from "./RecipeChips.vue";
 import type { Recipe, RecipeCategory, RecipeTool } from "~/lib/api/types/recipe";
@@ -70,6 +69,8 @@ import { useUserApi } from "~/composables/api";
 import type { UserSummary } from "~/lib/api/types/user";
 import type { RecipeTag } from "~/lib/api/types/household";

+const INPUT_EVENT = "update:modelValue";
+
 interface ShowHeaders {
  id: boolean;
  owner: boolean;
@@ -82,114 +83,136 @@ interface ShowHeaders {
  dateAdded: boolean;
 }

-interface Props {
-  loading?: boolean;
-  recipes?: Recipe[];
-  showHeaders?: ShowHeaders;
-}
-const props = withDefaults(defineProps<Props>(), {
-  loading: false,
-  recipes: () => [],
-  showHeaders: () => ({
-    id: true,
-    owner: false,
-    tags: true,
-    categories: true,
-    tools: true,
-    recipeServings: true,
-    recipeYieldQuantity: true,
-    recipeYield: true,
-    dateAdded: true,
-  }),
+export default defineNuxtComponent({
+  components: { RecipeChip, UserAvatar },
+  props: {
+    modelValue: {
+      type: Array as PropType<Recipe[]>,
+      required: false,
+      default: () => [],
+    },
+    loading: {
+      type: Boolean,
+      required: false,
+      default: false,
+    },
+    recipes: {
+      type: Array as () => Recipe[],
+      default: () => [],
+    },
+    showHeaders: {
+      type: Object as () => ShowHeaders,
+      required: false,
+      default: () => {
+        return {
+          id: true,
+          owner: false,
+          tags: true,
+          categories: true,
+          recipeServings: true,
+          recipeYieldQuantity: true,
+          recipeYield: true,
+          dateAdded: true,
+        };
+      },
+    },
+  },
+  emits: ["click"],
+  setup(props, context) {
+    const i18n = useI18n();
+    const $auth = useMealieAuth();
+    const groupSlug = $auth.user.value?.groupSlug;
+    const router = useRouter();
+    const selected = computed({
+      get: () => props.modelValue,
+      set: value => context.emit(INPUT_EVENT, value),
+    });
+
+    const headers = computed(() => {
+      const hdrs: Array<{ title: string; value: string; align?: string; sortable?: boolean }> = [];
+
+      if (props.showHeaders.id) {
+        hdrs.push({ title: i18n.t("general.id"), value: "id" });
+      }
+      if (props.showHeaders.owner) {
+        hdrs.push({ title: i18n.t("general.owner"), value: "userId", align: "center", sortable: true });
+      }
+      hdrs.push({ title: i18n.t("general.name"), value: "name", sortable: true });
+      if (props.showHeaders.categories) {
+        hdrs.push({ title: i18n.t("recipe.categories"), value: "recipeCategory", sortable: true });
+      }
+
+      if (props.showHeaders.tags) {
+        hdrs.push({ title: i18n.t("tag.tags"), value: "tags", sortable: true });
+      }
+      if (props.showHeaders.tools) {
+        hdrs.push({ title: i18n.t("tool.tools"), value: "tools", sortable: true });
+      }
+      if (props.showHeaders.recipeServings) {
+        hdrs.push({ title: i18n.t("recipe.servings"), value: "recipeServings", sortable: true });
+      }
+      if (props.showHeaders.recipeYieldQuantity) {
+        hdrs.push({ title: i18n.t("recipe.yield"), value: "recipeYieldQuantity", sortable: true });
+      }
+      if (props.showHeaders.recipeYield) {
+        hdrs.push({ title: i18n.t("recipe.yield-text"), value: "recipeYield", sortable: true });
+      }
+      if (props.showHeaders.dateAdded) {
+        hdrs.push({ title: i18n.t("general.date-added"), value: "dateAdded", sortable: true });
+      }
+
+      return hdrs;
+    });
+
+    function formatDate(date: string) {
+      try {
+        return i18n.d(Date.parse(date), "medium");
+      }
+      catch {
+        return "";
+      }
+    }
+
+    // ============
+    // Group Members
+    const api = useUserApi();
+    const members = ref<UserSummary[]>([]);
+
+    async function refreshMembers() {
+      const { data } = await api.groups.fetchMembers();
+      if (data) {
+        members.value = data.items;
+      }
+    }
+
+    function filterItems(item: RecipeTag | RecipeCategory | RecipeTool, itemType: string) {
+      if (!groupSlug || !item.id) {
+        return;
+      }
+      router.push(`/g/${groupSlug}?${itemType}=${item.id}`);
+    }
+
+    onMounted(() => {
+      refreshMembers();
+    });
+
+    function getMember(id: string) {
+      if (members.value[0]) {
+        return members.value.find(m => m.id === id)?.fullName;
+      }
+
+      return i18n.t("general.none");
+    }
+
+    return {
+      selected,
+      groupSlug,
+      headers,
+      formatDate,
+      members,
+      getMember,
+      filterItems,
+    };
+  },
 });
-
-defineEmits<{
-  click: [];
-}>();
-
-const selected = defineModel<Recipe[]>({ default: () => [] });
-
-const i18n = useI18n();
-const $auth = useMealieAuth();
-const groupSlug = $auth.user.value?.groupSlug;
-const router = useRouter();
-
-// Initialize sort state with default sorting by dateAdded descending
-const sortBy = ref([{ key: "dateAdded", order: "desc" as const }]);
-
-const headers = computed(() => {
-  const hdrs: Array<{ title: string; value: string; align?: "center" | "start" | "end"; sortable?: boolean }> = [];
-
-  if (props.showHeaders.id) {
-    hdrs.push({ title: i18n.t("general.id"), value: "id" });
-  }
-  if (props.showHeaders.owner) {
-    hdrs.push({ title: i18n.t("general.owner"), value: "userId", align: "center", sortable: true });
-  }
-  hdrs.push({ title: i18n.t("general.name"), value: "name", sortable: true });
-  if (props.showHeaders.categories) {
-    hdrs.push({ title: i18n.t("recipe.categories"), value: "recipeCategory", sortable: true });
-  }
-
-  if (props.showHeaders.tags) {
-    hdrs.push({ title: i18n.t("tag.tags"), value: "tags", sortable: true });
-  }
-  if (props.showHeaders.tools) {
-    hdrs.push({ title: i18n.t("tool.tools"), value: "tools", sortable: true });
-  }
-  if (props.showHeaders.recipeServings) {
-    hdrs.push({ title: i18n.t("recipe.servings"), value: "recipeServings", sortable: true });
-  }
-  if (props.showHeaders.recipeYieldQuantity) {
-    hdrs.push({ title: i18n.t("recipe.yield"), value: "recipeYieldQuantity", sortable: true });
-  }
-  if (props.showHeaders.recipeYield) {
-    hdrs.push({ title: i18n.t("recipe.yield-text"), value: "recipeYield", sortable: true });
-  }
-  if (props.showHeaders.dateAdded) {
-    hdrs.push({ title: i18n.t("general.date-added"), value: "dateAdded", sortable: true });
-  }
-
-  return hdrs;
-});
-
-function formatDate(date: string) {
-  try {
-    return i18n.d(Date.parse(date), "medium");
-  }
-  catch {
-    return "";
-  }
-}
-
-// ============
-// Group Members
-const api = useUserApi();
-const members = ref<UserSummary[]>([]);
-
-async function refreshMembers() {
-  const { data } = await api.groups.fetchMembers();
-  if (data) {
-    members.value = data.items;
-  }
-}
-
-function filterItems(item: RecipeTag | RecipeCategory | RecipeTool, itemType: string) {
-  if (!groupSlug || !item.id) {
-    return;
-  }
-  router.push(`/g/${groupSlug}?${itemType}=${item.id}`);
-}
-
-onMounted(() => {
-  refreshMembers();
-});
-
-function getMember(id: string) {
-  if (members.value[0]) {
-    return members.value.find(m => m.id === id)?.fullName;
-  }
-
-  return i18n.t("general.none");
-}
 </script>
--- a/frontend/components/Domain/Recipe/RecipeDialogAddToShoppingList.vue
+++ b/frontend/components/Domain/Recipe/RecipeDialogAddToShoppingList.vue
@@ -51,7 +51,7 @@
    <BaseDialog
      v-if="shoppingListIngredientDialog"
      v-model="dialog"
-      :title="selectedShoppingList?.name || $t('recipe.add-to-list')"
+      :title="selectedShoppingList ? selectedShoppingList.name : $t('recipe.add-to-list')"
      :icon="$globals.icons.cartCheck"
      width="70%"
      :submit-text="$t('recipe.add-to-list')"
@@ -130,23 +130,20 @@
                      .ingredients[i]
                      .checked"
                >
-                  <v-container class="pa-0 ma-0">
-                    <v-row no-gutters>
-                      <v-checkbox
-                        hide-details
-                        :model-value="ingredientData.checked"
-                        class="pt-0 my-auto py-auto mr-2"
-                        color="secondary"
-                        density="compact"
-                      />
-                      <div :key="`${ingredientData.ingredient.quantity || 'no-qty'}-${i}`" class="pa-auto my-auto">
-                        <RecipeIngredientListItem
-                          :ingredient="ingredientData.ingredient"
-                          :scale="recipeSection.recipeScale"
-                        />
-                      </div>
-                    </v-row>
-                  </v-container>
+                  <v-checkbox
+                    hide-details
+                    :model-value="ingredientData.checked"
+                    class="pt-0 my-auto py-auto"
+                    color="secondary"
+                    density="compact"
+                  />
+                  <div :key="ingredientData.ingredient.quantity">
+                    <RecipeIngredientListItem
+                      :ingredient="ingredientData.ingredient"
+                      :disable-amount="ingredientData.disableAmount"
+                      :scale="recipeSection.recipeScale"
+                    />
+                  </div>
                </v-list-item>
              </div>
            </div>
@@ -175,7 +172,7 @@
  </div>
 </template>

-<script setup lang="ts">
+<script lang="ts">
 import { toRefs } from "@vueuse/core";
 import RecipeIngredientListItem from "./RecipeIngredientListItem.vue";
 import { useUserApi } from "~/composables/api";
@@ -191,6 +188,7 @@ export interface RecipeWithScale extends Recipe {
 export interface ShoppingListIngredient {
  checked: boolean;
  ingredient: RecipeIngredient;
+  disableAmount: boolean;
 }

 export interface ShoppingListIngredientSection {
@@ -205,214 +203,240 @@ export interface ShoppingListRecipeIngredientSection {
  ingredientSections: ShoppingListIngredientSection[];
 }

-interface Props {
-  recipes?: RecipeWithScale[];
-  shoppingLists?: ShoppingListSummary[];
-}
-const props = withDefaults(defineProps<Props>(), {
-  recipes: undefined,
-  shoppingLists: () => [],
-});
-
-const dialog = defineModel<boolean>({ default: false });
-
-const i18n = useI18n();
-const $auth = useMealieAuth();
-const api = useUserApi();
-const preferences = useShoppingListPreferences();
-const ready = ref(false);
-
-const state = reactive({
-  shoppingListDialog: true,
-  shoppingListIngredientDialog: false,
-  shoppingListShowAllToggled: false,
-});
-
-const { shoppingListDialog, shoppingListIngredientDialog, shoppingListShowAllToggled: _shoppingListShowAllToggled } = toRefs(state);
-
-const userHousehold = computed(() => {
-  return $auth.user.value?.householdSlug || "";
-});
-
-const shoppingListChoices = computed(() => {
-  return props.shoppingLists.filter(list => preferences.value.viewAllLists || list.userId === $auth.user.value?.id);
-});
-
-const recipeIngredientSections = ref<ShoppingListRecipeIngredientSection[]>([]);
-const selectedShoppingList = ref<ShoppingListSummary | null>(null);
-
-watchEffect(
-  () => {
-    if (shoppingListChoices.value.length === 1 && !state.shoppingListShowAllToggled) {
-      selectedShoppingList.value = shoppingListChoices.value[0];
-      openShoppingListIngredientDialog(selectedShoppingList.value);
-    }
-    else {
-      ready.value = true;
-    }
+export default defineNuxtComponent({
+  components: {
+    RecipeIngredientListItem,
  },
-);
+  props: {
+    modelValue: {
+      type: Boolean,
+      default: false,
+    },
+    recipes: {
+      type: Array as () => RecipeWithScale[],
+      default: undefined,
+    },
+    shoppingLists: {
+      type: Array as () => ShoppingListSummary[],
+      default: () => [],
+    },
+  },
+  emits: ["update:modelValue"],
+  setup(props, context) {
+    const i18n = useI18n();
+    const $auth = useMealieAuth();
+    const api = useUserApi();
+    const preferences = useShoppingListPreferences();
+    const ready = ref(false);

-watch(dialog, (val) => {
-  if (!val) {
-    initState();
-  }
-});
-
-async function consolidateRecipesIntoSections(recipes: RecipeWithScale[]) {
-  const recipeSectionMap = new Map<string, ShoppingListRecipeIngredientSection>();
-  for (const recipe of recipes) {
-    if (!recipe.slug) {
-      continue;
-    }
-
-    if (recipeSectionMap.has(recipe.slug)) {
-      const existingSection = recipeSectionMap.get(recipe.slug);
-      if (existingSection) {
-        existingSection.recipeScale += recipe.scale;
-      }
-      continue;
-    }
-
-    if (!(recipe.id && recipe.name && recipe.recipeIngredient)) {
-      const { data } = await api.recipes.getOne(recipe.slug);
-      if (!data?.recipeIngredient?.length) {
-        continue;
-      }
-      recipe.id = data.id || "";
-      recipe.name = data.name || "";
-      recipe.recipeIngredient = data.recipeIngredient;
-    }
-    else if (!recipe.recipeIngredient.length) {
-      continue;
-    }
-
-    const shoppingListIngredients: ShoppingListIngredient[] = recipe.recipeIngredient.map((ing) => {
-      const householdsWithFood = (ing.food?.householdsWithIngredientFood || []);
-      return {
-        checked: !householdsWithFood.includes(userHousehold.value),
-        ingredient: ing,
-      };
+    // v-model support
+    const dialog = computed({
+      get: () => {
+        return props.modelValue;
+      },
+      set: (val) => {
+        context.emit("update:modelValue", val);
+        initState();
+      },
    });

-    let currentTitle = "";
-    const onHandIngs: ShoppingListIngredient[] = [];
-    const shoppingListIngredientSections = shoppingListIngredients.reduce((sections, ing) => {
-      if (ing.ingredient.title) {
-        currentTitle = ing.ingredient.title;
-      }
+    const state = reactive({
+      shoppingListDialog: true,
+      shoppingListIngredientDialog: false,
+      shoppingListShowAllToggled: false,
+    });

-      // If this is the first item in the section, create a new section
-      if (sections.length === 0 || currentTitle !== sections[sections.length - 1].sectionName) {
-        if (sections.length) {
-          // Add the on-hand ingredients to the previous section
-          sections[sections.length - 1].ingredients.push(...onHandIngs);
-          onHandIngs.length = 0;
+    const userHousehold = computed(() => {
+      return $auth.user.value?.householdSlug || "";
+    });
+
+    const shoppingListChoices = computed(() => {
+      return props.shoppingLists.filter(list => preferences.value.viewAllLists || list.userId === $auth.user.value?.id);
+    });
+
+    const recipeIngredientSections = ref<ShoppingListRecipeIngredientSection[]>([]);
+    const selectedShoppingList = ref<ShoppingListSummary | null>(null);
+
+    watchEffect(
+      () => {
+        if (shoppingListChoices.value.length === 1 && !state.shoppingListShowAllToggled) {
+          selectedShoppingList.value = shoppingListChoices.value[0];
+          openShoppingListIngredientDialog(selectedShoppingList.value);
        }
-        sections.push({
-          sectionName: currentTitle,
-          ingredients: [],
+        else {
+          ready.value = true;
+        }
+      },
+    );
+
+    async function consolidateRecipesIntoSections(recipes: RecipeWithScale[]) {
+      const recipeSectionMap = new Map<string, ShoppingListRecipeIngredientSection>();
+      for (const recipe of recipes) {
+        if (!recipe.slug) {
+          continue;
+        }
+
+        if (recipeSectionMap.has(recipe.slug)) {
+          recipeSectionMap.get(recipe.slug).recipeScale += recipe.scale;
+          continue;
+        }
+
+        if (!(recipe.id && recipe.name && recipe.recipeIngredient)) {
+          const { data } = await api.recipes.getOne(recipe.slug);
+          if (!data?.recipeIngredient?.length) {
+            continue;
+          }
+          recipe.id = data.id || "";
+          recipe.name = data.name || "";
+          recipe.recipeIngredient = data.recipeIngredient;
+        }
+        else if (!recipe.recipeIngredient.length) {
+          continue;
+        }
+
+        const shoppingListIngredients: ShoppingListIngredient[] = recipe.recipeIngredient.map((ing) => {
+          const householdsWithFood = (ing.food?.householdsWithIngredientFood || []);
+          return {
+            checked: !householdsWithFood.includes(userHousehold.value),
+            ingredient: ing,
+            disableAmount: recipe.settings?.disableAmount || false,
+          };
+        });
+
+        let currentTitle = "";
+        const onHandIngs: ShoppingListIngredient[] = [];
+        const shoppingListIngredientSections = shoppingListIngredients.reduce((sections, ing) => {
+          if (ing.ingredient.title) {
+            currentTitle = ing.ingredient.title;
+          }
+
+          // If this is the first item in the section, create a new section
+          if (sections.length === 0 || currentTitle !== sections[sections.length - 1].sectionName) {
+            if (sections.length) {
+              // Add the on-hand ingredients to the previous section
+              sections[sections.length - 1].ingredients.push(...onHandIngs);
+              onHandIngs.length = 0;
+            }
+            sections.push({
+              sectionName: currentTitle,
+              ingredients: [],
+            });
+          }
+
+          // Store the on-hand ingredients for later
+          const householdsWithFood = (ing.ingredient.food?.householdsWithIngredientFood || []);
+          if (householdsWithFood.includes(userHousehold.value)) {
+            onHandIngs.push(ing);
+            return sections;
+          }
+
+          // Add the ingredient to previous section
+          sections[sections.length - 1].ingredients.push(ing);
+          return sections;
+        }, [] as ShoppingListIngredientSection[]);
+
+        // Add remaining on-hand ingredients to the previous section
+        shoppingListIngredientSections[shoppingListIngredientSections.length - 1].ingredients.push(...onHandIngs);
+
+        recipeSectionMap.set(recipe.slug, {
+          recipeId: recipe.id,
+          recipeName: recipe.name,
+          recipeScale: recipe.scale,
+          ingredientSections: shoppingListIngredientSections,
        });
      }

-      // Store the on-hand ingredients for later
-      const householdsWithFood = (ing.ingredient.food?.householdsWithIngredientFood || []);
-      if (householdsWithFood.includes(userHousehold.value)) {
-        onHandIngs.push(ing);
-        return sections;
-      }
-
-      // Add the ingredient to previous section
-      sections[sections.length - 1].ingredients.push(ing);
-      return sections;
-    }, [] as ShoppingListIngredientSection[]);
-
-    // Add remaining on-hand ingredients to the previous section
-    shoppingListIngredientSections[shoppingListIngredientSections.length - 1].ingredients.push(...onHandIngs);
-
-    recipeSectionMap.set(recipe.slug, {
-      recipeId: recipe.id,
-      recipeName: recipe.name,
-      recipeScale: recipe.scale,
-      ingredientSections: shoppingListIngredientSections,
-    });
-  }
-
-  recipeIngredientSections.value = Array.from(recipeSectionMap.values());
-}
-
-function initState() {
-  state.shoppingListDialog = true;
-  state.shoppingListIngredientDialog = false;
-  state.shoppingListShowAllToggled = false;
-  recipeIngredientSections.value = [];
-  selectedShoppingList.value = null;
-}
-
-initState();
-
-async function openShoppingListIngredientDialog(list: ShoppingListSummary) {
-  if (!props.recipes?.length) {
-    return;
-  }
-
-  selectedShoppingList.value = list;
-  await consolidateRecipesIntoSections(props.recipes);
-  state.shoppingListDialog = false;
-  state.shoppingListIngredientDialog = true;
-}
-
-function setShowAllToggled() {
-  state.shoppingListShowAllToggled = true;
-}
-
-function bulkCheckIngredients(value = true) {
-  recipeIngredientSections.value.forEach((recipeSection) => {
-    recipeSection.ingredientSections.forEach((ingSection) => {
-      ingSection.ingredients.forEach((ing) => {
-        ing.checked = value;
-      });
-    });
-  });
-}
-
-async function addRecipesToList() {
-  if (!selectedShoppingList.value) {
-    return;
-  }
-
-  const recipeData: ShoppingListAddRecipeParamsBulk[] = [];
-  recipeIngredientSections.value.forEach((section) => {
-    const ingredients: RecipeIngredient[] = [];
-    section.ingredientSections.forEach((ingSection) => {
-      ingSection.ingredients.forEach((ing) => {
-        if (ing.checked) {
-          ingredients.push(ing.ingredient);
-        }
-      });
-    });
-
-    if (!ingredients.length) {
-      return;
+      recipeIngredientSections.value = Array.from(recipeSectionMap.values());
    }

-    recipeData.push(
-      {
-        recipeId: section.recipeId,
-        recipeIncrementQuantity: section.recipeScale,
-        recipeIngredients: ingredients,
-      },
-    );
-  });
+    function initState() {
+      state.shoppingListDialog = true;
+      state.shoppingListIngredientDialog = false;
+      state.shoppingListShowAllToggled = false;
+      recipeIngredientSections.value = [];
+      selectedShoppingList.value = null;
+    }

-  const { error } = await api.shopping.lists.addRecipes(selectedShoppingList.value.id, recipeData);
-  // eslint-disable-next-line @typescript-eslint/no-unused-expressions
-  error ? alert.error(i18n.t("recipe.failed-to-add-recipes-to-list")) : alert.success(i18n.t("recipe.successfully-added-to-list"));
+    initState();

-  state.shoppingListDialog = false;
-  state.shoppingListIngredientDialog = false;
-  dialog.value = false;
-}
+    async function openShoppingListIngredientDialog(list: ShoppingListSummary) {
+      if (!props.recipes?.length) {
+        return;
+      }
+
+      selectedShoppingList.value = list;
+      await consolidateRecipesIntoSections(props.recipes);
+      state.shoppingListDialog = false;
+      state.shoppingListIngredientDialog = true;
+    }
+
+    function setShowAllToggled() {
+      state.shoppingListShowAllToggled = true;
+    }
+
+    function bulkCheckIngredients(value = true) {
+      recipeIngredientSections.value.forEach((recipeSection) => {
+        recipeSection.ingredientSections.forEach((ingSection) => {
+          ingSection.ingredients.forEach((ing) => {
+            ing.checked = value;
+          });
+        });
+      });
+    }
+
+    async function addRecipesToList() {
+      if (!selectedShoppingList.value) {
+        return;
+      }
+
+      const recipeData: ShoppingListAddRecipeParamsBulk[] = [];
+      recipeIngredientSections.value.forEach((section) => {
+        const ingredients: RecipeIngredient[] = [];
+        section.ingredientSections.forEach((ingSection) => {
+          ingSection.ingredients.forEach((ing) => {
+            if (ing.checked) {
+              ingredients.push(ing.ingredient);
+            }
+          });
+        });
+
+        if (!ingredients.length) {
+          return;
+        }
+
+        recipeData.push(
+          {
+            recipeId: section.recipeId,
+            recipeIncrementQuantity: section.recipeScale,
+            recipeIngredients: ingredients,
+          },
+        );
+      });
+
+      const { error } = await api.shopping.lists.addRecipes(selectedShoppingList.value.id, recipeData);
+      // eslint-disable-next-line @typescript-eslint/no-unused-expressions
+      error ? alert.error(i18n.t("recipe.failed-to-add-recipes-to-list")) : alert.success(i18n.t("recipe.successfully-added-to-list"));
+
+      state.shoppingListDialog = false;
+      state.shoppingListIngredientDialog = false;
+      dialog.value = false;
+    }
+
+    return {
+      dialog,
+      preferences,
+      ready,
+      shoppingListChoices,
+      ...toRefs(state),
+      addRecipesToList,
+      bulkCheckIngredients,
+      openShoppingListIngredientDialog,
+      setShowAllToggled,
+      recipeIngredientSections,
+      selectedShoppingList,
+    };
+  },
+});
 </script>

 <style scoped lang="css">
--- a/frontend/components/Domain/Recipe/RecipeDialogBulkAdd.vue
+++ b/frontend/components/Domain/Recipe/RecipeDialogBulkAdd.vue
@@ -4,9 +4,9 @@
      v-model="dialog"
      width="800"
    >
-      <template #activator="{ props: activatorProps }">
+      <template #activator="{ props }">
        <BaseButton
-          v-bind="activatorProps"
+          v-bind="props"
          @click="inputText = inputTextProp"
        >
          {{ $t("new-recipe.bulk-add") }}
@@ -89,75 +89,88 @@
  </div>
 </template>

-<script setup lang="ts">
-interface Props {
-  inputTextProp?: string;
-}
-const props = withDefaults(defineProps<Props>(), {
-  inputTextProp: "",
+<script lang="ts">
+export default defineNuxtComponent({
+  props: {
+    inputTextProp: {
+      type: String,
+      required: false,
+      default: "",
+    },
+  },
+  emits: ["bulk-data"],
+  setup(props, context) {
+    const state = reactive({
+      dialog: false,
+      inputText: props.inputTextProp,
+    });
+
+    function splitText() {
+      return state.inputText.split("\n").filter(line => !(line === "\n" || !line));
+    }
+
+    function removeFirstCharacter() {
+      state.inputText = splitText()
+        .map(line => line.substring(1))
+        .join("\n");
+    }
+
+    const numberedLineRegex = /\d+[.):] /gm;
+
+    function splitByNumberedLine() {
+      // Split inputText by numberedLineRegex
+      const matches = state.inputText.match(numberedLineRegex);
+
+      matches?.forEach((match, idx) => {
+        const replaceText = idx === 0 ? "" : "\n";
+        state.inputText = state.inputText.replace(match, replaceText);
+      });
+    }
+
+    function trimAllLines() {
+      const splitLines = splitText();
+
+      splitLines.forEach((element: string, index: number) => {
+        splitLines[index] = element.trim();
+      });
+
+      state.inputText = splitLines.join("\n");
+    }
+
+    function save() {
+      context.emit("bulk-data", splitText());
+      state.dialog = false;
+    }
+
+    const i18n = useI18n();
+
+    const utilities = [
+      {
+        id: "trim-whitespace",
+        description: i18n.t("new-recipe.trim-whitespace-description"),
+        action: trimAllLines,
+      },
+      {
+        id: "trim-prefix",
+        description: i18n.t("new-recipe.trim-prefix-description"),
+        action: removeFirstCharacter,
+      },
+      {
+        id: "split-by-numbered-line",
+        description: i18n.t("new-recipe.split-by-numbered-line-description"),
+        action: splitByNumberedLine,
+      },
+    ];
+
+    return {
+      utilities,
+      splitText,
+      trimAllLines,
+      removeFirstCharacter,
+      splitByNumberedLine,
+      save,
+      ...toRefs(state),
+    };
+  },
 });
-
-const emit = defineEmits<{
-  "bulk-data": [data: string[]];
-}>();
-
-const dialog = ref(false);
-const inputText = ref(props.inputTextProp);
-
-function splitText() {
-  return inputText.value.split("\n").filter(line => !(line === "\n" || !line));
-}
-
-function removeFirstCharacter() {
-  inputText.value = splitText()
-    .map(line => line.substring(1))
-    .join("\n");
-}
-
-const numberedLineRegex = /\d+[.):] /gm;
-
-function splitByNumberedLine() {
-  // Split inputText by numberedLineRegex
-  const matches = inputText.value.match(numberedLineRegex);
-
-  matches?.forEach((match, idx) => {
-    const replaceText = idx === 0 ? "" : "\n";
-    inputText.value = inputText.value.replace(match, replaceText);
-  });
-}
-
-function trimAllLines() {
-  const splitLines = splitText();
-
-  splitLines.forEach((element: string, index: number) => {
-    splitLines[index] = element.trim();
-  });
-
-  inputText.value = splitLines.join("\n");
-}
-
-function save() {
-  emit("bulk-data", splitText());
-  dialog.value = false;
-}
-
-const i18n = useI18n();
-
-const utilities = [
-  {
-    id: "trim-whitespace",
-    description: i18n.t("new-recipe.trim-whitespace-description"),
-    action: trimAllLines,
-  },
-  {
-    id: "trim-prefix",
-    description: i18n.t("new-recipe.trim-prefix-description"),
-    action: removeFirstCharacter,
-  },
-  {
-    id: "split-by-numbered-line",
-    description: i18n.t("new-recipe.split-by-numbered-line-description"),
-    action: splitByNumberedLine,
-  },
-];
 </script>
--- a/frontend/components/Domain/Recipe/RecipeDialogPrintPreferences.vue
+++ b/frontend/components/Domain/Recipe/RecipeDialogPrintPreferences.vue
@@ -44,7 +44,6 @@
              <v-switch
                v-model="preferences.showDescription"
                hide-details
-                color="primary"
                :label="$t('recipe.description')"
              />
            </v-row>
@@ -52,7 +51,6 @@
              <v-switch
                v-model="preferences.showNotes"
                hide-details
-                color="primary"
                :label="$t('recipe.notes')"
              />
            </v-row>
@@ -65,7 +63,6 @@
              <v-switch
                v-model="preferences.showNutrition"
                hide-details
-                color="primary"
                :label="$t('recipe.nutrition')"
              />
            </v-row>
@@ -86,19 +83,45 @@
  </BaseDialog>
 </template>

-<script setup lang="ts">
+<script lang="ts">
 import type { Recipe } from "~/lib/api/types/recipe";
 import { ImagePosition, useUserPrintPreferences } from "~/composables/use-users/preferences";
 import RecipePrintView from "~/components/Domain/Recipe/RecipePrintView.vue";
 import type { NoUndefinedField } from "~/lib/api/types/non-generated";

-interface Props {
-  recipe?: NoUndefinedField<Recipe>;
-}
-withDefaults(defineProps<Props>(), {
-  recipe: undefined,
-});
+export default defineNuxtComponent({
+  components: {
+    RecipePrintView,
+  },
+  props: {
+    modelValue: {
+      type: Boolean,
+      default: false,
+    },
+    recipe: {
+      type: Object as () => NoUndefinedField<Recipe>,
+      default: undefined,
+    },
+  },
+  emits: ["update:modelValue"],
+  setup(props, context) {
+    const preferences = useUserPrintPreferences();

-const dialog = defineModel<boolean>({ default: false });
-const preferences = useUserPrintPreferences();
+    // V-Model Support
+    const dialog = computed({
+      get: () => {
+        return props.modelValue;
+      },
+      set: (val) => {
+        context.emit("update:modelValue", val);
+      },
+    });
+
+    return {
+      dialog,
+      ImagePosition,
+      preferences,
+    };
+  },
+});
 </script>
--- a/frontend/components/Domain/Recipe/RecipeDialogSearch.vue
+++ b/frontend/components/Domain/Recipe/RecipeDialogSearch.vue
@@ -52,6 +52,10 @@
          <div class="mr-auto">
            {{ $t("search.results") }}
          </div>
+          <!-- <router-link
+            :to="advancedSearchUrl"
+            class="text-primary"
+          > {{ $t("search.advanced-search") }} </router-link> -->
        </v-card-actions>

        <RecipeCardMobile
@@ -72,7 +76,7 @@
  </div>
 </template>

-<script setup lang="ts">
+<script lang="ts">
 import RecipeCardMobile from "./RecipeCardMobile.vue";
 import { useLoggedInState } from "~/composables/use-logged-in-state";
 import type { RecipeSummary } from "~/lib/api/types/recipe";
@@ -81,104 +85,114 @@ import { useRecipeSearch } from "~/composables/recipes/use-recipe-search";
 import { usePublicExploreApi } from "~/composables/api/api-client";

 const SELECTED_EVENT = "selected";
+export default defineNuxtComponent({
+  components: {
+    RecipeCardMobile,
+  },

-// Define emits
-const emit = defineEmits<{
-  selected: [recipe: RecipeSummary];
-}>();
+  setup(_, context) {
+    const $auth = useMealieAuth();
+    const state = reactive({
+      loading: false,
+      selectedIndex: -1,
+    });

-const $auth = useMealieAuth();
-const loading = ref(false);
-const selectedIndex = ref(-1);
+    // ===========================================================================
+    // Dialog State Management
+    const dialog = ref(false);

-// ===========================================================================
-// Dialog State Management
-const dialog = ref(false);
+    // Reset or Grab Recipes on Change
+    watch(dialog, (val) => {
+      if (!val) {
+        search.query.value = "";
+        state.selectedIndex = -1;
+        search.data.value = [];
+      }
+    });

-// Reset or Grab Recipes on Change
-watch(dialog, (val) => {
-  if (!val) {
-    search.query.value = "";
-    selectedIndex.value = -1;
-    search.data.value = [];
-  }
-});
+    // ===========================================================================
+    // Event Handlers

-// ===========================================================================
-// Event Handlers
+    function selectRecipe() {
+      const recipeCards = document.getElementsByClassName("arrow-nav");
+      if (recipeCards) {
+        if (state.selectedIndex < 0) {
+          state.selectedIndex = -1;
+          document.getElementById("arrow-search")?.focus();
+          return;
+        }

-function selectRecipe() {
-  const recipeCards = document.getElementsByClassName("arrow-nav");
-  if (recipeCards) {
-    if (selectedIndex.value < 0) {
-      selectedIndex.value = -1;
-      document.getElementById("arrow-search")?.focus();
-      return;
+        if (state.selectedIndex >= recipeCards.length) {
+          state.selectedIndex = recipeCards.length - 1;
+        }
+
+        (recipeCards[state.selectedIndex] as HTMLElement).focus();
+      }
    }

-    if (selectedIndex.value >= recipeCards.length) {
-      selectedIndex.value = recipeCards.length - 1;
+    function onUpDown(e: KeyboardEvent) {
+      if (e.key === "Enter") {
+        console.log(document.activeElement);
+        // (document.activeElement as HTMLElement).click();
+      }
+      else if (e.key === "ArrowUp") {
+        e.preventDefault();
+        state.selectedIndex--;
+      }
+      else if (e.key === "ArrowDown") {
+        e.preventDefault();
+        state.selectedIndex++;
+      }
+      else {
+        return;
+      }
+      selectRecipe();
    }

-    (recipeCards[selectedIndex.value] as HTMLElement).focus();
-  }
-}
+    watch(dialog, (val) => {
+      if (!val) {
+        document.removeEventListener("keyup", onUpDown);
+      }
+      else {
+        document.addEventListener("keyup", onUpDown);
+      }
+    });

-function onUpDown(e: KeyboardEvent) {
-  if (e.key === "Enter") {
-    console.log(document.activeElement);
-    // (document.activeElement as HTMLElement).click();
-  }
-  else if (e.key === "ArrowUp") {
-    e.preventDefault();
-    selectedIndex.value--;
-  }
-  else if (e.key === "ArrowDown") {
-    e.preventDefault();
-    selectedIndex.value++;
-  }
-  else {
-    return;
-  }
-  selectRecipe();
-}
+    const groupSlug = computed(() => route.params.groupSlug as string || $auth.user.value?.groupSlug || "");
+    const route = useRoute();
+    const advancedSearchUrl = computed(() => `/g/${groupSlug.value}`);
+    watch(route, close);

-watch(dialog, (val) => {
-  if (!val) {
-    document.removeEventListener("keyup", onUpDown);
-  }
-  else {
-    document.addEventListener("keyup", onUpDown);
-  }
-});
+    function open() {
+      dialog.value = true;
+    }
+    function close() {
+      dialog.value = false;
+    }

-const route = useRoute();
-const groupSlug = computed(() => route.params.groupSlug as string || $auth.user.value?.groupSlug || "");
-watch(route, close);
+    // ===========================================================================
+    // Basic Search
+    const { isOwnGroup } = useLoggedInState();
+    const api = isOwnGroup.value ? useUserApi() : usePublicExploreApi(groupSlug.value).explore;
+    const search = useRecipeSearch(api);

-function open() {
-  dialog.value = true;
-}
-function close() {
-  dialog.value = false;
-}
+    // Select Handler

-// ===========================================================================
-// Basic Search
-const { isOwnGroup } = useLoggedInState();
-const api = isOwnGroup.value ? useUserApi() : usePublicExploreApi(groupSlug.value).explore;
-const search = useRecipeSearch(api);
+    function handleSelect(recipe: RecipeSummary) {
+      close();
+      context.emit(SELECTED_EVENT, recipe);
+    }

-// Select Handler
-function handleSelect(recipe: RecipeSummary) {
-  close();
-  emit(SELECTED_EVENT, recipe);
-}
-
-// Expose functions to parent components
-defineExpose({
-  open,
-  close,
+    return {
+      ...toRefs(state),
+      advancedSearchUrl,
+      dialog,
+      open,
+      close,
+      handleSelect,
+      search,
+    };
+  },
 });
 </script>

--- a/frontend/components/Domain/Recipe/RecipeDialogShare.vue
+++ b/frontend/components/Domain/Recipe/RecipeDialogShare.vue
@@ -14,14 +14,14 @@
          max-width="290px"
          min-width="auto"
        >
-          <template #activator="{ props: activatorProps }">
+          <template #activator="{ props }">
            <v-text-field
              v-model="expirationDateString"
              :label="$t('recipe-share.expiration-date')"
              :hint="$t('recipe-share.default-30-days')"
              persistent-hint
              :prepend-icon="$globals.icons.calendar"
-              v-bind="activatorProps"
+              v-bind="props"
              readonly
            />
          </template>
@@ -92,116 +92,150 @@
  </div>
 </template>

-<script setup lang="ts">
+<script lang="ts">
 import { useClipboard, useShare, whenever } from "@vueuse/core";
 import type { RecipeShareToken } from "~/lib/api/types/recipe";
 import { useUserApi } from "~/composables/api";
 import { useHouseholdSelf } from "~/composables/use-households";
 import { alert } from "~/composables/use-toast";

-interface Props {
-  recipeId: string;
-  name: string;
-}
-const props = defineProps<Props>();
-
-const dialog = defineModel<boolean>({ default: false });
-
-const datePickerMenu = ref(false);
-const expirationDate = ref(new Date(Date.now() - new Date().getTimezoneOffset() * 60000));
-const tokens = ref<RecipeShareToken[]>([]);
-
-const expirationDateString = computed(() => {
-  return expirationDate.value.toISOString().substring(0, 10);
-});
-
-whenever(
-  () => dialog.value,
-  () => {
-    // Set expiration date to today + 30 Days
-    const today = new Date();
-    expirationDate.value = new Date(today.getTime() + 30 * 24 * 60 * 60 * 1000);
-    refreshTokens();
+export default defineNuxtComponent({
+  props: {
+    modelValue: {
+      type: Boolean,
+      default: false,
+    },
+    recipeId: {
+      type: String,
+      required: true,
+    },
+    name: {
+      type: String,
+      required: true,
+    },
  },
-);
-
-const i18n = useI18n();
-const $auth = useMealieAuth();
-const { household } = useHouseholdSelf();
-const route = useRoute();
-const groupSlug = computed(() => route.params.groupSlug as string || $auth.user.value?.groupSlug || "");
-
-const firstDayOfWeek = computed(() => {
-  return household.value?.preferences?.firstDayOfWeek || 0;
-});
-
-// ============================================================
-// Token Actions
-
-const userApi = useUserApi();
-
-async function createNewToken() {
-  // Convert expiration date to timestamp
-  const { data } = await userApi.recipes.share.createOne({
-    recipeId: props.recipeId,
-    expiresAt: expirationDate.value.toISOString(),
-  });
-
-  if (data) {
-    tokens.value.push(data);
-  }
-}
-
-async function deleteToken(id: string) {
-  await userApi.recipes.share.deleteOne(id);
-  tokens.value = tokens.value.filter(token => token.id !== id);
-}
-
-async function refreshTokens() {
-  const { data } = await userApi.recipes.share.getAll(1, -1, { recipe_id: props.recipeId });
-
-  if (data) {
-    // @ts-expect-error - TODO: This routes doesn't have pagination, but the type are mismatched.
-    tokens.value = data ?? [];
-  }
-}
-
-const { share, isSupported: shareIsSupported } = useShare();
-const { copy, copied, isSupported } = useClipboard();
-
-function getRecipeText() {
-  return i18n.t("recipe.share-recipe-message", [props.name]);
-}
-
-function getTokenLink(token: string) {
-  return `${window.location.origin}/g/${groupSlug.value}/shared/r/${token}`;
-}
-
-async function copyTokenLink(token: string) {
-  if (isSupported.value) {
-    await copy(getTokenLink(token));
-    if (copied.value) {
-      alert.success(i18n.t("recipe-share.recipe-link-copied-message") as string);
-    }
-    else {
-      alert.error(i18n.t("general.clipboard-copy-failure") as string);
-    }
-  }
-  else {
-    alert.error(i18n.t("general.clipboard-not-supported") as string);
-  }
-}
-
-async function shareRecipe(token: string) {
-  if (shareIsSupported) {
-    share({
-      title: props.name,
-      url: getTokenLink(token),
-      text: getRecipeText() as string,
+  emits: ["update:modelValue"],
+  setup(props, context) {
+    // V-Model Support
+    const dialog = computed({
+      get: () => {
+        return props.modelValue;
+      },
+      set: (val) => {
+        context.emit("update:modelValue", val);
+      },
    });
-  }
-  else {
-    await copyTokenLink(token);
-  }
-}
+
+    const state = reactive({
+      datePickerMenu: false,
+      expirationDate: new Date(Date.now() - new Date().getTimezoneOffset() * 60000),
+      tokens: [] as RecipeShareToken[],
+    });
+
+    const expirationDateString = computed(() => {
+      return state.expirationDate.toISOString().substring(0, 10);
+    });
+
+    whenever(
+      () => props.modelValue,
+      () => {
+        // Set expiration date to today + 30 Days
+        const today = new Date();
+        state.expirationDate = new Date(today.getTime() + 30 * 24 * 60 * 60 * 1000);
+        refreshTokens();
+      },
+    );
+
+    const i18n = useI18n();
+    const $auth = useMealieAuth();
+    const { household } = useHouseholdSelf();
+    const route = useRoute();
+    const groupSlug = computed(() => route.params.groupSlug as string || $auth.user.value?.groupSlug || "");
+
+    const firstDayOfWeek = computed(() => {
+      return household.value?.preferences?.firstDayOfWeek || 0;
+    });
+
+    // ============================================================
+    // Token Actions
+
+    const userApi = useUserApi();
+
+    async function createNewToken() {
+      // Convert expiration date to timestamp
+      const { data } = await userApi.recipes.share.createOne({
+        recipeId: props.recipeId,
+        expiresAt: state.expirationDate.toISOString(),
+      });
+
+      if (data) {
+        state.tokens.push(data);
+      }
+    }
+
+    async function deleteToken(id: string) {
+      await userApi.recipes.share.deleteOne(id);
+      state.tokens = state.tokens.filter(token => token.id !== id);
+    }
+
+    async function refreshTokens() {
+      const { data } = await userApi.recipes.share.getAll(1, -1, { recipe_id: props.recipeId });
+
+      if (data) {
+        // @ts-expect-error - TODO: This routes doesn't have pagination, but the type are mismatched.
+        state.tokens = data ?? [];
+      }
+    }
+
+    const { share, isSupported: shareIsSupported } = useShare();
+    const { copy, copied, isSupported } = useClipboard();
+
+    function getRecipeText() {
+      return i18n.t("recipe.share-recipe-message", [props.name]);
+    }
+
+    function getTokenLink(token: string) {
+      return `${window.location.origin}/g/${groupSlug.value}/shared/r/${token}`;
+    }
+
+    async function copyTokenLink(token: string) {
+      if (isSupported.value) {
+        await copy(getTokenLink(token));
+        if (copied.value) {
+          alert.success(i18n.t("recipe-share.recipe-link-copied-message") as string);
+        }
+        else {
+          alert.error(i18n.t("general.clipboard-copy-failure") as string);
+        }
+      }
+      else {
+        alert.error(i18n.t("general.clipboard-not-supported") as string);
+      }
+    }
+
+    async function shareRecipe(token: string) {
+      if (shareIsSupported) {
+        share({
+          title: props.name,
+          url: getTokenLink(token),
+          text: getRecipeText() as string,
+        });
+      }
+      else {
+        await copyTokenLink(token);
+      }
+    }
+
+    return {
+      ...toRefs(state),
+      expirationDateString,
+      dialog,
+      createNewToken,
+      deleteToken,
+      firstDayOfWeek,
+      shareRecipe,
+      copyTokenLink,
+    };
+  },
+});
 </script>
--- a/frontend/components/Domain/Recipe/RecipeExplorerPage.vue
+++ b/frontend/components/Domain/Recipe/RecipeExplorerPage.vue
@@ -0,0 +1,710 @@
+<template>
+  <v-container
+    fluid
+    class="px-0"
+  >
+    <div class="search-container pb-8">
+      <form
+        class="search-box pa-2"
+        @submit.prevent="search"
+      >
+        <div class="d-flex justify-center mb-2">
+          <v-text-field
+            ref="input"
+            v-model="state.search"
+            variant="outlined"
+            hide-details
+            clearable
+            color="primary"
+            :placeholder="$t('search.search-placeholder')"
+            :prepend-inner-icon="$globals.icons.search"
+            @keyup.enter="hideKeyboard"
+          />
+        </div>
+        <div class="search-row">
+          <!-- Category Filter -->
+          <SearchFilter
+            v-if="categories"
+            v-model="selectedCategories"
+            v-model:require-all="state.requireAllCategories"
+            :items="categories"
+          >
+            <v-icon start>
+              {{ $globals.icons.categories }}
+            </v-icon>
+            {{ $t("category.categories") }}
+          </SearchFilter>
+
+          <!-- Tag Filter -->
+          <SearchFilter
+            v-if="tags"
+            v-model="selectedTags"
+            v-model:require-all="state.requireAllTags"
+            :items="tags"
+          >
+            <v-icon start>
+              {{ $globals.icons.tags }}
+            </v-icon>
+            {{ $t("tag.tags") }}
+          </SearchFilter>
+
+          <!-- Tool Filter -->
+          <SearchFilter
+            v-if="tools"
+            v-model="selectedTools"
+            v-model:require-all="state.requireAllTools"
+            :items="tools"
+          >
+            <v-icon start>
+              {{ $globals.icons.potSteam }}
+            </v-icon>
+            {{ $t("tool.tools") }}
+          </SearchFilter>
+
+          <!-- Food Filter -->
+          <SearchFilter
+            v-if="foods"
+            v-model="selectedFoods"
+            v-model:require-all="state.requireAllFoods"
+            :items="foods"
+          >
+            <v-icon start>
+              {{ $globals.icons.foods }}
+            </v-icon>
+            {{ $t("general.foods") }}
+          </SearchFilter>
+
+          <!-- Household Filter -->
+          <SearchFilter
+            v-if="households.length > 1"
+            v-model="selectedHouseholds"
+            :items="households"
+            radio
+          >
+            <v-icon start>
+              {{ $globals.icons.household }}
+            </v-icon>
+            {{ $t("household.households") }}
+          </SearchFilter>
+
+          <!-- Sort Options -->
+          <v-menu
+            offset-y
+            nudge-bottom="3"
+          >
+            <template #activator="{ props }">
+              <v-btn
+                class="ml-auto"
+                size="small"
+                color="accent"
+                v-bind="props"
+              >
+                <v-icon :start="!$vuetify.display.xs">
+                  {{ state.orderDirection === "asc" ? $globals.icons.sortAscending : $globals.icons.sortDescending }}
+                </v-icon>
+                {{ $vuetify.display.xs ? null : sortText }}
+              </v-btn>
+            </template>
+            <v-card>
+              <v-list>
+                <v-list-item
+                  slim
+                  density="comfortable"
+                  :prepend-icon="state.orderDirection === 'asc' ? $globals.icons.sortDescending : $globals.icons.sortAscending"
+                  :title="state.orderDirection === 'asc' ? $t('general.sort-descending') : $t('general.sort-ascending')"
+                  @click="toggleOrderDirection()"
+                />
+                <v-divider />
+                <v-list-item
+                  v-for="v in sortable"
+                  :key="v.name"
+                  :active="state.orderBy === v.value"
+                  slim
+                  density="comfortable"
+                  :prepend-icon="v.icon"
+                  :title="v.name"
+                  @click="state.orderBy = v.value"
+                />
+              </v-list>
+            </v-card>
+          </v-menu>
+
+          <!-- Settings -->
+          <v-menu
+            offset-y
+            bottom
+            start
+            nudge-bottom="3"
+            :close-on-content-click="false"
+          >
+            <template #activator="{ props }">
+              <v-btn
+                size="small"
+                color="accent"
+                dark
+                v-bind="props"
+              >
+                <v-icon size="small">
+                  {{ $globals.icons.cog }}
+                </v-icon>
+              </v-btn>
+            </template>
+            <v-card>
+              <v-card-text>
+                <v-switch
+                  v-model="state.auto"
+                  :label="$t('search.auto-search')"
+                  single-line
+                />
+                <v-btn
+                  block
+                  color="primary"
+                  @click="reset"
+                >
+                  {{ $t("general.reset") }}
+                </v-btn>
+              </v-card-text>
+            </v-card>
+          </v-menu>
+        </div>
+        <div
+          v-if="!state.auto"
+          class="search-button-container"
+        >
+          <v-btn
+            size="x-large"
+            color="primary"
+            type="submit"
+            block
+          >
+            <v-icon start>
+              {{ $globals.icons.search }}
+            </v-icon>
+            {{ $t("search.search") }}
+          </v-btn>
+        </div>
+      </form>
+    </div>
+    <v-divider />
+    <v-container class="mt-6 px-md-6">
+      <RecipeCardSection
+        v-if="state.ready"
+        class="mt-n5"
+        :icon="$globals.icons.silverwareForkKnife"
+        :title="$t('general.recipes')"
+        :recipes="recipes"
+        :query="passedQueryWithSeed"
+        disable-sort
+        @item-selected="filterItems"
+        @replace-recipes="replaceRecipes"
+        @append-recipes="appendRecipes"
+      />
+    </v-container>
+  </v-container>
+</template>
+
+<script lang="ts">
+import { watchDebounced } from "@vueuse/shared";
+import SearchFilter from "~/components/Domain/SearchFilter.vue";
+import { useLoggedInState } from "~/composables/use-logged-in-state";
+import {
+  useCategoryStore,
+  usePublicCategoryStore,
+  useFoodStore,
+  usePublicFoodStore,
+  useHouseholdStore,
+  usePublicHouseholdStore,
+  useTagStore,
+  usePublicTagStore,
+  useToolStore,
+  usePublicToolStore,
+} from "~/composables/store";
+import { useUserSearchQuerySession } from "~/composables/use-users/preferences";
+import RecipeCardSection from "~/components/Domain/Recipe/RecipeCardSection.vue";
+import type { IngredientFood, RecipeCategory, RecipeTag, RecipeTool } from "~/lib/api/types/recipe";
+import type { NoUndefinedField } from "~/lib/api/types/non-generated";
+import { useLazyRecipes } from "~/composables/recipes";
+import type { RecipeSearchQuery } from "~/lib/api/user/recipes/recipe";
+import type { HouseholdSummary } from "~/lib/api/types/household";
+
+export default defineNuxtComponent({
+  components: { SearchFilter, RecipeCardSection },
+  setup() {
+    const router = useRouter();
+    const i18n = useI18n();
+    const $auth = useMealieAuth();
+    const { $globals } = useNuxtApp();
+
+    const { isOwnGroup } = useLoggedInState();
+    const state = ref({
+      auto: true,
+      ready: false,
+      search: "",
+      orderBy: "created_at",
+      orderDirection: "desc" as "asc" | "desc",
+
+      // and/or
+      requireAllCategories: false,
+      requireAllTags: false,
+      requireAllTools: false,
+      requireAllFoods: false,
+    });
+
+    const route = useRoute();
+    const groupSlug = computed(() => route.params.groupSlug as string || $auth.user.value?.groupSlug || "");
+    const searchQuerySession = useUserSearchQuerySession();
+
+    const { recipes, appendRecipes, assignSorted, removeRecipe, replaceRecipes } = useLazyRecipes(isOwnGroup.value ? null : groupSlug.value);
+    const categories = isOwnGroup.value ? useCategoryStore() : usePublicCategoryStore(groupSlug.value);
+    const selectedCategories = ref<NoUndefinedField<RecipeCategory>[]>([]);
+
+    const foods = isOwnGroup.value ? useFoodStore() : usePublicFoodStore(groupSlug.value);
+    const selectedFoods = ref<IngredientFood[]>([]);
+
+    const households = isOwnGroup.value ? useHouseholdStore() : usePublicHouseholdStore(groupSlug.value);
+    const selectedHouseholds = ref([] as NoUndefinedField<HouseholdSummary>[]);
+
+    const tags = isOwnGroup.value ? useTagStore() : usePublicTagStore(groupSlug.value);
+    const selectedTags = ref<NoUndefinedField<RecipeTag>[]>([]);
+
+    const tools = isOwnGroup.value ? useToolStore() : usePublicToolStore(groupSlug.value);
+    const selectedTools = ref<NoUndefinedField<RecipeTool>[]>([]);
+
+    function calcPassedQuery(): RecipeSearchQuery {
+      return {
+        // the search clear button sets search to null, which still renders the query param for a moment,
+        // whereas an empty string is not rendered
+        search: state.value.search ? state.value.search : "",
+        categories: toIDArray(selectedCategories.value),
+        foods: toIDArray(selectedFoods.value),
+        households: toIDArray(selectedHouseholds.value),
+        tags: toIDArray(selectedTags.value),
+        tools: toIDArray(selectedTools.value),
+        requireAllCategories: state.value.requireAllCategories,
+        requireAllTags: state.value.requireAllTags,
+        requireAllTools: state.value.requireAllTools,
+        requireAllFoods: state.value.requireAllFoods,
+        orderBy: state.value.orderBy,
+        orderDirection: state.value.orderDirection,
+      };
+    }
+    const passedQuery = ref<RecipeSearchQuery>(calcPassedQuery());
+
+    // we calculate this separately because otherwise we can't check for query changes
+    const passedQueryWithSeed = computed(() => {
+      return {
+        ...passedQuery.value,
+        _searchSeed: Date.now().toString(),
+      };
+    });
+
+    const queryDefaults = {
+      search: "",
+      orderBy: "created_at",
+      orderDirection: "desc" as "asc" | "desc",
+      requireAllCategories: false,
+      requireAllTags: false,
+      requireAllTools: false,
+      requireAllFoods: false,
+    };
+
+    function reset() {
+      state.value.search = queryDefaults.search;
+      state.value.orderBy = queryDefaults.orderBy;
+      state.value.orderDirection = queryDefaults.orderDirection;
+      state.value.requireAllCategories = queryDefaults.requireAllCategories;
+      state.value.requireAllTags = queryDefaults.requireAllTags;
+      state.value.requireAllTools = queryDefaults.requireAllTools;
+      state.value.requireAllFoods = queryDefaults.requireAllFoods;
+      selectedCategories.value = [];
+      selectedFoods.value = [];
+      selectedHouseholds.value = [];
+      selectedTags.value = [];
+      selectedTools.value = [];
+    }
+
+    function toggleOrderDirection() {
+      state.value.orderDirection = state.value.orderDirection === "asc" ? "desc" : "asc";
+    }
+
+    function toIDArray(array: { id: string }[]) {
+      // we sort the array to make sure the query is always the same
+      return array.map(item => item.id).sort();
+    }
+
+    function hideKeyboard() {
+      input.value.blur();
+    }
+
+    const input: Ref<any> = ref(null);
+
+    async function search() {
+      const oldQueryValueString = JSON.stringify(passedQuery.value);
+      const newQueryValue = calcPassedQuery();
+      const newQueryValueString = JSON.stringify(newQueryValue);
+      if (oldQueryValueString === newQueryValueString) {
+        return;
+      }
+
+      passedQuery.value = newQueryValue;
+      const query = {
+        categories: passedQuery.value.categories,
+        foods: passedQuery.value.foods,
+        tags: passedQuery.value.tags,
+        tools: passedQuery.value.tools,
+        // Only add the query param if it's not the default value
+        ...{
+          auto: state.value.auto ? undefined : "false",
+          search: passedQuery.value.search === queryDefaults.search ? undefined : passedQuery.value.search,
+          orderBy: passedQuery.value.orderBy === queryDefaults.orderBy ? undefined : passedQuery.value.orderBy,
+          orderDirection: passedQuery.value.orderDirection === queryDefaults.orderDirection ? undefined : passedQuery.value.orderDirection,
+          households: !passedQuery.value.households?.length || passedQuery.value.households?.length === households.store.value.length ? undefined : passedQuery.value.households,
+          requireAllCategories: passedQuery.value.requireAllCategories ? "true" : undefined,
+          requireAllTags: passedQuery.value.requireAllTags ? "true" : undefined,
+          requireAllTools: passedQuery.value.requireAllTools ? "true" : undefined,
+          requireAllFoods: passedQuery.value.requireAllFoods ? "true" : undefined,
+        },
+      };
+      await router.push({ query });
+      searchQuerySession.value.recipe = JSON.stringify(query);
+    }
+
+    function waitUntilAndExecute(
+      condition: () => boolean,
+      callback: () => void,
+      opts = { timeout: 2000, interval: 500 },
+    ): Promise<void> {
+      return new Promise((resolve, reject) => {
+        const state = {
+          timeout: undefined as number | undefined,
+          interval: undefined as number | undefined,
+        };
+
+        const check = () => {
+          if (condition()) {
+            clearInterval(state.interval);
+            clearTimeout(state.timeout);
+            callback();
+            resolve();
+          }
+        };
+
+        // For some reason these were returning NodeJS.Timeout
+        state.interval = setInterval(check, opts.interval) as unknown as number;
+        state.timeout = setTimeout(() => {
+          clearInterval(state.interval);
+          reject(new Error("Timeout"));
+        }, opts.timeout) as unknown as number;
+      });
+    }
+
+    const sortText = computed(() => {
+      const sort = sortable.find(s => s.value === state.value.orderBy);
+      if (!sort) return "";
+      return `${sort.name}`;
+    });
+
+    const sortable = [
+      {
+        icon: $globals.icons.orderAlphabeticalAscending,
+        name: i18n.t("general.sort-alphabetically"),
+        value: "name",
+      },
+      {
+        icon: $globals.icons.newBox,
+        name: i18n.t("general.created"),
+        value: "created_at",
+      },
+      {
+        icon: $globals.icons.chefHat,
+        name: i18n.t("general.last-made"),
+        value: "last_made",
+      },
+      {
+        icon: $globals.icons.star,
+        name: i18n.t("general.rating"),
+        value: "rating",
+      },
+      {
+        icon: $globals.icons.update,
+        name: i18n.t("general.updated"),
+        value: "updated_at",
+      },
+      {
+        icon: $globals.icons.diceMultiple,
+        name: i18n.t("general.random"),
+        value: "random",
+      },
+    ];
+
+    watch(
+      () => route.query,
+      () => {
+        if (!Object.keys(route.query).length) {
+          reset();
+        }
+      },
+    );
+
+    function filterItems(item: RecipeCategory | RecipeTag | RecipeTool, urlPrefix: string) {
+      if (urlPrefix === "categories") {
+        const result = categories.store.value.filter(category => (category.id as string).includes(item.id as string));
+        selectedCategories.value = result as NoUndefinedField<RecipeTag>[];
+      }
+      else if (urlPrefix === "tags") {
+        const result = tags.store.value.filter(tag => (tag.id as string).includes(item.id as string));
+        selectedTags.value = result as NoUndefinedField<RecipeTag>[];
+      }
+      else if (urlPrefix === "tools") {
+        const result = tools.store.value.filter(tool => (tool.id).includes(item.id || ""));
+        selectedTags.value = result as NoUndefinedField<RecipeTag>[];
+      }
+    }
+
+    async function hydrateSearch() {
+      const query = router.currentRoute.value.query;
+      if (query.auto?.length) {
+        state.value.auto = query.auto === "true";
+      }
+
+      if (query.search?.length) {
+        state.value.search = query.search as string;
+      }
+      else {
+        state.value.search = queryDefaults.search;
+      }
+
+      if (query.orderBy?.length) {
+        state.value.orderBy = query.orderBy as string;
+      }
+      else {
+        state.value.orderBy = queryDefaults.orderBy;
+      }
+
+      if (query.orderDirection?.length) {
+        state.value.orderDirection = query.orderDirection as "asc" | "desc";
+      }
+      else {
+        state.value.orderDirection = queryDefaults.orderDirection;
+      }
+
+      if (query.requireAllCategories?.length) {
+        state.value.requireAllCategories = query.requireAllCategories === "true";
+      }
+      else {
+        state.value.requireAllCategories = queryDefaults.requireAllCategories;
+      }
+
+      if (query.requireAllTags?.length) {
+        state.value.requireAllTags = query.requireAllTags === "true";
+      }
+      else {
+        state.value.requireAllTags = queryDefaults.requireAllTags;
+      }
+
+      if (query.requireAllTools?.length) {
+        state.value.requireAllTools = query.requireAllTools === "true";
+      }
+      else {
+        state.value.requireAllTools = queryDefaults.requireAllTools;
+      }
+
+      if (query.requireAllFoods?.length) {
+        state.value.requireAllFoods = query.requireAllFoods === "true";
+      }
+      else {
+        state.value.requireAllFoods = queryDefaults.requireAllFoods;
+      }
+
+      const promises: Promise<void>[] = [];
+
+      if (query.categories?.length) {
+        promises.push(
+          waitUntilAndExecute(
+            () => categories.store.value.length > 0,
+            () => {
+              const result = categories.store.value.filter(item =>
+                (query.categories as string[]).includes(item.id as string),
+              );
+
+              selectedCategories.value = result as NoUndefinedField<RecipeCategory>[];
+            },
+          ),
+        );
+      }
+      else {
+        selectedCategories.value = [];
+      }
+
+      if (query.tags?.length) {
+        promises.push(
+          waitUntilAndExecute(
+            () => tags.store.value.length > 0,
+            () => {
+              const result = tags.store.value.filter(item => (query.tags as string[]).includes(item.id as string));
+              selectedTags.value = result as NoUndefinedField<RecipeTag>[];
+            },
+          ),
+        );
+      }
+      else {
+        selectedTags.value = [];
+      }
+
+      if (query.tools?.length) {
+        promises.push(
+          waitUntilAndExecute(
+            () => tools.store.value.length > 0,
+            () => {
+              const result = tools.store.value.filter(item => (query.tools as string[]).includes(item.id));
+              selectedTools.value = result as NoUndefinedField<RecipeTool>[];
+            },
+          ),
+        );
+      }
+      else {
+        selectedTools.value = [];
+      }
+
+      if (query.foods?.length) {
+        promises.push(
+          waitUntilAndExecute(
+            () => {
+              if (foods.store.value) {
+                return foods.store.value.length > 0;
+              }
+              return false;
+            },
+            () => {
+              const result = foods.store.value?.filter(item => (query.foods as string[]).includes(item.id));
+              selectedFoods.value = result ?? [];
+            },
+          ),
+        );
+      }
+      else {
+        selectedFoods.value = [];
+      }
+
+      if (query.households?.length) {
+        promises.push(
+          waitUntilAndExecute(
+            () => {
+              if (households.store.value) {
+                return households.store.value.length > 0;
+              }
+              return false;
+            },
+            () => {
+              const result = households.store.value?.filter(item => (query.households as string[]).includes(item.id));
+              selectedHouseholds.value = result as NoUndefinedField<HouseholdSummary>[] ?? [];
+            },
+          ),
+        );
+      }
+      else {
+        selectedHouseholds.value = [];
+      }
+
+      await Promise.allSettled(promises);
+    };
+
+    onMounted(async () => {
+      // restore the user's last search query
+      if (searchQuerySession.value.recipe && !(Object.keys(route.query).length > 0)) {
+        try {
+          const query = JSON.parse(searchQuerySession.value.recipe);
+          await router.replace({ query });
+        }
+        catch {
+          searchQuerySession.value.recipe = "";
+          router.replace({ query: {} });
+        }
+      }
+
+      await hydrateSearch();
+      await search();
+      state.value.ready = true;
+    });
+
+    watchDebounced(
+      [
+        () => state.value.search,
+        () => state.value.requireAllCategories,
+        () => state.value.requireAllTags,
+        () => state.value.requireAllTools,
+        () => state.value.requireAllFoods,
+        () => state.value.orderBy,
+        () => state.value.orderDirection,
+        selectedCategories,
+        selectedFoods,
+        selectedHouseholds,
+        selectedTags,
+        selectedTools,
+      ],
+      async () => {
+        if (state.value.ready && state.value.auto) {
+          await search();
+        }
+      },
+      {
+        debounce: 500,
+      },
+    );
+
+    return {
+      sortText,
+      search,
+      reset,
+      state,
+      categories: categories.store as unknown as NoUndefinedField<RecipeCategory>[],
+      tags: tags.store as unknown as NoUndefinedField<RecipeTag>[],
+      foods: foods.store,
+      tools: tools.store as unknown as NoUndefinedField<RecipeTool>[],
+      households: households.store as unknown as NoUndefinedField<HouseholdSummary>[],
+
+      sortable,
+      toggleOrderDirection,
+      hideKeyboard,
+      input,
+
+      selectedCategories,
+      selectedFoods,
+      selectedHouseholds,
+      selectedTags,
+      selectedTools,
+      appendRecipes,
+      assignSorted,
+      recipes,
+      removeRecipe,
+      replaceRecipes,
+      passedQueryWithSeed,
+
+      filterItems,
+    };
+  },
+});
+</script>
+
+<style lang="css">
+.search-row {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 0.65rem;
+  margin-top: 1rem;
+}
+
+.search-container {
+  display: flex;
+  justify-content: center;
+}
+
+.search-box {
+  width: 950px;
+}
+
+.search-button-container {
+  margin: 3rem auto 0 auto;
+  max-width: 500px;
+}
+</style>
--- a/frontend/components/Domain/Recipe/RecipeExplorerPage/RecipeExplorerPage.vue
+++ b/frontend/components/Domain/Recipe/RecipeExplorerPage/RecipeExplorerPage.vue
@@ -1,72 +0,0 @@
-<template>
-  <v-container
-    fluid
-    class="px-0"
-  >
-    <RecipeExplorerPageSearch
-      ref="searchComponent"
-      @ready="onSearchReady"
-    />
-    <v-divider />
-    <v-container class="mt-6 px-md-6">
-      <RecipeCardSection
-        v-if="ready"
-        class="mt-n5"
-        :icon="$globals.icons.silverwareForkKnife"
-        :title="$t('general.recipes')"
-        :recipes="recipes"
-        :query="searchQuery"
-        disable-sort
-        @item-selected="onItemSelected"
-        @replace-recipes="replaceRecipes"
-        @append-recipes="appendRecipes"
-      />
-    </v-container>
-  </v-container>
-</template>
-
-<script lang="ts">
-import RecipeExplorerPageSearch from "./RecipeExplorerPageParts/RecipeExplorerPageSearch.vue";
-import { useLoggedInState } from "~/composables/use-logged-in-state";
-import RecipeCardSection from "~/components/Domain/Recipe/RecipeCardSection.vue";
-import { useLazyRecipes } from "~/composables/recipes";
-
-export default defineNuxtComponent({
-  components: { RecipeCardSection, RecipeExplorerPageSearch },
-  setup() {
-    const $auth = useMealieAuth();
-    const route = useRoute();
-
-    const { isOwnGroup } = useLoggedInState();
-    const groupSlug = computed(() => route.params.groupSlug as string || $auth.user.value?.groupSlug || "");
-
-    const { recipes, appendRecipes, replaceRecipes } = useLazyRecipes(isOwnGroup.value ? null : groupSlug.value);
-
-    const ready = ref(false);
-    const searchComponent = ref<InstanceType<typeof RecipeExplorerPageSearch>>();
-
-    const searchQuery = computed(() => {
-      return searchComponent.value?.passedQueryWithSeed || {};
-    });
-
-    function onSearchReady() {
-      ready.value = true;
-    }
-
-    function onItemSelected(item: any, urlPrefix: string) {
-      searchComponent.value?.filterItems(item, urlPrefix);
-    }
-
-    return {
-      ready,
-      searchComponent,
-      searchQuery,
-      recipes,
-      appendRecipes,
-      replaceRecipes,
-      onSearchReady,
-      onItemSelected,
-    };
-  },
-});
-</script>
--- a/frontend/components/Domain/Recipe/RecipeExplorerPage/RecipeExplorerPageParts/RecipeExplorerPageSearch.vue
+++ b/frontend/components/Domain/Recipe/RecipeExplorerPage/RecipeExplorerPageParts/RecipeExplorerPageSearch.vue
@@ -1,231 +0,0 @@
-<template>
-  <div class="search-container pb-8">
-    <form
-      class="search-box pa-2"
-      @submit.prevent="search"
-    >
-      <div class="d-flex justify-center mb-2">
-        <v-text-field
-          ref="input"
-          v-model="state.search"
-          variant="outlined"
-          hide-details
-          clearable
-          color="primary"
-          :placeholder="$t('search.search-placeholder')"
-          :prepend-inner-icon="$globals.icons.search"
-          @keyup.enter="hideKeyboard"
-        />
-      </div>
-      <div class="search-row">
-        <RecipeExplorerPageSearchFilters />
-        <!-- Sort Options -->
-        <v-menu
-          offset-y
-          nudge-bottom="3"
-        >
-          <template #activator="{ props }">
-            <v-btn
-              class="ml-auto"
-              size="small"
-              color="accent"
-              v-bind="props"
-            >
-              <v-icon :start="!$vuetify.display.xs">
-                {{ state.orderDirection === "asc" ? $globals.icons.sortAscending : $globals.icons.sortDescending }}
-              </v-icon>
-              {{ $vuetify.display.xs ? null : sortText }}
-            </v-btn>
-          </template>
-          <v-card>
-            <v-list>
-              <v-list-item
-                slim
-                density="comfortable"
-                :prepend-icon="state.orderDirection === 'asc' ? $globals.icons.sortDescending : $globals.icons.sortAscending"
-                :title="state.orderDirection === 'asc' ? $t('general.sort-descending') : $t('general.sort-ascending')"
-                @click="toggleOrderDirection"
-              />
-              <v-divider />
-              <v-list-item
-                v-for="v in sortable"
-                :key="v.name"
-                :active="state.orderBy === v.value"
-                slim
-                density="comfortable"
-                :prepend-icon="v.icon"
-                :title="v.name"
-                @click="setOrderBy(v.value)"
-              />
-            </v-list>
-          </v-card>
-        </v-menu>
-
-        <!-- Settings -->
-        <v-menu
-          offset-y
-          bottom
-          start
-          nudge-bottom="3"
-          :close-on-content-click="false"
-        >
-          <template #activator="{ props }">
-            <v-btn
-              size="small"
-              color="accent"
-              dark
-              v-bind="props"
-            >
-              <v-icon size="small">
-                {{ $globals.icons.cog }}
-              </v-icon>
-            </v-btn>
-          </template>
-          <v-card>
-            <v-card-text>
-              <v-switch
-                v-model="state.auto"
-                :label="$t('search.auto-search')"
-                single-line
-              />
-              <v-btn
-                block
-                color="primary"
-                @click="reset"
-              >
-                {{ $t("general.reset") }}
-              </v-btn>
-            </v-card-text>
-          </v-card>
-        </v-menu>
-      </div>
-      <div
-        v-if="!state.auto"
-        class="search-button-container"
-      >
-        <v-btn
-          size="x-large"
-          color="primary"
-          type="submit"
-          block
-        >
-          <v-icon start>
-            {{ $globals.icons.search }}
-          </v-icon>
-          {{ $t("search.search") }}
-        </v-btn>
-      </div>
-    </form>
-  </div>
-</template>
-
-<script setup lang="ts">
-import RecipeExplorerPageSearchFilters from "./RecipeExplorerPageSearchFilters.vue";
-import { useRecipeExplorerSearch, clearRecipeExplorerSearchState } from "~/composables/use-recipe-explorer-search";
-
-const emit = defineEmits<{
-  ready: [];
-}>();
-
-const $auth = useMealieAuth();
-const route = useRoute();
-const { $globals } = useNuxtApp();
-const i18n = useI18n();
-
-const groupSlug = computed(() => route.params.groupSlug as string || $auth.user.value?.groupSlug || "");
-
-const {
-  state,
-  passedQueryWithSeed,
-  search,
-  reset,
-  toggleOrderDirection,
-  setOrderBy,
-  filterItems,
-  initialize,
-} = useRecipeExplorerSearch(groupSlug);
-
-defineExpose({
-  passedQueryWithSeed,
-  filterItems,
-});
-
-onMounted(async () => {
-  await initialize();
-  emit("ready");
-});
-
-onUnmounted(() => {
-  // Clear the cache when component unmounts to ensure fresh state on remount
-  clearRecipeExplorerSearchState(groupSlug.value);
-});
-
-const sortText = computed(() => {
-  const sort = sortable.value.find(s => s.value === state.value.orderBy);
-  if (!sort) return "";
-  return `${sort.name}`;
-});
-
-const sortable = computed(() => [
-  {
-    icon: $globals.icons.orderAlphabeticalAscending,
-    name: i18n.t("general.sort-alphabetically"),
-    value: "name",
-  },
-  {
-    icon: $globals.icons.newBox,
-    name: i18n.t("general.created"),
-    value: "created_at",
-  },
-  {
-    icon: $globals.icons.chefHat,
-    name: i18n.t("general.last-made"),
-    value: "last_made",
-  },
-  {
-    icon: $globals.icons.star,
-    name: i18n.t("general.rating"),
-    value: "rating",
-  },
-  {
-    icon: $globals.icons.update,
-    name: i18n.t("general.updated"),
-    value: "updated_at",
-  },
-  {
-    icon: $globals.icons.diceMultiple,
-    name: i18n.t("general.random"),
-    value: "random",
-  },
-]);
-
-// Methods
-const input: Ref<any> = ref(null);
-
-function hideKeyboard() {
-  input.value?.blur();
-}
-</script>
-
-<style scoped>
-.search-row {
-  display: flex;
-  flex-wrap: wrap;
-  gap: 0.65rem;
-  margin-top: 1rem;
-}
-
-.search-container {
-  display: flex;
-  justify-content: center;
-}
-
-.search-box {
-  width: 950px;
-}
-
-.search-button-container {
-  margin: 3rem auto 0 auto;
-  max-width: 500px;
-}
-</style>
--- a/frontend/components/Domain/Recipe/RecipeExplorerPage/RecipeExplorerPageParts/RecipeExplorerPageSearchFilters.vue
+++ b/frontend/components/Domain/Recipe/RecipeExplorerPage/RecipeExplorerPageParts/RecipeExplorerPageSearchFilters.vue
@@ -1,104 +0,0 @@
-<template>
-  <!-- Category Filter -->
-  <SearchFilter
-    v-if="categories"
-    v-model="selectedCategories"
-    v-model:require-all="state.requireAllCategories"
-    :items="categories"
-  >
-    <v-icon start>
-      {{ $globals.icons.categories }}
-    </v-icon>
-    {{ $t("category.categories") }}
-  </SearchFilter>
-
-  <!-- Tag Filter -->
-  <SearchFilter
-    v-if="tags"
-    v-model="selectedTags"
-    v-model:require-all="state.requireAllTags"
-    :items="tags"
-  >
-    <v-icon start>
-      {{ $globals.icons.tags }}
-    </v-icon>
-    {{ $t("tag.tags") }}
-  </SearchFilter>
-
-  <!-- Tool Filter -->
-  <SearchFilter
-    v-if="tools"
-    v-model="selectedTools"
-    v-model:require-all="state.requireAllTools"
-    :items="tools"
-  >
-    <v-icon start>
-      {{ $globals.icons.potSteam }}
-    </v-icon>
-    {{ $t("tool.tools") }}
-  </SearchFilter>
-
-  <!-- Food Filter -->
-  <SearchFilter
-    v-if="foods"
-    v-model="selectedFoods"
-    v-model:require-all="state.requireAllFoods"
-    :items="foods"
-  >
-    <v-icon start>
-      {{ $globals.icons.foods }}
-    </v-icon>
-    {{ $t("general.foods") }}
-  </SearchFilter>
-
-  <!-- Household Filter -->
-  <SearchFilter
-    v-if="households.length > 1"
-    v-model="selectedHouseholds"
-    :items="households"
-    radio
-  >
-    <v-icon start>
-      {{ $globals.icons.household }}
-    </v-icon>
-    {{ $t("household.households") }}
-  </SearchFilter>
-</template>
-
-<script setup lang="ts">
-import { useLoggedInState } from "~/composables/use-logged-in-state";
-import { useRecipeExplorerSearch } from "~/composables/use-recipe-explorer-search";
-import {
-  useCategoryStore,
-  usePublicCategoryStore,
-  useFoodStore,
-  usePublicFoodStore,
-  useHouseholdStore,
-  usePublicHouseholdStore,
-  useTagStore,
-  usePublicTagStore,
-  useToolStore,
-  usePublicToolStore,
-} from "~/composables/store";
-
-const $auth = useMealieAuth();
-const route = useRoute();
-
-const { isOwnGroup } = useLoggedInState();
-const groupSlug = computed(() => route.params.groupSlug as string || $auth.user.value?.groupSlug || "");
-
-const {
-  state,
-  selectedCategories,
-  selectedFoods,
-  selectedHouseholds,
-  selectedTags,
-  selectedTools,
-} = useRecipeExplorerSearch(groupSlug);
-
-const { store: categories } = isOwnGroup.value ? useCategoryStore() : usePublicCategoryStore(groupSlug.value);
-const { store: tags } = isOwnGroup.value ? useTagStore() : usePublicTagStore(groupSlug.value);
-const { store: tools } = isOwnGroup.value ? useToolStore() : usePublicToolStore(groupSlug.value);
-const { store: foods } = isOwnGroup.value ? useFoodStore() : usePublicFoodStore(groupSlug.value);
-const { store: households } = isOwnGroup.value ? useHouseholdStore() : usePublicHouseholdStore(groupSlug.value);
-</script>
--- a/frontend/components/Domain/Recipe/RecipeFavoriteBadge.vue
+++ b/frontend/components/Domain/Recipe/RecipeFavoriteBadge.vue
@@ -4,7 +4,7 @@
    nudge-right="50"
    :color="buttonStyle ? 'info' : 'secondary'"
  >
-    <template #activator="{ props: tooltipProps }">
+    <template #activator="{ props }">
      <v-btn
        v-if="isFavorite || showAlways"
        icon
@@ -13,7 +13,7 @@
        size="small"
        :color="buttonStyle ? 'info' : 'secondary'"
        :fab="buttonStyle"
-        v-bind="{ ...tooltipProps, ...$attrs }"
+        v-bind="{ ...props, ...$attrs }"
        @click.prevent="toggleFavorite"
      >
        <v-icon
@@ -28,39 +28,47 @@
  </v-tooltip>
 </template>

-<script setup lang="ts">
+<script lang="ts">
 import { useUserSelfRatings } from "~/composables/use-users";
 import { useUserApi } from "~/composables/api";

-interface Props {
-  recipeId?: string;
-  showAlways?: boolean;
-  buttonStyle?: boolean;
-}
-const props = withDefaults(defineProps<Props>(), {
-  recipeId: "",
-  showAlways: false,
-  buttonStyle: false,
+export default defineNuxtComponent({
+  props: {
+    recipeId: {
+      type: String,
+      default: "",
+    },
+    showAlways: {
+      type: Boolean,
+      default: false,
+    },
+    buttonStyle: {
+      type: Boolean,
+      default: false,
+    },
+  },
+  setup(props) {
+    const api = useUserApi();
+    const $auth = useMealieAuth();
+    const { userRatings, refreshUserRatings } = useUserSelfRatings();
+
+    const isFavorite = computed(() => {
+      const rating = userRatings.value.find(r => r.recipeId === props.recipeId);
+      return rating?.isFavorite || false;
+    });
+
+    async function toggleFavorite() {
+      if (!$auth.user.value) return;
+      if (!isFavorite.value) {
+        await api.users.addFavorite($auth.user.value?.id, props.recipeId);
+      }
+      else {
+        await api.users.removeFavorite($auth.user.value?.id, props.recipeId);
+      }
+      await refreshUserRatings();
+    }
+
+    return { isFavorite, toggleFavorite };
+  },
 });
-
-const { userRatings, refreshUserRatings } = useUserSelfRatings();
-
-const isFavorite = computed(() => {
-  const rating = userRatings.value.find(r => r.recipeId === props.recipeId);
-  return rating?.isFavorite || false;
-});
-
-async function toggleFavorite() {
-  const api = useUserApi();
-  const $auth = useMealieAuth();
-
-  if (!$auth.user.value) return;
-  if (!isFavorite.value) {
-    await api.users.addFavorite($auth.user.value?.id, props.recipeId);
-  }
-  else {
-    await api.users.removeFavorite($auth.user.value?.id, props.recipeId);
-  }
-  await refreshUserRatings();
-}
 </script>
--- a/frontend/components/Domain/Recipe/RecipeImageUploadBtn.vue
+++ b/frontend/components/Domain/Recipe/RecipeImageUploadBtn.vue
@@ -7,11 +7,11 @@
      nudge-top="6"
      :close-on-content-click="false"
    >
-      <template #activator="{ props: activatorProps }">
+      <template #activator="{ props }">
        <v-btn
          color="accent"
          dark
-          v-bind="activatorProps"
+          v-bind="props"
        >
          <v-icon start>
            {{ $globals.icons.fileImage }}
@@ -61,42 +61,52 @@
  </div>
 </template>

-<script setup lang="ts">
+<script lang="ts">
 import { useUserApi } from "~/composables/api";

 const REFRESH_EVENT = "refresh";
 const UPLOAD_EVENT = "upload";

-const props = defineProps<{ slug: string }>();
+export default defineNuxtComponent({
+  props: {
+    slug: {
+      type: String,
+      required: true,
+    },
+  },
+  setup(props, context) {
+    const state = reactive({
+      url: "",
+      loading: false,
+      menu: false,
+    });

-const emit = defineEmits<{
-  refresh: [];
-  upload: [fileObject: File];
-}>();
+    function uploadImage(fileObject: File) {
+      context.emit(UPLOAD_EVENT, fileObject);
+      state.menu = false;
+    }

-const url = ref("");
-const loading = ref(false);
-const menu = ref(false);
+    const api = useUserApi();
+    async function getImageFromURL() {
+      state.loading = true;
+      if (await api.recipes.updateImagebyURL(props.slug, state.url)) {
+        context.emit(REFRESH_EVENT);
+      }
+      state.loading = false;
+      state.menu = false;
+    }

-function uploadImage(fileObject: File) {
-  emit(UPLOAD_EVENT, fileObject);
-  menu.value = false;
-}
+    const i18n = useI18n();
+    const messages = props.slug ? [""] : [i18n.t("recipe.save-recipe-before-use")];

-const api = useUserApi();
-async function getImageFromURL() {
-  loading.value = true;
-  if (await api.recipes.updateImagebyURL(props.slug, url.value)) {
-    emit(REFRESH_EVENT);
-  }
-  loading.value = false;
-  menu.value = false;
-}
-
-const i18n = useI18n();
-const messages = computed(() =>
-  props.slug ? [""] : [i18n.t("recipe.save-recipe-before-use")],
-);
+    return {
+      ...toRefs(state),
+      uploadImage,
+      getImageFromURL,
+      messages,
+    };
+  },
+});
 </script>

 <style lang="scss" scoped></style>
--- a/frontend/components/Domain/Recipe/RecipeIngredientEditor.vue
+++ b/frontend/components/Domain/Recipe/RecipeIngredientEditor.vue
@@ -17,6 +17,7 @@
      class="d-flex flex-wrap my-1"
    >
      <v-col
+        v-if="!disableAmount"
        sm="12"
        md="2"
        cols="12"
@@ -31,7 +32,7 @@
          :placeholder="$t('recipe.quantity')"
          @keypress="quantityFilter"
        >
-          <template v-if="enableDragHandle" #prepend>
+          <template #prepend>
            <v-icon
              class="mr-n1 handle"
            >
@@ -41,6 +42,7 @@
        </v-text-field>
      </v-col>
      <v-col
+        v-if="!disableAmount"
        sm="12"
        md="3"
        cols="12"
@@ -59,25 +61,8 @@
          class="mx-1"
          :placeholder="$t('recipe.choose-unit')"
          clearable
-          :menu-props="{ attach: props.menuAttachTarget, maxHeight: '250px' }"
          @keyup.enter="handleUnitEnter"
        >
-          <template #prepend>
-            <v-tooltip v-if="unitError" location="bottom">
-              <template #activator="{ props: unitTooltipProps }">
-                <v-icon
-                  v-bind="unitTooltipProps"
-                  class="ml-2 mr-n3 opacity-100"
-                  color="primary"
-                >
-                  {{ $globals.icons.alert }}
-                </v-icon>
-              </template>
-              <span v-if="unitErrorTooltip">
-                {{ unitErrorTooltip }}
-              </span>
-            </v-tooltip>
-          </template>
          <template #no-data>
            <div class="caption text-center pb-2">
              {{ $t("recipe.press-enter-to-create") }}
@@ -97,6 +82,7 @@

      <!-- Foods Input -->
      <v-col
+        v-if="!disableAmount"
        m="12"
        md="3"
        cols="12"
@@ -116,25 +102,8 @@
          class="mx-1 py-0"
          :placeholder="$t('recipe.choose-food')"
          clearable
-          :menu-props="{ attach: props.menuAttachTarget, maxHeight: '250px' }"
          @keyup.enter="handleFoodEnter"
        >
-          <template #prepend>
-            <v-tooltip v-if="foodError" location="bottom">
-              <template #activator="{ props: foodTooltipProps }">
-                <v-icon
-                  v-bind="foodTooltipProps"
-                  class="ml-2 mr-n3 opacity-100"
-                  color="primary"
-                >
-                  {{ $globals.icons.alert }}
-                </v-icon>
-              </template>
-              <span v-if="foodErrorTooltip">
-                {{ foodErrorTooltip }}
-              </span>
-            </v-tooltip>
-          </template>
          <template #no-data>
            <div class="caption text-center pb-2">
              {{ $t("recipe.press-enter-to-create") }}
@@ -165,22 +134,38 @@
            :placeholder="$t('recipe.notes')"
            class="mb-auto"
            @click="$emit('clickIngredientField', 'note')"
-          />
+          >
+            <template #prepend>
+              <v-icon
+                v-if="disableAmount && $attrs && $attrs.delete"
+                class="mr-n1 handle"
+              >
+                {{ $globals.icons.arrowUpDown }}
+              </v-icon>
+            </template>
+          </v-text-field>
          <BaseButtonGroup
-            v-if="enableContextMenu"
            hover
            :large="false"
            class="my-auto d-flex"
            :buttons="btns"
            @toggle-section="toggleTitle"
+            @toggle-original="toggleOriginalText"
            @insert-above="$emit('insert-above')"
            @insert-below="$emit('insert-below')"
+            @insert-ingredient="$emit('insert-ingredient')"
            @delete="$emit('delete')"
          />
        </div>
      </v-col>
    </v-row>
-    <slot name="before-divider" />
+    <p
+      v-if="showOriginalText"
+      class="text-caption"
+    >
+      {{ $t("recipe.original-text-with-value", { originalText: model.originalText }) }}
+    </p>
+
    <v-divider
      v-if="!mdAndUp"
      class="my-4"
@@ -200,35 +185,11 @@ import type { RecipeIngredient } from "~/lib/api/types/recipe";
 const model = defineModel<RecipeIngredient>({ required: true });

 const props = defineProps({
-  menuAttachTarget: {
-    type: String,
-    default: "body",
-  },
-  unitError: {
+  disableAmount: {
    type: Boolean,
    default: false,
  },
-  unitErrorTooltip: {
-    type: String,
-    default: "",
-  },
-  foodError: {
-    type: Boolean,
-    default: false,
-  },
-  foodErrorTooltip: {
-    type: String,
-    default: "",
-  },
-  enableContextMenu: {
-    type: Boolean,
-    default: false,
-  },
-  enableDragHandle: {
-    type: Boolean,
-    default: false,
-  },
-  deleteDisabled: {
+  allowInsertIngredient: {
    type: Boolean,
    default: false,
  },
@@ -238,6 +199,7 @@ defineEmits([
  "clickIngredientField",
  "insert-above",
  "insert-below",
+  "insert-ingredient",
  "delete",
 ]);

@@ -247,6 +209,7 @@ const { $globals } = useNuxtApp();

 const state = reactive({
  showTitle: false,
+  showOriginalText: false,
 });

 const contextMenuOptions = computed(() => {
@@ -265,6 +228,20 @@ const contextMenuOptions = computed(() => {
    },
  ];

+  if (props.allowInsertIngredient) {
+    options.push({
+      text: i18n.t("recipe.insert-ingredient"),
+      event: "insert-ingredient",
+    });
+  }
+
+  if (model.value.originalText) {
+    options.push({
+      text: i18n.t("recipe.see-original-text"),
+      event: "toggle-original",
+    });
+  }
+
  return options;
 });

@@ -285,8 +262,8 @@ const btns = computed(() => {
    text: i18n.t("general.delete"),
    event: "delete",
    children: undefined,
-    disabled: props.deleteDisabled,
  });
+
  return out;
 });

@@ -323,6 +300,10 @@ function toggleTitle() {
  state.showTitle = !state.showTitle;
 }

+function toggleOriginalText() {
+  state.showOriginalText = !state.showOriginalText;
+}
+
 function handleUnitEnter() {
  if (
    model.value.unit === undefined
@@ -349,7 +330,7 @@ function quantityFilter(e: KeyboardEvent) {
  }
 }

-const { showTitle } = toRefs(state);
+const { showTitle, showOriginalText } = toRefs(state);

 const foods = foodStore.store;
 const units = unitStore.store;
--- a/frontend/components/Domain/Recipe/RecipeIngredientHtml.vue
+++ b/frontend/components/Domain/Recipe/RecipeIngredientHtml.vue
@@ -1,44 +1,23 @@
 <template>
-  <div class="ingredient-link-label links-disabled">
-    <SafeMarkdown v-if="baseText" :source="baseText" />
-    <SafeMarkdown
-      v-if="ingredient?.note"
-      class="d-inline"
-      :source="` ${ingredient.note}`"
-    />
-  </div>
+  <!-- eslint-disable-next-line vue/no-v-html -->
+  <div v-html="safeMarkup" />
 </template>

-<script setup lang="ts">
-import { computed } from "vue";
-import type { RecipeIngredient } from "~/lib/api/types/recipe";
-import { useParsedIngredientText } from "~/composables/recipes";
+<script lang="ts">
+import { sanitizeIngredientHTML } from "~/composables/recipes/use-recipe-ingredients";

-interface Props {
-  ingredient?: RecipeIngredient;
-  scale?: number;
-}
-
-const { ingredient, scale = 1 } = defineProps<Props>();
-
-const baseText = computed(() => {
-  if (!ingredient) return "";
-  const parsed = useParsedIngredientText(ingredient, scale);
-  return [parsed.quantity, parsed.unit, parsed.name].filter(Boolean).join(" ").trim();
+export default defineNuxtComponent({
+  props: {
+    markup: {
+      type: String,
+      required: true,
+    },
+  },
+  setup(props) {
+    const safeMarkup = computed(() => sanitizeIngredientHTML(props.markup));
+    return {
+      safeMarkup,
+    };
+  },
 });
 </script>
-
-<style scoped>
-.ingredient-link-label {
-  display: block;
-  line-height: 1.25;
-  word-break: break-word;
-  font-size: 0.95rem;
-}
-.links-disabled :deep(a) {
-  pointer-events: none;
-  cursor: default;
-  color: var(--v-theme-primary);
-  text-decoration: none;
-}
-</style>
--- a/frontend/components/Domain/Recipe/RecipeIngredientListItem.vue
+++ b/frontend/components/Domain/Recipe/RecipeIngredientListItem.vue
@@ -28,20 +28,34 @@
  </div>
 </template>

-<script setup lang="ts">
+<script lang="ts">
 import type { RecipeIngredient } from "~/lib/api/types/household";
 import { useParsedIngredientText } from "~/composables/recipes";

-interface Props {
-  ingredient: RecipeIngredient;
-  scale?: number;
-}
-const props = withDefaults(defineProps<Props>(), {
-  scale: 1,
-});
+export default defineNuxtComponent({
+  props: {
+    ingredient: {
+      type: Object as () => RecipeIngredient,
+      required: true,
+    },
+    disableAmount: {
+      type: Boolean,
+      default: false,
+    },
+    scale: {
+      type: Number,
+      default: 1,
+    },
+  },
+  setup(props) {
+    const parsedIng = computed(() => {
+      return useParsedIngredientText(props.ingredient, props.disableAmount, props.scale);
+    });

-const parsedIng = computed(() => {
-  return useParsedIngredientText(props.ingredient, props.scale);
+    return {
+      parsedIng,
+    };
+  },
 });
 </script>

--- a/frontend/components/Domain/Recipe/RecipeIngredients.vue
+++ b/frontend/components/Domain/Recipe/RecipeIngredients.vue
@@ -43,6 +43,7 @@
          <v-list-item-title>
            <RecipeIngredientListItem
              :ingredient="ingredient"
+              :disable-amount="disableAmount"
              :scale="scale"
            />
          </v-list-item-title>
@@ -52,51 +53,71 @@
  </div>
 </template>

-<script setup lang="ts">
+<script lang="ts">
 import RecipeIngredientListItem from "./RecipeIngredientListItem.vue";
 import { parseIngredientText } from "~/composables/recipes";
 import type { RecipeIngredient } from "~/lib/api/types/recipe";

-interface Props {
-  value?: RecipeIngredient[];
-  scale?: number;
-  isCookMode?: boolean;
-}
-const props = withDefaults(defineProps<Props>(), {
-  value: () => [],
-  scale: 1,
-  isCookMode: false,
-});
-
-function validateTitle(title?: string | null) {
-  return !(title === undefined || title === "" || title === null);
-}
-
-const checked = ref(props.value.map(() => false));
-const showTitleEditor = computed(() => props.value.map(x => validateTitle(x.title)));
-
-const ingredientCopyText = computed(() => {
-  const components: string[] = [];
-  props.value.forEach((ingredient) => {
-    if (ingredient.title) {
-      if (components.length) {
-        components.push("");
-      }
-
-      components.push(`[${ingredient.title}]`);
+export default defineNuxtComponent({
+  components: { RecipeIngredientListItem },
+  props: {
+    value: {
+      type: Array as () => RecipeIngredient[],
+      default: () => [],
+    },
+    disableAmount: {
+      type: Boolean,
+      default: false,
+    },
+    scale: {
+      type: Number,
+      default: 1,
+    },
+    isCookMode: {
+      type: Boolean,
+      default: false,
+    },
+  },
+  setup(props) {
+    function validateTitle(title?: string) {
+      return !(title === undefined || title === "" || title === null);
    }

-    components.push(parseIngredientText(ingredient, props.scale, false));
-  });
+    const state = reactive({
+      checked: props.value.map(() => false),
+      showTitleEditor: computed(() => props.value.map(x => validateTitle(x.title))),
+    });

-  return components.join("\n");
+    const ingredientCopyText = computed(() => {
+      const components: string[] = [];
+      props.value.forEach((ingredient) => {
+        if (ingredient.title) {
+          if (components.length) {
+            components.push("");
+          }
+
+          components.push(`[${ingredient.title}]`);
+        }
+
+        components.push(parseIngredientText(ingredient, props.disableAmount, props.scale, false));
+      });
+
+      return components.join("\n");
+    });
+
+    function toggleChecked(index: number) {
+      // TODO Find a better way to do this - $set is not available, and
+      // direct array modifications are not propagated for some reason
+      state.checked.splice(index, 1, !state.checked[index]);
+    }
+
+    return {
+      ...toRefs(state),
+      ingredientCopyText,
+      toggleChecked,
+    };
+  },
 });
-
-function toggleChecked(index: number) {
-  // TODO Find a better way to do this - $set is not available, and
-  // direct array modifications are not propagated for some reason
-  checked.value.splice(index, 1, !checked.value[index]);
-}
 </script>

 <style>
--- a/frontend/components/Domain/Recipe/RecipeLastMade.vue
+++ b/frontend/components/Domain/Recipe/RecipeLastMade.vue
@@ -3,7 +3,6 @@
    <div>
      <BaseDialog
        v-model="madeThisDialog"
-        :loading="madeThisFormLoading"
        :icon="$globals.icons.chefHat"
        :title="$t('recipe.made-this')"
        :submit-text="$t('recipe.add-to-timeline')"
@@ -30,11 +29,11 @@
                    offset-y
                    max-width="290px"
                  >
-                    <template #activator="{ props: activatorProps }">
+                    <template #activator="{ props }">
                      <v-text-field
                        v-model="newTimelineEventTimestampString"
                        :prepend-icon="$globals.icons.calendar"
-                        v-bind="activatorProps"
+                        v-bind="props"
                        readonly
                      />
                    </template>
@@ -86,13 +85,13 @@
    <div>
      <div v-if="lastMadeReady" class="d-flex justify-center flex-wrap">
        <v-row no-gutters class="d-flex flex-wrap align-center" style="font-size: larger">
-          <v-tooltip location="bottom">
-            <template #activator="{ props: tooltipProps }">
+          <v-tooltip bottom>
+            <template #activator="{ props }">
              <v-btn
                rounded
                variant="outlined"
                size="x-large"
-                v-bind="tooltipProps"
+                v-bind="props"
                style="border-color: rgb(var(--v-theme-primary));"
                @click="madeThisDialog = true"
              >
@@ -117,166 +116,148 @@
  </div>
 </template>

-<script setup lang="ts">
+<script lang="ts">
 import { whenever } from "@vueuse/core";
-import { formatISO } from "date-fns";
 import { useUserApi } from "~/composables/api";
-import { alert } from "~/composables/use-toast";
 import { useHouseholdSelf } from "~/composables/use-households";
-import type { Recipe, RecipeTimelineEventIn, RecipeTimelineEventOut } from "~/lib/api/types/recipe";
+import type { Recipe, RecipeTimelineEventIn } from "~/lib/api/types/recipe";
 import type { VForm } from "~/types/auto-forms";

-const props = defineProps<{ recipe: Recipe }>();
-const emit = defineEmits<{
-  eventCreated: [event: RecipeTimelineEventOut];
-}>();
-
-const madeThisDialog = ref(false);
-const userApi = useUserApi();
-const { household } = useHouseholdSelf();
-const i18n = useI18n();
-const $auth = useMealieAuth();
-const domMadeThisForm = ref<VForm>();
-const newTimelineEvent = ref<RecipeTimelineEventIn>({
-  subject: "",
-  eventType: "comment",
-  eventMessage: "",
-  timestamp: undefined,
-  recipeId: props.recipe?.id || "",
-});
-const newTimelineEventImage = ref<Blob | File>();
-const newTimelineEventImageName = ref<string>("");
-const newTimelineEventImagePreviewUrl = ref<string>();
-const newTimelineEventTimestamp = ref<Date>(new Date());
-const newTimelineEventTimestampString = computed(() => {
-  return formatISO(newTimelineEventTimestamp.value, { representation: "date" });
-});
-
-const lastMade = ref(props.recipe.lastMade);
-const lastMadeReady = ref(false);
-onMounted(async () => {
-  if (!$auth.user?.value?.householdSlug) {
-    lastMade.value = props.recipe.lastMade;
-  }
-  else {
-    const { data } = await userApi.households.getCurrentUserHouseholdRecipe(props.recipe.slug || "");
-    lastMade.value = data?.lastMade;
-  }
-
-  lastMadeReady.value = true;
-});
-
-whenever(
-  () => madeThisDialog.value,
-  () => {
-    // Set timestamp to now
-    newTimelineEventTimestamp.value = new Date();
+export default defineNuxtComponent({
+  props: {
+    recipe: {
+      type: Object as () => Recipe,
+      required: true,
+    },
  },
-);
+  emits: ["eventCreated"],
+  setup(props, context) {
+    const madeThisDialog = ref(false);
+    const userApi = useUserApi();
+    const { household } = useHouseholdSelf();
+    const i18n = useI18n();
+    const $auth = useMealieAuth();
+    const domMadeThisForm = ref<VForm>();
+    const newTimelineEvent = ref<RecipeTimelineEventIn>({
+      subject: "",
+      eventType: "comment",
+      eventMessage: "",
+      timestamp: undefined,
+      recipeId: props.recipe?.id || "",
+    });
+    const newTimelineEventImage = ref<Blob | File>();
+    const newTimelineEventImageName = ref<string>("");
+    const newTimelineEventImagePreviewUrl = ref<string>();
+    const newTimelineEventTimestamp = ref<Date>(new Date());
+    const newTimelineEventTimestampString = computed(() => {
+      return newTimelineEventTimestamp.value.toISOString().substring(0, 10);
+    });

-const firstDayOfWeek = computed(() => {
-  return household.value?.preferences?.firstDayOfWeek || 0;
-});
-
-function clearImage() {
-  newTimelineEventImage.value = undefined;
-  newTimelineEventImageName.value = "";
-  newTimelineEventImagePreviewUrl.value = undefined;
-}
-
-function uploadImage(fileObject: File) {
-  newTimelineEventImage.value = fileObject;
-  newTimelineEventImageName.value = fileObject.name;
-  newTimelineEventImagePreviewUrl.value = URL.createObjectURL(fileObject);
-}
-
-function updateUploadedImage(fileObject: Blob) {
-  newTimelineEventImage.value = fileObject;
-  newTimelineEventImagePreviewUrl.value = URL.createObjectURL(fileObject);
-}
-
-const datePickerMenu = ref(false);
-const madeThisFormLoading = ref(false);
-
-function resetMadeThisForm() {
-  madeThisFormLoading.value = false;
-
-  newTimelineEvent.value.eventMessage = "";
-  newTimelineEvent.value.timestamp = undefined;
-  clearImage();
-  madeThisDialog.value = false;
-  domMadeThisForm.value?.reset();
-}
-
-async function createTimelineEvent() {
-  if (!(newTimelineEventTimestampString.value && props.recipe?.id && props.recipe?.slug)) {
-    return;
-  }
-
-  madeThisFormLoading.value = true;
-
-  newTimelineEvent.value.recipeId = props.recipe.id;
-  // Note: $auth.user is now a ref
-  newTimelineEvent.value.subject = i18n.t("recipe.user-made-this", { user: $auth.user.value?.fullName });
-
-  // the user only selects the date, so we set the time to end of day local time
-  // we choose the end of day so it always comes after "new recipe" events
-  newTimelineEvent.value.timestamp = new Date(newTimelineEventTimestampString.value + "T23:59:59").toISOString();
-
-  let newEvent: RecipeTimelineEventOut | null = null;
-  try {
-    const eventResponse = await userApi.recipes.createTimelineEvent(newTimelineEvent.value);
-    newEvent = eventResponse.data;
-    if (!newEvent) {
-      throw new Error("No event created");
-    }
-  }
-  catch (error) {
-    console.error("Failed to create timeline event:", error);
-    alert.error(i18n.t("recipe.failed-to-add-to-timeline"));
-    resetMadeThisForm();
-    return;
-  }
-
-  // we also update the recipe's last made value
-  if (!lastMade.value || newTimelineEvent.value.timestamp > lastMade.value) {
-    try {
-      lastMade.value = newTimelineEvent.value.timestamp;
-      await userApi.recipes.updateLastMade(props.recipe.slug, newTimelineEvent.value.timestamp);
-    }
-    catch (error) {
-      console.error("Failed to update last made date:", error);
-      alert.error(i18n.t("recipe.failed-to-update-recipe"));
-    }
-  }
-
-  // update the image, if provided
-  let imageError = false;
-  if (newTimelineEventImage.value) {
-    try {
-      const imageResponse = await userApi.recipes.updateTimelineEventImage(
-        newEvent.id,
-        newTimelineEventImage.value,
-        newTimelineEventImageName.value,
-      );
-      if (imageResponse.data) {
-        newEvent.image = imageResponse.data.image;
+    const lastMade = ref(props.recipe.lastMade);
+    const lastMadeReady = ref(false);
+    onMounted(async () => {
+      if (!$auth.user?.value?.householdSlug) {
+        lastMade.value = props.recipe.lastMade;
+      }
+      else {
+        const { data } = await userApi.households.getCurrentUserHouseholdRecipe(props.recipe.slug || "");
+        lastMade.value = data?.lastMade;
      }
-    }
-    catch (error) {
-      imageError = true;
-      console.error("Failed to upload image for timeline event:", error);
-    }
-  }

-  if (imageError) {
-    alert.error(i18n.t("recipe.added-to-timeline-but-failed-to-add-image"));
-  }
-  else {
-    alert.success(i18n.t("recipe.added-to-timeline"));
-  }
+      lastMadeReady.value = true;
+    });

-  resetMadeThisForm();
-  emit("eventCreated", newEvent);
-}
+    whenever(
+      () => madeThisDialog.value,
+      () => {
+        // Set timestamp to now
+        newTimelineEventTimestamp.value = new Date(Date.now() - new Date().getTimezoneOffset() * 60000);
+      },
+    );
+
+    const firstDayOfWeek = computed(() => {
+      return household.value?.preferences?.firstDayOfWeek || 0;
+    });
+
+    function clearImage() {
+      newTimelineEventImage.value = undefined;
+      newTimelineEventImageName.value = "";
+      newTimelineEventImagePreviewUrl.value = undefined;
+    }
+
+    function uploadImage(fileObject: File) {
+      newTimelineEventImage.value = fileObject;
+      newTimelineEventImageName.value = fileObject.name;
+      newTimelineEventImagePreviewUrl.value = URL.createObjectURL(fileObject);
+    }
+
+    function updateUploadedImage(fileObject: Blob) {
+      newTimelineEventImage.value = fileObject;
+      newTimelineEventImagePreviewUrl.value = URL.createObjectURL(fileObject);
+    }
+
+    const state = reactive({ datePickerMenu: false });
+    async function createTimelineEvent() {
+      if (!(newTimelineEventTimestampString.value && props.recipe?.id && props.recipe?.slug)) {
+        return;
+      }
+
+      newTimelineEvent.value.recipeId = props.recipe.id;
+      // Note: $auth.user is now a ref
+      newTimelineEvent.value.subject = i18n.t("recipe.user-made-this", { user: $auth.user.value?.fullName });
+
+      // the user only selects the date, so we set the time to end of day local time
+      // we choose the end of day so it always comes after "new recipe" events
+      newTimelineEvent.value.timestamp = new Date(newTimelineEventTimestampString.value + "T23:59:59").toISOString();
+
+      const eventResponse = await userApi.recipes.createTimelineEvent(newTimelineEvent.value);
+      const newEvent = eventResponse.data;
+
+      // we also update the recipe's last made value
+      if (!lastMade.value || newTimelineEvent.value.timestamp > lastMade.value) {
+        lastMade.value = newTimelineEvent.value.timestamp;
+        await userApi.recipes.updateLastMade(props.recipe.slug, newTimelineEvent.value.timestamp);
+      }
+
+      // update the image, if provided
+      if (newTimelineEventImage.value && newEvent) {
+        const imageResponse = await userApi.recipes.updateTimelineEventImage(
+          newEvent.id,
+          newTimelineEventImage.value,
+          newTimelineEventImageName.value,
+        );
+        if (imageResponse.data) {
+          newEvent.image = imageResponse.data.image;
+        }
+      }
+
+      // reset form
+      newTimelineEvent.value.eventMessage = "";
+      newTimelineEvent.value.timestamp = undefined;
+      clearImage();
+      madeThisDialog.value = false;
+      domMadeThisForm.value?.reset();
+
+      context.emit("eventCreated", newEvent);
+    }
+
+    return {
+      ...toRefs(state),
+      domMadeThisForm,
+      madeThisDialog,
+      firstDayOfWeek,
+      newTimelineEvent,
+      newTimelineEventImage,
+      newTimelineEventImagePreviewUrl,
+      newTimelineEventTimestamp,
+      newTimelineEventTimestampString,
+      lastMade,
+      lastMadeReady,
+      createTimelineEvent,
+      clearImage,
+      uploadImage,
+      updateUploadedImage,
+    };
+  },
+});
 </script>
--- a/frontend/components/Domain/Recipe/RecipeList.vue
+++ b/frontend/components/Domain/Recipe/RecipeList.vue
@@ -1,5 +1,5 @@
 <template>
-  <v-list :class="tile ? 'd-flex flex-wrap background' : 'background'" style="background-color: transparent;">
+  <v-list :class="tile ? 'd-flex flex-wrap background' : 'background'">
    <v-sheet
      v-for="recipe, index in recipes"
      :key="recipe.id"
@@ -41,131 +41,151 @@
          </v-list-item-subtitle>
        </div>
        <template #append>
-          <slot
-            :name="'actions-' + recipe.id"
-            :v-bind="{ item: recipe }"
-          />
+            <slot
+              :name="'actions-' + recipe.id"
+              :v-bind="{ item: recipe }"
+            />
        </template>
      </v-list-item>
    </v-sheet>
  </v-list>
 </template>

-<script setup lang="ts">
+<script lang="ts">
 import DOMPurify from "dompurify";
 import { useFraction } from "~/composables/recipes/use-fraction";
 import type { ShoppingListItemOut } from "~/lib/api/types/household";
 import type { RecipeSummary } from "~/lib/api/types/recipe";

-interface Props {
-  recipes: RecipeSummary[];
-  listItem?: ShoppingListItemOut;
-  small?: boolean;
-  tile?: boolean;
-  showDescription?: boolean;
-  disabled?: boolean;
-}
-const props = withDefaults(defineProps<Props>(), {
-  listItem: undefined,
-  small: false,
-  tile: false,
-  showDescription: false,
-  disabled: false,
-});
+export default defineNuxtComponent({
+  props: {
+    recipes: {
+      type: Array as () => RecipeSummary[],
+      required: true,
+    },
+    listItem: {
+      type: Object as () => ShoppingListItemOut | undefined,
+      default: undefined,
+    },
+    small: {
+      type: Boolean,
+      default: false,
+    },
+    tile: {
+      type: Boolean,
+      default: false,
+    },
+    showDescription: {
+      type: Boolean,
+      default: false,
+    },
+    disabled: {
+      type: Boolean,
+      default: false,
+    },
+  },
+  setup(props) {
+    const $auth = useMealieAuth();
+    const { frac } = useFraction();
+    const route = useRoute();
+    const groupSlug = computed(() => route.params.groupSlug || $auth.user?.value?.groupSlug || "");

-const $auth = useMealieAuth();
-const { frac } = useFraction();
-const route = useRoute();
-const groupSlug = computed(() => route.params.groupSlug || $auth.user?.value?.groupSlug || "");
+    const attrs = computed(() => {
+      return props.small
+        ? {
+            class: {
+              sheet: props.tile ? "mb-1 me-1 justify-center align-center" : "mb-1 justify-center align-center",
+              listItem: "px-0",
+              avatar: "ma-0",
+              icon: "ma-0 pa-0 primary",
+              text: "pa-0",
+            },
+            style: {
+              text: {
+                title: "font-size: small;",
+                subTitle: "font-size: x-small;",
+              },
+            },
+          }
+        : {
+            class: {
+              sheet: props.tile ? "mx-1 justify-center align-center" : "mb-1 justify-center align-center",
+              listItem: "px-4",
+              avatar: "",
+              icon: "pa-1 primary",
+              text: "",
+            },
+            style: {
+              text: {
+                title: "",
+                subTitle: "",
+              },
+            },
+          };
+    });

-const attrs = computed(() => {
-  return props.small
-    ? {
-        class: {
-          sheet: props.tile ? "mb-1 me-1 justify-center align-center" : "mb-1 justify-center align-center",
-          listItem: "px-0",
-          avatar: "ma-0",
-          icon: "ma-0 pa-0 primary",
-          text: "pa-0",
-        },
-        style: {
-          text: {
-            title: "font-size: small;",
-            subTitle: "font-size: x-small;",
-          },
-        },
-      }
-    : {
-        class: {
-          sheet: props.tile ? "mx-1 justify-center align-center" : "mb-1 justify-center align-center",
-          listItem: "px-4",
-          avatar: "",
-          icon: "pa-1 primary",
-          text: "",
-        },
-        style: {
-          text: {
-            title: "",
-            subTitle: "",
-          },
-        },
-      };
-});
-
-function sanitizeHTML(rawHtml: string) {
-  return DOMPurify.sanitize(rawHtml, {
-    USE_PROFILES: { html: true },
-    ALLOWED_TAGS: ["strong", "sup"],
-  });
-}
-
-const listItemDescriptions = computed<string[]>(() => {
-  if (
-    props.recipes.length === 1 // we don't need to specify details if there's only one recipe ref
-    || !props.listItem?.recipeReferences
-    || props.listItem.recipeReferences.length !== props.recipes.length
-  ) {
-    return props.recipes.map(_ => "");
-  }
-
-  const listItemDescriptions: string[] = [];
-  for (let i = 0; i < props.recipes.length; i++) {
-    const itemRef = props.listItem?.recipeReferences[i];
-    const quantity = (itemRef.recipeQuantity || 1) * (itemRef.recipeScale || 1);
-
-    let listItemDescription = "";
-    if (props.listItem.unit?.fraction) {
-      const fraction = frac(quantity, 10, true);
-      if (fraction[0] !== undefined && fraction[0] > 0) {
-        listItemDescription += fraction[0];
-      }
-
-      if (fraction[1] > 0) {
-        listItemDescription += ` <sup>${fraction[1]}</sup>&frasl;<sub>${fraction[2]}</sub>`;
-      }
-      else {
-        listItemDescription = (quantity).toString();
-      }
-    }
-    else {
-      listItemDescription = (Math.round(quantity * 100) / 100).toString();
+    function sanitizeHTML(rawHtml: string) {
+      return DOMPurify.sanitize(rawHtml, {
+        USE_PROFILES: { html: true },
+        ALLOWED_TAGS: ["strong", "sup"],
+      });
    }

-    if (props.listItem.unit) {
-      const unitDisplay = props.listItem.unit.useAbbreviation && props.listItem.unit.abbreviation
-        ? props.listItem.unit.abbreviation
-        : props.listItem.unit.name;
+    const listItemDescriptions = computed<string[]>(() => {
+      if (
+        props.recipes.length === 1 // we don't need to specify details if there's only one recipe ref
+        || !props.listItem?.recipeReferences
+        || props.listItem.recipeReferences.length !== props.recipes.length
+      ) {
+        return props.recipes.map(_ => "");
+      }

-      listItemDescription += ` ${unitDisplay}`;
-    }
+      const listItemDescriptions: string[] = [];
+      for (let i = 0; i < props.recipes.length; i++) {
+        const itemRef = props.listItem?.recipeReferences[i];
+        const quantity = (itemRef.recipeQuantity || 1) * (itemRef.recipeScale || 1);

-    if (itemRef.recipeNote) {
-      listItemDescription += `, ${itemRef.recipeNote}`;
-    }
+        let listItemDescription = "";
+        if (props.listItem.unit?.fraction) {
+          const fraction = frac(quantity, 10, true);
+          if (fraction[0] !== undefined && fraction[0] > 0) {
+            listItemDescription += fraction[0];
+          }

-    listItemDescriptions.push(sanitizeHTML(listItemDescription));
-  }
+          if (fraction[1] > 0) {
+            listItemDescription += ` <sup>${fraction[1]}</sup>&frasl;<sub>${fraction[2]}</sub>`;
+          }
+          else {
+            listItemDescription = (quantity).toString();
+          }
+        }
+        else {
+          listItemDescription = (Math.round(quantity * 100) / 100).toString();
+        }

-  return listItemDescriptions;
+        if (props.listItem.unit) {
+          const unitDisplay = props.listItem.unit.useAbbreviation && props.listItem.unit.abbreviation
+            ? props.listItem.unit.abbreviation
+            : props.listItem.unit.name;
+
+          listItemDescription += ` ${unitDisplay}`;
+        }
+
+        if (itemRef.recipeNote) {
+          listItemDescription += `, ${itemRef.recipeNote}`;
+        }
+
+        listItemDescriptions.push(sanitizeHTML(listItemDescription));
+      }
+
+      return listItemDescriptions;
+    });
+
+    return {
+      attrs,
+      groupSlug,
+      listItemDescriptions,
+    };
+  },
 });
 </script>
--- a/frontend/components/Domain/Recipe/RecipeNutrition.vue
+++ b/frontend/components/Domain/Recipe/RecipeNutrition.vue
@@ -45,48 +45,62 @@
  </div>
 </template>

-<script setup lang="ts">
+<script lang="ts">
 import { useNutritionLabels } from "~/composables/recipes";
 import type { Nutrition } from "~/lib/api/types/recipe";
 import type { NutritionLabelType } from "~/composables/recipes/use-recipe-nutrition";

-interface Props {
-  edit?: boolean;
-}
-const props = withDefaults(defineProps<Props>(), {
-  edit: true,
-});
+export default defineNuxtComponent({
+  props: {
+    modelValue: {
+      type: Object as () => Nutrition,
+      required: true,
+    },
+    edit: {
+      type: Boolean,
+      default: true,
+    },
+  },
+  emits: ["update:modelValue"],
+  setup(props, context) {
+    const { labels } = useNutritionLabels();
+    const valueNotNull = computed(() => {
+      let key: keyof Nutrition;
+      for (key in props.modelValue) {
+        if (props.modelValue[key] !== null) {
+          return true;
+        }
+      }
+      return false;
+    });

-const modelValue = defineModel<Nutrition>({ required: true });
+    const showViewer = computed(() => !props.edit && valueNotNull.value);

-const { labels } = useNutritionLabels();
-const valueNotNull = computed(() => {
-  let key: keyof Nutrition;
-  for (key in modelValue.value) {
-    if (modelValue.value[key] !== null) {
-      return true;
+    function updateValue(key: number | string, event: Event) {
+      context.emit("update:modelValue", { ...props.modelValue, [key]: event });
    }
-  }
-  return false;
-});

-const showViewer = computed(() => !props.edit && valueNotNull.value);
+    // Build a new list that only contains nutritional information that has a value
+    const renderedList = computed(() => {
+      return Object.entries(labels).reduce((item: NutritionLabelType, [key, label]) => {
+        if (props.modelValue[key]?.trim()) {
+          item[key] = {
+            ...label,
+            value: props.modelValue[key],
+          };
+        }
+        return item;
+      }, {});
+    });

-function updateValue(key: number | string, event: Event) {
-  modelValue.value = { ...modelValue.value, [key]: event };
-}
-
-// Build a new list that only contains nutritional information that has a value
-const renderedList = computed(() => {
-  return Object.entries(labels).reduce((item: NutritionLabelType, [key, label]) => {
-    if (modelValue.value[key]?.trim()) {
-      item[key] = {
-        ...label,
-        value: modelValue.value[key],
-      };
-    }
-    return item;
-  }, {});
+    return {
+      labels,
+      valueNotNull,
+      showViewer,
+      updateValue,
+      renderedList,
+    };
+  },
 });
 </script>

--- a/frontend/components/Domain/Recipe/RecipeOrganizerDialog.vue
+++ b/frontend/components/Domain/Recipe/RecipeOrganizerDialog.vue
@@ -60,93 +60,119 @@
  </div>
 </template>

-<script setup lang="ts">
+<script lang="ts">
 import { useUserApi } from "~/composables/api";
 import { useCategoryStore, useTagStore, useToolStore } from "~/composables/store";
 import { type RecipeOrganizer, Organizer } from "~/lib/api/types/non-generated";

 const CREATED_ITEM_EVENT = "created-item";

-interface Props {
-  color?: string | null;
-  tagDialog?: boolean;
-  itemType?: RecipeOrganizer;
-}
-const props = withDefaults(defineProps<Props>(), {
-  color: null,
-  tagDialog: true,
-  itemType: "category" as RecipeOrganizer,
-});
-
-const emit = defineEmits<{
-  "created-item": [item: any];
-}>();
-
-const dialog = defineModel<boolean>({ default: false });
-
-const i18n = useI18n();
-
-const name = ref("");
-const onHand = ref(false);
-
-watch(
-  dialog,
-  (val: boolean) => {
-    if (!val) name.value = "";
+export default defineNuxtComponent({
+  props: {
+    modelValue: {
+      type: Boolean,
+      default: false,
+    },
+    color: {
+      type: String,
+      default: null,
+    },
+    tagDialog: {
+      type: Boolean,
+      default: true,
+    },
+    itemType: {
+      type: String as () => RecipeOrganizer,
+      default: "category",
+    },
  },
-);
+  emits: ["update:modelValue"],
+  setup(props, context) {
+    const i18n = useI18n();

-const userApi = useUserApi();
+    const state = reactive({
+      name: "",
+      onHand: false,
+    });

-const store = (() => {
-  switch (props.itemType) {
-    case Organizer.Tag:
-      return useTagStore();
-    case Organizer.Tool:
-      return useToolStore();
-    default:
-      return useCategoryStore();
-  }
-})();
+    const dialog = computed({
+      get() {
+        return props.modelValue;
+      },
+      set(value) {
+        context.emit("update:modelValue", value);
+      },
+    });

-const properties = computed(() => {
-  switch (props.itemType) {
-    case Organizer.Tag:
-      return {
-        title: i18n.t("tag.create-a-tag"),
-        label: i18n.t("tag.tag-name"),
-        api: userApi.tags,
-      };
-    case Organizer.Tool:
-      return {
-        title: i18n.t("tool.create-a-tool"),
-        label: i18n.t("tool.tool-name"),
-        api: userApi.tools,
-      };
-    default:
-      return {
-        title: i18n.t("category.create-a-category"),
-        label: i18n.t("category.category-name"),
-        api: userApi.categories,
-      };
-  }
+    watch(
+      () => props.modelValue,
+      (val: boolean) => {
+        if (!val) state.name = "";
+      },
+    );
+
+    const userApi = useUserApi();
+
+    const store = (() => {
+      switch (props.itemType) {
+        case Organizer.Tag:
+          return useTagStore();
+        case Organizer.Tool:
+          return useToolStore();
+        default:
+          return useCategoryStore();
+      }
+    })();
+
+    const properties = computed(() => {
+      switch (props.itemType) {
+        case Organizer.Tag:
+          return {
+            title: i18n.t("tag.create-a-tag"),
+            label: i18n.t("tag.tag-name"),
+            api: userApi.tags,
+          };
+        case Organizer.Tool:
+          return {
+            title: i18n.t("tool.create-a-tool"),
+            label: i18n.t("tool.tool-name"),
+            api: userApi.tools,
+          };
+        default:
+          return {
+            title: i18n.t("category.create-a-category"),
+            label: i18n.t("category.category-name"),
+            api: userApi.categories,
+          };
+      }
+    });
+
+    const rules = {
+      required: (val: string) => !!val || (i18n.t("general.a-name-is-required") as string),
+    };
+
+    async function select() {
+      if (store) {
+        // @ts-expect-error the same state is used for different organizer types, which have different requirements
+        await store.actions.createOne({ ...state });
+      }
+
+      const newItem = store.store.value.find(item => item.name === state.name);
+
+      context.emit(CREATED_ITEM_EVENT, newItem);
+      dialog.value = false;
+    }
+
+    return {
+      Organizer,
+      ...toRefs(state),
+      dialog,
+      properties,
+      rules,
+      select,
+    };
+  },
 });
-
-const rules = {
-  required: (val: string) => !!val || (i18n.t("general.a-name-is-required") as string),
-};
-
-async function select() {
-  if (store) {
-    // @ts-expect-error the same state is used for different organizer types, which have different requirements
-    await store.actions.createOne({ name: name.value, onHand: onHand.value });
-  }
-
-  const newItem = store.store.value.find(item => item.name === name.value);
-
-  emit(CREATED_ITEM_EVENT, newItem);
-  dialog.value = false;
-}
 </script>

 <style></style>
--- a/frontend/components/Domain/Recipe/RecipeOrganizerPage.vue
+++ b/frontend/components/Domain/Recipe/RecipeOrganizerPage.vue
@@ -122,8 +122,9 @@
  </div>
 </template>

-<script setup lang="ts">
+<script lang="ts">
 import Fuse from "fuse.js";
+
 import { useContextPresets } from "~/composables/use-context-presents";
 import RecipeOrganizerDialog from "~/components/Domain/Recipe/RecipeOrganizerDialog.vue";
 import { Organizer, type RecipeOrganizer } from "~/lib/api/types/non-generated";
@@ -137,128 +138,156 @@ interface GenericItem {
  onHand: boolean;
 }

-const props = defineProps<{
-  items: GenericItem[];
-  icon: string;
-  itemType: RecipeOrganizer;
-}>();
-
-const emit = defineEmits<{
-  update: [item: GenericItem];
-  delete: [id: string];
-}>();
-
-const state = reactive({
-  // Search Options
-  options: {
-    ignoreLocation: true,
-    shouldSort: true,
-    threshold: 0.2,
-    location: 0,
-    distance: 20,
-    findAllMatches: true,
-    maxPatternLength: 32,
-    minMatchCharLength: 1,
-    keys: ["name"],
+export default defineNuxtComponent({
+  components: {
+    RecipeOrganizerDialog,
  },
-});
-
-const $auth = useMealieAuth();
-const route = useRoute();
-const groupSlug = computed(() => route.params.groupSlug as string || $auth.user?.value?.groupSlug || "");
-
-// =================================================================
-// Context Menu
-
-const dialogs = ref({
-  organizer: false,
-  update: false,
-  delete: false,
-});
-
-const presets = useContextPresets();
-
-const translationKey = computed<string>(() => {
-  const typeMap = {
-    categories: "category.category",
-    tags: "tag.tag",
-    tools: "tool.tool",
-    foods: "shopping-list.food",
-    households: "household.household",
-  };
-  return typeMap[props.itemType] || "";
-});
-
-const deleteTarget = ref<GenericItem | null>(null);
-const updateTarget = ref<GenericItem | null>(null);
-
-function confirmDelete(item: GenericItem) {
-  deleteTarget.value = item;
-  dialogs.value.delete = true;
-}
-
-function deleteOne() {
-  if (!deleteTarget.value) {
-    return;
-  }
-
-  emit("delete", deleteTarget.value.id);
-}
-
-function openUpdateDialog(item: GenericItem) {
-  updateTarget.value = deepCopy(item);
-  dialogs.value.update = true;
-}
-
-function updateOne() {
-  if (!updateTarget.value) {
-    return;
-  }
-
-  emit("update", updateTarget.value);
-}
-
-// ================================================================
-// Search Functions
-
-const searchString = useRouteQuery("q", "");
-
-const fuse = computed(() => {
-  return new Fuse(props.items, state.options);
-});
-
-const fuzzyItems = computed<GenericItem[]>(() => {
-  if (searchString.value.trim() === "") {
-    return props.items;
-  }
-  const result = fuse.value.search(searchString.value.trim() as string);
-  return result.map(x => x.item);
-});
-
-// =================================================================
-// Sorted Items
-
-const itemsSorted = computed(() => {
-  const byLetter: { [key: string]: Array<GenericItem> } = {};
-
-  if (!fuzzyItems.value) {
-    return byLetter;
-  }
-
-  [...fuzzyItems.value]
-    .sort((a, b) => a.name.localeCompare(b.name))
-    .forEach((item) => {
-      const letter = item.name[0].toUpperCase();
-      if (!byLetter[letter]) {
-        byLetter[letter] = [];
-      }
-      byLetter[letter].push(item);
+  props: {
+    items: {
+      type: Array as () => GenericItem[],
+      required: true,
+    },
+    icon: {
+      type: String,
+      required: true,
+    },
+    itemType: {
+      type: String as () => RecipeOrganizer,
+      required: true,
+    },
+  },
+  emits: ["update", "delete"],
+  setup(props, { emit }) {
+    const state = reactive({
+      // Search Options
+      options: {
+        ignoreLocation: true,
+        shouldSort: true,
+        threshold: 0.2,
+        location: 0,
+        distance: 20,
+        findAllMatches: true,
+        maxPatternLength: 32,
+        minMatchCharLength: 1,
+        keys: ["name"],
+      },
    });

-  return byLetter;
-});
+    const $auth = useMealieAuth();
+    const route = useRoute();
+    const groupSlug = computed(() => route.params.groupSlug as string || $auth.user?.value?.groupSlug || "");

-function isTitle(str: number | string) {
-  return typeof str === "string" && str.length === 1;
-}
+    // =================================================================
+    // Context Menu
+
+    const dialogs = ref({
+      organizer: false,
+      update: false,
+      delete: false,
+    });
+
+    const presets = useContextPresets();
+
+    const translationKey = computed<string>(() => {
+      const typeMap = {
+        categories: "category.category",
+        tags: "tag.tag",
+        tools: "tool.tool",
+        foods: "shopping-list.food",
+        households: "household.household",
+      };
+      return typeMap[props.itemType] || "";
+    });
+
+    const deleteTarget = ref<GenericItem | null>(null);
+    const updateTarget = ref<GenericItem | null>(null);
+
+    function confirmDelete(item: GenericItem) {
+      deleteTarget.value = item;
+      dialogs.value.delete = true;
+    }
+
+    function deleteOne() {
+      if (!deleteTarget.value) {
+        return;
+      }
+
+      emit("delete", deleteTarget.value.id);
+    }
+
+    function openUpdateDialog(item: GenericItem) {
+      updateTarget.value = deepCopy(item);
+      dialogs.value.update = true;
+    }
+
+    function updateOne() {
+      if (!updateTarget.value) {
+        return;
+      }
+
+      emit("update", updateTarget.value);
+    }
+
+    // ================================================================
+    // Search Functions
+
+    const searchString = useRouteQuery("q", "");
+
+    const fuse = computed(() => {
+      return new Fuse(props.items, state.options);
+    });
+
+    const fuzzyItems = computed<GenericItem[]>(() => {
+      if (searchString.value.trim() === "") {
+        return props.items;
+      }
+      const result = fuse.value.search(searchString.value.trim() as string);
+      return result.map(x => x.item);
+    });
+
+    // =================================================================
+    // Sorted Items
+
+    const itemsSorted = computed(() => {
+      const byLetter: { [key: string]: Array<GenericItem> } = {};
+
+      if (!fuzzyItems.value) {
+        return byLetter;
+      }
+
+      [...fuzzyItems.value]
+        .sort((a, b) => a.name.localeCompare(b.name))
+        .forEach((item) => {
+          const letter = item.name[0].toUpperCase();
+          if (!byLetter[letter]) {
+            byLetter[letter] = [];
+          }
+          byLetter[letter].push(item);
+        });
+
+      return byLetter;
+    });
+
+    function isTitle(str: number | string) {
+      return typeof str === "string" && str.length === 1;
+    }
+
+    return {
+      groupSlug,
+      isTitle,
+      dialogs,
+      confirmDelete,
+      openUpdateDialog,
+      updateOne,
+      updateTarget,
+      deleteOne,
+      deleteTarget,
+      Organizer,
+      presets,
+      itemsSorted,
+      searchString,
+      translationKey,
+    };
+  },
+});
 </script>
--- a/frontend/components/Domain/Recipe/RecipeOrganizerSelector.vue
+++ b/frontend/components/Domain/Recipe/RecipeOrganizerSelector.vue
@@ -3,7 +3,7 @@
    v-model="selected"
    v-bind="inputAttrs"
    v-model:search="searchInput"
-    :items="items"
+    :items="storeItem"
    :label="label"
    chips
    closable-chips
@@ -46,138 +46,180 @@
  </v-autocomplete>
 </template>

-<script setup lang="ts">
+<script lang="ts">
 import type { IngredientFood, RecipeCategory, RecipeTag } from "~/lib/api/types/recipe";
 import type { RecipeTool } from "~/lib/api/types/admin";
 import { Organizer, type RecipeOrganizer } from "~/lib/api/types/non-generated";
 import type { HouseholdSummary } from "~/lib/api/types/household";
 import { useCategoryStore, useFoodStore, useHouseholdStore, useTagStore, useToolStore } from "~/composables/store";

-interface Props {
-  selectorType: RecipeOrganizer;
-  inputAttrs?: Record<string, any>;
-  returnObject?: boolean;
-  showAdd?: boolean;
-  showLabel?: boolean;
-  showIcon?: boolean;
-  variant?: "filled" | "underlined" | "outlined" | "plain" | "solo" | "solo-inverted" | "solo-filled";
-}
+export default defineNuxtComponent({
+  props: {
+    modelValue: {
+      type: Array as () => (
+        | HouseholdSummary
+        | RecipeTag
+        | RecipeCategory
+        | RecipeTool
+        | IngredientFood
+        | string
+      )[] | undefined,
+      required: true,
+    },
+    /**
+     * The type of organizer to use.
+     */
+    selectorType: {
+      type: String as () => RecipeOrganizer,
+      required: true,
+    },
+    inputAttrs: {
+      type: Object as () => Record<string, any>,
+      default: () => ({}),
+    },
+    returnObject: {
+      type: Boolean,
+      default: true,
+    },
+    showAdd: {
+      type: Boolean,
+      default: true,
+    },
+    showLabel: {
+      type: Boolean,
+      default: true,
+    },
+    showIcon: {
+      type: Boolean,
+      default: true,
+    },
+    variant: {
+      type: String as () => "filled" | "underlined" | "outlined" | "plain" | "solo" | "solo-inverted" | "solo-filled",
+      default: "outlined",
+    },
+  },
+  emits: ["update:modelValue"],

-const props = withDefaults(defineProps<Props>(), {
-  inputAttrs: () => ({}),
-  returnObject: true,
-  showAdd: true,
-  showLabel: true,
-  showIcon: true,
-  variant: "outlined",
+  setup(props, context) {
+    const selected = computed({
+      get: () => props.modelValue,
+      set: (val) => {
+        context.emit("update:modelValue", val);
+      },
+    });
+
+    onMounted(() => {
+      if (selected.value === undefined) {
+        selected.value = [];
+      }
+    });
+
+    const i18n = useI18n();
+    const { $globals } = useNuxtApp();
+
+    const label = computed(() => {
+      if (!props.showLabel) {
+        return "";
+      }
+
+      switch (props.selectorType) {
+        case Organizer.Tag:
+          return i18n.t("tag.tags");
+        case Organizer.Category:
+          return i18n.t("category.categories");
+        case Organizer.Tool:
+          return i18n.t("tool.tools");
+        case Organizer.Food:
+          return i18n.t("general.foods");
+        case Organizer.Household:
+          return i18n.t("household.households");
+        default:
+          return i18n.t("general.organizer");
+      }
+    });
+
+    const icon = computed(() => {
+      if (!props.showIcon) {
+        return "";
+      }
+
+      switch (props.selectorType) {
+        case Organizer.Tag:
+          return $globals.icons.tags;
+        case Organizer.Category:
+          return $globals.icons.categories;
+        case Organizer.Tool:
+          return $globals.icons.tools;
+        case Organizer.Food:
+          return $globals.icons.foods;
+        case Organizer.Household:
+          return $globals.icons.household;
+        default:
+          return $globals.icons.tags;
+      }
+    });
+
+    // ===========================================================================
+    // Store & Items Setup
+
+    const storeMap = {
+      [Organizer.Category]: useCategoryStore(),
+      [Organizer.Tag]: useTagStore(),
+      [Organizer.Tool]: useToolStore(),
+      [Organizer.Food]: useFoodStore(),
+      [Organizer.Household]: useHouseholdStore(),
+    };
+
+    const store = computed(() => {
+      const { store } = storeMap[props.selectorType];
+      return store.value;
+    });
+
+    const items = computed(() => {
+      if (!props.returnObject) {
+        return store.value.map(item => item.name);
+      }
+      return store.value;
+    });
+
+    function removeByIndex(index: number) {
+      if (selected.value === undefined) {
+        return;
+      }
+      const newSelected = selected.value.filter((_, i) => i !== index);
+      selected.value = [...newSelected];
+    }
+
+    function appendCreated(item: any) {
+      if (selected.value === undefined) {
+        return;
+      }
+
+      selected.value = [...selected.value, item];
+    }
+
+    const dialog = ref(false);
+
+    const searchInput = ref("");
+
+    function resetSearchInput() {
+      searchInput.value = "";
+    }
+
+    return {
+      Organizer,
+      appendCreated,
+      dialog,
+      storeItem: items,
+      label,
+      icon,
+      selected,
+      removeByIndex,
+      searchInput,
+      resetSearchInput,
+    };
+  },
 });
-
-const selected = defineModel<(
-  | HouseholdSummary
-  | RecipeTag
-  | RecipeCategory
-  | RecipeTool
-  | IngredientFood
-  | string
-)[] | undefined>({ required: true });
-
-onMounted(() => {
-  if (selected.value === undefined) {
-    selected.value = [];
-  }
-});
-
-const i18n = useI18n();
-const { $globals } = useNuxtApp();
-
-const label = computed(() => {
-  if (!props.showLabel) {
-    return "";
-  }
-
-  switch (props.selectorType) {
-    case Organizer.Tag:
-      return i18n.t("tag.tags");
-    case Organizer.Category:
-      return i18n.t("category.categories");
-    case Organizer.Tool:
-      return i18n.t("tool.tools");
-    case Organizer.Food:
-      return i18n.t("general.foods");
-    case Organizer.Household:
-      return i18n.t("household.households");
-    default:
-      return i18n.t("general.organizer");
-  }
-});
-
-const icon = computed(() => {
-  if (!props.showIcon) {
-    return "";
-  }
-
-  switch (props.selectorType) {
-    case Organizer.Tag:
-      return $globals.icons.tags;
-    case Organizer.Category:
-      return $globals.icons.categories;
-    case Organizer.Tool:
-      return $globals.icons.tools;
-    case Organizer.Food:
-      return $globals.icons.foods;
-    case Organizer.Household:
-      return $globals.icons.household;
-    default:
-      return $globals.icons.tags;
-  }
-});
-
-// ===========================================================================
-// Store & Items Setup
-
-const storeMap = {
-  [Organizer.Category]: useCategoryStore(),
-  [Organizer.Tag]: useTagStore(),
-  [Organizer.Tool]: useToolStore(),
-  [Organizer.Food]: useFoodStore(),
-  [Organizer.Household]: useHouseholdStore(),
-};
-
-const store = computed(() => {
-  const { store } = storeMap[props.selectorType];
-  return store.value;
-});
-
-const items = computed(() => {
-  if (!props.returnObject) {
-    return store.value.map(item => item.name);
-  }
-  return store.value;
-});
-
-function removeByIndex(index: number) {
-  if (selected.value === undefined) {
-    return;
-  }
-  const newSelected = selected.value.filter((_, i) => i !== index);
-  selected.value = [...newSelected];
-}
-
-function appendCreated(item: any) {
-  if (selected.value === undefined) {
-    return;
-  }
-
-  selected.value = [...selected.value, item];
-}
-
-const dialog = ref(false);
-
-const searchInput = ref("");
-
-function resetSearchInput() {
-  searchInput.value = "";
-}
 </script>

 <style scoped>
--- a/frontend/components/Domain/Recipe/RecipePage/RecipePage.vue
+++ b/frontend/components/Domain/Recipe/RecipePage/RecipePage.vue
@@ -1,14 +1,7 @@
 <template>
  <div>
-    <RecipePageParseDialog
-      :model-value="isParsing"
-      :ingredients="recipe.recipeIngredient"
-      :width="$vuetify.display.smAndDown ? '100%' : '80%'"
-      @update:model-value="toggleIsParsing"
-      @save="saveParsedIngredients"
-    />
-    <v-container v-show="!isCookMode" key="recipe-page" class="px-0" :class="{ 'pa-0': $vuetify.display.smAndDown }">
-      <v-card :flat="$vuetify.display.smAndDown" class="d-print-none">
+    <v-container v-show="!isCookMode" key="recipe-page" class="px-0" :class="{ 'pa-0': $vuetify.display.smAndDown.value }">
+      <v-card :flat="$vuetify.display.smAndDown.value" class="d-print-none">
        <RecipePageHeader
          :recipe="recipe"
          :recipe-scale="scale"
@@ -44,7 +37,7 @@
            <RecipePageIngredientEditor v-if="isEditForm" v-model="recipe" />
          </div>
          <div>
-            <RecipePageScale v-model="scale" :recipe="recipe" />
+            <RecipePageScale v-model:scale="scale" :recipe="recipe" />
          </div>

          <!--
@@ -88,7 +81,7 @@
      </v-card>
      <WakelockSwitch />
      <RecipePageComments
-        v-if="!recipe.settings?.disableComments && !isEditForm && !isCookMode"
+        v-if="!recipe.settings.disableComments && !isEditForm && !isCookMode"
        v-model="recipe"
        class="px-1 my-4 d-print-none"
      />
@@ -103,7 +96,7 @@
      <v-row style="height: 100%" no-gutters class="overflow-hidden">
        <v-col cols="12" sm="5" class="overflow-y-auto pl-4 pr-3 py-2" style="height: 100%">
          <div class="d-flex align-center">
-            <RecipePageScale v-model="scale" :recipe="recipe" />
+            <RecipePageScale v-model:scale="scale" :recipe="recipe" />
          </div>
          <RecipePageIngredientToolsView
            v-if="!isEditForm"
@@ -113,13 +106,9 @@
          />
          <v-divider />
        </v-col>
-        <v-col
-          class="overflow-y-auto"
-          :class="$vuetify.display.smAndDown ? 'py-2': 'py-6'"
-          style="height: 100%"
-          cols="12"
-          sm="7"
-        >
+        <v-col class="overflow-y-auto"
+        :class="$vuetify.display.smAndDown.value ? 'py-2': 'py-6'"
+        style="height: 100%" cols="12" sm="7">
          <h2 class="text-h5 px-4 font-weight-medium opacity-80">
            {{ $t('recipe.instructions') }}
          </h2>
@@ -135,7 +124,7 @@
    </v-sheet>
    <v-sheet v-show="isCookMode && hasLinkedIngredients">
      <div class="mt-2 px-2 px-md-4">
-        <RecipePageScale v-model="scale" :recipe="recipe" />
+        <RecipePageScale v-model:scale="scale" :recipe="recipe" />
      </div>
      <RecipePageInstructions
        v-model="recipe.recipeInstructions"
@@ -152,6 +141,7 @@
          <RecipeIngredients
            :value="notLinkedIngredients"
            :scale="scale"
+            :disable-amount="recipe.settings.disableAmount"
            :is-cook-mode="isCookMode"
          />
        </v-card>
@@ -179,7 +169,6 @@ import RecipePageIngredientEditor from "./RecipePageParts/RecipePageIngredientEd
 import RecipePageIngredientToolsView from "./RecipePageParts/RecipePageIngredientToolsView.vue";
 import RecipePageInstructions from "./RecipePageParts/RecipePageInstructions.vue";
 import RecipePageOrganizers from "./RecipePageParts/RecipePageOrganizers.vue";
-import RecipePageParseDialog from "./RecipePageParts/RecipePageParseDialog.vue";
 import RecipePageScale from "./RecipePageParts/RecipePageScale.vue";
 import RecipePageInfoEditor from "./RecipePageParts/RecipePageInfoEditor.vue";
 import RecipePageComments from "./RecipePageParts/RecipePageComments.vue";
@@ -190,28 +179,26 @@ import {
  usePageState,
 } from "~/composables/recipe-page/shared-state";
 import type { NoUndefinedField } from "~/lib/api/types/non-generated";
-import type { Recipe, RecipeCategory, RecipeIngredient, RecipeTag, RecipeTool } from "~/lib/api/types/recipe";
+import type { Recipe, RecipeCategory, RecipeTag, RecipeTool } from "~/lib/api/types/recipe";
 import { useRouteQuery } from "~/composables/use-router";
 import { useUserApi } from "~/composables/api";
 import { uuid4, deepCopy } from "~/composables/use-utils";
 import RecipeDialogBulkAdd from "~/components/Domain/Recipe/RecipeDialogBulkAdd.vue";
 import RecipeNotes from "~/components/Domain/Recipe/RecipeNotes.vue";
-import { useLoggedInState } from "~/composables/use-logged-in-state";
 import { useNavigationWarning } from "~/composables/use-navigation-warning";

 const recipe = defineModel<NoUndefinedField<Recipe>>({ required: true });

-const display = useDisplay();
+const { $vuetify } = useNuxtApp();
 const i18n = useI18n();
 const $auth = useMealieAuth();
 const route = useRoute();
-const { isOwnGroup } = useLoggedInState();

 const groupSlug = computed(() => (route.params.groupSlug as string) || $auth.user?.value?.groupSlug || "");

 const router = useRouter();
 const api = useUserApi();
-const { setMode, isEditForm, isEditJSON, isCookMode, isEditMode, isParsing, toggleCookMode, toggleIsParsing }
+const { setMode, isEditForm, isEditJSON, isCookMode, isEditMode, toggleCookMode }
  = usePageState(recipe.value.slug);
 const { deactivateNavigationWarning } = useNavigationWarning();
 const notLinkedIngredients = computed(() => {
@@ -260,29 +247,12 @@ const hasLinkedIngredients = computed(() => {

 type BooleanString = "true" | "false" | "";

-const paramsEdit = useRouteQuery<BooleanString>("edit", "");
-const paramsParse = useRouteQuery<BooleanString>("parse", "");
+const edit = useRouteQuery<BooleanString>("edit", "");

 onMounted(() => {
-  if (paramsEdit.value === "true" && isOwnGroup.value) {
+  if (edit.value === "true") {
    setMode(PageMode.EDIT);
  }
-
-  if (paramsParse.value === "true" && isOwnGroup.value) {
-    toggleIsParsing(true);
-  }
-});
-
-watch(isEditMode, (newVal) => {
-  if (!newVal) {
-    paramsEdit.value = undefined;
-  }
-});
-
-watch(isParsing, () => {
-  if (!isParsing.value) {
-    paramsParse.value = undefined;
-  }
 });

 /** =============================================================
@@ -297,12 +267,6 @@ async function saveRecipe() {
  }
 }

-async function saveParsedIngredients(ingredients: NoUndefinedField<RecipeIngredient[]>) {
-  recipe.value.recipeIngredient = ingredients;
-  await saveRecipe();
-  toggleIsParsing(false);
-}
-
 async function deleteRecipe() {
  const { data } = await api.recipes.deleteOne(recipe.value.slug);
  if (data?.slug) {
@@ -314,8 +278,8 @@ async function deleteRecipe() {
 * View Preferences
 */
 const landscape = computed(() => {
-  const preferLandscape = recipe.value.settings?.landscapeView;
-  const smallScreen = !display.smAndUp.value;
+  const preferLandscape = recipe.value.settings.landscapeView;
+  const smallScreen = !$vuetify.display.smAndUp.value;

  if (preferLandscape) {
    return true;
@@ -339,7 +303,7 @@ function addStep(steps: Array<string> | null = null) {

  if (steps) {
    const cleanedSteps = steps.map((step) => {
-      return { id: uuid4(), text: step, title: "", summary: "", ingredientReferences: [] };
+      return { id: uuid4(), text: step, title: "", ingredientReferences: [] };
    });

    recipe.value.recipeInstructions.push(...cleanedSteps);
--- a/frontend/components/Domain/Recipe/RecipePage/RecipePageParts/RecipePageEditorToolbar.vue
+++ b/frontend/components/Domain/Recipe/RecipePage/RecipePageParts/RecipePageEditorToolbar.vue
@@ -13,25 +13,25 @@
      @upload="uploadImage"
    />
    <v-spacer />
-    <v-select
-      v-model="recipe.userId"
-      class="my-2"
-      max-width="300"
-      :items="allUsers"
-      :item-props="itemsProps"
-      :label="$t('general.owner')"
-      :disabled="!canEditOwner"
-      variant="outlined"
-      density="compact"
-    >
-      <template #prepend>
-        <UserAvatar
-          :user-id="recipe.userId"
-          :tooltip="false"
-        />
-      </template>
-    </v-select>
-  </div>
+      <v-select
+        v-model="recipe.userId"
+        class="my-2"
+        max-width="300"
+        :items="allUsers"
+        :item-props="itemsProps"
+        :label="$t('general.owner')"
+        :disabled="!canEditOwner"
+        variant="outlined"
+        density="compact"
+      >
+        <template #prepend>
+          <UserAvatar
+            :user-id="recipe.userId"
+            :tooltip="false"
+          />
+        </template>
+      </v-select>
+</div>
 </template>

 <script setup lang="ts">
--- a/frontend/components/Domain/Recipe/RecipePage/RecipePageParts/RecipePageFooter.vue
+++ b/frontend/components/Domain/Recipe/RecipePage/RecipePageParts/RecipePageFooter.vue
@@ -29,8 +29,8 @@
        class="mb-2 mx-n2"
      >
        <v-card-title class="text-h5 font-weight-medium opacity-80">
-          {{ $t('recipe.api-extras') }}
-        </v-card-title>
+{{ $t('recipe.api-extras') }}
+</v-card-title>
        <v-divider class="ml-4" />
        <v-card-text>
          {{ $t('recipe.api-extras-description') }}
--- a/frontend/components/Domain/Recipe/RecipePage/RecipePageParts/RecipePageHeader.vue
+++ b/frontend/components/Domain/Recipe/RecipePage/RecipePageParts/RecipePageHeader.vue
@@ -26,7 +26,7 @@
  </div>
 </template>

-<script setup lang="ts">
+<script lang="ts">
 import { useLoggedInState } from "~/composables/use-logged-in-state";
 import { useRecipePermissions } from "~/composables/recipes";
 import RecipePageInfoCard from "~/components/Domain/Recipe/RecipePage/RecipePageParts/RecipePageInfoCard.vue";
@@ -35,48 +35,82 @@ import { useStaticRoutes, useUserApi } from "~/composables/api";
 import type { HouseholdSummary } from "~/lib/api/types/household";
 import type { Recipe } from "~/lib/api/types/recipe";
 import type { NoUndefinedField } from "~/lib/api/types/non-generated";
-import { usePageState, usePageUser, PageMode } from "~/composables/recipe-page/shared-state";
+import { usePageState, usePageUser, PageMode, EditorMode } from "~/composables/recipe-page/shared-state";

-interface Props {
-  recipe: NoUndefinedField<Recipe>;
-  recipeScale?: number;
-  landscape?: boolean;
-}
-const props = withDefaults(defineProps<Props>(), {
-  recipeScale: 1,
-  landscape: false,
-});
-
-defineEmits(["save", "delete"]);
-
-const { recipeImage } = useStaticRoutes();
-const { imageKey, setMode, toggleEditMode, isEditMode } = usePageState(props.recipe.slug);
-const { user } = usePageUser();
-const { isOwnGroup } = useLoggedInState();
-
-const recipeHousehold = ref<HouseholdSummary>();
-if (user) {
-  const userApi = useUserApi();
-  userApi.households.getOne(props.recipe.householdId).then(({ data }) => {
-    recipeHousehold.value = data || undefined;
-  });
-}
-const { canEditRecipe } = useRecipePermissions(props.recipe, recipeHousehold, user);
-
-function printRecipe() {
-  window.print();
-}
-
-const hideImage = ref(false);
-
-const recipeImageUrl = computed(() => {
-  return recipeImage(props.recipe.id, props.recipe.image, imageKey.value);
-});
-
-watch(
-  () => recipeImageUrl.value,
-  () => {
-    hideImage.value = false;
+export default defineNuxtComponent({
+  components: {
+    RecipePageInfoCard,
+    RecipeActionMenu,
  },
-);
+  props: {
+    recipe: {
+      type: Object as () => NoUndefinedField<Recipe>,
+      required: true,
+    },
+    recipeScale: {
+      type: Number,
+      default: 1,
+    },
+    landscape: {
+      type: Boolean,
+      default: false,
+    },
+  },
+  emits: ["save", "delete"],
+  setup(props) {
+    const { $vuetify } = useNuxtApp();
+    const { recipeImage } = useStaticRoutes();
+    const { imageKey, pageMode, editMode, setMode, toggleEditMode, isEditMode } = usePageState(props.recipe.slug);
+    const { user } = usePageUser();
+    const { isOwnGroup } = useLoggedInState();
+
+    const recipeHousehold = ref<HouseholdSummary>();
+    if (user) {
+      const userApi = useUserApi();
+      userApi.households.getOne(props.recipe.householdId).then(({ data }) => {
+        recipeHousehold.value = data || undefined;
+      });
+    }
+    const { canEditRecipe } = useRecipePermissions(props.recipe, recipeHousehold, user);
+
+    function printRecipe() {
+      window.print();
+    }
+
+    const hideImage = ref(false);
+    const imageHeight = computed(() => {
+      return $vuetify.display.xs.value ? "200" : "400";
+    });
+
+    const recipeImageUrl = computed(() => {
+      return recipeImage(props.recipe.id, props.recipe.image, imageKey.value);
+    });
+
+    watch(
+      () => recipeImageUrl.value,
+      () => {
+        hideImage.value = false;
+      },
+    );
+
+    return {
+      isOwnGroup,
+      setMode,
+      toggleEditMode,
+      recipeImage,
+      canEditRecipe,
+      imageKey,
+      user,
+      PageMode,
+      pageMode,
+      EditorMode,
+      editMode,
+      printRecipe,
+      imageHeight,
+      hideImage,
+      isEditMode,
+      recipeImageUrl,
+    };
+  },
+});
 </script>
--- a/frontend/components/Domain/Recipe/RecipePage/RecipePageParts/RecipePageInfoCard.vue
+++ b/frontend/components/Domain/Recipe/RecipePage/RecipePageParts/RecipePageInfoCard.vue
@@ -12,10 +12,10 @@
      >
        <v-card-text class="w-100">
          <div class="d-flex flex-column align-center">
-            <v-card-title class="text-h5 font-weight-regular pa-0 text-wrap text-center opacity-80">
-              {{ recipe.name }}
-            </v-card-title>
-            <RecipeRating
+          <v-card-title class="text-h5 font-weight-regular pa-0 text-wrap text-center opacity-80">
+            {{ recipe.name }}
+          </v-card-title>
+          <RecipeRating
              :key="recipe.slug"
              :value="recipe.rating"
              :recipe-id="recipe.id"
@@ -35,7 +35,7 @@
                >
                  <RecipeYield
                    :yield-quantity="recipe.recipeYieldQuantity"
-                    :yield-text="recipe.recipeYield"
+                    :yield="recipe.recipeYield"
                    :scale="recipeScale"
                    class="mb-4"
                  />
@@ -76,7 +76,7 @@
  </div>
 </template>

-<script setup lang="ts">
+<script lang="ts">
 import { useLoggedInState } from "~/composables/use-logged-in-state";
 import RecipeRating from "~/components/Domain/Recipe/RecipeRating.vue";
 import RecipeLastMade from "~/components/Domain/Recipe/RecipeLastMade.vue";
@@ -86,15 +86,34 @@ import RecipePageInfoCardImage from "~/components/Domain/Recipe/RecipePage/Recip
 import type { Recipe } from "~/lib/api/types/recipe";
 import type { NoUndefinedField } from "~/lib/api/types/non-generated";

-interface Props {
-  recipe: NoUndefinedField<Recipe>;
-  recipeScale?: number;
-  landscape: boolean;
-}
+export default defineNuxtComponent({
+  components: {
+    RecipeRating,
+    RecipeLastMade,
+    RecipeTimeCard,
+    RecipeYield,
+    RecipePageInfoCardImage,
+  },
+  props: {
+    recipe: {
+      type: Object as () => NoUndefinedField<Recipe>,
+      required: true,
+    },
+    recipeScale: {
+      type: Number,
+      default: 1,
+    },
+    landscape: {
+      type: Boolean,
+      required: true,
+    },
+  },
+  setup() {
+    const { isOwnGroup } = useLoggedInState();

-withDefaults(defineProps<Props>(), {
-  recipeScale: 1,
+    return {
+      isOwnGroup,
+    };
+  },
 });
-
-const { isOwnGroup } = useLoggedInState();
 </script>
--- a/frontend/components/Domain/Recipe/RecipePage/RecipePageParts/RecipePageInfoCardImage.vue
+++ b/frontend/components/Domain/Recipe/RecipePage/RecipePageParts/RecipePageInfoCardImage.vue
@@ -12,47 +12,60 @@
  />
 </template>

-<script setup lang="ts">
+<script lang="ts">
 import { useStaticRoutes, useUserApi } from "~/composables/api";
 import type { HouseholdSummary } from "~/lib/api/types/household";
 import { usePageState, usePageUser } from "~/composables/recipe-page/shared-state";
 import type { Recipe } from "~/lib/api/types/recipe";
 import type { NoUndefinedField } from "~/lib/api/types/non-generated";

-interface Props {
-  recipe: NoUndefinedField<Recipe>;
-  maxWidth?: string;
-}
-const props = withDefaults(defineProps<Props>(), {
-  maxWidth: undefined,
-});
-
-const display = useDisplay();
-const { recipeImage } = useStaticRoutes();
-const { imageKey } = usePageState(props.recipe.slug);
-const { user } = usePageUser();
-
-const recipeHousehold = ref<HouseholdSummary>();
-if (user) {
-  const userApi = useUserApi();
-  userApi.households.getOne(props.recipe.householdId).then(({ data }) => {
-    recipeHousehold.value = data || undefined;
-  });
-}
-
-const hideImage = ref(false);
-const imageHeight = computed(() => {
-  return display.xs.value ? "200" : "400";
-});
-
-const recipeImageUrl = computed(() => {
-  return recipeImage(props.recipe.id, props.recipe.image, imageKey.value);
-});
-
-watch(
-  () => recipeImageUrl.value,
-  () => {
-    hideImage.value = false;
+export default defineNuxtComponent({
+  props: {
+    recipe: {
+      type: Object as () => NoUndefinedField<Recipe>,
+      required: true,
+    },
+    maxWidth: {
+      type: String,
+      default: undefined,
+    },
  },
-);
+  setup(props) {
+    const { $vuetify } = useNuxtApp();
+    const { recipeImage } = useStaticRoutes();
+    const { imageKey } = usePageState(props.recipe.slug);
+    const { user } = usePageUser();
+
+    const recipeHousehold = ref<HouseholdSummary>();
+    if (user) {
+      const userApi = useUserApi();
+      userApi.households.getOne(props.recipe.householdId).then(({ data }) => {
+        recipeHousehold.value = data || undefined;
+      });
+    }
+
+    const hideImage = ref(false);
+    const imageHeight = computed(() => {
+      return $vuetify.display.xs.value ? "200" : "400";
+    });
+
+    const recipeImageUrl = computed(() => {
+      return recipeImage(props.recipe.id, props.recipe.image, imageKey.value);
+    });
+
+    watch(
+      () => recipeImageUrl.value,
+      () => {
+        hideImage.value = false;
+      },
+    );
+
+    return {
+      recipeImageUrl,
+      imageKey,
+      hideImage,
+      imageHeight,
+    };
+  },
+});
 </script>
--- a/frontend/components/Domain/Recipe/RecipePage/RecipePageParts/RecipePageIngredientEditor.vue
+++ b/frontend/components/Domain/Recipe/RecipePage/RecipePageParts/RecipePageIngredientEditor.vue
@@ -1,13 +1,9 @@
+<!-- eslint-disable vue/no-mutating-props -->
 <template>
  <div>
-    <div class="mb-4">
-      <h2 class="mb-4 text-h5 font-weight-medium opacity-80">
-        {{ $t("recipe.ingredients") }}
-      </h2>
-      <BannerWarning v-if="!hasFoodOrUnit">
-        {{ $t("recipe.ingredients-not-parsed-description", { parse: $t('recipe.parse') }) }}
-      </BannerWarning>
-    </div>
+    <h2 class="mb-4 text-h5 font-weight-medium opacity-80">
+      {{ $t("recipe.ingredients") }}
+    </h2>
    <VueDraggable
      v-if="recipe.recipeIngredient.length > 0"
      v-model="recipe.recipeIngredient"
@@ -30,9 +26,8 @@
          v-for="(ingredient, index) in recipe.recipeIngredient"
          :key="ingredient.referenceId"
          v-model="recipe.recipeIngredient[index]"
-          enable-drag-handle
-          enable-context-menu
          class="list-group-item"
+          :disable-amount="recipe.settings.disableAmount"
          @delete="recipe.recipeIngredient.splice(index, 1)"
          @insert-above="insertNewIngredient(index)"
          @insert-below="insertNewIngredient(index + 1)"
@@ -47,17 +42,17 @@
    />
    <div class="d-flex flex-wrap justify-center justify-sm-end mt-3">
      <v-tooltip
-        location="top"
+        top
        color="accent"
      >
        <template #activator="{ props }">
          <span>
            <BaseButton
              class="mb-1"
-              :disabled="hasFoodOrUnit"
+              :disabled="recipe.settings.disableAmount || hasFoodOrUnit"
              color="accent"
+              :to="`/g/${groupSlug}/r/${recipe.slug}/ingredient-parser`"
              v-bind="props"
-              @click="toggleIsParsing(true)"
            >
              <template #icon>
                {{ $globals.icons.foods }}
@@ -88,14 +83,16 @@ import type { NoUndefinedField } from "~/lib/api/types/non-generated";
 import type { Recipe } from "~/lib/api/types/recipe";
 import RecipeIngredientEditor from "~/components/Domain/Recipe/RecipeIngredientEditor.vue";
 import RecipeDialogBulkAdd from "~/components/Domain/Recipe/RecipeDialogBulkAdd.vue";
-import { usePageState } from "~/composables/recipe-page/shared-state";
 import { uuid4 } from "~/composables/use-utils";

 const recipe = defineModel<NoUndefinedField<Recipe>>({ required: true });
 const i18n = useI18n();
+const $auth = useMealieAuth();

 const drag = ref(false);
-const { toggleIsParsing } = usePageState(recipe.value.slug);
+
+const route = useRoute();
+const groupSlug = computed(() => route.params.groupSlug as string || $auth.user.value?.groupSlug || "");

 const hasFoodOrUnit = computed(() => {
  if (!recipe.value) {
@@ -112,7 +109,10 @@ const hasFoodOrUnit = computed(() => {
 });

 const parserToolTip = computed(() => {
-  if (hasFoodOrUnit.value) {
+  if (recipe.value.settings.disableAmount) {
+    return i18n.t("recipe.enable-ingredient-amounts-to-use-this-feature");
+  }
+  else if (hasFoodOrUnit.value) {
    return i18n.t("recipe.recipes-with-units-or-foods-defined-cannot-be-parsed");
  }
  return i18n.t("recipe.parse-ingredients");
@@ -127,7 +127,8 @@ function addIngredient(ingredients: Array<string> | null = null) {
        note: x,
        unit: undefined,
        food: undefined,
-        quantity: 0,
+        disableAmount: true,
+        quantity: 1,
      };
    });

@@ -145,7 +146,8 @@ function addIngredient(ingredients: Array<string> | null = null) {
      unit: undefined,
      // @ts-expect-error - prop can be null-type by NoUndefinedField type forces it to be set
      food: undefined,
-      quantity: 0,
+      disableAmount: true,
+      quantity: 1,
    });
  }
 }
@@ -159,7 +161,8 @@ function insertNewIngredient(dest: number) {
    unit: undefined,
    // @ts-expect-error - prop can be null-type by NoUndefinedField type forces it to be set
    food: undefined,
-    quantity: 0,
+    disableAmount: true,
+    quantity: 1,
  });
 }
 </script>
--- a/frontend/components/Domain/Recipe/RecipePage/RecipePageParts/RecipePageIngredientToolsView.vue
+++ b/frontend/components/Domain/Recipe/RecipePage/RecipePageParts/RecipePageIngredientToolsView.vue
@@ -3,6 +3,7 @@
    <RecipeIngredients
      :value="recipe.recipeIngredient"
      :scale="scale"
+      :disable-amount="recipe.settings.disableAmount"
      :is-cook-mode="isCookMode"
    />
    <div v-if="!isEditMode && recipe.tools && recipe.tools.length > 0">
@@ -35,7 +36,7 @@
  </div>
 </template>

-<script setup lang="ts">
+<script lang="ts">
 import { useLoggedInState } from "~/composables/use-logged-in-state";
 import { usePageState, usePageUser } from "~/composables/recipe-page/shared-state";
 import { useToolStore } from "~/composables/store";
@@ -47,52 +48,71 @@ interface RecipeToolWithOnHand extends RecipeTool {
  onHand: boolean;
 }

-interface Props {
-  recipe: NoUndefinedField<Recipe>;
-  scale: number;
-  isCookMode?: boolean;
-}
-const props = withDefaults(defineProps<Props>(), {
-  isCookMode: false,
-});
+export default defineNuxtComponent({
+  components: {
+    RecipeIngredients,
+  },
+  props: {
+    recipe: {
+      type: Object as () => NoUndefinedField<Recipe>,
+      required: true,
+    },
+    scale: {
+      type: Number,
+      required: true,
+    },
+    isCookMode: {
+      type: Boolean,
+      default: false,
+    },
+  },
+  setup(props) {
+    const { isOwnGroup } = useLoggedInState();

-const { isOwnGroup } = useLoggedInState();
+    const toolStore = isOwnGroup.value ? useToolStore() : null;
+    const { user } = usePageUser();
+    const { isEditMode } = usePageState(props.recipe.slug);

-const toolStore = isOwnGroup.value ? useToolStore() : null;
-const { user } = usePageUser();
-const { isEditMode } = usePageState(props.recipe.slug);
-
-const recipeTools = computed(() => {
-  if (!(user.householdSlug && toolStore)) {
-    return props.recipe.tools.map(tool => ({ ...tool, onHand: false }) as RecipeToolWithOnHand);
-  }
-  else {
-    return props.recipe.tools.map((tool) => {
-      const onHand = tool.householdsWithTool?.includes(user.householdSlug) || false;
-      return { ...tool, onHand } as RecipeToolWithOnHand;
-    });
-  }
-});
-
-function updateTool(index: number) {
-  if (user.id && user.householdSlug && toolStore) {
-    const tool = recipeTools.value[index];
-    if (tool.onHand && !tool.householdsWithTool?.includes(user.householdSlug)) {
-      if (!tool.householdsWithTool) {
-        tool.householdsWithTool = [user.householdSlug];
+    const recipeTools = computed(() => {
+      if (!(user.householdSlug && toolStore)) {
+        return props.recipe.tools.map(tool => ({ ...tool, onHand: false }) as RecipeToolWithOnHand);
      }
      else {
-        tool.householdsWithTool.push(user.householdSlug);
+        return props.recipe.tools.map((tool) => {
+          const onHand = tool.householdsWithTool?.includes(user.householdSlug) || false;
+          return { ...tool, onHand } as RecipeToolWithOnHand;
+        });
+      }
+    });
+
+    function updateTool(index: number) {
+      if (user.id && user.householdSlug && toolStore) {
+        const tool = recipeTools.value[index];
+        if (tool.onHand && !tool.householdsWithTool?.includes(user.householdSlug)) {
+          if (!tool.householdsWithTool) {
+            tool.householdsWithTool = [user.householdSlug];
+          }
+          else {
+            tool.householdsWithTool.push(user.householdSlug);
+          }
+        }
+        else if (!tool.onHand && tool.householdsWithTool?.includes(user.householdSlug)) {
+          tool.householdsWithTool = tool.householdsWithTool.filter(household => household !== user.householdSlug);
+        }
+
+        toolStore.actions.updateOne(tool);
+      }
+      else {
+        console.log("no user, skipping server update");
      }
    }
-    else if (!tool.onHand && tool.householdsWithTool?.includes(user.householdSlug)) {
-      tool.householdsWithTool = tool.householdsWithTool.filter(household => household !== user.householdSlug);
-    }

-    toolStore.actions.updateOne(tool);
-  }
-  else {
-    console.log("no user, skipping server update");
-  }
-}
+    return {
+      toolStore,
+      recipeTools,
+      isEditMode,
+      updateTool,
+    };
+  },
+});
 </script>
--- a/frontend/components/Domain/Recipe/RecipePage/RecipePageParts/RecipePageInstructions.vue
+++ b/frontend/components/Domain/Recipe/RecipePage/RecipePageParts/RecipePageInstructions.vue
@@ -29,48 +29,33 @@
            {{ activeText }}
          </p>
          <v-divider class="mb-4" />
-          <template v-if="Object.keys(groupedUnusedIngredients).length > 0">
-            <h4 class="py-3 ml-1">
-              {{ $t("recipe.unlinked") }}
-            </h4>
-            <template v-for="(ingredients, title) in groupedUnusedIngredients" :key="title">
-              <h4 v-if="title" class="py-3 ml-1 pl-4">
-                {{ title }}
-              </h4>
-              <v-checkbox-btn
-                v-for="ing in ingredients"
-                :key="ing.referenceId"
-                v-model="activeRefs"
-                :value="ing.referenceId"
-                class="ml-4"
-              >
-                <template #label>
-                  <RecipeIngredientHtml :ingredient="ing" :scale="scale" />
-                </template>
-              </v-checkbox-btn>
+          <v-checkbox
+            v-for="ing in unusedIngredients"
+            :key="ing.referenceId"
+            v-model="activeRefs"
+            :value="ing.referenceId"
+            class="mb-n2 mt-n2"
+          >
+            <template #label>
+              <RecipeIngredientHtml :markup="parseIngredientText(ing, recipe.settings.disableAmount)" />
            </template>
-          </template>
+          </v-checkbox>

-          <template v-if="Object.keys(groupedUsedIngredients).length > 0">
+          <template v-if="usedIngredients.length > 0">
            <h4 class="py-3 ml-1">
              {{ $t("recipe.linked-to-other-step") }}
            </h4>
-            <template v-for="(ingredients, title) in groupedUsedIngredients" :key="title">
-              <h4 v-if="title" class="py-3 ml-1 pl-4">
-                {{ title }}
-              </h4>
-              <v-checkbox-btn
-                v-for="ing in ingredients"
-                :key="ing.referenceId"
-                v-model="activeRefs"
-                :value="ing.referenceId"
-                class="ml-4"
-              >
-                <template #label>
-                  <RecipeIngredientHtml :ingredient="ing" :scale="scale" />
-                </template>
-              </v-checkbox-btn>
-            </template>
+            <v-checkbox
+              v-for="ing in usedIngredients"
+              :key="ing.referenceId"
+              v-model="activeRefs"
+              :value="ing.referenceId"
+              class="mb-n2 mt-n2"
+            >
+              <template #label>
+                <RecipeIngredientHtml :markup="parseIngredientText(ing, recipe.settings.disableAmount)" />
+              </template>
+            </v-checkbox>
          </template>
        </v-card-text>

@@ -184,17 +169,17 @@
          <v-hover v-slot="{ isHovering }">
            <v-card
              class="my-3"
-              :class="[{ 'on-hover': isHovering }, { 'cursor-default': isEditForm }, isChecked(index)]"
+              :class="[{ 'on-hover': isHovering }, isChecked(index)]"
              :elevation="isHovering ? 12 : 2"
              :ripple="false"
              @click="toggleDisabled(index)"
            >
-              <v-card-title class="recipe-step-title pt-3" :class="!isChecked(index) ? 'pb-0' : 'pb-3'">
-                <div class="d-flex align-center w-100">
+              <v-card-title :class="{ 'pb-0': !isChecked(index) }">
+                <div class="d-flex align-center">
                  <v-text-field
                    v-if="isEditForm"
                    v-model="step.summary"
-                    class="headline"
+                    class="headline handle"
                    hide-details
                    density="compact"
                    variant="solo"
@@ -202,27 +187,14 @@
                    :placeholder="$t('recipe.step-index', { step: index + 1 })"
                  >
                    <template #prepend>
-                      <v-icon size="26" class="handle">
+                      <v-icon size="26">
                        {{ $globals.icons.arrowUpDown }}
                      </v-icon>
                    </template>
                  </v-text-field>
-                  <div
-                    v-else
-                    class="summary-wrapper"
-                  >
-                    <template v-if="step.summary">
-                      <SafeMarkdown
-                        class="pr-2"
-                        :source="step.summary"
-                      />
-                    </template>
-                    <template v-else>
-                      <span>
-                        {{ $t('recipe.step-index', { step: index + 1 }) }}
-                      </span>
-                    </template>
-                  </div>
+                  <span v-else>
+                    {{ step.summary ? step.summary : $t("recipe.step-index", { step: index + 1 }) }}
+                  </span>
                  <template v-if="isEditForm">
                    <div class="ml-auto">
                      <BaseButtonGroup
@@ -327,22 +299,11 @@
                      persistentHint: true,
                    }"
                  />
-                  <div
-                    v-if="step.ingredientReferences && step.ingredientReferences.length"
-                    class="linked-ingredients-editor"
-                  >
-                    <div
-                      v-for="(linkRef, i) in step.ingredientReferences"
-                      :key="linkRef.referenceId ?? i"
-                      class="mb-1"
-                    >
-                      <RecipeIngredientHtml
-                        v-if="linkRef.referenceId && ingredientLookup[linkRef.referenceId]"
-                        :ingredient="ingredientLookup[linkRef.referenceId]"
-                        :scale="scale"
-                      />
-                    </div>
-                  </div>
+                  <RecipeIngredientHtml
+                    v-for="ing in step.ingredientReferences"
+                    :key="ing.referenceId!"
+                    :markup="getIngredientByRefId(ing.referenceId!)"
+                  />
                </v-card-text>
              </DropZone>
              <v-expand-transition>
@@ -364,6 +325,7 @@
                              return step.ingredientReferences.map((ref) => ref.referenceId).includes(ing.referenceId || '')
                            })"
                            :scale="scale"
+                            :disable-amount="recipe.settings.disableAmount"
                            :is-cook-mode="isCookMode"
                          />
                        </div>
@@ -397,7 +359,9 @@
 <script setup lang="ts">
 import { VueDraggable } from "vue-draggable-plus";
 import { computed, nextTick, onMounted, ref, watch } from "vue";
+import RecipeIngredientHtml from "../../RecipeIngredientHtml.vue";
 import type { RecipeStep, IngredientReferences, RecipeIngredient, RecipeAsset, Recipe } from "~/lib/api/types/recipe";
+import { parseIngredientText } from "~/composables/recipes";
 import { uuid4 } from "~/composables/use-utils";
 import { useUserApi, useStaticRoutes } from "~/composables/api";
 import { usePageState } from "~/composables/recipe-page/shared-state";
@@ -405,7 +369,6 @@ import { useExtractIngredientReferences } from "~/composables/recipe-page/use-ex
 import type { NoUndefinedField } from "~/lib/api/types/non-generated";
 import DropZone from "~/components/global/DropZone.vue";
 import RecipeIngredients from "~/components/Domain/Recipe/RecipeIngredients.vue";
-import RecipeIngredientHtml from "~/components/Domain/Recipe/RecipeIngredientHtml.vue";

 interface MergerHistory {
  target: number;
@@ -430,6 +393,8 @@ const props = defineProps({

 const emit = defineEmits(["click-instruction-field", "update:assets"]);

+const BASE_URL = useRequestURL().origin;
+
 const { isCookMode, toggleCookMode, isEditForm } = usePageState(props.recipe.slug);

 const dialog = ref(false);
@@ -523,9 +488,10 @@ function openDialog(idx: number, text: string, refs?: IngredientReferences[]) {
    instructionList.value[idx].ingredientReferences = [];
    refs = instructionList.value[idx].ingredientReferences as IngredientReferences[];
  }
-  activeIndex.value = idx;
-  activeText.value = text;
+
  setUsedIngredients();
+  activeText.value = text;
+  activeIndex.value = idx;
  dialog.value = true;
  activeRefs.value = refs.map(ref => ref.referenceId ?? "");
 }
@@ -566,26 +532,30 @@ function saveAndOpenNextLinkIngredients() {
 function setUsedIngredients() {
  const usedRefs: { [key: string]: boolean } = {};

-  instructionList.value.forEach((element, idx) => {
-    if (idx === activeIndex.value) return;
+  instructionList.value.forEach((element) => {
    element.ingredientReferences?.forEach((ref) => {
-      if (ref.referenceId) usedRefs[ref.referenceId] = true;
+      if (ref.referenceId !== undefined) {
+        usedRefs[ref.referenceId!] = true;
+      }
    });
  });

-  usedIngredients.value = props.recipe.recipeIngredient.filter(ing => !!ing.referenceId && ing.referenceId in usedRefs);
+  usedIngredients.value = props.recipe.recipeIngredient.filter((ing) => {
+    return ing.referenceId !== undefined && ing.referenceId in usedRefs;
+  });

-  unusedIngredients.value = props.recipe.recipeIngredient.filter(ing => !!ing.referenceId && !(ing.referenceId in usedRefs));
+  unusedIngredients.value = props.recipe.recipeIngredient.filter((ing) => {
+    return !(ing.referenceId !== undefined && ing.referenceId in usedRefs);
+  });
 }

-watch(activeRefs, () => setUsedIngredients());
-
 function autoSetReferences() {
  useExtractIngredientReferences(
    props.recipe.recipeIngredient,
    activeRefs.value,
    activeText.value,
-  ).forEach(ingredient => activeRefs.value.push(ingredient));
+    props.recipe.settings.disableAmount,
+  ).forEach((ingredient: string) => activeRefs.value.push(ingredient));
 }

 const ingredientLookup = computed(() => {
@@ -599,60 +569,15 @@ const ingredientLookup = computed(() => {
  }, results);
 });

-// Map each ingredient's referenceId to its section title
-const ingredientSectionTitles = computed(() => {
-  const titleMap: { [key: string]: string } = {};
-  let currentTitle = "";
+function getIngredientByRefId(refId: string | undefined) {
+  if (refId === undefined) {
+    return "";
+  }

-  // Go through all ingredients in order
-  props.recipe.recipeIngredient.forEach((ingredient) => {
-    if (ingredient.referenceId === undefined) {
-      return;
-    }
-
-    // If this ingredient has a title, update the current title
-    if (ingredient.title) {
-      currentTitle = ingredient.title;
-    }
-
-    // Assign the current title to this ingredient
-    titleMap[ingredient.referenceId] = currentTitle;
-  });
-
-  return titleMap;
-});
-
-const groupedUnusedIngredients = computed((): Record<string, RecipeIngredient[]> => {
-  const groups: Record<string, RecipeIngredient[]> = {};
-
-  // Group ingredients by section title
-  unusedIngredients.value.forEach((ingredient) => {
-    if (ingredient.referenceId === undefined) {
-      return;
-    }
-
-    // Use the section title from the mapping, or fallback to the ingredient's own title
-    const title = ingredientSectionTitles.value[ingredient.referenceId] || ingredient.title || "";
-    (groups[title] ||= []).push(ingredient);
-  });
-
-  return groups;
-});
-
-const groupedUsedIngredients = computed((): Record<string, RecipeIngredient[]> => {
-  const groups: Record<string, RecipeIngredient[]> = {};
-  usedIngredients.value.forEach((ingredient) => {
-    if (ingredient.referenceId === undefined) {
-      return;
-    }
-
-    // Use the section title from the mapping, or fallback to the ingredient's own title
-    const title = ingredientSectionTitles.value[ingredient.referenceId] || ingredient.title || "";
-    (groups[title] ||= []).push(ingredient);
-  });
-
-  return groups;
-});
+  const ing = ingredientLookup.value[refId];
+  if (!ing) return "";
+  return parseIngredientText(ing, props.recipe.settings.disableAmount, props.scale);
+}

 // ===============================================================
 // Instruction Merger
@@ -774,7 +699,7 @@ async function handleImageDrop(index: number, files: File[]) {
  }

  emit("update:assets", [...assets.value, data]);
-  const assetUrl = recipeAssetPath(props.recipe.id, data.fileName as string);
+  const assetUrl = BASE_URL + recipeAssetPath(props.recipe.id, data.fileName as string);
  const text = `<img src="${assetUrl}" height="100%" width="100%"/>`;
  instructionList.value[index].text += text;
 }
@@ -846,21 +771,7 @@ function openImageUpload(index: number) {
  z-index: 1;
 }

-.v-text-field :deep(input) {
+.v-text-field >>> input {
  font-size: 1.5rem;
 }
-
-.recipe-step-title {
-  /* Multiline display */
-  white-space: normal;
-  line-height: 1.25;
-  word-break: break-word;
-}
-.summary-wrapper {
-  flex: 1 1 auto;
-  min-width: 0; /* wrapping in flex container */
-  white-space: normal;
-  overflow-wrap: anywhere;
-  cursor: pointer;
-}
 </style>
--- a/frontend/components/Domain/Recipe/RecipePage/RecipePageParts/RecipePageParseDialog.vue
+++ b/frontend/components/Domain/Recipe/RecipePage/RecipePageParts/RecipePageParseDialog.vue
@@ -1,538 +0,0 @@
-<template>
-  <BaseDialog
-    :model-value="modelValue"
-    :title="$t('recipe.parse-ingredients')"
-    :icon="$globals.icons.fileSign"
-    disable-submit-on-enter
-    @update:model-value="emit('update:modelValue', $event)"
-  >
-    <v-container fluid class="pa-2 ma-0" style="background-color: rgb(var(--v-theme-background));">
-      <div v-if="state.loading.parser" class="my-6">
-        <AppLoader waiting-text="" class="my-6" />
-      </div>
-      <div v-else>
-        <BaseCardSectionTitle :title="$t('recipe.parser.ingredient-parser')">
-          <div v-if="!state.allReviewed" class="mb-4">
-            <p>{{ $t("recipe.parser.ingredient-parser-description") }}</p>
-            <p>{{ $t("recipe.parser.ingredient-parser-final-review-description") }}</p>
-          </div>
-          <div class="d-flex flex-wrap align-center">
-            <div class="text-body-2 mr-2">
-              {{ $t("recipe.parser.select-parser") }}
-            </div>
-            <div class="d-flex align-center">
-              <BaseOverflowButton
-                v-model="parser"
-                :disabled="state.loading.parser"
-                btn-class="mx-2"
-                :items="availableParsers"
-              />
-              <v-btn
-                icon
-                size="40"
-                color="info"
-                :disabled="state.loading.parser"
-                @click="parseIngredients"
-              >
-                <v-icon>{{ $globals.icons.refresh }}</v-icon>
-              </v-btn>
-            </div>
-          </div>
-        </BaseCardSectionTitle>
-        <v-card v-if="!state.allReviewed && currentIng">
-          <v-card-text class="pb-0 mb-0">
-            <div class="text-center px-8 py-4 mb-6">
-              <p class="text-h5 font-italic">
-                {{ currentIng.input }}
-              </p>
-            </div>
-            <div class="d-flex align-center pa-0 ma-0">
-              <v-icon
-                :color="(currentIng.confidence?.average || 0) < confidenceThreshold ? 'error' : 'success'"
-              >
-                {{ (currentIng.confidence?.average || 0) < confidenceThreshold ? $globals.icons.alert : $globals.icons.check }}
-              </v-icon>
-              <span
-                class="ml-2"
-                :color="currentIngHasError ? 'error-text' : 'success-text'"
-              >
-                {{ $t("recipe.parser.confidence-score") }}: {{ currentIng.confidence ? asPercentage(currentIng.confidence?.average!) : "" }}
-              </span>
-            </div>
-            <RecipeIngredientEditor
-              v-model="currentIng.ingredient"
-              :unit-error="!!currentMissingUnit"
-              :unit-error-tooltip="$t('recipe.parser.this-unit-could-not-be-parsed-automatically')"
-              :food-error="!!currentMissingFood"
-              :food-error-tooltip="$t('recipe.parser.this-food-could-not-be-parsed-automatically')"
-            />
-            <v-card-actions>
-              <v-spacer />
-              <BaseButton
-                v-if="currentMissingUnit && !currentIng.ingredient.unit?.id"
-                color="warning"
-                size="small"
-                @click="createMissingUnit"
-              >
-                {{ i18n.t("recipe.parser.missing-unit", { unit: currentMissingUnit }) }}
-              </BaseButton>
-              <BaseButton
-                v-if="
-                  currentMissingUnit
-                    && currentIng.ingredient.unit?.id
-                    && currentMissingUnit.toLowerCase() != currentIng.ingredient.unit?.name.toLowerCase()
-                "
-                color="warning"
-                size="small"
-                @click="addMissingUnitAsAlias"
-              >
-                {{ i18n.t("recipe.parser.add-text-as-alias-for-item", { text: currentMissingUnit, item: currentIng.ingredient.unit.name }) }}
-              </BaseButton>
-              <BaseButton
-                v-if="currentMissingFood && !currentIng.ingredient.food?.id"
-                color="warning"
-                size="small"
-                @click="createMissingFood"
-              >
-                {{ i18n.t("recipe.parser.missing-food", { food: currentMissingFood }) }}
-              </BaseButton>
-              <BaseButton
-                v-if="
-                  currentMissingFood
-                    && currentIng.ingredient.food?.id
-                    && currentMissingFood.toLowerCase() != currentIng.ingredient.food?.name.toLowerCase()
-                "
-                color="warning"
-                size="small"
-                @click="addMissingFoodAsAlias"
-              >
-                {{ i18n.t("recipe.parser.add-text-as-alias-for-item", { text: currentMissingFood, item: currentIng.ingredient.food.name }) }}
-              </BaseButton>
-            </v-card-actions>
-          </v-card-text>
-        </v-card>
-        <div v-else>
-          <v-card-title class="text-center pt-0 pb-8">
-            {{ $t("recipe.parser.review-parsed-ingredients") }}
-          </v-card-title>
-          <v-card-text style="max-height: 60vh; overflow-y: auto;">
-            <VueDraggable
-              v-model="parsedIngs"
-              handle=".handle"
-              :delay="250"
-              :delay-on-touch-only="true"
-              v-bind="{
-                animation: 200,
-                group: 'recipe-ingredients',
-                disabled: false,
-                ghostClass: 'ghost',
-              }"
-              class="px-6"
-              @start="drag = true"
-              @end="drag = false"
-            >
-              <TransitionGroup
-                type="transition"
-              >
-                <v-lazy v-for="(ingredient, index) in parsedIngs" :key="index">
-                  <RecipeIngredientEditor
-                    v-model="ingredient.ingredient"
-                    enable-drag-handle
-                    enable-context-menu
-                    class="list-group-item pb-8"
-                    :delete-disabled="parsedIngs.length <= 1"
-                    @delete="parsedIngs.splice(index, 1)"
-                    @insert-above="insertNewIngredient(index)"
-                    @insert-below="insertNewIngredient(index + 1)"
-                  >
-                    <template #before-divider>
-                      <p v-if="ingredient.input" class="py-0 my-0 text-caption">
-                        {{ $t("recipe.original-text-with-value", { originalText: ingredient.input }) }}
-                      </p>
-                    </template>
-                  </RecipeIngredientEditor>
-                </v-lazy>
-              </TransitionGroup>
-            </VueDraggable>
-          </v-card-text>
-        </div>
-      </div>
-    </v-container>
-    <template v-if="!state.loading.parser" #custom-card-action>
-      <!-- Parse -->
-      <div v-if="!state.allReviewed" class="d-flex justify-space-between align-center">
-        <v-checkbox
-          v-model="currentIngShouldDelete"
-          color="error"
-          hide-details
-          density="compact"
-          :label="i18n.t('recipe.parser.delete-item')"
-          class="mr-4"
-        />
-        <BaseButton
-          :color="currentIngShouldDelete ? 'error' : 'info'"
-          :icon="currentIngShouldDelete ? $globals.icons.delete : $globals.icons.arrowRightBold"
-          :icon-right="!currentIngShouldDelete"
-          :text="$t(currentIngShouldDelete ? 'recipe.parser.delete-item' : 'general.next')"
-          @click="nextIngredient"
-        />
-      </div>
-      <!-- Review -->
-      <div v-else>
-        <BaseButton
-          create
-          :text="$t('general.save')"
-          :icon="$globals.icons.save"
-          :loading="state.loading.save"
-          @click="saveIngs"
-        />
-      </div>
-    </template>
-  </BaseDialog>
-</template>
-
-<script setup lang="ts">
-import { VueDraggable } from "vue-draggable-plus";
-import type { IngredientFood, IngredientUnit, ParsedIngredient, RecipeIngredient } from "~/lib/api/types/recipe";
-import type { Parser } from "~/lib/api/user/recipes/recipe";
-import type { NoUndefinedField } from "~/lib/api/types/non-generated";
-import { useAppInfo, useUserApi } from "~/composables/api";
-import { parseIngredientText } from "~/composables/recipes";
-import { useFoodData, useFoodStore, useUnitData, useUnitStore } from "~/composables/store";
-import { useGlobalI18n } from "~/composables/use-global-i18n";
-import { alert } from "~/composables/use-toast";
-import { useParsingPreferences } from "~/composables/use-users/preferences";
-
-const props = defineProps<{
-  modelValue: boolean;
-  ingredients: NoUndefinedField<RecipeIngredient[]>;
-}>();
-
-const emit = defineEmits<{
-  (e: "update:modelValue", value: boolean): void;
-  (e: "save", value: NoUndefinedField<RecipeIngredient[]>): void;
-}>();
-
-const i18n = useGlobalI18n();
-const api = useUserApi();
-const appInfo = useAppInfo();
-const drag = ref(false);
-
-const unitStore = useUnitStore();
-const unitData = useUnitData();
-const foodStore = useFoodStore();
-const foodData = useFoodData();
-
-const parserPreferences = useParsingPreferences();
-const parser = ref<Parser>(parserPreferences.value.parser || "nlp");
-const availableParsers = computed(() => {
-  return [
-    {
-      text: i18n.t("recipe.parser.natural-language-processor"),
-      value: "nlp",
-    },
-    {
-      text: i18n.t("recipe.parser.brute-parser"),
-      value: "brute",
-    },
-    {
-      text: i18n.t("recipe.parser.openai-parser"),
-      value: "openai",
-      hide: !appInfo.value?.enableOpenai,
-    },
-  ];
-});
-
-/**
- * If confidence of parsing is below this threshold,
- * we will prompt the user to review the parsed ingredient.
- */
-const confidenceThreshold = 0.85;
-const parsedIngs = ref<ParsedIngredient[]>([]);
-
-const currentIng = ref<ParsedIngredient | null>(null);
-const currentMissingUnit = ref("");
-const currentMissingFood = ref("");
-const currentIngHasError = computed(() => currentMissingUnit.value || currentMissingFood.value);
-const currentIngShouldDelete = ref(false);
-
-const state = reactive({
-  currentParsedIndex: -1,
-  allReviewed: false,
-  loading: {
-    parser: false,
-    save: false,
-  },
-});
-
-function shouldReview(ing: ParsedIngredient): boolean {
-  console.debug(`Checking if ingredient needs review (input="${ing.input})":`, ing);
-
-  if ((ing.confidence?.average || 0) < confidenceThreshold) {
-    console.debug("Needs review due to low confidence:", ing.confidence?.average);
-    return true;
-  }
-
-  const food = ing.ingredient.food;
-  if (food && !food.id) {
-    console.debug("Needs review due to missing food ID:", food);
-    return true;
-  }
-
-  const unit = ing.ingredient.unit;
-  if (unit && !unit.id) {
-    console.debug("Needs review due to missing unit ID:", unit);
-    return true;
-  }
-
-  console.debug("No review needed");
-  return false;
-}
-
-function checkUnit(ing: ParsedIngredient) {
-  const unit = ing.ingredient.unit?.name;
-  if (!unit || ing.ingredient.unit?.id) {
-    currentMissingUnit.value = "";
-    return;
-  }
-
-  const potentialMatch = createdUnits.get(unit.toLowerCase());
-  if (potentialMatch) {
-    ing.ingredient.unit = potentialMatch;
-    currentMissingUnit.value = "";
-    return;
-  }
-
-  currentMissingUnit.value = unit;
-  ing.ingredient.unit = undefined;
-}
-
-function checkFood(ing: ParsedIngredient) {
-  const food = ing.ingredient.food?.name;
-  if (!food || ing.ingredient.food?.id) {
-    currentMissingFood.value = "";
-    return;
-  }
-
-  const potentialMatch = createdFoods.get(food.toLowerCase());
-  if (potentialMatch) {
-    ing.ingredient.food = potentialMatch;
-    currentMissingFood.value = "";
-    return;
-  }
-
-  currentMissingFood.value = food;
-  ing.ingredient.food = undefined;
-}
-
-function nextIngredient() {
-  let nextIndex = state.currentParsedIndex;
-  if (currentIngShouldDelete.value) {
-    parsedIngs.value.splice(state.currentParsedIndex, 1);
-    currentIngShouldDelete.value = false;
-  }
-  else {
-    nextIndex += 1;
-  }
-
-  while (nextIndex < parsedIngs.value.length) {
-    const current = parsedIngs.value[nextIndex];
-    if (shouldReview(current)) {
-      state.currentParsedIndex = nextIndex;
-      currentIng.value = current;
-      currentIngShouldDelete.value = false;
-      checkUnit(current);
-      checkFood(current);
-      return;
-    }
-
-    nextIndex += 1;
-  }
-
-  // No more to review
-  state.allReviewed = true;
-}
-
-async function parseIngredients() {
-  if (state.loading.parser) {
-    return;
-  }
-
-  if (!props.ingredients || props.ingredients.length === 0) {
-    state.loading.parser = false;
-    return;
-  }
-  state.loading.parser = true;
-  try {
-    const ingsAsString = props.ingredients.map(ing => parseIngredientText(ing, 1, false) ?? "");
-    const { data, error } = await api.recipes.parseIngredients(parser.value, ingsAsString);
-    if (error || !data) {
-      throw new Error("Failed to parse ingredients");
-    }
-    parsedIngs.value = data;
-    state.currentParsedIndex = -1;
-    state.allReviewed = false;
-    createdUnits.clear();
-    createdFoods.clear();
-    currentIngShouldDelete.value = false;
-    nextIngredient();
-  }
-  catch (error) {
-    console.error("Error parsing ingredients:", error);
-    alert.error(i18n.t("events.something-went-wrong"));
-  }
-  finally {
-    state.loading.parser = false;
-  }
-}
-
-/** Cache of lowercased created units to avoid duplicate creations */
-const createdUnits = new Map<string, IngredientUnit>();
-/** Cache of lowercased created foods to avoid duplicate creations */
-const createdFoods = new Map<string, IngredientFood>();
-
-async function createMissingUnit() {
-  if (!currentMissingUnit.value) {
-    return;
-  }
-
-  unitData.reset();
-  unitData.data.name = currentMissingUnit.value;
-
-  let newUnit: IngredientUnit | null = null;
-  if (createdUnits.has(unitData.data.name)) {
-    newUnit = createdUnits.get(unitData.data.name)!;
-  }
-  else {
-    newUnit = await unitStore.actions.createOne(unitData.data);
-  }
-
-  if (!newUnit) {
-    alert.error(i18n.t("events.something-went-wrong"));
-    return;
-  }
-
-  currentIng.value!.ingredient.unit = newUnit;
-  createdUnits.set(newUnit.name.toLowerCase(), newUnit);
-  currentMissingUnit.value = "";
-}
-
-async function createMissingFood() {
-  if (!currentMissingFood.value) {
-    return;
-  }
-
-  foodData.reset();
-  foodData.data.name = currentMissingFood.value;
-
-  let newFood: IngredientFood | null = null;
-  if (createdFoods.has(foodData.data.name)) {
-    newFood = createdFoods.get(foodData.data.name)!;
-  }
-  else {
-    newFood = await foodStore.actions.createOne(foodData.data);
-  }
-
-  if (!newFood) {
-    alert.error(i18n.t("events.something-went-wrong"));
-    return;
-  }
-
-  currentIng.value!.ingredient.food = newFood;
-  createdFoods.set(newFood.name.toLowerCase(), newFood);
-  currentMissingFood.value = "";
-}
-
-async function addMissingUnitAsAlias() {
-  const unit = currentIng.value?.ingredient.unit as IngredientUnit | undefined;
-  if (!currentMissingUnit.value || !unit?.id) {
-    return;
-  }
-
-  unit.aliases = unit.aliases || [];
-  if (unit.aliases.map(a => a.name).includes(currentMissingUnit.value)) {
-    return;
-  }
-
-  unit.aliases.push({ name: currentMissingUnit.value });
-  const updated = await unitStore.actions.updateOne(unit);
-  if (!updated) {
-    alert.error(i18n.t("events.something-went-wrong"));
-    return;
-  }
-
-  currentIng.value!.ingredient.unit = updated;
-  currentMissingUnit.value = "";
-}
-
-async function addMissingFoodAsAlias() {
-  const food = currentIng.value?.ingredient.food as IngredientFood | undefined;
-  if (!currentMissingFood.value || !food?.id) {
-    return;
-  }
-
-  food.aliases = food.aliases || [];
-  if (food.aliases.map(a => a.name).includes(currentMissingFood.value)) {
-    return;
-  }
-
-  food.aliases.push({ name: currentMissingFood.value });
-  const updated = await foodStore.actions.updateOne(food);
-  if (!updated) {
-    alert.error(i18n.t("events.something-went-wrong"));
-    return;
-  }
-
-  currentIng.value!.ingredient.food = updated;
-  currentMissingFood.value = "";
-}
-
-watch(() => props.modelValue, () => {
-  if (!props.modelValue) {
-    return;
-  }
-
-  parseIngredients();
-});
-
-watch(parser, () => {
-  parserPreferences.value.parser = parser.value;
-  parseIngredients();
-});
-
-watch([parsedIngs, () => state.allReviewed], () => {
-  if (!state.allReviewed) {
-    return;
-  }
-
-  if (!parsedIngs.value.length) {
-    insertNewIngredient(0);
-  }
-}, { immediate: true, deep: true });
-
-function asPercentage(num: number | undefined): string {
-  if (!num) {
-    return "0%";
-  }
-
-  return Math.round(num * 100).toFixed(2) + "%";
-}
-
-function insertNewIngredient(index: number) {
-  const ing = {
-    input: "",
-    confidence: {},
-    ingredient: {
-      quantity: 0,
-      referenceId: uuid4(),
-    },
-  } as ParsedIngredient;
-
-  parsedIngs.value.splice(index, 0, ing);
-}
-
-function saveIngs() {
-  emit("save", parsedIngs.value.map(x => x.ingredient as NoUndefinedField<RecipeIngredient>));
-  state.loading.save = true;
-}
-</script>
--- a/frontend/components/Domain/Recipe/RecipePage/RecipePageParts/RecipePageScale.vue
+++ b/frontend/components/Domain/Recipe/RecipePage/RecipePageParts/RecipePageScale.vue
@@ -2,37 +2,55 @@
  <div class="d-flex justify-space-between align-center pt-2 pb-3">
    <RecipeScaleEditButton
      v-if="!isEditMode"
-      v-model.number="scale"
+      v-model.number="scaleValue"
      :recipe-servings="recipeServings"
-      :edit-scale="hasFoodOrUnit && !isEditMode"
+      :edit-scale="!recipe.settings.disableAmount && !isEditMode"
    />
  </div>
 </template>

-<script setup lang="ts">
+<script lang="ts">
 import RecipeScaleEditButton from "~/components/Domain/Recipe/RecipeScaleEditButton.vue";
 import type { NoUndefinedField } from "~/lib/api/types/non-generated";
 import type { Recipe } from "~/lib/api/types/recipe";
 import { usePageState } from "~/composables/recipe-page/shared-state";

-const props = defineProps<{ recipe: NoUndefinedField<Recipe> }>();
+export default defineNuxtComponent({
+  components: {
+    RecipeScaleEditButton,
+  },
+  props: {
+    recipe: {
+      type: Object as () => NoUndefinedField<Recipe>,
+      required: true,
+    },
+    scale: {
+      type: Number,
+      default: 1,
+    },
+  },
+  emits: ["update:scale"],
+  setup(props, { emit }) {
+    const { isEditMode } = usePageState(props.recipe.slug);

-const scale = defineModel<number>({ default: 1 });
+    const recipeServings = computed<number>(() => {
+      return props.recipe.recipeServings || props.recipe.recipeYieldQuantity || 1;
+    });

-const { isEditMode } = usePageState(props.recipe.slug);
+    const scaleValue = computed<number>({
+      get() {
+        return props.scale;
+      },
+      set(val) {
+        emit("update:scale", val);
+      },
+    });

-const recipeServings = computed<number>(() => {
-  return props.recipe.recipeServings || props.recipe.recipeYieldQuantity || 1;
-});
-
-const hasFoodOrUnit = computed(() => {
-  if (props.recipe.recipeIngredient) {
-    for (const ingredient of props.recipe.recipeIngredient) {
-      if (ingredient.food || ingredient.unit) {
-        return true;
-      }
-    }
-  }
-  return false;
+    return {
+      recipeServings,
+      scaleValue,
+      isEditMode,
+    };
+  },
 });
 </script>
--- a/frontend/components/Domain/Recipe/RecipePrintContainer.vue
+++ b/frontend/components/Domain/Recipe/RecipePrintContainer.vue
@@ -8,17 +8,24 @@
  </div>
 </template>

-<script setup lang="ts">
+<script lang="ts">
 import RecipePrintView from "~/components/Domain/Recipe/RecipePrintView.vue";
 import type { Recipe } from "~/lib/api/types/recipe";

-interface Props {
-  recipe: Recipe;
-  scale?: number;
-}
-
-withDefaults(defineProps<Props>(), {
-  scale: 1,
+export default defineNuxtComponent({
+  components: {
+    RecipePrintView,
+  },
+  props: {
+    recipe: {
+      type: Object as () => Recipe,
+      required: true,
+    },
+    scale: {
+      type: Number,
+      default: 1,
+    },
+  },
 });
 </script>

--- a/frontend/components/Domain/Recipe/RecipePrintView.vue
+++ b/frontend/components/Domain/Recipe/RecipePrintView.vue
@@ -4,23 +4,20 @@
    <section>
      <v-container class="ma-0 pa-0">
        <v-row>
-          <v-col
-            v-if="preferences.imagePosition && preferences.imagePosition != ImagePosition.hidden"
-            :order="preferences.imagePosition == ImagePosition.left ? -1 : 1"
-            cols="4"
-            align-self="center"
+          <v-col v-if="preferences.imagePosition && preferences.imagePosition != ImagePosition.hidden"
+                 :order="preferences.imagePosition == ImagePosition.left ? -1 : 1"
+                 cols="4"
+                 align-self="center"
          >
-            <img
-              :key="imageKey"
-              :src="recipeImageUrl"
-              style="min-height: 50; max-width: 100%;"
+            <img :key="imageKey"
+                 :src="recipeImageUrl"
+                 style="min-height: 50; max-width: 100%;"
            >
          </v-col>
          <v-col order="0">
            <v-card-title class="headline pl-0">
-              <v-icon
-                start
-                color="primary"
+              <v-icon start
+                      color="primary"
              >
                {{ $globals.icons.primary }}
              </v-icon>
@@ -39,19 +36,17 @@
              </div>
            </div>
            <v-row class="d-flex justify-start">
-              <RecipeTimeCard
-                :prep-time="recipe.prepTime"
-                :total-time="recipe.totalTime"
-                :perform-time="recipe.performTime"
-                small
-                color="white"
-                class="ml-4"
+              <RecipeTimeCard :prep-time="recipe.prepTime"
+                              :total-time="recipe.totalTime"
+                              :perform-time="recipe.performTime"
+                              small
+                              color="white"
+                              class="ml-4"
              />
            </v-row>

-            <v-card-text
-              v-if="preferences.showDescription"
-              class="px-0"
+            <v-card-text v-if="preferences.showDescription"
+                         class="px-0"
            >
              <SafeMarkdown :source="recipe.description" />
            </v-card-text>
@@ -65,29 +60,24 @@
      <v-card-title class="headline pl-0">
        {{ $t("recipe.ingredients") }}
      </v-card-title>
-      <div
-        v-for="(ingredientSection, sectionIndex) in ingredientSections"
-        :key="`ingredient-section-${sectionIndex}`"
-        class="print-section"
+      <div v-for="(ingredientSection, sectionIndex) in ingredientSections"
+           :key="`ingredient-section-${sectionIndex}`"
+           class="print-section"
      >
-        <h4
-          v-if="ingredientSection.ingredients[0].title"
-          class="ingredient-title mt-2"
+        <h4 v-if="ingredientSection.ingredients[0].title"
+            class="ingredient-title mt-2"
        >
          {{ ingredientSection.ingredients[0].title }}
        </h4>
-        <div
-          class="ingredient-grid"
-          :style="{ gridTemplateRows: `repeat(${Math.ceil(ingredientSection.ingredients.length / 2)}, min-content)` }"
+        <div class="ingredient-grid"
+             :style="{ gridTemplateRows: `repeat(${Math.ceil(ingredientSection.ingredients.length / 2)}, min-content)` }"
        >
-          <template
-            v-for="(ingredient, ingredientIndex) in ingredientSection.ingredients"
-            :key="`ingredient-${ingredientIndex}`"
+          <template v-for="(ingredient, ingredientIndex) in ingredientSection.ingredients"
+                    :key="`ingredient-${ingredientIndex}`"
          >
            <!-- eslint-disable-next-line vue/no-v-html -->
-            <p
-              class="ingredient-body"
-              v-html="parseText(ingredient)"
+            <p class="ingredient-body"
+               v-html="parseText(ingredient)"
            />
          </template>
        </div>
@@ -96,26 +86,22 @@

    <!-- Instructions -->
    <section>
-      <div
-        v-for="(instructionSection, sectionIndex) in instructionSections"
-        :key="`instruction-section-${sectionIndex}`"
-        :class="{ 'print-section': instructionSection.sectionName }"
+      <div v-for="(instructionSection, sectionIndex) in instructionSections"
+           :key="`instruction-section-${sectionIndex}`"
+           :class="{ 'print-section': instructionSection.sectionName }"
      >
-        <v-card-title
-          v-if="!sectionIndex"
-          class="headline pl-0"
+        <v-card-title v-if="!sectionIndex"
+                      class="headline pl-0"
        >
          {{ $t("recipe.instructions") }}
        </v-card-title>
-        <div
-          v-for="(step, stepIndex) in instructionSection.instructions"
-          :key="`instruction-${stepIndex}`"
+        <div v-for="(step, stepIndex) in instructionSection.instructions"
+             :key="`instruction-${stepIndex}`"
        >
          <div class="print-section">
-            <h4
-              v-if="step.title"
-              :key="`instruction-title-${stepIndex}`"
-              class="instruction-title mb-2"
+            <h4 v-if="step.title"
+                :key="`instruction-title-${stepIndex}`"
+                class="instruction-title mb-2"
            >
              {{ step.title }}
            </h4>
@@ -126,9 +112,8 @@
                  + 1,
              }) }}
            </h5>
-            <SafeMarkdown
-              :source="step.text"
-              class="recipe-step-body"
+            <SafeMarkdown :source="step.text"
+                          class="recipe-step-body"
            />
          </div>
        </div>
@@ -137,21 +122,18 @@

    <!-- Notes -->
    <div v-if="preferences.showNotes">
-      <v-divider
-        v-if="hasNotes"
-        class="grey my-4"
+      <v-divider v-if="hasNotes"
+                 class="grey my-4"
      />

      <section>
-        <div
-          v-for="(note, index) in recipe.notes"
-          :key="index + 'note'"
+        <div v-for="(note, index) in recipe.notes"
+             :key="index + 'note'"
        >
          <div class="print-section">
            <h4>{{ note.title }}</h4>
-            <SafeMarkdown
-              :source="note.text"
-              class="note-body"
+            <SafeMarkdown :source="note.text"
+                          class="note-body"
            />
          </div>
        </div>
@@ -168,9 +150,8 @@
        <div class="print-section">
          <table class="nutrition-table">
            <tbody>
-              <tr
-                v-for="(value, key) in recipe.nutrition"
-                :key="key"
+              <tr v-for="(value, key) in recipe.nutrition"
+                  :key="key"
              >
                <template v-if="value">
                  <td>{{ labels[key].label }}</td>
@@ -185,7 +166,7 @@
  </div>
 </template>

-<script setup lang="ts">
+<script lang="ts">
 import DOMPurify from "dompurify";
 import RecipeTimeCard from "~/components/Domain/Recipe/RecipeTimeCard.vue";
 import { useStaticRoutes } from "~/composables/api";
@@ -207,141 +188,167 @@ type InstructionSection = {
  instructions: RecipeStep[];
 };

-interface Props {
-  recipe: NoUndefinedField<Recipe>;
-  scale?: number;
-  dense?: boolean;
-}
-const props = withDefaults(defineProps<Props>(), {
-  scale: 1,
-  dense: false,
-});
+export default defineNuxtComponent({
+  components: {
+    RecipeTimeCard,
+  },
+  props: {
+    recipe: {
+      type: Object as () => NoUndefinedField<Recipe>,
+      required: true,
+    },
+    scale: {
+      type: Number,
+      default: 1,
+    },
+    dense: {
+      type: Boolean,
+      default: false,
+    },
+  },
+  setup(props) {
+    const i18n = useI18n();
+    const preferences = useUserPrintPreferences();
+    const { recipeImage } = useStaticRoutes();
+    const { imageKey } = usePageState(props.recipe.slug);
+    const { labels } = useNutritionLabels();

-const i18n = useI18n();
-const preferences = useUserPrintPreferences();
-const { recipeImage } = useStaticRoutes();
-const { imageKey } = usePageState(props.recipe.slug);
-const { labels } = useNutritionLabels();
-
-function sanitizeHTML(rawHtml: string) {
-  return DOMPurify.sanitize(rawHtml, {
-    USE_PROFILES: { html: true },
-    ALLOWED_TAGS: ["strong", "sup"],
-  });
-}
-const servingsDisplay = computed(() => {
-  const { scaledAmountDisplay } = useScaledAmount(props.recipe.recipeYieldQuantity, props.scale);
-  return scaledAmountDisplay || props.recipe.recipeYield
-    ? i18n.t("recipe.yields-amount-with-text", {
-      amount: scaledAmountDisplay,
-      text: props.recipe.recipeYield,
-    }) as string
-    : "";
-});
-
-const yieldDisplay = computed(() => {
-  const { scaledAmountDisplay } = useScaledAmount(props.recipe.recipeServings, props.scale);
-  return scaledAmountDisplay ? i18n.t("recipe.serves-amount", { amount: scaledAmountDisplay }) as string : "";
-});
-
-const recipeYield = computed(() => {
-  if (servingsDisplay.value && yieldDisplay.value) {
-    return sanitizeHTML(`${yieldDisplay.value}; ${servingsDisplay.value}`);
-  }
-  else {
-    return sanitizeHTML(yieldDisplay.value || servingsDisplay.value);
-  }
-});
-
-const recipeImageUrl = computed(() => {
-  return recipeImage(props.recipe.id, props.recipe.image, imageKey.value);
-});
-
-// Group ingredients by section so we can style them independently
-const ingredientSections = computed<IngredientSection[]>(() => {
-  if (!props.recipe.recipeIngredient) {
-    return [];
-  }
-
-  return props.recipe.recipeIngredient.reduce((sections, ingredient) => {
-    // if title append new section to the end of the array
-    if (ingredient.title) {
-      sections.push({
-        sectionName: ingredient.title,
-        ingredients: [ingredient],
+    function sanitizeHTML(rawHtml: string) {
+      return DOMPurify.sanitize(rawHtml, {
+        USE_PROFILES: { html: true },
+        ALLOWED_TAGS: ["strong", "sup"],
      });
-
-      return sections;
    }

-    // append new section if first
-    if (sections.length === 0) {
-      sections.push({
-        sectionName: "",
-        ingredients: [ingredient],
-      });
+    const servingsDisplay = computed(() => {
+      const { scaledAmountDisplay } = useScaledAmount(props.recipe.recipeYieldQuantity, props.scale);
+      return scaledAmountDisplay
+        ? i18n.t("recipe.yields-amount-with-text", {
+          amount: scaledAmountDisplay,
+          text: props.recipe.recipeYield,
+        }) as string
+        : "";
+    });

-      return sections;
-    }
+    const yieldDisplay = computed(() => {
+      const { scaledAmountDisplay } = useScaledAmount(props.recipe.recipeServings, props.scale);
+      return scaledAmountDisplay ? i18n.t("recipe.serves-amount", { amount: scaledAmountDisplay }) as string : "";
+    });

-    // otherwise add ingredient to last section in the array
-    sections[sections.length - 1].ingredients.push(ingredient);
-    return sections;
-  }, [] as IngredientSection[]);
-});
+    const recipeYield = computed(() => {
+      if (servingsDisplay.value && yieldDisplay.value) {
+        return sanitizeHTML(`${yieldDisplay.value}; ${servingsDisplay.value}`);
+      }
+      else {
+        return sanitizeHTML(yieldDisplay.value || servingsDisplay.value);
+      }
+    });

-// Group instructions by section so we can style them independently
-const instructionSections = computed<InstructionSection[]>(() => {
-  if (!props.recipe.recipeInstructions) {
-    return [];
-  }
+    const recipeImageUrl = computed(() => {
+      return recipeImage(props.recipe.id, props.recipe.image, imageKey.value);
+    });

-  return props.recipe.recipeInstructions.reduce((sections, step) => {
-    const offset = (() => {
-      if (sections.length === 0) {
-        return 0;
+    // Group ingredients by section so we can style them independently
+    const ingredientSections = computed<IngredientSection[]>(() => {
+      if (!props.recipe.recipeIngredient) {
+        return [];
      }

-      const lastOffset = sections[sections.length - 1].stepOffset;
-      const lastNumSteps = sections[sections.length - 1].instructions.length;
-      return lastOffset + lastNumSteps;
-    })();
+      return props.recipe.recipeIngredient.reduce((sections, ingredient) => {
+        // if title append new section to the end of the array
+        if (ingredient.title) {
+          sections.push({
+            sectionName: ingredient.title,
+            ingredients: [ingredient],
+          });

-    // if title append new section to the end of the array
-    if (step.title) {
-      sections.push({
-        sectionName: step.title,
-        stepOffset: offset,
-        instructions: [step],
-      });
+          return sections;
+        }

-      return sections;
+        // append new section if first
+        if (sections.length === 0) {
+          sections.push({
+            sectionName: "",
+            ingredients: [ingredient],
+          });
+
+          return sections;
+        }
+
+        // otherwise add ingredient to last section in the array
+        sections[sections.length - 1].ingredients.push(ingredient);
+        return sections;
+      }, [] as IngredientSection[]);
+    });
+
+    // Group instructions by section so we can style them independently
+    const instructionSections = computed<InstructionSection[]>(() => {
+      if (!props.recipe.recipeInstructions) {
+        return [];
+      }
+
+      return props.recipe.recipeInstructions.reduce((sections, step) => {
+        const offset = (() => {
+          if (sections.length === 0) {
+            return 0;
+          }
+
+          const lastOffset = sections[sections.length - 1].stepOffset;
+          const lastNumSteps = sections[sections.length - 1].instructions.length;
+          return lastOffset + lastNumSteps;
+        })();
+
+        // if title append new section to the end of the array
+        if (step.title) {
+          sections.push({
+            sectionName: step.title,
+            stepOffset: offset,
+            instructions: [step],
+          });
+
+          return sections;
+        }
+
+        // append if first element
+        if (sections.length === 0) {
+          sections.push({
+            sectionName: "",
+            stepOffset: offset,
+            instructions: [step],
+          });
+
+          return sections;
+        }
+
+        // otherwise add step to last section in the array
+        sections[sections.length - 1].instructions.push(step);
+        return sections;
+      }, [] as InstructionSection[]);
+    });
+
+    const hasNotes = computed(() => {
+      return props.recipe.notes && props.recipe.notes.length > 0;
+    });
+
+    function parseText(ingredient: RecipeIngredient) {
+      return parseIngredientText(ingredient, props.recipe.settings?.disableAmount || false, props.scale);
    }

-    // append if first element
-    if (sections.length === 0) {
-      sections.push({
-        sectionName: "",
-        stepOffset: offset,
-        instructions: [step],
-      });
-
-      return sections;
-    }
-
-    // otherwise add step to last section in the array
-    sections[sections.length - 1].instructions.push(step);
-    return sections;
-  }, [] as InstructionSection[]);
+    return {
+      labels,
+      hasNotes,
+      imageKey,
+      ImagePosition,
+      parseText,
+      parseIngredientText,
+      preferences,
+      recipeImageUrl,
+      recipeYield,
+      ingredientSections,
+      instructionSections,
+    };
+  },
 });
-
-const hasNotes = computed(() => {
-  return props.recipe.notes && props.recipe.notes.length > 0;
-});
-
-function parseText(ingredient: RecipeIngredient) {
-  return parseIngredientText(ingredient, props.scale);
-}
 </script>

 <style scoped>
--- a/frontend/components/Domain/Recipe/RecipeRating.vue
+++ b/frontend/components/Domain/Recipe/RecipeRating.vue
@@ -2,8 +2,7 @@
  <div @click.prevent>
    <!-- User Rating -->
    <v-hover v-slot="{ isHovering, props }">
-      <v-rating
-        v-if="isOwnGroup && (userRating || isHovering || !ratingsLoaded)"
+      <v-rating v-if="isOwnGroup && (userRating || isHovering || !ratingsLoaded)"
        v-bind="props"
        :model-value="userRating"
        active-color="secondary"
@@ -14,10 +13,10 @@
        hover
        clearable
        @update:model-value="updateRating(+$event)"
+        @click="updateRating"
      />
      <!-- Group Rating -->
-      <v-rating
-        v-else
+      <v-rating v-else
        v-bind="props"
        :model-value="groupRating"
        :half-increments="true"
@@ -84,7 +83,7 @@ export default defineNuxtComponent({
    });

    function updateRating(val?: number) {
-      if (!isOwnGroup.value || !val) {
+      if (!isOwnGroup.value) {
        return;
      }

--- a/frontend/components/Domain/Recipe/RecipeScaleEditButton.vue
+++ b/frontend/components/Domain/Recipe/RecipeScaleEditButton.vue
@@ -10,11 +10,11 @@
          nudge-top="6"
          :close-on-content-click="false"
        >
-          <template #activator="{ props: activatorProps }">
+          <template #activator="{ props }">
            <v-tooltip
              v-if="canEditScale"
              size="small"
-              location="top"
+              top
              color="secondary-darken-1"
            >
              <template #activator="{ props: tooltipProps }">
@@ -23,7 +23,7 @@
                  dark
                  color="secondary-darken-1"
                  size="small"
-                  v-bind="{ ...activatorProps, ...tooltipProps }"
+                  v-bind="{ ...props, ...tooltipProps }"
                  :style="{ cursor: canEditScale ? '' : 'default' }"
                >
                  <v-icon
@@ -45,7 +45,7 @@
              dark
              color="secondary-darken-1"
              size="small"
-              v-bind="activatorProps"
+              v-bind="props"
              :style="{ cursor: canEditScale ? '' : 'default' }"
            >
              <v-icon
@@ -66,22 +66,21 @@
            <v-card-text class="mt-n5">
              <div class="mt-4 d-flex align-center">
                <v-text-field
-                  :model-value="yieldQuantity"
+                  :model-value="yieldQuantityEditorValue"
                  type="number"
                  :min="0"
                  variant="underlined"
                  hide-spin-buttons
-                  @update:model-value="recalculateScale(parseFloat($event) || 0)"
+                  @update:model-value="recalculateScale(yieldQuantityEditorValue)"
                />
                <v-tooltip
-                  location="end"
+                  end
                  color="secondary-darken-1"
                >
-                  <template #activator="{ props: resetTooltipProps }">
+                  <template #activator="{ props }">
                    <v-btn
-                      v-bind="resetTooltipProps"
+                      v-bind="props"
                      icon
-                      flat
                      class="mx-1"
                      size="small"
                      @click="scale = 1"
@@ -122,50 +121,90 @@
  </div>
 </template>

-<script setup lang="ts">
+<script lang="ts">
 import { useScaledAmount } from "~/composables/recipes/use-scaled-amount";

-interface Props {
-  recipeServings?: number;
-  editScale?: boolean;
-}
-const props = withDefaults(defineProps<Props>(), {
-  recipeServings: 0,
-  editScale: false,
-});
+export default defineNuxtComponent({
+  props: {
+    modelValue: {
+      type: Number,
+      required: true,
+    },
+    recipeServings: {
+      type: Number,
+      default: 0,
+    },
+    editScale: {
+      type: Boolean,
+      default: false,
+    },
+  },
+  emits: ["update:modelValue"],
+  setup(props, { emit }) {
+    const i18n = useI18n();
+    const menu = ref<boolean>(false);
+    const canEditScale = computed(() => props.editScale && props.recipeServings > 0);

-const scale = defineModel<number>({ required: true });
+    const scale = computed({
+      get: () => props.modelValue,
+      set: (value) => {
+        const newScaleNumber = parseFloat(`${value}`);
+        emit("update:modelValue", isNaN(newScaleNumber) ? 0 : newScaleNumber);
+      },
+    });

-const i18n = useI18n();
-const menu = ref<boolean>(false);
-const canEditScale = computed(() => props.editScale && props.recipeServings > 0);
+    function recalculateScale(newYield: number) {
+      if (isNaN(newYield) || newYield <= 0) {
+        return;
+      }

-function recalculateScale(newYield: number) {
-  if (isNaN(newYield) || newYield <= 0) {
-    return;
-  }
+      if (props.recipeServings <= 0) {
+        scale.value = 1;
+      }
+      else {
+        scale.value = newYield / props.recipeServings;
+      }
+    }

-  if (props.recipeServings <= 0) {
-    scale.value = 1;
-  }
-  else {
-    scale.value = newYield / props.recipeServings;
-  }
-}
+    const recipeYieldAmount = computed(() => {
+      return useScaledAmount(props.recipeServings, scale.value);
+    });
+    const yieldQuantity = computed(() => recipeYieldAmount.value.scaledAmount);
+    const yieldDisplay = computed(() => {
+      return yieldQuantity.value
+        ? i18n.t(
+          "recipe.serves-amount", { amount: recipeYieldAmount.value.scaledAmountDisplay },
+        ) as string
+        : "";
+    });

-const recipeYieldAmount = computed(() => {
-  return useScaledAmount(props.recipeServings, scale.value);
-});
-const yieldQuantity = computed(() => recipeYieldAmount.value.scaledAmount);
-const yieldDisplay = computed(() => {
-  return yieldQuantity.value
-    ? i18n.t(
-      "recipe.serves-amount", { amount: recipeYieldAmount.value.scaledAmountDisplay },
-    ) as string
-    : "";
-});
+    // only update yield quantity when the menu opens, so we don't override the user's input
+    const yieldQuantityEditorValue = ref(recipeYieldAmount.value.scaledAmount);
+    watch(
+      () => menu.value,
+      () => {
+        if (!menu.value) {
+          return;
+        }

-const disableDecrement = computed(() => {
-  return yieldQuantity.value <= 1;
+        yieldQuantityEditorValue.value = recipeYieldAmount.value.scaledAmount;
+      },
+    );
+
+    const disableDecrement = computed(() => {
+      return recipeYieldAmount.value.scaledAmount <= 1;
+    });
+
+    return {
+      menu,
+      canEditScale,
+      scale,
+      recalculateScale,
+      yieldDisplay,
+      yieldQuantity,
+      yieldQuantityEditorValue,
+      disableDecrement,
+    };
+  },
 });
 </script>
--- a/frontend/components/Domain/Recipe/RecipeSearchFilterSelector.vue
+++ b/frontend/components/Domain/Recipe/RecipeSearchFilterSelector.vue
@@ -0,0 +1,54 @@
+<template>
+  <div class="d-flex justify-center align-center">
+    <v-btn-toggle v-model="selected" tile group color="primary accent-3" mandatory="force" @change="emitMulti">
+      <v-btn size="small" :value="false">
+        {{ $t("search.include") }}
+      </v-btn>
+      <v-btn size="small" :value="true">
+        {{ $t("search.exclude") }}
+      </v-btn>
+    </v-btn-toggle>
+    <v-btn-toggle v-model="match" tile group color="primary accent-3" mandatory="force" @change="emitMulti">
+      <v-btn size="small" :value="false" class="text-uppercase">
+        {{ $t("search.and") }}
+      </v-btn>
+      <v-btn size="small" :value="true" class="text-uppercase">
+        {{ $t("search.or") }}
+      </v-btn>
+    </v-btn-toggle>
+  </div>
+</template>
+
+<script lang="ts">
+type SelectionValue = "include" | "exclude" | "any";
+
+export default defineNuxtComponent({
+  props: {
+    modelValue: {
+      type: String as () => SelectionValue,
+      default: "include",
+    },
+  },
+  emits: ["update:modelValue", "update"],
+  data() {
+    return {
+      selected: false,
+      match: false,
+    };
+  },
+  methods: {
+    emitChange() {
+      this.$emit("update:modelValue", this.selected);
+    },
+    emitMulti() {
+      const updateData = {
+        exclude: this.selected,
+        matchAny: this.match,
+      };
+      this.$emit("update", updateData);
+    },
+  },
+});
+</script>
+
+<style lang="scss" scoped></style>
--- a/frontend/components/Domain/Recipe/RecipeSettingsSwitches.vue
+++ b/frontend/components/Domain/Recipe/RecipeSettingsSwitches.vue
@@ -31,6 +31,7 @@ const labels: Record<keyof RecipeSettings, string> = {
  showAssets: i18n.t("asset.show-assets"),
  landscapeView: i18n.t("recipe.landscape-view-coming-soon"),
  disableComments: i18n.t("recipe.disable-comments"),
+  disableAmount: i18n.t("recipe.disable-amount"),
  locked: i18n.t("recipe.locked"),
 };
 </script>
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Kuchenpirat	6e16a16cd8	Merge branch 'mealie-next' into reset-scroll-position	2025-07-12 01:32:32 +02:00
Kuchenpirat	78a0f74f33	reset scroll position	2025-07-11 23:29:09 +00:00