Merge branch 'mealie-recipes:mealie-next' into mealie-next

.devcontainer/Dockerfile

@@ -1,8 +1,8 @@
 # See here for image contents: https://github.com/microsoft/vscode-dev-containers/tree/v0.224.2/containers/python-3/.devcontainer/base.Dockerfile
 
 # [Choice] Python version (use -bullseye variants on local arm64/Apple Silicon): 3, 3.10, 3.9, 3.8, 3.7, 3.6, 3-bullseye, 3.10-bullseye, 3.9-bullseye, 3.8-bullseye, 3.7-bullseye, 3.6-bullseye, 3-buster, 3.10-buster, 3.9-buster, 3.8-buster, 3.7-buster, 3.6-buster
-ARG VARIANT="3.10-bullseye"
-FROM mcr.microsoft.com/vscode/devcontainers/python:0-${VARIANT}
+ARG VARIANT="3.12-bullseye"
+FROM mcr.microsoft.com/devcontainers/python:${VARIANT}
 
 # [Choice] Node.js version: none, lts/*, 16, 14, 12, 10
 ARG NODE_VERSION="none"

.devcontainer/devcontainer.json

@@ -9,7 +9,7 @@
       // Update 'VARIANT' to pick a Python version: 3, 3.10, 3.9, 3.8, 3.7, 3.6
       // Append -bullseye or -buster to pin to an OS version.
       // Use -bullseye variants on local on arm64/Apple Silicon.
-      "VARIANT": "3.10-bullseye",
+      "VARIANT": "3.12-bullseye",
       // Options
       "NODE_VERSION": "16"
     }

.github/pull_request_template.md

@@ -20,20 +20,6 @@
 
  -->
 
-## What type of PR is this?
-
-_(REQUIRED)_
-
-<!--
-  Delete any of the following that do not apply:
- -->
-
-- feature
-- bug
-- documentation
-- cleanup
-- dev (Internal development)
-
 ## What this PR does / why we need it:
 
 _(REQUIRED)_

.github/workflows/partial-backend.yml

@@ -47,7 +47,7 @@ jobs:
       - name: Set up python
         uses: actions/setup-python@v5
         with:
-          python-version: "3.10"
+          python-version: "3.12"
 
       - name: Install Poetry
         uses: snok/install-poetry@v1

.github/workflows/scheduled-checks.yml

@@ -18,7 +18,7 @@ jobs:
       - name: Setup Python
         uses: actions/setup-python@v5
         with:
-          python-version: "3.10"
+          python-version: "3.12"
 
       - name: Set PY
         shell: bash

.pre-commit-config.yaml

@@ -12,7 +12,7 @@ repos:
         exclude: ^tests/data/
   - repo: https://github.com/astral-sh/ruff-pre-commit
     # Ruff version.
-    rev: v0.7.2
+    rev: v0.9.5
     hooks:
       - id: ruff
       - id: ruff-format

Taskfile.yml

@@ -151,7 +151,7 @@ tasks:
   py:migrate:
     desc: generates a new database migration file e.g. task py:migrate -- "add new column"
     cmds:
-      - poetry run alembic revision --autogenerate -m "{{ .CLI_ARGS }}"
+      - poetry run alembic --config mealie/alembic/alembic.ini revision --autogenerate -m "{{ .CLI_ARGS }}"
       - task: py:format
 
   ui:build:

dev/code-generation/gen_ts_types.py

@@ -1,3 +1,4 @@
+import re
 from pathlib import Path
 
 from jinja2 import Template
@@ -64,7 +65,112 @@ def generate_global_components_types() -> None:
 # Pydantic To Typescript Generator
 
 
-def generate_typescript_types() -> None:
+def generate_typescript_types() -> None:  # noqa: C901
+    def contains_number(s: str) -> bool:
+        return bool(re.search(r"\d", s))
+
+    def remove_numbers(s: str) -> str:
+        return re.sub(r"\d", "", s)
+
+    def extract_type_name(line: str) -> str:
+        # Looking for "export type EnumName = enumVal1 | enumVal2 | ..."
+        if not (line.startswith("export type") and "=" in line):
+            return ""
+
+        return line.split(" ")[2]
+
+    def extract_property_type_name(line: str) -> str:
+        # Looking for " fieldName: FieldType;" or " fieldName: FieldType & string;"
+        if not (line.startswith("  ") and ":" in line):
+            return ""
+
+        return line.split(":")[1].strip().split(";")[0]
+
+    def extract_interface_name(line: str) -> str:
+        # Looking for "export interface InterfaceName {"
+        if not (line.startswith("export interface") and "{" in line):
+            return ""
+
+        return line.split(" ")[2]
+
+    def is_comment_line(line: str) -> bool:
+        s = line.strip()
+        return s.startswith("/*") or s.startswith("*")
+
+    def clean_output_file(file: Path) -> None:
+        """
+        json2ts generates duplicate types off of our enums and appends a number to the end of the type name.
+        Our Python code (hopefully) doesn't have any duplicate enum names, or types with numbers in them,
+        so we can safely remove the numbers.
+
+        To do this, we read the output line-by-line and replace any type names that contain numbers with
+        the same type name, but without the numbers.
+
+        Note: the issue arrises from the JSON package json2ts, not the Python package pydantic2ts,
+        otherwise we could just fix pydantic2ts.
+        """
+
+        # First pass: build a map of type names to their numberless counterparts and lines to skip
+        replacement_map = {}
+        lines_to_skip = set()
+        wait_for_semicolon = False
+        wait_for_close_bracket = False
+        skip_comments = False
+        with open(file) as f:
+            for i, line in enumerate(f.readlines()):
+                if wait_for_semicolon:
+                    if ";" in line:
+                        wait_for_semicolon = False
+                    lines_to_skip.add(i)
+                    continue
+                if wait_for_close_bracket:
+                    if "}" in line:
+                        wait_for_close_bracket = False
+                    lines_to_skip.add(i)
+                    continue
+
+                if type_name := extract_type_name(line):
+                    if not contains_number(type_name):
+                        continue
+
+                    replacement_map[type_name] = remove_numbers(type_name)
+                    if ";" not in line:
+                        wait_for_semicolon = True
+                    lines_to_skip.add(i)
+
+                elif type_name := extract_interface_name(line):
+                    if not contains_number(type_name):
+                        continue
+
+                    replacement_map[type_name] = remove_numbers(type_name)
+                    if "}" not in line:
+                        wait_for_close_bracket = True
+                    lines_to_skip.add(i)
+
+                elif skip_comments and is_comment_line(line):
+                    lines_to_skip.add(i)
+
+                # we've passed the opening comments and empty line at the header
+                elif not skip_comments and not line.strip():
+                    skip_comments = True
+
+        # Second pass: rewrite or remove lines as needed.
+        # We have to do two passes here because definitions don't always appear in the same order as their usage.
+        lines = []
+        with open(file) as f:
+            for i, line in enumerate(f.readlines()):
+                if i in lines_to_skip:
+                    continue
+
+                if type_name := extract_property_type_name(line):
+                    if type_name in replacement_map:
+                        line = line.replace(type_name, replacement_map[type_name])
+
+                lines.append(line)
+
+        with open(file, "w") as f:
+            f.writelines(lines)
+
     def path_to_module(path: Path):
         str_path: str = str(path)
 
@@ -98,9 +204,10 @@ def generate_typescript_types() -> None:
         try:
             path_as_module = path_to_module(module)
             generate_typescript_defs(path_as_module, str(out_path), exclude=("MealieModel"))  # type: ignore
-        except Exception as e:
+            clean_output_file(out_path)
+        except Exception:
             failed_modules.append(module)
-            log.error(f"Module Error: {e}")
+            log.exception(f"Module Error: {module}")
 
     log.debug("\n📁 Skipped Directories:")
     for skipped_dir in skipped_dirs:

docker/Dockerfile

@@ -17,7 +17,7 @@ RUN yarn generate
 ###############################################
 # Base Image - Python
 ###############################################
-FROM python:3.10-slim as python-base
+FROM python:3.12-slim as python-base
 
 ENV MEALIE_HOME="/app"
 
@@ -109,10 +109,6 @@ COPY --from=crfpp /usr/local/bin/crf_test /usr/local/bin/crf_test
 COPY ./mealie $MEALIE_HOME/mealie
 COPY ./poetry.lock ./pyproject.toml $MEALIE_HOME/
 
-# Alembic
-COPY ./alembic $MEALIE_HOME/alembic
-COPY ./alembic.ini $MEALIE_HOME/
-
 # venv already has runtime deps installed we get a quicker install
 WORKDIR $MEALIE_HOME
 RUN . $VENV_PATH/bin/activate && poetry install -E pgsql --only main

docs/docs/contributors/developers-guide/starting-dev-server.md

@@ -32,7 +32,7 @@ Make sure the VSCode Dev Containers extension is installed, then select "Dev Con
 
 ### Prerequisites
 
-- [Python 3.10](https://www.python.org/downloads/)
+- [Python 3.12](https://www.python.org/downloads/)
 - [Poetry](https://python-poetry.org/docs/#installation)
 - [Node v16.x](https://nodejs.org/en/)
 - [yarn](https://classic.yarnpkg.com/lang/en/docs/install/#mac-stable)

docs/docs/documentation/community-guide/bring-api.md

@@ -0,0 +1,8 @@
+!!! info
+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).
+However, for this to work, your Mealie instance needs to be exposed to the open Internet so that the Bring servers can access its information. If you don't want your server to be publicly accessible for security reasons, you can use the [Mealie-Bring-API](https://github.com/felixschndr/mealie-bring-api) written by a community member. This integration is entirely local and does not require any service to be exposed to the Internet.
+
+This is a small web server that runs locally next to your Mealie instance, and instead of Bring pulling the data from you, it pushes the data to Bring. [Check out the project](https://github.com/felixschndr/mealie-bring-api) for more information and installation instructions.

docs/docs/documentation/community-guide/home-assistant.md

@@ -24,7 +24,7 @@ Make sure the url and port (`http://mealie:9000` ) matches your installation's a
 
 ```yaml
 rest:
-  - resource: "http://mealie:9000/api/groups/mealplans/today"
+  - resource: "http://mealie:9000/api/households/mealplans/today"
     method: GET
     headers:
       Authorization: Bearer <<API_TOKEN>>

docs/docs/documentation/getting-started/authentication/oidc-v2.md

@@ -10,7 +10,7 @@
 Mealie supports 3rd party authentication via [OpenID Connect (OIDC)](https://openid.net/connect/), an identity layer built on top of OAuth2. OIDC is supported by many Identity Providers (IdP), including:
 
 - [Authentik](https://goauthentik.io/integrations/sources/oauth/#openid-connect)
-- [Authelia](https://www.authelia.com/configuration/identity-providers/open-id-connect/)
+- [Authelia](https://www.authelia.com/integration/openid-connect/mealie/)
 - [Keycloak](https://www.keycloak.org/docs/latest/securing_apps/#_oidc)
 - [Okta](https://www.okta.com/openid-connect/)
 

docs/docs/documentation/getting-started/authentication/oidc.md

@@ -5,7 +5,7 @@
 Mealie supports 3rd party authentication via [OpenID Connect (OIDC)](https://openid.net/connect/), an identity layer built on top of OAuth2. OIDC is supported by many Identity Providers (IdP), including:
 
 - [Authentik](https://goauthentik.io/integrations/sources/oauth/#openid-connect)
-- [Authelia](https://www.authelia.com/configuration/identity-providers/open-id-connect/)
+- [Authelia](https://www.authelia.com/integration/openid-connect/mealie/)
 - [Keycloak](https://www.keycloak.org/docs/latest/securing_apps/#_oidc)
 - [Okta](https://www.okta.com/openid-connect/)
 

docs/docs/documentation/getting-started/faq.md

@@ -1,164 +1,308 @@
+
 # Frequently Asked Questions
 
-## How do I enable "smart" ingredient handling?
+## Features and Functionality
 
-You might have noticed that scaling up a recipe or making a shopping list doesn't by default handle the ingredients in a way you might expect. Depending on your settings, scaling up might yield things like `2 1 cup broth` instead of `2 cup broth`. And, making shopping lists from recipes that have shared ingredients can yield multiple lines of the same ingredient. **But**, Mealie has a mechanism to intelligently handle ingredients and make your day better. How?
-### Set up your Foods and Units
-Do the following just **once**. Doing this applies to your whole group, so be careful.
+??? question "How do I enable 'smart' ingredient handling?"
 
-1. Click on your name in the upper left corner to get to your settings
-2. In the bottom right, select `Manage Data`
-3. In the Management page, make sure that a little orange button says `Foods`
-4. If your Foods database is empty, click `Seed` and choose your language. You should end up with a list of foods. (Wait a bit for seeding to happen, and try not to seed more than once or you will have duplicates)
-5. Click the little orange `Foods` button and now choose `Units`.
-6. Click `Seed` and choose your language. You should end up with a list of units (e.g. `tablespoon`)
+    ### How do I enable "smart" ingredient handling?
 
-Initial seeding of Units is pretty complete, but there are many Foods in the world. You'll probably find that you need to add Foods to the database during parsing for the first several recipes. Once you have a well-populated Food database, there are API routes to parse ingredients automatically in bulk. But this is not a good idea without a very complete set of Foods.
+    You might have noticed that scaling up a recipe or making a shopping list doesn't by default handle the ingredients in a way you might expect. Depending on your settings, scaling up might yield things like `2 1 cup broth` instead of `2 cup broth`. And, making shopping lists from recipes that have shared ingredients can yield multiple lines of the same ingredient. **But**, Mealie has a mechanism to intelligently handle ingredients and make your day better. How?
 
-### Set up Recipes to use Foods and Units
-Do the following for each recipe you want to intelligently handle ingredients.
+    <p style="font-size: 0.75rem; font-weight: 500;">Set up your Foods and Units</p>
+    Do the following just **once**. Doing this applies to your whole group, so be careful.
 
-1. Go to a recipe
-2. Click the Edit button/icon
-3. Click the Recipe Settings gear and deselect `Disable Ingredient Amounts`
-4. Save
-5. The ingredients should now look a little weird (`1 1 cup broth` and so on)
-6. Click the Edit button/icon again
-7. Scroll to the ingredients and you should see new fields for Amount, Unit, Food, and Note. The Note in particular will contain the original text of the Recipe.
-8. Click `Parse` and you will be taken to the ingredient parsing page.
-9. Choose your parser. The `Natural Language Parser` works very well, but you can also use the `Brute Parser`, or the `OpenAI Parser` if you've [enabled OpenAI support](./installation/backend-config.md#openai).
-10. Click `Parse All`, and your ingredients should be separated out into Units and Foods based on your seeding in Step 1 above.
-11. For ingredients where the Unit or Food was not found, you can click a button to accept an automatically suggested Food to add to the database. Or, manually enter the Unit/Food and hit `Enter` (or click `Create`) to add it to the database
-12. When done, click `Save All` and you will be taken back to the recipe. Now the Unit and Food fields of the recipe should be filled out.
+    1. Click on your name in the upper left corner to get to your settings
+    2. In the bottom right, select `Manage Data`
+    3. In the Management page, make sure that a little orange button says `Foods`
+    4. If your Foods database is empty, click `Seed` and choose your language. You should end up with a list of foods. (Wait a bit for seeding to happen, and try not to seed more than once or you will have duplicates)
+    5. Click the little orange `Foods` button and now choose `Units`.
+    6. Click `Seed` and choose your language. You should end up with a list of units (e.g. `tablespoon`)
 
-Scaling up this recipe or adding it to a Shopping List will now smartly take care of ingredient amounts and duplicate combinations.
+    Initial seeding of Units is pretty complete, but there are many Foods in the world. You'll probably find that you need to add Foods to the database during parsing for the first several recipes. Once you have a well-populated Food database, there are API routes to parse ingredients automatically in bulk. But this is not a good idea without a very complete set of Foods.
 
-## Is it safe to upgrade Mealie?
+    <p style="font-size: 0.75rem; font-weight: 500;">Set up Recipes to use Foods and Units</p>
 
-Yes. If you are using the v1 branches (including beta), you can upgrade to the latest version of Mealie without performing a site Export/Restore. This process was required in previous versions of Mealie, however we've automated the database migration process to make it easier to upgrade. Note that if you were using the v0.5.x version, you CANNOT upgrade to the latest version automatically. You must follow the migration instructions in the documentation.
+    Do the following for each recipe you want to intelligently handle ingredients.
 
-- [Migration From v0.5.x](./migrating-to-mealie-v1.md)
+    1. Go to a recipe
+    2. Click the Edit button/icon
+    3. Click the Recipe Settings gear and deselect `Disable Ingredient Amounts`
+    4. Save
+    5. The ingredients should now look a little weird (`1 1 cup broth` and so on)
+    6. Click the Edit button/icon again
+    7. Scroll to the ingredients and you should see new fields for Amount, Unit, Food, and Note. The Note in particular will contain the original text of the Recipe.
+    8. Click `Parse` and you will be taken to the ingredient parsing page.
+    9. Choose your parser. The `Natural Language Parser` works very well, but you can also use the `Brute Parser`, or the `OpenAI Parser` if you've [enabled OpenAI support](./installation/backend-config.md#openai).
+    10. Click `Parse All`, and your ingredients should be separated out into Units and Foods based on your seeding in Step 1 above.
+    11. For ingredients where the Unit or Food was not found, you can click a button to accept an automatically suggested Food to add to the database. Or, manually enter the Unit/Food and hit `Enter` (or click `Create`) to add it to the database
+    12. When done, click `Save All` and you will be taken back to the recipe. Now the Unit and Food fields of the recipe should be filled out.
 
-## How can I change the theme?
-
-You can change the theme by settings the environment variables.
-
-- [Backend Config - Themeing](./installation/backend-config.md#themeing)
-
-## How can I change the login session timeout?
-
-Login session can be configured by setting the `TOKEN_TIME` variable on the backend container.
-
-- [Backend Config](./installation/backend-config.md)
-
-## Can I serve Mealie on a subpath?
-
-No. Due to limitations from the JavaScript Framework, Mealie doesn't support serving Mealie on a subpath.
-
-## Can I install Mealie without docker?
-
-Yes, you can install Mealie on your local machine. HOWEVER, it is recommended that you don't. Managing non-system versions of python, node, and npm is a pain. Moreover, updating and upgrading your system with this configuration is unsupported and will likely require manual interventions.
-
-## What is fuzzy search and how do I use it?
-Mealie can use fuzzy search, which is robust to minor typos. For example, searching for "brocolli" will still find your recipe for "broccoli soup". But fuzzy search is only functional on a Postgres database backend. To enable fuzzy search you will need to migrate to Postgres:
-
-1. Backup your database and download the .zip file (same as when [migrating](./migrating-to-mealie-v1.md))
-2. Set up a [Postgres](./installation/postgres.md) instance of Mealie
-3. Upload the backup .zip and click to apply it (as as migration)
-
-## How can I attach an image or video to a Recipe?
-
-Mealie's Recipe Steps and other fields support markdown syntax and therefore support images and videos. To attach an image to the recipe, you can upload it as an asset and use the provided copy button to generate the html image tag required to render the image. For videos, Mealie provides no way to host videos. You'll need to host your videos with another provider and embed them in your recipe. Generally, the video provider will provide a link to the video and the html tag required to render the video. For example, YouTube provides the following link that works inside a step. You can adjust the width and height attributes as necessary to ensure a fit.
-
-```html
-<iframe width="560" height="315" src="https://www.youtube.com/embed/nAUwKeO93bY" title="YouTube video player" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe>
-```
-
-## How can I unlock my account?
-
-If your account has been locked by bad password attempts, you can use an administrator account to unlock another account. Alternatively, you can unlock all accounts via a script within the container.
-
-```shell
-docker exec -it mealie-next bash
-
-python /app/mealie/scripts/reset_locked_users.py
-```
-
-## How can I change my password?
-
-You can change your password by going to the user profile page and clicking the "Change Password" button. Alternatively you can use the following script to change your password via the CLI if you are locked out of your account.
-
-```shell
-docker exec -it mealie-next bash
-
-python /app/mealie/scripts/change_password.py
-```
-
-## I can't log in with external auth. How can I change my authentication method?
-
-Follow the [steps above](#how-can-i-change-my-password) for changing your password. You will be prompted if you would like to switch your authentication method back to local auth so you can log in again.
-
-## How do private groups, households, and recipes work?
-
-Managing private groups and recipes can be confusing. The following diagram and notes should help explain how they work to determine if a recipe can be shared publicly.
-
-- Private links that are generated from the recipe page using the `Share` button bypass all group and recipe permissions
-- Private groups block all access to recipes, including those that are public, except as noted above.
-- Private households, similar to private groups, block all access to recipes, except as noted above.
-- Households with "Allow users outside of your group to see your recipes" disabled block all access to recipes, except as noted above.
-- Private recipes block all access to the recipe from public links. This does not affect Private Links.
-
-```mermaid
-stateDiagram-v2
-  r1: Request Access
-  p1: Using Private Link?
-  p2: Is Group Private?
-  p3: Is Household Private?
-  p4: Is Recipe Private?
-  s1: Deny Access
-  n1: Allow Access
+    Scaling up this recipe or adding it to a Shopping List will now smartly take care of ingredient amounts and duplicate combinations.
 
 
-  r1 --> p1
-  p1 --> p2: No
-  p1 --> n1: Yes
+??? question "How do I enable Nutritional Values?"
 
-  p2 --> s1: Yes
-  p2 --> p3: No
+    ### How do I enable Nutritional Values?
 
-  p3 --> s1: Yes
-  p3 --> p4: No
+    Mealie can store Nutritional Information for Recipes. Please note that the values you enter are static for the recipe and no scaling is being done when changing Servings / Yield.
 
-  p4 --> s1: Yes
-  p4 --> n1: No
-```
+    Do the following to enable Nutritional Values on individual Recipes, or to modify your Household Recipe Preferences
 
-For more information on public access, check out the [Permissions and Public Access guide](./usage/permissions-and-public-access.md). For more information on groups vs. households, check out the [Groups and Households](./features.md#groups-and-households) section in the Features guide.
+    **Show Nutritional Values on a Single Recipe**
 
-## Can I use fail2ban with Mealie?
-Yes, Mealie is configured to properly forward external IP addresses into the `mealie.log` logfile. Note that due to restrictions in docker, IP address forwarding only works on Linux.
+    1. Go to a recipe
+    2. Click the Edit button/icon
+    3. Click the Recipe Settings gear and select `Show Nutritional Values`
+    4. Scroll down to manually fill out the Nutritional Values
+    5. Save
 
-Your fail2ban usage should look like the following:
-```
-Use      datepattern : %d-%b-%y %H:%M:%S : Day-MON-Year2 24hour:Minute:Second
-Use   failregex line : ^ERROR:\s+Incorrect username or password from <HOST>
-```
+    **Show Nutritional Values by default**
 
-## Why an API?
-An API allows integration into applications like [Home Assistant](https://www.home-assistant.io/) that can act as notification engines to provide custom notifications based on Meal Plan data to remind you to defrost the chicken, marinate the steak, or start the CrockPot. Additionally, you can access nearly any backend service via the API giving you total control to extend the application. To explore the API spin up your server and navigate to http://yourserver.com/docs for interactive API documentation.
+    1. Click your username in the top left
+    2. Click the 'Household Settings' button
+    3. Under 'Household Recipe Preferences', click to select 'Show nutrition information'
+    4. Click 'Update'
 
-## Why a database?
-Some users of static-site generator applications like ChowDown have expressed concerns about their data being stuck in a database. Considering this is a new project, it is a valid concern to be worried about your data. Mealie specifically addresses this concern by providing automatic daily backups that export your data in json, plain-text markdown files, and/or custom Jinja2 templates. **This puts you in control of how your data is represented** when exported from Mealie, which means you can easily migrate to any other service provided Mealie doesn't work for you.
 
-As to why we need a database?
+??? question "Why Link Ingredients to a Recipe Step?"
 
-- **Developer Experience:** Without a database, a lot of the work to maintain your data is taken on by the developer instead of a battle-tested platform for storing data.
-- **Multi User Support:** With a solid database as backend storage for your data, Mealie can better support multi-user sites and avoid read/write access errors when multiple actions are taken at the same time.
+    ### Why Link Ingredients to a Recipe Step?
 
-## Why is there no "Keep Screen Alive" button when I access a recipe?
-You've perhaps visited the Mealie Demo and noticed that it had a "Keep Screen Alive" button, but it doesn't show up in your own Mealie instance.
-There are typically two possible reasons for this:
-1. You're accessing your Mealie instance without using HTTPS. The Wake Lock API is only available if HTTPS is used. Read more here: https://developer.mozilla.org/en-US/docs/Web/API/Screen_Wake_Lock_API
-2. You're accessing your Mealie instance on a browser which doesn't support the API. You can test this here: https://vueuse.org/core/useWakeLock/#demo
+    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.
 
-Solving the above points will most likely resolve your issues. However, if you're still having problems, you are welcome to create an issue. Just remember to add that you've tried the above two options first in your description.
+    **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
+    4. Click the ellipsis button next to the step and click 'Link Ingredients'
+    5. Check off the Ingredient(s) that you want to link to that step
+    6. Optionally, click 'Next step' to continue linking remaining ingredients to steps, or click 'Save' to Finish
+    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?
+
+    Mealie can use fuzzy search, which is robust to minor typos. For example, searching for "brocolli" will still find your recipe for "broccoli soup". But fuzzy search is only functional on a Postgres database backend. To enable fuzzy search you will need to migrate to Postgres:
+
+    1. Backup your database and download the .zip file (same as when [migrating](./migrating-to-mealie-v1.md))
+    2. Set up a [Postgres](./installation/postgres.md) instance of Mealie
+    3. Upload the backup .zip and click to apply it (as as migration)
+
+??? question "How can I attach an image or video to a Recipe?"
+
+    ### How can I attach an image or video to a Recipe?
+
+    Mealie's Recipe Steps and other fields support markdown syntax and therefore support images and videos. To attach an image to the recipe, you can upload it as an asset and use the provided copy button to generate the html image tag required to render the image. For videos, Mealie provides no way to host videos. You'll need to host your videos with another provider and embed them in your recipe. Generally, the video provider will provide a link to the video and the html tag required to render the video. For example, YouTube provides the following link that works inside a step. You can adjust the width and height attributes as necessary to ensure a fit.
+
+    ```html
+    <iframe width="560" height="315" src="https://www.youtube.com/embed/nAUwKeO93bY" title="YouTube video player" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe>
+    ```
+
+## Customization and Configuration
+
+??? question "How can I change the theme?"
+
+    ### How can I change the theme?
+
+    You can change the theme by settings the environment variables.
+
+    - [Backend Config - Themeing](./installation/backend-config.md#themeing)
+
+
+??? question "How can I change the login session timeout?"
+
+    ### How can I change the login session timeout?
+
+    Login session can be configured by setting the `TOKEN_TIME` variable on the backend container.
+
+    - [Backend Config](./installation/backend-config.md)
+
+
+??? question "Can I serve Mealie on a subpath?"
+
+    ### Can I serve Mealie on a subpath?
+
+    No. Due to limitations from the JavaScript Framework, Mealie doesn't support serving Mealie on a subpath.
+
+
+??? question "Can I install Mealie without docker?"
+
+    ### Can I install Mealie without docker?
+
+    Yes, you can install Mealie on your local machine. HOWEVER, it is recommended that you don't. Managing non-system versions of python, node, and npm is a pain. Moreover, updating and upgrading your system with this configuration is unsupported and will likely require manual interventions.
+
+
+## Account Management
+
+??? question "How can I unlock my account?"
+
+    ### How can I unlock my account?
+
+    If your account has been locked by bad password attempts, you can use an administrator account to unlock another account. Alternatively, you can unlock all accounts via a script within the container.
+
+    ```shell
+    docker exec -it mealie bash
+
+    python /app/mealie/scripts/reset_locked_users.py
+    ```
+
+
+??? question "How can I reset admin privileges for my account?"
+
+    ### How can I reset admin privileges for my account?
+
+    If you've lost admin privileges and no other admin can restore them, you can use the Command Line Interface (CLI) to grant admin access.
+
+    ```shell
+    docker exec -it mealie bash
+
+    python /app/mealie/scripts/make_admin.py
+    ```
+
+
+??? question "How can I change my password?"
+
+    ### How can I change my password?
+
+    You can change your password by going to the user profile page and clicking the "Change Password" button. Alternatively you can use the following script to change your password via the CLI if you are locked out of your account.
+
+    ```shell
+    docker exec -it mealie bash
+
+    python /app/mealie/scripts/change_password.py
+    ```
+
+
+??? question "I can't log in with external auth. How can I change my authentication method?"
+
+    ### I can't log in with external auth. How can I change my authentication method?
+
+    Follow the [steps above](#how-can-i-change-my-password) for changing your password. You will be prompted if you would like to switch your authentication method back to local auth so you can log in again.
+
+
+## Collaboration and Privacy
+
+??? question "How do private groups, households, and recipes work?"
+
+    ### How do private groups, households, and recipes work?
+
+    Managing private groups and recipes can be confusing. The following diagram and notes should help explain how they work to determine if a recipe can be shared publicly.
+
+    - Private links that are generated from the recipe page using the `Share` button bypass all group and recipe permissions
+    - Private groups block all access to recipes, including those that are public, except as noted above.
+    - Private households, similar to private groups, block all access to recipes, except as noted above.
+    - Households with "Allow users outside of your group to see your recipes" disabled block all access to recipes, except as noted above.
+    - Private recipes block all access to the recipe from public links. This does not affect Private Links.
+
+    ```mermaid
+    stateDiagram-v2
+      r1: Request Access
+      p1: Using Private Link?
+      p2: Is Group Private?
+      p3: Is Household Private?
+      p4: Is Recipe Private?
+      s1: Deny Access
+      n1: Allow Access
+
+
+      r1 --> p1
+      p1 --> p2: No
+      p1 --> n1: Yes
+
+      p2 --> s1: Yes
+      p2 --> p3: No
+
+      p3 --> s1: Yes
+      p3 --> p4: No
+
+      p4 --> s1: Yes
+      p4 --> n1: No
+    ```
+
+    For more information on public access, check out the [Permissions and Public Access guide](./usage/permissions-and-public-access.md). For more information on groups vs. households, check out the [Groups and Households](./features.md#groups-and-households) section in the Features guide.
+
+
+## Security and Maintenance
+
+??? question "How can I use Mealie externally?"
+
+    ### 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. 
+
+    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.
+
+
+??? question "Can I use fail2ban with Mealie?"
+
+    ### Can I use fail2ban with Mealie?
+
+    Yes, Mealie is configured to properly forward external IP addresses into the `mealie.log` logfile. Note that due to restrictions in docker, IP address forwarding only works on Linux.
+
+    Your fail2ban usage should look like the following:
+    ```
+    Use      datepattern : %d-%b-%y %H:%M:%S : Day-MON-Year2 24hour:Minute:Second
+    Use   failregex line : ^ERROR:\s+Incorrect username or password from <HOST>
+    ```
+
+
+??? question "Is it safe to upgrade Mealie?"
+
+    ### Is it safe to upgrade Mealie?
+
+    Yes. If you are using the v1 branches (including beta), you can upgrade to the latest version of Mealie without performing a site Export/Restore. This process was required in previous versions of Mealie, however we've automated the database migration process to make it easier to upgrade. Note that if you were using the v0.5.x version, you CANNOT upgrade to the latest version automatically. You must follow the migration instructions in the documentation.
+
+    - [Migration From v0.5.x](./migrating-to-mealie-v1.md)
+
+
+## Technical Considerations
+
+
+??? question "Why setup Email?"
+
+    ### 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. 
+
+    Email settings can be adjusted via environment variables on the backend container:
+
+    - [Backend Config](./installation/backend-config.md)
+
+    Note that many email providers (e.g., Gmail, Outlook) are disabling SMTP Auth and requiring Modern Auth, which Mealie currently does not support. You may need to use an SMTP relay or third-party SMTP provider, such as SMTP2GO.
+
+??? question "Why an API?"
+
+    ### Why an API?
+
+    An API allows integration into applications like [Home Assistant](https://www.home-assistant.io/) that can act as notification engines to provide custom notifications based on Meal Plan data to remind you to defrost the chicken, marinate the steak, or start the CrockPot. Additionally, you can access nearly any backend service via the API giving you total control to extend the application. To explore the API spin up your server and navigate to http://yourserver.com/docs for interactive API documentation.
+
+
+??? question "Why a database?"
+
+    ### Why a database?
+
+    Some users of static-site generator applications like ChowDown have expressed concerns about their data being stuck in a database. Considering this is a new project, it is a valid concern to be worried about your data. Mealie specifically addresses this concern by providing automatic daily backups that export your data in json, plain-text markdown files, and/or custom Jinja2 templates. **This puts you in control of how your data is represented** when exported from Mealie, which means you can easily migrate to any other service provided Mealie doesn't work for you.
+
+    As to why we need a database?
+
+    - **Developer Experience:** Without a database, a lot of the work to maintain your data is taken on by the developer instead of a battle-tested platform for storing data.
+    - **Multi User Support:** With a solid database as backend storage for your data, Mealie can better support multi-user sites and avoid read/write access errors when multiple actions are taken at the same time.
+
+
+## Usability
+
+??? question "Why is there no 'Keep Screen Alive' button when I access a recipe?"
+
+    ### Why is there no "Keep Screen Alive" button when I access a recipe?
+
+    You've perhaps visited the Mealie Demo and noticed that it had a "Keep Screen Alive" button, but it doesn't show up in your own Mealie instance.
+    There are typically two possible reasons for this:
+    1. You're accessing your Mealie instance without using HTTPS. The Wake Lock API is only available if HTTPS is used. Read more here: https://developer.mozilla.org/en-US/docs/Web/API/Screen_Wake_Lock_API
+    2. You're accessing your Mealie instance on a browser which doesn't support the API. You can test this here: https://vueuse.org/core/useWakeLock/#demo
+
+    Solving the above points will most likely resolve your issues. However, if you're still having problems, you are welcome to create an issue. Just remember to add that you've tried the above two options first in your description.

docs/docs/documentation/getting-started/features.md

@@ -139,6 +139,9 @@ Below is a list of all valid merge fields:
 - ${id}
 - ${slug}
 - ${url}
+- ${servings}
+- ${yieldQuantity}
+- ${yieldText}
 
 To add, modify, or delete Recipe Actions, visit the Data Management page (more on that below).
 

docs/docs/documentation/getting-started/installation/backend-config.md

@@ -4,21 +4,21 @@
 
 ### General
 
-| Variables                     |        Default        | Description                                                                                               |
-| ----------------------------- | :-------------------: | --------------------------------------------------------------------------------------------------------- |
-| PUID                          |          911          | UserID permissions between host OS and container                                                          |
-| PGID                          |          911          | GroupID permissions between host OS and container                                                         |
-| 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                                                        |
-| 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                                                        |
-| ALLOW_SIGNUP<super>\*</super> |         false         | Allow user sign-up without token                                                                          |
-| LOG_CONFIG_OVERRIDE           |                       | Override the config for logging with a custom path                                                        |
-| LOG_LEVEL                     |         info          | Logging level (e.g. critical, error, warning, info, debug)                                                |
-| DAILY_SCHEDULE_TIME           |         23:45         | The time of day to run daily server tasks, in HH:MM format. Use the server's local time, *not* UTC        |
+| Variables                     |        Default        | Description                                                                                        |
+| ----------------------------- | :-------------------: | -------------------------------------------------------------------------------------------------- |
+| PUID                          |          911          | UserID permissions between host OS and container                                                   |
+| PGID                          |          911          | GroupID permissions between host OS and container                                                  |
+| 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                                                 |
+| 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                                                 |
+| ALLOW_SIGNUP<super>\*</super> |         false         | Allow user sign-up without token                                                                   |
+| LOG_CONFIG_OVERRIDE           |                       | Override the config for logging with a custom path                                                 |
+| LOG_LEVEL                     |         info          | Logging level (e.g. critical, error, warning, info, debug)                                         |
+| DAILY_SCHEDULE_TIME           |         23:45         | The time of day to run daily server tasks, in HH:MM format. Use the server's local time, *not* UTC |
 
 <super>\*</super> Starting in v1.4.0 this was changed to default to `false` as part of a security review of the application.
 
@@ -57,8 +57,8 @@
 
 Changing the webworker settings may cause unforeseen memory leak issues with Mealie. It's best to leave these at the defaults unless you begin to experience issues with multiple users. Exercise caution when changing these settings
 
-| Variables       | Default | Description                                                                   |
-| --------------- | :-----: | ----------------------------------------------------------------------------- |
+| Variables       | Default | Description                                                                      |
+| --------------- | :-----: | -------------------------------------------------------------------------------- |
 | UVICORN_WORKERS |    1    | Sets the number of workers for the web server. [More info here][unicorn_workers] |
 
 ### TLS
@@ -94,21 +94,23 @@ Use this only when mealie is run without a webserver or reverse proxy.
 
 For usage, see [Usage - OpenID Connect](../authentication/oidc-v2.md)
 
-| Variables              | Default | Description                                                                                                                                                                                                                                                                                            |
-| ---------------------- | :-----: | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ |
-| OIDC_AUTH_ENABLED      |  False  | Enables authentication via OpenID Connect                                                                                                                                                                                                                                                              |
-| OIDC_SIGNUP_ENABLED    |  True   | Enables new users to be created when signing in for the first time with OIDC                                                                                                                                                                                                                           |
-| OIDC_CONFIGURATION_URL |  None   | The URL to the OIDC configuration of your provider. This is usually something like https://auth.example.com/.well-known/openid-configuration                                                                                                                                                           |
-| OIDC_CLIENT_ID         |  None   | The client id of your configured client in your provider                                                                                                                                                                                                                                               |
-| OIDC_CLIENT_SECRET <br/> :octicons-tag-24: v2.0.0    |  None   | The client secret of your configured client in your provider|
-| OIDC_USER_GROUP        |  None   | If specified, only users belonging to this group will be able to successfully authenticate. For more information see [this page](../authentication/oidc-v2.md#groups)                                                                                               |
-| OIDC_ADMIN_GROUP       |  None   | If specified, users belonging to this group will be able to successfully authenticate *and* be made an admin. For more information see [this page](../authentication/oidc-v2.md#groups)                                                                                                                                                              |
-| OIDC_AUTO_REDIRECT     |  False  | If `True`, then the login page will be bypassed and you will be sent directly to your Identity Provider. You can still get to the login page by adding `?direct=1` to the login URL                                                                                                                     |
-| OIDC_PROVIDER_NAME     |  OAuth  | The provider name is shown in SSO login button. "Login with <OIDC_PROVIDER_NAME\>"                                                                                                                                                                                                                     |
-| OIDC_REMEMBER_ME       |  False  | Because redirects bypass the login screen, you cant extend your session by clicking the "Remember Me" checkbox. By setting this value to true, a session will be extended as if "Remember Me" was checked                                                                                              |
-| OIDC_USER_CLAIM        |  email  | This is the claim which Mealie will use to look up an existing user by (e.g. "email", "preferred_username")                                                                                                                                                                                            |
-| OIDC_GROUPS_CLAIM      | groups  | Optional if not using `OIDC_USER_GROUP` or `OIDC_ADMIN_GROUP`. This is the claim Mealie will request from your IdP and will use to compare to `OIDC_USER_GROUP` or `OIDC_ADMIN_GROUP` to allow the user to log in to Mealie or is set as an admin. **Your IdP must be configured to grant this claim** |
-| OIDC_TLS_CACERTFILE    |  None   | File path to Certificate Authority used to verify server certificate (e.g. `/path/to/ca.crt`)                                                                                                                                                                                                          |
+| Variables                                         | Default | Description                                                                                                                                                                                                                                                                                            |
+|---------------------------------------------------|:-------:|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| OIDC_AUTH_ENABLED                                 |  False  | Enables authentication via OpenID Connect                                                                                                                                                                                                                                                              |
+| OIDC_SIGNUP_ENABLED                               |  True   | Enables new users to be created when signing in for the first time with OIDC                                                                                                                                                                                                                           |
+| OIDC_CONFIGURATION_URL                            |  None   | The URL to the OIDC configuration of your provider. This is usually something like https://auth.example.com/.well-known/openid-configuration                                                                                                                                                           |
+| OIDC_CLIENT_ID                                    |  None   | The client id of your configured client in your provider                                                                                                                                                                                                                                               |
+| OIDC_CLIENT_SECRET <br/> :octicons-tag-24: v2.0.0 |  None   | The client secret of your configured client in your provider                                                                                                                                                                                                                                           |
+| OIDC_USER_GROUP                                   |  None   | If specified, only users belonging to this group will be able to successfully authenticate. For more information see [this page](../authentication/oidc-v2.md#groups)                                                                                                                                  |
+| OIDC_ADMIN_GROUP                                  |  None   | If specified, users belonging to this group will be able to successfully authenticate *and* be made an admin. For more information see [this page](../authentication/oidc-v2.md#groups)                                                                                                                |
+| OIDC_AUTO_REDIRECT                                |  False  | If `True`, then the login page will be bypassed and you will be sent directly to your Identity Provider. You can still get to the login page by adding `?direct=1` to the login URL                                                                                                                    |
+| OIDC_PROVIDER_NAME                                |  OAuth  | The provider name is shown in SSO login button. "Login with <OIDC_PROVIDER_NAME\>"                                                                                                                                                                                                                     |
+| OIDC_REMEMBER_ME                                  |  False  | Because redirects bypass the login screen, you cant extend your session by clicking the "Remember Me" checkbox. By setting this value to true, a session will be extended as if "Remember Me" was checked                                                                                              |
+| OIDC_USER_CLAIM                                   |  email  | This is the claim which Mealie will use to look up an existing user by (e.g. "email", "preferred_username")                                                                                                                                                                                            |
+| OIDC_NAME_CLAIM                                   |  name   | This is the claim which Mealie will use for the users Full Name                                                                                                                                                                                                                                        |
+| OIDC_GROUPS_CLAIM                                 | groups  | Optional if not using `OIDC_USER_GROUP` or `OIDC_ADMIN_GROUP`. This is the claim Mealie will request from your IdP and will use to compare to `OIDC_USER_GROUP` or `OIDC_ADMIN_GROUP` to allow the user to log in to Mealie or is set as an admin. **Your IdP must be configured to grant this claim** |
+| OIDC_SCOPES_OVERRIDE                              |  None   | Advanced configuration used to override the scopes requested from the IdP. **Most users won't need to change this**. At a minimum, 'openid profile email' are required.                                                                                                                                |
+| OIDC_TLS_CACERTFILE                               |  None   | File path to Certificate Authority used to verify server certificate (e.g. `/path/to/ca.crt`)                                                                                                                                                                                                          |
 
 ### OpenAI
 
@@ -127,7 +129,7 @@ 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       |  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 |
+| 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
 

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:v2.1.0`
+2. Replace the image for the API container with `ghcr.io/mealie-recipes/mealie:v2.6.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
 

docs/docs/documentation/getting-started/installation/postgres.md

@@ -7,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:v2.1.0 # (3)
+    image: ghcr.io/mealie-recipes/mealie:v2.6.0 # (3)
     container_name: mealie
     restart: always
     ports:
@@ -24,8 +24,6 @@ services:
       PUID: 1000
       PGID: 1000
       TZ: America/Anchorage
-      MAX_WORKERS: 1
-      WEB_CONCURRENCY: 1
       BASE_URL: https://mealie.yourdomain.com
       # Database Settings
       DB_ENGINE: postgres
@@ -47,6 +45,7 @@ services:
     environment:
       POSTGRES_PASSWORD: mealie
       POSTGRES_USER: mealie
+      PGUSER: mealie
     healthcheck:
       test: ["CMD", "pg_isready"]
       interval: 30s

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:v2.1.0 # (3)
+    image: ghcr.io/mealie-recipes/mealie:v2.6.0 # (3)
     container_name: mealie
     restart: always
     ports:
@@ -28,8 +28,6 @@ services:
       PUID: 1000
       PGID: 1000
       TZ: America/Anchorage
-      MAX_WORKERS: 1
-      WEB_CONCURRENCY: 1
       BASE_URL: https://mealie.yourdomain.com
 
 volumes:

docs/docs/news/surveys/2024-october/overview.md

@@ -0,0 +1,126 @@
+# October 2024 Survey
+
+It's been a while since a Mealie survey was done, and the community was much smaller back then. So much has changed in 2024, and we wanted to gauge the community's thoughts.
+Our v2.0 release gave us a platform to ask people to take a few minutes to share their thoughts.
+
+A massive thanks to everyone who took the time to fill out this survey. We had 525 respondents! We're overwhelmed with the support.
+
+Also, thanks to ChristianB-F from our Discord community for putting the following images together, and to everyone who has taken the time to raise either an issue or pull request on our GitHub repository!
+
+For each question, we've created a GitHub discussion and we invite you to share any interesting insights or thoughts you have from the survey results!
+If you see a specific idea that resonates with you, please check if there's already a feature request, and if not, please raise one and add your perspective.
+
+The questions (bar question 1) that are free text are on separate pages you'll need to click into, as there's just too much content to include on this page.
+
+For the written response sections, we have removed some of the more indifferent responses (e.g., "N/A") to save you reading time. If you'd like to see all the raw responses, they're in [this GitHub commit](https://github.com/mealie-recipes/mealie/pull/4666/commits/1287bc1635d9c2560b10db3a92a0d6644bc81571).
+
+## Structured Questions
+
+### Mealie Version (pre-v2)
+
+This question was free text input and it was mandatory.
+
+The responses to this were so varied and not overly informative/indicative of anything, so we've decided not to publish them - both to save space and your time.
+
+### Database Type
+
+This question was a single select and it was optional.
+
+Key insight: SQLite is the predominant database, but Postgres maintains an admirable share and must remain front of mind for any changes we make.
+
+[GitHub Discussion](https://github.com/mealie-recipes/mealie/discussions/4640)
+
+![Question 2](Question2.png)
+
+### Time Using Mealie
+
+How long have you been using Mealie? This question was a single select and it was mandatory.
+
+Key insight: Most users have been using Mealie less than a year, with another 25% in the 1-2 year range. These users will have seen a lot of change in the product over that time.
+Thanks to the long term users!
+
+[GitHub Discussion](https://github.com/mealie-recipes/mealie/discussions/4641)
+
+![Question 3](Question3.png)
+
+### Engagement with Mealie, the Project, and the Community
+
+This question was multiple choice and it was optional.
+
+[GitHub Discussion](https://github.com/mealie-recipes/mealie/discussions/4642)
+
+![Question 4](Question4.png)
+
+### Number of Active Users
+
+This question was a single select and it was mandatory.
+
+Key insight: ~85% of instances have 2 users or fewer. This is assumed to be a couple of adults living together.
+
+[GitHub Discussion](https://github.com/mealie-recipes/mealie/discussions/4643)
+
+![Question 5](Question5.png)
+
+### Number of Active Groups
+
+This question was a single select and it was mandatory.
+
+Key insight: Similar to the above question, one group being the most common backs the theory of one "family" using the Mealie instance.
+
+[GitHub Discussion](https://github.com/mealie-recipes/mealie/discussions/4644)
+
+![Question 6](Question6.png)
+
+### Using Mealie on Mobile
+
+Do you access Mealie on a mobile? Using your browser or with it installed as an app (a Progressive Web App/PWA)? This question was a multiple select and it was mandatory.
+
+[GitHub Discussion](https://github.com/mealie-recipes/mealie/discussions/4645)
+
+![Question 7](Question7.png)
+
+### Feature Usage
+
+Please select all the features you actively/regularly use, or consider important. This question was a multiple select and it was optional.
+
+[GitHub Discussion](https://github.com/mealie-recipes/mealie/discussions/4646)
+
+![Question 8](Question8.png)
+
+## Suggestions/Feedback
+
+Some of you will spot feature suggestions that you know to already exist in Mealie. We'd love it if you could help us improve the documentation so more people can know about them! All pull requests are much appreciated. The [features](https://docs.mealie.io/documentation/getting-started/features/) page, or the [FAQ](https://docs.mealie.io/documentation/getting-started/faq/) could be appropriate places to add documentation.
+
+### Shopping List Suggestions
+
+[GitHub Discussion](https://github.com/mealie-recipes/mealie/discussions/4647)
+
+[Question 9](q9.md)
+
+### Meal Planner Suggestions
+
+[GitHub Discussion](https://github.com/mealie-recipes/mealie/discussions/4648)
+
+[Question 10](q10.md)
+
+### Recipe Timeline Suggestions
+
+Key insight: Looks like a lot of people would be fine with this not existing, or at least being hidden.
+
+[GitHub Discussion](https://github.com/mealie-recipes/mealie/discussions/4649)
+
+[Question 11](q11.md)
+
+### Recipe Suggestions
+
+[GitHub Discussion](https://github.com/mealie-recipes/mealie/discussions/4650)
+
+[Question 12](q12.md)
+
+### Other Suggestions
+
+There are so many kind words in this section in particular. Thanks so much, it means a lot to the whole team and all our contributors to see the impact Mealie has on people's lives!
+
+[GitHub Discussion](https://github.com/mealie-recipes/mealie/discussions/4651)
+
+[Question 13](q13.md)

docs/docs/news/surveys/2024-october/q10.md

@@ -0,0 +1,227 @@
+[Back to the overview](overview.md)
+
+# Question 10: Any suggestions for how to improve the Meal Planner?
+
+> again mostly visual, I think it works well as is for my needs but the interface could use some improvements
+
+> The ability to open a recipe in a new tab from Edit mode. You can do this in the View only mode, but when editing the meal plan, it would be nice to easily get to a recipe to see what ingredients there are. I am often checking recipes to see if I already have the ingredients in my cupboard, as part of making a plan for my weekly meal plan. Not being able to quickly see the recipe is a little annoying.
+
+> If Not fixed jet, integrate Portions e.g. 200g sugger and 2egg for two people and 400g sugger and 4eggs for 4 people
+
+> I live alone, so I almost always have leftovers from a meal. Would love for the meal planner to be able to see how many portions a recipe makes, and if its more than the number of people eating it automatically makes leftover meals for the next days. I know you can create notes manually currently, but that's a lot of work.
+
+> Option for "friendly mode" when selecting a date, I.e. "next Tuesday" or "two Wednesday's from today"
+
+> Add a label with the name of the user who added a meal to the planner in case of two or more users in the same household don't share the same dish.
+
+> editing is a separate button/step. It would be nice if that would be more intuitive/user friendly
+
+> - two week view, month view - drag & drop - mass add to shopping list
+
+> It would be very helpful if the meal planner had an option that helps the user to find recipes with some of the similar ingredients, so that it's easier to use all of the groceries bought.
+
+> Allow to set the same food every day of the week if needed
+
+> Synchronize Meal Plan via ics calendar
+
+> Add a button to automatically fill the whole week (or a predetermined number of days). (Wasn't that an option before?) Add the choice of having the full week (Monday to Sunday) stay in place until the new week. Now the meal planner changes to the current day and adds the chosen number of days to display, which always creates a new empty day.
+
+> Improve import
+
+> A better sliding window of plans. I've found looking back to previous weeks clunky. Most of the time, we only care about this upcoming week but once in a while we'll plan a couple weeks out. I know you can expand the view to be more than 7 days; however, beyond planning, I typically only care about a few days in advance once the plan has been set.
+
+> We create meal plans for the next 7 days but are not fixed to what meals have to be made on which dates. It's more flexible in practice. The Meal Planner as-is is a bit in-flexible in this aspect. Being able to check-off meals as they have been made. As above, are meal plans have to be flexible so being able to mark meals as 'made' or done, makes it easier to see what is left for the rest of the week.
+
+> So the meal planner I find it to be the weakest yet the most important point of Mealie. My main issue is that there are only 4 fixed meals. There are some diet plans that have some intermediate snacks and stuff like that, so the best thing would be to have free control on how many meals each day can have, and perhaps have some rules like "mondays have the standard 4 meals" and "tuesdays have these 4 snacks in middle of the meals" or "wednesdays have these customs meals", so I can set as many meals each day with its custom names on them. The logic would be that I have a "meals" database so I create the object like "morning snack" and then I can apply rules like having a fruit on my morning snack and a power bar on my "afternoon snack". - Also would be cool to have a randomizer for the whole week or month after proper rules were established that autofills the meals set for each day, so I can plan my groceries in advance and save a good amount of repetitive clicking. - In the case of each day's random meal, its strange that there is a button for 2 different meals, but dinner and side have their own buttons. They should have eiother their own button each, or be all toghether in one menu - The possibilty of marking special days like birthdays so these days wont autofill with the suggested randomizer, ignore the rules, and instead would require user input for planning these special meals
+
+> So far it works. It could use some UX changes to improve the flow, certain sizing on mobile would be nice. I am using it with a couple of rules, and made a feature request about this already.
+
+> Create an option to create singular list, that does not tie recipe to specific date. When I create a meal plan, my idea is to use it as a todo list, not deciding upfront what will be done on each day. Currently I am not using meal planner at all, because it really cumbersome for me.
+
+> 1. have a check box so a week could be automatically selected. maybe use the week of the year, ie check box next to Week 47 that would select Sunday - Saturday 2. to be able to click and drag the recipes between the days of the week. so if i didn't want make it on Monday but Tuesday instead i can just drag the recipe cards to the new days. 3. having a Today button in the drop down calendar in case you plan a few weeks ahead
+
+> Being able to go back to previous dates and batch edit the meal plan without having to set the dates after each single edit
+
+> A wizard for creating a meal plan for a given period
+
+> Easy integration of daily meal image into Home assistant. eg a HACS addon?
+
+> More options to auto create e.g. based on ingredients such as pick recipes that total 500g minced beef or 2 meals that include pulled pork. Include macro tracking e.g. total planned calories and average calories
+
+> I was very excited about a "Meal Planner" feature when I first saw it, but it was not what I was expecting. I wanted to be able to collect several recipes into a single "meal", e.g., a soup, a starter, a main, and a desert; or combine my home made steak sauce recipe with my grilled steak recipe for a more complete meal without having to duplicate recipes in multiple records. This would be particularly helpful for large holiday gatherings or dinner parties. Once collected, it could provide a master ingredients list and help with organizing the sequencing of the cooking.
+
+> Ability to reorder meals without switching to edit mode. (Very minor)
+
+> It could be here that you pick the number of people a recipe is for when you add it to a plan. Currently, to double a recipe we have to add it twice to the meal planner and list. Also, drag n drop doesn't work great when editing plans on a tablet (android).
+
+> No I like the meal planner. Integration with the shopping list would be awesome. As in, add the ingredients from recipes on the planner to the shopping list.
+
+> Allow a default view instead of "today forward. (For example, "x previous days" or "this week") Remove the modes and integrate editing with viewing Default to "today" (or "first blank dinner/etc slot") when adding entries.
+
+> As per previous shopping list comments. Really appreciate and like the planner. It makes managing the week's meals and shopping so much easier!
+
+> Add https://github.com/mealie-recipes/mealie/discussions/1761, it would make it easier for me to make many recipes of like tacos or pizzas with base seasoning mixes/dough mixes and individual recipe customizations on top.
+
+> Please add more entry type/food type on planner. In Poland the main dish is at 1-4 P.M. It's called obiad but it's related to lunch. But because it's main meal, we usually have 2 dishes: soup (zupa) and the second dish (drugie danie). It would be great to have separate entry type for soups and the second dished. So in generally, please allow to define own entry types in planner (like in Tandoor Recipes).
+
+> On the meal planner screen, I feel like there should be a button for immediately adding or randomizing a meal for any given day that is blank. There’s something about having to go into edit mode first when you’re creating a meal plan on a blank day that seems unintuitive. To my brain “Edit” means to change something that exists, not to create from scratch. Not a big issue obviously but I notice it every time.
+
+> It could be that I’m missing something, but excluding meals from categories when using random selection. For example, let me disable adding foods labeled “Dessert” when randomizing.
+
+> Same here. Make it removable via env.
+
+> Mealie has done a great job. If you have to ask questions, I hope to support the<video>tag in the recipe steps instead of iframes, which will cause the video to play automatically.
+
+> Would love a "feature flag"/env var to enable/disable the nightly "Meal Planner -> Recipe Timeline" job. I really like clicking the "I made this!" button when finishing cooking a recipe, and would rather do it that way. My timeline is full of duplicates/incorrect recipe history.
+
+> Nicer UI, option to assign meal to user (e.g. different dinner for kid).
+
+> track times recipe is accessed and suggest meal plans based on patterns
+
+> Make it possible to plan a re-scaled version of a recipe. This would be very helpful when scaling a dish up for hosting. At the moment, you have to remember to scale up the servings each time you go to a recipe from the meal planner.
+
+> I like the meal planner alot. I use it all the time. It was a great bug fix to allow external recipe links as hyperlinks that were clickable (nice to try things before adding to mealie)
+
+> Random within a tag.
+
+> When showing the days, it would be very helpful to have an option to have something like be able to set "default: show week" For me that would make it easier as I sometimes skip cooking one night and have to manually set it so I can see days earlier in the week.
+
+> We repeat our meal plan to a default 3-week plan so it would be nice to be able to apply a 'template' to a timeframe and then make manual adjustments from there. This would be the killer feature for us!
+
+> Using the randomizer is clunky. I don't know how it determines the difference between sides and dinners. It isn't clear how best to organize sides and dinners.
+
+> It may already be an existing feature and I haven't found it it some kind of calendar integration would be nice. I'm going to be trying the home assistant integration soon, then I can stop asking my wife everyday what's for dinner
+
+> sometimes there's too much repetition Or some meals are not proper for a dinner sometimes even adds desserts etc. may be me miss using it to be fair
+
+> Again on v0.5.6 so I'm not sure where this is at with the latest updates.
+
+> Setting the default days would be nice but not a major inconvenience at the moment.
+
+> Ability to export a nice PDF to print out and put it on the kitchen door. Maybe make i iportable as a calendar in Android
+
+> Have settings that allow it to be formatted as a week view on screens that are wide enough or at least adjust the number of columns that can be displayed.
+
+> Allow the ability add any text so that I can add a one time meal that I don't have added to my recipes
+
+> buttons to move displayed days forward/back by 7 days
+
+> It is annoying having to switch between "Meal Planner" and "Edit" views, I would prefer a (+) button on the view to add items to that day for users that can edit the meal plan
+
+> When I add several meals, I can lose track of which days I've added meals to, so if the calendar can highlight days with existing entries, that could be handy.
+
+> It would be nice if you could add meals to a different span of time instead of days. We don't plan to the day but to the week so if we could plan for meals in a week that would be nice. Basically we know we want to eat burgers next week but we don't choose the day, and some day during the week we just look at what is available and decide on the day which of the plan meals we will have.
+
+> Again coming from Meal Lime - I personally prefer a much simpler meal planner (this is my preference so I appreciate everyone is different). I would prefer a toggle "Simple meal planner" vs "Advanced meal planner" The advanced planner would be its current form. The simple meal planner would essentially remove a lot of features. - Plus icon on a day simply pulls up a view of your recipes (with pictures) to tap and select (this is how meal lime works) the popup box with date is not needed, I already click plus on a certain day, why would I then want to select the date again? its a lot easier and quicker to see your pictures than a big list of titles - Meal planner would ONLY account for dinner (again personal preference) the plus icon simply adds a dinner meal - thats it. - No Random button - No side button - No rules or automations etc. You can, in essence, very quickly tap + on a few days, select what you fancy from your recipe photos and hit go. Shopping list is auto populated and you are ready to go. To give you an idea of how I used to use Meal Lime - I was able to complete a meal plan in a couple of minutes as I walked in to the shop, it was that easy and painless. I know I keep going on about it - but I would LOVE for this to be a self hosted version of that app!
+
+> allow a way to disable it via config - we don't use it.
+
+> I often add meals to the planner but don't end up making them, it's just an idea of what we might have, but it adds them to the timeline when I haven't made them. I don't want that.
+
+> Ability to rename the entry type. We use "Side" for our kids meals. I have renamed it in the Magic Mirror module but having it renamed in the app would be a nice QoL improvement. Other than that minor thing it works very well.
+
+> We typically plan meals as a "queue", rather than specific days. It'd be nice to have a non-day-specific queue to add recipes to, in addition to specific days.
+
+> The ability to manually move recipes to the bottom or top of the list for a given day. The option to separate meal planners for each meal. Have consistent style between the “Meal Planner” mode and “Edit” mode. Integrate the Meal Planner so it shows up on external calendars.
+
+> Maybe adding in time divisions e.g. breakfast, lunch, dinner so if I have multiple items I can see them, any maybe make the view sortable (like view only dinner). Can we add side dishes or condiments? Maybe suggestions of meals that we might like based on what we eat, but with variety (you eat a lot of chicken, have you tried this chicken pasta recipe). Maybe notifications for meals just in case I forget.
+
+> allow for multiple meals per day (i.e. breakfast, lunch, dinner)
+
+> Perhaps allow notes on the recipe entries?
+
+> is could be more compact on mobile view. also in current version the title got cut off. this is a problem with notes only entries. when using till understood the difference i was wondering that I could not tap (mobile view) on the notes only entry to view the full title. That was possible before, cause i was in editing mode. would make the meal planner better if a detail view for notes only entries would be available. also in mobile view: when i am in editing mode with an open note only entriy and hit the OS back-button I not only leave the editing mode of the entry but also the editing mode of the meal planner. this is anoying when planning the next week ahead with our spouse on the kitchen table. dates have to reajusted to see the next week again
+
+> When using the random functions, have the ability to exclude recipes that have already been added to the plan.
+
+> ask for how many people when planning
+
+> Meal image in edit mode in Android browser only shows a small cropped part of the thumbnail. It is not really useful.
+
+> None, really like the way it is now
+
+> Default to include past meals from the week
+
+> High Value: Default view to "This week" instead of "Today+7 days" - sometimes we have more leftovers than anticipated so we skip cooking a new meal, and the next night when I go in to 'find' what I was supposed to cook last night, I have to update the date range to see yesterday/earlier in the same week. Let me set the week start date in settings (drives me nuts that the week starts on Monday 😅) Assume that if someone is on the meal planner, it was made that day (so I don't have to click "I made this" each time). If desired, could be a toggle setting. Low Value: Ability to add "Leftovers" or a restaurant as the 'Meal' for a particular night. I know I could just create a recipe called (for example) "Leftovers" or "McDonalds" but it sure would be cool if they didn't clutter my recipe view and I could specify "Leftovers of "Recipe X" I'm sure this is possible via API, and maybe already do-able, but I would love to integrate Meal Planner into a Home Assistant dashboard to display what is the meal plan for the week to the rest of the family. If there's other dashboard platforms people use, or maybe a static dashboard within Mealie, providing better/more support would be cool.
+
+> Meal plan based on goals, I.e. macros
+
+> its fine as it is
+
+> Keep/restore scroll position when going back from a recipe to a list. Multiple people i talked to don't use Meale due to this as it's such an annoyance.
+
+> It would be nice if you could enter that leftovers from the previous days are planned for a certain day.
+
+> A button which fills the shopping list using all recipes currently displayed in the planner. Buttons which quickly change the current week. A button which fills in the whole week with random recipes.
+
+> Ah YES! The meal planner needs some love. So our intention when we began trying to use Mealie was to have some help organicing our meals automatically, so I would have our recipes, and have them properly tagged. Then I would set some rules for each meal, but then I have to go clicking each meal of each day to have it planned. It would be great to have some randomizer to automatically fill all the meals following the rules I've established, so I can have the whole month planned and I can set my shopping list and do the shopping for it. Also there are diets that include other meals over the day, like snacks (in spanish they are called "colacion") or a "merienda" which is like a lighter breakfast that you have around 4-5PM, some coffee and a toast or something like that. So it would be cool to have the ability to add or customize the available meals of the day, perhaps even set the time it should be eaten so the app can send a notification X time before it to start cooking. Im a really undisciplined person and need to have everything as structured as possible, so being able to have it all set in advance, and more granular and user friendly control for the wife approval factor (WAF) and even with reminder to get ready for each meal so I can finish what Im doing and make my time for cooking properly would be awesome and really help me to get my diet in order.
+
+> Accidentally mentioned that in the shopping list one, whoops
+
+> This would also be nice if it could integrate with iOS to automatically show in Reminders/Calendar.
+
+> The new query filter builder probably solves one of my biggest issues. Filter by "last eaten" should be included. Another issue is that the rules are predefined but often, the user wants to build the filters just for the specific "event" and wants to see a selection of dishes to choose from. There is also no back button on the settings page. (Recipes could also be opened as a popup although this idea needs testing especially because of mobile.)
+
+> Allow more powerful search queries to be built from the Meal Planner screen, such as those that are available from the Recipes screen. Let these queries be included in the recipe rules section, such as "OR" statements for tags instead of just "AND" statements.
+
+> Hard to add recipe by name if you have many, we have ~100+ in each household
+
+> A way to persist date preferences, eg I often want to look two days back and 14 days forward. Switching between edit mode and normal is confusing at first
+
+> Meal planner rules. I want a mixture of protein during the week so i would like to be able to do the following: Only allow X* recipes with these () ingredient(s)/tag(s) per week/month/Y* days
+
+> I believe it is not the best UX to have the fine list and than to swap to the edit view to start editing it. Especially if you plan on long term you have to select the date range and bla bla bla... Instead: one continuing list would be great where I can directly edit a day in time. Also a calendar view would be great. And last: I want in the future that the meal plan is defining itself using rules without any manual interaction. I plan to do this automation with N8N again but would be great to have this integrated.
+
+> My wife said that her PWA logs her out too frequently. It would be great to somehow configure a long lived token method for authentication to securely eliminate the login. The meal planner works great otherwise!
+
+> It is great already
+
+> Good as is. Love it!
+
+> The option of having the meal plan generated for a specific period. Preferably with the possibility to define which meals should be generated and how often a recipe should be repeated on the following days (because we often cook a dish for n days in advance (usually 2 days in a row)).
+
+> The differentiation between the "Edit" mode and the "View" mode doesn't make much sense to me personally. Whenever I the "view" mode, I somehow expect that I would be able to drag&drop the meals from one day to another, without going into the "edit" mode.
+
+> From an recipe, assign it to a day
+
+> I would like breakfast/lunch/dinner breakdowns.
+
+> I haven't used it much but can you can meals with other users?
+
+> Able to subscribe via .ics for easy reference
+
+> Some sort of learning algorithm (probably using the openAI integration) to look at recipes and automatically tag them. This would help when adding sides and mains!
+
+> I would like a way to be able to check off meals. For example, I often plan out meals but have something come up and don't make them on a given day. It's then rather difficult to go back and see what recipes I had bought ingredients for. Perhaps, if unchecked, the meal automatically shifts to the next available day (dinner remains dinner, lunch as lunch, etc). Or, praise, there is a section to see skipped meals and quickly reassign to a new day.
+
+> Have them (or anything, really) be accessible across households, if desired. I.e., my SO and I live in different cities, thus use different households for the majority of the time. However, when we stay at the others place (which then usually is for minimum a week at a time), it would be useful to be able to share things like meal planner, shopping lists etc for that time, without some workaroung (like an additional user or moving my or their user to the other household for the time).
+
+> The meal planner works fine for entries that link to a recipe. For items that do not link to a recipe, there's no easy way to see the whole text as it's cut off after a couple chars in the mobile UI. The only way of reading the full text of the entry is by editing it. It would be much better if those items would be accessible right from the meal planner rather than having to dig into editing mode.
+
+> I mostly plan for a whole month or more so I would like to have an custom range of days I can choose in the settings. Right now I set it to a month manually each time I open the planner. For editing it would be nice to have a button to move all upcoming meals for a day. Sometimes we skip lunch and then I have to move all upcoming meals by a day
+
+> Meal Planner is not important to me. I use Mealie purely as recipe storage.
+
+> Better integration with Home Assistant
+
+> More intelligent recipe suggestions (e.g. based on recipes not made in a while, ingredients you are likely to have) to assist creating plans
+
+> Add rules that recipes can only be repeated in x amount of time. But I mostly just add the meals myself and don't use the automatic selection, because my recipes are not properly tagged and categorized (I have it on my todo list).
+
+> My wife is not using it, because we have lots of meals we don't have recipes for. It would be very helpful if we could plan a meal which does not exist as a recipe.
+
+> Remember the default number of days. Option to set number of 'meals' in a day - mostly we just use dunner. Quick access to 'todays meals' from the homs screen
+
+> Make it toggable. If the user does not use it, let him disable it.
+
+> The only real suggestion is to maybe add time-ranges for the meals, like breakfast from 6-10 am, lunch 10 am - 2 pm, and dinner 4 pm- 8 pm. The only reason I say this is I use Home Assistant and the home assistant integration pulls the meals over as all-day events in the calendar and doesn't give a nice order for the day.
+
+> This is a minor thing -- and I don't even know if I would use such a feature, if it existed: but if the meal-planner would allow for an easy (read only) export is an .ical calendar, I could add it to my usual calendar tools and have it available in the typical interfaces.
+
+> Better random, ability to switch days easily. Or pause to push back a day
+
+> Ability to plan a fish for two days at once.
+
+> Add a "Feeling lucky" button. Random recipes for the whole week!
+
+[Back to the overview](overview.md) or [On to Question 11](q11.md)

docs/docs/news/surveys/2024-october/q11.md

@@ -0,0 +1,141 @@
+[Back to the overview](overview.md)
+
+# Question 11: Any suggestions for how to improve the Recipe Timeline?
+
+> Generally not used. Maybe could prompt to add to timeline after a recipe has been open for x amount of time but probably not useful. I was surprised that timeline comments are different from recipe comments so maybe making that clearer would be helpful?
+
+> For me the timeline itself isn't that interesting, but I would love to be able to use the data in other ways. For example, I want to know how many times I've made a recipe, which recipes do I make the most or the least, etc.
+
+> Scaling ingrediants is my biggest ask overall ofr sure
+
+> It's not accuraten
+
+> Maybe a way to import instagram recipe's (usually in the description of the video)
+
+> maybe adding a comment together with the picture
+
+> I like the timeline as it is right now but the only change I would make is to be able to add a picture after I have marked a recipe as done. Currently, I can only add a picture at the moment I mark the recipe and not after in an edit. I would also like to be able to press the photos to enlarge them.
+
+> Instead of just the profile picture. Also add the name of the user. If there's multiple people who didn't set a profile picture, it's hard to tell who created that timeline event. Example: Recipe creation
+
+> I didn't know it existed
+
+> Not really, but I use it often
+
+> default to reverse chronological order
+
+> Make it easier to rate dishes and add comments directly from timeline
+
+> Add the person's name without having to hover over their non-existent or too small to tell who it is photo.
+
+> Again, really cool feature. I wonder if comments from the time line should appear as recipe comments. As most of the time I suggest things to myself as a part of recording that I've cooked the meal. Also being able to search the time line would be really cool.
+
+> Its fine how it is.
+
+> Make the pictures in the timeline bigger so that I can show off to my friends what dishes I have made
+
+> disable it option
+
+> I honestly don't use it. Haven't found a work flow for it.
+
+> I am not sure what the purpose of this is...
+
+> It seems good so far :)
+
+> I don't see much sense in it, feel free to drop it.
+
+> An option to automatically mark recipes in the meal planner as completed - forgetting to do this on most recipes in the meal planner makes the timeline mostly useless.
+
+> Reverse the order so newer things are first (or at least make an option).
+
+> Allow editing the date made. If a meal is made the day before or after it appears in the meal planner then the timeline will be wrong but can't be easily fixed.
+
+> I don't need or use it
+
+> I generally don't care when I added a recipe, just when I last cooked a recipe.
+
+> We don't use the feature.
+
+> I do not use this feature.
+
+> we don't really use it
+
+> Nope I think its fine the way it is.
+
+> Never used it
+
+> Be able to filter for “meals made” or “recipes created”.
+
+> I only use this passively, but interesting to have, no notes.
+
+> no, i don't use it
+
+> Whilst I do use it, I do not use it consistently enough to be able to validly comment
+
+> I'm still getting used to the timeline. Currently it seems like recipes appear on the timeline when I haven't cooked them yet, but I think I'm still getting used to how it interacts with the meal planner. Not sure if there's an issue there or not.
+
+> this a cool side feature for me. love it but functionality is completely sufficent
+
+> Do not use
+
+> Not exactly timeline, sorry, but how about including in a recipe page how many times a recipe has been cooked
+
+> Assume recipes on the Meal Planner were made, so they automatically also appear on the timeline after the meal planner date passes. Better search and filtering options. For example, what did we have last Valentines day? What was that potato dish we made last month? Being able to easily search for that type of stuff would be amazing.
+
+> I haven't found the option to remove the creation of a recipe from the timeline. This would be useful if I could filter them out
+
+> i dont see a need for the timeline
+
+> Maybe being able to update the date? I entered a wrong date and couldn't update it (or didn't find a way to do it!).
+
+> Not really, its a simple function.
+
+> My only irritation with the timeline is that it doesn't show the name of who added a recipe, it only shows a picture. I have 1 user that refuses to update it with his picture.
+
+> Just upgraded to 2.0 and I love this! I wish there was a way to edit the metadata on the recipes to show when they were actually added, in stead of just all imported on the one day that I upgraded
+
+> Improve presentation, scale things down, make things interactive, provide more information (when hovering or clicking), improve loading time. I do not have found a use case for this feature but it feels like something that has potential
+
+> For me, the recipe timeline is more important than the comments. And yet, it is not visible unless I click on a button. It would be nice to have an option for the recipe timeline to be shown directly in the recipe page.
+
+> Could it be auto populated based on meal plan? I always forget to click "I made this"
+
+> Smaller list view option for mobile
+
+> One entry uses up a lot of screen space. I would decrease the size of an entry drastically. Also the image within an entry card looks a bit like an afterthought. I would move the user icon somewhere to the right an let the image got from top to bottom and have no border to the left.
+
+> its nice, but in the time you collect new recipes, xou have only the dates from the creating
+
+> Multiple images per recipe.
+
+> Never used it.
+
+> Build a mini timeline into the recipe page to see "committ history" (but for meals made haha)
+
+> Option to hide, it isn't a feature we use.
+
+> never use
+
+> Keeps adding recipe as if "made", when in fact I have not yet made them. Maybe because I have it in my meal plan, but sometimes my meal plan changes...
+
+> I would like that recipe timeline events would also show directly (without having to click on it and navigate away) on the recipe page itself. I.e., it could be shown as a comment? That would be really nice
+
+> We never used the timeline at all.
+
+> A way I would use it more often maybe is when at the end of a recipe there would be another button to say "I made it". Sometimes I just forget, especially when it's on the phone :)
+
+> Recipe Timeline is not important to me. I use Mealie purely as recipe storage.
+
+> Better integration with Home Assistant
+
+> Faster loading times - never use it because it tends to be really slow
+
+> It is difficult to use if I don't stick to my meal plan, which happens regularly. It would be great if I could go backwards in the meal planner with a button like "-1 week". That way, I would get a better overview of what I had as meals. Before I started to use the mealie mealplanner for the HassIO Integration, I used miro with virtual post-its for 2 years. So I was able to just scroll up and see what was for dinner 5 weeks ago and get some inspiration.
+
+> Different view options would be nice. The alternating left/right orientation of posts is not as nice as a simple linear feed style timeline IMO
+
+> More compact flow options
+
+> Add an on behalf of function when adding recipes to the timeline
+
+[Back to the overview](overview.md) or [On to Question 12](q12.md)

docs/docs/news/surveys/2024-october/q12.md

@@ -0,0 +1,283 @@
+[Back to the overview](overview.md)
+
+# Question 12: Any suggestions for how to improve the Recipes functionality?
+
+> Some things are not intuitive to use when creating recipes. also the import of recipes is sometimes interesting. Generally it works well but its been a while I havent added a new recipe so idont remember any pain points I had other than the ingredients and organizing the sections of steps
+
+> Add the option to make recipes private from other households.
+
+> Generally quite happy with recipe search and display :)
+
+> Editing the ingredients list when creating a recipe feels a little cumbersome and could use some UX love, but mostly I think it works well.
+
+> Highlight the ingredient used in a step that when tapped or clicked on shows the amount to use for that specific step. For example, a recipe uses carrots twice, once in step one and again in step 2. Tapping"carrots" in step one shows a pop up that shows "1 cup" and tapping carrot in step two shows "1/3 cup"
+
+> While cooking offer support, included timers, using AI to discuss/ask questions about current step, next step, etc.
+
+> Scaling ingrediants
+
+> I would love to have a shortcut / one step process to analyze recipes with OpenAI directly on import
+
+> possibility to add more pictures. maybe also a picture per step
+
+> I wish I could have multiple columns of ingredient units, for example, 30 grams or 0,5 dl powdered sugar, because if I share my recipes they may not use weight as a unit like me. If I then increase/decrease the amount of the recipe I would like both units to change.
+
+> One of my user's is bad at including tags. Perhaps an option to remind users to categorize, tag, etc
+
+> Ability to double, triple, etc the ingredient amounts
+
+> I think it works pretty well. Our most used feature of Mealie.
+
+> Lots of improvements were introduced in the last updates here, so I may only add: - The possibility of grouping steps. For example for some pasta recipe, have the steps for the dough in one group, and separately for the sauce, or perhaps have a "sauce" whole category and have the possibility to add a dropdown menu so I can chose which sauce I want to add to the recipe. I wouldnt go as far as making sauce recipes as an indepentand meal recipe because the meal planner would treat them as a meal and mess up with that, but have the option to "+add" a sauce recipe to a meal recipe, and therefore adding it own subset of steps and ingredients to the whole recipe. - Tools: this seems to be only another tagging function but it would be useful is there were a place where I can input the tools that I ALREADY have, and then if some recipe specifies a tool that I DONT have, it would be highlighted so I dont find myself with the issue when im already in the middle of cooking it. Perhaps even the option to add it to the shopping list
+
+> I would love to be able to decrease a serving count. If a recipe does 8 serves, but I only want to do 4, unless I want to manually adjust the scale to 0.5, I can't use the +/- buttons to reduce serving count. Additionally, if I want to do 10 serves instead of 8, I can't use the +/- buttons, it goes up by multiples of the serving count. I understand this wouldn't be for everyone, so maybe allowing the option to change the behaviour?
+
+> add button which can change recipe portions count (if i have recipe for 4 people i should be able to recalculate for 2 or 1)
+
+> The auto import imports weirdly sometimes. Also, absolutely allow fractions (1/4) instead of only .25 as an example
+
+> Maybe add video support, template for receipes type
+
+> Anything that could be done to simply or automate parsing ingredient sizes so that multiples (2x, 3x the recipe size) could be done without so much effort.
+
+> when creating a recipe via text input, don't add example ingredients and steps, always a pain to delete 1 cup of flower, etc.
+
+> I'd like to have the possibility to add macros at the food level - and make recipes calculate the recipe macros from the food macros. Thanks.
+
+> Import from pdf
+
+> Importing, particularly parsing ingredients and setting amounts is a pain. I wish there was a way to at least set the relevant settings by default (as I usually want the ability to scale my recipes)
+
+> I would love ingredients to be identifiable as logical entities in the body-text of the instructions so I can hover over them, and it will pop-up how much. E.g., in Chicken Marsala I remove the fried chicken from the pan and add butter before sautéing the mushrooms. I don't want to scroll back up to the top to see how much butter, that instruction step could be context-aware and able to show me how much butter to add. This could be achieved rudimentarily with a markdown like tag, or an 'insert intergradient' button that would give you a picker of the ingredients already entered in the edit interface. If users didn't want to use them, they could still type ingredients in plain-text as before. A more advanced implementation could looks for matching text and recommend 'smart ingredient' links for the user.
+
+> Would like to be able to enter a recipe for 2 people, but then see ingredients for just 1 person, or 3 etc. Currently you are stuck at a minimum for 2 and multiples thereof.
+
+> No, I love the app. Think it works great.
+
+> On ipad, please don’t make swiping all the way to the top refresh the page. Ive lost manual recipes while creating them.
+
+> When clicking 'parse ingredients', it usually asks to save changes. That save doesn't include any actual changes from the recipe form. It would be nice to flow straight into 'parse ingredients' from the import instead of having to do at least 2 separate editing passes Include recipe as ingredient, with autocomplete and bidirectional referencing. ("Recipes that include this recipe:")
+
+> Not sure how feasible it is, but it would be nice to have the option to turn off authentication for local deployments.
+
+> Calculation of nutritive aspect of the recipes (like cholesterol, lipides, glucides) , based on the ingredient list. For example based on openfoodfacts.org or ciqual.anses.fr
+
+> Ability to increase the servings and automatically multiplying quantities.
+
+> I can't think of anything. It works really well and is a great way to manage our food.
+
+> Improve visibility of ingredients linked to specific steps
+
+> Ingredient categories. They would prob tie into https://github.com/mealie-recipes/mealie/discussions/1761 which would include ingredient sub-sections for sub-recipes, but they would be useful for recipes that have something like a cake and a sauce as well - especially when the cake and sauce both take sugar and it's easier to read when the amounts are split between sub-goals.
+
+> Changing the serving size for fractions of the original is only possible by giving it a number and not the plus and minutes buttons. Typically over wants to decrement or increment by single servings.
+
+> In ingredients list please add better support for non-english languages with more complicated grammar like Polish. We say: * 1 szklanka cukru / 1 cup of sugar * 2 szklanki cukru / 2 cups of sugar * 3 szklanki cukru / 3 cups of sugar * 4 szklanki cukru / 4 cups of sugar * 5 szklanek cukru / 5 cups of sugar * 6 szklanek cukru / 6 cups of sugar etc. * 1/2 szklanki cukru / 1/2 cup of sugar Antoher example: * 1 marchewka / 1 carrot * 2 marchewki / 2 carrots * 3 marchewki / 3 carrots * 4 marchewki / 4 carrots * 5 marchewek / 5 carrots * 6 marchewek / 6 carrots etc * 1/2 marchewki / 1/2 carrot So we have: * form for 1 * form for 2,3, 4 and fractions like 1/2 * form for 5 and more
+
+> I often find that the brute parser is 10x better than the NLP ingredient parser, so I’d love to be able to select it as my default and use it automatically on recipe import.
+
+> Ingredient Calculation should work. X = Ingredient / Default Servings so you can calculate every number.
+
+> more features to support baking. Like portion: small cake(16cm) regular cake (22cm)
+
+> Option to create recipe from url with AI rather than scraper (in many cases, the structure for recipe is not followed by website).
+
+> Being able to import from PDF, spreadsheet, etc from other recipe programs and/or wikis that are private
+
+> It would be good to be able to parse by default, and also add common ingredient aliases. There are ingredients that are commonly described with multiple forms, e.g.: "ground pepper", "black pepper", "pepper" etc. and it gets tedious to have to keep on making the same sorts of replacements instead of just adding a few rules. Similarly, unit conversion would be brilliant. At a basic level, you could make it possible to define units that are automatically converted to other units (e.g. cups to ml). A big step up, but a tricky one, is converting between volume and weight measurements. This is appropriate when say using metric and measurements like "1 cup" of flour, which should become ~150g, not 250ml of flour. Conversion of units and weight/volume seems like an area where having some default values (or an importable source, like with ingredients) that can be added to would make sense. I did some work along these lines myself a while ago and found http://www.fao.org/docrep/017/ap815e/ap815e.pdf a useful resource.
+
+> This is probably mealie's most refined section. I use it all the time. Haven't had any complaints about it in a while.
+
+> I would love to have a text to speech option, so that it can read out tasks while I am busy cooking, it would be great to have a button that reads out one step at a time...and you can just click next or even better just say the word next....i have text set to large on my phone/tablet as my eyes are poor so I keep having to scroll down between steps....I am also a little OCD about touching my phone/tablet with dirty hands so I have to wash my hands between each step before i scroll down on the phone/tablet...sounds like a "me" problem I know.
+
+> I feel everything works great. Sometimes the import is buggy but that's probably due to the site and not mealie
+
+> Not sure if this is updated since I'm on v0.5.6 but being able to section ingredients is important - especially where you have duplicated ingredients (e.g. one for a sauce, one for the main course).
+
+> I'd love to be able to universally enable ingredient amounts.
+
+> - Allow private recipes to be shared with certain individuals or households (vs sharing a link)
+
+> Actually really like this section and the main reason why I use Mealie.
+
+> It would be great if there was some way to convert between metric and imperial units.
+
+> Combining Recipes similar to Tandoor Recipes. Sometimes I have a base dough when baking which can be used with several different baking recipes. Combining and connecting them in recipes would be a nice feature so I do not have to switch back and forth between different recipe parts.
+
+> Support for meals which include multiple recipes e.g. a roast dinner would include links to roast chicken, roast potatoes, braised cabbage and so on. Filtering of recipes should allow tags or categories to be excluded.
+
+> Split ingredient and "amount of ingredient" to allow for eg. convert imported recipes in Imperial units to normal metric and to allow multiplying the recipe for smaller/larger portions.
+
+> Adding and rearranging steps can be quite cumbersome when there are many steps, if there's some way to streamline inserting and rearranging steps, that could be handle.
+
+> none, it's already great!
+
+> I dont have any complaints about this - works fine for my needs. I dont use the OpenAI feature so might look in to this.
+
+> Maybe a way to paste a block of text copy and pasted from a private facebook post, and it would (at least attempt) to parse ingredients and steps. Aside from that, it works pretty well as is.
+
+> I was really excited when I saw that there was a new version, but there's really nothing of interest in it for me which is really disappointing. Out of all the improvements that could have been made, there's household sharing been done which seems pretty niche, surely most people like me just use it for their house. I would have loved to have seen conversion of imperial to metric automatically. I would like to be able to have my main screen show only the main meal recipes, not all the dessert recipes together, just some sort of better separation that you could use on your home screen for the food vs drinks and desserts etc. Coloured tags would be a bonus. An android app where you can press a button to keep the screen on while cooking would be welcome too. I forgot to add for the Meal Planner functionality in the previous screen... There's nothing that can be used for advanced meal prep, when you make 2 or 3 meals on a sunday for the week, you can't plan for that. Your options are only limited to breakfast, lunch and dinner.
+
+> For recipe scaling, scale by multiples instead of by serving count when using the plus and minus buttons, including multiples less than one (1/2, 1/4, etc). Please include a reset button with the plus and minus (which would be the x1 multiplier I suppose). I am often making half a recipe and it would be nice to use the minus button to scale to 1/2, instead of opening the custom number input and calculating the serving size for half the recipe. Please do keep the custom scaling input though, that is very nice in some cases.
+
+> Add images from the recipes that are inlined so they are part of the steps Replace functionality, allow a recipe that was imported to be updated from the URL. Ive sometimes deleted a recipe so I could add it back with better images and nutritional information and then the parser fails so I have to add it all back by hand.
+
+> An android app would be so good. Using the browser is really annoying
+
+> Nope. I love it the way it is :-)
+
+> Link other recipes for base recipes or combine different stuff
+
+> If it was possible to specify the quantities for, say, 1 person, and then in the planner specify how many people are eating and get the required ingredients in the shopping list - that could be very handy.
+
+> Sub-recipe nesting would probably be my biggest point. Also, built-in timers would be convenient.
+
+> Nope! It’s great :)
+
+> I end up with loads of stuff all mixed up, perhaps folders to help me sort it a bit? I think cookbooks might work in this way (just started using). Perhaps sort by number of people? I find the sort by ingredient filter doesn’t really work would be amazing if this did.
+
+> allow for half portions to be selected as well - many recipes are for 4-6 portions, so we have to manually scale them down to 1 or 2 portions before adding to mealie - having that done automatically would be great
+
+> Unless I am misunderstanding usage ideas, I would like to see the cookbooks or silos to be possible to hide one group of recipes from another so the "recipe" for the soap I make does not go into the same silo and show up alongside my cok-au-vin
+
+> automatic unit detection to adjust the size of protions
+
+> more possible entries for nutritional values. adding note for amount food per entred nutritional values. OpenAI calculation for those. editing mode for uploaded or scaped pictures. we found that if pictures are in landscape mealie would rotate the picture in wrong (upright) position. no possibility to change beside adjusting the picture outside of mealie.
+
+> Big ask but calorie & macro computation(s) related to the recipes.
+
+> ADD UNRAID TO YOUR INSTALLATION GUIDES. Make official app on unraid community applications.
+
+> When importing a recipe, it would be great if I could switch on ingredient counts and parse the ingredients right away before saving.
+
+> some websites guard against recipe imports by detecting bots. would be nice to allow the importer to have some kinds of bot evasion options - changing the user-agent, pairing with something like flaresolverr, importing saved raw web pages, explicitly allowing specified local IP address (i see that's a security concern) to allow proxying, etc.
+
+> Make it possible to remove recipes that you don't want anymore.
+
+> A better method for PDF export. Currently the webp images result in large PDFs when exported (multiple MB when webp picture is less than 1MB).
+
+> Give me a compact view!
+
+> Have an option for a secondary measurment option which also scales when you increase the amount of servings. Like if the main option is "1 packet", then have the option to add "2 teaspoons" or "20 ml", etc.
+
+> Works as intended for me
+
+> Add support for Ingredients that change the plural based on the number so like 1 egg 2 eggs
+
+> A cool feature would be to add reminders for some ingredients. Some recipes require X ingredient to soak in water 24 hours or another thing to be prepared well in advance. If the recipe is added in the meal planner, then it should send a notification based on what was configured in Settings that you should prepare that ingredient.
+
+> Better initial parsing of ingredients, specifically automatic creation of unknown item and automatic breakdown of quantities. My partner doesn't like to take the time to clean up recipes so they're unable to take advantage of a lot of other functionality within Mealie as a result. If the recipe was imported via URL, option to save the original webpage as .html/PDF/similar to guard against link rot.
+
+> Quick UI option to 2x,3x,1/2x, etc recipe ingredients
+
+> Honestly love it as is. I go external to figure out the nutritional information for my recipes it would be nice to bring it into mealie https://www.verywellfit.com/recipe-nutrition-analyzer-4157076
+
+> I love overall how recipes function and are laid out. The only thing that would be nice is if you were able to take a picture of a physical recipe and have the parser create the recipe, similar to the URL importer. I know that is a huge ask though and it is not a deal breaking by any means.
+
+> A general tips or something like that would be useful to link, things related with food and cooking but that they are not recipes, for example: cooking temperatures of the meat, type of fat: pro and cons, cuts of meat and which ones are best for each case
+
+> not really. it works great as it is
+
+> Well, its not clear nor easy how to connect to OpenAI and take advantage of ChatGPT properly. I've managed to connect it but when trying to import recipes using it I fail to get it right. I've already tried to get ChatGPT on its free site to get me a recipe from a site which is not compatible with the scraper, and it was very successful to give me a script with Mealie format, although I had to create every ingredient first manually so it wasnt viable, but it would be great if it were possible to use GPT to scrape recipes websites and import them so we can then tweak them a bit if needed. An example is this page my wife loves but is not compatible so she always ends up complaining: https://www.paulinacocina.net/
+
+> Add the option to enable ingredient amounts by default for all recipes
+
+> I think I would just want to be able to share recipes across groups or copy a recipe to another group more easily.
+
+> Print / Export functionality improvements: ### Print - Allow for padding changes or something like "force on one page" or "condense." The amount of whitespace is great for web but not needed and wasteful for print. - Allow change of header/Section formatting (center, left, size) - Allow for margin size changes "Leave space for notes on right" ### Export - I love the new Ingredients Copy function, would love something similar on the instructions side. That way I can easily paste it in a different document or email if needed. - Allow export as text only - basically the download as JSON version, but just the basics to be opened in notepad or word
+
+> Support multiple languages for ingredients, let the user choose preferred names from aliases of foods/units, support abbreviations and aliases in manual ingredients input suggestions, parsing after importing without saving/refreshing the side has weird behavior, better local parsing (brute force add ingredient button does not correctly apply the same ingredient to other fields; local model? pdf/image parsing?), when exiting the editor indicate unsaved changes
+
+> Improve bulk tagging functionality, e.g., let me search for recipes then tag everything that matches the search. Right now I have to scroll through all the recipes and bulk tag everything by hand.
+
+> Hardness (discussed in discord and issue) that can be filtered by. Preamble "before you begin" step.
+
+> Ability to get nutrition information on ingredients would be quite useful
+
+> - Bulk import of recipes based on images. - A way to review all of the imported data before committing it to the database - Allow for multiple images when importing a single recipe.
+
+> Remind me to use the feature that adds ingredients to steps because it's awesome but I always forget to set it up
+
+> When I import a recipe, I want the option to automatically parse my ingredients and take me to the parse page.
+
+> Editing - could we have a 'Save' button at the bottom as well, or better still, that sticks to the same position on-screen? I seem to be forever scrolling back to the top to save it, every time I make an edit. Printing - I sometimes print out a recipe to avoid using my device near the cooker(!) It would be good to have some control over the layout. For instance, the headings Step 1, Step 2, etc, needlessly take up space.
+
+> What about a simplified WYSIWYG Editor for the step text? (My wife will never learn to use Mark down syntax..)
+
+> NA, mealie is great. I appreciate the work done to help quickly build recipes snd ingredients from copying and pasting non structured recipes that can’t be imported.
+
+> In steps, make links to quantities or ingredients so I don't have to scroll up to the top again
+
+> Serving scaling would be amazing
+
+> Loving it, just keeps getting better
+
+> That you can add x many ingredient fields.
+
+> It would be great to have alternative ingredients. I like to use the 'ingredient amounts' and would like to be able to specify 'use *this oil* or *that fat* to fry'.
+
+> Add photos to each step
+
+> Overall, it seems to work well, Maybe a global setting for ingredient amounts?
+
+> When editing a recipe I've not been able to find a way to remove the image, for example I imported a recipe from a URL and it added an image. I didn't want to use an image so I tried to remove it. I couldn't and needed to create a new recipe manually.
+
+> Nutritional function improvements?
+
+> not really. Easy to use!
+
+> I could not find a way to add or remove units (like tsp, cups, etc.) so I've been stuck with a unit called "ts" when I made a typo when entering "tsp". Also have to have plural forms of units (cup/cups); maybe a place to manage units could have a checkbox to indicate "when quantity is equal or greater than 1, use plural form or add an s".
+
+> When ingredients are not linked to steps having the ingredient list stick to the side when scrolling down the steps would help a lot.
+
+> I use Mealie live while cooking, I hate the way it is scaling right now. I would love to have it just as multiplier and not with the "smart way" as it is right now
+
+> I sure miss the native recipe OCR functionality. My main reason for using a recipe keeper was to digitize my cookbooks to make it easier to find recipes. The built-in OCR was a differentiator between Mealie and its competitors (and for whatever it's faults, it worked surprisingly well for me.) The AI implementation was both complicated to setup and didn't work (and I'm not interested in relying on a third-party service either.)
+
+> Have the ingredient quantities enabled by default and supported by the importer
+
+> I would love the required tools to work the same as ingredients. That is, have a counter (i.e., the recipe needs 1 oven, two pans, one small bowl and 3 large bowls) and especially, linking those to the steps. I love the "link ingredients to step" feature, because it allows me to really quickly see what I need for the current step without having to scroll (or touch the screen at all for that matter), but as of now, for the tools I still need to do that.
+
+> Difficulty level (how difficult is it to cook)
+
+> - Allow sorting (manually) of the linked ingredients of a recipe step. - Allow ticking (marking as done) of the linked ingredients of a recipe step. - Automatically save while creating a new recipe (to avoid losing progress). - Make it easier to rename/change existing ingredients in the DB. - Make it possible to clone an existing recipe. - Maybe it would make sense to have a linked recipe within a recipe. For example, a "cake base" that is used by several cakes. - Allow for multiple timers. This would be useful if several steps require a certain amount of time.
+
+> Can't think of an improvement right now.
+
+> Maybe making categories and tags more automatic? I am not sure if it's maybe too hard. But some recpies are called "Noodles with..." and I have a category "Noodles". Would be cool if something like that could be automatically parsed
+
+> * Allow scaling ingredients to different servings ("4 serving(s)" appears clickable but does actually nothing). * Allow creating small variations of a base recipe without fully duplicating (e.g. "the recipe says this, but I usually do this instead"). Comments are too out-of-the-way to suffice. * Allow adding notes/conversions to specific ingredients (e.g. setting conversion rates of substitute ingredients: "1 clove of garlic is 0.25 teaspoons of powder", "the one onion the recipe calls for is about one cup of pre-chopped opnions" or just adding per-ingredient notes that are easier to access)
+
+> I find the detailed ingredients somewhat awkward to use. (but thk you for all the work on mealy ❤️)
+
+> Better integration with Home Assistant
+
+> Link ingredients to steps. I think this is possible in tandoor and would be really great. But please keep also the main ingredient list, just links to the steps. It would probably be good to be able to link one ingredient to multiple steps, like e.g. salt or pepper.
+
+> Could the recipe ingredient parser be built into the recipie editor - no need to navigate away to parse? Drah-and-drop recipe images? Perhaps allow a space to upload a photo of a meal 'as made'
+
+> - ingredient scraper usually needs to be passed and manual adjusted. Not a big deal tho.
+
+> Perfect
+
+> Add an option to hide the 1-5 star ratings on recipes.
+
+> Better UI/UX for parsing Ingredients, sharing Links with PWA imports instantly without the time to change the checkboxes, for parsed recipes allow to decrease the meal portions from 4 to 3 or 2 with plus and minus instead of doubling it or requiring to input something like 0.75 manually.
+
+> Being able to reduce servings would be great. If a recipe is made for 4 servings, being able to see only 2 servings would be nice. I had another thought before, but cannot remember off the top of my head
+
+> Two points that (to my knowledge) are also already discussed online would be 1. Timers linked to steps. 2. Recipes as ingredients or alternatives, with the option to add them to the Meal Planner / Shopping List with a single click.
+
+> Fiddly part for me is to parse the ingredients and convert various units to grams. Not sure how it would work exactly but I think make use of llms. Eg a cup of flour = ?? grams
+
+> Better UI flow
+
+> I would like to see images treated as their own objects, instead of in-line. I always end up having to manually add styles to the img tag, otherwise the image takes too much space. Also would be nice to be able to disable images when printing the recipe.
+
+> More support for sites with different formats. Or picture OCR
+
+> No super happy with it
+
+> Not really, it's great
+
+[Back to the overview](overview.md) or [On to Question 13](q13.md)

docs/docs/news/surveys/2024-october/q13.md

@@ -0,0 +1,391 @@
+[Back to the overview](overview.md)
+
+# Question 13: Any other suggestions or feedback you have for us?
+
+> Great Project, We love it !
+
+> It's an amazing software. thanks for making it. has helped me organize my family recipes and be able to more easily find and make family favourites.
+
+> I love the concept of mealie, great work so far, excited to see how it develops in the future!
+
+> Honestly, keep up the great work! I've been slowly getting my family to use it and has worked for a meal or two so far! Thank you for the dedication to this project!
+
+> Thanks for the great app!
+
+> Import recipe from "betty bossi": e.g. https://www.bettybossi.ch/de/Rezept/ShowRezept/BB_BBZA110115_0004A-40-de
+
+> For inspiration have a look here, I think it has a lot of nice features and the integration with AI is everywhere https://cooked.wiki/
+
+> I would love to see caching / storage in mobile browsers / PWA, so that recipes are available offline. The performance of mealie could be better. I currently only have 88 recipes, but the initial load of Mealie takes 10 seconds. This should load instantly.
+
+> First and most important:Mealie is really great. Keep up the incredible work! For my storage I use Grocy. Mealie is of course much better redarding recepies, but in Grocy I like the possibilty to show recepies based on what I have in stock or where only few items are missing or what needs to be used. It would be great, if there would be an easy way to link recepies and shopping lists between Grocy and Mealie, but I know this is probably more an API thing...
+
+> I think this is a great app, thank you!
+
+> It would be useful if I could use categories/tags/tools/food to do advanced searches for example, I want the dessert category and egg as food but to exclude strawberry in the food search. In other words, I would like to be able to select and deselect things to make advanced searches.
+
+> Maybe I've missed this option, but I would like to be able to "share" recipe (or even dump the database of recipe, without login/config/...) with other Mealie users on a different system
+
+> We're still learning how to integrate Mealie into our kitchen. Thank you for including OIDC. Some desired features: - Tag deduplication, & merging - Tag parsing. Some recipes have 'Chicken' others have 'Chicken soup'. Two different tags when looking for things with Chicken - Recipe deduplication. A good task for AI perhaps
+
+> I love Mealie!!!
+
+> No specific feedback other than a big thanks for your hard work! Kudos to all of you
+
+> I love the program and like its functionality. I'm glad there is now an option to make your mealie recipes accesable without special links or login requirements.
+
+> It'd be great if the login requirement could be ignored for LAN connections so that users at home do not have to keep logging back in - but only if it's possible to maintain overall security.
+
+> Not really, mostly Meal Planner and Shopping List recommendations. I would love to have some sort of syncing functions so I can integrate it with notes, shopping lists and calendars. Regarding sync, having the meal planner somehow synced with my calendar could be great for planning my day, specially as the recipes usually have some expected time for the preparation, so for example: If I expect to have Lunch everyday at 1PM, and the recipe for my monday takes 45m to make, I would have an event in my calendar called "MEALIE Lunch: Spaghetti w/ Filetto" starting 12.15PM with a 30m before notification so I get notified and have time to round up my ongoing workm, be ready to start cooking and check I dont have to buy fresh ingredient. I dont know the technicals behind it but if syncing to calendars is too complex, at least as an intermediate step, having the option to export an .ics with the whole month and then each user can have it imported in the calendar fo their chosing.
+
+> Love mealie!! I probably don't use it enough though. One thing worth taking a look at (not sure how technically viable it is, but) the recipe import often fails, especially for recipes in hebrew (which is my native language). I still use it to save recipes but it kinda misses the point. Anyway, thank you so much, and keep up the good work :)
+
+> Keep up the good work, mealie is a great tool
+
+> I use this with Authentik so pretty glad to see OIDC made it in (though I haven't had a chance to update my instance in a while). Just to be clear, I'll *never* use any of the OpenAI integrations. GenAI is a negative value add and I don't want it anywhere near my instance.
+
+> Mealie is fantastic so far, I've only just started using it in the past week. It would be great if it had the option to group ingredients into sections, e.g. for a recipe with multiple components. Also when it scraped a recipe from a website it was able to tell the difference between a heading and an instruction step. It might already be able to do this but I haven't quite explored all its capabilities and if so, I apologise! Thank you for making such a fab service self-hostable!
+
+> I am may missed the section for the Shopping List and this may be an impossible ask. But would it be possible to combine ingredients to reduce waste. For example: if i had 2 recipes for that use a 1/4 cup of milk and another that used 1 cup of milk, the shopping list would say 1-1/4 milk as a total purchase. the Mealime app performs this function as a reference.
+
+> Thank you for making Mealie.
+
+> THANK YOU. Thank you for your work. Thank you for putting us back on a healthier meal plan. It honestly makes a pretty significant difference.
+
+> It would be nice to be able to personalize the instance a little bit more. I host this instance for family and friends and to be fair they don't really care what's under the hood. So, changing the title, the banner that appears when a link is shared, etc would bring a lot of value
+
+> At the moment you can only have the text next to the logo in the top-left corner say "Mealie". For me, it would be nice if you could change that text to be something else (e.g. frank's bistro).
+
+> Keep up the great work!
+
+> Mealie is the only tool I've found that allows me to meal plan efficiently. I eat healthier and save money
+
+> Absolutely fantastic application. My family depends on it!
+
+> Keep up the good work. Me and wife love it alot.
+
+> I was using it daily to import recipes from url, plan weekly meals. The dinner image would show on a home assistant dashboard what was for dinner that night. This broke with a mealie update. Mealie is still working but not grabbing the dinner (unknown).
+
+> continue the way you do ;)
+
+> I love mealie :D Thank you for providing it and making it better and better!
+
+> Keep up the great work thank you! Mealie is fantastic!
+
+> Thanks for making and maintaining this! It's revolutionised how we eat.
+
+> Have you considered making recipes publishable via activitypub? That could be very cool.
+
+> The Households filter is a lifesaver. Maybe add a filter to find recipes owned by a user to make it more granular.
+
+> I love this project and it has absolutely made my love significantly easier, thank you. The ability to import a cert/key file to enable SSL would be great, either via the UI or yaml would be fine. This is a very odd and specific request but when importing from something like HelloFresh many of their ingredients are in units, how they ship them. If there were some built in way for me to define one unit of ingredient X = 1.5 tsp or similar for it to auto switch that when parsing, that would be amazing.
+
+> Love the product! Such great work. We use it non stop for meal planning and shopping. Thank you so much for all your hard work in making such an amazing bit of software.
+
+> No. It's been very useful to me. I'd love to contribute. Not a programmer but I am an IT professional
+
+> When importing recipes (especially in bulk), it would be nice if the system notified you if the URL you are trying to import is already in the DB instead of just importing it and marking it with a (1). Or have an option to just not import duplicate URLs.
+
+> AI is not for food.
+
+> 1 - Ability for the Admin user to rename or delete wrong "foods" or "units" items. (today the only way I found is to use swagger). 2 - Management of "of" in ingredient list. (like in "1 kg of oranges " vs "4 oranges")
+
+> Thank you for all the great work. Really enjoy using, and we rely on Mealie for our food planning 😁🍲
+
+> Recipe as an ingredient https://github.com/mealie-recipes/mealie/discussions/1761 my kings and queens and all royalty in between.
+
+> Please add a fully guide how to install mealie. I got lost with the env variables and was only able to set Mealie up thanks to guy I found on youtube that provided a standard docker compose file that worked perfectly for me. Why don't you provide a standard docker compose that people can modify? Or at least a full guide? Apart from that I completely love Mealie! Imprting recipes is amazing. It won't work in a few cases (plain text) which is something that you could optimize.
+
+> Formatting recipes to parse ingredients AND automatically connect ingredients to the steps could be done with LLM/OpenAI integration, that would save a lot of time.
+
+> Hover effect for all recipes is useless. Most of the sites i import from have just bullshit in the first section. Would be nice to have some themes or disable stuff like this.
+
+> i personally dont use any of the planning etc. also i use another app for my shopping list. mealie for me is just a plattform to share reciepies with familie and friends, all thoose recipies we have for years in our famaliy. so we all have a place with recipies we all know are working great. something like chefkoch and co are flooded with bad recipies and nobody wants them. so using mealie as a managaer for shopping list and week planning etc is nothing we use at all becouse this would mean that everything lives in mealie, something like bring or similiar is way better for just that use case and mealie is "just" a plattform for private recipies what would be a nice feature is some kind of centrialized database a private mealie CAN push to and this way making recipies others would like to share explorable.
+
+> Love Mealie! Thanks for making, sharing, and maintaining a really cool open source project :)
+
+> Integration with Bring would be very nice
+
+> an app for android would be perfect
+
+> Have the meal planner select meals for a time-span, e.g. a whole week/month (excluding weekends).
+
+> abandoning the project for another one which is similar and unreleased was a huge fuck up. Reliability is more important than flashy flashy by miles.
+
+> thanks for the great work
+
+> Thanks !
+
+> A way to import a nice recipie i have seen on social media (e.g. Instagram). And also save the iamge/ video of it. I know its a large task, but it would be great.
+
+> You do great work!
+
+> Keep going. Mealie is really looking good right now.
+
+> FANTASTIC APP!
+
+> A small issue I have is being logged out when using mealie as a pwa on android through the brave browser. Just a little annoying when it happens but it doesn't happen that often.
+
+> My wife loves this and enjoys importing recipes from the web when she has time to find them, but most of our meals are an established part of a set we have been using for years. Importing from other systems or through some sort of OCR tech in an app to grab grandma's cookie recipe would be more useful than scouring all the cooking websites and importing something that may never make it to the table again. Maybe that is just us, but the kids and jobs make recipe searching a luxury. Without a good recipe base, the other features are less useful.
+
+> Thanks a lot for your great work you're doing with Mealie. I use it to store my recipes and manage my family's shopping list and it's so much better that managing everything in paper folders.
+
+> Some bits of the UI are a bit slow, for instance adding a new ingredient has a huge typing delay when showing hundreds of other ingredients (I tried to profile this in-browser, but the tab crashed). It would be good to prioritise snappiness over fanciness. It would also be quite good to split complex recipes into multiple stages.
+
+> Integration with Grocy would be nice.
+
+> I've had some ideas to contribute but haven't had the time unfortunately. 1. When cooking, the timer "floats" and follows as you scroll down. 2. Multiple timers. 3. Visual warning when timer goes off. (had my pc connected to bluetooth so didn't hear it go off..) 4. Add pre-set timer to recepie
+
+> I am very happy with the features for mealie. It helps me budget and make nice food for my family
+
+> Keep up the good work
+
+> Love it. So far, all of the updates have been positive. While there are a ton of new features that we'll probably explore in the coming year, the core functionality is still spot on . 🤞 for the future :)
+
+> None at this time. Thanks for your work!
+
+> Thank you for everything. I would like to find ways to contribute more to the project and the community. Mealie is now also in use by my parents' household and two co-workers' households since I should it off. My only other recommendation would be to have a better set of default food labels/units/categories/measurements. Or perhaps localised sets of defaults.
+
+> I understand it's probably not doable but some form of Grocy integration would be so amazing.
+
+> I´m astonished by the work you´v done already. Since certain circumstances I´m not able to fund the project, but hope it will change soon. Coud it be possible to habe each recepie analysed by AI, if it is keto, low-carb, vegan, etc.? Or maybe automaic mealpans for a certain type of diet? So one wil not miss their macros.
+
+> Most of my recipes were imported from AllRecipes.com. I used to have an account there where I saved recipes, but the website has lost features and gotten progressively slower over the years. Once I found Mealie I imported all my recipes and ditched my AllRecipes.com account. Mealie works better than AllRecipes.com ever did, even in its hey day. Just having the ability to search my own recipes again is wonderful! I don't use the advanced features much, mainly importing from URLs, tagging and categorizing, and occasionally commenting if I need to remember alterations or tips. Thank you so much for this great software!
+
+> love you keep it up
+
+> You guys are amazing! Thanks again for all of your hard work.
+
+> I'm a new user but I love it already.
+
+> Would be nice to have a "I'm cooking setting that stops eg. tablets from sleeping for "Total time" for this recipe or default of eg. 30 minutes
+
+> I need to look to see if this can be done already, but an accountless option would be nice, don't need an account for home use only.
+
+> Just an idea, it would be cool if I could set requirements for recipes. For example making it required that a category and tag is set. I have set up my instance to add things to cookbooks from these but some of my users forget to add them, therefore they don't appear in the cookbook. If it were required then they wouldn't be able to save the recipe until they did.
+
+> please allow the ability to disable/hide extra functionality throughout, we don't use a lot of it so it's just clutter. We don't use shopping list, meal planner, nor the timeline. All we wanted was a simple recipe creation + storage app and mealie does do this very well. We do use 'cookbooks' to separate group recipes made by me, made by my wife, internet recipes, family, etc.
+
+> Great project. Thank you!
+
+> I think the recipes page is really good, and I love using it for my cooking, and it makes me cook a lot more now. The other things like shopping list and meal planner aren't useful for me in their current form unfortunately, but I hope to be able to use them in the future. I'd never use a shopping web app because of the page refresh in a browser, so that would have to be in an app before I'd consider using it while I was at the supermarket. I also have to spend too much time converting imperial to metric quantities in recipes that I've imported and that would be a massive time saving feature to have them auto convert if I set up the ingredient amounts.
+
+> So far I love Mealie and I hope you guys keep up the great work. You have made a fantastic product.
+
+> Much better and clearer handling of administrative task. Things like bulk adding or removing tags and labels to selected items.
+
+> I love Mealie. It's one of my most essential self hosted services right next to DNS and a password manager.
+
+> Converting to metric would be so good! Also, being able to set the primary language as British English would be good. Ie. Fiber --> Fibre etc.
+
+> Keep up the awesome work on this project. I am trying to get more family members into using it. But I started them with an earlier (less functional and feature rich) version. So I am trying to draw them back in as it seems to work so much better these days.
+
+> We are generally very happy with the app and it's functionality. We are using it self-hosted internally on a Raspberry Pi and it serves our needs very well.
+
+> Please make URL importer and recipe/ingredient editing/adding more user friendly. Often when importing I find errors or need to manually edit a lot myself, which makes it very clunky and dissuades my family from using Mealie. Thank you for a wonderful system!
+
+> Keep up the amazing work!
+
+> Nope, just thanks, your app rocks and has completely changed how we prepare food. You have helped us to be healthier and more organised, thanks.
+
+> I love love love mealie. Temporarily had to stop sponsoring through Github - but will definitely responsor in the future. I appreciated incorporating OIDC. Happy that we can still see recipes without being logged in (was afraid this would disappear going into v1 territory). I love cooking but choosing what to make gives me analysis paralysis. Having a shortlist of thing I love right there in Mealie is great. My girlfriend uses mealie as well. We don't live together so it is a surpsie to find new recipes in there from time to time.
+
+> Nice application, I enjoy it a a lot. Thanks for your work :)
+
+> Mealie is great and has helped massively improve my diet. Inspiring stuff. Keep up the good work.
+
+> I'm having some trouble with the OpenAI image parsing feature. The error messages indicate OpenAI isn't returning JSON as expected? This isn't a critical feature to me, so I haven't followed up yet, but it'd certainly be handy if this worked better.
+
+> Thank you very much for your effort. you make our family life much easier cause we know have a central place for receipt storage which we mutual agree on. thats makes it a lot easier to find receipts we already did. also all the loose paper collections are gone
+
+> No. I wouldn't mind telemetry as long as it was opt in by default.
+
+> Keep up the great work!
+
+> - Allow specifying ingredients measurement in recipe builder via acronym (typing in tsp instead of teaspoon) -Cache/Save recipes in client so that reactions can still be accessed if server/Internet is down (I assume this probably needs a proper mobile app to implement)
+
+> Thanks for your great work. Mealie was a live saver when my main recipe website suddenly went offline. It started as an archive and is now my family's recipe book.
+
+> very nice!
+
+> Mealie is great! Thanks for developing it and making it available for free. It has improved our organization.
+
+> Thank you very much for developing Mealie! Me and my wife use it for everyday meal planning and find it very useful.
+
+> You are doing great work! I am super happy with mealie!
+
+> Good job!
+
+> It would be great there was a better way to display the dashboard in HA than to use an iframe and also to not have to type the password every couple weeks
+
+> On bulk imports, it would be great if you could parse out the pasted step numbers.
+
+> Love the project, use it daily as a family!
+
+> Nutrition information for Ingredients to automatically build up to recipes
+
+> Please add a "no login" Option. In a private household with 1-2 people it's annoying to login every now and then... I would prefer to use Mealie without a login, at least I wish I could have the option to do so.
+
+> It's an amazing application. It improved my marriage as there was always arguments as to what to eat, who cooks, what we need to buy. Everything is organized, it removed a LOT of stress from my life.
+
+> Every time I log in I get the welcome to mealie lets get started. I always have to click I'm already setup, just bring me to the homepage. I find this kind of annoying. I am not sure why I would want to setup after I have already done so. Maybe I am missing something.
+
+> Great work love the platform
+
+> I just want to say I absolutely love Mealie and you've done an amazing job! I'm happy to support such a fantastic piece of FOSS software!
+
+> Might be nice to have a settings option to disable features you don’t care about to reduce UI clutter. Helpful for less technical household users who just want a simple digital/self-hosted recipe book.
+
+> I get lots of recipes from websites that require signing in. The recent addition of importing through HTML will hopefully improve my workflow a bit. A browser extension to send the full HTML would be even nicer.
+
+> It is perfect for my use case. We use it to plan for the upcoming week and we use the pool of recipes that I have imported as inspiration. We use planner comments for restaurant names in order to have a complete timeline.
+
+> It's a great app and I use it a lot more than I thought I would. Thanks a lot for it!
+
+> Mealie starts to bog down heavily when there are 1000+ recipes.
+
+> Thanks for the great work!
+
+> My wife and I love this software, we use it every day for our cooking and we are always adding new recipes into it. Keep up the fantastic work!
+
+> This software solves a problem I never even realised I had - where to collect all those recipes from books, magazines, websites and scraps of paper all over the place - and it runs an absolute charm. Thank you!
+
+> Thank you for the amazing work you are doing
+
+> Please make the WPA work as the web page on iOS, because the icons get lost and replace by generic rectangle, it's not usable for checking in real time the shopping list.
+
+> Include support for other databases like Oracle.
+
+> thanks for the hard work
+
+> Great software, thank you kindly!
+
+> It's such a useful app, thanks for all the hard work!
+
+> update mealie from application
+
+> The app has been improving steadily and I'm aware that we are in no position to ask for anything, I do believe that there is a lot of margin to improve and make it much user friendly and not so "power user only". The most important things here for me are the meal planner which should be smart enough to plan my meals and just tell me what to eat based on what rules I established, the shopping list because if I dont have the items to cook, I end up derailing and eating some delivery or breaking my rules, and of course the smartest scrapper possible so its easy to import recipes we like. From a person who is in almost constant need of a controlled diet, I can tell that discipline can be hard to keep, and Mealie can be a really powerful tool to keep it, and Im thankful for that.
+
+> Love the project, it's the only way I enjoy doing groceries and planning meals in advance opposed to ordering out
+
+> I would like to be able to switch between groups more easily, if there was a button to select a group. Right now, as far as I'm aware, I have to change the URL to access the different groups. Though, I haven't used it recently because of this issue.
+
+> i enjoy mealie as well as my family since the beginning of the project. Thx a lot for your time :)
+
+> The search improvements are huge!! Love the additions there. - Would love to be able to search by source domain - with recipes added via url. (e.g. "Mary's Test Kitchen" would return every recipe from the domain https://www.marystestkitchen.com/) there could be a matching section in settings to make it easier to read like that, or the filter would just show marystestkitchen.com, either is fine - Why do the foods in the list appear to be random? Couldn't they pull from the ingredients in all the recipes?
+
+> I moved to Mealie from Tandoor, and I like the look and feel of Mealie much better. I host Mealie in docker, and every time I update the docker it wipes my database. I have to back up before updating, and restore after updating every time, which is probably a good habbit to have, but it would be nice to not have to every time. I don't know if it is my docker compose, or the way Mealie works. It is not a huge deal, but it is kind of annoying. Other than that I really enjoy Mealie, and have come to depend on it. Thank you for creating Mealie and keep up the great work.
+
+> oh my gawd PLEASE let me change the color of the header on the mobile safari app. it drives me crazy that it's always orange ::tears:: But- love the app overall :)
+
+> Provide (more) ideas/concepts for tags and categories to the user, restructure profile page: the amount of different things that would be more accurately described as settings are confusing, allow combination of NOT IN and IN in search, save language setting per user. Forgot to mention for recipes: provide a toggle to merge ingredients to see the total amount of an ingredient needed for a recipe. Similar to how it is handled when adding to a shopping list but should also merge regardless of note. This is useful when using sections. Also with regard to internationalization: internationalize/standardize servings and time. Also when internationalizing categories, foods, units, tags etc., don't make it dependent on the UI language setting
+
+> Can you make PWA shortcuts available on iOS? If not, please provide documentation explaining this limitation. I tried and tried to get it to work, but it appears to be an Android-only feature.
+
+> Take care of yourselves!
+
+> PLEASE keep working on Mealie, my family has come to pretty much rely on it daily! I would even be willing to pay for a license as long as the project stays strong!
+
+> I love Mealie. Please keep up the great work!
+
+> I only use it for the basics, but Mealie does its job really well.
+
+> Please continue! Mealie is a great system, we love it!
+
+> I added my wife’s feedback under the meal planner question, she doesn’t like that she needs to login to often. Also, there’s a longstanding bug that I believe is a a WebKit bug on iOS that prevents the screen from sleep function working when mealie is running as a PWA. Not your fault, however if it was possible to find a workaround to that maybe, that would be great. Thanks! Mealie has changed our lives, I cannot thank you enough!
+
+> Thank you for this amazing project.
+
+> I've tried to import recipes from Podio with the API, but I got many error messages. The API accepted data that caused issues reading the data, so I had to dig into the database to correct the information. Validation on the API should be added.
+
+> Love the service! Thank you for putting it together!!!
+
+> Some custom editing options for uploaded images might be nice. I'm honestly just super happy that this app continues to get love and development.
+
+> While I love Mealie in general (thanks for the awesome project, btw!), I fell that the responsiveness of the interface could still be improved a lot (haven't upgraded to v2 yet, but didn't see anything in this regard). Especially on mobile devices and slower/low-end computers, the interface doesn't feel snappy and I find myself often waiting for it to do things. It might be because I'm using Firefox, which might not be a major development target/platform though.
+
+> Really great app, my wife and I love it. I self host a few services but after Home Assistant this is probably our second most frequently used service. We also use the Home Assistant integration for Mealie and have announcements of what is planned for dinner. We also use a mixture of Home Assistant native shopping lists for non supermarket stuff (like the hardware store) and Mealie shopping list for food and drugstore stuff.
+
+> Thanks for this wonderful product. I created an article about this projects and I added some extra functionality to my Home Assistant dashboard for it. https://vdbrink.github.io/homeassistant/homeassistant_dashboard_mealie After I shared my article in multiple social medias I see a lot more people who use it now also. Afterwards there is now also the hacs home assistant module.
+
+> Thank you for all that you do!
+
+> GG for v2.0
+
+> its nice, but we are currently in testing-modus
+
+> For the user-specific rating, it would be really nice, if I could look up the rating for each person (maybe only as admin?)
+
+> In the Group admin pages, there is a checkbox for "Private Group". There is also one for "Allow users outside of your group to see your recipes". Both of those are presented without any explanation of what they are, or how they are different. Adding some text explaining what the different options do would be useful.
+
+> Y'all are awesome keep up the amazing work. I use Mealie as my modern recipe book and love it
+
+> Overall a GREAT app and am very happy with it.
+
+> Would love to import raw PDF (no AI) even if it was just viewable and not parsed or searchable just to keep my recipe hoard all in the same place
+
+> Keep up the great work! I have been using Mealie 5-6 days a week consistently for over a year, it's been a great help, a wonderful tool. I never "disable ingredient amounts", so if you can find a way for import recipe to automatically match up the units and quantities by default, it would save me time and be amazing, because I love cook mode, being able to increase/decrease recipe servings, and ingredient linking.
+
+> It would be awesome if the API docs got some TLC. There are several endpoints that have no description or are rather confusing on how they work.
+
+> Thank you for the great work!
+
+> After importing a new recipe via URL and making a few changes (like assigning categories/tags), it requires me to first save, then re-enter edit mode before I can safely use the ingredient parser. Please consider having the 'parse' button prompt to save changes rather than saying "you're gonna lose everything!"
+
+> Just a great tool.
+
+> mealie is fantastic
+
+> Manual recipe building is needlessly complicated due to two limitations: Mealie doesn't have an option to start with a baseline "blank" recipe state and it doesn't properly pass bulk-added ingredients to the parser, In the first case, this means every time I create a new recipe I first have to delete the first ingredient and first sample step so I can bulk add my own. Guess how many times I forget to do that. In the second case, if ingredients are bulk added then you must first save the unfinished recipe and then go back to editing it to use the parser. This should definitely not be necessary.
+
+> I have it running on a docker container on a Synology and I'm not sure how to upgrade. I'd love some dumbed down documentation for installing, migrating, and upgrading.
+
+> I wish the recipe parser would automatically go to edit mode after importing a recipe
+
+> Great work!
+
+> I just love the tool. The UI and UX is great (well, some settings are obscurley hidden, but one can learn that) overall, I am really happy. Thank you all a bunch!
+
+> Currently I am using 2 different instances of Mealie. This is because for my deployment I NEED a way to completely segregate 2 different groups. Users from group A must not be able to see anything in group B. Some users from group B should be able to see recipes in group A. The groups should be auto-assigned through OIDC auth. Currently there is no way to have this functionality, because groups can not be assigned automatically from OIDC and there is no functional way to have a single user as part of both groups. At least this is so AFAICT, I was not able to get this to work. (If you wish to chat about this to me, I am in the discord. user: Gecko)
+
+> Usability should be the main focus. The system is often used by non-technical people and they get lost quickly. Keep things simple and clear.
+
+> It would be great to support the installation in a subpath. It looks like Nuxt has support for this in v3 using app.baseURL / NUXT_APP_BASE_URL.
+
+> We're rather happy with Mealie despite it being not perfect. A quick detour to Tandoor brought us back to Mealie after a single day as it's just not fur us apparently. While Todoist worked for us a long time as a Meal Planner and Shopping List, Meal Planning has moved completely to Mealie. Shopping Lists are not quite there but I'm confident they'll get there eventually. Thank you for listening to user feedback and your continued investment into Mealie, it makes a real difference :)
+
+> Thank you! You have greatly improved my planning and dealing with meals. I have like 10 recipe books and used to never find anything, but now it is so easy and central. Otherwise my autistic ass loves statistics. If you want to include something like a Spotify wrapped like "You cooked 20kg of noodles this year" that be hilarious
+
+> Thank you ❤️
+
+> Better integration with Home Assistant
+
+> It's never really been clear to me the purpose of a 'group'. Perhaps this can be better explained in the UI when you would use it. Especially now there's another grouping of users in households. One other thing is that the PWA on Android seems to be much slower and less responsive than on IOS. Otherwise, love mealie and it's up there with my most used self hosted apps
+
+> I really enjoy using mealie as a recipe database and mealplanner. I integrated it in HassIO so that I get a message every morning with whats for lunch and dinner and a notification when I need to start preparing lunch so that it's ready at noon.
+
+> Please make a Android app like Mealient but with full mealie options
+
+> Thanks for a great product - it brought harmony to our household 💖
+
+> I really appreciate the work. This has made cooking for holidays (especially) so much easier. I look forward to seeing what is happening in groups in v2.0.0. I wanted to share with my family outside of my house, but didn't want them to see meal planning or shopping lists.
+
+> Generally, this tool is great -- and I very much belief that it actually does reduce the amount of food-waste with us planning better what to eat. Very definitely, it saves us time doing shopping: )
+
+> keep up the great work! :-) i love mealie and it is an integral part of our household :-)
+
+> Thank you for providing this software!
+
+> Thanks for the awesome app! Some thoughts: - A nice feature to have would be a native app widget so I could show a recipe on my kitchen tablet's home screen. - Another one would be an option to increase the font size of recipes, again for use on tablet. Thanks again!
+
+> I do not like how Cookbooks are managed. I shouldn't have to set a tag for a recipe to be in a cookbook, there should be a different way to assign a recipe to one or more cookbooks. Cookbooks should be organized and displayed as though you picked up a physical cookbook and were about to go through all the categories - as displayed on your screen. Cookbooks should also display the total number of recipes as well as the total recipes per category. Please consider extending the functionality of cookbooks, how the user interacts with them, and how recipes are assigned to cookbooks. Thank you for the consideration.
+
+> Keep on the good work
+
+> Love it. Only thing I wish it did or did better if it is available, is when I import a recipe it creates a separate list of just the ingredients outside of the standard one that includes how much. It's hard to quickly view what I need when grocery shopping.
+
+> I enjoy using Mealie and appreciate all the contributors
+
+> Keep on trucking Brothers
+
+[Back to the overview](overview.md)

docs/docs/news/surveys/2024-october/q9.md

@@ -0,0 +1,319 @@
+[Back to the overview](overview.md)
+
+# Question 9: Any suggestions for how to improve Shopping Lists?
+
+> Take a look at OurGroceries, it is awesome. but i guess it works a bit differently, but its very quick to add
+
+> Functionally it feels good in 1.x just some visual improvements would be nice. havent tried it out in 2.x yet
+
+> I am on 1.12.0, running in a browser (no PWA since I don't have HTTPS set up for my homelab). On mobile, shopping lists feel like thet take up a lot of space for each item, with the item name and amount, description, buttons for editing, showing the recipe the ingredient belongs to, and drag symbol. When on mobile in the store doing the shopping I really only need a checkbox, amount, and ingredient name. Maybe simplify the list and add a button for an "advanced" or "edit" mode?
+
+> Toggle showing or hiding notes imported from recipes.
+
+> Sort the ingredients and add up the quantity
+
+> Using AI to just describe the ingredients using natural language or upload a picture of the ingredients and then add them automatically to the shopping list
+
+> Per-store ordering of aisles (so the list is in order of where I plan to route throughout the store)
+
+> For me there's not much room for improvement, as I'm exporting the Shopping List into Home Assistants Shopping List. It does make sense for me, as Home Assistant offers me a local and privacy first voice assistant, that can add things to the Home Assistant Shopping List. Implementing such a feature would in my opinion not fit to Mealie. So I'd say, if you can improve the sync functionality for the shopping list in Mealie, it would be better than to try to "improve" to another voice assistant, this time for shopping lists andd recepies. Concentrate on what Mealie does really, really good: serving as a support app for all your food needs. But not for all the shopping needs.
+
+> - add a pole to write down a shop name with option to group products by that name - automatically categorize product by their kind ex. cheese, brewery, etc., with option to group them together
+
+> Make it look or feel more like Microsoft todo
+
+> Ability to add shopping list items in a conveniant way via Alexa, Siri or other speech. Although it is somehow possible with tags, I like shopping list, where I can order categories in the same order they are in a shop (e.g. vegetables, meat, drinks, spices, etc) so I have my list in the order of the shop and i can easiely work from top to bottom of my list while shopping
+
+> Maybe have some kind of household inventory in addition?
+
+> I don't use the Mealie shopping list as the stores I buy at have their own digital shopping lists in their apps.
+
+> Ingredient sterilization to make cleaner shopping lists
+
+> To me fetching recepies via url and importing them is the reason to use mealie.
+
+> I would like to see an option to set a custom label ordering per shopping list. Usecase: You have different supermarkets and for each a seperate shopping list. For the ordering of food could differ from store to store. Having the ability to re-order tags for a specific shopping list (market) would make handling this situation very convenient. A default order could be applied when creating new shopping lists
+
+> Unfortunately I've yet to use it. But I really like the idea of having it available to me once I use mealie fully.
+
+> I don't really use this feature (despite wanting to) as it is more convenient to share/sync a list with my partner on Google Keep
+
+> I cant access my Mealie outside my lcoal network as its not exposed, so It would be cool to have some sharing function so I can send the list to my phone, to someone who is at the store or to some other app, perhaps some notes or Google Keeps app (It would be even better if could be synced with some of these apps). This is something that was on my mind but I recently saw that the copy function was added which is great!! I would recommend putting all the action buttons on top of the list so I dont have to scroll to the bottom in order to perform the actions as an UX thing. I would also look forward to have it integrated with HAOS as most mealie users are self-hosted users who try to run everything locally and integrate it as much as possible, perhaps have a card for it with a sync button and the possibilty to add items through some assistant or at least to read it out loud when requested.
+
+> Unify measurements so there is no double ups of ingredients
+
+> add nutritional data, very important
+
+> I guess this would be more of a "units as a whole" thing, but I'd love to see a "Unit Conversion" thing as a whole. For example, in the shopping list, if Recipe A uses 500g Beef Mince, and another recipe uses 1kg of Beef Mince, the two would usually separate in to two Shopping List entries. It would be cool to see units combine where possible, like in the example above, the list would show either 1500g or 1.5kg Beef Mince
+
+> connections to 3rd party app / grocy
+
+> I'm still in the process of learning how best to use it, so not in a position to advise.
+
+> Little icons for each item Favorites List of regularly shopped items clearer iconography while entering a new item
+
+> 1. mass delete for Tags, i have over 300 tags and don't want to delete them all manually 2. look at this webpage (https://www.traeger.com/recipes/bbq-chicken-wings-3-wings) on the left hand side they have ingredient headings (with a different font size so it stands out) like Chicken Wing, Franks RedHot Sauce, etc. that way the ingredient list can be separated into groups. i currently add blank ingredient spaces to try and do this. 3. be able to click and drag recipe cards to cookbooks 4. be able to mass assign tags to recipe cards. for example if i had a BBQ tag and wanted to assign it to 10 recipe cards, it would be nice to do that instead of opening up each card and making the change
+
+> Some lists are hidden by default, which is confusing I sync my lists with home assistant which is fantastic!
+
+> I do my grocery shopping online, and my shop (Sainsbury's) has the option to paste my shopping list and do a search for each line. I would like an option to customise what the generated text from mealie looks like
+
+> Ai to learn your preferred labels and then auto suggest a label for new ingredients.
+
+> At the moment, I am not using it that much.
+
+> Allow ingredients to be added to the shopping list directly from the recipe. This would save time for ad-hoc menus when you don't want to use the meal planner.
+
+> Option to auto convert free text items to categorised via natural language parser Timeline/stats for previously bought items Prices especially if integrated with a supermarket price tracker Export for online shopping
+
+> Create Pantry Section but this idea got no go-forward
+
+> Continue to sort by labels but be able to hide them. Easier reordering on mobile.
+
+> We'd like to be able to select the number of people a recipe is for when you add it to the list. Currently, most of our recipes are for 2 people so if we have guests we have to add the meal to the plan twice in order to get the correct amount of ingredients. Also, when you tick an item as done and it's attached to a recipe, that recipe information is lost if you untick it. This isn't great if you tick anything by accident, or need to check a ticked ingredient against a recipe.
+
+> Combine like ingredients from two different recipes. Meaning if two recipes call for garlic there is just one shopping list item for garlic.
+
+> I think the ingredients need to be added “correctly” from URL import instead of just a large string.
+
+> I did really like the auto shopping list based on meal plan, but I understand the logic about selecting specific meals and ingredients from those recipes. Perhaps if you could press one button and refine a list from all the recipes in the current meal plan, that would be best of both. Also, the ability to re-order or sort shopping lists. Thank you.
+
+> When adding recipes to the Shopping List, it will take about a minute to actually load the ingredients into the Shopping List section. However, the linked recipe will be visible at the bottom of the Shopping List page right away
+
+> Export/Integraion to Home Assistant ToDoS (I use the as shopping list and don't have access to mealie from extern)
+
+> The biggest think that I need is to be able to sync the shopping list between my account and my wife's account one thing that I love that is included in samsung food app is that it allows me to use the share button on a website to send the recipe to the app. I wish mealie had this same functionality
+
+> It seems (I'm still a newbie) Shopping Lists aren't immediately shared, contrary to recipes, in a group. If that's correct, it's counterintuitive.
+
+> 1. Please add more entry type/food type on planner. In Poland the main dish is at 1-4 P.M. It's called obiad but it's related to lunch. But because it's main meal, we usually have 2 dishes: soup (zupa) and the second dish (drugie danie). It would be great to have separate entry type for soups and the second dished. So in generally, please allow to define own entry types in planner (like in Tandoor Recipes). 2. In ingredients list please add better support for non-english languages with more complicated grammar like Polish. We say: * 1 szklanka cukru / 1 cup of sugar * 2 szklanki cukru / 2 cups of sugar * 3 szklanki cukru / 3 cups of sugar * 4 szklanki cukru / 4 cups of sugar * 5 szklanek cukru / 5 cups of sugar * 6 szklanek cukru / 6 cups of sugar etc. * 1/2 szklanki cukru / 1/2 cup of sugar Antoher example: * 1 marchewka / 1 carrot * 2 marchewki / 2 carrots * 3 marchewki / 3 carrots * 4 marchewki / 4 carrots * 5 marchewek / 5 carrots * 6 marchewek / 6 carrots etc * 1/2 marchewki / 1/2 carrot So we have: * form for 1 * form for 2,3, 4 and fractions like 1/2 * form for 5 and more
+
+> I just submitted a survey, but forgot to mention this: dragging and dropping items to organize them within shopping lists is *extremely* clunky, especially if you use a trackpad or touchscreen. I often have to click on the box for moving the item at least 3 times before it actually lets me move it to where I want to. Then, it’s hard to get it to the right place if the list is long, because the screen doesn’t scroll in the way you’d want (it scrolls at a static rate but doesn’t stop scrolling once it’s started unless the item is dropped, causing the entire process to repeat).
+
+> I would love the ability to set a default order for how items with labels are ordered automatically when added. I organize my shopping lists by type (e.g., “Dinner List”) to make it easier when exporting items to the lists. But this means shopping for items can be tough, since I have to switch between lists. Being able to set it so that the “Vegetables” label automatically comes right before the “Grains” label would be amazing. I would also love a way to create or see a “parent” list that simply contains all of the unchecked items from all lists (as a stretch goal, it would be nice to be able to exclude lists) using the above ordering. Then I would no longer have to switch between lists.
+
+> I would like to disable all this not realy usefull stuff via env.
+
+> Mealie has done a great job. If you have to ask questions, I hope to support the<video>tag in the recipe steps instead of iframes, which will cause the video to play automatically.
+
+> I think live sync'ing the checkboxes on a shopping list would be cool, we often grocery shop together, and with Mealie, it's challenging for us to "share" a shopping list/both use it at the same time (having to constantly refresh the page, checkboxes not syncing, etc.). I haven't updated to v2+ yet, so maybe this is different/improved with Households!
+
+> Big Stretch... it would be awesome if there was a plugin architecture to support purchasing groceries from stores that have API's available i.e. Kroger in the US has a fully documented API to support the writing of a Kroger Shopping plugin to let you take everything that you need to shop for and one click "add it to my cart at Kroger" or even "buy these things and schedule them for delivery or pickup"
+
+> Integration of "Bring" would be great. Bring is a german shopping list app: https://www.getbring.com/
+
+> Introduce a "Pantry List" to keep track of spices, rice, flour and other non-perishables. Then add the option to subtract used amounts from Pantry List instead of having to cross them out from Shopping Lists generated from Meal Plans. Pantry List could also serve as foundation for a "Suggest a recipe" feature in meal planning, to suggest recipes based on items already contained on the Pantry List - e.g. Pantry: 3x cans of chopped tomatoes 500 g pasta Suggested recipes: Spaghetti Bolognese ...
+
+> Maybe space it out a little more on Mobile. I sometimes tap the wrong ingredients as they are close together.
+
+> Have the shopping be more instantly syncing. If I check off an item in the list. The app should reflect that a little quicker on my SOs phone. A second thing related to shopping is some way to keep track of expiring items like milk. Maybe have a place to enter the date of expiration in so when shopping you can easily see if you need to buy a new one. Also a small note about the new update 2.0. I don't really like the units in the shopping list now. I ignore them/remove them when adding to the shopping list from a recipe.
+
+> android app
+
+> It would be ideal if shopping lists would be accessible offline, i.e. without a connection to the Mealie server. Closing the PWA somtimes causes it to "un-load" the page and you aren't able to open it again offline. I understand that this is probably difficult to realize with just the PWA, so just keep up the great work you're doing with Mealie!
+
+> Sorry, I haven't tested it in a few months. I tried early implementations, and ended up switching to AnyList. I will revisit and provide feedback in discord. Off the top of my head, the reason why I switched to anylist was: - A way to add to the list with voice assistant - Grouping of ingredients into shopping aisle sections.
+
+> I have not been able to sort the items on the list. Firefox, android. When I move them, they move back after a couple of seconds.
+
+> The ability to mark certain items that are not linked to a recipe in such a way that they can easily be added again later with a single click. For pantry staples that you buy every couple of weeks e.g flour, milk, cereals it would be nice to not have to type them again every time.
+
+> Save ingredient labels when they are edited
+
+> As I'm still on v0.5.6 I haven't tried out new features so I'm not sure where this is at. The best case scenario would be to use a meal plan to select recipes, then build and aggregate the shopping list based on all ingredients. Structured ingredients is required for this so the shopping list includes units of each ingredient.
+
+> They are great! We have two lists: "This Week" and "Next Week". It works really well in PWA when in the grocery store.
+
+> Automatically split ingredients into sections; produce, canned, frozen etc. (if this already exists it not well documented)
+
+> An ability to add the shopping list items to another app (Apple Reminders, etc) would be nice
+
+> Make an integration with Grocy so Mealie can see what you have/do not have and plan accordingly.
+
+> Allow labels to have a custom order (so that I can order them in the order I shop in the supermarket)
+
+> Unifying ingredients automatically and then apply nutrition calculation derrived from a standartised database.
+
+> render list as text for copying from browsers which prevent clipboard interaction when serving over http option to copy as text without quantities
+
+> I have no need for online shopping lists. I prefer it on paper as I use my phone to scan and pay goods in the supermarket.
+
+> My version is a bit old, so maybe it has improved already, but an easy way to clear the list without having to delete and recreate a new list. Also, when adding items to the list, if there's only one list, just use it rather than having to select it.
+
+> I've honestly not used it at all because I don't need to. Because of that I cannot make a suggestion. Sorry.
+
+> Yes, it should be as close to Meal Lime as possible (the app). When you create a meal plan all recipes automatically by defualt add their ingredients to the shopping list. If you delete a recipe, it removes its ingredients from the list automatically. I suppose ideally this would be a toggle "Automatically sync shopping list with Meal Plan" or something...
+
+> allow a way to disable it hiding the option - we don't use it.
+
+> It's not as full features as grocy, which I use as my shopping app.
+
+> Source recipes are currently tracked on shopping lists before items are checked (marked complete). I often would like to know which recipe my completed shopping list items belonged to. Keeping the source recipe list in a separate list of completed recipes on the shopping list would be handy.
+
+> Quicker to add food instead of just notes
+
+> I currently use grocy for shopping lists because I can categorise all products so when I'm shopping it's easy to go aisle by aisle. There's also an app as well and using mobile browser is annoying. It would be handy to have shopping list in the same app as my recipes, but unless you could match the functionality of grocy then I won't be using it in Mealie.
+
+> Sync to Bring
+
+> The ability to manually re-order the shopping lists.
+
+> An integration with CalDAV so that the shopping list can sync with Apple Reminders.
+
+> It's UI/UX, cannot provide details in text field
+
+> Export as string so that you can paste into into a chat
+
+> By merging similar items, I think this happens in some cases (perhaps if something is close and the app is not sure it could check?), maybe suggestions for items you use regularly. Group items by type (e.g. veggies, baking, tinned goods). Group items by when you need them (e.g. do I need this today or next week).
+
+> Better grouping of ingredients added from recipes
+
+> Have the option to combine/not combine items. if I have lets say two receipes each needing 1KG of chicken wings, having the option to show it as 2KG, or 1KG shown twice but grouped perhaps with recipe next to it so when shopping the chicken wings which are all in one spot, can be purchased at once rather than jumping around
+
+> Grouping items by type of ingredient. I.E. Vegetables. Makes them easier to gather when in the shop.
+
+> I'd like to be able to export/ merge the lists to other apps, such as Google Keep, so I can use the Mealie feature alongside Google Assistant.
+
+> Integration of third party apps like bring. i think the shopping list is a really good feature, but there is almost always more to buy than groceries. so to us there happened two things (1) we wrote a written shopping list (default) (2) switched to bring app reason for bring: we use mealie hosted locally not accessable from the internet. beside avaiable vpn the mealie shopping list is to unconvient to reach
+
+> The ability to parse and merge ingredients from recipes. So say if I add two recipes to a list that both need garlic. One says two cloves and the other says 4 cloves. I don't want two separate entries in the list. Personally I don't really want the amounts in there.
+
+> None come to mind. Very handy as-implemented.
+
+> integration with flipp for best prices.
+
+> It would be cool to sync them with external services, like bring. I only Idee mealie for food related shopping but not for stuff like cleaning supplies. Using two apps while shopping is a bit cumbersome.
+
+> Make it so you can organize the list by store section (in addition to category).
+
+> Add price of ingredient, brand, store bought at
+
+> My main use is there is no good cross platform way to shop with my girlfriend while being able to split up. Mealie fixes this, we make a list and split up knowing checked items will update instantly, no reloading the page. I wish common foods were already included in the system Maybe keep an ingredient history so when I add lemons I can see "5 lemons were added in the last week".
+
+> When adding multiple recipes for the week, if they use the same ingredient, it would be nice if they combined.
+
+> sectioned by ingredient type (dairy, fruit, veg, etc) - maybe this happened in v2?
+
+> Sorting by ingredient name. There's recipes that require 1 carrot, another that requires 1 cup of carrots, it would be a lot easier to see what needs to be bought if all ingredients are grouped. Sure, for recipes we should have the same measuring unit, but it's not always easy when managing hundreds of recipes.
+
+> Integration with Google Home for adding to list
+
+> Better initial parsing of ingredients into discrete amounts/items (my partner never cleans up their recipes after importing, so they cannot take advantage of shopping list, scaling, etc.) Permission support to mark a list as shared between users or private. That way different users can add to the same shopping list if/when desired, but if cooking something as a surprise (birthday, etc.) they can add ingredients into a private list. To be clear, the biggest thing that can be done to improve shopping list is actually not to do with the lists themselves but with the ingredient parsing. If that can happen automatically and more reliably, both scaling and shopping lists benefit. Anything else is just an enhancement.
+
+> I don't really use it and would not find it usefull unless it would link to the android shopping list app I use (called Shopping List)
+
+> If there was an integration with Walmart+ I’d use it forever
+
+> Reordering of the items is not possible
+
+> At one point we accidentally removed all entries from our shopping list just by clicking on the trash icon. A confirmation dialog here would be very helpful, to avoid this.
+
+> Not really sure why but after some days the sessions logout in the phone using PWA although the checkbox remember me is marked when logging in
+
+> Make it work similar to the app AnyList (https://apps.apple.com/us/app/anylist-grocery-shopping-list/id522167641) or better for spouse/family approval factor. :) Thanks for the good work
+
+> Add a way to right click on a recipe ingredient and add to a shopping list.
+
+> it would be nice if it could be deactivated if you don't use it (in the settings)
+
+> The offline mode is not really working pre v2. I have not checked v2 yet though. To be honest, I never saw a good offline pwa yet. They always break apart after some time. I can imagine that an iOS / Android app will yield better results. In addition, we also use the apple watch app from our current shopping list app, that would also require an iOS app for mealie I think.
+
+> First thing would be the possibility to export it to google keep or some notes app, because my instance is not exposed to the internet, so when Im actually going to the store, I cant access the list. Therefore it would be nice to have some sync function to have it synced to some external notes app or to at least have a share button so I can send the list to my wife when she is at the store. Its not even possible to select the text and copypaste it. No other change I can think of right now
+
+> Adding recipes from the meal planner does always reliably add all the recipes as linked. Otherwise it'd be cool to have an option for the meal planner to automatically add 2 portions of all recipes
+
+> If there was an app or easy way to integrate into iOS notes/reminders, that would work really well for me.
+
+> Offer prompts to combine ingredients that are the same or are similar - like how contacts lists say "want to merge Sam Rockwell and Samuel Rockwell?" Prompt with "Want to add 1 onion with 1/2 cup onion, diced?" Then the result would be "1 onion and 1/2 cup onion, diced" in one line.
+
+> Make it easier to quickly type multiple entries (using enter to save, have a more natural order of entry fields). In that context also, include abbreviations of units as search hint.
+
+> Make shopping lists easier to navigate to on mobile PWA, such as allow the shopping list to be opened when the PWA is first launched, so that it opens automatically when I open mealie at the supermarket. Allow the user to move items from one shopping list to another. It looks like there is a "Transfer" function, but it does not work for me. Simplify the UI for adding items, or explain the concept of notes vs. foods better.
+
+> Make a print dialog, which removes everything from the page except the pure shopping list.
+
+> A fast way to open your default list
+
+> When I add an ingredient that is a duplicate of an ingredient that has already been checked off, I want to remove it from the checked off list. Right now, duplicates are only removed if both entries are in the unchecked shopping list.
+
+> merge same ingredient, different unit items into one line
+
+> Try to connect similar ingredients
+
+> I'm currently on it to obtain the shopping list via N8N in order to transfer it into Microsoft To Do App. Because the ToDo App is our central app to maintain all! shopping activities. Using Shopping List in Mealie would require to start swapping between two Apps/Lists. So, what to improve? Integration/Ingestion (automated) of Shopping Lists into other Services, e.g. Microsoft ToDo. 😉
+
+> Recently I have been getting a "browser does not support copying to the clipboard" error. It seems to happen from all my browsers thought the main one I use is Falkon.
+
+> It would be nice if it removed linked recipes once they passed from the meal plan. I love the copy button as text button which I use constantly.
+
+> This is my favorite feature. I imagine it would be very difficult to pull off in the code. But would be amazing if it could detect small changes in how ingredients are listed and pulled from recipe imports and consolidate them into the same phrase. (ie.. "1 small egg and 1 egg") so that it could combine the same ingredients for multiple recipes into one line (2 eggs) into the shopping list. It would be less manual editing to create the list. But possibly an easier suggestion to implement would be to automatically uncheck general use spices. I imagine we usually already have those so there is no need to manually uncheck from shopping list on adding a recipe.
+
+> When I make lists by hand I will often put the items in the order I go through the store, eg produce first. It would be nice if I could define a category sort order that would apply to all shopping lists by default.
+
+> If no list exists then create one automatically when I add ingredients from a meal plan I just put together. It is really not a big deal at all, but will save me a click or two.
+
+> Bull add feature similar to recipe ingredients
+
+> I'm always irritated when I click on a list item (with the intention of editing it) and it is directly marked as done. Then I rediscover the edit button on the right again. For me personally the checkbox is the call to action button for the user journey of checking off an item. I would also like to click and hold to drag an item instead of needing to grab the handle on the right.
+
+> dont use it till know, but maybe for the x-mas seasion for the backing
+
+> I want to easily export into my ios reminders app
+
+> I would like to be able to click on ingredients in a recipe, and say "Add to Shopping List" Right now, I believe it adds all of the ingredients, regardless of what's selected.
+
+> Some persistence that tracks checked off boxes across sessions if that is not a thing
+
+> Auto complete for checked off items to re-add without searching for it. Manual sorting of lists
+
+> Native Apps Offline usage for Apps Automatic Sorting into Categories
+
+> I don't use them enough right now. When adding items to a list, removing things in brackets , e.g., tbs garlic (cut) would be nice. WOuld be just tbs garlic. Or something nicer like that. And merging items in the list would be great too!
+
+> all good
+
+> Implement bring implementation (without mealie being exposed to the internet, see https://github.com/felixschndr/mealie-bring-api)
+
+> A recently checked option that displays any items checked in the last 30 minutes or so. Would be very useful in store to help reduce fat fingering. The current checked item list can be used that way but it isn't as timely so not always the best.
+
+> We use a google keep list for our shopping list because we can add items with our voice via google home. So either integrate it into keep or add it as a feature that google home can add directly to.
+
+> Make it easier to organize list order. We try to order it by aisles and in the phone it can be difficult to reorder them
+
+> Have them (or anything, really) be accessible across households, if desired. I.e., my SO and I live in different cities, thus use different households for the majority of the time. However, when we stay at the others place (which then usually is for minimum a week at a time), it would be useful to be able to share things like meal planner, shopping lists etc for that time, without some workaroung (like an additional user or moving my or their user to the other household for the time).
+
+> Not sure how to do them right, but the experience is very off for some reason (or rather the sum of many). We're still doing our weekly shopping planning in Todoist that holds 3 broad categories (2 different shops and one for meat). - Adding recipes to a list is not something we'd do. We usually have half the ingredients (or more) at hand already and just need a couple. - Jumping between lists is clumsy. When we add items to the list, we jump between out "categories" (which are held in different lists. It's hard to think of anything that is bought at shop A while remembering the items that come from Shop B. Having a back button in the UI doesn't work well for this workflow, a list of tabs in the top to jump between lists easily would be much better for this. - The shopping list is very unforgiving to mistakes. Deleted an item? To bad, it's gone. Any change to a list or an item needs to be reversible.
+
+> Maybe an integration with Bring or similar shopping list apps. I also buy things outside of recipes, that way I could combine them
+
+> Shopping Lists are not important to me. I use Mealie purely as recipe storage.
+
+> Better integration with Home Assistant
+
+> Ability to have a default ordering of categories for new lists
+
+> All of my recipes don't have ingredients parsed, so the shopping list is quite complicated to use. I write my shopping list manually in the nextcloud tasks app and use it with tasks.org on android. Also I recently started to use grocy to track my inventory, so I'm planning to write some script to combine the shopping lists and save it to the caldav server. Something with a simple drag'n'drop webinterface. I still like mealie for recipes way better than grocy :-)
+
+> No, its great i think
+
+> Make it quicket / faster to input ingredients overall - possible 'quick add', or add from home. Remember the default layouts and sorting of the list - label sort. Easy way to update labels on food from the shopping list - or link to unlabelled food
+
+> - adding nutritional tracker
+
+> Add Nice icons to catégories/foods Make it raster or an apk
+
+> Feature: Copy paste ingredients for to do app
+
+> Make them toggable. Not everyone uses them, and it's a UI element which could be removed if the user does not use it.
+
+> Sync it with Bring/Alexa would be very cool (I dont use shopping lists because I prefer Bring)
+
+> Yes, it would be great if it could combine the totals for all food items for all of the recipes added it to the shopping list. For example, if I add 2 recipes and the first needs 1 cup flour and the other needs 1/2 cup flour, it would be nice to have a single line of 1.5 cups flour. This would be especially helpful for planning Holiday meals. The second suggestion is less helpful, but being able to categorize the shopping list and then group the food items would also be nice (produce, dairy, meat, soups, etc.) to make it more efficient while shopping.
+
+> Make it more like buymeapie it is easier to use, esp. when modifying the list on my phone while shopping.
+
+> I only use it once a year at Thanksgiving when I'm making a lot of food. It seems fine.
+
+> Integration with other shopping list providers like Bring! (https://www.getbring.com/en/home) or others.
+
+[Back to the overview](overview.md) or [On to Question 10](q10.md)

docs/mkdocs.yml

@@ -48,6 +48,7 @@ markdown_extensions:
         - name: mermaid
           class: mermaid
           format: !!python/name:pymdownx.superfences.fence_code_format
+  - pymdownx.details
 extra_css:
   - assets/stylesheets/custom.css
 extra_javascript:
@@ -84,12 +85,13 @@ nav:
           - OpenID Connect: "documentation/getting-started/authentication/oidc-v2.md"
 
       - Community Guides:
+          - Bring API without internet exposure: "documentation/community-guide/bring-api.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"
           - iOS Shortcuts: "documentation/community-guide/ios.md"
           - Reverse Proxy (SWAG): "documentation/community-guide/swag.md"
-          - Home Assistant: "documentation/community-guide/home-assistant.md"
-          - Bulk Url Import: "documentation/community-guide/bulk-url-import.md"
-          - Import Bookmarklet: "documentation/community-guide/import-recipe-bookmarklet.md"
-          - Automate Backups with n8n: "documentation/community-guide/n8n-backup-automation.md"
 
   - API Reference: "api/redoc.md"
 
@@ -104,3 +106,7 @@ nav:
           - Migration Guide: "contributors/developers-guide/migration-guide.md"
       - Guides:
           - Improving Ingredient Parser: "contributors/guides/ingredient-parser.md"
+
+  - News:
+      - Surveys:
+          - October 2024: "news/surveys/2024-october/overview.md"

frontend/assets/css/main.css

@@ -48,3 +48,11 @@
 .v-card__title {
   word-break: normal !important;
 }
+
+.text-hide-overflow {
+  display: inline-block;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  max-width: 100%;
+}

frontend/components/Domain/Cookbook/CookbookEditor.vue

@@ -57,6 +57,11 @@ export default defineComponent({
         label: i18n.tc("tag.tags"),
         type: Organizer.Tag,
       },
+      {
+        name: "recipe_ingredient.food.id",
+        label: i18n.tc("recipe.ingredients"),
+        type: Organizer.Food,
+      },
       {
         name: "tools.id",
         label: i18n.tc("tool.tools"),

frontend/components/Domain/Cookbook/CookbookPage.vue

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

frontend/components/Domain/Household/GroupMealPlanRuleForm.vue

@@ -118,6 +118,11 @@ export default defineComponent({
         label: i18n.tc("tag.tags"),
         type: Organizer.Tag,
       },
+      {
+        name: "recipe_ingredient.food.id",
+        label: i18n.tc("recipe.ingredients"),
+        type: Organizer.Food,
+      },
       {
         name: "tools.id",
         label: i18n.tc("tool.tools"),

frontend/components/Domain/QueryFilterBuilder.vue

@@ -253,7 +253,7 @@
       </v-container>
     </v-card-text>
     <v-card-actions>
-      <v-container fluid class="d-flex justify-end pa-0">
+      <v-container fluid class="d-flex justify-end pa-0 mx-2">
         <v-checkbox
           v-model="showAdvanced"
           hide-details
@@ -431,6 +431,7 @@ export default defineComponent({
         state.qfValid = !!qf;
 
         context.emit("input", qf || undefined);
+        context.emit("inputJSON", qf ? buildQueryFilterJSON() : undefined);
       },
       {
         deep: true
@@ -543,6 +544,32 @@ export default defineComponent({
       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 attrs = computed(() => {
       const baseColMaxWidth = 55;

frontend/components/Domain/Recipe/RecipeActionMenu.vue

@@ -34,12 +34,6 @@
         </v-tooltip>
       </div>
 
-      <RecipeTimerMenu
-        fab
-        color="info"
-        class="ml-1"
-      />
-
       <RecipeContextMenu
         show-print
         :menu-top="false"
@@ -53,7 +47,6 @@
         :recipe-id="recipe.id"
         :recipe-scale="recipeScale"
         :use-items="{
-          delete: false,
           edit: false,
           download: loggedIn,
           duplicate: loggedIn,
@@ -63,6 +56,7 @@
           printPreferences: true,
           share: loggedIn,
           recipeActions: true,
+          delete: loggedIn,
         }"
         class="ml-1"
         @print="$emit('print')"
@@ -88,7 +82,6 @@
 import { defineComponent, ref, useContext } from "@nuxtjs/composition-api";
 import RecipeContextMenu from "./RecipeContextMenu.vue";
 import RecipeFavoriteBadge from "./RecipeFavoriteBadge.vue";
-import RecipeTimerMenu from "./RecipeTimerMenu.vue";
 import RecipeTimelineBadge from "./RecipeTimelineBadge.vue";
 import { Recipe } from "~/lib/api/types/recipe";
 
@@ -98,7 +91,7 @@ const CLOSE_EVENT = "close";
 const JSON_EVENT = "json";
 
 export default defineComponent({
-  components: { RecipeContextMenu, RecipeFavoriteBadge, RecipeTimerMenu, RecipeTimelineBadge },
+  components: { RecipeContextMenu, RecipeFavoriteBadge, RecipeTimelineBadge },
   props: {
     recipe: {
       required: true,

frontend/components/Domain/Recipe/RecipeCard.vue

@@ -7,7 +7,7 @@
         :elevation="hover ? 12 : 2"
         :to="recipeRoute"
         :min-height="imageHeight + 75"
-        @click="$emit('click')"
+        @click.self="$emit('click')"
       >
         <RecipeCardImage
           :icon-size="imageHeight"
@@ -39,7 +39,7 @@
 
             <RecipeRating class="pb-1" :value="rating" :recipe-id="recipeId" :slug="slug" :small="true" />
             <v-spacer></v-spacer>
-            <RecipeChips :truncate="true" :items="tags" :title="false" :limit="2" :small="true" url-prefix="tags" />
+            <RecipeChips :truncate="true" :items="tags" :title="false" :limit="2" :small="true" url-prefix="tags" v-on="$listeners" />
 
             <!-- If we're not logged-in, no items display, so we hide this menu -->
             <RecipeContextMenu

frontend/components/Domain/Recipe/RecipeCardMobile.vue

@@ -38,7 +38,7 @@
               <SafeMarkdown :source="description" />
             </v-list-item-subtitle>
             <div class="d-flex flex-wrap justify-start ma-0">
-              <RecipeChips :truncate="true" :items="tags" :title="false" :limit="2" :small="true" url-prefix="tags" />
+              <RecipeChips :truncate="true" :items="tags" :title="false" :limit="2" :small="true" url-prefix="tags" v-on="$listeners" />
             </div>
             <div class="d-flex flex-wrap justify-end align-center">
               <slot name="actions">

frontend/components/Domain/Recipe/RecipeCardSection.vue

@@ -82,6 +82,8 @@
                 :image="recipe.image"
                 :tags="recipe.tags"
                 :recipe-id="recipe.id"
+
+                 v-on="$listeners"
               />
             </v-lazy>
           </v-col>
@@ -105,6 +107,8 @@
                 :image="recipe.image"
                 :tags="recipe.tags"
                 :recipe-id="recipe.id"
+
+                v-on="$listeners"
               />
             </v-lazy>
           </v-col>
@@ -215,27 +219,34 @@ export default defineComponent({
     const router = useRouter();
 
     const queryFilter = computed(() => {
-      const orderBy = props.query?.orderBy || preferences.value.orderBy;
-      const orderByFilter = preferences.value.filterNull && orderBy ? `${orderBy} IS NOT NULL` : null;
+      return props.query.queryFilter || null;
 
-      if (props.query.queryFilter && orderByFilter) {
-        return `(${props.query.queryFilter}) AND ${orderByFilter}`;
-      } else if (props.query.queryFilter) {
-        return props.query.queryFilter;
-      } else {
-        return orderByFilter;
-      }
+      // 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,
-        props.query?.orderDirection || preferences.value.orderDirection,
+        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
+        queryFilter.value,
       );
     }
 
@@ -296,6 +307,7 @@ export default defineComponent({
       }, useAsyncKey());
     }, 500);
 
+
     function sortRecipes(sortType: string) {
       if (state.sortLoading || loading.value) {
         return;

frontend/components/Domain/Recipe/RecipeChips.vue

@@ -9,7 +9,8 @@
       color="accent"
       :small="small"
       dark
-      :to="`${baseRecipeRoute}?${urlPrefix}=${category.id}`"
+
+      @click.prevent="() => $emit('item-selected', category, urlPrefix)"
     >
       {{ truncateText(category.name) }}
     </v-chip>

frontend/components/Domain/Recipe/RecipeContextMenu.vue

@@ -51,8 +51,6 @@
             <v-text-field
               v-model="newMealdate"
               :label="$t('general.date')"
-              :hint="$t('recipe.date-format-hint')"
-              persistent-hint
               :prepend-icon="$globals.icons.calendar"
               v-bind="attrs"
               readonly
@@ -278,7 +276,7 @@ export default defineComponent({
       delete: {
         title: i18n.tc("general.delete"),
         icon: $globals.icons.delete,
-        color: "error",
+        color: undefined,
         event: "delete",
         isPublic: false,
       },
@@ -373,7 +371,7 @@ export default defineComponent({
     const groupRecipeActionsStore = useGroupRecipeActions();
 
     async function executeRecipeAction(action: GroupRecipeActionOut) {
-      const response = await groupRecipeActionsStore.execute(action, props.recipe);
+      const response = await groupRecipeActionsStore.execute(action, props.recipe, props.recipeScale);
 
       if (action.actionType === "post") {
         if (!response?.error) {
@@ -385,7 +383,10 @@ export default defineComponent({
     }
 
     async function deleteRecipe() {
-      await api.recipes.deleteOne(props.slug);
+      const { data } = await api.recipes.deleteOne(props.slug);
+      if (data?.slug) {
+        router.push(`/g/${groupSlug.value}`);
+      }
       context.emit("delete", props.slug);
     }
 

frontend/components/Domain/Recipe/RecipeDataTable.vue

@@ -23,13 +23,13 @@
       <a :href="`/g/${groupSlug}/r/${item.slug}`" style="color: inherit; text-decoration: inherit; " @click="$emit('click')">{{ item.name }}</a>
     </template>
     <template #item.tags="{ item }">
-      <RecipeChip small :items="item.tags" :is-category="false" url-prefix="tags" />
+      <RecipeChip small :items="item.tags" :is-category="false" url-prefix="tags" @item-selected="filterItems" />
     </template>
     <template #item.recipeCategory="{ item }">
-      <RecipeChip small :items="item.recipeCategory" />
+      <RecipeChip small :items="item.recipeCategory" @item-selected="filterItems" />
     </template>
     <template #item.tools="{ item }">
-      <RecipeChip small :items="item.tools" url-prefix="tools" />
+      <RecipeChip small :items="item.tools" url-prefix="tools" @item-selected="filterItems" />
     </template>
     <template #item.userId="{ item }">
       <v-list-item class="justify-start">
@@ -48,12 +48,13 @@
 </template>
 
 <script lang="ts">
-import { computed, defineComponent, onMounted, ref, useContext } from "@nuxtjs/composition-api";
+import { computed, defineComponent, onMounted, ref, useContext, useRouter } from "@nuxtjs/composition-api";
 import UserAvatar from "../User/UserAvatar.vue";
 import RecipeChip from "./RecipeChips.vue";
-import { Recipe } from "~/lib/api/types/recipe";
+import { Recipe, RecipeCategory, RecipeTool } from "~/lib/api/types/recipe";
 import { useUserApi } from "~/composables/api";
 import { UserSummary } from "~/lib/api/types/user";
+import { RecipeTag } from "~/lib/api/types/household";
 
 const INPUT_EVENT = "input";
 
@@ -63,6 +64,8 @@ interface ShowHeaders {
   tags: boolean;
   categories: boolean;
   tools: boolean;
+  recipeServings: boolean;
+  recipeYieldQuantity: boolean;
   recipeYield: boolean;
   dateAdded: boolean;
 }
@@ -93,6 +96,8 @@ export default defineComponent({
           owner: false,
           tags: true,
           categories: true,
+          recipeServings: true,
+          recipeYieldQuantity: true,
           recipeYield: true,
           dateAdded: true,
         };
@@ -102,7 +107,7 @@ export default defineComponent({
   setup(props, context) {
     const { $auth, i18n } = useContext();
     const groupSlug = $auth.user?.groupSlug;
-
+    const router = useRouter();
     function setValue(value: Recipe[]) {
       context.emit(INPUT_EVENT, value);
     }
@@ -127,8 +132,14 @@ export default defineComponent({
       if (props.showHeaders.tools) {
         hdrs.push({ text: i18n.t("tool.tools"), value: "tools" });
       }
+      if (props.showHeaders.recipeServings) {
+        hdrs.push({ text: i18n.t("recipe.servings"), value: "recipeServings" });
+      }
+      if (props.showHeaders.recipeYieldQuantity) {
+        hdrs.push({ text: i18n.t("recipe.yield"), value: "recipeYieldQuantity" });
+      }
       if (props.showHeaders.recipeYield) {
-        hdrs.push({ text: i18n.t("recipe.yield"), value: "recipeYield" });
+        hdrs.push({ text: i18n.t("recipe.yield-text"), value: "recipeYield" });
       }
       if (props.showHeaders.dateAdded) {
         hdrs.push({ text: i18n.t("general.date-added"), value: "dateAdded" });
@@ -157,6 +168,13 @@ export default defineComponent({
       }
     }
 
+    function filterItems(item: RecipeTag | RecipeCategory | RecipeTool, itemType: string) {
+      if (!groupSlug || !item.id) {
+        return;
+      }
+      router.push(`/g/${groupSlug}?${itemType}=${item.id}`);
+    }
+
     onMounted(() => {
       refreshMembers();
     });
@@ -176,6 +194,7 @@ export default defineComponent({
       formatDate,
       members,
       getMember,
+      filterItems,
     };
   },
 

frontend/components/Domain/Recipe/RecipeDialogAddToShoppingList.vue

@@ -1,6 +1,11 @@
 <template>
   <div v-if="dialog">
     <BaseDialog v-if="shoppingListDialog && ready" v-model="dialog" :title="$t('recipe.add-to-list')" :icon="$globals.icons.cartCheck">
+    <v-container v-if="!shoppingListChoices.length">
+      <BasePageTitle>
+        <template #title>{{ $t('shopping-list.no-shopping-lists-found') }}</template>
+      </BasePageTitle>
+    </v-container>
       <v-card-text>
         <v-card
           v-for="list in shoppingListChoices"
@@ -199,6 +204,10 @@ export default defineComponent({
       shoppingListShowAllToggled: false,
     });
 
+    const userHousehold = computed(() => {
+      return $auth.user?.householdSlug || "";
+    });
+
     const shoppingListChoices = computed(() => {
       return props.shoppingLists.filter((list) => preferences.value.viewAllLists || list.userId === $auth.user?.id);
     });
@@ -243,8 +252,9 @@ export default defineComponent({
         }
 
         const shoppingListIngredients: ShoppingListIngredient[] = recipe.recipeIngredient.map((ing) => {
+          const householdsWithFood = (ing.food?.householdsWithIngredientFood || []);
           return {
-            checked: !ing.food?.onHand,
+            checked: !householdsWithFood.includes(userHousehold.value),
             ingredient: ing,
             disableAmount: recipe.settings?.disableAmount || false,
           }
@@ -271,7 +281,8 @@ export default defineComponent({
           }
 
           // Store the on-hand ingredients for later
-          if (ing.ingredient.food?.onHand) {
+          const householdsWithFood = (ing.ingredient.food?.householdsWithIngredientFood || []);
+          if (householdsWithFood.includes(userHousehold.value)) {
             onHandIngs.push(ing);
             return sections;
           }

frontend/components/Domain/Recipe/RecipeExplorerPage.vue

@@ -138,6 +138,7 @@
         :title="$tc('general.recipes')"
         :recipes="recipes"
         :query="passedQueryWithSeed"
+        @item-selected="filterItems"
         @replaceRecipes="replaceRecipes"
         @appendRecipes="appendRecipes"
       />
@@ -387,6 +388,19 @@ export default defineComponent({
       }
     )
 
+    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.query;
       if (query.auto?.length) {
@@ -592,6 +606,8 @@ export default defineComponent({
       removeRecipe,
       replaceRecipes,
       passedQueryWithSeed,
+
+      filterItems,
     };
   },
   head: {},

frontend/components/Domain/Recipe/RecipeIngredients.vue

@@ -1,14 +1,16 @@
 <template>
   <div v-if="value && value.length > 0">
-    <div class="d-flex justify-start">
+    <div v-if="!isCookMode" class="d-flex justify-start" >
       <h2 class="mb-2 mt-1">{{ $t("recipe.ingredients") }}</h2>
       <AppButtonCopy btn-class="ml-auto" :copy-text="ingredientCopyText" />
     </div>
     <div>
       <div v-for="(ingredient, index) in value" :key="'ingredient' + index">
-        <h3 v-if="showTitleEditor[index]" class="mt-2">{{ ingredient.title }}</h3>
-        <v-divider v-if="showTitleEditor[index]"></v-divider>
-        <v-list-item dense @click="toggleChecked(index)">
+        <template v-if="!isCookMode">
+          <h3 v-if="showTitleEditor[index]" class="mt-2">{{ ingredient.title }}</h3>
+          <v-divider v-if="showTitleEditor[index]"></v-divider>
+        </template>
+        <v-list-item dense @click.stop="toggleChecked(index)">
           <v-checkbox hide-details :value="checked[index]" class="pt-0 my-auto py-auto" color="secondary" />
           <v-list-item-content :key="ingredient.quantity">
             <RecipeIngredientListItem :ingredient="ingredient" :disable-amount="disableAmount" :scale="scale" />
@@ -40,6 +42,10 @@ export default defineComponent({
       type: Number,
       default: 1,
     },
+    isCookMode: {
+      type: Boolean,
+      default: false,
+    }
   },
   setup(props) {
     function validateTitle(title?: string) {

frontend/components/Domain/Recipe/RecipeLastMade.vue

@@ -86,12 +86,6 @@
       </BaseDialog>
     </div>
     <div>
-      <div class="d-flex justify-center flex-wrap">
-        <BaseButton :small="$vuetify.breakpoint.smAndDown" @click="madeThisDialog = true">
-          <template #icon> {{ $globals.icons.chefHat }} </template>
-          {{ $t('recipe.made-this') }}
-        </BaseButton>
-      </div>
       <div class="d-flex justify-center flex-wrap">
         <v-chip
           label
@@ -102,15 +96,26 @@
           <v-icon left>
             {{ $globals.icons.calendar }}
           </v-icon>
-            {{ $t('recipe.last-made-date', { date: value ? new Date(value).toLocaleDateString($i18n.locale) : $t("general.never") } ) }}
+            <div v-if="lastMadeReady">
+              {{ $t('recipe.last-made-date', { date: lastMade ? new Date(lastMade).toLocaleDateString($i18n.locale) : $t("general.never") } ) }}
+            </div>
+            <div v-else>
+              <AppLoader tiny />
+            </div>
         </v-chip>
       </div>
+      <div class="d-flex justify-center flex-wrap mt-1">
+        <BaseButton :small="$vuetify.breakpoint.smAndDown" @click="madeThisDialog = true">
+          <template #icon> {{ $globals.icons.chefHat }} </template>
+          {{ $t('recipe.made-this') }}
+        </BaseButton>
+      </div>
     </div>
   </div>
 </template>
 
 <script lang="ts">
-import { computed, defineComponent, reactive, ref, toRefs, useContext } from "@nuxtjs/composition-api";
+import { computed, defineComponent, onMounted, reactive, ref, toRefs, useContext } from "@nuxtjs/composition-api";
 import { whenever } from "@vueuse/core";
 import { VForm } from "~/types/vuetify";
 import { useUserApi } from "~/composables/api";
@@ -119,13 +124,9 @@ import { Recipe, RecipeTimelineEventIn } from "~/lib/api/types/recipe";
 
 export default defineComponent({
   props: {
-    value: {
-      type: String,
-      default: null,
-    },
     recipe: {
       type: Object as () => Recipe,
-      default: null,
+      required: true,
     },
   },
   setup(props, context) {
@@ -146,6 +147,20 @@ export default defineComponent({
     const newTimelineEventImagePreviewUrl = ref<string>();
     const newTimelineEventTimestamp = ref<string>();
 
+    const lastMade = ref(props.recipe.lastMade);
+    const lastMadeReady = ref(false);
+    onMounted(async () => {
+      if (!$auth.user?.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,
       () => {
@@ -195,11 +210,9 @@ export default defineComponent({
       const newEvent = eventResponse.data;
 
       // we also update the recipe's last made value
-      if (!props.value || newTimelineEvent.value.timestamp > props.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 recipe in parent so the user can see it
-        context.emit("input", newTimelineEvent.value.timestamp);
       }
 
       // update the image, if provided
@@ -234,6 +247,8 @@ export default defineComponent({
       newTimelineEventImage,
       newTimelineEventImagePreviewUrl,
       newTimelineEventTimestamp,
+      lastMade,
+      lastMadeReady,
       createTimelineEvent,
       clearImage,
       uploadImage,

frontend/components/Domain/Recipe/RecipePage/RecipePage.vue

@@ -1,75 +1,136 @@
 <template>
-  <v-container :class="{ 'pa-0': $vuetify.breakpoint.smAndDown }">
-    <v-card :flat="$vuetify.breakpoint.smAndDown" class="d-print-none">
-      <RecipePageHeader
+  <div>
+    <v-container v-show="!isCookMode" key="recipe-page" :class="{ 'pa-0': $vuetify.breakpoint.smAndDown }">
+      <v-card :flat="$vuetify.breakpoint.smAndDown" class="d-print-none">
+        <RecipePageHeader
+          :recipe="recipe"
+          :recipe-scale="scale"
+          :landscape="landscape"
+          @save="saveRecipe"
+          @delete="deleteRecipe"
+        />
+        <LazyRecipeJsonEditor v-if="isEditJSON" v-model="recipe" class="mt-10" :options="EDITOR_OPTIONS" />
+        <v-card-text v-else>
+          <!--
+            This is where most of the main content is rendered. Some components include state for both Edit and View modes
+            which is why some have explicit v-if statements and others use the composition API to determine and manage
+            the shared state internally.
+
+            The global recipe object is shared down the tree of components and _is_ mutated by child components. This is
+            some-what of a hack of the system and goes against the principles of Vue, but it _does_ seem to work and streamline
+            a significant amount of prop management. When we move to Vue 3 and have access to some of the newer API's the plan to update this
+            data management and mutation system we're using.
+          -->
+          <RecipePageInfoEditor v-if="isEditMode" :recipe="recipe" :landscape="landscape" />
+          <RecipePageEditorToolbar v-if="isEditForm" :recipe="recipe" />
+          <RecipePageIngredientEditor v-if="isEditForm" :recipe="recipe" />
+          <RecipePageScale :recipe="recipe" :scale.sync="scale" />
+
+          <!--
+            This section contains the 2 column layout for the recipe steps and other content.
+          -->
+          <v-row>
+            <!--
+              The left column is conditionally rendered based on cook mode.
+            -->
+            <v-col v-if="!isCookMode || isEditForm" cols="12" sm="12" md="4" lg="4">
+              <RecipePageIngredientToolsView v-if="!isEditForm" :recipe="recipe" :scale="scale" />
+              <RecipePageOrganizers v-if="$vuetify.breakpoint.mdAndUp" :recipe="recipe" @item-selected="chipClicked" />
+            </v-col>
+            <v-divider v-if="$vuetify.breakpoint.mdAndUp && !isCookMode" class="my-divider" :vertical="true" />
+
+            <!--
+              the right column is always rendered, but it's layout width is determined by where the left column is
+              rendered.
+            -->
+            <v-col cols="12" sm="12" :md="8 + (isCookMode ? 1 : 0) * 4" :lg="8 + (isCookMode ? 1 : 0) * 4">
+              <RecipePageInstructions
+                v-model="recipe.recipeInstructions"
+                :assets.sync="recipe.assets"
+                :recipe="recipe"
+                :scale="scale"
+              />
+              <div v-if="isEditForm" class="d-flex">
+                <RecipeDialogBulkAdd class="ml-auto my-2 mr-1" @bulk-data="addStep" />
+                <BaseButton class="my-2" @click="addStep()"> {{ $t("general.add") }}</BaseButton>
+              </div>
+              <div v-if="!$vuetify.breakpoint.mdAndUp">
+                <RecipePageOrganizers :recipe="recipe" />
+              </div>
+              <RecipeNotes v-model="recipe.notes" :edit="isEditForm" />
+            </v-col>
+          </v-row>
+          <RecipePageFooter :recipe="recipe" />
+        </v-card-text>
+      </v-card>
+      <WakelockSwitch/>
+      <RecipePageComments
+        v-if="!recipe.settings.disableComments && !isEditForm && !isCookMode"
         :recipe="recipe"
-        :recipe-scale="scale"
-        :landscape="landscape"
-        @save="saveRecipe"
-        @delete="deleteRecipe"
+        class="px-1 my-4 d-print-none"
       />
-      <LazyRecipeJsonEditor v-if="isEditJSON" v-model="recipe" class="mt-10" :options="EDITOR_OPTIONS" />
-      <v-card-text v-else>
-        <!--
-          This is where most of the main content is rendered. Some components include state for both Edit and View modes
-          which is why some have explicit v-if statements and others use the composition API to determine and manage
-          the shared state internally.
+      <RecipePrintContainer :recipe="recipe" :scale="scale" />
+    </v-container>
+    <!-- Cook mode displayes two columns with ingredients and instructions side by side, each being scrolled individually, allowing to view both at the same timer -->
+    <v-sheet v-show="isCookMode && !hasLinkedIngredients" key="cookmode" :style="{height: $vuetify.breakpoint.smAndUp ? 'calc(100vh - 48px)' : ''}"> <!-- the calc is to account for the toolbar a more dynamic solution could be needed  -->
+      <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 :recipe="recipe" :scale.sync="scale" />
+          </div>
+          <RecipePageIngredientToolsView v-if="!isEditForm" :recipe="recipe" :scale="scale" :is-cook-mode="isCookMode" />
+          <v-divider></v-divider>
+        </v-col>
+        <v-col class="overflow-y-auto py-2" style="height: 100%;" cols="12" sm="7">
+          <RecipePageInstructions
+            v-model="recipe.recipeInstructions"
+            class="overflow-y-hidden px-4"
+            :assets.sync="recipe.assets"
+            :recipe="recipe"
+            :scale="scale"
+          />
+        </v-col>
+      </v-row>
 
-          The global recipe object is shared down the tree of components and _is_ mutated by child components. This is
-          some-what of a hack of the system and goes against the principles of Vue, but it _does_ seem to work and streamline
-          a significant amount of prop management. When we move to Vue 3 and have access to some of the newer API's the plan to update this
-          data management and mutation system we're using.
-         -->
-        <RecipePageEditorToolbar v-if="isEditForm" :recipe="recipe" />
-        <RecipePageTitleContent :recipe="recipe" :landscape="landscape" />
-        <RecipePageIngredientEditor v-if="isEditForm" :recipe="recipe" />
-        <RecipePageScale :recipe="recipe" :scale.sync="scale" :landscape="landscape" />
+    </v-sheet>
+    <v-sheet v-show="isCookMode && hasLinkedIngredients">
+      <div class="mt-2 px-2 px-md-4">
+        <RecipePageScale :recipe="recipe" :scale.sync="scale"/>
+      </div>
+      <RecipePageInstructions
+        v-model="recipe.recipeInstructions"
+        class="overflow-y-hidden mt-n5 px-2 px-md-4"
+        :assets.sync="recipe.assets"
+        :recipe="recipe"
+        :scale="scale"
+      />
 
-        <!--
-          This section contains the 2 column layout for the recipe steps and other content.
-         -->
-        <v-row>
-          <!--
-            The left column is conditionally rendered based on cook mode.
-           -->
-          <v-col v-if="!isCookMode || isEditForm" cols="12" sm="12" md="4" lg="4">
-            <RecipePageIngredientToolsView v-if="!isEditForm" :recipe="recipe" :scale="scale" />
-            <RecipePageOrganizers v-if="$vuetify.breakpoint.mdAndUp" :recipe="recipe" />
-          </v-col>
-          <v-divider v-if="$vuetify.breakpoint.mdAndUp && !isCookMode" class="my-divider" :vertical="true" />
-
-          <!--
-            the right column is always rendered, but it's layout width is determined by where the left column is
-            rendered.
-           -->
-          <v-col cols="12" sm="12" :md="8 + (isCookMode ? 1 : 0) * 4" :lg="8 + (isCookMode ? 1 : 0) * 4">
-            <RecipePageInstructions
-              v-model="recipe.recipeInstructions"
-              :assets.sync="recipe.assets"
-              :recipe="recipe"
+      <div v-if="notLinkedIngredients.length > 0" class="px-2 px-md-4 pb-4 ">
+        <v-divider></v-divider>
+        <v-card flat>
+          <v-card-title>{{ $t('recipe.not-linked-ingredients') }}</v-card-title>
+            <RecipeIngredients
+              :value="notLinkedIngredients"
               :scale="scale"
-            />
-            <div v-if="isEditForm" class="d-flex">
-              <RecipeDialogBulkAdd class="ml-auto my-2 mr-1" @bulk-data="addStep" />
-              <BaseButton class="my-2" @click="addStep()"> {{ $t("general.add") }}</BaseButton>
-            </div>
-            <div v-if="!$vuetify.breakpoint.mdAndUp">
-              <RecipePageOrganizers :recipe="recipe" />
-            </div>
-            <RecipeNotes v-model="recipe.notes" :edit="isEditForm" />
-          </v-col>
-        </v-row>
-        <RecipePageFooter :recipe="recipe" />
-      </v-card-text>
-    </v-card>
-    <WakelockSwitch/>
-    <RecipePageComments
-      v-if="!recipe.settings.disableComments && !isEditForm && !isCookMode"
-      :recipe="recipe"
-      class="px-1 my-4 d-print-none"
-    />
-    <RecipePrintContainer :recipe="recipe" :scale="scale" />
-  </v-container>
+              :disable-amount="recipe.settings.disableAmount"
+              :is-cook-mode="isCookMode">
+
+            </RecipeIngredients>
+        </v-card>
+      </div>
+    </v-sheet>
+    <v-btn
+      v-if="isCookMode"
+      fab
+      small
+      color="primary"
+      style="position: fixed; right: 12px; top: 60px;"
+      @click="toggleCookMode()"
+      >
+      <v-icon>mdi-close</v-icon>
+    </v-btn>
+  </div>
+
 </template>
 
 <script lang="ts">
@@ -84,6 +145,7 @@ import {
 useRoute,
 } from "@nuxtjs/composition-api";
 import { invoke, until } from "@vueuse/core";
+import RecipeIngredients from "../RecipeIngredients.vue";
 import RecipePageEditorToolbar from "./RecipePageParts/RecipePageEditorToolbar.vue";
 import RecipePageFooter from "./RecipePageParts/RecipePageFooter.vue";
 import RecipePageHeader from "./RecipePageParts/RecipePageHeader.vue";
@@ -92,13 +154,19 @@ import RecipePageIngredientToolsView from "./RecipePageParts/RecipePageIngredien
 import RecipePageInstructions from "./RecipePageParts/RecipePageInstructions.vue";
 import RecipePageOrganizers from "./RecipePageParts/RecipePageOrganizers.vue";
 import RecipePageScale from "./RecipePageParts/RecipePageScale.vue";
-import RecipePageTitleContent from "./RecipePageParts/RecipePageTitleContent.vue";
+import RecipePageInfoEditor from "./RecipePageParts/RecipePageInfoEditor.vue";
 import RecipePageComments from "./RecipePageParts/RecipePageComments.vue";
 import { useLoggedInState } from "~/composables/use-logged-in-state";
 import RecipePrintContainer from "~/components/Domain/Recipe/RecipePrintContainer.vue";
-import { EditorMode, PageMode, usePageState, usePageUser } from "~/composables/recipe-page/shared-state";
+import {
+  clearPageState,
+  EditorMode,
+  PageMode,
+  usePageState,
+  usePageUser,
+} from "~/composables/recipe-page/shared-state";
 import { NoUndefinedField } from "~/lib/api/types/non-generated";
-import { Recipe } from "~/lib/api/types/recipe";
+import { 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";
@@ -117,7 +185,7 @@ export default defineComponent({
     RecipePageHeader,
     RecipePrintContainer,
     RecipePageComments,
-    RecipePageTitleContent,
+    RecipePageInfoEditor,
     RecipePageEditorToolbar,
     RecipePageIngredientEditor,
     RecipePageOrganizers,
@@ -127,6 +195,7 @@ export default defineComponent({
     RecipeNotes,
     RecipePageInstructions,
     RecipePageFooter,
+    RecipeIngredients,
   },
   props: {
     recipe: {
@@ -145,6 +214,11 @@ export default defineComponent({
     const { pageMode, editMode, setMode, isEditForm, isEditJSON, isCookMode, isEditMode, toggleCookMode } =
       usePageState(props.recipe.slug);
     const { deactivateNavigationWarning } = useNavigationWarning();
+    const notLinkedIngredients = computed(() => {
+      return props.recipe.recipeIngredient.filter((ingredient) => {
+        return !props.recipe.recipeInstructions.some((step) => step.ingredientReferences?.map((ref) => ref.referenceId).includes(ingredient.referenceId));
+      })
+    })
 
     /** =============================================================
      * Recipe Snapshot on Mount
@@ -170,8 +244,14 @@ export default defineComponent({
         }
       }
       deactivateNavigationWarning();
-    });
+      toggleCookMode()
 
+      clearPageState(props.recipe.slug || "");
+      console.debug("reset RecipePage state during unmount");
+    });
+    const hasLinkedIngredients = computed(() => {
+      return props.recipe.recipeInstructions.some((step) => step.ingredientReferences && step.ingredientReferences.length > 0);
+    })
     /** =============================================================
      * Set State onMounted
      */
@@ -249,6 +329,17 @@ export default defineComponent({
      */
     const { user } = usePageUser();
 
+    /** =============================================================
+     * RecipeChip Clicked
+     */
+
+    function chipClicked(item: RecipeTag | RecipeCategory | RecipeTool, itemType: string) {
+      if (!item.id) {
+        return;
+      }
+      router.push(`/g/${groupSlug.value}?${itemType}=${item.id}`);
+    }
+
     return {
       user,
       isOwnGroup,
@@ -269,6 +360,9 @@ export default defineComponent({
       saveRecipe,
       deleteRecipe,
       addStep,
+      hasLinkedIngredients,
+      notLinkedIngredients,
+      chipClicked,
     };
   },
   head: {},

frontend/components/Domain/Recipe/RecipePage/RecipePageParts/RecipePageComments.vue

@@ -34,7 +34,7 @@
       <UserAvatar :tooltip="false" size="40" :user-id="comment.userId" />
       <v-card outlined class="flex-grow-1">
         <v-card-text class="pa-3 pb-0">
-          <p class="">{{ comment.user.username }} • {{ $d(Date.parse(comment.createdAt), "medium") }}</p>
+          <p class="">{{ comment.user.fullName }} • {{ $d(Date.parse(comment.createdAt), "medium") }}</p>
           <SafeMarkdown :source="comment.text" />
         </v-card-text>
         <v-card-actions class="justify-end mt-0 pt-0">

frontend/components/Domain/Recipe/RecipePage/RecipePageParts/RecipePageEditorToolbar.vue

@@ -32,8 +32,8 @@
 </template>
 
 <script lang="ts">
-import { computed, defineComponent, onUnmounted } from "@nuxtjs/composition-api";
-import { clearPageState, usePageState, usePageUser } from "~/composables/recipe-page/shared-state";
+import { computed, defineComponent } from "@nuxtjs/composition-api";
+import { usePageState, usePageUser } from "~/composables/recipe-page/shared-state";
 import { NoUndefinedField } from "~/lib/api/types/non-generated";
 import { Recipe } from "~/lib/api/types/recipe";
 import { useUserApi } from "~/composables/api";
@@ -75,10 +75,6 @@ export default defineComponent({
       return households.value.find((h) => h.id === owner.householdId);
     });
 
-    onUnmounted(() => {
-      clearPageState(props.recipe.slug);
-      console.debug("reset RecipePage state during unmount");
-    });
     async function uploadImage(fileObject: File) {
       if (!props.recipe || !props.recipe.slug) {
         return;

frontend/components/Domain/Recipe/RecipePage/RecipePageParts/RecipePageHeader.vue

@@ -1,46 +1,7 @@
 <template>
   <div>
-    <div class="d-flex justify-end flex-wrap align-stretch">
-      <v-card v-if="!landscape" width="50%" flat class="d-flex flex-column justify-center align-center">
-        <v-card-text>
-          <v-card-title class="headline pa-0 flex-column align-center">
-            {{ recipe.name }}
-            <RecipeRating :key="recipe.slug" :value="recipe.rating" :recipe-id="recipe.id" :slug="recipe.slug" />
-          </v-card-title>
-          <v-divider class="my-2"></v-divider>
-          <SafeMarkdown :source="recipe.description" />
-          <v-divider></v-divider>
-          <div v-if="isOwnGroup" class="d-flex justify-center mt-5">
-            <RecipeLastMade
-              v-model="recipe.lastMade"
-              :recipe="recipe"
-              class="d-flex justify-center flex-wrap"
-              :class="true ? undefined : 'force-bottom'"
-            />
-          </div>
-          <div class="d-flex justify-center mt-5">
-            <RecipeTimeCard
-              class="d-flex justify-center flex-wrap"
-              :class="true ? undefined : 'force-bottom'"
-              :prep-time="recipe.prepTime"
-              :total-time="recipe.totalTime"
-              :perform-time="recipe.performTime"
-            />
-          </div>
-        </v-card-text>
-      </v-card>
-      <v-img
-        :key="imageKey"
-        :max-width="landscape ? null : '50%'"
-        min-height="50"
-        :height="hideImage ? undefined : imageHeight"
-        :src="recipeImageUrl"
-        class="d-print-none"
-        @error="hideImage = true"
-      >
-      </v-img>
-    </div>
-    <v-divider></v-divider>
+    <RecipePageInfoCard :recipe="recipe" :recipe-scale="recipeScale" :landscape="landscape" />
+    <v-divider />
     <RecipeActionMenu
       :recipe="recipe"
       :slug="recipe.slug"
@@ -50,7 +11,7 @@
       :logged-in="isOwnGroup"
       :open="isEditMode"
       :recipe-id="recipe.id"
-      class="ml-auto mt-n8 pb-4"
+      class="ml-auto mt-n2 pb-4"
       @close="setMode(PageMode.VIEW)"
       @json="toggleEditMode()"
       @edit="setMode(PageMode.EDIT)"
@@ -65,10 +26,8 @@
 import { defineComponent, useContext, computed, ref, watch } from "@nuxtjs/composition-api";
 import { useLoggedInState } from "~/composables/use-logged-in-state";
 import { useRecipePermissions } from "~/composables/recipes";
-import RecipeRating from "~/components/Domain/Recipe/RecipeRating.vue";
-import RecipeLastMade from "~/components/Domain/Recipe/RecipeLastMade.vue";
+import RecipePageInfoCard from "~/components/Domain/Recipe/RecipePage/RecipePageParts/RecipePageInfoCard.vue";
 import RecipeActionMenu from "~/components/Domain/Recipe/RecipeActionMenu.vue";
-import RecipeTimeCard from "~/components/Domain/Recipe/RecipeTimeCard.vue";
 import { useStaticRoutes, useUserApi  } from "~/composables/api";
 import { HouseholdSummary } from "~/lib/api/types/household";
 import { Recipe } from "~/lib/api/types/recipe";
@@ -76,10 +35,8 @@ import { NoUndefinedField } from "~/lib/api/types/non-generated";
 import { usePageState, usePageUser, PageMode, EditorMode } from "~/composables/recipe-page/shared-state";
 export default defineComponent({
   components: {
-    RecipeTimeCard,
+    RecipePageInfoCard,
     RecipeActionMenu,
-    RecipeRating,
-    RecipeLastMade,
   },
   props: {
     recipe: {

frontend/components/Domain/Recipe/RecipePage/RecipePageParts/RecipePageInfoCard.vue

@@ -0,0 +1,100 @@
+<template>
+  <div>
+    <div class="d-flex justify-end flex-wrap align-stretch">
+      <RecipePageInfoCardImage v-if="landscape" :recipe="recipe" />
+      <v-card
+        :width="landscape ? '100%' : '50%'"
+        flat
+        class="d-flex flex-column justify-center align-center"
+      >
+        <v-card-text>
+          <v-card-title class="headline pa-0 flex-column align-center">
+            {{ recipe.name }}
+            <RecipeRating :key="recipe.slug" :value="recipe.rating" :recipe-id="recipe.id" :slug="recipe.slug" />
+          </v-card-title>
+          <v-divider class="my-2" />
+          <SafeMarkdown :source="recipe.description" />
+          <v-divider />
+          <v-container class="d-flex flex-row flex-wrap justify-center align-center">
+            <div class="mx-5">
+              <v-row no-gutters class="mb-1">
+                <v-col v-if="recipe.recipeYieldQuantity || recipe.recipeYield" cols="12" class="d-flex flex-wrap justify-center">
+                  <RecipeYield
+                    :yield-quantity="recipe.recipeYieldQuantity"
+                    :yield="recipe.recipeYield"
+                    :scale="recipeScale"
+                  />
+                </v-col>
+              </v-row>
+              <v-row no-gutters>
+                <v-col cols="12" class="d-flex flex-wrap justify-center">
+                  <RecipeLastMade
+                    v-if="isOwnGroup"
+                    :recipe="recipe"
+                    :class="true ? undefined : 'force-bottom'"
+                  />
+                </v-col>
+              </v-row>
+            </div>
+            <div class="mx-5">
+              <RecipeTimeCard
+                stacked
+                container-class="d-flex flex-wrap justify-center"
+                :prep-time="recipe.prepTime"
+                :total-time="recipe.totalTime"
+                :perform-time="recipe.performTime"
+              />
+            </div>
+          </v-container>
+        </v-card-text>
+      </v-card>
+      <RecipePageInfoCardImage v-if="!landscape" :recipe="recipe" max-width="50%" class="my-auto" />
+    </div>
+  </div>
+</template>
+
+<script lang="ts">
+import { computed, defineComponent, useContext } from "@nuxtjs/composition-api";
+import { useLoggedInState } from "~/composables/use-logged-in-state";
+import RecipeRating from "~/components/Domain/Recipe/RecipeRating.vue";
+import RecipeLastMade from "~/components/Domain/Recipe/RecipeLastMade.vue";
+import RecipeTimeCard from "~/components/Domain/Recipe/RecipeTimeCard.vue";
+import RecipeYield from "~/components/Domain/Recipe/RecipeYield.vue";
+import RecipePageInfoCardImage from "~/components/Domain/Recipe/RecipePage/RecipePageParts/RecipePageInfoCardImage.vue";
+import { Recipe } from "~/lib/api/types/recipe";
+import { NoUndefinedField } from "~/lib/api/types/non-generated";
+export default defineComponent({
+  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 { $vuetify } = useContext();
+    const useMobile = computed(() => $vuetify.breakpoint.smAndDown);
+
+    const { isOwnGroup } = useLoggedInState();
+
+    return {
+      isOwnGroup,
+      useMobile,
+    };
+  }
+});
+</script>

frontend/components/Domain/Recipe/RecipePage/RecipePageParts/RecipePageInfoCardImage.vue

@@ -0,0 +1,69 @@
+<template>
+  <v-img
+    :key="imageKey"
+    :max-width="maxWidth"
+    min-height="50"
+    :height="hideImage ? undefined : imageHeight"
+    :src="recipeImageUrl"
+    class="d-print-none"
+    @error="hideImage = true"
+  />
+</template>
+
+<script lang="ts">
+import { computed, defineComponent, ref, useContext, watch } from "@nuxtjs/composition-api";
+import { useStaticRoutes, useUserApi  } from "~/composables/api";
+import { HouseholdSummary } from "~/lib/api/types/household";
+import { usePageState, usePageUser } from "~/composables/recipe-page/shared-state";
+import { Recipe } from "~/lib/api/types/recipe";
+import { NoUndefinedField } from "~/lib/api/types/non-generated";
+export default defineComponent({
+  props: {
+    recipe: {
+      type: Object as () => NoUndefinedField<Recipe>,
+      required: true,
+    },
+    maxWidth: {
+      type: String,
+      default: undefined,
+    },
+  },
+  setup(props) {
+    const { $vuetify } = useContext();
+    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.breakpoint.xs ? "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>

frontend/components/Domain/Recipe/RecipePage/RecipePageParts/RecipePageInfoEditor.vue

@@ -0,0 +1,107 @@
+<template>
+  <div>
+    <v-text-field
+      v-model="recipe.name"
+      class="my-3"
+      :label="$t('recipe.recipe-name')"
+      :rules="[validators.required]"
+    />
+    <v-container class="ma-0 pa-0">
+      <v-row>
+        <v-col cols="3">
+          <v-text-field
+            v-model="recipeServings"
+            type="number"
+            :min="0"
+            hide-spin-buttons
+            dense
+            :label="$t('recipe.servings')"
+            @input="validateInput($event, 'recipeServings')"
+          />
+        </v-col>
+        <v-col cols="3">
+          <v-text-field
+            v-model="recipeYieldQuantity"
+            type="number"
+            :min="0"
+            hide-spin-buttons
+            dense
+            :label="$t('recipe.yield')"
+            @input="validateInput($event, 'recipeYieldQuantity')"
+          />
+        </v-col>
+        <v-col cols="6">
+          <v-text-field
+          v-model="recipe.recipeYield"
+          dense
+          :label="$t('recipe.yield-text')"
+        />
+        </v-col>
+      </v-row>
+    </v-container>
+
+    <div class="d-flex flex-wrap" style="gap: 1rem">
+      <v-text-field v-model="recipe.totalTime" :label="$t('recipe.total-time')" />
+      <v-text-field v-model="recipe.prepTime" :label="$t('recipe.prep-time')" />
+      <v-text-field v-model="recipe.performTime" :label="$t('recipe.perform-time')" />
+    </div>
+    <v-textarea v-model="recipe.description" auto-grow min-height="100" :label="$t('recipe.description')" />
+  </div>
+</template>
+
+<script lang="ts">
+import { computed, defineComponent } from "@nuxtjs/composition-api";
+import { validators } from "~/composables/use-validators";
+import { NoUndefinedField } from "~/lib/api/types/non-generated";
+import { Recipe } from "~/lib/api/types/recipe";
+
+export default defineComponent({
+  props: {
+    recipe: {
+      type: Object as () => NoUndefinedField<Recipe>,
+      required: true,
+    },
+  },
+  setup(props) {
+    const recipeServings = computed<number>({
+      get() {
+        return props.recipe.recipeServings;
+      },
+      set(val) {
+        validateInput(val.toString(), "recipeServings");
+      },
+    });
+
+    const recipeYieldQuantity = computed<number>({
+      get() {
+        return props.recipe.recipeYieldQuantity;
+      },
+      set(val) {
+        validateInput(val.toString(), "recipeYieldQuantity");
+      },
+    });
+
+    function validateInput(value: string | null, property: "recipeServings" | "recipeYieldQuantity") {
+      if (!value) {
+        props.recipe[property] = 0;
+        return;
+      }
+
+      const number = parseFloat(value.replace(/[^0-9.]/g, ""));
+      if (isNaN(number) || number <= 0) {
+        props.recipe[property] = 0;
+        return;
+      }
+
+      props.recipe[property] = number;
+    }
+
+    return {
+      validators,
+      recipeServings,
+      recipeYieldQuantity,
+      validateInput,
+    };
+  },
+});
+</script>

frontend/components/Domain/Recipe/RecipePage/RecipePageParts/RecipePageIngredientToolsView.vue

@@ -4,12 +4,13 @@
       :value="recipe.recipeIngredient"
       :scale="scale"
       :disable-amount="recipe.settings.disableAmount"
+      :is-cook-mode="isCookMode"
     />
     <div v-if="!isEditMode && recipe.tools && recipe.tools.length > 0">
       <h2 class="mb-2 mt-4">{{ $t('tool.required-tools') }}</h2>
       <v-list-item v-for="(tool, index) in recipe.tools" :key="index" dense>
         <v-checkbox
-          v-model="recipe.tools[index].onHand"
+          v-model="recipeTools[index].onHand"
           hide-details
           class="pt-0 my-auto py-auto"
           color="secondary"
@@ -25,14 +26,18 @@
 </template>
 
 <script lang="ts">
-import { defineComponent } from "@nuxtjs/composition-api";
+import { computed, defineComponent } from "@nuxtjs/composition-api";
 import { useLoggedInState } from "~/composables/use-logged-in-state";
 import { usePageState, usePageUser } from "~/composables/recipe-page/shared-state";
 import { useToolStore } from "~/composables/store";
 import { NoUndefinedField } from "~/lib/api/types/non-generated";
-import { Recipe } from "~/lib/api/types/recipe";
+import { Recipe, RecipeTool } from "~/lib/api/types/recipe";
 import RecipeIngredients from "~/components/Domain/Recipe/RecipeIngredients.vue";
 
+interface RecipeToolWithOnHand extends RecipeTool {
+  onHand: boolean;
+}
+
 export default defineComponent({
   components: {
     RecipeIngredients,
@@ -46,6 +51,10 @@ export default defineComponent({
       type: Number,
       required: true,
     },
+    isCookMode: {
+      type: Boolean,
+      default: false,
+    }
   },
   setup(props) {
     const { isOwnGroup } = useLoggedInState();
@@ -54,9 +63,31 @@ export default defineComponent({
     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 && toolStore) {
-        toolStore.actions.updateOne(props.recipe.tools[index]);
+      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");
       }
@@ -64,6 +95,7 @@ export default defineComponent({
 
     return {
       toolStore,
+      recipeTools,
       isEditMode,
       updateTool,
     };

frontend/components/Domain/Recipe/RecipePage/RecipePageParts/RecipePageInstructions.vue

@@ -65,8 +65,8 @@
     </v-dialog>
 
     <div class="d-flex justify-space-between justify-start">
-      <h2 class="mb-4 mt-1">{{ $t("recipe.instructions") }}</h2>
-      <BaseButton v-if="!isEditForm && showCookMode" minor cancel color="primary" @click="toggleCookMode()">
+      <h2 v-if="!isCookMode" class="mb-4 mt-1">{{ $t("recipe.instructions") }}</h2>
+      <BaseButton v-if="!isEditForm && !isCookMode" minor cancel color="primary" @click="toggleCookMode()">
         <template #icon>
           {{ $globals.icons.primary }}
         </template>
@@ -243,16 +243,31 @@
               </DropZone>
               <v-expand-transition>
                 <div v-show="!isChecked(index) && !isEditForm" class="m-0 p-0">
+
                   <v-card-text class="markdown">
-                    <SafeMarkdown class="markdown" :source="step.text" />
-                    <div v-if="isCookMode && step.ingredientReferences && step.ingredientReferences.length > 0">
-                      <v-divider class="mb-2"></v-divider>
-                      <RecipeIngredientHtml
-                        v-for="ing in step.ingredientReferences"
-                        :key="ing.referenceId"
-                        :markup="getIngredientByRefId(ing.referenceId)"
-                      />
-                    </div>
+                    <v-row>
+                      <v-col
+                        v-if="isCookMode && step.ingredientReferences && step.ingredientReferences.length > 0"
+                        cols="12"
+                        sm="5"
+                      >
+                        <div class="ml-n4">
+                          <RecipeIngredients
+                            :value="recipe.recipeIngredient.filter((ing) => {
+                              if(!step.ingredientReferences) return false
+                              return step.ingredientReferences.map((ref) => ref.referenceId).includes(ing.referenceId || '')
+                            })"
+                            :scale="scale"
+                            :disable-amount="recipe.settings.disableAmount"
+                            :is-cook-mode="isCookMode"
+                          />
+                        </div>
+                      </v-col>
+                      <v-divider v-if="isCookMode && step.ingredientReferences && step.ingredientReferences.length > 0 && $vuetify.breakpoint.smAndUp" vertical ></v-divider>
+                      <v-col>
+                        <SafeMarkdown class="markdown" :source="step.text" />
+                      </v-col>
+                    </v-row>
                   </v-card-text>
                 </div>
               </v-expand-transition>
@@ -261,7 +276,7 @@
         </div>
       </TransitionGroup>
     </draggable>
-    <v-divider class="mt-10 d-flex d-md-none"/>
+    <v-divider v-if="!isCookMode" class="mt-10 d-flex d-md-none"/>
   </section>
 </template>
 
@@ -287,7 +302,7 @@ import { usePageState } from "~/composables/recipe-page/shared-state";
 import { useExtractIngredientReferences } from "~/composables/recipe-page/use-extract-ingredient-references";
 import { NoUndefinedField } from "~/lib/api/types/non-generated";
 import DropZone from "~/components/global/DropZone.vue";
-
+import RecipeIngredients from "~/components/Domain/Recipe/RecipeIngredients.vue";
 interface MergerHistory {
   target: number;
   source: number;
@@ -300,6 +315,7 @@ export default defineComponent({
     draggable,
     RecipeIngredientHtml,
     DropZone,
+    RecipeIngredients
   },
   props: {
     value: {

frontend/components/Domain/Recipe/RecipePage/RecipePageParts/RecipePageOrganizers.vue

@@ -14,7 +14,7 @@
           :show-add="true"
           selector-type="categories"
         />
-        <RecipeChips v-else :items="recipe.recipeCategory" />
+        <RecipeChips v-else :items="recipe.recipeCategory" v-on="$listeners" />
       </v-card-text>
     </v-card>
 
@@ -32,7 +32,7 @@
           :show-add="true"
           selector-type="tags"
         />
-        <RecipeChips v-else :items="recipe.tags" url-prefix="tags" />
+        <RecipeChips v-else :items="recipe.tags" url-prefix="tags" v-on="$listeners" />
       </v-card-text>
     </v-card>
 
@@ -41,7 +41,7 @@
       <v-card-title class="py-2"> {{ $t('tool.required-tools') }} </v-card-title>
       <v-divider class="mx-2" />
       <v-card-text class="pt-0">
-        <RecipeOrganizerSelector v-model="recipe.tools" selector-type="tools" />
+        <RecipeOrganizerSelector v-model="recipe.tools" selector-type="tools" v-on="$listeners" />
       </v-card-text>
     </v-card>
 
@@ -82,6 +82,8 @@ export default defineComponent({
     const { user } = usePageUser();
     const { isEditForm } = usePageState(props.recipe.slug);
 
+
+
     return {
       isEditForm,
       user,

frontend/components/Domain/Recipe/RecipePage/RecipePageParts/RecipePageScale.vue

@@ -5,50 +5,32 @@
         <RecipeScaleEditButton
           v-model.number="scaleValue"
           v-bind="attrs"
-          :recipe-yield="recipe.recipeYield"
-          :scaled-yield="scaledYield"
-          :basic-yield-num="basicYieldNum"
+          :recipe-servings="recipeServings"
           :edit-scale="!recipe.settings.disableAmount && !isEditMode"
           v-on="on"
         />
       </template>
       <span> {{ $t("recipe.edit-scale") }} </span>
     </v-tooltip>
-    <v-spacer></v-spacer>
-
-    <RecipeRating
-      v-if="landscape && $vuetify.breakpoint.smAndUp"
-      :key="recipe.slug"
-      v-model="recipe.rating"
-      :recipe-id="recipe.id"
-      :slug="recipe.slug"
-    />
   </div>
 </template>
 
 <script lang="ts">
-import { computed, defineComponent, ref } from "@nuxtjs/composition-api";
+import { computed, defineComponent } from "@nuxtjs/composition-api";
 import RecipeScaleEditButton from "~/components/Domain/Recipe/RecipeScaleEditButton.vue";
-import RecipeRating from "~/components/Domain/Recipe/RecipeRating.vue";
 import { NoUndefinedField } from "~/lib/api/types/non-generated";
 import { Recipe } from "~/lib/api/types/recipe";
 import { usePageState } from "~/composables/recipe-page/shared-state";
-import { useExtractRecipeYield, findMatch } from "~/composables/recipe-page/use-extract-recipe-yield";
 
 export default defineComponent({
   components: {
     RecipeScaleEditButton,
-    RecipeRating,
   },
   props: {
     recipe: {
       type: Object as () => NoUndefinedField<Recipe>,
       required: true,
     },
-    landscape: {
-      type: Boolean,
-      default: false,
-    },
     scale: {
       type: Number,
       default: 1,
@@ -57,6 +39,10 @@ export default defineComponent({
   setup(props, { emit }) {
     const { isEditMode } = usePageState(props.recipe.slug);
 
+    const recipeServings = computed<number>(() => {
+      return props.recipe.recipeServings || props.recipe.recipeYieldQuantity || 1;
+    });
+
     const scaleValue = computed<number>({
       get() {
         return props.scale;
@@ -66,17 +52,9 @@ export default defineComponent({
       },
     });
 
-    const scaledYield = computed(() => {
-      return useExtractRecipeYield(props.recipe.recipeYield, scaleValue.value);
-    });
-
-    const match = findMatch(props.recipe.recipeYield);
-    const basicYieldNum = ref<number |null>(match ? match[1] : null);
-
     return {
+      recipeServings,
       scaleValue,
-      scaledYield,
-      basicYieldNum,
       isEditMode,
     };
   },

frontend/components/Domain/Recipe/RecipePage/RecipePageParts/RecipePageTitleContent.vue

@@ -1,92 +0,0 @@
-<template>
-  <div>
-    <template v-if="!isEditMode && landscape">
-      <v-card-title class="px-0 py-2 ma-0 headline">
-        {{ recipe.name }}
-      </v-card-title>
-      <SafeMarkdown :source="recipe.description" />
-      <div v-if="isOwnGroup" class="pb-2 d-flex justify-center flex-wrap">
-        <RecipeLastMade
-          v-model="recipe.lastMade"
-          :recipe="recipe"
-          class="d-flex justify-center flex-wrap"
-          :class="true ? undefined : 'force-bottom'"
-        />
-      </div>
-      <div class="pb-2 d-flex justify-center flex-wrap">
-        <RecipeTimeCard
-          class="d-flex justify-center flex-wrap"
-          :prep-time="recipe.prepTime"
-          :total-time="recipe.totalTime"
-          :perform-time="recipe.performTime"
-        />
-        <RecipeRating
-          v-if="$vuetify.breakpoint.smAndDown"
-          :key="recipe.slug"
-          v-model="recipe.rating"
-          :recipe-id="recipe.id"
-          :slug="recipe.slug"
-        />
-      </div>
-      <v-divider></v-divider>
-    </template>
-    <template v-else-if="isEditMode">
-      <v-text-field
-        v-model="recipe.name"
-        class="my-3"
-        :label="$t('recipe.recipe-name')"
-        :rules="[validators.required]"
-      />
-      <v-text-field v-model="recipe.recipeYield" dense :label="$t('recipe.servings')" />
-      <div class="d-flex flex-wrap" style="gap: 1rem">
-        <v-text-field v-model="recipe.totalTime" :label="$t('recipe.total-time')" />
-        <v-text-field v-model="recipe.prepTime" :label="$t('recipe.prep-time')" />
-        <v-text-field v-model="recipe.performTime" :label="$t('recipe.perform-time')" />
-      </div>
-      <v-textarea v-model="recipe.description" auto-grow min-height="100" :label="$t('recipe.description')" />
-    </template>
-  </div>
-</template>
-
-<script lang="ts">
-import { defineComponent } from "@nuxtjs/composition-api";
-import { useLoggedInState } from "~/composables/use-logged-in-state";
-import { usePageState, usePageUser } from "~/composables/recipe-page/shared-state";
-import { validators } from "~/composables/use-validators";
-import { NoUndefinedField } from "~/lib/api/types/non-generated";
-import { Recipe } from "~/lib/api/types/recipe";
-import RecipeRating from "~/components/Domain/Recipe/RecipeRating.vue";
-import RecipeTimeCard from "~/components/Domain/Recipe/RecipeTimeCard.vue";
-import RecipeLastMade from "~/components/Domain/Recipe/RecipeLastMade.vue";
-
-export default defineComponent({
-  components: {
-    RecipeRating,
-    RecipeTimeCard,
-    RecipeLastMade,
-  },
-  props: {
-    recipe: {
-      type: Object as () => NoUndefinedField<Recipe>,
-      required: true,
-    },
-    landscape: {
-      type: Boolean,
-      default: false,
-    },
-  },
-  setup(props) {
-    const { user } = usePageUser();
-    const { imageKey, isEditMode } = usePageState(props.recipe.slug);
-    const { isOwnGroup } = useLoggedInState();
-
-    return {
-      user,
-      imageKey,
-      validators,
-      isEditMode,
-      isOwnGroup,
-    };
-  },
-});
-</script>

frontend/components/Domain/Recipe/RecipePrintView.vue

@@ -18,7 +18,24 @@
               </v-icon>
               {{ recipe.name }}
             </v-card-title>
-            <RecipeTimeCard :prep-time="recipe.prepTime" :total-time="recipe.totalTime" :perform-time="recipe.performTime" color="white" />
+            <div v-if="recipeYield" class="d-flex justify-space-between align-center px-4 pb-2">
+              <v-chip
+                :small="$vuetify.breakpoint.smAndDown"
+                label
+              >
+                <v-icon left>
+                  {{ $globals.icons.potSteam }}
+                </v-icon>
+                <!-- eslint-disable-next-line vue/no-v-html -->
+                <span v-html="recipeYield"></span>
+              </v-chip>
+            </div>
+            <RecipeTimeCard
+              :prep-time="recipe.prepTime"
+              :total-time="recipe.totalTime"
+              :perform-time="recipe.performTime"
+              color="white"
+            />
             <v-card-text v-if="preferences.showDescription" class="px-0">
               <SafeMarkdown :source="recipe.description" />
             </v-card-text>
@@ -30,9 +47,6 @@
     <!-- Ingredients -->
     <section>
       <v-card-title class="headline pl-0"> {{ $t("recipe.ingredients") }} </v-card-title>
-      <div class="font-italic px-0 py-0">
-        <SafeMarkdown :source="recipe.recipeYield" />
-      </div>
       <div
         v-for="(ingredientSection, sectionIndex) in ingredientSections"
         :key="`ingredient-section-${sectionIndex}`"
@@ -111,7 +125,8 @@
 </template>
 
 <script lang="ts">
-import { computed, defineComponent } from "@nuxtjs/composition-api";
+import { computed, defineComponent, useContext } from "@nuxtjs/composition-api";
+import DOMPurify from "dompurify";
 import RecipeTimeCard from "~/components/Domain/Recipe/RecipeTimeCard.vue";
 import { useStaticRoutes } from "~/composables/api";
 import { Recipe, RecipeIngredient, RecipeStep} from "~/lib/api/types/recipe";
@@ -119,6 +134,7 @@ import { NoUndefinedField } from "~/lib/api/types/non-generated";
 import { ImagePosition, useUserPrintPreferences } from "~/composables/use-users/preferences";
 import { parseIngredientText, useNutritionLabels } from "~/composables/recipes";
 import { usePageState } from "~/composables/recipe-page/shared-state";
+import { useScaledAmount } from "~/composables/recipes/use-scaled-amount";
 
 
 type IngredientSection = {
@@ -151,13 +167,39 @@ export default defineComponent({
     }
   },
   setup(props) {
+    const { i18n } = useContext();
     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 ? 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);
@@ -258,6 +300,7 @@ export default defineComponent({
       parseIngredientText,
       preferences,
       recipeImageUrl,
+      recipeYield,
       ingredientSections,
       instructionSections,
     };

frontend/components/Domain/Recipe/RecipeScaleEditButton.vue

@@ -1,17 +1,21 @@
 <template>
-  <div>
+  <div v-if="yieldDisplay">
     <div class="text-center d-flex align-center">
       <div>
-        <v-menu v-model="menu" :disabled="!editScale" offset-y top nudge-top="6" :close-on-content-click="false">
+        <v-menu v-model="menu" :disabled="!canEditScale" offset-y top nudge-top="6" :close-on-content-click="false">
           <template #activator="{ on, attrs }">
-            <v-card class="pa-1 px-2" dark color="secondary darken-1" small v-bind="attrs" v-on="on">
-              <span v-if="!recipeYield"> x {{ scale }} </span>
-              <div v-else-if="!numberParsed && recipeYield">
-                <span v-if="numerator === 1"> {{ recipeYield }} </span>
-                <span v-else> {{ numerator }}x {{ scaledYield }} </span>
-              </div>
-              <span v-else> {{ scaledYield }} </span>
-
+            <v-card
+              class="pa-1 px-2"
+              dark
+              color="secondary darken-1"
+              small
+              v-bind="attrs"
+              :style="{ cursor: canEditScale ? '' : 'default' }"
+              v-on="on"
+            >
+              <v-icon v-if="canEditScale" small class="mr-2">{{ $globals.icons.edit }}</v-icon>
+              <!-- eslint-disable-next-line vue/no-v-html -->
+              <span v-html="yieldDisplay"></span>
             </v-card>
           </template>
           <v-card min-width="300px">
@@ -20,7 +24,7 @@
             </v-card-title>
             <v-card-text class="mt-n5">
               <div class="mt-4 d-flex align-center">
-                <v-text-field v-model="numerator" type="number" :min="0" hide-spin-buttons />
+                <v-text-field v-model="yieldQuantityEditorValue" type="number" :min="0" hide-spin-buttons @input="recalculateScale(yieldQuantityEditorValue)" />
                 <v-tooltip right color="secondary darken-1">
                   <template #activator="{ on, attrs }">
                     <v-btn v-bind="attrs" icon class="mx-1" small v-on="on" @click="scale = 1">
@@ -37,7 +41,7 @@
         </v-menu>
       </div>
       <BaseButtonGroup
-        v-if="editScale"
+        v-if="canEditScale"
         class="pl-2"
         :large="false"
         :buttons="[
@@ -53,41 +57,36 @@
             event: 'increment',
           },
         ]"
-        @decrement="numerator--"
-        @increment="numerator++"
+        @decrement="recalculateScale(yieldQuantity - 1)"
+        @increment="recalculateScale(yieldQuantity + 1)"
       />
     </div>
   </div>
 </template>
 
 <script lang="ts">
-import { defineComponent, ref, computed, watch  } from "@nuxtjs/composition-api";
+import { computed, defineComponent, ref, useContext, watch } from "@nuxtjs/composition-api";
+import { useScaledAmount } from "~/composables/recipes/use-scaled-amount";
 
 export default defineComponent({
   props: {
-    recipeYield: {
-      type: String,
-      default: null,
-    },
-    scaledYield: {
-      type: String,
-      default: null,
-    },
-    basicYieldNum: {
+    value: {
       type: Number,
-      default: null,
+      required: true,
+    },
+    recipeServings: {
+      type: Number,
+      default: 0,
     },
     editScale: {
       type: Boolean,
       default: false,
     },
-    value: {
-      type: Number,
-      required: true,
-    },
   },
   setup(props, { emit }) {
+    const { i18n } = useContext();
     const menu = ref<boolean>(false);
+    const canEditScale = computed(() => props.editScale && props.recipeServings > 0);
 
     const scale = computed({
       get: () => props.value,
@@ -97,24 +96,54 @@ export default defineComponent({
       },
     });
 
-    const numerator = ref<number>(props.basicYieldNum != null ? parseFloat(props.basicYieldNum.toFixed(3)) : 1);
-    const denominator = props.basicYieldNum != null ? parseFloat(props.basicYieldNum.toFixed(32)) : 1;
-    const numberParsed = !!props.basicYieldNum;
+    function recalculateScale(newYield: number) {
+      if (isNaN(newYield) || newYield <= 0) {
+        return;
+      }
 
-    watch(() => numerator.value, () => {
-      scale.value = parseFloat((numerator.value / denominator).toFixed(32));
+      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 : "";
+    });
+
+    // 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;
+        }
+
+        yieldQuantityEditorValue.value = recipeYieldAmount.value.scaledAmount;
+      }
+    )
+
     const disableDecrement = computed(() => {
-      return numerator.value <= 1;
+      return recipeYieldAmount.value.scaledAmount <= 1;
     });
 
-
     return {
       menu,
+      canEditScale,
       scale,
-      numerator,
+      recalculateScale,
+      yieldDisplay,
+      yieldQuantity,
+      yieldQuantityEditorValue,
       disableDecrement,
-      numberParsed,
     };
   },
 });

frontend/components/Domain/Recipe/RecipeSuggestion.vue

@@ -0,0 +1,118 @@
+<template>
+  <v-container class="elevation-3">
+    <v-row no-gutters>
+      <v-col cols="12">
+        <RecipeCardMobile
+          :name="recipe.name"
+          :description="recipe.description"
+          :slug="recipe.slug"
+          :rating="recipe.rating"
+          :image="recipe.image"
+          :recipe-id="recipe.id"
+        />
+      </v-col>
+      <div v-for="(organizer, idx) in missingOrganizers" :key="idx">
+        <v-col
+          v-if="organizer.show"
+          cols="12"
+        >
+          <div class="d-flex flex-row flex-wrap align-center pt-2">
+            <v-icon class="ma-0 pa-0">{{ organizer.icon }}</v-icon>
+            <v-card-text class="mr-0 my-0 pl-1 py-0" style="width: min-content;">
+              {{ $tc("recipe-finder.missing") }}:
+            </v-card-text>
+            <v-chip
+              v-for="item in organizer.items"
+              :key="item.item.id"
+              label
+              color="secondary custom-transparent"
+              class="mr-2 my-1"
+            >
+              <v-checkbox dark :ripple="false" @click="handleCheckbox(item)">
+                <template #label>
+                  {{ organizer.getLabel(item.item) }}
+                </template>
+              </v-checkbox>
+            </v-chip>
+          </div>
+        </v-col>
+      </div>
+    </v-row>
+  </v-container>
+</template>
+
+<script lang="ts">
+import { computed, defineComponent, reactive, useContext } from "@nuxtjs/composition-api";
+import RecipeCardMobile from "./RecipeCardMobile.vue";
+import { IngredientFood, RecipeSummary, RecipeTool } from "~/lib/api/types/recipe";
+
+interface Organizer {
+  type: "food" | "tool";
+  item: IngredientFood | RecipeTool;
+  selected: boolean;
+}
+
+export default defineComponent({
+  components: { RecipeCardMobile },
+  props: {
+    recipe: {
+      type: Object as () => RecipeSummary,
+      required: true,
+    },
+    missingFoods: {
+      type: Array as () => IngredientFood[] | null,
+      default: null,
+    },
+    missingTools: {
+      type: Array as () => RecipeTool[] | null,
+      default: null,
+    },
+    disableCheckbox: {
+      type: Boolean,
+      default: false,
+    },
+  },
+  setup(props, context) {
+    const { $globals } = useContext();
+    const missingOrganizers = computed(() => [
+      {
+        type: "food",
+        show: props.missingFoods?.length,
+        icon: $globals.icons.foods,
+        items: props.missingFoods ? props.missingFoods.map((food) => {
+          return reactive({type: "food", item: food, selected: false} as Organizer);
+        }) : [],
+        getLabel: (item: IngredientFood) => item.pluralName || item.name,
+      },
+      {
+        type: "tool",
+        show: props.missingTools?.length,
+        icon: $globals.icons.tools,
+        items: props.missingTools ? props.missingTools.map((tool) => {
+          return reactive({type: "tool", item: tool, selected: false} as Organizer);
+        }) : [],
+        getLabel: (item: RecipeTool) => item.name,
+      }
+    ])
+
+    function handleCheckbox(organizer: Organizer) {
+      if (props.disableCheckbox) {
+        return;
+      }
+
+      organizer.selected = !organizer.selected;
+      if (organizer.selected) {
+        context.emit(`add-${organizer.type}`, organizer.item);
+      }
+      else {
+        context.emit(`remove-${organizer.type}`, organizer.item);
+      }
+    }
+
+    return {
+      missingOrganizers,
+      handleCheckbox,
+    };
+  }
+});
+</script>

frontend/components/Domain/Recipe/RecipeTimeCard.vue

@@ -1,19 +1,41 @@
 <template>
-  <div>
-    <v-chip
-      v-for="(time, index) in allTimes"
-      :key="index"
-      :small="$vuetify.breakpoint.smAndDown"
-      label
-      :color="color"
-      class="ma-1"
-    >
-      <v-icon left>
-        {{ $globals.icons.clockOutline }}
-      </v-icon>
-      {{ time.name }} |
-      {{ time.value }}
-    </v-chip>
+  <div v-if="stacked">
+    <v-container>
+      <v-row v-for="(time, index) in allTimes" :key="`${index}-stacked`" no-gutters>
+        <v-col cols="12" :class="containerClass">
+          <v-chip
+            :small="$vuetify.breakpoint.smAndDown"
+            label
+            :color="color"
+            class="ma-1"
+          >
+            <v-icon left>
+              {{ $globals.icons.clockOutline }}
+            </v-icon>
+            {{ time.name }} |
+            {{ time.value }}
+          </v-chip>
+        </v-col>
+      </v-row>
+    </v-container>
+  </div>
+  <div v-else>
+    <v-container :class="containerClass">
+      <v-chip
+        v-for="(time, index) in allTimes"
+        :key="index"
+        :small="$vuetify.breakpoint.smAndDown"
+        label
+        :color="color"
+        class="ma-1"
+      >
+        <v-icon left>
+          {{ $globals.icons.clockOutline }}
+        </v-icon>
+        {{ time.name }} |
+        {{ time.value }}
+      </v-chip>
+    </v-container>
   </div>
 </template>
 
@@ -22,6 +44,10 @@ import { computed, defineComponent, useContext } from "@nuxtjs/composition-api";
 
 export default defineComponent({
   props: {
+    stacked: {
+      type: Boolean,
+      default: false,
+    },
     prepTime: {
       type: String,
       default: null,
@@ -38,6 +64,10 @@ export default defineComponent({
       type: String,
       default: "accent custom-transparent"
     },
+    containerClass: {
+      type: String,
+      default: undefined,
+    },
   },
   setup(props) {
     const { i18n } = useContext();

frontend/components/Domain/Recipe/RecipeTimerMenu.vue

@@ -1,317 +0,0 @@
-<template>
-  <div class="text-center">
-    <v-menu
-      v-model="showMenu"
-      offset-x
-      offset-overflow
-      left
-      allow-overflow
-      close-delay="125"
-      :close-on-content-click="false"
-      content-class="d-print-none"
-      :z-index="2"
-    >
-      <template #activator="{ on, attrs }">
-        <v-badge :value="timerEnded" overlap color="red" content="!">
-          <v-btn :fab="fab" :small="fab" :color="timerEnded ? 'secondary' : color" :icon="!fab" dark v-bind="attrs" v-on="on" @click.prevent>
-            <v-progress-circular
-              v-if="timerInitialized && !timerEnded"
-              :value="timerProgress"
-              :rotate="270"
-              :color="timerRunning ? undefined : 'primary'"
-            >
-              <v-icon small>{{ timerRunning ? $globals.icons.timer : $globals.icons.timerPause }}</v-icon>
-            </v-progress-circular>
-            <v-icon v-else>{{ $globals.icons.timer }}</v-icon>
-          </v-btn>
-        </v-badge>
-      </template>
-      <v-card>
-        <v-card-title>
-          <v-icon class="pr-2">{{ $globals.icons.timer }}</v-icon>
-          {{ $i18n.tc("recipe.timer.kitchen-timer") }}
-        </v-card-title>
-        <div class="mx-auto" style="width: fit-content;">
-          <v-progress-circular
-            :value="timerProgress"
-            :rotate="270"
-            color="primary"
-            class="mb-2"
-            :size="128"
-            :width="24"
-          >
-          <v-icon
-            v-if="timerInitialized && !timerRunning"
-            x-large
-            :color="timerEnded ? 'red' : 'primary'"
-            @click="() => timerEnded ? resetTimer() : resumeTimer()"
-          >
-            {{ timerEnded ? $globals.icons.stop : $globals.icons.pause }}
-          </v-icon>
-          </v-progress-circular>
-        </div>
-        <v-container width="100%" fluid class="ma-0 px-auto py-2">
-          <v-row no-gutters justify="center">
-            <v-col cols="3" align-self="center">
-              <v-text-field
-                :value="timerHours"
-                :min="0"
-                outlined
-                single-line
-                solo
-                hide-details
-                type="number"
-                :disabled="timerInitialized"
-                class="centered-input my-0 py-0"
-                style="font-size: large; width: 100px;"
-                @input="(v) => timerHours = v.toString().padStart(2, '0')"
-              />
-            </v-col>
-            <v-col cols="1" align-self="center" style="text-align: center;">
-              <h1>:</h1>
-            </v-col>
-            <v-col cols="3" align-self="center">
-              <v-text-field
-                :value="timerMinutes"
-                :min="0"
-                outlined
-                single-line
-                solo
-                hide-details
-                type="number"
-                :disabled="timerInitialized"
-                class="centered-input my-0 py-0"
-                style="font-size: large; width: 100px;"
-                @input="(v) => timerMinutes = v.toString().padStart(2, '0')"
-              />
-            </v-col>
-            <v-col cols="1" align-self="center" style="text-align: center;" >
-              <h1>:</h1>
-            </v-col>
-            <v-col cols="3" align-self="center">
-              <v-text-field
-                :value="timerSeconds"
-                :min="0"
-                outlined
-                single-line
-                solo
-                hide-details
-                type="number"
-                :disabled="timerInitialized"
-                class="centered-input my-0 py-0"
-                style="font-size: large; width: 100px;"
-                @input="(v) => timerSeconds = v.toString().padStart(2, '0')"
-              />
-            </v-col>
-          </v-row>
-        </v-container>
-        <div class="mx-auto" style="width: 100%;">
-          <BaseButtonGroup
-            stretch
-            :buttons="timerButtons"
-            @initialize-timer="initializeTimer"
-            @pause-timer="pauseTimer"
-            @resume-timer="resumeTimer"
-            @stop-timer="resetTimer"
-          />
-        </div>
-      </v-card>
-    </v-menu>
-  </div>
-</template>
-
-<script lang="ts">
-import { computed, defineComponent, reactive, ref, toRefs, useContext, watch } from "@nuxtjs/composition-api";
-import { ButtonOption } from "~/components/global/BaseButtonGroup.vue";
-
-// @ts-ignore typescript can't find our audio file, but it's there!
-import timerAlarmAudio from "~/assets/audio/kitchen_alarm.mp3";
-
-export default defineComponent({
-  props: {
-    fab: {
-      type: Boolean,
-      default: false,
-    },
-    color: {
-      type: String,
-      default: "primary",
-    },
-  },
-  setup() {
-    const { $globals, i18n } = useContext();
-    const state = reactive({
-      showMenu: false,
-      timerInitialized: false,
-      timerRunning: false,
-      timerEnded: false,
-      timerInitialValue: 0,
-      timerValue: 0,
-    });
-
-    watch(
-      () => state.showMenu,
-      () => {
-        if (state.showMenu && state.timerEnded) {
-          resetTimer();
-        }
-      }
-    );
-
-    // ts doesn't recognize timerAlarmAudio because it's a weird import
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
-    const timerAlarm = new Audio(timerAlarmAudio);
-    timerAlarm.loop = true;
-
-    const timerHours = ref<string | number>("00");
-    const timerMinutes = ref<string | number>("00");
-    const timerSeconds = ref<string | number>("00");
-
-    const initializeButton: ButtonOption = {
-      icon: $globals.icons.timerPlus,
-      text: i18n.tc("recipe.timer.start-timer"),
-      event: "initialize-timer",
-    }
-
-    const pauseButton: ButtonOption = {
-      icon: $globals.icons.pause,
-      text: i18n.tc("recipe.timer.pause-timer"),
-      event: "pause-timer",
-    };
-
-    const resumeButton: ButtonOption = {
-      icon: $globals.icons.play,
-      text: i18n.tc("recipe.timer.resume-timer"),
-      event: "resume-timer",
-    };
-
-    const stopButton: ButtonOption = {
-      icon: $globals.icons.stop,
-      text: i18n.tc("recipe.timer.stop-timer"),
-      event: "stop-timer",
-      color: "red",
-    };
-
-    const timerButtons = computed<ButtonOption[]>(() => {
-      const buttons: ButtonOption[] = [];
-      if (state.timerInitialized) {
-        if (state.timerEnded) {
-          buttons.push(stopButton);
-        } else if (state.timerRunning) {
-          buttons.push(pauseButton, stopButton);
-        } else {
-          buttons.push(resumeButton, stopButton);
-        }
-      } else {
-        buttons.push(initializeButton);
-      }
-
-      // I don't know why this is failing the frontend lint test ¯\_(ツ)_/¯
-      // eslint-disable-next-line @typescript-eslint/no-unsafe-return
-      return buttons;
-    });
-
-    const timerProgress = computed(() => {
-      if(state.timerInitialValue) {
-        return (state.timerValue / state.timerInitialValue) * 100;
-      } else {
-        return 0;
-      }
-    });
-
-    let timerInterval: number | null = null;
-    function decrementTimer() {
-      if (state.timerValue > 0) {
-        state.timerValue -= 1;
-
-        timerHours.value = Math.floor(state.timerValue / 3600).toString().padStart(2, "0");
-        timerMinutes.value = Math.floor(state.timerValue % 3600 / 60).toString().padStart(2, "0");
-        timerSeconds.value = Math.floor(state.timerValue % 3600 % 60).toString().padStart(2, "0");
-      }
-      else {
-        state.timerRunning = false;
-        state.timerEnded = true;
-        timerAlarm.currentTime = 0;
-        timerAlarm.play();
-
-        if (timerInterval) {
-          clearInterval(timerInterval);
-          timerInterval = null;
-        }
-      }
-    }
-
-    function initializeTimer() {
-      state.timerInitialized = true;
-      state.timerRunning = true;
-      state.timerEnded = false;
-
-      console.log(timerSeconds.value);
-
-      const hours = parseFloat(timerHours.value.toString()) > 0 ? parseFloat(timerHours.value.toString()) : 0;
-      const minutes = parseFloat(timerMinutes.value.toString()) > 0 ? parseFloat(timerMinutes.value.toString()) : 0;
-      const seconds = parseFloat(timerSeconds.value.toString()) > 0 ? parseFloat(timerSeconds.value.toString()) : 0;
-
-      state.timerInitialValue = (hours * 3600) + (minutes * 60) + seconds;
-      state.timerValue = state.timerInitialValue;
-
-      timerInterval = setInterval(decrementTimer, 1000) as unknown as number;
-
-      timerHours.value = Math.floor(state.timerValue / 3600).toString().padStart(2, "0");
-      timerMinutes.value = Math.floor(state.timerValue % 3600 / 60).toString().padStart(2, "0");
-      timerSeconds.value = Math.floor(state.timerValue % 3600 % 60).toString().padStart(2, "0");
-    };
-
-    function pauseTimer() {
-      state.timerRunning = false;
-      if (timerInterval) {
-        clearInterval(timerInterval);
-        timerInterval = null;
-      }
-    };
-
-    function resumeTimer() {
-      state.timerRunning = true;
-      timerInterval = setInterval(decrementTimer, 1000) as unknown as number;
-    };
-
-    function resetTimer() {
-      state.timerInitialized = false;
-      state.timerRunning = false;
-      state.timerEnded = false;
-
-      timerAlarm.pause();
-      timerAlarm.currentTime = 0;
-
-      timerHours.value = "00";
-      timerMinutes.value = "00";
-      timerSeconds.value = "00";
-
-      state.timerValue = 0;
-      if (timerInterval) {
-        clearInterval(timerInterval);
-        timerInterval = null;
-      }
-    };
-
-    return {
-      ...toRefs(state),
-      timerHours,
-      timerMinutes,
-      timerSeconds,
-      timerButtons,
-      timerProgress,
-      initializeTimer,
-      pauseTimer,
-      resumeTimer,
-      resetTimer,
-    };
-  },
-});
-</script>
-
-<style scoped>
-    .centered-input >>> input {
-      text-align: center;
-    }
-</style>

frontend/components/Domain/Recipe/RecipeYield.vue

@@ -0,0 +1,69 @@
+<template>
+  <div v-if="displayText" class="d-flex justify-space-between align-center">
+    <v-chip
+      :small="$vuetify.breakpoint.smAndDown"
+      label
+      :color="color"
+    >
+      <v-icon left>
+        {{ $globals.icons.potSteam }}
+      </v-icon>
+      <!-- eslint-disable-next-line vue/no-v-html -->
+      <span v-html="displayText"></span>
+    </v-chip>
+  </div>
+</template>
+
+<script lang="ts">
+import { computed, defineComponent, useContext } from "@nuxtjs/composition-api";
+import DOMPurify from "dompurify";
+import { useScaledAmount } from "~/composables/recipes/use-scaled-amount";
+
+export default defineComponent({
+  props: {
+    yieldQuantity: {
+      type: Number,
+      default: 0,
+    },
+    yield: {
+      type: String,
+      default: "",
+    },
+    scale: {
+      type: Number,
+      default: 1,
+    },
+    color: {
+      type: String,
+      default: "accent custom-transparent"
+    },
+  },
+  setup(props) {
+    const { i18n } = useContext();
+
+    function sanitizeHTML(rawHtml: string) {
+      return DOMPurify.sanitize(rawHtml, {
+        USE_PROFILES: { html: true },
+        ALLOWED_TAGS: ["strong", "sup"],
+      });
+    }
+
+    const displayText = computed(() => {
+      if (!(props.yieldQuantity || props.yield)) {
+        return "";
+      }
+
+      const { scaledAmountDisplay } = useScaledAmount(props.yieldQuantity, props.scale);
+
+      return i18n.t("recipe.yields-amount-with-text", {
+        amount: scaledAmountDisplay,
+        text: sanitizeHTML(props.yield),
+      }) as string;
+    });
+
+    return {
+      displayText,
+    };
+  },
+});
+</script>

frontend/components/Domain/User/UserInviteDialog.vue

@@ -0,0 +1,215 @@
+<template>
+  <BaseDialog
+    v-model="inviteDialog"
+    :title="$tc('profile.get-invite-link')"
+    :icon="$globals.icons.accountPlusOutline"
+    color="primary">
+    <v-container>
+      <v-form class="mt-5">
+        <v-select
+          v-if="groups && groups.length"
+          v-model="selectedGroup"
+          :items="groups"
+          item-text="name"
+          item-value="id"
+          :return-object="false"
+          filled
+          :label="$tc('group.user-group')"
+          :rules="[validators.required]" />
+        <v-select
+          v-if="households && households.length"
+          v-model="selectedHousehold"
+          :items="filteredHouseholds"
+          item-text="name" item-value="id"
+          :return-object="false" filled
+          :label="$tc('household.user-household')"
+          :rules="[validators.required]" />
+        <v-row>
+          <v-col cols="9">
+            <v-text-field
+              :label="$tc('profile.invite-link')"
+              type="text" readonly filled
+              :value="generatedSignupLink" />
+          </v-col>
+          <v-col cols="3" class="pl-1 mt-3">
+            <AppButtonCopy
+              :icon="false"
+              color="info"
+              :copy-text="generatedSignupLink"
+              :disabled="generatedSignupLink" />
+          </v-col>
+        </v-row>
+        <v-text-field
+          v-model="sendTo"
+          :label="$t('user.email')"
+          :rules="[validators.email]"
+          outlined
+          @keydown.enter="sendInvite" />
+      </v-form>
+    </v-container>
+    <template #custom-card-action>
+      <BaseButton
+        :disabled="!validEmail"
+        :loading="loading"
+        :icon="$globals.icons.email"
+        @click="sendInvite">
+          {{ $t("group.invite") }}
+      </BaseButton>
+    </template>
+  </BaseDialog>
+</template>
+
+<script lang="ts">
+import { computed, defineComponent, useContext, ref, toRefs, reactive } from "@nuxtjs/composition-api";
+import { watchEffect } from "vue";
+import { useUserApi } from "@/composables/api";
+import BaseDialog from "~/components/global/BaseDialog.vue";
+import AppButtonCopy from "~/components/global/AppButtonCopy.vue";
+import BaseButton from "~/components/global/BaseButton.vue";
+import { validators } from "~/composables/use-validators";
+import { alert } from "~/composables/use-toast";
+import { GroupInDB } from "~/lib/api/types/user";
+import { HouseholdInDB } from "~/lib/api/types/household";
+import { useGroups } from "~/composables/use-groups";
+import { useAdminHouseholds } from "~/composables/use-households";
+
+export default defineComponent({
+  name: "UserInviteDialog",
+  components: {
+    BaseDialog,
+    AppButtonCopy,
+    BaseButton,
+  },
+  props: {
+    value: {
+      type: Boolean,
+      default: false,
+    },
+  },
+  setup(props, context) {
+    const { $auth, i18n } = useContext();
+
+    const isAdmin = computed(() => $auth.user?.admin);
+    const token = ref("");
+    const selectedGroup = ref<string | null>(null);
+    const selectedHousehold = ref<string | null>(null);
+    const groups = ref<GroupInDB[]>([]);
+    const households = ref<HouseholdInDB[]>([]);
+    const api = useUserApi();
+
+    const fetchGroupsAndHouseholds = () => {
+      if (isAdmin) {
+        const groupsResponse = useGroups();
+        const householdsResponse = useAdminHouseholds();
+        watchEffect(() => {
+          groups.value = groupsResponse.groups.value || [];
+          households.value = householdsResponse.households.value || [];
+        });
+      }
+    };
+
+    const inviteDialog = computed<boolean>({
+      get() {
+        return props.value;
+      },
+      set(val) {
+        context.emit("input", val);
+      },
+    });
+
+    async function getSignupLink(group: string | null = null, household: string | null = null) {
+      const payload = (group && household) ? { uses: 1, group_id: group, household_id: household } : { uses: 1 };
+      const { data } = await api.households.createInvitation(payload);
+      if (data) {
+        token.value = data.token;
+      }
+    }
+
+    const filteredHouseholds = computed(() => {
+      if (!selectedGroup.value) return [];
+      return households.value?.filter(household => household.groupId === selectedGroup.value);
+    });
+
+    function constructLink(token: string) {
+      return token ? `${window.location.origin}/register?token=${token}` : "";
+    }
+
+    const generatedSignupLink = computed(() => {
+      return constructLink(token.value);
+    });
+
+    // =================================================
+    // Email Invitation
+    const state = reactive({
+      loading: false,
+      sendTo: "",
+    });
+
+    async function sendInvite() {
+      state.loading = true;
+      if (!token.value) {
+        getSignupLink(selectedGroup.value, selectedHousehold.value);
+      }
+      const { data } = await api.email.sendInvitation({
+        email: state.sendTo,
+        token: token.value,
+      });
+
+      if (data && data.success) {
+        alert.success(i18n.tc("profile.email-sent"));
+      } else {
+        alert.error(i18n.tc("profile.error-sending-email"));
+      }
+      state.loading = false;
+      inviteDialog.value = false;
+    }
+
+    const validEmail = computed(() => {
+      if (state.sendTo === "") {
+        return false;
+      }
+      const valid = validators.email(state.sendTo);
+
+      // Explicit bool check because validators.email sometimes returns a string
+      if (valid === true) {
+        return true;
+      }
+      return false;
+    });
+
+    return {
+      sendInvite,
+      validators,
+      validEmail,
+      inviteDialog,
+      getSignupLink,
+      generatedSignupLink,
+      selectedGroup,
+      selectedHousehold,
+      filteredHouseholds,
+      groups,
+      households,
+      fetchGroupsAndHouseholds,
+      ...toRefs(state),
+    };
+  },
+  watch: {
+    value: {
+      immediate: false,
+      handler(val) {
+        if (val && !this.isAdmin) {
+          this.getSignupLink();
+        }
+      },
+    },
+    selectedHousehold(newVal) {
+      if (newVal && this.selectedGroup) {
+        this.getSignupLink(this.selectedGroup, this.selectedHousehold);
+      }
+    },
+  },
+  created() {
+    this.fetchGroupsAndHouseholds();
+  },
+});
+</script>

frontend/components/Layout/DefaultLayout.vue

@@ -221,7 +221,13 @@ export default defineComponent({
         icon: $globals.icons.silverwareForkKnife,
         to: `/g/${groupSlug.value}`,
         title: i18n.tc("general.recipes"),
-        restricted: true,
+        restricted: false,
+      },
+      {
+        icon: $globals.icons.search,
+        to: `/g/${groupSlug.value}/recipes/finder`,
+        title: i18n.tc("recipe-finder.recipe-finder"),
+        restricted: false,
       },
       {
         icon: $globals.icons.calendarMultiselect,

frontend/components/global/AppButtonCopy.vue

@@ -15,6 +15,7 @@
         :color="color"
         retain-focus-on-click
         :class="btnClass"
+        :disabled="copyText !== '' ? false : true"
         @click="
           on.click;
           textToClipboard();

frontend/components/global/AppLoader.vue

@@ -8,14 +8,14 @@
           </v-icon>
           <div v-if="large" class="text-small">
             <slot>
-              {{ small ? "" : waitingText }}
+              {{ (small || tiny) ? "" : waitingText }}
             </slot>
           </div>
         </div>
       </v-progress-circular>
       <div v-if="!large" class="text-small">
         <slot>
-          {{ small ? "" : waitingTextCalculated }}
+          {{ (small || tiny) ? "" : waitingTextCalculated }}
         </slot>
       </div>
     </div>
@@ -31,6 +31,10 @@ export default defineComponent({
       type: Boolean,
       default: true,
     },
+    tiny: {
+      type: Boolean,
+      default: false,
+    },
     small: {
       type: Boolean,
       default: false,
@@ -50,6 +54,13 @@ export default defineComponent({
   },
   setup(props) {
     const size = computed(() => {
+      if (props.tiny) {
+        return {
+          width: 2,
+          icon: 0,
+          size: 25,
+        };
+      }
       if (props.small) {
         return {
           width: 2,

frontend/components/global/BaseDialog.vue

@@ -45,11 +45,13 @@
             </v-btn>
             <v-spacer></v-spacer>
 
+            <slot name="custom-card-action"></slot>
             <BaseButton v-if="$listeners.delete" delete secondary @click="deleteEvent" />
             <BaseButton
               v-if="$listeners.confirm"
               :color="color"
               type="submit"
+              :disabled="submitDisabled"
               @click="
                 $emit('confirm');
                 dialog = false;
@@ -60,8 +62,12 @@
               </template>
               {{ $t("general.confirm") }}
             </BaseButton>
-            <slot name="custom-card-action"></slot>
-            <BaseButton v-if="$listeners.submit" type="submit" :disabled="submitDisabled" @click="submitEvent">
+            <BaseButton
+              v-if="$listeners.submit"
+              type="submit"
+              :disabled="submitDisabled"
+              @click="submitEvent"
+            >
               {{ submitText }}
               <template v-if="submitIcon" #icon>
                 {{ submitIcon }}

frontend/components/global/CrudTable.vue

@@ -99,6 +99,8 @@ export interface TableHeaders {
   value: string;
   show: boolean;
   align?: string;
+  sortable?: boolean;
+  sort?: (a: any, b: any) => number;
 }
 
 export interface BulkAction {

frontend/components/global/SafeMarkdown.vue

@@ -48,3 +48,20 @@ export default defineComponent({
   },
 });
 </script>
+
+<style scoped>
+::v-deep table {
+  border-collapse: collapse;
+  width: 100%;
+}
+
+::v-deep th, ::v-deep td {
+  border: 1px solid;
+  padding: 8px;
+  text-align: left;
+}
+
+::v-deep th {
+  font-weight: bold;
+}
+</style>

frontend/components/global/WakelockSwitch.vue

@@ -16,7 +16,7 @@ export default defineComponent({
     setup() {
         const { isSupported: wakeIsSupported, isActive, request, release } = useWakeLock();
         const wakeLock = computed({
-            get: () => isActive,
+            get: () => isActive.value,
             set: () => {
                 if (isActive.value) {
                     unlockScreen();
@@ -27,13 +27,13 @@ export default defineComponent({
         });
         async function lockScreen() {
             if (wakeIsSupported) {
-                console.log("Wake Lock Requested");
+                console.debug("Wake Lock Requested");
                 await request("screen");
             }
         }
         async function unlockScreen() {
             if (wakeIsSupported || isActive) {
-                console.log("Wake Lock Released");
+                console.debug("Wake Lock Released");
                 await release();
             }
         }

frontend/composables/recipe-page/use-extract-recipe-yield.test.ts

@@ -1,111 +0,0 @@
-import { describe, expect, test } from "vitest";
-import { useExtractRecipeYield } from "./use-extract-recipe-yield";
-
-describe("test use extract recipe yield", () => {
-    test("when text empty return empty", () => {
-        const result = useExtractRecipeYield(null, 1);
-        expect(result).toStrictEqual("");
-    });
-
-    test("when text matches nothing return text", () => {
-        const val = "this won't match anything";
-        const result = useExtractRecipeYield(val, 1);
-        expect(result).toStrictEqual(val);
-
-        const resultScaled = useExtractRecipeYield(val, 5);
-        expect(resultScaled).toStrictEqual(val);
-    });
-
-    test("when text matches a mixed fraction, return a scaled fraction", () => {
-        const val = "10 1/2 units";
-        const result = useExtractRecipeYield(val, 1);
-        expect(result).toStrictEqual(val);
-
-        const resultScaled = useExtractRecipeYield(val, 3);
-        expect(resultScaled).toStrictEqual("31 1/2 units");
-
-        const resultScaledPartial = useExtractRecipeYield(val, 2.5);
-        expect(resultScaledPartial).toStrictEqual("26 1/4 units");
-
-        const resultScaledInt = useExtractRecipeYield(val, 4);
-        expect(resultScaledInt).toStrictEqual("42 units");
-    });
-
-    test("when text matches a fraction, return a scaled fraction", () => {
-        const val = "1/3 plates";
-        const result = useExtractRecipeYield(val, 1);
-        expect(result).toStrictEqual(val);
-
-        const resultScaled = useExtractRecipeYield(val, 2);
-        expect(resultScaled).toStrictEqual("2/3 plates");
-
-        const resultScaledInt = useExtractRecipeYield(val, 3);
-        expect(resultScaledInt).toStrictEqual("1 plates");
-
-        const resultScaledPartial = useExtractRecipeYield(val, 2.5);
-        expect(resultScaledPartial).toStrictEqual("5/6 plates");
-
-        const resultScaledMixed = useExtractRecipeYield(val, 4);
-        expect(resultScaledMixed).toStrictEqual("1 1/3 plates");
-    });
-
-    test("when text matches a decimal, return a scaled, rounded decimal", () => {
-        const val = "1.25 parts";
-        const result = useExtractRecipeYield(val, 1);
-        expect(result).toStrictEqual(val);
-
-        const resultScaled = useExtractRecipeYield(val, 2);
-        expect(resultScaled).toStrictEqual("2.5 parts");
-
-        const resultScaledInt = useExtractRecipeYield(val, 4);
-        expect(resultScaledInt).toStrictEqual("5 parts");
-
-        const resultScaledPartial = useExtractRecipeYield(val, 2.5);
-        expect(resultScaledPartial).toStrictEqual("3.125 parts");
-
-        const roundedVal = "1.33333333333333333333 parts";
-        const resultScaledRounded = useExtractRecipeYield(roundedVal, 2);
-        expect(resultScaledRounded).toStrictEqual("2.667 parts");
-    });
-
-    test("when text matches an int, return a scaled int", () => {
-        const val = "5 bowls";
-        const result = useExtractRecipeYield(val, 1);
-        expect(result).toStrictEqual(val);
-
-        const resultScaled = useExtractRecipeYield(val, 2);
-        expect(resultScaled).toStrictEqual("10 bowls");
-
-        const resultScaledPartial = useExtractRecipeYield(val, 2.5);
-        expect(resultScaledPartial).toStrictEqual("12.5 bowls");
-
-        const resultScaledLarge = useExtractRecipeYield(val, 10);
-        expect(resultScaledLarge).toStrictEqual("50 bowls");
-    });
-
-    test("when text contains an invalid fraction, return the original string", () => {
-        const valDivZero = "3/0 servings";
-        const resultDivZero = useExtractRecipeYield(valDivZero, 3);
-        expect(resultDivZero).toStrictEqual(valDivZero);
-
-        const valDivZeroMixed = "2 4/0 servings";
-        const resultDivZeroMixed = useExtractRecipeYield(valDivZeroMixed, 6);
-        expect(resultDivZeroMixed).toStrictEqual(valDivZeroMixed);
-    });
-
-    test("when text contains a weird or small fraction, return the original string", () => {
-        const valWeird = "2323231239087/134527431962272135 servings";
-        const resultWeird = useExtractRecipeYield(valWeird, 5);
-        expect(resultWeird).toStrictEqual(valWeird);
-
-        const valSmall = "1/20230225 lovable servings";
-        const resultSmall = useExtractRecipeYield(valSmall, 12);
-        expect(resultSmall).toStrictEqual(valSmall);
-    });
-
-    test("when text contains multiple numbers, the first is parsed as the servings amount", () => {
-        const val = "100 sets of 55 bowls";
-        const result = useExtractRecipeYield(val, 3);
-        expect(result).toStrictEqual("300 sets of 55 bowls");
-    })
-});

frontend/composables/recipe-page/use-extract-recipe-yield.ts

@@ -1,132 +0,0 @@
-import { useFraction } from "~/composables/recipes";
-
-const matchMixedFraction = /(?:\d*\s\d*\d*|0)\/\d*\d*/;
-const matchFraction = /(?:\d*\d*|0)\/\d*\d*/;
-const matchDecimal = /(\d+.\d+)|(.\d+)/;
-const matchInt = /\d+/;
-
-
-
-function extractServingsFromMixedFraction(fractionString: string): number | undefined {
-    const mixedSplit = fractionString.split(/\s/);
-    const wholeNumber = parseInt(mixedSplit[0]);
-    const fraction = mixedSplit[1];
-
-    const fractionSplit = fraction.split("/");
-    const numerator = parseInt(fractionSplit[0]);
-    const denominator = parseInt(fractionSplit[1]);
-
-    if (denominator === 0) {
-        return undefined;  // if the denominator is zero, just give up
-    }
-    else {
-        return wholeNumber + (numerator / denominator);
-    }
-}
-
-function extractServingsFromFraction(fractionString: string): number | undefined {
-    const fractionSplit = fractionString.split("/");
-    const numerator = parseInt(fractionSplit[0]);
-    const denominator = parseInt(fractionSplit[1]);
-
-    if (denominator === 0) {
-        return undefined;  // if the denominator is zero, just give up
-    }
-    else {
-        return numerator / denominator;
-    }
-}
-
-
-
-export function findMatch(yieldString: string): [matchString: string, servings: number, isFraction: boolean] | null {
-    if (!yieldString) {
-        return null;
-    }
-
-    const mixedFractionMatch = yieldString.match(matchMixedFraction);
-    if (mixedFractionMatch?.length) {
-        const match = mixedFractionMatch[0];
-        const servings = extractServingsFromMixedFraction(match);
-
-        // if the denominator is zero, return no match
-        if (servings === undefined) {
-            return null;
-        } else {
-            return [match, servings, true];
-        }
-    }
-
-    const fractionMatch = yieldString.match(matchFraction);
-    if (fractionMatch?.length) {
-        const match = fractionMatch[0]
-        const servings = extractServingsFromFraction(match);
-
-        // if the denominator is zero, return no match
-        if (servings === undefined) {
-            return null;
-        } else {
-            return [match, servings, true];
-        }
-    }
-
-    const decimalMatch = yieldString.match(matchDecimal);
-    if (decimalMatch?.length) {
-        const match = decimalMatch[0];
-        return [match, parseFloat(match), false];
-    }
-
-    const intMatch = yieldString.match(matchInt);
-    if (intMatch?.length) {
-        const match = intMatch[0];
-        return [match, parseInt(match), false];
-    }
-
-    return null;
-}
-
-function formatServings(servings: number, scale: number, isFraction: boolean): string {
-    const val = servings * scale;
-    if (Number.isInteger(val)) {
-        return val.toString();
-    } else if (!isFraction) {
-        return (Math.round(val * 1000) / 1000).toString();
-    }
-
-    // convert val into a fraction string
-    const { frac } = useFraction();
-
-    let valString = "";
-    const fraction = frac(val, 10, true);
-
-    if (fraction[0] !== undefined && fraction[0] > 0) {
-        valString += fraction[0];
-    }
-
-    if (fraction[1] > 0) {
-        valString += ` ${fraction[1]}/${fraction[2]}`;
-    }
-
-    return valString.trim();
-}
-
-
-export function useExtractRecipeYield(yieldString: string | null, scale: number): string {
-    if (!yieldString) {
-        return "";
-    }
-
-    const match = findMatch(yieldString);
-    if (!match) {
-        return yieldString;
-    }
-
-    const [matchString, servings, isFraction] = match;
-
-    const formattedServings = formatServings(servings, scale, isFraction);
-    if (!formattedServings) {
-        return yieldString  // this only happens with very weird or small fractions
-    } else {
-        return yieldString.replace(matchString, formatServings(servings, scale, isFraction));
-    }
-}

frontend/composables/recipes/use-recipe-tools.ts

@@ -9,7 +9,6 @@ export const useTools = function (eager = true) {
     id: "",
     name: "",
     slug: "",
-    onHand: false,
   });
 
   const api = useUserApi();

frontend/composables/recipes/use-recipes.ts

@@ -2,7 +2,7 @@ import { useAsync, useRouter, ref } from "@nuxtjs/composition-api";
 import { useAsyncKey } from "../use-utils";
 import { usePublicExploreApi } from "~/composables/api/api-client";
 import { useUserApi } from "~/composables/api";
-import { Recipe } from "~/lib/api/types/recipe";
+import { OrderByNullPosition, Recipe } from "~/lib/api/types/recipe";
 import { RecipeSearchQuery } from "~/lib/api/user/recipes/recipe";
 
 export const allRecipes = ref<Recipe[]>([]);
@@ -11,12 +11,14 @@ export const recentRecipes = ref<Recipe[]>([]);
 function getParams(
   orderBy: string | null = null,
   orderDirection = "desc",
+  orderByNullPosition: OrderByNullPosition | null = null,
   query: RecipeSearchQuery | null = null,
   queryFilter: string | null = null
 ) {
   return {
     orderBy,
     orderDirection,
+    orderByNullPosition,
     paginationSeed: query?._searchSeed, // propagate searchSeed to stabilize random order pagination
     searchSeed: query?._searchSeed, // unused, but pass it along for completeness of data
     search: query?.search,
@@ -47,6 +49,7 @@ export const useLazyRecipes = function (publicGroupSlug: string | null = null) {
     perPage: number,
     orderBy: string | null = null,
     orderDirection = "desc",
+    orderByNullPosition: OrderByNullPosition | null = null,
     query: RecipeSearchQuery | null = null,
     queryFilter: string | null = null,
   ) {
@@ -54,7 +57,7 @@ export const useLazyRecipes = function (publicGroupSlug: string | null = null) {
     const { data, error } = await api.recipes.getAll(
       page,
       perPage,
-      getParams(orderBy, orderDirection, query, queryFilter),
+      getParams(orderBy, orderDirection, orderByNullPosition, query, queryFilter),
     );
 
     if (error?.response?.status === 404) {
@@ -88,7 +91,7 @@ export const useLazyRecipes = function (publicGroupSlug: string | null = null) {
   }
 
   async function getRandom(query: RecipeSearchQuery | null = null, queryFilter: string | null = null) {
-    const { data } = await api.recipes.getAll(1, 1, getParams("random", "desc", query, queryFilter));
+    const { data } = await api.recipes.getAll(1, 1, getParams("random", "desc", null, query, queryFilter));
     if (data?.items.length) {
       return data.items[0];
     }

frontend/composables/recipes/use-scaled-amount.test.ts

@@ -0,0 +1,68 @@
+import { describe, expect, test } from "vitest";
+import { useScaledAmount } from "./use-scaled-amount";
+
+describe("test use recipe yield", () => {
+  function asFrac(numerator: number, denominator: number): string {
+    return `<sup>${numerator}</sup><span>&frasl;</span><sub>${denominator}</sub>`;
+  }
+
+  test("base case", () => {
+    const { scaledAmount, scaledAmountDisplay } = useScaledAmount(3);
+    expect(scaledAmount).toStrictEqual(3);
+    expect(scaledAmountDisplay).toStrictEqual("3");
+  });
+
+  test("base case scaled", () => {
+    const { scaledAmount, scaledAmountDisplay } = useScaledAmount(3, 2);
+    expect(scaledAmount).toStrictEqual(6);
+    expect(scaledAmountDisplay).toStrictEqual("6");
+  });
+
+  test("zero scale", () => {
+    const { scaledAmount, scaledAmountDisplay } = useScaledAmount(3, 0);
+    expect(scaledAmount).toStrictEqual(0);
+    expect(scaledAmountDisplay).toStrictEqual("");
+  });
+
+  test("zero quantity", () => {
+    const { scaledAmount, scaledAmountDisplay } = useScaledAmount(0);
+    expect(scaledAmount).toStrictEqual(0);
+    expect(scaledAmountDisplay).toStrictEqual("");
+  });
+
+  test("basic fraction", () => {
+    const { scaledAmount, scaledAmountDisplay } = useScaledAmount(0.5);
+    expect(scaledAmount).toStrictEqual(0.5);
+    expect(scaledAmountDisplay).toStrictEqual(asFrac(1, 2));
+  });
+
+  test("mixed fraction", () => {
+    const { scaledAmount, scaledAmountDisplay } = useScaledAmount(1.5);
+    expect(scaledAmount).toStrictEqual(1.5);
+    expect(scaledAmountDisplay).toStrictEqual(`1${asFrac(1, 2)}`);
+  });
+
+  test("mixed fraction scaled", () => {
+    const { scaledAmount, scaledAmountDisplay } = useScaledAmount(1.5, 9);
+    expect(scaledAmount).toStrictEqual(13.5);
+    expect(scaledAmountDisplay).toStrictEqual(`13${asFrac(1, 2)}`);
+  });
+
+  test("small scale", () => {
+    const { scaledAmount, scaledAmountDisplay } = useScaledAmount(1, 0.125);
+    expect(scaledAmount).toStrictEqual(0.125);
+    expect(scaledAmountDisplay).toStrictEqual(asFrac(1, 8));
+  });
+
+  test("small qty", () => {
+    const { scaledAmount, scaledAmountDisplay } = useScaledAmount(0.125);
+    expect(scaledAmount).toStrictEqual(0.125);
+    expect(scaledAmountDisplay).toStrictEqual(asFrac(1, 8));
+  });
+
+  test("rounded decimal", () => {
+    const { scaledAmount, scaledAmountDisplay } = useScaledAmount(1.3344559997);
+    expect(scaledAmount).toStrictEqual(1.334);
+    expect(scaledAmountDisplay).toStrictEqual(`1${asFrac(1, 3)}`);
+  });
+});

frontend/composables/recipes/use-scaled-amount.ts

@@ -0,0 +1,32 @@
+import { useFraction } from "~/composables/recipes";
+
+function formatQuantity(val: number): string {
+  if (Number.isInteger(val)) {
+    return val.toString();
+  }
+
+  const { frac } = useFraction();
+
+  let valString = "";
+  const fraction = frac(val, 10, true);
+
+  if (fraction[0] !== undefined && fraction[0] > 0) {
+      valString += fraction[0];
+  }
+
+  if (fraction[1] > 0) {
+      valString += `<sup>${fraction[1]}</sup><span>&frasl;</span><sub>${fraction[2]}</sub>`;
+  }
+
+  return valString.trim();
+}
+
+export function useScaledAmount(amount: number, scale = 1) {
+  const scaledAmount = Number(((amount || 0) * scale).toFixed(3));
+  const scaledAmountDisplay = scaledAmount ? formatQuantity(scaledAmount) : "";
+
+  return {
+    scaledAmount,
+    scaledAmountDisplay,
+  };
+}

frontend/composables/store/use-food-store.ts

@@ -13,7 +13,6 @@ export const useFoodData = function () {
     name: "",
     description: "",
     labelId: undefined,
-    onHand: false,
   });
 }
 

frontend/composables/store/use-tool-store.ts

@@ -3,16 +3,21 @@ import { useData, useReadOnlyStore, useStore } from "../partials/use-store-facto
 import { RecipeTool } from "~/lib/api/types/recipe";
 import { usePublicExploreApi, useUserApi } from "~/composables/api";
 
+interface RecipeToolWithOnHand extends RecipeTool {
+  onHand: boolean;
+}
+
 const store: Ref<RecipeTool[]> = ref([]);
 const loading = ref(false);
 const publicLoading = ref(false);
 
 export const useToolData = function () {
-  return useData<RecipeTool>({
+  return useData<RecipeToolWithOnHand>({
     id: "",
     name: "",
     slug: "",
     onHand: false,
+    householdsWithTool: [],
   });
 }
 

frontend/composables/use-group-recipe-actions.ts

@@ -46,17 +46,23 @@ export const useGroupRecipeActions = function (
     return groupRecipeActions.value;
   });
 
-  function parseRecipeActionUrl(url: string, recipe: Recipe): string {
+  function parseRecipeActionUrl(url: string, recipe: Recipe, recipeScale: number): string {
+    const recipeServings = (recipe.recipeServings || 1) * recipeScale;
+    const recipeYieldQuantity = (recipe.recipeYieldQuantity || 1) * recipeScale;
+
     /* eslint-disable no-template-curly-in-string */
     return url
       .replace("${url}", window.location.href)
       .replace("${id}", recipe.id || "")
       .replace("${slug}", recipe.slug || "")
+      .replace("${servings}", recipeServings.toString())
+      .replace("${yieldQuantity}", recipeYieldQuantity.toString())
+      .replace("${yieldText}", recipe.recipeYield || "")
     /* eslint-enable no-template-curly-in-string */
   };
 
-  async function execute(action: GroupRecipeActionOut, recipe: Recipe): Promise<void | RequestResponse<unknown>> {
-    const url = parseRecipeActionUrl(action.url, recipe);
+  async function execute(action: GroupRecipeActionOut, recipe: Recipe, recipeScale: number): Promise<void | RequestResponse<unknown>> {
+    const url = parseRecipeActionUrl(action.url, recipe, recipeScale);
 
     switch (action.actionType) {
       case "link":

frontend/composables/use-users/preferences.ts

@@ -1,6 +1,7 @@
 import { Ref, useContext } from "@nuxtjs/composition-api";
 import { useLocalStorage, useSessionStorage } from "@vueuse/core";
 import { RegisteredParser, TimelineEventType } from "~/lib/api/types/recipe";
+import { QueryFilterJSON } from "~/lib/api/types/response";
 
 export interface UserPrintPreferences {
   imagePosition: string;
@@ -49,6 +50,17 @@ export interface UserCookbooksPreferences {
   hideOtherHouseholds: boolean;
 }
 
+export interface UserRecipeFinderPreferences {
+  foodIds: string[];
+  toolIds: string[];
+  queryFilter: string;
+  queryFilterJSON: QueryFilterJSON;
+  maxMissingFoods: number;
+  maxMissingTools: number;
+  includeFoodsOnHand: boolean;
+  includeToolsOnHand: boolean;
+}
+
 export function useUserMealPlanPreferences(): Ref<UserMealPlanPreferences> {
   const fromStorage = useLocalStorage(
     "meal-planner-preferences",
@@ -171,3 +183,24 @@ export function useCookbookPreferences(): Ref<UserCookbooksPreferences> {
 
   return fromStorage;
 }
+
+export function useRecipeFinderPreferences(): Ref<UserRecipeFinderPreferences> {
+  const fromStorage = useLocalStorage(
+    "recipe-finder-preferences",
+    {
+      foodIds: [],
+      toolIds: [],
+      queryFilter: "",
+      queryFilterJSON: { parts: [] } as QueryFilterJSON,
+      maxMissingFoods: 20,
+      maxMissingTools: 20,
+      includeFoodsOnHand: true,
+      includeToolsOnHand: true,
+    },
+    { mergeDefaults: true }
+    // we cast to a Ref because by default it will return an optional type ref
+    // but since we pass defaults we know all properties are set.
+  ) as unknown as Ref<UserRecipeFinderPreferences>;
+
+  return fromStorage;
+}

frontend/lang/messages/af-ZA.json

@@ -276,7 +276,8 @@
     "admin-group-management": "Admin groepbestuur",
     "admin-group-management-text": "Veranderinge aan hierdie groep sal onmiddellik weerspieël word.",
     "group-id-value": "Groep-Id: {0}",
-    "total-households": "Total Households"
+    "total-households": "Total Households",
+    "you-must-select-a-group-before-selecting-a-household": "You must select a group before selecting a household"
   },
   "household": {
     "household": "Household",
@@ -517,6 +518,7 @@
     "save-recipe-before-use": "Stoor resep voor gebruik",
     "section-title": "Afdeling titel",
     "servings": "Porsies",
+    "serves-amount": "Serves {amount}",
     "share-recipe-message": "Ek wou my {0}-resep met jou deel.",
     "show-nutrition-values": "Wys voedingswaardes",
     "sodium-content": "Natrium",
@@ -545,6 +547,8 @@
     "failed-to-add-recipe-to-mealplan": "Kon nie resep by maaltydplan voeg nie",
     "failed-to-add-to-list": "Failed to add to list",
     "yield": "Resultaat",
+    "yields-amount-with-text": "Yields {amount} {text}",
+    "yield-text": "Yield Text",
     "quantity": "Hoeveelheid",
     "choose-unit": "Kies 'n eenheid",
     "press-enter-to-create": "Druk Enter om te skep",
@@ -566,13 +570,6 @@
     "increase-scale-label": "Verhoog skaal met 1",
     "locked": "Gesluit",
     "public-link": "Openbare skakel",
-    "timer": {
-      "kitchen-timer": "Kombuis timer",
-      "start-timer": "Begin die kombuis timer",
-      "pause-timer": "Onderbreek die kombuis timer",
-      "resume-timer": "Hervat kombuis timer",
-      "stop-timer": "Stop die kombuis timer"
-    },
     "edit-timeline-event": "Wysig tydlyn gebeurtenis",
     "timeline": "Tydlyn",
     "timeline-is-empty": "Nog niks op die tydlyn nie. Probeer hierdie resep maak!",
@@ -640,7 +637,9 @@
     "recipe-debugger-use-openai-description": "Use OpenAI to parse the results instead of relying on the scraper library. When creating a recipe via URL, this is done automatically if the scraper library fails, but you may test it manually here.",
     "debug": "Debug",
     "tree-view": "Boomstruktuur",
+    "recipe-servings": "Recipe Servings",
     "recipe-yield": "Resep opbrengs",
+    "recipe-yield-text": "Recipe Yield Text",
     "unit": "Eenheid",
     "upload-image": "Laai prent",
     "screen-awake": "Hou die skerm aan",
@@ -662,7 +661,25 @@
       "missing-food": "Create missing food: {food}",
       "no-food": "No Food"
     },
-    "reset-servings-count": "Reset Servings Count"
+    "reset-servings-count": "Reset Servings Count",
+    "not-linked-ingredients": "Additional Ingredients"
+  },
+  "recipe-finder": {
+    "recipe-finder": "Recipe Finder",
+    "recipe-finder-description": "Search for recipes based on ingredients you have on hand. You can also filter by tools you have available, and set a maximum number of missing ingredients or tools.",
+    "selected-ingredients": "Selected Ingredients",
+    "no-ingredients-selected": "No ingredients selected",
+    "missing": "Missing",
+    "no-recipes-found": "No recipes found",
+    "no-recipes-found-description": "Try adding more ingredients to your search or adjusting your filters",
+    "include-ingredients-on-hand": "Include Ingredients On Hand",
+    "include-tools-on-hand": "Include Tools On Hand",
+    "max-missing-ingredients": "Max Missing Ingredients",
+    "max-missing-tools": "Max Missing Tools",
+    "selected-tools": "Selected Tools",
+    "other-filters": "Other Filters",
+    "ready-to-make": "Ready to Make",
+    "almost-ready-to-make": "Almost Ready to Make"
   },
   "search": {
     "advanced-search": "Gevorderde soek",
@@ -866,7 +883,8 @@
     "you-are-offline-description": "Not all features are available while offline. You can still add, modify, and remove items, but you will not be able to sync your changes to the server until you are back online.",
     "are-you-sure-you-want-to-check-all-items": "Are you sure you want to check all items?",
     "are-you-sure-you-want-to-uncheck-all-items": "Are you sure you want to uncheck all items?",
-    "are-you-sure-you-want-to-delete-checked-items": "Are you sure you want to delete all checked items?"
+    "are-you-sure-you-want-to-delete-checked-items": "Are you sure you want to delete all checked items?",
+    "no-shopping-lists-found": "No Shopping Lists Found"
   },
   "sidebar": {
     "all-recipes": "Alle resepte",
@@ -1278,6 +1296,7 @@
   "profile": {
     "welcome-user": "👋 Welcome, {0}!",
     "description": "Bestuur jou profiel, resepte en groepverstellings.",
+    "invite-link": "Invite Link",
     "get-invite-link": "Kry uitnodigingskakel",
     "get-public-link": "Kry openbare skakel",
     "account-summary": "Rekeningopsomming",
@@ -1327,6 +1346,8 @@
   "cookbook": {
     "cookbooks": "Kookboeke",
     "description": "Cookbooks are another way to organize recipes by creating cross sections of recipes, organizers, and other filters. Creating a cookbook will add an entry to the side-bar and all the recipes with the filters chosen will be displayed in the cookbook.",
+    "hide-cookbooks-from-other-households": "Hide Cookbooks from Other Households",
+    "hide-cookbooks-from-other-households-description": "When enabled, only cookbooks from your household will appear on the sidebar",
     "public-cookbook": "Openbare kookboek",
     "public-cookbook-description": "Publieke kookboeke kan met nie-mealie-gebruikers gedeel word en sal op jou groepbladsy verskyn.",
     "filter-options": "Filter opsies",

frontend/lang/messages/ar-SA.json

@@ -8,7 +8,7 @@
     "database-type": "نوع قاعدة البيانات",
     "database-url": "رابط قاعدة البيانات",
     "default-group": "المجموعة الافتراضية",
-    "default-household": "Default Household",
+    "default-household": "العائلة الافتراضية",
     "demo": "عرض تجريبي",
     "demo-status": "حالة العرض تجريبي",
     "development": "تطوير",
@@ -65,7 +65,7 @@
     "something-went-wrong": "حدث خطأ ما!",
     "subscribed-events": "الأحداث التي تم الاشتراك فيها",
     "test-message-sent": "تم إرسال رسالة تجريبية",
-    "message-sent": "Message Sent",
+    "message-sent": "تم إرسال الرسالة",
     "new-notification": "إشعار جديد",
     "event-notifiers": "إشعار الحدث",
     "apprise-url-skipped-if-blank": "الرابط Apprise (يتم تجاهله إذا ما كان فارغً)",
@@ -79,15 +79,15 @@
     "tag-events": "أحداث الوسم",
     "category-events": "أحداث الفئة",
     "when-a-new-user-joins-your-group": "عندما ينضم مستخدم جديد إلى مجموعتك",
-    "recipe-events": "Recipe Events"
+    "recipe-events": "وصفات المناسبات"
   },
   "general": {
-    "add": "Add",
+    "add": "أضف",
     "cancel": "إلغاء",
     "clear": "مسح",
     "close": "إغلاق",
     "confirm": "تأكيد",
-    "confirm-how-does-everything-look": "How does everything look?",
+    "confirm-how-does-everything-look": "كيف تبدو كل شيء؟",
     "confirm-delete-generic": "هل انت متأكد من حذف هذا؟",
     "copied_message": "تم النسخ!",
     "create": "إنشاء",
@@ -146,23 +146,23 @@
     "save": "حفظ",
     "settings": "الإعدادات",
     "share": "مشاركة",
-    "show-all": "Show All",
+    "show-all": "عرض الكل",
     "shuffle": "ترتيب عشوائي",
     "sort": "ترتيب",
-    "sort-ascending": "Sort Ascending",
-    "sort-descending": "Sort Descending",
+    "sort-ascending": "ترتيب تصاعدي",
+    "sort-descending": "ترتيب تنازلي",
     "sort-alphabetically": "ترتيب حَسَبَ الحروف الأبجدية",
     "status": "الحالة",
     "subject": "الموضوع",
     "submit": "إرسال",
     "success-count": "نجحت: {count}",
     "sunday": "الأحد",
-    "system": "System",
+    "system": "النظام",
     "templates": "القوالب:",
     "test": "تجربة",
     "themes": "السمات",
     "thursday": "الخميس",
-    "title": "Title",
+    "title": "العنوان",
     "token": "الرمز التعريفي",
     "tuesday": "الثلاثاء",
     "type": "النوع",
@@ -177,12 +177,12 @@
     "units": "الوحدات",
     "back": "عودة",
     "next": "التالي",
-    "start": "Start",
+    "start": "إبدأ",
     "toggle-view": "تبديل طريقة العرض",
     "date": "التاريخ",
     "id": "المعرف",
     "owner": "المالك",
-    "change-owner": "Change Owner",
+    "change-owner": "تغير المالك",
     "date-added": "تاريخ الإضافة",
     "none": "لا شيء",
     "run": "شغّل",
@@ -209,15 +209,15 @@
     "refresh": "تحديث",
     "upload-file": "تحميل الملف",
     "created-on-date": "تم الإنشاء في {0}",
-    "unsaved-changes": "You have unsaved changes. Do you want to save before leaving? Okay to save, Cancel to discard changes.",
-    "clipboard-copy-failure": "Failed to copy to the clipboard.",
-    "confirm-delete-generic-items": "Are you sure you want to delete the following items?",
-    "organizers": "Organizers",
-    "caution": "Caution",
-    "show-advanced": "Show Advanced",
-    "add-field": "Add Field",
-    "date-created": "Date Created",
-    "date-updated": "Date Updated"
+    "unsaved-changes": "لديك تغييرات غير محفوظة. هل تريد الحفظ قبل المغادرة؟ حسنًا للحفظ، قم بإلغاء تجاهل التغييرات.",
+    "clipboard-copy-failure": "فشل في النسخ إلى الحافظة.",
+    "confirm-delete-generic-items": "هل أنت متأكد أنك تريد حذف المجموعات التالية؟",
+    "organizers": "المنظمون",
+    "caution": "تحذير",
+    "show-advanced": "إظهار متقدمة",
+    "add-field": "إضافة حقل",
+    "date-created": "تاريخ الإنشاء",
+    "date-updated": "تاريخ التحديث"
   },
   "group": {
     "are-you-sure-you-want-to-delete-the-group": "هل انت متأكد من رغبتك في حذف <b>{groupName}<b/>؟",
@@ -244,65 +244,66 @@
       "keep-my-recipes-private-description": "تعيين مجموعتك وجميع الوصفات الافتراضية إلى النمط الخاص. يمكنك دائماً تغييرها لاحقاً."
     },
     "manage-members": "إدارة الأعضاء",
-    "manage-members-description": "Manage the permissions of the members in your household. {manage} allows the user to access the data-management page, and {invite} allows the user to generate invitation links for other users. Group owners cannot change their own permissions.",
+    "manage-members-description": ".",
     "manage": "إدارة الحساب",
-    "manage-household": "Manage Household",
+    "manage-household": "إدارة العائلة",
     "invite": "دعوة",
     "looking-to-update-your-profile": "هل ترغب في تحديث ملفك الشخصي؟",
     "default-recipe-preferences-description": "هذه هي الإعدادات الافتراضية عند إنشاء وصفة جديدة في مجموعتك. يمكن تغيير هذه الوصفات الفردية في قائمة إعدادات الوصفات.",
-    "default-recipe-preferences": "Default Recipe Preferences",
+    "default-recipe-preferences": "تفضيلات الوصفة الافتراضية",
     "group-preferences": "إعدادات المجموعة",
     "private-group": "مجموعة خاصة",
-    "private-group-description": "Setting your group to private will disable all public view options. This overrides any individual public view settings",
-    "enable-public-access": "Enable Public Access",
-    "enable-public-access-description": "Make group recipes public by default, and allow visitors to view recipes without logging-in",
+    "private-group-description": "سيؤدي تعيين مجموعتك إلى الخاص إلى تعطيل جميع خيارات العرض العام. وهذا يلغي أي إعدادات عرض عام فردية",
+    "enable-public-access": "تمكين الوصول للعموم",
+    "enable-public-access-description": "جعل وصفات المجموعة عامة بشكل افتراضي، والسماح للزوار بعرض الوصفات دون تسجيل الدخول",
     "allow-users-outside-of-your-group-to-see-your-recipes": "السماح للمستخدمين خارج مجموعتك لمشاهدة وصفاتك",
-    "allow-users-outside-of-your-group-to-see-your-recipes-description": "When enabled you can use a public share link to share specific recipes without authorizing the user. When disabled, you can only share recipes with users who are in your group or with a pre-generated private link",
+    "allow-users-outside-of-your-group-to-see-your-recipes-description": "عند التمكين يمكنك استخدام رابط المشاركة العامة لمشاركة وصفات محددة دون تفويض المستخدم. عند التعطيل، يمكنك مشاركة الوصفات فقط مع المستخدمين الموجودين في مجموعتك أو مع رابط خاص تم إنشاؤه مسبقاً",
     "show-nutrition-information": "عرض معلومات التغذية",
-    "show-nutrition-information-description": "When enabled the nutrition information will be shown on the recipe if available. If there is no nutrition information available, the nutrition information will not be shown",
-    "show-recipe-assets": "Show recipe assets",
-    "show-recipe-assets-description": "When enabled the recipe assets will be shown on the recipe if available",
-    "default-to-landscape-view": "Default to landscape view",
-    "default-to-landscape-view-description": "When enabled the recipe header section will be shown in landscape view",
+    "show-nutrition-information-description": "عندما يتم تمكين المعلومات الغذائية ستظهر على الوصفة إذا كانت متاحة. وفي حالة عدم توافر معلومات عن التغذية، لن تظهر المعلومات المتعلقة بالتغذية",
+    "show-recipe-assets": "إظهار أصول الوصفة",
+    "show-recipe-assets-description": "عند تمكين الوصفة، سيتم عرض أصول الوصفة على الوصفة إذا كانت متوفرة",
+    "default-to-landscape-view": "الافتراضي للعرض الأفقي",
+    "default-to-landscape-view-description": "عند تمكين قسم رأس الوصفة سوف يظهر في العرض الأفقي",
     "disable-users-from-commenting-on-recipes": "إيقاف المستخدمين من التعليق على الوصفات",
-    "disable-users-from-commenting-on-recipes-description": "Hides the comment section on the recipe page and disables commenting",
-    "disable-organizing-recipe-ingredients-by-units-and-food": "Disable organizing recipe ingredients by units and food",
-    "disable-organizing-recipe-ingredients-by-units-and-food-description": "Hides the Food, Unit, and Amount fields for ingredients and treats ingredients as plain text fields",
-    "general-preferences": "General Preferences",
-    "group-recipe-preferences": "Group Recipe Preferences",
+    "disable-users-from-commenting-on-recipes-description": "يخفي قسم التعليق على صفحة الوصفة ويعطل التعليق",
+    "disable-organizing-recipe-ingredients-by-units-and-food": "تعطيل تنظيم عناصر الوصفة حسب الوحدات والطعام",
+    "disable-organizing-recipe-ingredients-by-units-and-food-description": "يخفي حقول الطعام والوحدة والكمية للمكونات ويعامل المكونات كحقول نصية عادية",
+    "general-preferences": "الإعدادات العامة",
+    "group-recipe-preferences": "تفضيلات الوصفة للمجموعة",
     "report": "تقرير",
-    "report-with-id": "Report ID: {id}",
-    "group-management": "Group Management",
-    "admin-group-management": "Admin Group Management",
-    "admin-group-management-text": "Changes to this group will be reflected immediately.",
-    "group-id-value": "Group Id: {0}",
-    "total-households": "Total Households"
+    "report-with-id": "معرف التقرير: {id}",
+    "group-management": "إدارة المجموعة",
+    "admin-group-management": "إدارة مجموعة المشرف",
+    "admin-group-management-text": "التغييرات التي ستطرأ على هذه المجموعة ستنعكس على الفور.",
+    "group-id-value": "معرف المجموعة: {0}",
+    "total-households": "مجموع المنزل",
+    "you-must-select-a-group-before-selecting-a-household": "يجب عليك تحديد مجموعة قبل تحديد المنزل"
   },
   "household": {
-    "household": "Household",
-    "households": "Households",
-    "user-household": "User Household",
-    "create-household": "Create Household",
-    "household-name": "Household Name",
-    "household-group": "Household Group",
-    "household-management": "Household Management",
-    "manage-households": "Manage Households",
-    "admin-household-management": "Admin Household Management",
-    "admin-household-management-text": "Changes to this household will be reflected immediately.",
-    "household-id-value": "Household Id: {0}",
-    "private-household": "Private Household",
-    "private-household-description": "Setting your household to private will disable all public view options. This overrides any individual public view settings",
-    "lock-recipe-edits-from-other-households": "Lock recipe edits from other households",
-    "lock-recipe-edits-from-other-households-description": "When enabled only users in your household can edit recipes created by your household",
-    "household-recipe-preferences": "Household Recipe Preferences",
-    "default-recipe-preferences-description": "These are the default settings when a new recipe is created in your household. These can be changed for individual recipes in the recipe settings menu.",
-    "allow-users-outside-of-your-household-to-see-your-recipes": "Allow users outside of your household to see your recipes",
-    "allow-users-outside-of-your-household-to-see-your-recipes-description": "When enabled you can use a public share link to share specific recipes without authorizing the user. When disabled, you can only share recipes with users who are in your household or with a pre-generated private link",
-    "household-preferences": "Household Preferences"
+    "household": "المنزل",
+    "households": "المنازل",
+    "user-household": "منزل المستخدم",
+    "create-household": "إنشاء منزل",
+    "household-name": "اسم المنزل",
+    "household-group": "مجموعة المنزل",
+    "household-management": "إدارة المنزل",
+    "manage-households": "إدارة المنازل",
+    "admin-household-management": "إدارة مشرف المنزل",
+    "admin-household-management-text": "التغييرات التي ستطرأ على هذا المنزل ستنعكس على الفور.",
+    "household-id-value": "معرف المنزل: {0}",
+    "private-household": "منزل خاص",
+    "private-household-description": "سيؤدي تعيين المنزل إلى خاص إلى تعطيل جميع خيارات العرض العام. وهذا يلغي أي إعدادات عرض عام فردية",
+    "lock-recipe-edits-from-other-households": "إقفال تحرير الوصفة من المنازل الأخرى",
+    "lock-recipe-edits-from-other-households-description": "عند التمكين, المستخدمين فقط في أسرتك المعيشية يمكنهم تعديل الوصفات التي أنشأتها أسرتك",
+    "household-recipe-preferences": "تفضيلات الوصفة المنزلية",
+    "default-recipe-preferences-description": "هذه هي الإعدادات الافتراضية عند إنشاء وصفة جديدة في منزلك. يمكن تغيير الوصفات الفردية في قائمة إعدادات الوصفة.",
+    "allow-users-outside-of-your-household-to-see-your-recipes": "السماح للمستخدمين خارج منزلك بمشاهدة وصفاتك",
+    "allow-users-outside-of-your-household-to-see-your-recipes-description": "عند التمكين يمكنك استخدام رابط المشاركة العامة لمشاركة وصفات محددة دون تفويض المستخدم. عند التعطيل، يمكنك مشاركة الوصفات فقط مع المستخدمين الموجودين في منزلك أو مع رابط خاص تم إنشاؤه مسبقاً",
+    "household-preferences": "تفضيلات المنزل"
   },
   "meal-plan": {
     "create-a-new-meal-plan": "إنشاء خطة وجبة جديدة",
-    "update-this-meal-plan": "Update this Meal Plan",
+    "update-this-meal-plan": "تحديث خِطَّة الوجبة الغذائية هذه",
     "dinner-this-week": "العشاء لهذا الأسبوع",
     "dinner-today": "العشاء اليوم",
     "dinner-tonight": "العشاء الليلة",
@@ -320,95 +321,95 @@
     "mealplan-settings": "اعدادات خطة الوجبات",
     "mealplan-update-failed": "فشل تحديث خطة الوجبات",
     "mealplan-updated": "تم تحديث خطة الوجبات",
-    "mealplan-households-description": "If no household is selected, recipes can be added from any household",
-    "any-category": "Any Category",
-    "any-tag": "Any Tag",
-    "any-household": "Any Household",
+    "mealplan-households-description": "إذا لم يتم اختيار منزل، يمكن إضافة وصفات من أي منزل",
+    "any-category": "أي فئة",
+    "any-tag": "أي وسم",
+    "any-household": "أي منزل",
     "no-meal-plan-defined-yet": "لم يتم تحديد خطة بعد",
     "no-meal-planned-for-today": "لم يتم تخطيط وجبة لهذا اليوم",
-    "numberOfDays-hint": "Number of days on page load",
-    "numberOfDays-label": "Default Days",
+    "numberOfDays-hint": "عدد الأيام عند تحميل الصفحة",
+    "numberOfDays-label": "الأيام الافتراضية",
     "only-recipes-with-these-categories-will-be-used-in-meal-plans": "فقط الوجبات التي تحتوي على التصنيفات التالية سوف تستخدم لإنشاء خطتك",
     "planner": "المخطط",
-    "quick-week": "Quick Week",
+    "quick-week": "أسبوع سريع",
     "side": "وجبة جانبية",
     "sides": "الوجبات الجانبية",
     "start-date": "تاريخ البدء",
-    "rule-day": "Rule Day",
+    "rule-day": "يوم القاعدة",
     "meal-type": "نوع الوجبة",
     "breakfast": "الإفطار",
     "lunch": "الغداء",
     "dinner": "العشاء",
     "type-any": "أي",
     "day-any": "أي",
-    "editor": "Editor",
+    "editor": "المحرر",
     "meal-recipe": "وصفة الوجبة",
     "meal-title": "عنوان الوجبة",
     "meal-note": "ملاحظة الوجبة",
     "note-only": "ملاحظة فقط",
     "random-meal": "وجبة عشوائية",
     "random-dinner": "عشاء عشوائي",
-    "random-side": "Random Side",
-    "this-rule-will-apply": "This rule will apply {dayCriteria} {mealTypeCriteria}.",
+    "random-side": "جانب عشوائي",
+    "this-rule-will-apply": "هذه القاعدة سوف تطبق على {dayCriteria} {mealTypeCriteria}.",
     "to-all-days": "إلى جميع الأيام",
-    "on-days": "on {0}s",
+    "on-days": "على أيام {0}",
     "for-all-meal-types": "لجميع أنواع الوجبات",
-    "for-type-meal-types": "for {0} meal types",
-    "meal-plan-rules": "Meal Plan Rules",
+    "for-type-meal-types": "لأنواع الوجبات {0}",
+    "meal-plan-rules": "قواعد خِطَّة وجبة الطعام",
     "new-rule": "قاعدة جديدة",
-    "meal-plan-rules-description": "You can create rules for auto selecting recipes for your meal plans. These rules are used by the server to determine the random pool of recipes to select from when creating meal plans. Note that if rules have the same day/type constraints then the rule filters will be merged. In practice, it's unnecessary to create duplicate rules, but it's possible to do so.",
-    "new-rule-description": "When creating a new rule for a meal plan you can restrict the rule to be applicable for a specific day of the week and/or a specific type of meal. To apply a rule to all days or all meal types you can set the rule to \"Any\" which will apply it to all the possible values for the day and/or meal type.",
+    "meal-plan-rules-description": "يمكنك إنشاء قواعد لاختيار الوصفات التلقائية لخطط وجبتك الغذائية. وتستخدم هذه القواعد من قبل الخادم لتحديد مجموعة عشوائية من الوصفات التي يتم اختيارها من خلال إنشاء خطط الوجبات. لاحظ أنه إذا كانت القواعد تحتوي على نفس قيود اليوم/النوع فسيتم دمج عوامل تصفية القاعدة. من الناحية العملية، ليس من الضروري إنشاء قواعد مكررة، ولكن من الممكن فعل ذلك.",
+    "new-rule-description": "عند إنشاء قاعدة جديدة لخطة وجبة غذائية، يمكنك تقييد القاعدة لتكون قابلة للتطبيق ليوم محدد من الأسبوع و/أو نوع محدد من الوجبات. لتطبيق قاعدة على جميع الأيام أو جميع أنواع الوجبات الغذائية يمكنك تعيين القاعدة إلى \"أي كان\" التي ستطبقها على جميع القيم الممكنة لليوم و/أو نوع الوجبة.",
     "recipe-rules": "قواعد الوصفات",
     "applies-to-all-days": "ينطبق على جميع الأيام",
-    "applies-on-days": "Applies on {0}s",
-    "meal-plan-settings": "Meal Plan Settings"
+    "applies-on-days": "يطبق على أيام {0}",
+    "meal-plan-settings": "إعدادات خِطَّة الوجبات الغذائية"
   },
   "migration": {
-    "migration-data-removed": "Migration data removed",
-    "new-migration": "New Migration",
+    "migration-data-removed": "حذف بيانات الهجرة",
+    "new-migration": "هجرة جديدة",
     "no-file-selected": "لم يتمّ اختيار أيّ ملفّ",
-    "no-migration-data-available": "No Migration Data Available",
-    "previous-migrations": "Previous Migrations",
+    "no-migration-data-available": "لا توجد بيانات هجرة متوفرة",
+    "previous-migrations": "الهجرة السابقة",
     "recipe-migration": "نقل الوصفة",
     "chowdown": {
-      "description": "Migrate data from Chowdown",
-      "description-long": "Mealie natively supports the chowdown repository format. Download the code repository as a .zip file and upload it below.",
-      "title": "Chowdown"
+      "description": "نقل البيانات من \"Chowdown\"",
+      "description-long": "ميلي يدعم بشكل محلي تنسيق مستودع طعام. يجب تنزيل مستودع التعليمات البرمجية CODE REPOSITORY كملف مضغوط ZIP وتحميله أدناه.",
+      "title": "\"Chowdown\""
     },
     "nextcloud": {
-      "description": "Migrate data from a Nextcloud Cookbook instance",
-      "description-long": "Nextcloud recipes can be imported from a zip file that contains the data stored in Nextcloud. See the example folder structure below to ensure your recipes are able to be imported.",
-      "title": "Nextcloud Cookbook"
+      "description": "نقل البيانات من نموذج كتاب طبخ NEXTCLOUD",
+      "description-long": "يمكن استيراد الوصفات السحابية من مِلَفّ مضغوط ZIP يحتوي على البيانات المخزنة في Nextcloud. راجع بنية مجلد المثال أدناه للتأكد من أن وصفاتك قابلة للاستيراد.",
+      "title": "كتاب طبخ <Nextcloud>"
     },
     "copymethat": {
-      "description-long": "Mealie can import recipes from Copy Me That. Export your recipes in HTML format, then upload the .zip below.",
-      "title": "Copy Me That Recipe Manager"
+      "description-long": "يمكن لميلي استيراد الوصفات من نسخ لي. يجب تصدير وصفاتك بتنسيق HTML، ثم تحميل ZIP أدناه.",
+      "title": "انسخ لي مدير الوصفة"
     },
     "paprika": {
-      "description-long": "Mealie can import recipes from the Paprika application. Export your recipes from paprika, rename the export extension to .zip and upload it below.",
-      "title": "Paprika Recipe Manager"
+      "description-long": "يمكن لميلي استيراد الوصفات من تطبيق PAPRIKA. يجب تصدير وصفاتك من PAPRIKA، وإعادة تسمية امتداد التصدير إلى .ZIP وتحميله أدناه.",
+      "title": "مدير وصفة بابريكا"
     },
     "mealie-pre-v1": {
-      "description-long": "Mealie can import recipes from the Mealie application from a pre v1.0 release. Export your recipes from your old instance, and upload the zip file below. Note that only recipes can be imported from the export.",
-      "title": "Mealie Pre v1.0"
+      "description-long": "يمكن لميلي استيراد الوصفات من تطبيق ميلي من إصدار قبل 1.0. يجب تصدير وصفاتك من نموذجك القديم، وتحميل المِلَفّ المضغوط أدناه. لاحظ أنه يمكن استيراد الوصفات فقط من التصدير.",
+      "title": "ميلي إصدار قبل 1.0"
     },
     "tandoor": {
-      "description-long": "Mealie can import recipes from Tandoor. Export your data in the \"Default\" format, then upload the .zip below.",
-      "title": "Tandoor Recipes"
+      "description-long": "يمكن لميلي استيراد الوصفات من تندور. يجب تصدير بياناتك بالتنسيق \"الافتراضي\"، ثم يجب تحميل المِلَفّ المضغوط أدناه.",
+      "title": "وصفات تاندور"
     },
-    "recipe-data-migrations": "Recipe Data Migrations",
-    "recipe-data-migrations-explanation": "Recipes can be migrated from another supported application to Mealie. This is a great way to get started with Mealie.",
-    "coming-from-another-application-or-an-even-older-version-of-mealie": "Coming from another application or an even older version of Mealie? Check out migrations and see if your data can be imported.",
-    "choose-migration-type": "Choose Migration Type",
-    "tag-all-recipes": "Tag all recipes with {tag-name} tag",
-    "nextcloud-text": "Nextcloud recipes can be imported from a zip file that contains the data stored in Nextcloud. See the example folder structure below to ensure your recipes are able to be imported.",
+    "recipe-data-migrations": "وصفة 2",
+    "recipe-data-migrations-explanation": "يمكن نقل الوصفات من تطبيق آخر مدعوم إلى ميلي. هذه طريقة رائعة للبدء مع ميلي.",
+    "coming-from-another-application-or-an-even-older-version-of-mealie": "هل تأتي من تطبيق آخر أو حتى إصدار قديم من ميلي؟ يجب التحقق من عمليات الترحيل لمعرفة ما إذا كان يمكن استيراد بياناتك.",
+    "choose-migration-type": "اختر نوع الترحيل",
+    "tag-all-recipes": "وسم جميع الوصفات باستخدام علامة {tag-name}",
+    "nextcloud-text": "يمكن استيراد الوصفات السحابية من مِلَفّ مضغوط Zip يحتوي على البيانات المخزنة في Nextcloud. راجع بنية مجلد المثال أدناه للتأكد من أن وصفاتك قابلة للاستيراد.",
     "chowdown-text": "Mealie natively supports the chowdown repository format. Download the code repository as a .zip file and upload it below.",
-    "recipe-1": "Recipe 1",
-    "recipe-2": "Recipe 2",
+    "recipe-1": "وصفة 1",
+    "recipe-2": "وصفة 2",
     "paprika-text": "Mealie can import recipes from the Paprika application. Export your recipes from paprika, rename the export extension to .zip and upload it below.",
     "mealie-text": "Mealie can import recipes from the Mealie application from a pre v1.0 release. Export your recipes from your old instance, and upload the zip file below. Note that only recipes can be imported from the export.",
     "plantoeat": {
-      "title": "Plan to Eat",
+      "title": "خِطَّة تناول الطعام",
       "description-long": "Mealie can import recipies from Plan to Eat."
     },
     "myrecipebox": {
@@ -416,44 +417,44 @@
       "description-long": "Mealie can import recipes from My Recipe Box. Export your recipes in CSV format, then upload the .csv file below."
     },
     "recipekeeper": {
-      "title": "Recipe Keeper",
+      "title": "مدير الوصفة",
       "description-long": "Mealie can import recipes from Recipe Keeper. Export your recipes in zip format, then upload the .zip file below."
     }
   },
   "new-recipe": {
-    "bulk-add": "Bulk Add",
+    "bulk-add": "إضافة مجموعة",
     "error-details": "Only websites containing ld+json or microdata can be imported by Mealie. Most major recipe websites support this data structure. If your site cannot be imported but there is json data in the log, please submit a github issue with the URL and data.",
     "error-title": "Looks Like We Couldn't Find Anything",
-    "from-url": "Import a Recipe",
+    "from-url": "استيراد وصفة",
     "github-issues": "مشاكل GitHub",
     "google-ld-json-info": "معرف Google + معلومات json",
     "must-be-a-valid-url": "يجب أن يكون عنوان URL صالحًا",
     "paste-in-your-recipe-data-each-line-will-be-treated-as-an-item-in-a-list": "Paste in your recipe data. Each line will be treated as an item in a list",
     "recipe-markup-specification": "Recipe Markup Specification",
-    "recipe-url": "Recipe URL",
-    "recipe-html-or-json": "Recipe HTML or JSON",
-    "upload-a-recipe": "Upload a Recipe",
-    "upload-individual-zip-file": "Upload an individual .zip file exported from another Mealie instance.",
-    "url-form-hint": "Copy and paste a link from your favorite recipe website",
-    "view-scraped-data": "View Scraped Data",
-    "trim-whitespace-description": "Trim leading and trailing whitespace as well as blank lines",
-    "trim-prefix-description": "Trim first character from each line",
+    "recipe-url": "رابط الوصفة",
+    "recipe-html-or-json": "وصفة HTML أو JSON",
+    "upload-a-recipe": "تحميل وصفة",
+    "upload-individual-zip-file": "تحميل مِلَفّ zip فردي تم تصديره من مثيل Malie آخر.",
+    "url-form-hint": "نسخ ولصق رابط من موقعك المفضل للوصفة",
+    "view-scraped-data": "عرض البيانات المكشوفة",
+    "trim-whitespace-description": "قص المسافات البيضاء البادئة واللاحقة وكذلك الأسطر الفارغة",
+    "trim-prefix-description": "قص الحرف الأول من كل سطر",
     "split-by-numbered-line-description": "Attempts to split a paragraph by matching '1)' or '1.' patterns",
-    "import-by-url": "Import a recipe by URL",
-    "create-manually": "Create a recipe manually",
-    "make-recipe-image": "Make this the recipe image"
+    "import-by-url": "استيراد وصفة عن طريق عنوان URL",
+    "create-manually": "إنشاء وصفة يدوياً",
+    "make-recipe-image": "اجعل هذه صورة الوصفة"
   },
   "page": {
-    "404-page-not-found": "404 Page not found",
-    "all-recipes": "All Recipes",
-    "new-page-created": "New page created",
+    "404-page-not-found": "404: لم يتم العثور على الصفحة",
+    "all-recipes": "جميع الوصفات",
+    "new-page-created": "تم إنشاء الصفحة الجديدة",
     "page": "الصفحة",
-    "page-creation-failed": "Page creation failed",
+    "page-creation-failed": "فشل إنشاء الصفحة",
     "page-deleted": "تم حذف الصفحة",
     "page-deletion-failed": "حذف الصفحة فشل",
     "page-update-failed": "تحديث الصفحة فشل",
     "page-updated": "تم تحديث صفحة",
-    "pages-update-failed": "Pages update failed",
+    "pages-update-failed": "فشل تحديث الصفحات",
     "pages-updated": "Pages updated",
     "404-not-found": "لم يتم العثور على الصفحة. خطأ 404",
     "an-error-occurred": "حصل خطأ ما"
@@ -499,41 +500,42 @@
     "object-value": "Object Value",
     "original-url": "Original URL",
     "perform-time": "Cook Time",
-    "prep-time": "Prep Time",
-    "protein-content": "Protein",
-    "public-recipe": "Public Recipe",
-    "recipe-created": "Recipe created",
-    "recipe-creation-failed": "Recipe creation failed",
-    "recipe-deleted": "Recipe deleted",
-    "recipe-image": "Recipe Image",
-    "recipe-image-updated": "Recipe image updated",
-    "recipe-name": "Recipe Name",
-    "recipe-settings": "Recipe Settings",
-    "recipe-update-failed": "Recipe update failed",
-    "recipe-updated": "Recipe updated",
-    "remove-from-favorites": "Remove from Favorites",
-    "remove-section": "Remove Section",
-    "saturated-fat-content": "Saturated fat",
-    "save-recipe-before-use": "Save recipe before use",
-    "section-title": "Section Title",
-    "servings": "Servings",
-    "share-recipe-message": "I wanted to share my {0} recipe with you.",
+    "prep-time": "وقت التحضير",
+    "protein-content": "البروتين",
+    "public-recipe": "وصفة عامة",
+    "recipe-created": "تم إنشاء الوصفة",
+    "recipe-creation-failed": "فشل إنشاء الوصفة",
+    "recipe-deleted": "تم حذف الوصفة",
+    "recipe-image": "صورة الوصفة",
+    "recipe-image-updated": "تم تحديث صورة الوصفة",
+    "recipe-name": "اسم الوصفة",
+    "recipe-settings": "إعدادات الوصفة",
+    "recipe-update-failed": "فشل تحديث الوصفة",
+    "recipe-updated": "تم تحديث الوصفة",
+    "remove-from-favorites": "إزالة من المفضلات",
+    "remove-section": "إزالة القسم",
+    "saturated-fat-content": "الدهون المشبعة",
+    "save-recipe-before-use": "حفظ الوصفة قبل الاستخدام",
+    "section-title": "عنوان القسم",
+    "servings": "حصص الطعام",
+    "serves-amount": "{amount} حصص",
+    "share-recipe-message": "أردت أن أشارككم وصفة {0} الخاصة بي.",
     "show-nutrition-values": "Show Nutrition Values",
-    "sodium-content": "Sodium",
-    "step-index": "Step: {step}",
-    "sugar-content": "Sugar",
-    "title": "Title",
-    "total-time": "Total Time",
-    "trans-fat-content": "Trans-fat",
-    "unable-to-delete-recipe": "Unable to Delete Recipe",
-    "unsaturated-fat-content": "Unsaturated fat",
-    "no-recipe": "No Recipe",
-    "locked-by-owner": "Locked by Owner",
-    "join-the-conversation": "Join the Conversation",
-    "add-recipe-to-mealplan": "Add Recipe to Mealplan",
-    "entry-type": "Entry Type",
-    "date-format-hint": "MM/DD/YYYY format",
-    "date-format-hint-yyyy-mm-dd": "YYYY-MM-DD format",
+    "sodium-content": "صوديوم",
+    "step-index": "الخطوة: {step}",
+    "sugar-content": "سكر",
+    "title": "العنوان",
+    "total-time": "الوقت الإجمالي",
+    "trans-fat-content": "الدهون المتحولة",
+    "unable-to-delete-recipe": "تعذر حذف الوصفة",
+    "unsaturated-fat-content": "دهون غير مشبعة",
+    "no-recipe": "لا يوجد وصفة",
+    "locked-by-owner": "مقفلة من قبل المالك",
+    "join-the-conversation": "انضم للمحادثة",
+    "add-recipe-to-mealplan": "إضافة الوصفة إلى خِطَّة الوجبة",
+    "entry-type": "نوع الإدخال",
+    "date-format-hint": "صيغة MM/DD/YYYYY",
+    "date-format-hint-yyyy-mm-dd": "صيغة YYY-MM-DD",
     "add-to-list": "Add to List",
     "add-to-plan": "Add to Plan",
     "add-to-timeline": "Add to Timeline",
@@ -545,6 +547,8 @@
     "failed-to-add-recipe-to-mealplan": "Failed to add recipe to mealplan",
     "failed-to-add-to-list": "Failed to add to list",
     "yield": "Yield",
+    "yields-amount-with-text": "Yields {amount} {text}",
+    "yield-text": "Yield Text",
     "quantity": "Quantity",
     "choose-unit": "Choose Unit",
     "press-enter-to-create": "Press Enter to Create",
@@ -566,13 +570,6 @@
     "increase-scale-label": "Increase Scale by 1",
     "locked": "Locked",
     "public-link": "Public Link",
-    "timer": {
-      "kitchen-timer": "Kitchen Timer",
-      "start-timer": "Start Timer",
-      "pause-timer": "Pause Timer",
-      "resume-timer": "Resume Timer",
-      "stop-timer": "Stop Timer"
-    },
     "edit-timeline-event": "Edit Timeline Event",
     "timeline": "Timeline",
     "timeline-is-empty": "Nothing on the timeline yet. Try making this recipe!",
@@ -640,7 +637,9 @@
     "recipe-debugger-use-openai-description": "Use OpenAI to parse the results instead of relying on the scraper library. When creating a recipe via URL, this is done automatically if the scraper library fails, but you may test it manually here.",
     "debug": "Debug",
     "tree-view": "Tree View",
+    "recipe-servings": "Recipe Servings",
     "recipe-yield": "Recipe Yield",
+    "recipe-yield-text": "Recipe Yield Text",
     "unit": "Unit",
     "upload-image": "Upload image",
     "screen-awake": "Keep Screen Awake",
@@ -662,7 +661,25 @@
       "missing-food": "Create missing food: {food}",
       "no-food": "No Food"
     },
-    "reset-servings-count": "Reset Servings Count"
+    "reset-servings-count": "Reset Servings Count",
+    "not-linked-ingredients": "Additional Ingredients"
+  },
+  "recipe-finder": {
+    "recipe-finder": "Recipe Finder",
+    "recipe-finder-description": "Search for recipes based on ingredients you have on hand. You can also filter by tools you have available, and set a maximum number of missing ingredients or tools.",
+    "selected-ingredients": "Selected Ingredients",
+    "no-ingredients-selected": "No ingredients selected",
+    "missing": "Missing",
+    "no-recipes-found": "No recipes found",
+    "no-recipes-found-description": "Try adding more ingredients to your search or adjusting your filters",
+    "include-ingredients-on-hand": "Include Ingredients On Hand",
+    "include-tools-on-hand": "Include Tools On Hand",
+    "max-missing-ingredients": "Max Missing Ingredients",
+    "max-missing-tools": "Max Missing Tools",
+    "selected-tools": "Selected Tools",
+    "other-filters": "Other Filters",
+    "ready-to-make": "Ready to Make",
+    "almost-ready-to-make": "Almost Ready to Make"
   },
   "search": {
     "advanced-search": "Advanced Search",
@@ -866,7 +883,8 @@
     "you-are-offline-description": "Not all features are available while offline. You can still add, modify, and remove items, but you will not be able to sync your changes to the server until you are back online.",
     "are-you-sure-you-want-to-check-all-items": "Are you sure you want to check all items?",
     "are-you-sure-you-want-to-uncheck-all-items": "Are you sure you want to uncheck all items?",
-    "are-you-sure-you-want-to-delete-checked-items": "Are you sure you want to delete all checked items?"
+    "are-you-sure-you-want-to-delete-checked-items": "Are you sure you want to delete all checked items?",
+    "no-shopping-lists-found": "No Shopping Lists Found"
   },
   "sidebar": {
     "all-recipes": "All Recipes",
@@ -1278,6 +1296,7 @@
   "profile": {
     "welcome-user": "👋 Welcome, {0}!",
     "description": "Manage your profile, recipes, and group settings.",
+    "invite-link": "Invite Link",
     "get-invite-link": "Get Invite Link",
     "get-public-link": "Get Public Link",
     "account-summary": "Account Summary",
@@ -1327,6 +1346,8 @@
   "cookbook": {
     "cookbooks": "Cookbooks",
     "description": "Cookbooks are another way to organize recipes by creating cross sections of recipes, organizers, and other filters. Creating a cookbook will add an entry to the side-bar and all the recipes with the filters chosen will be displayed in the cookbook.",
+    "hide-cookbooks-from-other-households": "Hide Cookbooks from Other Households",
+    "hide-cookbooks-from-other-households-description": "When enabled, only cookbooks from your household will appear on the sidebar",
     "public-cookbook": "Public Cookbook",
     "public-cookbook-description": "Public Cookbooks can be shared with non-mealie users and will be displayed on your groups page.",
     "filter-options": "Filter Options",

frontend/lang/messages/bg-BG.json

@@ -276,7 +276,8 @@
     "admin-group-management": "Административно управление на групите",
     "admin-group-management-text": "Промените по тази група ще бъдат отразени моментално.",
     "group-id-value": "ID на Групата: {0}",
-    "total-households": "Общ брой домакинства"
+    "total-households": "Общ брой домакинства",
+    "you-must-select-a-group-before-selecting-a-household": "You must select a group before selecting a household"
   },
   "household": {
     "household": "Домакинство",
@@ -517,6 +518,7 @@
     "save-recipe-before-use": "Запази рецептата преди да я използваш",
     "section-title": "Заглавие на раздела",
     "servings": "Порция|порции",
+    "serves-amount": "Serves {amount}",
     "share-recipe-message": "Искам да споделя моята рецепта {0} с теб.",
     "show-nutrition-values": "Покажи хранителните стойности",
     "sodium-content": "Натрий",
@@ -545,6 +547,8 @@
     "failed-to-add-recipe-to-mealplan": "Рецептата не беше добавена към хранителния план",
     "failed-to-add-to-list": "Неуспешно добавяне към списъка",
     "yield": "Добив",
+    "yields-amount-with-text": "Yields {amount} {text}",
+    "yield-text": "Yield Text",
     "quantity": "Количество",
     "choose-unit": "Избери единица",
     "press-enter-to-create": "Натисните Enter за да създадете",
@@ -566,13 +570,6 @@
     "increase-scale-label": "Увеличи мащаба с 1",
     "locked": "Заключено",
     "public-link": "Публична връзка",
-    "timer": {
-      "kitchen-timer": "Кухненски таймер",
-      "start-timer": "Стартирай таймера",
-      "pause-timer": "Поставяне таймера на пауза",
-      "resume-timer": "Възобновяване на таймера",
-      "stop-timer": "Спри таймера"
-    },
     "edit-timeline-event": "Редактирай събитие",
     "timeline": "Хронология на събитията",
     "timeline-is-empty": "Няма история на събитията. Опитайте да приготвите рецептата!",
@@ -640,7 +637,9 @@
     "recipe-debugger-use-openai-description": "Use OpenAI to parse the results instead of relying on the scraper library. When creating a recipe via URL, this is done automatically if the scraper library fails, but you may test it manually here.",
     "debug": "Отстраняване на грешки",
     "tree-view": "Дървовиден изглед",
+    "recipe-servings": "Recipe Servings",
     "recipe-yield": "Добиване от рецепта",
+    "recipe-yield-text": "Recipe Yield Text",
     "unit": "Единица",
     "upload-image": "Качване на изображение",
     "screen-awake": "Запази екрана активен",
@@ -662,7 +661,25 @@
       "missing-food": "Create missing food: {food}",
       "no-food": "No Food"
     },
-    "reset-servings-count": "Reset Servings Count"
+    "reset-servings-count": "Reset Servings Count",
+    "not-linked-ingredients": "Additional Ingredients"
+  },
+  "recipe-finder": {
+    "recipe-finder": "Recipe Finder",
+    "recipe-finder-description": "Search for recipes based on ingredients you have on hand. You can also filter by tools you have available, and set a maximum number of missing ingredients or tools.",
+    "selected-ingredients": "Selected Ingredients",
+    "no-ingredients-selected": "No ingredients selected",
+    "missing": "Missing",
+    "no-recipes-found": "No recipes found",
+    "no-recipes-found-description": "Try adding more ingredients to your search or adjusting your filters",
+    "include-ingredients-on-hand": "Include Ingredients On Hand",
+    "include-tools-on-hand": "Include Tools On Hand",
+    "max-missing-ingredients": "Max Missing Ingredients",
+    "max-missing-tools": "Max Missing Tools",
+    "selected-tools": "Selected Tools",
+    "other-filters": "Other Filters",
+    "ready-to-make": "Ready to Make",
+    "almost-ready-to-make": "Almost Ready to Make"
   },
   "search": {
     "advanced-search": "Разширено търсене",
@@ -866,7 +883,8 @@
     "you-are-offline-description": "Not all features are available while offline. You can still add, modify, and remove items, but you will not be able to sync your changes to the server until you are back online.",
     "are-you-sure-you-want-to-check-all-items": "Are you sure you want to check all items?",
     "are-you-sure-you-want-to-uncheck-all-items": "Are you sure you want to uncheck all items?",
-    "are-you-sure-you-want-to-delete-checked-items": "Are you sure you want to delete all checked items?"
+    "are-you-sure-you-want-to-delete-checked-items": "Are you sure you want to delete all checked items?",
+    "no-shopping-lists-found": "No Shopping Lists Found"
   },
   "sidebar": {
     "all-recipes": "Всички рецепти",
@@ -1278,6 +1296,7 @@
   "profile": {
     "welcome-user": "👋 Добре дошъл(а), {0}!",
     "description": "Настройки на профил, рецепти и настройки на групата.",
+    "invite-link": "Invite Link",
     "get-invite-link": "Вземи линк за покана",
     "get-public-link": "Вземи публичен линк",
     "account-summary": "Обобщение на акаунта",
@@ -1327,6 +1346,8 @@
   "cookbook": {
     "cookbooks": "Готварски книги",
     "description": "Cookbooks are another way to organize recipes by creating cross sections of recipes, organizers, and other filters. Creating a cookbook will add an entry to the side-bar and all the recipes with the filters chosen will be displayed in the cookbook.",
+    "hide-cookbooks-from-other-households": "Hide Cookbooks from Other Households",
+    "hide-cookbooks-from-other-households-description": "When enabled, only cookbooks from your household will appear on the sidebar",
     "public-cookbook": "Публична книга с рецепти",
     "public-cookbook-description": "Публичните готварски книги могат да се споделят с потребители, които не са в Mealie, и ще се показват на страницата на вашите групи.",
     "filter-options": "Опции на филтъра",

frontend/lang/messages/ca-ES.json

@@ -43,7 +43,7 @@
     "category-deleted": "S'ha suprimit la categoria",
     "category-deletion-failed": "S'ha produït un error al eliminar la categoria",
     "category-filter": "Filtre per categoria",
-    "category-update-failed": "S'ha produït un error a l'actualitzar la categoria",
+    "category-update-failed": "S'ha produït un error en actualitzar la categoria",
     "category-updated": "S'ha actualitzat la categoria",
     "uncategorized-count": "{count} sense categoritzar",
     "create-a-category": "Crea una categoria",
@@ -51,7 +51,7 @@
     "category": "Categoria"
   },
   "events": {
-    "apprise-url": "URL de Apprise",
+    "apprise-url": "URL d'Apprise",
     "database": "Base de Dades",
     "delete-event": "Suprimiu l'esdeveniment",
     "event-delete-confirmation": "Està segur que vol suprimir aquest esdeveniment?",
@@ -96,7 +96,7 @@
     "dashboard": "Tauler de control",
     "delete": "Suprimeix",
     "disabled": "Desactivat",
-    "download": "Baixa’l",
+    "download": "Descarregar",
     "duplicate": "Duplica",
     "edit": "Edita",
     "enabled": "Activat",
@@ -182,7 +182,7 @@
     "date": "Data",
     "id": "Id",
     "owner": "Propietari",
-    "change-owner": "Change Owner",
+    "change-owner": "Canviar propietari",
     "date-added": "Data d'alta",
     "none": "Cap",
     "run": "Executa",
@@ -214,10 +214,10 @@
     "confirm-delete-generic-items": "Are you sure you want to delete the following items?",
     "organizers": "Organitzadors",
     "caution": "Precaució",
-    "show-advanced": "Show Advanced",
-    "add-field": "Add Field",
-    "date-created": "Date Created",
-    "date-updated": "Date Updated"
+    "show-advanced": "Mostrar els paràmetres avançats",
+    "add-field": "Afegir camp",
+    "date-created": "Data de creació",
+    "date-updated": "Data d’actualització"
   },
   "group": {
     "are-you-sure-you-want-to-delete-the-group": "Esteu segur de voler suprimir el grup <b>{groupName}<b/>?",
@@ -225,10 +225,10 @@
     "cannot-delete-group-with-users": "No es pot suprimir un grup amb usuaris",
     "confirm-group-deletion": "Confirma l'eliminació del grup",
     "create-group": "Crea un grup",
-    "error-updating-group": "S’ha produït un error a l'actualitzar el grup",
+    "error-updating-group": "S’ha produït un error actualitzant el grup",
     "group": "Grup",
-    "group-deleted": "S'ha suprimir el grup",
-    "group-deletion-failed": "S'ha produït un error al suprimir el grup",
+    "group-deleted": "S'ha suprimit el grup",
+    "group-deletion-failed": "S'ha produït un error en suprimir el grup",
     "group-id-with-value": "Identificador del grup: {groupID}",
     "group-name": "Nom del grup",
     "group-not-found": "No s'ha trobat el grup",
@@ -238,15 +238,15 @@
     "manage-groups": "Gestiona els grups",
     "user-group": "Grup",
     "user-group-created": "S'ha creat el grup de l'usuari",
-    "user-group-creation-failed": "Ha fallat la creación del grup de l'usuari",
+    "user-group-creation-failed": "Ha fallat la creació del grup de l'usuari",
     "settings": {
-      "keep-my-recipes-private": "Manté les meues receptes privades",
-      "keep-my-recipes-private-description": "Posa el teu grup i totes les receptes com privades. Podeu canviar-lo després."
+      "keep-my-recipes-private": "Mantenir les meves receptes privades",
+      "keep-my-recipes-private-description": "Posa el teu grup i totes les receptes com a privades. Podeu canviar-ho després."
     },
     "manage-members": "Gestiona els membres",
-    "manage-members-description": "Gestiona els permisos dels membres de la teva llar. {manage} permet a l'usuari accedir la pàgina de gestió de dades, i {invite} permet a l'usuari generar enllaços d'invitació per altres usuaris. Els propitetaris de grups no es poden canviar els seus propis permisos.",
+    "manage-members-description": "Gestiona els permisos dels membres de la teva llar. {manage} permet a l'usuari accedir la pàgina de gestió de dades, i {invite} permet a l'usuari generar enllaços d'invitació per altres usuaris. Els propietaris de grups no es poden canviar els seus propis permisos.",
     "manage": "Gestiona",
-    "manage-household": "Gestiona llar",
+    "manage-household": "Gestiona la llar",
     "invite": "Convida",
     "looking-to-update-your-profile": "Voleu actualitzar el vostre perfil?",
     "default-recipe-preferences-description": "Aquestes són les configuracions per defecte quan una recepta es crea en el teu grup. Podeu canviar-les de forma individual en el menú d'opcions de cada recepta.",
@@ -256,14 +256,14 @@
     "private-group-description": "Configurar el teu grup com a privat en desactivarà totes les opcions de vista pública. Això sobreescriu qualsevol configuració de vista pública individual",
     "enable-public-access": "Permetre l'accés públic",
     "enable-public-access-description": "Fes les receptes en grup públiques per defecte, i permet a visitants veure receptes sense registrar-se",
-    "allow-users-outside-of-your-group-to-see-your-recipes": "Permeteu als usuaris d'altres grups, visualitzar les vostres receptes",
+    "allow-users-outside-of-your-group-to-see-your-recipes": "Permeteu que usuaris d'altres grups visualitzin les vostres receptes",
     "allow-users-outside-of-your-group-to-see-your-recipes-description": "Si ho habiliteu, podreu compartir enllaços públics de receptes específiques sense autoritzar l'usuari. Si està deshabilitat, només podreu compartir amb usuaris del vostre grup o generant enllaços privats",
     "show-nutrition-information": "Mostra la informació nutricional",
     "show-nutrition-information-description": "Si ho habiliteu, mostrareu la informació nutricional disponible. Si no hi ha informació nutricional disponible, no es mostrarà res",
     "show-recipe-assets": "Mostreu els recursos de les receptes",
-    "show-recipe-assets-description": "Si està habilitat, es mostraran els recursos de les receptes si hi són disponibles",
+    "show-recipe-assets-description": "Si està habilitat, es mostraran els recursos de les receptes si estan disponibles",
     "default-to-landscape-view": "Vista horitzontal per defecte",
-    "default-to-landscape-view-description": "Quan està activat la capçalera de la secció de receptes es mostraran en vista panoràmica",
+    "default-to-landscape-view-description": "Quan està activat la capçalera de la secció de receptes es mostrarà en vista panoràmica",
     "disable-users-from-commenting-on-recipes": "Desactiva els comentaris a les receptes",
     "disable-users-from-commenting-on-recipes-description": "Amaga la secció de comentaris a les pàgines de recepta i deshabilita els comentaris",
     "disable-organizing-recipe-ingredients-by-units-and-food": "Desactiva l'organització dels ingredients de la recepta per unitats i aliments",
@@ -276,7 +276,8 @@
     "admin-group-management": "Gestió del grup d'administradors",
     "admin-group-management-text": "Els canvis en aquest grup s'actualitzaran immediatament.",
     "group-id-value": "ID del grup: {0}",
-    "total-households": "Llars totals"
+    "total-households": "Llars totals",
+    "you-must-select-a-group-before-selecting-a-household": "Heu de seleccionar un grup abans de seleccionar una llar"
   },
   "household": {
     "household": "Llar",
@@ -285,25 +286,25 @@
     "create-household": "Crea llar",
     "household-name": "Nom de la llar",
     "household-group": "Grup de llar",
-    "household-management": "Gestió de llar",
+    "household-management": "Gestió de la llar",
     "manage-households": "Gestiona llars",
-    "admin-household-management": "Gestió de llar d'administrador",
-    "admin-household-management-text": "Canvis en aquesta llar s'actualitzaran immediatament.",
+    "admin-household-management": "Gestió de la llar de l'administrador",
+    "admin-household-management-text": "Els canvis a aquesta llar s'actualitzaran immediatament.",
     "household-id-value": "Id de llar: {0}",
     "private-household": "Llar privada",
     "private-household-description": "Configurar la teva llar com a privada en desactivarà totes les opcions de vista pública. Això sobreescriu qualsevol configuració de vista pública individual",
     "lock-recipe-edits-from-other-households": "Bloqueja les edicions de receptes des d'altres llars",
     "lock-recipe-edits-from-other-households-description": "Quan activat, només els usuaris de la teva llar poden editar les receptes creades per la teva llar",
     "household-recipe-preferences": "Preferències de receptes de llar",
-    "default-recipe-preferences-description": "These are the default settings when a new recipe is created in your household. These can be changed for individual recipes in the recipe settings menu.",
-    "allow-users-outside-of-your-household-to-see-your-recipes": "Allow users outside of your household to see your recipes",
-    "allow-users-outside-of-your-household-to-see-your-recipes-description": "When enabled you can use a public share link to share specific recipes without authorizing the user. When disabled, you can only share recipes with users who are in your household or with a pre-generated private link",
-    "household-preferences": "Household Preferences"
+    "default-recipe-preferences-description": "Aquestes són les configuracions per defecte en crear una recepta en la teva llar. Podeu canviar-les de forma individual en el menú d'opcions de cada recepta.",
+    "allow-users-outside-of-your-household-to-see-your-recipes": "Permeteu als usuaris d'altres grups, visualitzar les vostres receptes",
+    "allow-users-outside-of-your-household-to-see-your-recipes-description": "Si ho habiliteu, podreu compartir enllaços públics de receptes específiques sense autoritzar l'usuari. Si està deshabilitat, només podreu compartir amb usuaris de la vostra llar o generant enllaços privats",
+    "household-preferences": "Preferències de la llar"
   },
   "meal-plan": {
     "create-a-new-meal-plan": "Crea un nou menú",
     "update-this-meal-plan": "Actualitza aquest pla de menjar",
-    "dinner-this-week": "Sopar d'esta setmana",
+    "dinner-this-week": "Sopar d'aquesta setmana",
     "dinner-today": "Sopar per avui",
     "dinner-tonight": "Sopar d'aquesta nit",
     "edit-meal-plan": "Edita el menú",
@@ -320,10 +321,10 @@
     "mealplan-settings": "Configuració del menú",
     "mealplan-update-failed": "S'ha produït un error a l'actualitzar el menú",
     "mealplan-updated": "S'ha actualitzat el menú",
-    "mealplan-households-description": "If no household is selected, recipes can be added from any household",
-    "any-category": "Any Category",
-    "any-tag": "Any Tag",
-    "any-household": "Any Household",
+    "mealplan-households-description": "Si no hi ha cap llar seleccionada, les receptes es poden afegir de qualsevol llar",
+    "any-category": "Qualsevol categoria",
+    "any-tag": "Qualsevol etiqueta",
+    "any-household": "Qualsevol llar",
     "no-meal-plan-defined-yet": "No hi ha cap menú planificat",
     "no-meal-planned-for-today": "No hi han cap menú per a hui",
     "numberOfDays-hint": "Nombre de dies en carregar la pàgina",
@@ -336,8 +337,8 @@
     "start-date": "Data d'inici",
     "rule-day": "Regla per a Dia",
     "meal-type": "Tipus de menjar",
-    "breakfast": "Desdejuni",
-    "lunch": "Menjar principal",
+    "breakfast": "Esmorzar",
+    "lunch": "Dinar",
     "dinner": "Sopar",
     "type-any": "Qualsevol",
     "day-any": "Qualsevol",
@@ -347,7 +348,7 @@
     "meal-note": "Notes del menú",
     "note-only": "Només notes",
     "random-meal": "Menú aleatori",
-    "random-dinner": "Principal aleatori",
+    "random-dinner": "Sopar aleatori",
     "random-side": "Guarnició aleatòria",
     "this-rule-will-apply": "Aquesta regla s'aplicarà {dayCriteria} {mealTypeCriteria}.",
     "to-all-days": "a tots els dies",
@@ -356,7 +357,7 @@
     "for-type-meal-types": "per {0} tipus de menús",
     "meal-plan-rules": "Normes del planificador de menús",
     "new-rule": "Nova norma",
-    "meal-plan-rules-description": "You can create rules for auto selecting recipes for your meal plans. These rules are used by the server to determine the random pool of recipes to select from when creating meal plans. Note that if rules have the same day/type constraints then the rule filters will be merged. In practice, it's unnecessary to create duplicate rules, but it's possible to do so.",
+    "meal-plan-rules-description": "Podeu crear regles per a la selecció automàtica de receptes per a les vostres dietes. El servidor utilitza aquestes regles per determinar el conjunt aleatori de receptes per seleccionar quan es creen dietes. Tingueu en compte que si les regles tenen les mateixes restriccions de dia/tipus, les categories de les regles es fusionaran. A la pràctica, no és necessari crear regles duplicades, però és possible fer-ho.",
     "new-rule-description": "Quan creis una nova norma per una planificació d'àpats, pots restringir la norma per a què s'apliqui un dia específic de la setmana i/o un tipus d'àpat específic. Per aplicar la norma a tots els dies o a tots els tipus d'àpats, pots configurar la norma a \"Qualsevol\" que l'aplicarà a tots els valors possibles pel dia i/o tipus d'àpat.",
     "recipe-rules": "Normes per la recepta",
     "applies-to-all-days": "Aplica a tots els dies",
@@ -431,7 +432,7 @@
     "paste-in-your-recipe-data-each-line-will-be-treated-as-an-item-in-a-list": "Copieu en la recepta. Cada línia serà tractada com un element de la llista",
     "recipe-markup-specification": "Especificació Markup de la recepta",
     "recipe-url": "URL de la recepta",
-    "recipe-html-or-json": "Recipe HTML or JSON",
+    "recipe-html-or-json": "Recepta HTML o JSON",
     "upload-a-recipe": "Puja una recepta",
     "upload-individual-zip-file": "Puja només un arxiu zip, exportat d'altre Mealie.",
     "url-form-hint": "Copia i enganxa l'enllaç del teu lloc web de receptes preferit",
@@ -466,7 +467,7 @@
     "calories-suffix": "calories",
     "carbohydrate-content": "Carbohidrats",
     "categories": "Categories",
-    "cholesterol-content": "Cholesterol",
+    "cholesterol-content": "Colesterol",
     "comment-action": "Comentari",
     "comment": "Comentari",
     "comments": "Comentaris",
@@ -513,10 +514,11 @@
     "recipe-updated": "S'ha actualitzat la recepta",
     "remove-from-favorites": "S'ha eliminat de les receptes preferides",
     "remove-section": "Suprimeix la sel·lecció",
-    "saturated-fat-content": "Saturated fat",
+    "saturated-fat-content": "Greixos saturats",
     "save-recipe-before-use": "Desa la recepta abans d'utilitzar-la",
     "section-title": "Secció",
     "servings": "Porcions",
+    "serves-amount": "Serveis {amount}",
     "share-recipe-message": "Vull compartir la meua recepta {0} amb tú.",
     "show-nutrition-values": "Mostra els valors nutricionals",
     "sodium-content": "Sodi",
@@ -524,9 +526,9 @@
     "sugar-content": "Sucres",
     "title": "Títol",
     "total-time": "Temps total",
-    "trans-fat-content": "Trans-fat",
+    "trans-fat-content": "Greix trans",
     "unable-to-delete-recipe": "No s'ha pogut suprimir la recepta",
-    "unsaturated-fat-content": "Unsaturated fat",
+    "unsaturated-fat-content": "Greix insaturat",
     "no-recipe": "Cap recepta",
     "locked-by-owner": "Bloquejat pel propietari",
     "join-the-conversation": "Uneix-te a la conversa",
@@ -545,6 +547,8 @@
     "failed-to-add-recipe-to-mealplan": "S'ha produït un error afegint la recepta al menú",
     "failed-to-add-to-list": "No s'ha pogut afegir a la llista",
     "yield": "Racions",
+    "yields-amount-with-text": "Racions {amount} {text}",
+    "yield-text": "Mida de racions",
     "quantity": "Quantitat",
     "choose-unit": "Tria el tipus d'unitat",
     "press-enter-to-create": "Premeu enter per a crear-lo",
@@ -566,13 +570,6 @@
     "increase-scale-label": "Multiplica",
     "locked": "Bloquejat",
     "public-link": "Enllaç públic",
-    "timer": {
-      "kitchen-timer": "Temporitzador de cuina",
-      "start-timer": "Iniciar temporitzador",
-      "pause-timer": "Pausa el temporitzador",
-      "resume-timer": "Reprèn el temporitzador",
-      "stop-timer": "Atura el temporitzador"
-    },
     "edit-timeline-event": "Edita l'esdeveniment de la cronologia",
     "timeline": "Cronologia",
     "timeline-is-empty": "Encara no hi ha res a la cronologia. Prova de fer aquesta recepta!",
@@ -600,12 +597,12 @@
     "create-recipe-description": "Crea una nova recepta des de zero.",
     "create-recipes": "Crea Receptes",
     "import-with-zip": "Importar amb un .zip",
-    "create-recipe-from-an-image": "Create Recipe from an Image",
-    "create-recipe-from-an-image-description": "Create a recipe by uploading an image of it. Mealie will attempt to extract the text from the image using AI and create a recipe from it.",
-    "crop-and-rotate-the-image": "Crop and rotate the image so that only the text is visible, and it's in the correct orientation.",
-    "create-from-image": "Create from Image",
-    "should-translate-description": "Translate the recipe into my language",
-    "please-wait-image-procesing": "Please wait, the image is processing. This may take some time.",
+    "create-recipe-from-an-image": "Crear una recepta a partir d'una imatge",
+    "create-recipe-from-an-image-description": "Crear una recepta pujant una imatge d'ella. Mealie intentarà extreure el text de la imatge mitjançant IA i crear-ne la recepta.",
+    "crop-and-rotate-the-image": "Retalla i rota la imatge, per tal que només el text sigui visible, i estigui orientat correctament.",
+    "create-from-image": "Crear des d'una imatge",
+    "should-translate-description": "Tradueix la recepta a la meva llengua",
+    "please-wait-image-procesing": "Si us plau, esperi, la imatge s'està processant. Això pot tardar un temps.",
     "bulk-url-import": "Importació d'URL en massa",
     "debug-scraper": "Rastrejador de depuració",
     "create-a-recipe-by-providing-the-name-all-recipes-must-have-unique-names": "Crea la recepta proporcionant-ne un nom. Totes les receptes han de tenir un nom únic.",
@@ -614,16 +611,16 @@
     "scrape-recipe-description": "Rastrejar recepta des de l'Url. Proporciona un Url del lloc que vols rastrejar i Mealie intentarà analitzar la recepta del lloc web i afegir-la a la teva col·lecció.",
     "scrape-recipe-have-a-lot-of-recipes": "Tens moltes receptes a processar alhora?",
     "scrape-recipe-suggest-bulk-importer": "Prova l'importador a granel",
-    "scrape-recipe-have-raw-html-or-json-data": "Have raw HTML or JSON data?",
-    "scrape-recipe-you-can-import-from-raw-data-directly": "You can import from raw data directly",
+    "scrape-recipe-have-raw-html-or-json-data": "Teniu dades HTML o JSON pla?",
+    "scrape-recipe-you-can-import-from-raw-data-directly": "Podeu importar directament des de les dades planes",
     "import-original-keywords-as-tags": "Importa les paraules clau originals com a tags",
     "stay-in-edit-mode": "Segueix en el mode d'edició",
     "import-from-zip": "Importa des d'un ZIP",
     "import-from-zip-description": "Importa una sola recepta que ha estat importada d'una altra instància de Mealie.",
-    "import-from-html-or-json": "Import from HTML or JSON",
-    "import-from-html-or-json-description": "Import a single recipe from raw HTML or JSON. This is useful if you have a recipe from a site that Mealie can't scrape normally, or from some other external source.",
-    "json-import-format-description-colon": "To import via JSON, it must be in valid format:",
-    "json-editor": "JSON Editor",
+    "import-from-html-or-json": "Importar des d'un HTML o JSON",
+    "import-from-html-or-json-description": "Importar una recepta des d'un HTML o JSON pla. Això és important si teniu una recepta des d'una web on Mealie no pot extreure dates, o des d'una altra font externa.",
+    "json-import-format-description-colon": "Per importar via JSON, aquest ha de tenir un format vàlid:",
+    "json-editor": "Editor JSON",
     "zip-files-must-have-been-exported-from-mealie": "Els fitxers .zip han d'haver sigut exportats des de Mealie",
     "create-a-recipe-by-uploading-a-scan": "Crea la recepta pujant-ne un escaneig.",
     "upload-a-png-image-from-a-recipe-book": "Puja una imatge PNG d'un llibre de receptes",
@@ -640,7 +637,9 @@
     "recipe-debugger-use-openai-description": "Fes servir OpenAI per processar els resultats en comptes d'emprar la llibreria de processat. Quan creis una recepta via URL, es fa automàticament si la llibreria falla, però ho pots provar manualment aquí.",
     "debug": "Depuració",
     "tree-view": "Vista en arbre",
+    "recipe-servings": "Serveis per la recepta",
     "recipe-yield": "Rendiment de la recepta",
+    "recipe-yield-text": "Mida/Unitats",
     "unit": "Unitat",
     "upload-image": "Puja una imatge",
     "screen-awake": "Mantenir la pantalla encesa",
@@ -662,7 +661,25 @@
       "missing-food": "Crear menjar que manca: {food}",
       "no-food": "Sense menjar"
     },
-    "reset-servings-count": "Reset Servings Count"
+    "reset-servings-count": "Reiniciar racions servides",
+    "not-linked-ingredients": "Ingredients addicionals"
+  },
+  "recipe-finder": {
+    "recipe-finder": "Cercador de receptes",
+    "recipe-finder-description": "Cerqueu receptes basades en els ingredients que teniu disponibles. També podeu filtrar pels estris que tingueu disponibles i seleccionar el nombre màxim d'ingredients o estris que us faltin.",
+    "selected-ingredients": "Ingredients seleccionats",
+    "no-ingredients-selected": "No hi ha ingredients seleccionats",
+    "missing": "Absent",
+    "no-recipes-found": "No s'han trobat receptes",
+    "no-recipes-found-description": "Intenteu afegir més ingredients a la cerca o ajusteu els filtres",
+    "include-ingredients-on-hand": "Inclou els ingredients disponibles",
+    "include-tools-on-hand": "Inclou els estris disponibles",
+    "max-missing-ingredients": "Màxim d'ingredients absents",
+    "max-missing-tools": "Màxim d'estris absents",
+    "selected-tools": "Estris seleccionats",
+    "other-filters": "Altres filtres",
+    "ready-to-make": "Llest per a preparar-ho",
+    "almost-ready-to-make": "Gairebé llest per a preparar-ho"
   },
   "search": {
     "advanced-search": "Cerca avançada",
@@ -673,7 +690,7 @@
     "or": "O",
     "has-any": "Conté qualsevol",
     "has-all": "Ho conté tot",
-    "clear-selection": "Clear Selection",
+    "clear-selection": "Netejar la selecció",
     "results": "Resultats",
     "search": "Cerca",
     "search-mealie": "Cerca a Melie (prem /)",
@@ -866,7 +883,8 @@
     "you-are-offline-description": "No totes les funcionalitats són disponibles desconnectat. Encara pots afegir, modificar i eliminar elements, però no podràs sincronitzar els teus canvis amb el servidor fins que et tornis a connectar.",
     "are-you-sure-you-want-to-check-all-items": "Estàs segur que vols marcar tots els elements?",
     "are-you-sure-you-want-to-uncheck-all-items": "Estàs segur que vols desmarcar tots els elements?",
-    "are-you-sure-you-want-to-delete-checked-items": "Estàs segur que vols eliminar tots els elements marcats?"
+    "are-you-sure-you-want-to-delete-checked-items": "Estàs segur que vols eliminar tots els elements marcats?",
+    "no-shopping-lists-found": "No s'han trobat llistes de la compra"
   },
   "sidebar": {
     "all-recipes": "Receptes",
@@ -1012,7 +1030,7 @@
     "administrator": "Administrador",
     "user-can-invite-other-to-group": "L'usuari pot convidar a altres al grup",
     "user-can-manage-group": "L'usuari pot gestionar el grup",
-    "user-can-manage-household": "User can manage household",
+    "user-can-manage-household": "Usuari que pot gestionar la llar",
     "user-can-organize-group-data": "L'usuari pot organitzar dades del grup",
     "enable-advanced-features": "Activa funcionalitats avançades",
     "it-looks-like-this-is-your-first-time-logging-in": "Sembla que és el primer cop que et registres.",
@@ -1268,24 +1286,25 @@
       "restore-from-v1-backup": "Tens una còpia de seguretat d'una instància prèvia de Mealie v1? Pots restaurar-la aquí.",
       "manage-profile-or-get-invite-link": "Gestiona el teu propi perfil, o agafa un enllaç d'invitació per compartir amb altres."
     },
-    "debug-openai-services": "Debug OpenAI Services",
-    "debug-openai-services-description": "Use this page to debug OpenAI services. You can test your OpenAI connection and see the results here. If you have image services enabled, you can also provide an image.",
-    "run-test": "Run Test",
-    "test-results": "Test Results",
-    "group-delete-note": "Groups with users or households cannot be deleted",
-    "household-delete-note": "Households with users cannot be deleted"
+    "debug-openai-services": "Depurar els serveis d'OpenAI",
+    "debug-openai-services-description": "Utilitza aquesta pàgina per depurar els serveis d'OpenAI. Pots provar la teva connexió amb OpenAI i veure els resultats aquí. Si tens els serveis d'imatge activats, també pots proporcionar una imatge.",
+    "run-test": "Executar prova",
+    "test-results": "Resultats de la prova",
+    "group-delete-note": "Grups amb usuaris o llars no poden ser esborrats",
+    "household-delete-note": "Llars amb usuaris no poden ser esborrades"
   },
   "profile": {
     "welcome-user": "👋 Benvingut/Benvinguda, {0}!",
     "description": "Gestiona el teu perfil, receptes i configuracions de grup.",
+    "invite-link": "Enllaç d'invitació",
     "get-invite-link": "Obtén enllaç d'invitacio",
     "get-public-link": "Enllaç públic",
     "account-summary": "Resum del compte",
     "account-summary-description": "Aquí tens un resum de la informació del teu grup.",
     "group-statistics": "Estadístiques del grup",
     "group-statistics-description": "Les estadístiques del grup ofereixen certa visió de com feu servir Mealie.",
-    "household-statistics": "Household Statistics",
-    "household-statistics-description": "Your Household Statistics provide some insight how you're using Mealie.",
+    "household-statistics": "Estadístiques de la llar",
+    "household-statistics-description": "Les estadístiques de la llar ofereixen una visió de com feu servir Mealie.",
     "storage-capacity": "Capacitat d'emmagatzematge",
     "storage-capacity-description": "La teva capacitat d'emmagatzematge és un càlcul de les imatges i béns que has pujat.",
     "personal": "Personal",
@@ -1295,13 +1314,13 @@
     "api-tokens-description": "Gestiona les claus d'API per accés des d'aplicacions externes.",
     "group-description": "Aquests elements són compartits dins del teu grup. Editar-ne un ho canviarà per tot el grup!",
     "group-settings": "Configuracions de grup",
-    "group-settings-description": "Manage your common group settings, like privacy settings.",
-    "household-description": "These items are shared within your household. Editing one of them will change it for the whole household!",
-    "household-settings": "Household Settings",
-    "household-settings-description": "Manage your household settings, like mealplan and privacy settings.",
+    "group-settings-description": "Gestiona configuracions comunes de grup com configuracions de privadesa.",
+    "household-description": "Aquests elements són compartits dins la teva llar. Editar-ne un, ho canviarà per tota la llar!",
+    "household-settings": "Configuracions de la llar",
+    "household-settings-description": "Gestionar les configuracions de la llar, com planificació d'àpats i configuracions de privadesa.",
     "cookbooks-description": "Gestiona una col·lecció de categories de receptes i genera'n pàgines.",
     "members": "Membres",
-    "members-description": "See who's in your household and manage their permissions.",
+    "members-description": "Mira qui hi ha a la teva llar i gestiona els seus permisos.",
     "webhooks-description": "Setup webhooks that trigger on days that you have have mealplan scheduled.",
     "notifiers": "Notificadors",
     "notifiers-description": "Setup email and push notifications that trigger on specific events.",
@@ -1326,7 +1345,9 @@
   },
   "cookbook": {
     "cookbooks": "Receptaris",
-    "description": "Cookbooks are another way to organize recipes by creating cross sections of recipes, organizers, and other filters. Creating a cookbook will add an entry to the side-bar and all the recipes with the filters chosen will be displayed in the cookbook.",
+    "description": "Els llibres de cuina són una altra manera d'organitzar les receptes creant seccions transversals de receptes, organitzadors i altres filtres. La creació d'un llibre de cuina afegirà una entrada a la barra lateral i totes les receptes amb les etiquetes i categories escollides es mostraran al llibre de cuina.",
+    "hide-cookbooks-from-other-households": "Amaga els receptaris d'altres llars",
+    "hide-cookbooks-from-other-households-description": "Quan s'habilita només es veuran receptaris de la teva llar",
     "public-cookbook": "Receptari públic",
     "public-cookbook-description": "Els receptaris públics es poden compartir amb usuaris que no estiguin dins l'aplicació i es mostraran a la pàgina del vostre grup.",
     "filter-options": "Opcions de filtres",
@@ -1336,31 +1357,31 @@
     "require-all-tools": "Requereix tots els utensilis",
     "cookbook-name": "Nom del receptari",
     "cookbook-with-name": "Receptari {0}",
-    "household-cookbook-name": "{0} Cookbook {1}",
+    "household-cookbook-name": "{0} Llibre de cuina {1}",
     "create-a-cookbook": "Crea un receptari",
     "cookbook": "Receptari"
   },
   "query-filter": {
     "logical-operators": {
-      "and": "AND",
-      "or": "OR"
+      "and": "I",
+      "or": "O"
     },
     "relational-operators": {
-      "equals": "equals",
-      "does-not-equal": "does not equal",
-      "is-greater-than": "is greater than",
-      "is-greater-than-or-equal-to": "is greater than or equal to",
-      "is-less-than": "is less than",
-      "is-less-than-or-equal-to": "is less than or equal to"
+      "equals": "és igual a",
+      "does-not-equal": "no és igual a",
+      "is-greater-than": "és més gran que",
+      "is-greater-than-or-equal-to": "és més gran o igual a",
+      "is-less-than": "és menys que",
+      "is-less-than-or-equal-to": "és menor o igual a"
     },
     "relational-keywords": {
-      "is": "is",
-      "is-not": "is not",
-      "is-one-of": "is one of",
-      "is-not-one-of": "is not one of",
-      "contains-all-of": "contains all of",
-      "is-like": "is like",
-      "is-not-like": "is not like"
+      "is": "és",
+      "is-not": "no és",
+      "is-one-of": "és un de",
+      "is-not-one-of": "no és un de",
+      "contains-all-of": "conté tots de",
+      "is-like": "és com",
+      "is-not-like": "no és com"
     }
   }
 }

frontend/lang/messages/da-DK.json

@@ -182,7 +182,7 @@
     "date": "Dato",
     "id": "Id",
     "owner": "Ejer",
-    "change-owner": "Change Owner",
+    "change-owner": "Skift ejer",
     "date-added": "Oprettelsesdato",
     "none": "Ingen",
     "run": "Start",
@@ -196,7 +196,7 @@
     "copy": "Kopier",
     "color": "Farve",
     "timestamp": "Tidsstempel",
-    "last-made": "Senest Lavet",
+    "last-made": "Senest lavet",
     "learn-more": "Lær mere",
     "this-feature-is-currently-inactive": "Denne funktion er i øjeblikket inaktiv",
     "clipboard-not-supported": "Udklipsholder er ikke understøttet",
@@ -214,10 +214,10 @@
     "confirm-delete-generic-items": "Er du sikker på at du ønsker at slette de valgte emner?",
     "organizers": "Organisatorer",
     "caution": "Bemærk",
-    "show-advanced": "Show Advanced",
-    "add-field": "Add Field",
-    "date-created": "Date Created",
-    "date-updated": "Date Updated"
+    "show-advanced": "Vis avanceret",
+    "add-field": "Tilføj felt",
+    "date-created": "Oprettet",
+    "date-updated": "Dato opdateret"
   },
   "group": {
     "are-you-sure-you-want-to-delete-the-group": "Er du sikker på, du vil slette <b>{groupName}<b/>?",
@@ -244,16 +244,16 @@
       "keep-my-recipes-private-description": "Ændrer din gruppe og alle opskrifter til private. Du kan altid ændre dette senere."
     },
     "manage-members": "Administrer medlemmer",
-    "manage-members-description": "Manage the permissions of the members in your household. {manage} allows the user to access the data-management page, and {invite} allows the user to generate invitation links for other users. Group owners cannot change their own permissions.",
+    "manage-members-description": "Administrer tilladelser for medlemmerne i din husstand. {manage} giver brugeren adgang til datastyringssiden, og {invite} giver brugeren mulighed for at generere invitationslinks til andre brugere. Gruppeejere kan ikke ændre deres egne tilladelser.",
     "manage": "Administrer",
-    "manage-household": "Manage Household",
+    "manage-household": "Administrer husholdning",
     "invite": "Invitér",
     "looking-to-update-your-profile": "Ønsker du at opdatere din profil?",
     "default-recipe-preferences-description": "Dette er standardindstillingerne, når en ny opskrift oprettes i din gruppe. Indstillingerne kan ændres for en opskrift i menuen Opskriftindstillinger.",
     "default-recipe-preferences": "Standard Opskrift Indstillinger",
     "group-preferences": "Gruppe Indstillinger",
     "private-group": "Privat Gruppe",
-    "private-group-description": "Setting your group to private will disable all public view options. This overrides any individual public view settings",
+    "private-group-description": "Sættes din husholdning til privat vil det deaktivere alle indstillinger for offentlig visning. Dette tilsidesætter individuelle indstillinger for offentlig visning",
     "enable-public-access": "Aktiver Offentlig Adgang",
     "enable-public-access-description": "Gør gruppeopskrifter offentlige som standard, og tillade besøgende at se opskrifter uden at logge ind",
     "allow-users-outside-of-your-group-to-see-your-recipes": "Tillad brugere udenfor din gruppe at se dine opskrifter",
@@ -267,7 +267,7 @@
     "disable-users-from-commenting-on-recipes": "Brugere kan ikke kommentere på opskrifter",
     "disable-users-from-commenting-on-recipes-description": "Skjuler kommentarsektionen på opskriftssiden og deaktiverer kommentarer",
     "disable-organizing-recipe-ingredients-by-units-and-food": "Deaktiver organisering af opskrift ingredienser efter enheder og fødevarer",
-    "disable-organizing-recipe-ingredients-by-units-and-food-description": "Hides the Food, Unit, and Amount fields for ingredients and treats ingredients as plain text fields",
+    "disable-organizing-recipe-ingredients-by-units-and-food-description": "Skjuler mad, enhed og mængde felterne og behandler ingredienser som almindelige tekstfelter",
     "general-preferences": "Generelle Indstillinger",
     "group-recipe-preferences": "Gruppe Indstillinger for opskrifter",
     "report": "Rapport",
@@ -276,7 +276,8 @@
     "admin-group-management": "Administrationsgruppe Håndtering",
     "admin-group-management-text": "Ændringer i denne gruppe vil træde i kraft øjeblikkeligt.",
     "group-id-value": "Gruppe-ID: {0}",
-    "total-households": "Husholdninger i Alt"
+    "total-households": "Husholdninger i Alt",
+    "you-must-select-a-group-before-selecting-a-household": "Du skal vælge en gruppe, før du vælger en husstand"
   },
   "household": {
     "household": "Husholdning",
@@ -291,13 +292,13 @@
     "admin-household-management-text": "Ændringer ved denne husholdning vil træde i kraft øjeblikkeligt.",
     "household-id-value": "Husholdning Id: {0}",
     "private-household": "Privat Husholdning",
-    "private-household-description": "Setting your household to private will disable all public view options. This overrides any individual public view settings",
-    "lock-recipe-edits-from-other-households": "Lock recipe edits from other households",
-    "lock-recipe-edits-from-other-households-description": "When enabled only users in your household can edit recipes created by your household",
-    "household-recipe-preferences": "Husholdnings Opskrift Præferencer",
-    "default-recipe-preferences-description": "These are the default settings when a new recipe is created in your household. These can be changed for individual recipes in the recipe settings menu.",
-    "allow-users-outside-of-your-household-to-see-your-recipes": "Allow users outside of your household to see your recipes",
-    "allow-users-outside-of-your-household-to-see-your-recipes-description": "When enabled you can use a public share link to share specific recipes without authorizing the user. When disabled, you can only share recipes with users who are in your household or with a pre-generated private link",
+    "private-household-description": "Sættes din husholdning til private vil det deaktivere alle indstillinger for offentlig visning. Dette tilsidesætter individuelle indstillinger for offentlig visning",
+    "lock-recipe-edits-from-other-households": "Lås opskrift redigeringer fra andre husholdninger",
+    "lock-recipe-edits-from-other-households-description": "Når aktiveret kan kun husholdningens brugere ændre den opskrifter",
+    "household-recipe-preferences": "Husholdningens opskriftspræferencer",
+    "default-recipe-preferences-description": "Disse er standardindstillingerne, når en ny opskrift er oprettet i din husstand. Disse kan ændres for individuelle opskrifter i menuen Opsætninger.",
+    "allow-users-outside-of-your-household-to-see-your-recipes": "Tillad brugere uden for din husstand at se dine opskrifter",
+    "allow-users-outside-of-your-household-to-see-your-recipes-description": "Når det er aktiveret kan du bruge et link til offentlig deling af specifikke opskrifter uden at godkende brugeren. Når deaktiveret, kan du kun dele opskrifter med brugere, der er i din husstand eller med et forudgenereret privat link",
     "household-preferences": "Husholdnings Præferencer"
   },
   "meal-plan": {
@@ -320,10 +321,10 @@
     "mealplan-settings": "Madplansindstillinger",
     "mealplan-update-failed": "Ændring af madplanen fejlede",
     "mealplan-updated": "Madplanen blev ændret",
-    "mealplan-households-description": "If no household is selected, recipes can be added from any household",
-    "any-category": "Any Category",
-    "any-tag": "Any Tag",
-    "any-household": "Any Household",
+    "mealplan-households-description": "Hvis ingen husstand er valgt, kan opskrifter tilføjes fra enhver husstand",
+    "any-category": "Enhver kategori",
+    "any-tag": "Ethvert tag",
+    "any-household": "Enhver husholdning",
     "no-meal-plan-defined-yet": "Ingen madplan er defineret",
     "no-meal-planned-for-today": "Ingen ret er planlagt til i dag",
     "numberOfDays-hint": "Antal dage ved sideindlæsning",
@@ -355,8 +356,8 @@
     "for-all-meal-types": "for alle typer af måltider",
     "for-type-meal-types": "for {0} måltidstyper",
     "meal-plan-rules": "Regler for madplanlægning",
-    "new-rule": "Ny Regel",
-    "meal-plan-rules-description": "You can create rules for auto selecting recipes for your meal plans. These rules are used by the server to determine the random pool of recipes to select from when creating meal plans. Note that if rules have the same day/type constraints then the rule filters will be merged. In practice, it's unnecessary to create duplicate rules, but it's possible to do so.",
+    "new-rule": "Ny regel",
+    "meal-plan-rules-description": "Du kan oprette regler for automatisk valg af opskrifter for dine madplaner. Regler bruges til at bestemme hvike opskrifter, der kan vælges imellem, når du opretter madplaner. Bemærk, at hvis reglerne har samme begrænsninger på dag eller type, så vil disse blive slået sammen. I praksis er det unødvendigt at oprette flere regler, men det er muligt at gøre det.",
     "new-rule-description": "Når du opretter en ny regel for en madplan, kan du begrænse reglen til at være gældende for en bestemt dag i ugen og/eller en bestemt måltidstype. For at anvende en regel for alle dage eller alle måltider typer kan du indstille reglen til \"Any\", som vil anvende den til alle mulige værdier for dag og/eller måltid.",
     "recipe-rules": "Opskriftsregler",
     "applies-to-all-days": "Gælder for alle dage",
@@ -431,7 +432,7 @@
     "paste-in-your-recipe-data-each-line-will-be-treated-as-an-item-in-a-list": "Indsæt dine opskriftsdata. \nHver linje behandles som et element på en liste",
     "recipe-markup-specification": "Opskriftsmarkupspecifikation",
     "recipe-url": "URL på opskrift",
-    "recipe-html-or-json": "Recipe HTML or JSON",
+    "recipe-html-or-json": "Opskrift HTML eller JSON",
     "upload-a-recipe": "Upload en opskrift",
     "upload-individual-zip-file": "Opload en individuel .zip-fil, eksporteret fra en anden Mealie-instans.",
     "url-form-hint": "Kopiér og indsæt et link fra din foretrukne opskrifts hjemmeside",
@@ -466,7 +467,7 @@
     "calories-suffix": "kalorier",
     "carbohydrate-content": "Kulhydrat",
     "categories": "Kategorier",
-    "cholesterol-content": "Cholesterol",
+    "cholesterol-content": "Kolesterol",
     "comment-action": "Kommentar",
     "comment": "Kommentar",
     "comments": "Kommentarer",
@@ -513,10 +514,11 @@
     "recipe-updated": "Opskrift opdateret",
     "remove-from-favorites": "Fjern fra favoritter",
     "remove-section": "Fjern sektion",
-    "saturated-fat-content": "Saturated fat",
+    "saturated-fat-content": "Mættet fedt",
     "save-recipe-before-use": "Gem opskrift før brug",
     "section-title": "Sektionstitel",
     "servings": "Portioner",
+    "serves-amount": "Serves {amount}",
     "share-recipe-message": "Jeg vil gerne dele min opskrift \"{0}\" med dig.",
     "show-nutrition-values": "Vis ernæringstabel",
     "sodium-content": "Natrium",
@@ -524,9 +526,9 @@
     "sugar-content": "Sukker",
     "title": "Titel",
     "total-time": "Total tid",
-    "trans-fat-content": "Trans-fat",
+    "trans-fat-content": "Transfedtsyrer",
     "unable-to-delete-recipe": "Kunne ikke slette opskrift",
-    "unsaturated-fat-content": "Unsaturated fat",
+    "unsaturated-fat-content": "Umættet fedt",
     "no-recipe": "Ingen opskrift",
     "locked-by-owner": "Låst af ejer",
     "join-the-conversation": "Deltag i samtalen",
@@ -545,6 +547,8 @@
     "failed-to-add-recipe-to-mealplan": "Kunne ikke tilføje opskrift til madplanen",
     "failed-to-add-to-list": "Kunne ikke tilføje opskrift til listen",
     "yield": "Portioner",
+    "yields-amount-with-text": "Yields {amount} {text}",
+    "yield-text": "Yield Text",
     "quantity": "Antal",
     "choose-unit": "Vælg enhed",
     "press-enter-to-create": "Tryk enter for at oprette",
@@ -566,13 +570,6 @@
     "increase-scale-label": "Forøg skala med 1",
     "locked": "Låst",
     "public-link": "Offentligt link",
-    "timer": {
-      "kitchen-timer": "Køkken Ur",
-      "start-timer": "Start timer",
-      "pause-timer": "Sæt timer på pause",
-      "resume-timer": "Genoptag Timer",
-      "stop-timer": "Stop timer"
-    },
     "edit-timeline-event": "Rediger tidslinjebegivenhed",
     "timeline": "Tidslinje",
     "timeline-is-empty": "Intet på tidslinjen endnu. Prøv at lave denne opskrift!",
@@ -614,16 +611,16 @@
     "scrape-recipe-description": "Hent en opskrift fra en hjemmeside. Angiv URL'en til den hjemmeside, du vil hente data fra, og Mealie vil forsøge at hente opskriften og tilføje den til din samling.",
     "scrape-recipe-have-a-lot-of-recipes": "Har du en masse opskrifter, du ønsker at scrappe på en gang?",
     "scrape-recipe-suggest-bulk-importer": "Prøv masse import",
-    "scrape-recipe-have-raw-html-or-json-data": "Have raw HTML or JSON data?",
-    "scrape-recipe-you-can-import-from-raw-data-directly": "You can import from raw data directly",
+    "scrape-recipe-have-raw-html-or-json-data": "Har rå HTML- eller JSON-data?",
+    "scrape-recipe-you-can-import-from-raw-data-directly": "Du kan importere direkte fra rå data",
     "import-original-keywords-as-tags": "Importér originale nøgleord som mærker",
     "stay-in-edit-mode": "Bliv i redigeringstilstand",
     "import-from-zip": "Importer fra zip-fil",
     "import-from-zip-description": "Importer en enkelt opskrift, der blev eksporteret fra en anden Mealie instans.",
-    "import-from-html-or-json": "Import from HTML or JSON",
-    "import-from-html-or-json-description": "Import a single recipe from raw HTML or JSON. This is useful if you have a recipe from a site that Mealie can't scrape normally, or from some other external source.",
-    "json-import-format-description-colon": "To import via JSON, it must be in valid format:",
-    "json-editor": "JSON Editor",
+    "import-from-html-or-json": "Importer fra HTML eller JSON",
+    "import-from-html-or-json-description": "Importer en enkelt opskrift fra rå HTML eller JSON. Dette er nyttigt, hvis du har en opskrift fra et websted, som Mealie ikke kan skrabe normalt, eller fra en anden ekstern kilde.",
+    "json-import-format-description-colon": "For at importere via JSON, skal det være i gyldigt format:",
+    "json-editor": "JSON-redigeringsprogram",
     "zip-files-must-have-been-exported-from-mealie": "Zip-filer skal være blevet eksporteret fra Mealie",
     "create-a-recipe-by-uploading-a-scan": "Opret en opskrift ved at uploade en scanning.",
     "upload-a-png-image-from-a-recipe-book": "Upload et billede med en opskrift, f.eks. fra en bog eller en udskrift",
@@ -640,7 +637,9 @@
     "recipe-debugger-use-openai-description": "Brug OpenAI til at fortolke resultaterne i stedet for at stole på scraper biblioteket. Når du opretter en opskrift via URL, gøres dette automatisk, hvis skraberbiblioteket fejler, men du kan teste det manuelt her.",
     "debug": "Fejlsøgning",
     "tree-view": "Træ visning",
+    "recipe-servings": "Recipe Servings",
     "recipe-yield": "Udbytte af opskrift",
+    "recipe-yield-text": "Recipe Yield Text",
     "unit": "Enhed",
     "upload-image": "Upload billede",
     "screen-awake": "Hold skærmen tændt",
@@ -662,7 +661,25 @@
       "missing-food": "Opret manglende fødevare: {food}",
       "no-food": "Ingen fødevarer"
     },
-    "reset-servings-count": "Reset Servings Count"
+    "reset-servings-count": "Nulstil antal serveringer",
+    "not-linked-ingredients": "Additional Ingredients"
+  },
+  "recipe-finder": {
+    "recipe-finder": "Opskrift Finder",
+    "recipe-finder-description": "Search for recipes based on ingredients you have on hand. You can also filter by tools you have available, and set a maximum number of missing ingredients or tools.",
+    "selected-ingredients": "Valgte Ingredienser",
+    "no-ingredients-selected": "Ingen ingredienser valgt",
+    "missing": "Mangler",
+    "no-recipes-found": "Ingen opskrifter fundet",
+    "no-recipes-found-description": "Prøv at tilføje flere ingredienser til din søgning eller justere dine filtre",
+    "include-ingredients-on-hand": "Inkluder ingredienser du allerede har",
+    "include-tools-on-hand": "Inkluder værktøjer du allerede har",
+    "max-missing-ingredients": "Maksimum Manglende Ingredienser",
+    "max-missing-tools": "Max Missing Tools",
+    "selected-tools": "Selected Tools",
+    "other-filters": "Andre filtre",
+    "ready-to-make": "Klar til at lave",
+    "almost-ready-to-make": "Næsten klar til at lave"
   },
   "search": {
     "advanced-search": "Avanceret søgning",
@@ -671,9 +688,9 @@
     "include": "Inkluder",
     "max-results": "Maksimalt antal resultater",
     "or": "Eller",
-    "has-any": "Har Nogen",
-    "has-all": "Har Alle",
-    "clear-selection": "Clear Selection",
+    "has-any": "Har nogen",
+    "has-all": "Har alle",
+    "clear-selection": "Ryd valg",
     "results": "Resultater",
     "search": "Søg",
     "search-mealie": "Søg Mealie (tryk /)",
@@ -681,7 +698,7 @@
     "tag-filter": "Tagfiler",
     "search-hint": "Tryk '/'",
     "advanced": "Avanceret",
-    "auto-search": "Automatisk Søgning",
+    "auto-search": "Automatisk søgning",
     "no-results": "Ingen resultater fundet"
   },
   "settings": {
@@ -866,7 +883,8 @@
     "you-are-offline-description": "Ikke alle funktioner er tilgængelige mens offline. Du kan stadig tilføje, modificere, og fjerne elementer, men du vil ikke kunne synkronisere dine ændringer til serveren, før du er online igen.",
     "are-you-sure-you-want-to-check-all-items": "Er du sikker på, at du vil markere alle elementer?",
     "are-you-sure-you-want-to-uncheck-all-items": "Er du sikker på, at du vil fjerne markeringen af alle elementer?",
-    "are-you-sure-you-want-to-delete-checked-items": "Er du sikker på, at du vil sletter de valgte elementer?"
+    "are-you-sure-you-want-to-delete-checked-items": "Er du sikker på, at du vil sletter de valgte elementer?",
+    "no-shopping-lists-found": "Ingen Indkøbslister fundet"
   },
   "sidebar": {
     "all-recipes": "Alle opskr.",
@@ -879,7 +897,7 @@
     "migrations": "Migrationer",
     "profile": "Profil",
     "search": "Søg",
-    "site-settings": "Sideindstil.",
+    "site-settings": "Sideindstillinger",
     "tags": "Tags",
     "toolbox": "Værktøjskasse",
     "language": "Sprog",
@@ -1012,7 +1030,7 @@
     "administrator": "Administrator",
     "user-can-invite-other-to-group": "Bruger kan invitere andre til gruppen",
     "user-can-manage-group": "Bruger kan administrere gruppen",
-    "user-can-manage-household": "User can manage household",
+    "user-can-manage-household": "Bruger kan administrere husholdningen",
     "user-can-organize-group-data": "Bruger kan organisere gruppedata",
     "enable-advanced-features": "Aktiver avancerede funktioner",
     "it-looks-like-this-is-your-first-time-logging-in": "Det ser ud til, at det er første gang, at du logger ind.",
@@ -1268,24 +1286,25 @@
       "restore-from-v1-backup": "Har du en sikkerhedskopi fra en tidligere udgave af Mealie v1? Du kan gendanne den her.",
       "manage-profile-or-get-invite-link": "Administrer din egen profil, eller tag et invitationslink til at dele med andre."
     },
-    "debug-openai-services": "Debug OpenAI Services",
-    "debug-openai-services-description": "Use this page to debug OpenAI services. You can test your OpenAI connection and see the results here. If you have image services enabled, you can also provide an image.",
-    "run-test": "Run Test",
-    "test-results": "Test Results",
-    "group-delete-note": "Groups with users or households cannot be deleted",
-    "household-delete-note": "Households with users cannot be deleted"
+    "debug-openai-services": "Fejlsøg OpenAI-tjenester",
+    "debug-openai-services-description": "Brug denne side til at fejlsøge OpenAI-tjenester. Du kan teste din OpenAI-forbindelse og se resultaterne her. Hvis du har billedetjenester aktiveret, kan du også prøve med et billede.",
+    "run-test": "Kør test",
+    "test-results": "Testresultater",
+    "group-delete-note": "Grupper med brugere eller husholdninger kan ikke slettes",
+    "household-delete-note": "Husholdninger med brugere kan ikke slettes"
   },
   "profile": {
     "welcome-user": "👋 Velkommen, {0}!",
     "description": "Administrer din profil, opskrifter og gruppeindstillinger.",
+    "invite-link": "Invitationslink",
     "get-invite-link": "Få Invitationslink",
     "get-public-link": "Offentligt link",
-    "account-summary": "Konto oversigt",
+    "account-summary": "Kontooversigt",
     "account-summary-description": "Her er en oversigt over din gruppes oplysninger.",
     "group-statistics": "Gruppestatistik",
     "group-statistics-description": "Din gruppestatistik giver indsigt i, hvordan du bruger Mealie.",
     "household-statistics": "Husholdnings Statistikker",
-    "household-statistics-description": "Your Household Statistics provide some insight how you're using Mealie.",
+    "household-statistics-description": "Dine husstandsstatistikker giver lidt indsigt i, hvordan du bruger Mealie.",
     "storage-capacity": "Lagerkapacitet",
     "storage-capacity-description": "Din lagerkapacitet er en beregning af de billeder og elementer, du har uploadet.",
     "personal": "Personlig",
@@ -1295,13 +1314,13 @@
     "api-tokens-description": "Administrer dine API Tokens for adgang fra eksterne applikationer.",
     "group-description": "Disse elementer deles i din gruppe. Redigering af et af dem vil ændre det for hele gruppen!",
     "group-settings": "Gruppeindstillinger",
-    "group-settings-description": "Manage your common group settings, like privacy settings.",
-    "household-description": "These items are shared within your household. Editing one of them will change it for the whole household!",
+    "group-settings-description": "Administrer dine fælles gruppeindstillinger, såsom privatlivsindstillinger.",
+    "household-description": "Disse elementer deles i din husstand. Redigering af en af dem vil ændre det for hele husstanden!",
     "household-settings": "Husholdnings Indstillinger",
-    "household-settings-description": "Manage your household settings, like mealplan and privacy settings.",
+    "household-settings-description": "Administrer dine husstandsindstillinger, såsom madplan og privatlivsindstillinger.",
     "cookbooks-description": "Administrer en samling af kategorier og generer sider for dem.",
     "members": "Medlemmer",
-    "members-description": "See who's in your household and manage their permissions.",
+    "members-description": "Se, hvem der er i din husstand og administrere deres tilladelser.",
     "webhooks-description": "Opsæt af webhooks, der afvikles på dage, som du har planlagt måltider for.",
     "notifiers": "Notifikationer",
     "notifiers-description": "Opsæt e-mail og push-notifikationer, der udløser på specifikke begivenheder.",
@@ -1326,7 +1345,9 @@
   },
   "cookbook": {
     "cookbooks": "Kogebøger",
-    "description": "Cookbooks are another way to organize recipes by creating cross sections of recipes, organizers, and other filters. Creating a cookbook will add an entry to the side-bar and all the recipes with the filters chosen will be displayed in the cookbook.",
+    "description": "Kogebøger er en anden måde at organisere opskrifter ved at skabe tværsnit af opskrifter, arrangører, og andre filtre. Oprettelse af en kogebog vil tilføje et link i sidemenuen, og alle opskrifter med de valgte filtre vil blive vist i kogebogen.",
+    "hide-cookbooks-from-other-households": "Skjul kogebøger fra andre husholdninger",
+    "hide-cookbooks-from-other-households-description": "Når aktiveret, kun kogebøger fra din husstand vises på sidepanelet",
     "public-cookbook": "Offentlig kogebog",
     "public-cookbook-description": "Offentlige kogebøger kan deles med personer, der ikke er oprettet som brugere i Mealie og vil blive vist på din gruppe side.",
     "filter-options": "Filtreringsindstillinger",
@@ -1342,25 +1363,25 @@
   },
   "query-filter": {
     "logical-operators": {
-      "and": "AND",
-      "or": "OR"
+      "and": "OG",
+      "or": "ELLER"
     },
     "relational-operators": {
-      "equals": "equals",
-      "does-not-equal": "does not equal",
-      "is-greater-than": "is greater than",
-      "is-greater-than-or-equal-to": "is greater than or equal to",
-      "is-less-than": "is less than",
-      "is-less-than-or-equal-to": "is less than or equal to"
+      "equals": "lig med",
+      "does-not-equal": "ikke lig med",
+      "is-greater-than": "er større end",
+      "is-greater-than-or-equal-to": "er større end eller lig med (Automatic Translation)",
+      "is-less-than": "er mindre end (Automatic Translation)",
+      "is-less-than-or-equal-to": "er mindre end eller lig med (Automatic Translation)"
     },
     "relational-keywords": {
-      "is": "is",
-      "is-not": "is not",
-      "is-one-of": "is one of",
-      "is-not-one-of": "is not one of",
-      "contains-all-of": "contains all of",
-      "is-like": "is like",
-      "is-not-like": "is not like"
+      "is": "er",
+      "is-not": "er ikke",
+      "is-one-of": "er en af",
+      "is-not-one-of": "er ikke en af",
+      "contains-all-of": "indeholder alle af",
+      "is-like": "er ligesom",
+      "is-not-like": "er ikke som"
     }
   }
 }

frontend/lang/messages/de-DE.json

@@ -23,7 +23,7 @@
     "support": "Unterstützen",
     "version": "Version",
     "unknown-version": "unbekannt",
-    "sponsor": "Unterstützen"
+    "sponsor": "Unterstützer"
   },
   "asset": {
     "assets": "Anhänge",
@@ -276,7 +276,8 @@
     "admin-group-management": "Administrator Gruppenverwaltung",
     "admin-group-management-text": "Änderungen an dieser Gruppe sind sofort wirksam.",
     "group-id-value": "Gruppen ID: {0}",
-    "total-households": "Haushalte insgesamt"
+    "total-households": "Haushalte insgesamt",
+    "you-must-select-a-group-before-selecting-a-household": "Sie müssen eine Gruppe auswählen, bevor Sie einen Haushalt auswählen"
   },
   "household": {
     "household": "Haushalt",
@@ -356,7 +357,7 @@
     "for-type-meal-types": "für {0}",
     "meal-plan-rules": "Essensplan Regeln",
     "new-rule": "Neue Regel",
-    "meal-plan-rules-description": "You can create rules for auto selecting recipes for your meal plans. These rules are used by the server to determine the random pool of recipes to select from when creating meal plans. Note that if rules have the same day/type constraints then the rule filters will be merged. In practice, it's unnecessary to create duplicate rules, but it's possible to do so.",
+    "meal-plan-rules-description": "Du kannst Regeln für die automatische Auswahl von Rezepten für deine Speisepläne erstellen. Diese Regeln werden vom Server benutzt, um den Pool an zufälligen Rezepten zu erstellen, aus denen beim Erstellen des Speiseplans gewählt werden kann. In der Praxis ist es nicht nötig, doppelte Regeln zu erstellen, aber es ist möglich.",
     "new-rule-description": "Wenn du eine neue Regel für einen Essensplan erstellst, kannst du die Regel für einen bestimmten Wochentag und/oder eine bestimmte Mahlzeit einschränken. Um eine Regel auf alle Tage oder alle Mahlzeiten anzuwenden, kannst du die Regel auf \"Alle\" setzen, damit sämtliche Tage und/oder Mahlzeiten berücksichtigt werden.",
     "recipe-rules": "Rezeptregeln",
     "applies-to-all-days": "Gilt an allen Tagen",
@@ -517,6 +518,7 @@
     "save-recipe-before-use": "Rezept vor Verwendung speichern",
     "section-title": "Titel des Abschnitts",
     "servings": "Portionen",
+    "serves-amount": "{amount} Portionen",
     "share-recipe-message": "Ich möchte mein Rezept {0} mit dir teilen.",
     "show-nutrition-values": "Nährwerte anzeigen",
     "sodium-content": "Natrium",
@@ -524,7 +526,7 @@
     "sugar-content": "Zucker",
     "title": "Titel",
     "total-time": "Gesamtzeit",
-    "trans-fat-content": "Trans-fat",
+    "trans-fat-content": "Trans-Fettsäuren",
     "unable-to-delete-recipe": "Rezept kann nicht gelöscht werden",
     "unsaturated-fat-content": "Ungesättigte Fettsäuren",
     "no-recipe": "Kein Rezept",
@@ -545,6 +547,8 @@
     "failed-to-add-recipe-to-mealplan": "Fehler beim Hinzufügen des Rezepts zum Essensplan",
     "failed-to-add-to-list": "Fehler beim Hinzufügen zur Liste",
     "yield": "Portionsangabe",
+    "yields-amount-with-text": "Ergibt {amount} {text}",
+    "yield-text": "Ergibt Text",
     "quantity": "Menge",
     "choose-unit": "Einheit wählen",
     "press-enter-to-create": "Zum Erstellen Eingabetaste drücken",
@@ -566,13 +570,6 @@
     "increase-scale-label": "Maßstab um 1 erhöhen",
     "locked": "Gesperrt",
     "public-link": "Öffentlicher Link",
-    "timer": {
-      "kitchen-timer": "Küchenwecker",
-      "start-timer": "Wecker starten",
-      "pause-timer": "Wecker pausieren",
-      "resume-timer": "Wecker fortsetzen",
-      "stop-timer": "Wecker stoppen"
-    },
     "edit-timeline-event": "Zeitstrahl-Ereignis bearbeiten",
     "timeline": "Zeitstrahl",
     "timeline-is-empty": "Noch nichts auf dem Zeitstrahl. Probier dieses Rezept aus!",
@@ -614,15 +611,15 @@
     "scrape-recipe-description": "Importiere ein Rezept mit der URL. Gib die URL für die Seite an, die du importieren möchtest und Mealie wird versuchen, das Rezept von dieser Seite einzulesen und deiner Sammlung hinzuzufügen.",
     "scrape-recipe-have-a-lot-of-recipes": "Hast Du viele Rezepte, die Du auf einmal einlesen willst?",
     "scrape-recipe-suggest-bulk-importer": "Probiere den Massenimporter aus",
-    "scrape-recipe-have-raw-html-or-json-data": "Have raw HTML or JSON data?",
-    "scrape-recipe-you-can-import-from-raw-data-directly": "You can import from raw data directly",
+    "scrape-recipe-have-raw-html-or-json-data": "Hast du Roh-HTML oder JSON Daten?",
+    "scrape-recipe-you-can-import-from-raw-data-directly": "Du kannst direkt von Rohdaten importieren",
     "import-original-keywords-as-tags": "Importiere ursprüngliche Stichwörter als Schlagwörter",
     "stay-in-edit-mode": "Im Bearbeitungsmodus bleiben",
     "import-from-zip": "Von Zip importieren",
     "import-from-zip-description": "Importiere ein einzelnes Rezept, das von einer anderen Mealie-Instanz exportiert wurde.",
-    "import-from-html-or-json": "Import from HTML or JSON",
-    "import-from-html-or-json-description": "Import a single recipe from raw HTML or JSON. This is useful if you have a recipe from a site that Mealie can't scrape normally, or from some other external source.",
-    "json-import-format-description-colon": "To import via JSON, it must be in valid format:",
+    "import-from-html-or-json": "Aus HTML oder JSON importieren",
+    "import-from-html-or-json-description": "Importiere eine einzelne Datei aus Roh-HTML oder JSON. Das ist nützlich, wenn du ein Rezept von einer Seite, die Mealie nicht scrapen kann, oder von einer externen Quelle hast.",
+    "json-import-format-description-colon": "Um mit JSON zu importieren, muss die Datei in einem gültigen Format vorliegen:",
     "json-editor": "JSON Editor",
     "zip-files-must-have-been-exported-from-mealie": ".zip Dateien müssen aus Mealie exportiert worden sein",
     "create-a-recipe-by-uploading-a-scan": "Erstelle ein Rezept durch Hochladen eines Scans.",
@@ -640,7 +637,9 @@
     "recipe-debugger-use-openai-description": "Verwende OpenAI anstelle der Scraper-Bibliothek, um die Einträge zu parsen. Wenn du ein Rezept über dessen URL erstellst und der Versuch über die Scraper-Bibliothek fehlschlägt, passiert das automatisch. Aber du kannst es hier auch manuell testen.",
     "debug": "Debug",
     "tree-view": "Strukturierte Ansicht",
+    "recipe-servings": "Rezept Portionen",
     "recipe-yield": "Portionsangabe",
+    "recipe-yield-text": "Rezept ergibt Text",
     "unit": "Maßeinheit",
     "upload-image": "Bild hochladen",
     "screen-awake": "Bildschirm nicht abschalten",
@@ -662,7 +661,25 @@
       "missing-food": "Fehlendes Lebensmittel erstellen: {food}",
       "no-food": "Kein Lebensmittel"
     },
-    "reset-servings-count": "Portionen zurücksetzen"
+    "reset-servings-count": "Portionen zurücksetzen",
+    "not-linked-ingredients": "Zusätzliche Zutaten"
+  },
+  "recipe-finder": {
+    "recipe-finder": "Rezept-Suche",
+    "recipe-finder-description": "Suche nach Rezepten basierend auf den Zutaten, die du zur Hand hast. Sie können auch nach verfügbaren Werkzeugen filtern und eine maximale Anzahl an fehlenden Zutaten oder Werkzeugen festlegen.",
+    "selected-ingredients": "Ausgewählte Zutaten",
+    "no-ingredients-selected": "Keine Zutaten ausgewählt",
+    "missing": "Fehlend",
+    "no-recipes-found": "Keine Rezepte gefunden",
+    "no-recipes-found-description": "Versuche mehr Zutaten zu deiner Suche hinzuzufügen oder deine Filter anzupassen",
+    "include-ingredients-on-hand": "Zutaten zu Hand einbeziehen",
+    "include-tools-on-hand": "Utensilien zur Hand einbeziehen",
+    "max-missing-ingredients": "Maximal fehlende Zutaten",
+    "max-missing-tools": "Maximal fehlende Utensilien",
+    "selected-tools": "Ausgewählte Utensilien",
+    "other-filters": "Andere Filter",
+    "ready-to-make": "Bereit zu Machen",
+    "almost-ready-to-make": "Fast bereit zu Machen"
   },
   "search": {
     "advanced-search": "Erweiterte Suche",
@@ -673,7 +690,7 @@
     "or": "Oder",
     "has-any": "Irgendeines enthalten",
     "has-all": "Alle enthalten",
-    "clear-selection": "Clear Selection",
+    "clear-selection": "Auswahl aufheben",
     "results": "Ergebnisse",
     "search": "Suchen",
     "search-mealie": "Mealie durchsuchen (/ drücken)",
@@ -866,7 +883,8 @@
     "you-are-offline-description": "Nicht alle Funktionen sind offline verfügbar. Du kannst weiterhin Einträge hinzufügen, ändern und entfernen, aber Änderungen werden erst dann mit dem Server synchronisiert, wenn du wieder online bist.",
     "are-you-sure-you-want-to-check-all-items": "Bist du sicher, dass du alle Elemente markieren möchtest?",
     "are-you-sure-you-want-to-uncheck-all-items": "Bist du sicher, dass du die Auswahl aller Elemente aufheben möchtest?",
-    "are-you-sure-you-want-to-delete-checked-items": "Bist du sicher, dass du alle ausgewählten Elemente löschen möchtest?"
+    "are-you-sure-you-want-to-delete-checked-items": "Bist du sicher, dass du alle ausgewählten Elemente löschen möchtest?",
+    "no-shopping-lists-found": "Keine Einkaufslisten gefunden"
   },
   "sidebar": {
     "all-recipes": "Alle Rezepte",
@@ -1268,16 +1286,17 @@
       "restore-from-v1-backup": "Hast du ein Backup von einer früheren v1 Instanz von Mealie? Hier kannst du es wiederherstellen.",
       "manage-profile-or-get-invite-link": "Verwalte dein eigenes Profil oder erstelle einen Einladungslink, den du an andere weitergeben kannst."
     },
-    "debug-openai-services": "Debug OpenAI Services",
-    "debug-openai-services-description": "Use this page to debug OpenAI services. You can test your OpenAI connection and see the results here. If you have image services enabled, you can also provide an image.",
-    "run-test": "Run Test",
-    "test-results": "Test Results",
-    "group-delete-note": "Groups with users or households cannot be deleted",
-    "household-delete-note": "Households with users cannot be deleted"
+    "debug-openai-services": "OpenAI Services debuggen",
+    "debug-openai-services-description": "",
+    "run-test": "Test durchführen",
+    "test-results": "Testergebnisse",
+    "group-delete-note": "Gruppen mit Benutzern oder Haushalten können nicht gelöscht werden",
+    "household-delete-note": "Haushalte mit Benutzern können nicht gelöscht werden"
   },
   "profile": {
     "welcome-user": "👋 Willkommen, {0}!",
     "description": "Verwalte dein Profil, Rezepte und Gruppeneinstellungen.",
+    "invite-link": "Einladungslink",
     "get-invite-link": "Einladungslink erzeugen",
     "get-public-link": "Öffentlichen Link abrufen",
     "account-summary": "Kontoübersicht",
@@ -1326,7 +1345,9 @@
   },
   "cookbook": {
     "cookbooks": "Kochbücher",
-    "description": "Cookbooks are another way to organize recipes by creating cross sections of recipes, organizers, and other filters. Creating a cookbook will add an entry to the side-bar and all the recipes with the filters chosen will be displayed in the cookbook.",
+    "description": "Kochbücher sind ein weiterer Weg, Rezepte zu organisieren, indem man verschiedene Filter erstellt. Das Erstellen eines Kochbuchs fügt einen Eintrag zur Seitenleiste hinzu und alle Rezepte, die den gewählten Filtern zustimmen, werden in dem Kochbuch angezeigt.",
+    "hide-cookbooks-from-other-households": "Kochbücher von anderen Haushalten ausblenden",
+    "hide-cookbooks-from-other-households-description": "Wenn aktiviert, werden nur Kochbücher deines Haushalts in der Seitenleiste angezeigt",
     "public-cookbook": "Öffentliches Kochbuch",
     "public-cookbook-description": "Öffentliche Kochbücher können mit Nicht-Mealie-Benutzern geteilt werden und werden auf deiner Gruppenseite angezeigt.",
     "filter-options": "Filteroptionen",
@@ -1342,16 +1363,16 @@
   },
   "query-filter": {
     "logical-operators": {
-      "and": "AND",
-      "or": "OR"
+      "and": "UND",
+      "or": "ODER"
     },
     "relational-operators": {
-      "equals": "equals",
-      "does-not-equal": "does not equal",
-      "is-greater-than": "is greater than",
-      "is-greater-than-or-equal-to": "is greater than or equal to",
+      "equals": "ist gleich",
+      "does-not-equal": "ist ungleich",
+      "is-greater-than": "ist größer als",
+      "is-greater-than-or-equal-to": "ist größer gleich",
       "is-less-than": "ist weniger als",
-      "is-less-than-or-equal-to": "is less than or equal to"
+      "is-less-than-or-equal-to": "ist kleiner gleich"
     },
     "relational-keywords": {
       "is": "ist",

frontend/lang/messages/el-GR.json

@@ -174,7 +174,7 @@
     "wednesday": "Τετάρτη",
     "yes": "Ναι",
     "foods": "Τρόφιμα",
-    "units": "Μονάδες",
+    "units": "Μονάδες μέτρησης",
     "back": "Πίσω",
     "next": "Επόμενο",
     "start": "Εναρξη",
@@ -247,7 +247,7 @@
     "manage-members-description": "Διαχειριστείτε τα δικαιώματα των μελών στις ομάδες σας. Το {manage} επιτρέπει στο χρήστη να έχει πρόσβαση στη σελίδα διαχείρισης δεδομένων. Το {invite} επιτρέπει στο χρήστη να δημιουργήσει συνδέσμους πρόσκληση για άλλους χρήστες. Οι ιδιοκτήτες ομάδων δεν μπορούν να αλλάξουν τα δικά τους δικαιώματα.",
     "manage": "Διαχείριση",
     "manage-household": "Διαχείριση νοικοκυριού",
-    "invite": "Προσκαλέστε",
+    "invite": "Πρόσκληση",
     "looking-to-update-your-profile": "Ψάχνετε να ενημερώσετε το προφίλ σας;",
     "default-recipe-preferences-description": "Αυτές είναι οι προεπιλεγμένες ρυθμίσεις όταν δημιουργείται μια νέα συνταγή στην ομάδα σας. Μπορούν να αλλάξουν για μεμονωμένες συνταγές στο μενού ρυθμίσεων συνταγών.",
     "default-recipe-preferences": "Προεπιλεγμένες Προτιμήσεις Συνταγών",
@@ -266,7 +266,7 @@
     "default-to-landscape-view-description": "Οταν ενεργοποιηθεί το τμήμα κεφαλίδας συνταγής θα εμφανίζεται σε οριζόντια προβολή",
     "disable-users-from-commenting-on-recipes": "Απενεργοποίηση σχολιασμού χρηστών σε συνταγές",
     "disable-users-from-commenting-on-recipes-description": "Κρύβει το τμήμα σχολίων στη σελίδα συνταγών και απενεργοποιεί τον σχολιασμό",
-    "disable-organizing-recipe-ingredients-by-units-and-food": "Απενεργοποίηση οργάνωση των συστατικών συνταγής ανά μονάδα και τρόφιμο",
+    "disable-organizing-recipe-ingredients-by-units-and-food": "Απενεργοποίηση οργάνωσης των συστατικών συνταγής ανά μονάδα και τρόφιμο",
     "disable-organizing-recipe-ingredients-by-units-and-food-description": "Κρύβει τα πεδία Τρόφιμο, Μονάδα, και Ποσότητα για συστατικά και αντιμετωπίζει τα συστατικά ως απλά πεδία κειμένου",
     "general-preferences": "Γενικές προτιμήσεις",
     "group-recipe-preferences": "Προτιμήσεις Συνταγών Ομάδας",
@@ -276,7 +276,8 @@
     "admin-group-management": "Διαχείριση Ομάδας Διαχειριστών",
     "admin-group-management-text": "Οι αλλαγές σε αυτή την ομάδα θα αντικατοπτρίζονται αμέσως.",
     "group-id-value": "ID ομάδας: {0}",
-    "total-households": "Σύνολο νοικοκυριών"
+    "total-households": "Σύνολο νοικοκυριών",
+    "you-must-select-a-group-before-selecting-a-household": "Πρέπει να επιλέξετε μια ομάδα πριν επιλέξετε ένα νοικοκυριό"
   },
   "household": {
     "household": "Νοικοκυριό",
@@ -517,6 +518,7 @@
     "save-recipe-before-use": "Αποθήκευση συνταγής πριν τη χρήση",
     "section-title": "Τίτλος τμήματος",
     "servings": "Μερίδες",
+    "serves-amount": "Μερίδες {amount}",
     "share-recipe-message": "Ήθελα να μοιραστώ την {0} συνταγή μου μαζί σας.",
     "show-nutrition-values": "Εμφάνιση Τιμών Διατροφής",
     "sodium-content": "Νάτριο",
@@ -544,7 +546,9 @@
     "failed-to-add-recipes-to-list": "Αποτυχία προσθήκης συνταγής στη λίστα",
     "failed-to-add-recipe-to-mealplan": "Αποτυχία προσθήκης συνταγής στο πρόγραμμα γευμάτων",
     "failed-to-add-to-list": "Αποτυχία προσθήκης στη λίστα",
-    "yield": "Μερίδες",
+    "yield": "Ποσότητα",
+    "yields-amount-with-text": "Ποσότητα {amount} {text}",
+    "yield-text": "Κείμενο ποσότητας",
     "quantity": "Ποσότητα",
     "choose-unit": "Επιλέξτε μονάδα",
     "press-enter-to-create": "Πατήστε Enter για δημιουργία",
@@ -566,13 +570,6 @@
     "increase-scale-label": "Αύξηση κλίμακας κατά 1",
     "locked": "Κλειδωμένο",
     "public-link": "Δημόσιος σύνδεσμος",
-    "timer": {
-      "kitchen-timer": "Χρονόμετρο Κουζίνας",
-      "start-timer": "Εναρξη χρονομέτρου",
-      "pause-timer": "Παύση χρονόμετρου",
-      "resume-timer": "Συνέχιση χρονομέτρου",
-      "stop-timer": "Διακοπή χρονόμετρου"
-    },
     "edit-timeline-event": "Επεξεργασία συμβάντος χρονοδιαγράμματος",
     "timeline": "Χρονοδιάγραμμα",
     "timeline-is-empty": "Δεν υπάρχει τίποτα ακόμα στο χρονοδιάγραμμα. Δοκιμάστε να κάνετε αυτή τη συνταγή!",
@@ -638,9 +635,11 @@
     "recipe-debugger-description": "Λάβετε τη διεύθυνση URL της συνταγής στην οποία θέλετε να εντοπίσετε σφάλματα και επικολλήστε την εδώ. Ο scraper συνταγών θα κάνει scrape την διεύθυνση URL και θα εμφανιστούν τα αποτελέσματα. Αν δεν δείτε να επιστρέφονται δεδομένα, η ιστοσελίδα που προσπαθείτε να κάνετε scrape δεν υποστηρίζεται από το Mealie ή τη βιβλιοθήκη του scraper του.",
     "use-openai": "Χρήση OpenAI",
     "recipe-debugger-use-openai-description": "Χρησιμοποιήστε το OpenAI για να αναλύσετε τα αποτελέσματα αντί να βασιστείτε στη βιβλιοθήκη του scraper. Κατά τη δημιουργία μιας συνταγής μέσω URL, αυτό γίνεται αυτόματα αν η βιβλιοθήκη του scraper αποτύχει, αλλά μπορείτε να την δοκιμάσετε χειροκίνητα εδώ.",
-    "debug": "Εντοπισμός σφαλμάτων",
+    "debug": "Εντ. σφαλμάτων",
     "tree-view": "Προβολή δέντρου",
-    "recipe-yield": "Μερίδες συνταγής",
+    "recipe-servings": "Μερίδες συνταγής",
+    "recipe-yield": "Ποσότητα Συνταγής",
+    "recipe-yield-text": "Κείμενο ποσότητας συνταγής",
     "unit": "Μονάδα",
     "upload-image": "Ανέβασμα εικόνας",
     "screen-awake": "Διατήρηση ενεργής οθόνης",
@@ -662,7 +661,25 @@
       "missing-food": "Δημιουργία τροφίμου που λείπει: {food}",
       "no-food": "Χωρίς Τρόφιμο"
     },
-    "reset-servings-count": "Επαναφορά μέτρησης μερίδων"
+    "reset-servings-count": "Επαναφορά μέτρησης μερίδων",
+    "not-linked-ingredients": "Πρόσθετα συστατικά"
+  },
+  "recipe-finder": {
+    "recipe-finder": "Εύρεση συνταγών",
+    "recipe-finder-description": "Αναζητήστε συνταγές με βάση τα συστατικά που έχετε στο χέρι. Μπορείτε επίσης να θέσετε φίλτρα με βάση τα εργαλεία που διαθέτετε και να ορίσετε έναν μέγιστο αριθμό συστατικών ή εργαλείων που λείπουν.",
+    "selected-ingredients": "Επιλεγμένα συστατικά",
+    "no-ingredients-selected": "Δεν επιλέχτηκαν συστατικά",
+    "missing": "Λείπει",
+    "no-recipes-found": "Δεν βρέθηκαν συνταγές",
+    "no-recipes-found-description": "Δοκιμάστε να προσθέσετε περισσότερα συστατικά στην αναζήτησή σας ή να προσαρμόσετε τα φίλτρα σας",
+    "include-ingredients-on-hand": "Συμπερίληψη συστατικών στο χέρι",
+    "include-tools-on-hand": "Συμπερίληψη εργαλείων στο χέρι",
+    "max-missing-ingredients": "Μέγιστος αριθμός συστατικών που λείπουν",
+    "max-missing-tools": "Μέγιστος αριθμός εργαλείων που λείπουν",
+    "selected-tools": "Επιλεγμένα εργαλεία",
+    "other-filters": "Αλλα φίλτρα",
+    "ready-to-make": "Ετοιμο για παρασκευή",
+    "almost-ready-to-make": "Σχεδόν έτοιμο για παρασκευή"
   },
   "search": {
     "advanced-search": "Σύνθετη Αναζήτηση",
@@ -866,7 +883,8 @@
     "you-are-offline-description": "Δεν είναι όλες οι λειτουργίες διαθέσιμες όταν είναι εκτός σύνδεσης. Μπορείτε ακόμα να προσθέσετε, να τροποποιήσετε και να αφαιρέσετε αντικείμενα, αλλά δεν θα μπορείτε να συγχρονίσετε τις αλλαγές σας στο διακομιστή μέχρι να επανέλθει η σύνδεση στο διαδίκτυο.",
     "are-you-sure-you-want-to-check-all-items": "Θέλετε σίγουρα να επιλέξετε όλα τα αντικείμενα;",
     "are-you-sure-you-want-to-uncheck-all-items": "Θέλετε σίγουρα να αποεπιλέξετε όλα τα αντικείμενα;",
-    "are-you-sure-you-want-to-delete-checked-items": "Θέλετε σίγουρα να διαγράψετε όλα τα επιλεγμένα αντικείμενα;"
+    "are-you-sure-you-want-to-delete-checked-items": "Θέλετε σίγουρα να διαγράψετε όλα τα επιλεγμένα αντικείμενα;",
+    "no-shopping-lists-found": "Δεν βρέθηκαν λίστες αγορών"
   },
   "sidebar": {
     "all-recipes": "Συνταγές όλες",
@@ -1278,6 +1296,7 @@
   "profile": {
     "welcome-user": "👋 Καλώς ορίσατε, {0}!",
     "description": "Διαχειριστείτε το προφίλ σας, τις συνταγές και τις ρυθμίσεις ομάδας.",
+    "invite-link": "Σύνδεσμος πρόσκλησης",
     "get-invite-link": "Λήψη συνδέσμου πρόσκλησης",
     "get-public-link": "Λήψη δημόσιου συνδέσμου",
     "account-summary": "Σύνοψη λογαριασμού",
@@ -1327,6 +1346,8 @@
   "cookbook": {
     "cookbooks": "Βιβλία Μαγειρικής",
     "description": "Τα βιβλία μαγειρικής είναι ένας άλλος τρόπος για να οργανώσετε τις συνταγές δημιουργώντας τμήματα συνταγών, οργανωτών και άλλων φίλτρων. Η δημιουργία ενός βιβλίου μαγειρικής θα προσθέσει μια καταχώρηση στην πλευρική μπάρα και όλες οι συνταγές με τα φίλτρα που έχουν επιλεγεί θα εμφανιστούν στο βιβλίο μαγειρικών.",
+    "hide-cookbooks-from-other-households": "Απόκρυψη Βιβλίων Μαγειρικής από άλλα νοικοκυριά",
+    "hide-cookbooks-from-other-households-description": "Οταν είναι ενεργοποιημένο, μόνο βιβλία μαγειρικής από το νοικοκυριό σας θα εμφανίζονται στην πλαϊνή μπάρα",
     "public-cookbook": "Δημόσιο Βιβλίο Μαγειρικής",
     "public-cookbook-description": "Τα δημόσια βιβλία μαγειρικής μπορούν να μοιραστούν με χρήστες εκτός του mealie και θα εμφανιστούν στη σελίδα των ομάδων σας.",
     "filter-options": "Επιλογές φίλτρου",

frontend/lang/messages/en-GB.json

@@ -276,7 +276,8 @@
     "admin-group-management": "Admin Group Management",
     "admin-group-management-text": "Changes to this group will be reflected immediately.",
     "group-id-value": "Group ID: {0}",
-    "total-households": "Total Households"
+    "total-households": "Total Households",
+    "you-must-select-a-group-before-selecting-a-household": "You must select a group before selecting a household"
   },
   "household": {
     "household": "Household",
@@ -517,6 +518,7 @@
     "save-recipe-before-use": "Save recipe before use",
     "section-title": "Section Title",
     "servings": "Servings",
+    "serves-amount": "Serves {amount}",
     "share-recipe-message": "I wanted to share my {0} recipe with you.",
     "show-nutrition-values": "Show Nutrition Values",
     "sodium-content": "Sodium",
@@ -545,6 +547,8 @@
     "failed-to-add-recipe-to-mealplan": "Failed to add recipe to mealplan",
     "failed-to-add-to-list": "Failed to add to list",
     "yield": "Yield",
+    "yields-amount-with-text": "Yields {amount} {text}",
+    "yield-text": "Yield Text",
     "quantity": "Quantity",
     "choose-unit": "Choose Unit",
     "press-enter-to-create": "Press Enter to Create",
@@ -566,13 +570,6 @@
     "increase-scale-label": "Increase Scale by 1",
     "locked": "Locked",
     "public-link": "Public Link",
-    "timer": {
-      "kitchen-timer": "Kitchen Timer",
-      "start-timer": "Start Timer",
-      "pause-timer": "Pause Timer",
-      "resume-timer": "Resume Timer",
-      "stop-timer": "Stop Timer"
-    },
     "edit-timeline-event": "Edit Timeline Event",
     "timeline": "Timeline",
     "timeline-is-empty": "Nothing on the timeline yet. Try making this recipe!",
@@ -640,7 +637,9 @@
     "recipe-debugger-use-openai-description": "Use OpenAI to parse the results instead of relying on the scraper library. When creating a recipe via URL, this is done automatically if the scraper library fails, but you may test it manually here.",
     "debug": "Debug",
     "tree-view": "Tree View",
+    "recipe-servings": "Recipe Servings",
     "recipe-yield": "Recipe Yield",
+    "recipe-yield-text": "Recipe Yield Text",
     "unit": "Unit",
     "upload-image": "Upload image",
     "screen-awake": "Keep Screen Awake",
@@ -662,7 +661,25 @@
       "missing-food": "Create missing food: {food}",
       "no-food": "No Food"
     },
-    "reset-servings-count": "Reset Servings Count"
+    "reset-servings-count": "Reset Servings Count",
+    "not-linked-ingredients": "Additional Ingredients"
+  },
+  "recipe-finder": {
+    "recipe-finder": "Recipe Finder",
+    "recipe-finder-description": "Search for recipes based on ingredients you have on hand. You can also filter by tools you have available, and set a maximum number of missing ingredients or tools.",
+    "selected-ingredients": "Selected Ingredients",
+    "no-ingredients-selected": "No ingredients selected",
+    "missing": "Missing",
+    "no-recipes-found": "No recipes found",
+    "no-recipes-found-description": "Try adding more ingredients to your search or adjusting your filters",
+    "include-ingredients-on-hand": "Include Ingredients On Hand",
+    "include-tools-on-hand": "Include Tools On Hand",
+    "max-missing-ingredients": "Max Missing Ingredients",
+    "max-missing-tools": "Max Missing Tools",
+    "selected-tools": "Selected Tools",
+    "other-filters": "Other Filters",
+    "ready-to-make": "Ready to Make",
+    "almost-ready-to-make": "Almost Ready to Make"
   },
   "search": {
     "advanced-search": "Advanced Search",
@@ -866,7 +883,8 @@
     "you-are-offline-description": "Not all features are available while offline. You can still add, modify, and remove items, but you will not be able to sync your changes to the server until you are back online.",
     "are-you-sure-you-want-to-check-all-items": "Are you sure you want to check all items?",
     "are-you-sure-you-want-to-uncheck-all-items": "Are you sure you want to uncheck all items?",
-    "are-you-sure-you-want-to-delete-checked-items": "Are you sure you want to delete all checked items?"
+    "are-you-sure-you-want-to-delete-checked-items": "Are you sure you want to delete all checked items?",
+    "no-shopping-lists-found": "No Shopping Lists Found"
   },
   "sidebar": {
     "all-recipes": "All Recipes",
@@ -1278,6 +1296,7 @@
   "profile": {
     "welcome-user": "👋 Welcome, {0}!",
     "description": "Manage your profile, recipes, and group settings.",
+    "invite-link": "Invite Link",
     "get-invite-link": "Get Invite Link",
     "get-public-link": "Get Public Link",
     "account-summary": "Account Summary",
@@ -1327,6 +1346,8 @@
   "cookbook": {
     "cookbooks": "Cookbooks",
     "description": "Cookbooks are another way to organize recipes by creating cross sections of recipes, organizers, and other filters. Creating a cookbook will add an entry to the side-bar and all the recipes with the filters chosen will be displayed in the cookbook.",
+    "hide-cookbooks-from-other-households": "Hide Cookbooks from Other Households",
+    "hide-cookbooks-from-other-households-description": "When enabled, only cookbooks from your household will appear on the sidebar",
     "public-cookbook": "Public Cookbook",
     "public-cookbook-description": "Public Cookbooks can be shared with non-mealie users and will be displayed on your groups page.",
     "filter-options": "Filter Options",

frontend/lang/messages/en-US.json

@@ -276,7 +276,8 @@
     "admin-group-management": "Admin Group Management",
     "admin-group-management-text": "Changes to this group will be reflected immediately.",
     "group-id-value": "Group Id: {0}",
-    "total-households": "Total Households"
+    "total-households": "Total Households",
+    "you-must-select-a-group-before-selecting-a-household": "You must select a group before selecting a household"
   },
   "household": {
     "household": "Household",
@@ -517,6 +518,7 @@
     "save-recipe-before-use": "Save recipe before use",
     "section-title": "Section Title",
     "servings": "Servings",
+    "serves-amount": "Serves {amount}",
     "share-recipe-message": "I wanted to share my {0} recipe with you.",
     "show-nutrition-values": "Show Nutrition Values",
     "sodium-content": "Sodium",
@@ -545,6 +547,8 @@
     "failed-to-add-recipe-to-mealplan": "Failed to add recipe to mealplan",
     "failed-to-add-to-list": "Failed to add to list",
     "yield": "Yield",
+    "yields-amount-with-text": "Yields {amount} {text}",
+    "yield-text": "Yield Text",
     "quantity": "Quantity",
     "choose-unit": "Choose Unit",
     "press-enter-to-create": "Press Enter to Create",
@@ -566,13 +570,6 @@
     "increase-scale-label": "Increase Scale by 1",
     "locked": "Locked",
     "public-link": "Public Link",
-    "timer": {
-      "kitchen-timer": "Kitchen Timer",
-      "start-timer": "Start Timer",
-      "pause-timer": "Pause Timer",
-      "resume-timer": "Resume Timer",
-      "stop-timer": "Stop Timer"
-    },
     "edit-timeline-event": "Edit Timeline Event",
     "timeline": "Timeline",
     "timeline-is-empty": "Nothing on the timeline yet. Try making this recipe!",
@@ -640,7 +637,9 @@
     "recipe-debugger-use-openai-description": "Use OpenAI to parse the results instead of relying on the scraper library. When creating a recipe via URL, this is done automatically if the scraper library fails, but you may test it manually here.",
     "debug": "Debug",
     "tree-view": "Tree View",
+    "recipe-servings": "Recipe Servings",
     "recipe-yield": "Recipe Yield",
+    "recipe-yield-text": "Recipe Yield Text",
     "unit": "Unit",
     "upload-image": "Upload image",
     "screen-awake": "Keep Screen Awake",
@@ -662,7 +661,25 @@
       "missing-food": "Create missing food: {food}",
       "no-food": "No Food"
     },
-    "reset-servings-count": "Reset Servings Count"
+    "reset-servings-count": "Reset Servings Count",
+    "not-linked-ingredients": "Additional Ingredients"
+  },
+  "recipe-finder": {
+    "recipe-finder": "Recipe Finder",
+    "recipe-finder-description": "Search for recipes based on ingredients you have on hand. You can also filter by tools you have available, and set a maximum number of missing ingredients or tools.",
+    "selected-ingredients": "Selected Ingredients",
+    "no-ingredients-selected": "No ingredients selected",
+    "missing": "Missing",
+    "no-recipes-found": "No recipes found",
+    "no-recipes-found-description": "Try adding more ingredients to your search or adjusting your filters",
+    "include-ingredients-on-hand": "Include Ingredients On Hand",
+    "include-tools-on-hand": "Include Tools On Hand",
+    "max-missing-ingredients": "Max Missing Ingredients",
+    "max-missing-tools": "Max Missing Tools",
+    "selected-tools": "Selected Tools",
+    "other-filters": "Other Filters",
+    "ready-to-make": "Ready to Make",
+    "almost-ready-to-make": "Almost Ready to Make"
   },
   "search": {
     "advanced-search": "Advanced Search",
@@ -866,7 +883,8 @@
     "you-are-offline-description": "Not all features are available while offline. You can still add, modify, and remove items, but you will not be able to sync your changes to the server until you are back online.",
     "are-you-sure-you-want-to-check-all-items": "Are you sure you want to check all items?",
     "are-you-sure-you-want-to-uncheck-all-items": "Are you sure you want to uncheck all items?",
-    "are-you-sure-you-want-to-delete-checked-items": "Are you sure you want to delete all checked items?"
+    "are-you-sure-you-want-to-delete-checked-items": "Are you sure you want to delete all checked items?",
+    "no-shopping-lists-found": "No Shopping Lists Found"
   },
   "sidebar": {
     "all-recipes": "All Recipes",
@@ -1278,6 +1296,7 @@
   "profile": {
     "welcome-user": "👋 Welcome, {0}!",
     "description": "Manage your profile, recipes, and group settings.",
+    "invite-link": "Invite Link",
     "get-invite-link": "Get Invite Link",
     "get-public-link": "Get Public Link",
     "account-summary": "Account Summary",

frontend/lang/messages/es-ES.json

@@ -276,7 +276,8 @@
     "admin-group-management": "Gestión del grupo administrador",
     "admin-group-management-text": "Los cambios en este grupo se reflejarán inmediatamente.",
     "group-id-value": "Id del Grupo: {0}",
-    "total-households": "Total de Casas"
+    "total-households": "Total de Casas",
+    "you-must-select-a-group-before-selecting-a-household": "Debe seleccionar un grupo antes de seleccionar un hogar"
   },
   "household": {
     "household": "Casa",
@@ -331,8 +332,8 @@
     "only-recipes-with-these-categories-will-be-used-in-meal-plans": "Sólo las recetas con estas categorías se utilizarán en los menús",
     "planner": "Planificador",
     "quick-week": "Plan rápido",
-    "side": "Guarnición",
-    "sides": "Guarniciones",
+    "side": "Segundo plato",
+    "sides": "Segundos platos",
     "start-date": "Fecha de Inicio",
     "rule-day": "Regla para día",
     "meal-type": "Tipo de comida",
@@ -348,7 +349,7 @@
     "note-only": "Solo notas",
     "random-meal": "Comida aleatoria",
     "random-dinner": "Cena al azar",
-    "random-side": "Lado Aleatorio",
+    "random-side": "Segundo plato aleatorio",
     "this-rule-will-apply": "Esta regla se aplicará {dayCriteria} {mealTypeCriteria}.",
     "to-all-days": "a todos los días",
     "on-days": "en {0}s",
@@ -468,7 +469,7 @@
     "categories": "Categorías",
     "cholesterol-content": "Colesterol",
     "comment-action": "Comentar",
-    "comment": "Comentar",
+    "comment": "Comentario",
     "comments": "Comentarios",
     "delete-confirmation": "¿Estás seguro de eliminar esta receta?",
     "delete-recipe": "Borrar receta",
@@ -517,6 +518,7 @@
     "save-recipe-before-use": "Guardar la receta antes de usar",
     "section-title": "Título de la sección",
     "servings": "Porciones",
+    "serves-amount": "Personas {amount}",
     "share-recipe-message": "Quería compartir mi receta {0} contigo.",
     "show-nutrition-values": "Mostrar valores nutricionales",
     "sodium-content": "Sodio",
@@ -545,6 +547,8 @@
     "failed-to-add-recipe-to-mealplan": "Error al añadir receta al menú",
     "failed-to-add-to-list": "No se pudo agregar a la lista",
     "yield": "Raciones",
+    "yields-amount-with-text": "Raciones {amount} {text}",
+    "yield-text": "Texto de raciones",
     "quantity": "Cantidad",
     "choose-unit": "Elija unidad",
     "press-enter-to-create": "Presione Intro para crear",
@@ -566,13 +570,6 @@
     "increase-scale-label": "Aumentar escala en 1",
     "locked": "Bloqueada",
     "public-link": "Enlace público",
-    "timer": {
-      "kitchen-timer": "Temporizador de cocina",
-      "start-timer": "Iniciar Temporizador",
-      "pause-timer": "Pausar Temporizador",
-      "resume-timer": "Reanudar Temporizador",
-      "stop-timer": "Detener temporizador"
-    },
     "edit-timeline-event": "Editar evento en la cronología",
     "timeline": "Cronología",
     "timeline-is-empty": "Aún no hay nada en la línea de tiempo. ¡Intenta hacer esta receta!",
@@ -640,7 +637,9 @@
     "recipe-debugger-use-openai-description": "Utilice OpenAI para analizar los resultados en lugar de depender de la biblioteca de analizadores. Cuando se crea una receta a través de la URL, esto se hace automáticamente si la biblioteca del analizador falla, pero puede probarla manualmente aquí.",
     "debug": "Depuración",
     "tree-view": "Vista en árbol",
+    "recipe-servings": "Cantidad de personas",
     "recipe-yield": "Porciones",
+    "recipe-yield-text": "Texto de raciones totales",
     "unit": "Unidades",
     "upload-image": "Subir imagen",
     "screen-awake": "Mantener la pantalla encendida",
@@ -662,7 +661,25 @@
       "missing-food": "Crear comida faltante: {food}",
       "no-food": "Sin Comida"
     },
-    "reset-servings-count": "Restablecer contador de porciones"
+    "reset-servings-count": "Restablecer contador de porciones",
+    "not-linked-ingredients": "Ingredientes adicionales"
+  },
+  "recipe-finder": {
+    "recipe-finder": "Buscador de recetas",
+    "recipe-finder-description": "Busca recetas basadas en los ingredientes que tengas disponibles. También puede filtrar por utensilios disponibles, y establecer un número máximo de ingredientes o herramientas que faltan.",
+    "selected-ingredients": "Ingredientes seleccionados",
+    "no-ingredients-selected": "Ningún ingrediente seleccionado",
+    "missing": "Faltan",
+    "no-recipes-found": "No se encontraron recetas",
+    "no-recipes-found-description": "Intenta añadir más ingredientes a tu búsqueda o ajustar tus filtros",
+    "include-ingredients-on-hand": "Incluye ingredientes a mano",
+    "include-tools-on-hand": "Incluye utensilios disponibles",
+    "max-missing-ingredients": "Máximo de ingredientes que faltan",
+    "max-missing-tools": "Máximo de utensilios que faltan",
+    "selected-tools": "Utensilios seleccionados",
+    "other-filters": "Otros filtros",
+    "ready-to-make": "Listo para hacer",
+    "almost-ready-to-make": "Casi listo para hacer"
   },
   "search": {
     "advanced-search": "Búsqueda avanzada",
@@ -866,14 +883,15 @@
     "you-are-offline-description": "No todas las características están disponibles mientras esté fuera de línea. Todavía puedes añadir, modificar y eliminar elementos, pero no podrá sincronizar sus cambios en el servidor hasta que vuelva a estar en línea.",
     "are-you-sure-you-want-to-check-all-items": "¿Seguro que quieres seleccionar todos los elementos?",
     "are-you-sure-you-want-to-uncheck-all-items": "¿Seguro que quieres de-seleccionar todos los elementos?",
-    "are-you-sure-you-want-to-delete-checked-items": "¿Está seguro que deseas eliminar los elementos seleccionados?"
+    "are-you-sure-you-want-to-delete-checked-items": "¿Está seguro que deseas eliminar los elementos seleccionados?",
+    "no-shopping-lists-found": "No hay listas de la compra"
   },
   "sidebar": {
     "all-recipes": "Recetas",
     "backups": "Copias de Seguridad",
     "categories": "Categorías",
     "cookbooks": "Recetarios",
-    "dashboard": "Consola",
+    "dashboard": "Panel de control",
     "home-page": "Inicio",
     "manage-users": "Usuarios",
     "migrations": "Migraciones",
@@ -1278,6 +1296,7 @@
   "profile": {
     "welcome-user": "👋 ¡Bienvenido, {0}!",
     "description": "Administra tu perfil, recetas y ajustes de grupo.",
+    "invite-link": "Link de invitación",
     "get-invite-link": "Obtener enlace de invitación",
     "get-public-link": "Obtener enlace público",
     "account-summary": "Información de la cuenta",
@@ -1327,6 +1346,8 @@
   "cookbook": {
     "cookbooks": "Recetarios",
     "description": "Los recetarios son otra forma de organizar recetas creando secciones cruzadas de recetas y etiquetas. Crear un recetario añadirá una entrada a la barra lateral y todas las recetas con las etiquetas y categorías elegidas se mostrarán en el recetario.",
+    "hide-cookbooks-from-other-households": "Ocultar libros de cocina de otros grupos/hogares",
+    "hide-cookbooks-from-other-households-description": "Cuando esté habilitado, sólo los libros de cocina de su hogar aparecerán en la barra lateral",
     "public-cookbook": "Recetario público",
     "public-cookbook-description": "Los recetarios públicos se pueden compartir con usuarios externos y se mostrarán en su página de grupos.",
     "filter-options": "Opciones de filtro",