fix(deps): update dependency pydantic to v1.10.14 (#3008)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Hayden <64056131+hay-kot@users.noreply.github.com>

.devcontainer/Dockerfile

@@ -21,12 +21,12 @@ ENV PYTHONUNBUFFERED=1 \
     PIP_DISABLE_PIP_VERSION_CHECK=on \
     PIP_DEFAULT_TIMEOUT=100 \
     POETRY_HOME="/opt/poetry" \
-    POETRY_VIRTUALENVS_CREATE=false
+    POETRY_VIRTUALENVS_IN_PROJECT=true
 
 # prepend poetry and venv to path
 ENV PATH="$POETRY_HOME/bin:$PATH"
 
-RUN curl -sSL https://raw.githubusercontent.com/python-poetry/poetry/master/install-poetry.py | python -
+RUN curl -sSL https://install.python-poetry.org | python3 -
 # RUN poetry config virtualenvs.create false
 
 RUN apt-get update \

.devcontainer/devcontainer.json

@@ -18,35 +18,31 @@
     "source=mealie-devcontainer-workspace,target=/workspaces/mealie/frontend/node_modules,type=volume",
     "source=mealie-bashhistory,target=/home/vscode/commandhistory,type=volume"
   ],
-  // Set *default* container specific settings.json values on container create.
-  "settings": {
-    "python.defaultInterpreterPath": "/usr/local/bin/python",
-    "python.linting.enabled": true,
-    "python.linting.pylintEnabled": true,
-    "python.formatting.autopep8Path": "/usr/local/py-utils/bin/autopep8",
-    "python.formatting.blackPath": "/usr/local/py-utils/bin/black",
-    "python.formatting.yapfPath": "/usr/local/py-utils/bin/yapf",
-    "python.linting.banditPath": "/usr/local/py-utils/bin/bandit",
-    "python.linting.flake8Path": "/usr/local/py-utils/bin/flake8",
-    "python.linting.mypyPath": "/usr/local/py-utils/bin/mypy",
-    "python.linting.pycodestylePath": "/usr/local/py-utils/bin/pycodestyle",
-    "python.linting.pydocstylePath": "/usr/local/py-utils/bin/pydocstyle",
-    "python.linting.pylintPath": "/usr/local/py-utils/bin/pylint"
+  "customizations": {
+    "vscode": {
+      "settings": {
+        "python.defaultInterpreterPath": "/usr/local/bin/python",
+        "python.formatting.autopep8Path": "/usr/local/py-utils/bin/autopep8",
+        "python.formatting.blackPath": "/usr/local/py-utils/bin/black",
+        "python.formatting.yapfPath": "/usr/local/py-utils/bin/yapf",
+      },
+      "extensions": [
+        "dbaeumer.vscode-eslint",
+        "matangover.mypy",
+        "ms-python.black-formatter",
+        "ms-python.isort",
+        "ms-python.pylint",
+        "ms-python.python",
+        "ms-python.vscode-pylance",
+        "Vue.volar"
+      ]
+    }
   },
-  // Add the IDs of extensions you want installed when the container is created.
-  "extensions": [
-    "dbaeumer.vscode-eslint",
-    "matangover.mypy",
-    "ms-python.black-formatter",
-    "ms-python.isort",
-    "ms-python.python",
-    "ms-python.vscode-pylance",
-    "Vue.volar"
-  ],
   // Use 'forwardPorts' to make a list of ports inside the container available locally.
   "forwardPorts": [
     3000,
-    9000
+    9000,
+    24678 // used by nuxt when hot-reloading using polling
   ],
   // Use 'onCreateCommand' to run commands at the end of container creation.
   // Use 'postCreateCommand' to run commands after the container is created.

.dockerignore

@@ -1,6 +1,7 @@
 .git
 .github
 .dockerignore
+.gitattributes
 .gitignore
 .idea
 .vscode
@@ -12,6 +13,7 @@ __pycache__/
 htmlcov/
 .coverage
 .coverage.*
+.pylintrc
 .pytest_cache/
 .venv
 venv
@@ -28,3 +30,5 @@ venv
 */mealie/.temp
 
 model.crfmodel
+
+crowdin.yml

.flake8

@@ -1,10 +0,0 @@
-[flake8]
-extend-ignore = [
-    E501 # Line Length - See Black Config in pyproject.toml
-    E402 # Import Not at Top of File
-]
-exclude = _all_models.py
-
-
-per-file-ignores = 
-    __init__.py:F403,F401

.github/DISCUSSION_TEMPLATE/feature-request.yaml

@@ -0,0 +1,41 @@
+---
+title: "YOUR TITLE"
+body:
+  - type: checkboxes
+    id: checks
+    attributes:
+      label: First Check
+      description: |
+        Please confirm and check all the following prior to submission. If you do not do this, your
+        issue may be closed.
+      options:
+        - label: I used the GitHub search to find a similar requests and didn't find it.
+          required: true
+        - label: Checked the [tasks tagged](https://github.com/hay-kot/mealie/issues?q=is%3Aissue+is%3Aopen+label%3Atask+) issues and verified my feature is not covered
+          required: true
+  - type: textarea
+    id: problem
+    attributes:
+      label: Please provide a concise description of the problem that would be addressed by this feature.
+    validations:
+      required: true
+  - type: textarea
+    id: solution
+    attributes:
+      label: Please provide a concise description of the feature that would resolve your issue.
+    validations:
+      required: true
+  - type: textarea
+    id: considerations
+    attributes:
+      label: Please consider and list out some caveats or tradeoffs made in your design decision
+    validations:
+      required: true
+  - type: checkboxes
+    id: additional-information
+    attributes:
+      label: Additional Information
+      options:
+        - label: If this is accepted I'm willing to submit a PR to provide this feature
+        - label: If this is accepted I'm willing to help maintain this feature
+        - label: I'm willing to sponsor/pay a developer to do this work

.github/ISSUE_TEMPLATE/bug-report.yaml

@@ -1,16 +1,20 @@
 ---
-name: "[v0.5.x] Bug Report"
-description: "submit a bug report for the current release"
+name: Bug Report
+description: "Submit a bug for the latest version of Mealie"
+title: "[BUG] - YOUR DESCRIPTIVE TITLE GOES HERE"
+labels: ["bug", "triage"]
 body:
   - type: checkboxes
     id: checks
     attributes:
       label: First Check
-      description: Please confirm and check all the following options.
+      description: |
+        Please confirm and check all the following prior to submission. If you do not do this, your
+        issue may be closed.
       options:
-        - label: This is not a feature request
+        - label: This is not a feature request.
           required: true
-        - label: I added a very descriptive title to this issue.
+        - label: I added a very descriptive title to this issue (title field is above this).
           required: true
         - label: I used the GitHub search to find a similar issue and didn't find it.
           required: true
@@ -18,8 +22,8 @@ body:
           required: true
         - label: I already read the docs and didn't find an answer.
           required: true
-        - label: I have checked for existing issues that have been resolved in v1-beta
-          required: true
+        - label: This issue can be replicated on the demo site (https://demo.mealie.io/).
+          required: false
   - type: textarea
     id: description
     attributes:
@@ -27,6 +31,25 @@ body:
       placeholder: A clear and concise description of what the bug is.
     validations:
       required: true
+  - type: textarea
+    id: reproduction
+    attributes:
+      label: Steps to Reproduce
+      placeholder: 1) ... 2) ... 3) ...
+    validations:
+      required: true
+  - type: textarea
+    id: logs
+    attributes:
+      label: Please provide relevant logs
+      placeholder: For example from `docker compose logs` or other system logs.
+    validations:
+      required: true
+  - type: textarea
+    id: version
+    attributes:
+      label: Mealie Version
+      placeholder: Docker image, as well as 'Build' tag from https://yourmealieurl/admin/site-settings, if UI is working
   - type: dropdown
     id: os
     attributes:
@@ -38,17 +61,11 @@ body:
         - Docker (Windows)
         - Docker (Synology)
         - Unraid
-        - Other
+        - TrueNAS
+        - Other (please specify below)
     validations:
       required: true
   - type: textarea
-    id: os-details
+    id: other
     attributes:
-      label: Deployment Details
-      description: You can add more details about your operating system here, in particular if you chose "Other". If you are experiencing issues with deployment, please provide your docker-compose or docker commands
-  - type: input
-    id: mealie-version
-    attributes:
-      label: Mealie Version
-    validations:
-      required: true
+      label: Additional Deployment Details

.github/ISSUE_TEMPLATE/config.yml

@@ -1,4 +1,4 @@
 contact_links:
   - name: Feature Requests
-    url: https://github.com/hay-kot/mealie/issues/122
-    about: Please add any Feature Requests here.
+    url: https://github.com/mealie-recipes/mealie/discussions/new?category=feature-request
+    about: Please add any Feature Requests as a Github Discussion using the form in this issue.

.github/ISSUE_TEMPLATE/recipe-scraper-bug.yaml

@@ -0,0 +1,53 @@
+---
+name: Error Scraping Recipe
+description: "Submit a bug or issues related to scraping recipes"
+title: "[SCRAPER] - YOUR TITLE"
+labels: ["bug", "triage", "scraper"]
+body:
+  - type: checkboxes
+    id: checks
+    attributes:
+      label: First Check
+      description: |
+        Please confirm and check all the following prior to submission. If you do not do this, your
+        issue may be closed.
+      options:
+        - label: I used the GitHub search to find a similar issue and didn't find it.
+          required: true
+        - label: |
+            I have verified that this issue _is not_ related to the underlying library
+            [hhyrsev/recipe-scrapers](https://github.com/hhursev/recipe-scrapers) by **1)** checking
+            the [debugger](https://demo.mealie.io/g/home/r/create/debug) and data is returned, **2)**
+            verifying that there _are_ errors in the log related to application level code, or
+            **3)** verified that the site provides recipe data, or is otherwise supported by
+            [hhyrsev/recipe-scrapers](https://github.com/hhursev/recipe-scrapers)
+          required: true
+        - label: This issue can be replicated on the demo site (https://demo.mealie.io/)
+          required: false
+  - type: textarea
+    id: urls
+    attributes:
+      label: Please provide 1-5 example URLs that are having errors
+    validations:
+      required: true
+  - type: textarea
+    id: logs
+    attributes:
+      label: |
+        Please provide your logs for the Mealie container `docker logs <container-id> > mealie.logs`
+    validations:
+      required: true
+  - type: dropdown
+    id: os
+    attributes:
+      label: Deployment
+      description: What Deployment system are you using?
+      multiple: true
+      options:
+        - Docker (Linux)
+        - Docker (Windows)
+        - Docker (Synology)
+        - Unraid
+        - Other
+    validations:
+      required: true

.github/ISSUE_TEMPLATE/v1-bug-report.yaml

@@ -1,47 +0,0 @@
----
-name: v1.0.0b Bug Report
-description: "submit a bug report for the v1 beta"
-title: "[v1.0.0b] - YOUR TITLE"
-body:
-  - type: checkboxes
-    id: checks
-    attributes:
-      label: First Check
-      description: Please confirm and check all the following options.
-      options:
-        - label: This is not a feature request
-          required: true
-        - label: I added a very descriptive title to this issue.
-          required: true
-        - label: I used the GitHub search to find a similar issue and didn't find it.
-          required: true
-        - label: I searched the Mealie documentation, with the integrated search.
-          required: true
-        - label: I already read the docs and didn't find an answer.
-          required: true
-  - type: textarea
-    id: description
-    attributes:
-      label: What is the issue you are experiencing?
-      placeholder: A clear and concise description of what the bug is.
-    validations:
-      required: true
-  - type: dropdown
-    id: os
-    attributes:
-      label: Deployment
-      description: What Deployment system are you using?
-      multiple: true
-      options:
-        - Docker (Linux)
-        - Docker (Windows)
-        - Docker (Synology)
-        - Unraid
-        - Other
-    validations:
-      required: true
-  - type: textarea
-    id: os-details
-    attributes:
-      label: Deployment Details
-      description: You can add more details about your operating system here, in particular if you chose "Other". If you are experiencing issues with deployment, please provide your docker-compose or docker commands

.github/dependabot.yml

@@ -1,46 +0,0 @@
-version: 2
-updates:
-  # Fetch and update latest `npm` packages
-  - package-ecosystem: npm
-    directory: "/frontend"
-    schedule:
-      interval: daily
-      time: "00:00"
-    open-pull-requests-limit: 10
-    reviewers:
-      - hay-kot
-    assignees:
-      - hay-kot
-    commit-message:
-      prefix: fix
-      prefix-development: chore
-      include: scope
-  # Fetch and update latest `github-actions` pkgs
-  - package-ecosystem: github-actions
-    directory: "/frontend"
-    schedule:
-      interval: daily
-      time: "00:00"
-    open-pull-requests-limit: 10
-    reviewers:
-      - hay-kot
-    assignees:
-      - hay-kot
-    commit-message:
-      prefix: fix
-      prefix-development: chore
-      include: scope
-  - package-ecosystem: pip
-    directory: "/mealie"
-    schedule:
-      interval: daily
-      time: "00:00"
-    open-pull-requests-limit: 10
-    reviewers:
-      - hay-kot
-    assignees:
-      - hay-kot
-    commit-message:
-      prefix: fix
-      prefix-development: chore
-      include: scope

.github/pull_request_template.md

@@ -2,6 +2,15 @@
   This template provides some ideas of things to include in your PR description.
   To start, try providing a short summary of your changes in the Title above.
   If a section of the PR template does not apply to this PR, then delete that section.
+
+  PLEASE READ:
+  -------------------------
+  Mealie is moving to a regular, automatic release schedule. This means that all PRs should be in a
+  stable state, ready for release. This includes:
+
+  - Ensuring new tests have been added to cover new features, or to prevent regressions.
+  - Work is fully complete and usable
+
  -->
 
 ## What type of PR is this?
@@ -56,17 +65,3 @@ _(fill-in or delete this section)_
 <!--
   Describe how you tested this change.
 -->
-
-## Release Notes
-
-_(REQUIRED)_
-<!--
-  If this PR makes user facing changes, please describe them here. This
-  description will be copied into the release notes/changelog, whenever the
-  next version is released. Keep this section short, and focus on high level
-  changes.
-  Put your text between the block. To omit notes, use NONE within the block.
--->
-
-```release-note
-```

.github/stale.yml

@@ -1,21 +0,0 @@
-# Number of days of inactivity before an issue becomes stale
-daysUntilStale: 60
-# Number of days of inactivity before a stale issue is closed
-daysUntilClose: 7
-# Issues with these labels will never be considered stale
-exemptLabels:
-  - pinned
-  - security
-  - early-stages
-  - "bug: confirmed"
-  - feedback
-  - task
-# Label to use when marking an issue as stale
-staleLabel: stale
-# Comment to post when marking an issue as stale. Set to `false` to disable
-markComment: >
-  This issue has been automatically marked as stale because it has not had
-  recent activity. It will be closed if no further activity occurs. Thank you
-  for your contributions.
-# Comment to post when closing a stale issue. Set to `false` to disable
-closeComment: false

.github/workflows/codeql.yml

@@ -0,0 +1,81 @@
+# For most projects, this workflow file will not need changing; you simply need
+# to commit it to your repository.
+#
+# You may wish to alter this file to override the set of languages analyzed,
+# or to provide custom queries or build logic.
+#
+# ******** NOTE ********
+# We have attempted to detect the languages in your repository. Please check
+# the `language` matrix defined below to confirm you have the correct set of
+# supported CodeQL languages.
+#
+name: "CodeQL"
+
+on:
+  push:
+    branches: [ "mealie-next" ]
+  pull_request:
+    branches: [ "mealie-next" ]
+  schedule:
+    - cron: '36 9 * * 3'
+
+jobs:
+  analyze:
+    name: Analyze
+    # Runner size impacts CodeQL analysis time. To learn more, please see:
+    #   - https://gh.io/recommended-hardware-resources-for-running-codeql
+    #   - https://gh.io/supported-runners-and-hardware-resources
+    #   - https://gh.io/using-larger-runners
+    # Consider using larger runners for possible analysis time improvements.
+    runs-on: ${{ (matrix.language == 'swift' && 'macos-latest') || 'ubuntu-latest' }}
+    timeout-minutes: ${{ (matrix.language == 'swift' && 120) || 360 }}
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ 'javascript-typescript', 'python' ]
+        # CodeQL supports [ 'c-cpp', 'csharp', 'go', 'java-kotlin', 'javascript-typescript', 'python', 'ruby', 'swift' ]
+        # Use only 'java-kotlin' to analyze code written in Java, Kotlin or both
+        # Use only 'javascript-typescript' to analyze code written in JavaScript, TypeScript or both
+        # Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v3
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v2
+      with:
+        languages: ${{ matrix.language }}
+        # If you wish to specify custom queries, you can do so here or in a config file.
+        # By default, queries listed here will override any specified in a config file.
+        # Prefix the list here with "+" to use these queries and those in the config file.
+
+        # For more details on CodeQL's query packs, refer to: https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
+        # queries: security-extended,security-and-quality
+
+
+    # Autobuild attempts to build any compiled languages (C/C++, C#, Go, Java, or Swift).
+    # If this step fails, then you should remove it and run the build manually (see below)
+    - name: Autobuild
+      uses: github/codeql-action/autobuild@v2
+
+    # ℹ️ Command-line programs to run using the OS shell.
+    # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
+
+    #   If the Autobuild fails above, remove it and uncomment the following three lines.
+    #   modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance.
+
+    # - run: |
+    #     echo "Run, Build Application using script"
+    #     ./location_of_script_within_repo/buildscript.sh
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v2
+      with:
+        category: "/language:${{matrix.language}}"

.github/workflows/nightly.yml

@@ -19,6 +19,9 @@ jobs:
     uses: ./.github/workflows/partial-frontend.yml
 
   build-release:
+    permissions:
+      contents: read
+      packages: write
     name: Build Tagged Release
     uses: ./.github/workflows/partial-builder.yml
     needs:
@@ -41,24 +44,4 @@ jobs:
           DISCORD_WEBHOOK: ${{ secrets.DISCORD_NIGHTLY_WEBHOOK }}
         uses: Ilshidur/action-discord@0.3.2
         with:
-          args: "🚀  A New build of mealie:api-nightly and mealie:frontend-nightly is available"
-
-  deploy-demo:
-    runs-on: ubuntu-latest
-    name: Deploy Demo
-    needs:
-      - build-release
-    steps:
-      - name: Clean and Deploy Demo
-        uses: appleboy/ssh-action@master
-        with:
-          host: ${{ secrets.DEMO_SERVER_IP }}
-          username: ${{ secrets.DEMO_SERVER_USER }}
-          key: ${{ secrets.DEMO_SERVER_SSH_KEY }}
-          port: ${{ secrets.DEMO_SERVER_PORT }}
-          script_stop: true
-          script: |
-            cd ~/docker/mealie-next
-            docker-compose pull
-            docker-compose down -v
-            docker-compose up -d
+          args: "🚀  New builds of ghcr.io/mealie-recipes/mealie:nightly"

.github/workflows/partial-backend.yml

@@ -13,7 +13,7 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        # Database ENV Variablse as Specified by Mealie
+        # Database ENV Variables as Specified by Mealie
         Database: [sqlite, postgres]
 
     # Services
@@ -27,13 +27,19 @@ jobs:
         options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
         ports:
           - 5432:5432
+      ldap:
+        image: rroemhild/test-openldap
+        ports:
+          - 10389:10389
+          - 10636:10636
+
     # Steps
     steps:
       - name: Check out repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Set up python
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v4
         with:
           python-version: "3.10"
 
@@ -54,24 +60,23 @@ jobs:
         id: cache-validate
         if: steps.cached-poetry-dependencies.outputs.cache-hit == 'true'
         run: |
-          echo "print('venv good?')" > test.py && poetry run python test.py && echo ::set-output name=cache-hit-success::true
+          echo "import black;print('venv good?')" > test.py && poetry run python test.py && echo "cache-hit-success=true" >> $GITHUB_OUTPUT
           rm test.py
         continue-on-error: true
 
       - name: Install dependencies
         run: |
           sudo apt-get update
-          sudo apt-get install libsasl2-dev libldap2-dev libssl-dev tesseract-ocr-all
+          sudo apt-get install libsasl2-dev libldap2-dev libssl-dev
           poetry install
           poetry add "psycopg2-binary==2.8.6"
         if: steps.cached-poetry-dependencies.outputs.cache-hit != 'true' || steps.cache-validate.outputs.cache-hit-success != 'true'
 
-      - name: Formatting (Black & isort)
+      - name: Formatting (Black)
         run: |
           poetry run black . --check
-          poetry run isort . --check-only
 
-      - name: Lint (Flake8)
+      - name: Lint (Ruff)
         run: |
           make backend-lint
 
@@ -83,5 +88,17 @@ jobs:
         env:
           DB_ENGINE: ${{ matrix.Database }}
           POSTGRES_SERVER: localhost
+          LDAP_AUTH_ENABLED: True
+          LDAP_SERVER_URL: ldap://localhost:10389
+          LDAP_TLS_INSECURE: true
+          LDAP_ENABLE_STARTTLS: false
+          LDAP_BASE_DN: "ou=people,dc=planetexpress,dc=com"
+          LDAP_QUERY_BIND: "cn=admin,dc=planetexpress,dc=com"
+          LDAP_QUERY_PASSWORD: "GoodNewsEveryone"
+          LDAP_USER_FILTER: "(&(|({id_attribute}={input})({mail_attribute}={input}))(|(memberOf=cn=ship_crew,ou=people,dc=planetexpress,dc=com)(memberOf=cn=admin_staff,ou=people,dc=planetexpress,dc=com)))"
+          LDAP_ADMIN_FILTER: "memberOf=cn=admin_staff,ou=people,dc=planetexpress,dc=com"
+          LDAP_ID_ATTRIBUTE: uid
+          LDAP_NAME_ATTRIBUTE: cn
+          LDAP_MAIL_ATTRIBUTE: mail
         run: |
           make backend-test

.github/workflows/partial-builder.yml

@@ -6,6 +6,9 @@ on:
       tag:
         required: true
         type: string
+      tags:
+        required: false
+        type: string
     secrets:
       DOCKERHUB_USERNAME:
         required: true
@@ -13,68 +16,48 @@ on:
         required: true
 
 jobs:
-  build-frontend:
+  publish:
     runs-on: ubuntu-latest
-    name: Build Frontend
     steps:
-      - name: Checkout
-        uses: actions/checkout@v2
+      - name: Checkout repository
+        uses: actions/checkout@v4
 
-      - name: Set up QEMU
-        id: qemu
-        uses: docker/setup-qemu-action@v1
+      - name: Log in to the Container registry (ghcr.io)
+        uses: docker/login-action@v3
         with:
-          image: tonistiigi/binfmt:latest
-          platforms: all
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Set up Docker Buildx
-        id: buildx
-        uses: docker/setup-buildx-action@v1
-        with:
-          install: true
-
-      - name: Login to Docker Hub
-        uses: docker/login-action@v1
+      - name: Log in to the Container registry (dockerhub)
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
-      - name: Build Frontend Image
-        working-directory: "frontend"
-        run: |
-          docker build --push --no-cache \
-            --tag hkotel/mealie:frontend-${{ inputs.tag }} \
-            --platform linux/amd64,linux/arm64 .
-
-  build-backend:
-    runs-on: ubuntu-latest
-    name: Build Backend
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-
       - name: Set up QEMU
-        id: qemu
-        uses: docker/setup-qemu-action@v1
-        with:
-          image: tonistiigi/binfmt:latest
-          platforms: all
+        uses: docker/setup-qemu-action@v3
 
       - name: Set up Docker Buildx
-        id: buildx
-        uses: docker/setup-buildx-action@v1
-        with:
-          install: true
+        uses: docker/setup-buildx-action@v3
 
-      - name: Login to Docker Hub
-        uses: docker/login-action@v1
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-
-      - name: Build Backend Image
+      - name: Override __init__.py
         run: |
-          docker build --push --no-cache \
-            --tag hkotel/mealie:api-${{ inputs.tag }}  \
-            --build-arg COMMIT=$(git rev-parse HEAD) \
-            --platform linux/amd64,linux/arm64 .
+          echo "__version__ = \"${{ inputs.tag }}\"" > ./mealie/__init__.py
+
+      - name: Build and push Docker image
+        uses: docker/build-push-action@v5
+        with:
+          file: ./docker/Dockerfile
+          context: .
+          platforms: linux/amd64,linux/arm64
+          push: true
+          tags: |
+            hkotel/mealie:${{ inputs.tag }}
+            ghcr.io/${{ github.repository }}:${{ inputs.tag }}
+            ${{ inputs.tags }}
+          build-args: |
+            COMMIT=${{ github.sha }}
+          # https://docs.docker.com/build/ci/github-actions/cache/#github-cache
+          cache-from: type=gha
+          cache-to: type=gha,mode=max

.github/workflows/partial-frontend.yml

@@ -9,20 +9,20 @@ jobs:
 
     steps:
       - name: Checkout 🛎
-        uses: actions/checkout@master
+        uses: actions/checkout@v4
 
       - name: Setup node env 🏗
-        uses: actions/setup-node@v2.1.5
+        uses: actions/setup-node@v4.0.0
         with:
           node-version: 16
           check-latest: true
 
       - name: Get yarn cache directory path 🛠
         id: yarn-cache-dir-path
-        run: echo "::set-output name=dir::$(yarn cache dir)"
+        run: echo "dir=$(yarn cache dir)" >> $GITHUB_OUTPUT
 
       - name: Cache node_modules 📦
-        uses: actions/cache@v2.1.4
+        uses: actions/cache@v3.3.2
         id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
         with:
           path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
@@ -47,20 +47,20 @@ jobs:
 
     steps:
       - name: Checkout 🛎
-        uses: actions/checkout@master
+        uses: actions/checkout@v4
 
       - name: Setup node env 🏗
-        uses: actions/setup-node@v2.1.5
+        uses: actions/setup-node@v4.0.0
         with:
           node-version: 16
           check-latest: true
 
       - name: Get yarn cache directory path 🛠
         id: yarn-cache-dir-path
-        run: echo "::set-output name=dir::$(yarn cache dir)"
+        run: echo "dir=$(yarn cache dir)" >> $GITHUB_OUTPUT
 
       - name: Cache node_modules 📦
-        uses: actions/cache@v2.1.4
+        uses: actions/cache@v3.3.2
         id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
         with:
           path: ${{ steps.yarn-cache-dir-path.outputs.dir }}

.github/workflows/partial-trivy-container-scanning.yml

@@ -0,0 +1,31 @@
+name: Trivy Container Scanning
+
+on:
+  workflow_call:
+
+jobs:
+  build:
+    name: Build and Scan Container
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: true
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Build Dockerfile
+        run: |
+          docker build -t mealie --file=./docker/Dockerfile .
+
+      - name: Run Trivy vulnerability scanner
+        uses: aquasecurity/trivy-action@master
+        with:
+          ignore-unfixed: true
+          image-ref: "mealie"
+          format: "sarif"
+          output: "trivy-results.sarif"
+
+      - name: Upload Trivy scan results to GitHub Security tab
+        uses: github/codeql-action/upload-sarif@v2
+        with:
+          sarif_file: "trivy-results.sarif"

.github/workflows/pull-requests.yml

@@ -13,3 +13,7 @@ jobs:
   frontend-tests:
     name: "Frontend and End-to-End Tests"
     uses: ./.github/workflows/partial-frontend.yml
+
+  container-scanning:
+    name: "Trivy Container Scanning"
+    uses: ./.github/workflows/partial-trivy-container-scanning.yml

.github/workflows/release.yml

@@ -14,6 +14,9 @@ jobs:
     uses: ./.github/workflows/partial-frontend.yml
 
   build-release:
+    permissions:
+      contents: read
+      packages: write
     name: Build Tagged Release
     uses: ./.github/workflows/partial-builder.yml
     needs:
@@ -21,26 +24,13 @@ jobs:
       - frontend-tests
     with:
       tag: ${{ github.event.release.tag_name }}
+      tags: |
+          hkotel/mealie:latest
+          ghcr.io/${{ github.repository }}:latest
     secrets:
       DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
       DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
 
-  publish-docs:
-    name: Deploy docs
-    runs-on: ubuntu-latest
-    needs:
-      - build-release
-    steps:
-      - name: Checkout main
-        uses: actions/checkout@v2
-
-      - name: Deploy docs
-        uses: mhausenblas/mkdocs-deploy-gh-pages@master
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          CONFIG_FILE: docs/mkdocs.yml
-          EXTRA_PACKAGES: build-base
-
   notify-discord:
     name: Notify Discord
     needs:

.github/workflows/stale.yml

@@ -0,0 +1,40 @@
+# Documentation: https://github.com/marketplace/actions/close-stale-issues
+name: 'Stale: Flag and close stale issues and PRs'
+on:
+  schedule:
+    - cron: '30 1 * * *'
+
+jobs:
+  stale:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/stale@v9
+        with:
+          stale-issue-label: 'stale'
+          exempt-issue-labels: 'pinned,security,early-stages,bug: confirmed,feedback,task'
+          stale-issue-message: 'This issue has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions.'
+          days-before-issue-stale: 30
+          days-before-issue-close: 5
+          stale-pr-label: 'stale'
+          stale-pr-message: 'This PR is stale because it has been open 45 days with no activity.'
+          days-before-pr-stale: 45
+          # This stops a PR from ever getting closed automatically.
+          days-before-pr-close: -1
+          # If an issue/PR has a milestone, it's exempt from being marked as stale.
+          exempt-all-milestones: true
+          # For initial implementation - this stops any actual updates happening.
+          # We can review the output and then decide how to proceed. I will own this action.
+          debug-only: true
+          # How many API calls will we allow the action to make, essentially.
+          # Doco: https://github.com/actions/stale?tab=readme-ov-file#operations-per-run
+          operations-per-run: 150
+          ########################################################################
+          # The below are just default values, but populating here for reference #
+          ########################################################################
+          # Automatically remove the stale label when the issues or the pull requests are updated
+          remove-stale-when-updated: true
+          # The reason used when closing issues. Valid values are `completed` and `not_planned`.
+          close-issue-reason: 'not_planned'
+          # If true, PRs currently in draft will not be marked as stale automatically.
+          # We can mark them stale (after `days-before-pr-stale`), though we don't auto-close.
+          exempt-draft-pr: false

.gitignore

@@ -12,6 +12,7 @@ docs/site/
 frontend/dist/
 
 dev/code-generation/generated/*
+dev/data/mealie.db-journal
 dev/data/backups/*
 dev/data/debug/*
 dev/data/img/*
@@ -86,6 +87,7 @@ coverage.xml
 *.cover
 .hypothesis/
 .pytest_cache/
+.ruff_cache/
 test.db
 
 # Translations
@@ -158,3 +160,5 @@ dev/code-generation/generated/test_routes.py
 mealie/services/parser_services/crfpp/model.crfmodel
 lcov.info
 dev/code-generation/openapi.json
+
+.run/

.pre-commit-config.yaml

@@ -10,22 +10,7 @@ repos:
       - id: end-of-file-fixer
       - id: trailing-whitespace
         exclude: ^tests/data/
-  - repo: https://github.com/asottile/pyupgrade
-    rev: v3.1.0
-    hooks:
-      - id: pyupgrade
-  - repo: https://github.com/pycqa/isort
-    rev: 5.10.1
-    hooks:
-      - id: isort
-        name: isort (python)
   - repo: https://github.com/psf/black
-    rev: 22.3.0
+    rev: 23.1.0
     hooks:
       - id: black
-  - repo: https://github.com/pycqa/flake8
-    rev: "4.0.1"
-    hooks:
-      - id: flake8
-        additional_dependencies:
-          - "flake8-print==4.0.0"

.pylintrc

@@ -60,17 +60,7 @@ confidence=
 # --enable=similarities". If you want to run only the classes checker, but have
 # no Warning level messages displayed, use "--disable=all --enable=classes
 # --disable=W".
-disable=print-statement,
-        parameter-unpacking,
-        unpacking-in-except,
-        old-raise-syntax,
-        backtick,
-        long-suffix,
-        old-ne-operator,
-        old-octal-literal,
-        import-star-module-level,
-        non-ascii-bytes-literal,
-        raw-checker-failed,
+disable=raw-checker-failed,
         bad-inline-option,
         locally-disabled,
         file-ignored,
@@ -78,67 +68,10 @@ disable=print-statement,
         useless-suppression,
         deprecated-pragma,
         use-symbolic-message-instead,
-        apply-builtin,
-        basestring-builtin,
-        buffer-builtin,
-        cmp-builtin,
-        coerce-builtin,
-        execfile-builtin,
-        file-builtin,
-        long-builtin,
-        raw_input-builtin,
-        reduce-builtin,
-        standarderror-builtin,
-        unicode-builtin,
-        xrange-builtin,
-        coerce-method,
-        delslice-method,
-        getslice-method,
-        setslice-method,
-        no-absolute-import,
-        old-division,
-        dict-iter-method,
-        dict-view-method,
-        next-method-called,
-        metaclass-assignment,
-        indexing-exception,
-        raising-string,
-        reload-builtin,
-        oct-method,
-        hex-method,
-        nonzero-method,
-        cmp-method,
-        input-builtin,
-        round-builtin,
-        intern-builtin,
-        unichr-builtin,
-        map-builtin-not-iterating,
-        zip-builtin-not-iterating,
-        range-builtin-not-iterating,
-        filter-builtin-not-iterating,
-        using-cmp-argument,
-        eq-without-hash,
-        div-method,
-        idiv-method,
-        rdiv-method,
-        exception-message-attribute,
-        invalid-str-codec,
-        sys-max-int,
-        bad-python3-import,
-        deprecated-string-function,
-        deprecated-str-translate-call,
-        deprecated-itertools-function,
-        deprecated-types-field,
-        next-method-defined,
-        dict-items-not-iterating,
-        dict-keys-not-iterating,
-        dict-values-not-iterating,
-        deprecated-operator-function,
-        deprecated-urllib-function,
-        xreadlines-attribute,
-        deprecated-sys-function,
-        exception-escape,
-        comprehension-escape
+        missing-function-docstring,
+        missing-class-docstring,
+        missing-module-docstring,
+        too-few-public-methods
 
 # Enable the message, report, category or checker with the given id(s). You can
 # either give multiple identifier separated by comma (,) or put this option
@@ -292,7 +225,9 @@ good-names=i,
            k,
            ex,
            Run,
-           _
+           _,
+           e,
+           db
 
 # Good variable names regexes, separated by a comma. If names match any regex,
 # they will always be accepted
@@ -455,7 +390,7 @@ indent-after-paren=4
 indent-string='    '
 
 # Maximum number of characters on a single line.
-max-line-length=100
+max-line-length=120
 
 # Maximum number of lines in a module.
 max-module-lines=1000
@@ -583,5 +518,5 @@ valid-metaclass-classmethod-first-arg=cls
 
 # Exceptions that will emit a warning when being caught. Defaults to
 # "BaseException, Exception".
-overgeneral-exceptions=BaseException,
-                       Exception
+overgeneral-exceptions=builtins.BaseException,
+                       builtins.Exception

.vscode/extensions.json

@@ -0,0 +1,3 @@
+{
+  "recommendations": ["lokalise.i18n-ally"]
+}

.vscode/settings.json

@@ -1,5 +1,9 @@
 {
-  "cSpell.enableFiletypes": ["!javascript", "!python", "!yaml"],
+  "cSpell.enableFiletypes": [
+    "!javascript",
+    "!python",
+    "!yaml"
+  ],
   "cSpell.words": [
     "chowdown",
     "compression",
@@ -10,11 +14,13 @@
     "webp"
   ],
   "editor.codeActionsOnSave": {
-    "source.fixAll.eslint": true,
-    "source.organizeImports": false
+    "source.fixAll.eslint": "explicit",
+    "source.organizeImports": "never"
   },
   "editor.formatOnSave": true,
-  "eslint.workingDirectories": ["./frontend"],
+  "eslint.workingDirectories": [
+    "./frontend"
+  ],
   "files.exclude": {
     "**/__pycache__": true,
     "**/.DS_Store": true,
@@ -23,30 +29,39 @@
     "**/.svn": true,
     "**/CVS": true
   },
-  "i18n-ally.enabledFrameworks": ["vue"],
+  "i18n-ally.enabledFrameworks": [
+    "vue"
+  ],
   "i18n-ally.keystyle": "nested",
   "i18n-ally.localesPaths": "frontend/lang/messages",
   "i18n-ally.sourceLanguage": "en-US",
-  "python.formatting.provider": "black",
-  "python.linting.enabled": true,
-  "python.linting.flake8Enabled": true,
-  "python.linting.pylintEnabled": false,
-  "python.linting.pylintArgs": ["--rcfile=${workspaceFolder}/.pylintrc"],
+  "python.defaultInterpreterPath": "${workspaceFolder}/.venv/bin/python",
   "python.testing.autoTestDiscoverOnSaveEnabled": false,
-  "python.testing.pytestArgs": ["tests"],
+  "python.testing.pytestArgs": [
+    "tests"
+  ],
   "python.testing.pytestEnabled": true,
   "python.testing.unittestEnabled": false,
   "python.analysis.typeCheckingMode": "off",
-  "python.linting.mypyEnabled": true,
-  "isort.path": ["${workspaceFolder}/.venv/bin/isort"],
   "search.mode": "reuseEditor",
-  "python.testing.unittestArgs": ["-v", "-s", "./tests", "-p", "test_*.py"],
+  "python.testing.unittestArgs": [
+    "-v",
+    "-s",
+    "./tests",
+    "-p",
+    "test_*.py"
+  ],
   "explorer.fileNesting.enabled": true,
   "explorer.fileNesting.patterns": {
     "package.json": "package-lock.json, yarn.lock, .eslintrc.js, tsconfig.json, .prettierrc, .editorconfig",
-    "pyproject.toml": "poetry.lock, alembic.ini, .pylintrc, .flake8",
+    "pyproject.toml": "poetry.lock, alembic.ini, .pylintrc",
     "netlify.toml": "runtime.txt",
-    "docker-compose.yml": "Dockerfile, .dockerignore, docker-compose.dev.yml, docker-compose.yml",
     "README.md": "LICENSE, SECURITY.md"
-  }
+  },
+  "[vue]": {
+    "editor.formatOnSave": false
+  },
+  "[python]": {
+    "editor.defaultFormatter": "ms-python.black-formatter",
+  },
 }

MAINTAINERS.md

@@ -0,0 +1,3 @@
+# Maintainers Guide
+
+See -> [/docs/docs/contributors/developers-guide/maintainers.md](/docs/docs/contributors/developers-guide/maintainers.md)

README.md

@@ -1,15 +1,15 @@
+[![Latest Release][latest-release-shield]][latest-release-url]
 [![Contributors][contributors-shield]][contributors-url]
 [![Forks][forks-shield]][forks-url]
 [![Stargazers][stars-shield]][stars-url]
 [![Issues][issues-shield]][issues-url]
-[![MIT License][license-shield]][license-url]
+[![AGPL License][license-shield]][license-url]
 [![Docker Pulls][docker-pull]][docker-pull]
-[![CodeFactor](https://www.codefactor.io/repository/github/hay-kot/mealie/badge)](https://www.codefactor.io/repository/github/hay-kot/mealie)
 
 <!-- PROJECT LOGO -->
 <br />
 <p align="center">
-  <a href="https://github.com/hay-kot/mealie">
+  <a href="https://github.com/mealie-recipes/mealie">
 <svg style="width:100px;height:100px" viewBox="0 0 24 24">
     <path fill="currentColor" d="M8.1,13.34L3.91,9.16C2.35,7.59 2.35,5.06 3.91,3.5L10.93,10.5L8.1,13.34M13.41,13L20.29,19.88L18.88,21.29L12,14.41L5.12,21.29L3.71,19.88L13.36,10.22L13.16,10C12.38,9.23 12.38,7.97 13.16,7.19L17.5,2.82L18.43,3.74L15.19,7L16.15,7.94L19.39,4.69L20.31,5.61L17.06,8.85L18,9.81L21.26,6.56L22.18,7.5L17.81,11.84C17.03,12.62 15.77,12.62 15,11.84L14.78,11.64L13.41,13Z" />
 </svg>
@@ -21,15 +21,14 @@
     A Place for All Your Recipes
     <br />
     <a href="https://nightly.mealie.io"><strong>Explore the docs »</strong></a>
-  <a href="https://github.com/hay-kot/mealie">
+  <a href="https://github.com/mealie-recipes/mealie">
   </a>
     <br />
     <a href="https://demo.mealie.io/">View Demo</a>
     ·
-    <a href="https://github.com/hay-kot/mealie/issues">Report Bug</a>
+    <a href="https://github.com/mealie-recipes/mealie/issues">Report Bug</a>
     ·
-    <a href="https://hub.docker.com/r/hkotel/mealie"> Docker Hub
-    </a>
+    <a href="https://github.com/mealie-recipes/mealie/pkgs/container/mealie">GitHub Container Registry</a>
 </p>
 
 
@@ -39,7 +38,7 @@
 
 # About The Project
 
-Mealie is a self hosted recipe manager and meal planner with a RestAPI backend and a reactive frontend application built in Vue for a pleasant user experience for the whole family. Easily add recipes into your database by providing the url and Mealie will automatically import the relevant data or add a family recipe with the UI editor. Mealie also provides an API for interactions from 3rd party applications.
+Mealie is a self hosted recipe manager and meal planner with a RestAPI backend and a reactive frontend application built in Vue for a pleasant user experience for the whole family. Easily add recipes into your database by providing the URL and Mealie will automatically import the relevant data, or add a family recipe with the UI editor. Mealie also provides an API for interactions from 3rd party applications.
 
 - [Remember to join the Discord](https://discord.gg/QuStdQGSGK)!
 - [Documentation](https://nightly.mealie.io)
@@ -48,7 +47,7 @@ Mealie is a self hosted recipe manager and meal planner with a RestAPI backend a
 <!-- CONTRIBUTING -->
 ## Contributing
 
-Contributions are what make the open source community such an amazing place to be learn, inspire, and create. Any contributions you make are **greatly appreciated**. If you're going to be working on the code-base, you'll want to use the nightly documentation to ensure you get the latest information.
+Contributions are what make the open source community such an amazing place to learn, inspire, and create. Any contributions you make are **greatly appreciated**. If you're going to be working on the code-base, you'll want to use the nightly documentation to ensure you get the latest information.
 
 - See the [Contributors Guide](https://nightly.mealie.io/contributors/developers-guide/code-contributions/) for help getting started.
 - We use [VSCode Dev Containers](https://code.visualstudio.com/docs/remote/containers) to make it easy for contributors to get started!
@@ -57,9 +56,15 @@ If you are not a coder, you can still contribute financially. Financial contribu
 
 <a href="https://www.buymeacoffee.com/haykot" target="_blank"><img src="https://cdn.buymeacoffee.com/buttons/v2/default-green.png" alt="Buy Me A Coffee" style="height: 30px !important;width: 107px !important;" ></a>
 
+### Translations
+
+Translations can be a great way for **non-coders** to contribute to project. We use [Crowdin](https://crowdin.com/project/mealie) to allow several contributors to work on translating Mealie. You can simply help by voting for your preferred translations, or even by completely translating Mealie into a new language.
+
+For more information, check out the translation page on the [contributor's guide](https://nightly.mealie.io/contributors/translating/).
+
 <!-- LICENSE -->
 ## License
-Distributed under the MIT License. See `LICENSE` for more information.
+Distributed under the AGPL License. See `LICENSE` for more information.
 
 
 ## Sponsors
@@ -77,17 +82,19 @@ Thanks to Linode for providing Hosting for the Demo, Beta, and Documentation sit
 
 <!-- MARKDOWN LINKS & IMAGES -->
 <!-- https://www.markdownguide.org/basic-syntax/#reference-style-links -->
-[contributors-shield]: https://img.shields.io/github/contributors/hay-kot/mealie.svg?style=flat-square
+[contributors-shield]: https://img.shields.io/github/contributors/mealie-recipes/mealie.svg?style=flat-square
 [docker-pull]: https://img.shields.io/docker/pulls/hkotel/mealie
-[contributors-url]: https://github.com/hay-kot/mealie/graphs/contributors
-[forks-shield]: https://img.shields.io/github/forks/hay-kot/mealie.svg?style=flat-square
-[forks-url]: https://github.com/hay-kot/mealie/network/members
-[stars-shield]: https://img.shields.io/github/stars/hay-kot/mealie.svg?style=flat-square
-[stars-url]: https://github.com/hay-kot/mealie/stargazers
-[issues-shield]: https://img.shields.io/github/issues/hay-kot/mealie.svg?style=flat-square
-[issues-url]: https://github.com/hay-kot/mealie/issues
-[license-shield]: https://img.shields.io/github/license/hay-kot/mealie.svg?style=flat-square
-[license-url]: https://github.com/hay-kot/mealie/blob/mealie-next/LICENSE
+[contributors-url]: https://github.com/mealie-recipes/mealie/graphs/contributors
+[forks-shield]: https://img.shields.io/github/forks/mealie-recipes/mealie.svg?style=flat-square
+[forks-url]: https://github.com/mealie-recipes/mealie/network/members
+[stars-shield]: https://img.shields.io/github/stars/mealie-recipes/mealie.svg?style=flat-square
+[stars-url]: https://github.com/mealie-recipes/mealie/stargazers
+[issues-shield]: https://img.shields.io/github/issues/mealie-recipes/mealie.svg?style=flat-square
+[issues-url]: https://github.com/mealie-recipes/mealie/issues
+[latest-release-shield]: https://img.shields.io/github/v/release/mealie-recipes/mealie.svg?style=flat-square
+[latest-release-url]: https://img.shields.io/github/v/release/mealie-recipes/mealie
+[license-shield]: https://img.shields.io/github/license/mealie-recipes/mealie.svg?style=flat-square
+[license-url]: https://github.com/mealie-recipes/mealie/blob/mealie-next/LICENSE
 [linkedin-shield]: https://img.shields.io/badge/-LinkedIn-black.svg?style=flat-square&logo=linkedin&colorB=555
 [linkedin-url]: https://linkedin.com/in/hay-kot
 [product-screenshot]: docs/docs/assets/img/home_screenshot.png

alembic/versions/2022-08-13-17.07.07_089bfa50d0ed_add_is_ocr_recipe_column_to_recipes.py

@@ -1,7 +1,7 @@
 """Add is_ocr_recipe column to recipes
 
 Revision ID: 089bfa50d0ed
-Revises: f30cf048c228
+Revises: 188374910655
 Create Date: 2022-08-05 17:07:07.389271
 
 """

alembic/versions/2022-08-29-13.57.40_44e8d670719d_add_extras_to_shopping_lists_list_items_.py

@@ -1,7 +1,7 @@
 """add extras to shopping lists, list items, and ingredient foods
 
 Revision ID: 44e8d670719d
-Revises: 188374910655
+Revises: 089bfa50d0ed
 Create Date: 2022-08-29 13:57:40.452245
 
 """

alembic/versions/2022-09-27-14.53.14_2ea7a807915c_add_recipe_timeline_events_table.py

@@ -0,0 +1,50 @@
+"""add recipe_timeline_events table
+
+Revision ID: 2ea7a807915c
+Revises: 44e8d670719d
+Create Date: 2022-09-27 14:53:14.111054
+
+"""
+import sqlalchemy as sa
+
+import mealie.db.migration_types
+from alembic import op
+
+# revision identifiers, used by Alembic.
+revision = "2ea7a807915c"
+down_revision = "44e8d670719d"
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.create_table(
+        "recipe_timeline_events",
+        sa.Column("created_at", sa.DateTime(), nullable=True),
+        sa.Column("update_at", sa.DateTime(), nullable=True),
+        sa.Column("id", mealie.db.migration_types.GUID(), nullable=False),
+        sa.Column("recipe_id", mealie.db.migration_types.GUID(), nullable=False),
+        sa.Column("user_id", mealie.db.migration_types.GUID(), nullable=False),
+        sa.Column("subject", sa.String(), nullable=False),
+        sa.Column("message", sa.String(), nullable=True),
+        sa.Column("event_type", sa.String(), nullable=True),
+        sa.Column("image", sa.String(), nullable=True),
+        sa.Column("timestamp", sa.DateTime(), nullable=True),
+        sa.ForeignKeyConstraint(
+            ["recipe_id"],
+            ["recipes.id"],
+        ),
+        sa.ForeignKeyConstraint(
+            ["user_id"],
+            ["users.id"],
+        ),
+        sa.PrimaryKeyConstraint("id"),
+    )
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_table("recipe_timeline_events")
+    # ### end Alembic commands ###

alembic/versions/2022-11-03-13.10.24_1923519381ad_renamed_timeline_event_message_and_.py

@@ -0,0 +1,28 @@
+"""added recipe last made timestamp
+
+Revision ID: 1923519381ad
+Revises: 2ea7a807915c
+Create Date: 2022-11-03 13:10:24.811134
+
+"""
+import sqlalchemy as sa
+
+from alembic import op
+
+# revision identifiers, used by Alembic.
+revision = "1923519381ad"
+down_revision = "2ea7a807915c"
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.add_column("recipes", sa.Column("last_made", sa.DateTime(), nullable=True))
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_column("recipes", "last_made")
+    # ### end Alembic commands ###

alembic/versions/2022-11-22-03.42.45_167eb69066ad_add_recipe_scale_to_shopping_list_item_.py

@@ -0,0 +1,29 @@
+"""add recipe_scale to shopping list item ref
+
+Revision ID: 167eb69066ad
+Revises: 1923519381ad
+Create Date: 2022-11-22 03:42:45.494567
+
+"""
+import sqlalchemy as sa
+
+from alembic import op
+
+# revision identifiers, used by Alembic.
+revision = "167eb69066ad"
+down_revision = "1923519381ad"
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.add_column("shopping_list_item_recipe_reference", sa.Column("recipe_scale", sa.Float(), nullable=True))
+    op.execute("UPDATE shopping_list_item_recipe_reference SET recipe_scale = 1")
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_column("shopping_list_item_recipe_reference", "recipe_scale")
+    # ### end Alembic commands ###

alembic/versions/2023-01-21-16.54.44_165d943c64ee_add_related_user_to_mealplan.py

@@ -0,0 +1,43 @@
+"""add related user to mealplan
+
+Revision ID: 165d943c64ee
+Revises: 167eb69066ad
+Create Date: 2023-01-21 16:54:44.368768
+
+"""
+import sqlalchemy as sa
+
+import mealie.db.migration_types
+from alembic import op
+
+# revision identifiers, used by Alembic.
+revision = "165d943c64ee"
+down_revision = "167eb69066ad"
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    with op.batch_alter_table("group_meal_plans", schema=None) as batch_op:
+        batch_op.add_column(sa.Column("user_id", mealie.db.migration_types.GUID(), nullable=True))
+        batch_op.create_index(batch_op.f("ix_group_meal_plans_user_id"), ["user_id"], unique=False)
+        batch_op.create_foreign_key("fk_user_mealplans", "users", ["user_id"], ["id"])
+
+    with op.batch_alter_table("shopping_list_item_recipe_reference", schema=None) as batch_op:
+        batch_op.alter_column("recipe_scale", existing_type=sa.FLOAT(), nullable=False)
+
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    with op.batch_alter_table("shopping_list_item_recipe_reference", schema=None) as batch_op:
+        batch_op.alter_column("recipe_scale", existing_type=sa.FLOAT(), nullable=True)
+
+    with op.batch_alter_table("group_meal_plans", schema=None) as batch_op:
+        batch_op.drop_constraint("fk_user_mealplans", type_="foreignkey")
+        batch_op.drop_index(batch_op.f("ix_group_meal_plans_user_id"))
+        batch_op.drop_column("user_id")
+
+    # ### end Alembic commands ###

alembic/versions/2023-02-07-20.57.21_ff5f73b01a7a_add_missing_foreign_key_and_order_.py

@@ -0,0 +1,280 @@
+"""add missing foreign key and order indices
+
+Revision ID: ff5f73b01a7a
+Revises: 165d943c64ee
+Create Date: 2023-02-07 20:57:21.066927
+
+"""
+
+from alembic import op
+
+# revision identifiers, used by Alembic.
+revision = "ff5f73b01a7a"
+down_revision = "165d943c64ee"
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.create_index(op.f("ix_api_extras_created_at"), "api_extras", ["created_at"], unique=False)
+    op.create_index(op.f("ix_api_extras_recipee_id"), "api_extras", ["recipee_id"], unique=False)
+    op.create_index(op.f("ix_categories_created_at"), "categories", ["created_at"], unique=False)
+    op.create_index(op.f("ix_cookbooks_created_at"), "cookbooks", ["created_at"], unique=False)
+    op.create_index(op.f("ix_cookbooks_group_id"), "cookbooks", ["group_id"], unique=False)
+    op.create_index(op.f("ix_cookbooks_slug"), "cookbooks", ["slug"], unique=False)
+    op.create_index(
+        op.f("ix_cookbooks_to_categories_category_id"), "cookbooks_to_categories", ["category_id"], unique=False
+    )
+    op.create_index(
+        op.f("ix_cookbooks_to_categories_cookbook_id"), "cookbooks_to_categories", ["cookbook_id"], unique=False
+    )
+    op.create_index(op.f("ix_cookbooks_to_tags_cookbook_id"), "cookbooks_to_tags", ["cookbook_id"], unique=False)
+    op.create_index(op.f("ix_cookbooks_to_tags_tag_id"), "cookbooks_to_tags", ["tag_id"], unique=False)
+    op.create_index(op.f("ix_cookbooks_to_tools_cookbook_id"), "cookbooks_to_tools", ["cookbook_id"], unique=False)
+    op.create_index(op.f("ix_cookbooks_to_tools_tool_id"), "cookbooks_to_tools", ["tool_id"], unique=False)
+    op.create_index(op.f("ix_group_data_exports_created_at"), "group_data_exports", ["created_at"], unique=False)
+    op.create_index(
+        op.f("ix_group_events_notifier_options_created_at"),
+        "group_events_notifier_options",
+        ["created_at"],
+        unique=False,
+    )
+    op.create_index(
+        op.f("ix_group_events_notifiers_created_at"), "group_events_notifiers", ["created_at"], unique=False
+    )
+    op.create_index(op.f("ix_group_meal_plan_rules_created_at"), "group_meal_plan_rules", ["created_at"], unique=False)
+    op.create_index(op.f("ix_group_meal_plan_rules_group_id"), "group_meal_plan_rules", ["group_id"], unique=False)
+    op.create_index(op.f("ix_group_meal_plans_created_at"), "group_meal_plans", ["created_at"], unique=False)
+    op.create_index(op.f("ix_group_preferences_created_at"), "group_preferences", ["created_at"], unique=False)
+    op.create_index(op.f("ix_group_reports_created_at"), "group_reports", ["created_at"], unique=False)
+    op.create_index(op.f("ix_group_to_categories_category_id"), "group_to_categories", ["category_id"], unique=False)
+    op.create_index(op.f("ix_group_to_categories_group_id"), "group_to_categories", ["group_id"], unique=False)
+    op.create_index(op.f("ix_groups_created_at"), "groups", ["created_at"], unique=False)
+    op.create_index(
+        op.f("ix_ingredient_food_extras_created_at"), "ingredient_food_extras", ["created_at"], unique=False
+    )
+    op.create_index(
+        op.f("ix_ingredient_food_extras_ingredient_food_id"),
+        "ingredient_food_extras",
+        ["ingredient_food_id"],
+        unique=False,
+    )
+    op.create_index(op.f("ix_ingredient_foods_created_at"), "ingredient_foods", ["created_at"], unique=False)
+    op.create_index(op.f("ix_ingredient_foods_group_id"), "ingredient_foods", ["group_id"], unique=False)
+    op.create_index(op.f("ix_ingredient_foods_label_id"), "ingredient_foods", ["label_id"], unique=False)
+    op.create_index(op.f("ix_ingredient_units_created_at"), "ingredient_units", ["created_at"], unique=False)
+    op.create_index(op.f("ix_ingredient_units_group_id"), "ingredient_units", ["group_id"], unique=False)
+    op.create_index(op.f("ix_invite_tokens_created_at"), "invite_tokens", ["created_at"], unique=False)
+    op.create_index(op.f("ix_invite_tokens_group_id"), "invite_tokens", ["group_id"], unique=False)
+    op.create_index(op.f("ix_long_live_tokens_created_at"), "long_live_tokens", ["created_at"], unique=False)
+    op.create_index(op.f("ix_long_live_tokens_token"), "long_live_tokens", ["token"], unique=False)
+    op.create_index(op.f("ix_long_live_tokens_user_id"), "long_live_tokens", ["user_id"], unique=False)
+    op.create_index(op.f("ix_multi_purpose_labels_created_at"), "multi_purpose_labels", ["created_at"], unique=False)
+    op.create_index(op.f("ix_notes_created_at"), "notes", ["created_at"], unique=False)
+    op.create_index(op.f("ix_notes_recipe_id"), "notes", ["recipe_id"], unique=False)
+    op.create_index(op.f("ix_password_reset_tokens_created_at"), "password_reset_tokens", ["created_at"], unique=False)
+    op.create_index(op.f("ix_password_reset_tokens_user_id"), "password_reset_tokens", ["user_id"], unique=False)
+    op.create_index(
+        op.f("ix_plan_rules_to_categories_category_id"), "plan_rules_to_categories", ["category_id"], unique=False
+    )
+    op.create_index(
+        op.f("ix_plan_rules_to_categories_group_plan_rule_id"),
+        "plan_rules_to_categories",
+        ["group_plan_rule_id"],
+        unique=False,
+    )
+    op.create_index(op.f("ix_plan_rules_to_tags_plan_rule_id"), "plan_rules_to_tags", ["plan_rule_id"], unique=False)
+    op.create_index(op.f("ix_plan_rules_to_tags_tag_id"), "plan_rules_to_tags", ["tag_id"], unique=False)
+    op.create_index(op.f("ix_recipe_assets_created_at"), "recipe_assets", ["created_at"], unique=False)
+    op.create_index(op.f("ix_recipe_assets_recipe_id"), "recipe_assets", ["recipe_id"], unique=False)
+    op.create_index(op.f("ix_recipe_comments_created_at"), "recipe_comments", ["created_at"], unique=False)
+    op.create_index(op.f("ix_recipe_comments_recipe_id"), "recipe_comments", ["recipe_id"], unique=False)
+    op.create_index(op.f("ix_recipe_comments_user_id"), "recipe_comments", ["user_id"], unique=False)
+    op.create_index(
+        op.f("ix_recipe_ingredient_ref_link_created_at"), "recipe_ingredient_ref_link", ["created_at"], unique=False
+    )
+    op.create_index(
+        op.f("ix_recipe_ingredient_ref_link_instruction_id"),
+        "recipe_ingredient_ref_link",
+        ["instruction_id"],
+        unique=False,
+    )
+    op.create_index(
+        op.f("ix_recipe_ingredient_ref_link_reference_id"), "recipe_ingredient_ref_link", ["reference_id"], unique=False
+    )
+    op.create_index(op.f("ix_recipe_instructions_created_at"), "recipe_instructions", ["created_at"], unique=False)
+    op.create_index(op.f("ix_recipe_instructions_position"), "recipe_instructions", ["position"], unique=False)
+    op.create_index(op.f("ix_recipe_instructions_recipe_id"), "recipe_instructions", ["recipe_id"], unique=False)
+    op.create_index(op.f("ix_recipe_nutrition_created_at"), "recipe_nutrition", ["created_at"], unique=False)
+    op.create_index(op.f("ix_recipe_nutrition_recipe_id"), "recipe_nutrition", ["recipe_id"], unique=False)
+    op.create_index(op.f("ix_recipe_settings_created_at"), "recipe_settings", ["created_at"], unique=False)
+    op.create_index(op.f("ix_recipe_settings_recipe_id"), "recipe_settings", ["recipe_id"], unique=False)
+    op.create_index(op.f("ix_recipe_share_tokens_created_at"), "recipe_share_tokens", ["created_at"], unique=False)
+    op.create_index(op.f("ix_recipe_share_tokens_recipe_id"), "recipe_share_tokens", ["recipe_id"], unique=False)
+    op.create_index(
+        op.f("ix_recipe_timeline_events_created_at"), "recipe_timeline_events", ["created_at"], unique=False
+    )
+    op.create_index(op.f("ix_recipe_timeline_events_recipe_id"), "recipe_timeline_events", ["recipe_id"], unique=False)
+    op.create_index(op.f("ix_recipe_timeline_events_timestamp"), "recipe_timeline_events", ["timestamp"], unique=False)
+    op.create_index(op.f("ix_recipe_timeline_events_user_id"), "recipe_timeline_events", ["user_id"], unique=False)
+    op.create_index(op.f("ix_recipes_created_at"), "recipes", ["created_at"], unique=False)
+    op.create_index(op.f("ix_recipes_name"), "recipes", ["name"], unique=False)
+    op.create_index(op.f("ix_recipes_ingredients_created_at"), "recipes_ingredients", ["created_at"], unique=False)
+    op.create_index(op.f("ix_recipes_ingredients_food_id"), "recipes_ingredients", ["food_id"], unique=False)
+    op.create_index(op.f("ix_recipes_ingredients_position"), "recipes_ingredients", ["position"], unique=False)
+    op.create_index(op.f("ix_recipes_ingredients_unit_id"), "recipes_ingredients", ["unit_id"], unique=False)
+    op.create_index(
+        op.f("ix_recipes_to_categories_category_id"), "recipes_to_categories", ["category_id"], unique=False
+    )
+    op.create_index(op.f("ix_recipes_to_categories_recipe_id"), "recipes_to_categories", ["recipe_id"], unique=False)
+    op.create_index(op.f("ix_recipes_to_tags_recipe_id"), "recipes_to_tags", ["recipe_id"], unique=False)
+    op.create_index(op.f("ix_recipes_to_tags_tag_id"), "recipes_to_tags", ["tag_id"], unique=False)
+    op.create_index(op.f("ix_recipes_to_tools_recipe_id"), "recipes_to_tools", ["recipe_id"], unique=False)
+    op.create_index(op.f("ix_recipes_to_tools_tool_id"), "recipes_to_tools", ["tool_id"], unique=False)
+    op.create_index(op.f("ix_report_entries_created_at"), "report_entries", ["created_at"], unique=False)
+    op.create_index(op.f("ix_report_entries_report_id"), "report_entries", ["report_id"], unique=False)
+    op.create_index(op.f("ix_server_tasks_created_at"), "server_tasks", ["created_at"], unique=False)
+    op.create_index(op.f("ix_shopping_list_extras_created_at"), "shopping_list_extras", ["created_at"], unique=False)
+    op.create_index(
+        op.f("ix_shopping_list_extras_shopping_list_id"), "shopping_list_extras", ["shopping_list_id"], unique=False
+    )
+    op.create_index(
+        op.f("ix_shopping_list_item_extras_created_at"), "shopping_list_item_extras", ["created_at"], unique=False
+    )
+    op.create_index(
+        op.f("ix_shopping_list_item_extras_shopping_list_item_id"),
+        "shopping_list_item_extras",
+        ["shopping_list_item_id"],
+        unique=False,
+    )
+    op.create_index(
+        op.f("ix_shopping_list_item_recipe_reference_created_at"),
+        "shopping_list_item_recipe_reference",
+        ["created_at"],
+        unique=False,
+    )
+    op.create_index(op.f("ix_shopping_list_items_created_at"), "shopping_list_items", ["created_at"], unique=False)
+    op.create_index(op.f("ix_shopping_list_items_position"), "shopping_list_items", ["position"], unique=False)
+    op.create_index(
+        op.f("ix_shopping_list_items_shopping_list_id"), "shopping_list_items", ["shopping_list_id"], unique=False
+    )
+    op.create_index(
+        op.f("ix_shopping_list_recipe_reference_created_at"),
+        "shopping_list_recipe_reference",
+        ["created_at"],
+        unique=False,
+    )
+    op.create_index(op.f("ix_shopping_lists_created_at"), "shopping_lists", ["created_at"], unique=False)
+    op.create_index(op.f("ix_tags_created_at"), "tags", ["created_at"], unique=False)
+    op.create_index(op.f("ix_tools_created_at"), "tools", ["created_at"], unique=False)
+    op.create_index(op.f("ix_tools_group_id"), "tools", ["group_id"], unique=False)
+    op.create_index(op.f("ix_users_created_at"), "users", ["created_at"], unique=False)
+    op.create_index(op.f("ix_users_to_favorites_recipe_id"), "users_to_favorites", ["recipe_id"], unique=False)
+    op.create_index(op.f("ix_users_to_favorites_user_id"), "users_to_favorites", ["user_id"], unique=False)
+    op.create_index(op.f("ix_webhook_urls_created_at"), "webhook_urls", ["created_at"], unique=False)
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_index(op.f("ix_webhook_urls_created_at"), table_name="webhook_urls")
+    op.drop_index(op.f("ix_users_to_favorites_user_id"), table_name="users_to_favorites")
+    op.drop_index(op.f("ix_users_to_favorites_recipe_id"), table_name="users_to_favorites")
+    op.drop_index(op.f("ix_users_created_at"), table_name="users")
+    op.drop_index(op.f("ix_tools_group_id"), table_name="tools")
+    op.drop_index(op.f("ix_tools_created_at"), table_name="tools")
+    op.drop_index(op.f("ix_tags_created_at"), table_name="tags")
+    op.drop_index(op.f("ix_shopping_lists_created_at"), table_name="shopping_lists")
+    op.drop_index(op.f("ix_shopping_list_recipe_reference_created_at"), table_name="shopping_list_recipe_reference")
+    op.drop_index(op.f("ix_shopping_list_items_shopping_list_id"), table_name="shopping_list_items")
+    op.drop_index(op.f("ix_shopping_list_items_position"), table_name="shopping_list_items")
+    op.drop_index(op.f("ix_shopping_list_items_created_at"), table_name="shopping_list_items")
+    op.drop_index(
+        op.f("ix_shopping_list_item_recipe_reference_created_at"), table_name="shopping_list_item_recipe_reference"
+    )
+    op.drop_index(op.f("ix_shopping_list_item_extras_shopping_list_item_id"), table_name="shopping_list_item_extras")
+    op.drop_index(op.f("ix_shopping_list_item_extras_created_at"), table_name="shopping_list_item_extras")
+    op.drop_index(op.f("ix_shopping_list_extras_shopping_list_id"), table_name="shopping_list_extras")
+    op.drop_index(op.f("ix_shopping_list_extras_created_at"), table_name="shopping_list_extras")
+    op.drop_index(op.f("ix_server_tasks_created_at"), table_name="server_tasks")
+    op.drop_index(op.f("ix_report_entries_report_id"), table_name="report_entries")
+    op.drop_index(op.f("ix_report_entries_created_at"), table_name="report_entries")
+    op.drop_index(op.f("ix_recipes_to_tools_tool_id"), table_name="recipes_to_tools")
+    op.drop_index(op.f("ix_recipes_to_tools_recipe_id"), table_name="recipes_to_tools")
+    op.drop_index(op.f("ix_recipes_to_tags_tag_id"), table_name="recipes_to_tags")
+    op.drop_index(op.f("ix_recipes_to_tags_recipe_id"), table_name="recipes_to_tags")
+    op.drop_index(op.f("ix_recipes_to_categories_recipe_id"), table_name="recipes_to_categories")
+    op.drop_index(op.f("ix_recipes_to_categories_category_id"), table_name="recipes_to_categories")
+    op.drop_index(op.f("ix_recipes_ingredients_unit_id"), table_name="recipes_ingredients")
+    op.drop_index(op.f("ix_recipes_ingredients_position"), table_name="recipes_ingredients")
+    op.drop_index(op.f("ix_recipes_ingredients_food_id"), table_name="recipes_ingredients")
+    op.drop_index(op.f("ix_recipes_ingredients_created_at"), table_name="recipes_ingredients")
+    op.drop_index(op.f("ix_recipes_name"), table_name="recipes")
+    op.drop_index(op.f("ix_recipes_created_at"), table_name="recipes")
+    op.drop_index(op.f("ix_recipe_timeline_events_user_id"), table_name="recipe_timeline_events")
+    op.drop_index(op.f("ix_recipe_timeline_events_timestamp"), table_name="recipe_timeline_events")
+    op.drop_index(op.f("ix_recipe_timeline_events_recipe_id"), table_name="recipe_timeline_events")
+    op.drop_index(op.f("ix_recipe_timeline_events_created_at"), table_name="recipe_timeline_events")
+    op.drop_index(op.f("ix_recipe_share_tokens_recipe_id"), table_name="recipe_share_tokens")
+    op.drop_index(op.f("ix_recipe_share_tokens_created_at"), table_name="recipe_share_tokens")
+    op.drop_index(op.f("ix_recipe_settings_recipe_id"), table_name="recipe_settings")
+    op.drop_index(op.f("ix_recipe_settings_created_at"), table_name="recipe_settings")
+    op.drop_index(op.f("ix_recipe_nutrition_recipe_id"), table_name="recipe_nutrition")
+    op.drop_index(op.f("ix_recipe_nutrition_created_at"), table_name="recipe_nutrition")
+    op.drop_index(op.f("ix_recipe_instructions_recipe_id"), table_name="recipe_instructions")
+    op.drop_index(op.f("ix_recipe_instructions_position"), table_name="recipe_instructions")
+    op.drop_index(op.f("ix_recipe_instructions_created_at"), table_name="recipe_instructions")
+    op.drop_index(op.f("ix_recipe_ingredient_ref_link_reference_id"), table_name="recipe_ingredient_ref_link")
+    op.drop_index(op.f("ix_recipe_ingredient_ref_link_instruction_id"), table_name="recipe_ingredient_ref_link")
+    op.drop_index(op.f("ix_recipe_ingredient_ref_link_created_at"), table_name="recipe_ingredient_ref_link")
+    op.drop_index(op.f("ix_recipe_comments_user_id"), table_name="recipe_comments")
+    op.drop_index(op.f("ix_recipe_comments_recipe_id"), table_name="recipe_comments")
+    op.drop_index(op.f("ix_recipe_comments_created_at"), table_name="recipe_comments")
+    op.drop_index(op.f("ix_recipe_assets_recipe_id"), table_name="recipe_assets")
+    op.drop_index(op.f("ix_recipe_assets_created_at"), table_name="recipe_assets")
+    op.drop_index(op.f("ix_plan_rules_to_tags_tag_id"), table_name="plan_rules_to_tags")
+    op.drop_index(op.f("ix_plan_rules_to_tags_plan_rule_id"), table_name="plan_rules_to_tags")
+    op.drop_index(op.f("ix_plan_rules_to_categories_group_plan_rule_id"), table_name="plan_rules_to_categories")
+    op.drop_index(op.f("ix_plan_rules_to_categories_category_id"), table_name="plan_rules_to_categories")
+    op.drop_index(op.f("ix_password_reset_tokens_user_id"), table_name="password_reset_tokens")
+    op.drop_index(op.f("ix_password_reset_tokens_created_at"), table_name="password_reset_tokens")
+    op.drop_index(op.f("ix_notes_recipe_id"), table_name="notes")
+    op.drop_index(op.f("ix_notes_created_at"), table_name="notes")
+    op.drop_index(op.f("ix_multi_purpose_labels_created_at"), table_name="multi_purpose_labels")
+    op.drop_index(op.f("ix_long_live_tokens_user_id"), table_name="long_live_tokens")
+    op.drop_index(op.f("ix_long_live_tokens_token"), table_name="long_live_tokens")
+    op.drop_index(op.f("ix_long_live_tokens_created_at"), table_name="long_live_tokens")
+    op.drop_index(op.f("ix_invite_tokens_group_id"), table_name="invite_tokens")
+    op.drop_index(op.f("ix_invite_tokens_created_at"), table_name="invite_tokens")
+    op.drop_index(op.f("ix_ingredient_units_group_id"), table_name="ingredient_units")
+    op.drop_index(op.f("ix_ingredient_units_created_at"), table_name="ingredient_units")
+    op.drop_index(op.f("ix_ingredient_foods_label_id"), table_name="ingredient_foods")
+    op.drop_index(op.f("ix_ingredient_foods_group_id"), table_name="ingredient_foods")
+    op.drop_index(op.f("ix_ingredient_foods_created_at"), table_name="ingredient_foods")
+    op.drop_index(op.f("ix_ingredient_food_extras_ingredient_food_id"), table_name="ingredient_food_extras")
+    op.drop_index(op.f("ix_ingredient_food_extras_created_at"), table_name="ingredient_food_extras")
+    op.drop_index(op.f("ix_groups_created_at"), table_name="groups")
+    op.drop_index(op.f("ix_group_to_categories_group_id"), table_name="group_to_categories")
+    op.drop_index(op.f("ix_group_to_categories_category_id"), table_name="group_to_categories")
+    op.drop_index(op.f("ix_group_reports_created_at"), table_name="group_reports")
+    op.drop_index(op.f("ix_group_preferences_created_at"), table_name="group_preferences")
+    op.drop_index(op.f("ix_group_meal_plans_created_at"), table_name="group_meal_plans")
+    op.drop_index(op.f("ix_group_meal_plan_rules_group_id"), table_name="group_meal_plan_rules")
+    op.drop_index(op.f("ix_group_meal_plan_rules_created_at"), table_name="group_meal_plan_rules")
+    op.drop_index(op.f("ix_group_events_notifiers_created_at"), table_name="group_events_notifiers")
+    op.drop_index(op.f("ix_group_events_notifier_options_created_at"), table_name="group_events_notifier_options")
+    op.drop_index(op.f("ix_group_data_exports_created_at"), table_name="group_data_exports")
+    op.drop_index(op.f("ix_cookbooks_to_tools_tool_id"), table_name="cookbooks_to_tools")
+    op.drop_index(op.f("ix_cookbooks_to_tools_cookbook_id"), table_name="cookbooks_to_tools")
+    op.drop_index(op.f("ix_cookbooks_to_tags_tag_id"), table_name="cookbooks_to_tags")
+    op.drop_index(op.f("ix_cookbooks_to_tags_cookbook_id"), table_name="cookbooks_to_tags")
+    op.drop_index(op.f("ix_cookbooks_to_categories_cookbook_id"), table_name="cookbooks_to_categories")
+    op.drop_index(op.f("ix_cookbooks_to_categories_category_id"), table_name="cookbooks_to_categories")
+    op.drop_index(op.f("ix_cookbooks_slug"), table_name="cookbooks")
+    op.drop_index(op.f("ix_cookbooks_group_id"), table_name="cookbooks")
+    op.drop_index(op.f("ix_cookbooks_created_at"), table_name="cookbooks")
+    op.drop_index(op.f("ix_categories_created_at"), table_name="categories")
+    op.drop_index(op.f("ix_api_extras_recipee_id"), table_name="api_extras")
+    op.drop_index(op.f("ix_api_extras_created_at"), table_name="api_extras")
+    # ### end Alembic commands ###

alembic/versions/2023-02-10-21.18.32_16160bf731a0_add_more_indices_necessary_for_search.py

@@ -0,0 +1,37 @@
+"""add more indices necessary for search
+
+Revision ID: 16160bf731a0
+Revises: ff5f73b01a7a
+Create Date: 2023-02-10 21:18:32.405130
+
+"""
+import sqlalchemy as sa
+
+import mealie.db.migration_types
+from alembic import op
+
+# revision identifiers, used by Alembic.
+revision = "16160bf731a0"
+down_revision = "ff5f73b01a7a"
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.create_index(op.f("ix_recipe_instructions_text"), "recipe_instructions", ["text"], unique=False)
+    op.create_index(op.f("ix_recipes_description"), "recipes", ["description"], unique=False)
+    op.create_index(op.f("ix_recipes_ingredients_note"), "recipes_ingredients", ["note"], unique=False)
+    op.create_index(
+        op.f("ix_recipes_ingredients_original_text"), "recipes_ingredients", ["original_text"], unique=False
+    )
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_index(op.f("ix_recipes_ingredients_original_text"), table_name="recipes_ingredients")
+    op.drop_index(op.f("ix_recipes_ingredients_note"), table_name="recipes_ingredients")
+    op.drop_index(op.f("ix_recipes_description"), table_name="recipes")
+    op.drop_index(op.f("ix_recipe_instructions_text"), table_name="recipe_instructions")
+    # ### end Alembic commands ###

alembic/versions/2023-02-14-20.45.41_5ab195a474eb_add_normalized_search_properties.py

@@ -0,0 +1,133 @@
+"""add normalized search properties
+
+Revision ID: 5ab195a474eb
+Revises: 16160bf731a0
+Create Date: 2023-02-14 20:45:41.102571
+
+"""
+import sqlalchemy as sa
+from sqlalchemy import orm, select
+from sqlalchemy.orm import DeclarativeBase, Mapped, mapped_column
+from text_unidecode import unidecode
+
+import mealie.db.migration_types
+from alembic import op
+from mealie.db.models._model_utils import GUID
+
+# revision identifiers, used by Alembic.
+revision = "5ab195a474eb"
+down_revision = "16160bf731a0"
+branch_labels = None
+depends_on = None
+
+
+class SqlAlchemyBase(DeclarativeBase):
+    pass
+
+
+# Intermediate table definitions
+class RecipeModel(SqlAlchemyBase):
+    __tablename__ = "recipes"
+
+    id: Mapped[GUID] = mapped_column(GUID, primary_key=True, default=GUID.generate)
+    name: Mapped[str] = mapped_column(sa.String, nullable=False)
+    description: Mapped[str | None] = mapped_column(sa.String)
+    name_normalized: Mapped[str] = mapped_column(sa.String, nullable=False, index=True)
+    description_normalized: Mapped[str | None] = mapped_column(sa.String, index=True)
+
+
+class RecipeIngredient(SqlAlchemyBase):
+    __tablename__ = "recipes_ingredients"
+
+    id: Mapped[int] = mapped_column(sa.Integer, primary_key=True)
+    note: Mapped[str | None] = mapped_column(sa.String)
+    original_text: Mapped[str | None] = mapped_column(sa.String)
+    note_normalized: Mapped[str | None] = mapped_column(sa.String, index=True)
+    original_text_normalized: Mapped[str | None] = mapped_column(sa.String, index=True)
+
+
+def do_data_migration():
+    bind = op.get_bind()
+    session = orm.Session(bind=bind)
+
+    recipes = session.execute(select(RecipeModel)).scalars().all()
+    for recipe in recipes:
+        if recipe.name is not None:
+            session.execute(
+                sa.text(
+                    f"UPDATE {RecipeModel.__tablename__} SET name_normalized=:name_normalized WHERE id=:id"
+                ).bindparams(name_normalized=unidecode(recipe.name).lower().strip(), id=recipe.id)
+            )
+
+        if recipe.description is not None:
+            session.execute(
+                sa.text(
+                    f"UPDATE {RecipeModel.__tablename__} SET description_normalized=:description_normalized WHERE id=:id"
+                ).bindparams(description_normalized=unidecode(recipe.description).lower().strip(), id=recipe.id)
+            )
+
+    ingredients = session.execute(select(RecipeIngredient)).scalars().all()
+    for ingredient in ingredients:
+        if ingredient.note is not None:
+            session.execute(
+                sa.text(
+                    f"UPDATE {RecipeIngredient.__tablename__} SET note_normalized=:note_normalized WHERE id=:id"
+                ).bindparams(note_normalized=unidecode(ingredient.note).lower().strip(), id=ingredient.id)
+            )
+
+        if ingredient.original_text is not None:
+            session.execute(
+                sa.text(
+                    f"UPDATE {RecipeIngredient.__tablename__} SET original_text_normalized=:original_text_normalized WHERE id=:id"
+                ).bindparams(
+                    original_text_normalized=unidecode(ingredient.original_text).lower().strip(), id=ingredient.id
+                )
+            )
+    session.commit()
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+
+    # Set column default first, since we do not have values here yet
+    op.add_column("recipes", sa.Column("name_normalized", sa.String(), nullable=False, server_default=""))
+    op.add_column("recipes", sa.Column("description_normalized", sa.String(), nullable=True))
+    op.drop_index("ix_recipes_description", table_name="recipes")
+    op.drop_index("ix_recipes_name", table_name="recipes")
+    op.create_index(op.f("ix_recipes_description_normalized"), "recipes", ["description_normalized"], unique=False)
+    op.create_index(op.f("ix_recipes_name_normalized"), "recipes", ["name_normalized"], unique=False)
+    op.add_column("recipes_ingredients", sa.Column("note_normalized", sa.String(), nullable=True))
+    op.add_column("recipes_ingredients", sa.Column("original_text_normalized", sa.String(), nullable=True))
+    op.drop_index("ix_recipes_ingredients_note", table_name="recipes_ingredients")
+    op.drop_index("ix_recipes_ingredients_original_text", table_name="recipes_ingredients")
+    op.create_index(
+        op.f("ix_recipes_ingredients_note_normalized"), "recipes_ingredients", ["note_normalized"], unique=False
+    )
+    op.create_index(
+        op.f("ix_recipes_ingredients_original_text_normalized"),
+        "recipes_ingredients",
+        ["original_text_normalized"],
+        unique=False,
+    )
+    do_data_migration()
+    # Remove server default now that column should be filled for all rows
+    with op.batch_alter_table("recipes", schema=None) as batch_op:
+        batch_op.alter_column("name_normalized", existing_type=sa.String(), server_default=None)
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_index(op.f("ix_recipes_ingredients_original_text_normalized"), table_name="recipes_ingredients")
+    op.drop_index(op.f("ix_recipes_ingredients_note_normalized"), table_name="recipes_ingredients")
+    op.create_index("ix_recipes_ingredients_original_text", "recipes_ingredients", ["original_text"], unique=False)
+    op.create_index("ix_recipes_ingredients_note", "recipes_ingredients", ["note"], unique=False)
+    op.drop_column("recipes_ingredients", "original_text_normalized")
+    op.drop_column("recipes_ingredients", "note_normalized")
+    op.drop_index(op.f("ix_recipes_name_normalized"), table_name="recipes")
+    op.drop_index(op.f("ix_recipes_description_normalized"), table_name="recipes")
+    op.create_index("ix_recipes_name", "recipes", ["name"], unique=False)
+    op.create_index("ix_recipes_description", "recipes", ["description"], unique=False)
+    op.drop_column("recipes", "description_normalized")
+    op.drop_column("recipes", "name_normalized")
+    # ### end Alembic commands ###

alembic/versions/2023-02-21-22.03.19_b04a08da2108_added_shopping_list_label_settings.py

@@ -0,0 +1,69 @@
+"""added shopping list label settings
+
+Revision ID: b04a08da2108
+Revises: 5ab195a474eb
+Create Date: 2023-21-02 22:03:19.837244
+
+"""
+from uuid import uuid4
+
+import sqlalchemy as sa
+from sqlalchemy.orm.session import Session
+
+import mealie.db.migration_types
+from alembic import op
+from mealie.db.models.group.shopping_list import ShoppingList
+from mealie.db.models.labels import MultiPurposeLabel
+
+# revision identifiers, used by Alembic.
+revision = "b04a08da2108"
+down_revision = "5ab195a474eb"
+branch_labels = None
+depends_on = None
+
+
+def populate_shopping_lists_multi_purpose_labels(shopping_lists_multi_purpose_labels_table: sa.Table, session: Session):
+    shopping_lists = session.query(ShoppingList).all()
+
+    shopping_lists_labels_data: list[dict] = []
+    for shopping_list in shopping_lists:
+        labels = session.query(MultiPurposeLabel).filter(MultiPurposeLabel.group_id == ShoppingList.group_id).all()
+        for i, label in enumerate(labels):
+            shopping_lists_labels_data.append(
+                {"id": uuid4(), "shopping_list_id": shopping_list.id, "label_id": label.id, "position": i}
+            )
+
+    op.bulk_insert(shopping_lists_multi_purpose_labels_table, shopping_lists_labels_data)
+    session.commit()
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    shopping_lists_multi_purpose_labels_table = op.create_table(
+        "shopping_lists_multi_purpose_labels",
+        sa.Column("created_at", sa.DateTime(), nullable=True),
+        sa.Column("update_at", sa.DateTime(), nullable=True),
+        sa.Column("id", mealie.db.migration_types.GUID(), nullable=False),
+        sa.Column("shopping_list_id", mealie.db.migration_types.GUID(), nullable=False),
+        sa.Column("label_id", mealie.db.migration_types.GUID(), nullable=False),
+        sa.Column("position", sa.Integer(), nullable=False),
+        sa.ForeignKeyConstraint(
+            ["label_id"],
+            ["multi_purpose_labels.id"],
+        ),
+        sa.ForeignKeyConstraint(
+            ["shopping_list_id"],
+            ["shopping_lists.id"],
+        ),
+        sa.PrimaryKeyConstraint("id", "shopping_list_id", "label_id"),
+    )
+    # ### end Alembic commands ###
+
+    session = Session(bind=op.get_bind())
+    populate_shopping_lists_multi_purpose_labels(shopping_lists_multi_purpose_labels_table, session)
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_table("shopping_lists_multi_purpose_labels")
+    # ### end Alembic commands ###

alembic/versions/2023-02-22-21.45.52_38514b39a824_add_auth_method_to_user_table.py

@@ -0,0 +1,43 @@
+"""add auth_method to user table
+
+Revision ID: 38514b39a824
+Revises: b04a08da2108
+Create Date: 2023-02-22 21:45:52.900964
+
+"""
+import sqlalchemy as sa
+
+import mealie.db.migration_types
+from alembic import op
+
+# revision identifiers, used by Alembic.
+revision = "38514b39a824"
+down_revision = "b04a08da2108"
+branch_labels = None
+depends_on = None
+
+
+def is_postgres():
+    return op.get_context().dialect.name == "postgresql"
+
+
+authMethod = sa.Enum("MEALIE", "LDAP", name="authmethod")
+
+
+def upgrade():
+    if is_postgres():
+        authMethod.create(op.get_bind())
+
+    op.add_column(
+        "users",
+        sa.Column("auth_method", authMethod, nullable=False, server_default="MEALIE"),
+    )
+    op.execute("UPDATE users SET auth_method = 'LDAP' WHERE password = 'LDAP'")
+
+
+def downgrade():
+    with op.batch_alter_table("users", schema=None) as batch_op:
+        batch_op.drop_column("auth_method")
+
+    if is_postgres():
+        authMethod.drop(op.get_bind())

alembic/versions/2023-04-13-06.47.04_b3dbb554ba53_postgres_fuzzy_search.py

@@ -0,0 +1,89 @@
+"""postgres fuzzy search
+
+Revision ID: b3dbb554ba53
+Revises: 38514b39a824
+Create Date: 2023-04-13 06:47:04.617131
+
+"""
+import sqlalchemy as sa
+
+import mealie.db.migration_types
+from alembic import op
+import alembic.context as context
+from mealie.core.config import get_app_settings
+
+# revision identifiers, used by Alembic.
+revision = "b3dbb554ba53"
+down_revision = "38514b39a824"
+branch_labels = None
+depends_on = None
+
+
+def get_db_type():
+    return op.get_context().dialect.name
+
+
+def setup_postgres_trigrams():
+    op.execute("CREATE EXTENSION IF NOT EXISTS pg_trgm;")
+    op.create_index(
+        "ix_recipes_name_normalized_gin",
+        table_name="recipes",
+        columns=["name_normalized"],
+        unique=False,
+        postgresql_using="gin",
+        postgresql_ops={
+            "name_normalized": "gin_trgm_ops",
+        },
+    )
+    op.create_index(
+        "ix_recipes_description_normalized_gin",
+        table_name="recipes",
+        columns=["description_normalized"],
+        unique=False,
+        postgresql_using="gin",
+        postgresql_ops={
+            "description_normalized": "gin_trgm_ops",
+        },
+    )
+    op.create_index(
+        "ix_recipes_ingredients_note_normalized_gin",
+        table_name="recipes_ingredients",
+        columns=["note_normalized"],
+        unique=False,
+        postgresql_using="gin",
+        postgresql_ops={
+            "note_normalized": "gin_trgm_ops",
+        },
+    )
+    op.create_index(
+        "ix_recipes_ingredients_original_text_normalized_gin",
+        table_name="recipes_ingredients",
+        columns=["original_text_normalized"],
+        unique=False,
+        postgresql_using="gin",
+        postgresql_ops={
+            "original_text_normalized": "gin_trgm_ops",
+        },
+    )
+
+
+def remove_postgres_trigrams():
+    op.execute("DROP EXTENSION IF EXISTS pg_trgm;")
+    op.drop_index("ix_recipes_name_normalized_gin", table_name="recipe")
+    op.drop_index("ix_recipes_description_normalized_gin", table_name="recipe")
+    op.drop_index("ix_recipes_ingredients_note_normalized_gin", table_name="recipes_ingredients")
+    op.drop_index("ix_recipes_ingredients_original_text_normalized_gin", table_name="recipes_ingredients")
+
+
+def upgrade():
+    if get_db_type() == "postgresql":
+        setup_postgres_trigrams()
+    else:
+        pass
+
+
+def downgrade():
+    if get_db_type() == "postgres":
+        remove_postgres_trigrams()
+    else:
+        pass

alembic/versions/2023-08-06-21.00.34_04ac51cbe9a4_added_group_slug.py

@@ -0,0 +1,61 @@
+"""added group slug
+
+Revision ID: 04ac51cbe9a4
+Revises: b3dbb554ba53
+Create Date: 2023-08-06 21:00:34.582905
+
+"""
+import sqlalchemy as sa
+from slugify import slugify
+from sqlalchemy.orm import Session
+
+from alembic import op
+from mealie.db.models.group.group import Group
+
+# revision identifiers, used by Alembic.
+revision = "04ac51cbe9a4"
+down_revision = "b3dbb554ba53"
+branch_labels = None
+depends_on = None
+
+
+def populate_group_slugs(session: Session):
+    groups: list[Group] = session.query(Group).all()
+    seen_slugs: set[str] = set()
+    for group in groups:
+        original_name = group.name
+        new_name = original_name
+        attempts = 0
+        while True:
+            slug = slugify(new_name)
+            if slug not in seen_slugs:
+                break
+
+            attempts += 1
+            new_name = f"{original_name} ({attempts})"
+
+        seen_slugs.add(slug)
+        session.execute(
+            sa.text(f"UPDATE {Group.__tablename__} SET name=:name, slug=:slug WHERE id=:id").bindparams(
+                name=new_name, slug=slug, id=group.id
+            )
+        )
+
+    session.commit()
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.add_column("groups", sa.Column("slug", sa.String(), nullable=True))
+    op.create_index(op.f("ix_groups_slug"), "groups", ["slug"], unique=True)
+    # ### end Alembic commands ###
+
+    session = Session(bind=op.get_bind())
+    populate_group_slugs(session)
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_index(op.f("ix_groups_slug"), table_name="groups")
+    op.drop_column("groups", "slug")
+    # ### end Alembic commands ###

alembic/versions/2023-08-14-19.30.49_1825b5225403_added_recipe_note_to_shopping_list_.py

@@ -0,0 +1,28 @@
+"""added recipe note to shopping list recipe ref
+
+Revision ID: 1825b5225403
+Revises: 04ac51cbe9a4
+Create Date: 2023-08-14 19:30:49.103185
+
+"""
+import sqlalchemy as sa
+
+from alembic import op
+
+# revision identifiers, used by Alembic.
+revision = "1825b5225403"
+down_revision = "04ac51cbe9a4"
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.add_column("shopping_list_item_recipe_reference", sa.Column("recipe_note", sa.String(), nullable=True))
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_column("shopping_list_item_recipe_reference", "recipe_note")
+    # ### end Alembic commands ###

alembic/versions/2023-08-15-16.25.07_bcfdad6b7355_remove_tool_name_and_slug_unique_.py

@@ -0,0 +1,32 @@
+"""remove tool name and slug unique contraints
+
+Revision ID: bcfdad6b7355
+Revises: 1825b5225403
+Create Date: 2023-08-15 16:25:07.058929
+
+"""
+from alembic import op
+
+# revision identifiers, used by Alembic.
+revision = "bcfdad6b7355"
+down_revision = "1825b5225403"
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_index("ix_tools_name", table_name="tools")
+    op.create_index(op.f("ix_tools_name"), "tools", ["name"], unique=False)
+    op.drop_index("ix_tools_slug", table_name="tools")
+    op.create_index(op.f("ix_tools_slug"), "tools", ["slug"], unique=False)
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_index(op.f("ix_tools_slug"), table_name="tools")
+    op.create_index("ix_tools_slug", "tools", ["slug"], unique=True)
+    op.drop_index(op.f("ix_tools_name"), table_name="tools")
+    op.create_index("ix_tools_name", "tools", ["name"], unique=True)
+    # ### end Alembic commands ###

alembic/versions/2023-09-01-14.55.42_0341b154f79a_added_normalized_unit_and_food_names.py

@@ -0,0 +1,89 @@
+"""added normalized unit and food names
+
+Revision ID: 0341b154f79a
+Revises: bcfdad6b7355
+Create Date: 2023-09-01 14:55:42.166766
+
+"""
+import sqlalchemy as sa
+from sqlalchemy import orm, select
+
+from alembic import op
+from mealie.db.models.recipe.ingredient import IngredientFoodModel, IngredientUnitModel
+
+# revision identifiers, used by Alembic.
+revision = "0341b154f79a"
+down_revision = "bcfdad6b7355"
+branch_labels = None
+depends_on = None
+
+
+def populate_normalized_fields():
+    bind = op.get_bind()
+    session = orm.Session(bind=bind)
+
+    units = (
+        session.execute(
+            select(IngredientUnitModel).options(
+                orm.load_only(IngredientUnitModel.name, IngredientUnitModel.abbreviation)
+            )
+        )
+        .scalars()
+        .all()
+    )
+    for unit in units:
+        if unit.name is not None:
+            session.execute(
+                sa.text(
+                    f"UPDATE {IngredientUnitModel.__tablename__} SET name_normalized=:name_normalized WHERE id=:id"
+                ).bindparams(name_normalized=IngredientUnitModel.normalize(unit.name), id=unit.id)
+            )
+
+        if unit.abbreviation is not None:
+            session.execute(
+                sa.text(
+                    f"UPDATE {IngredientUnitModel.__tablename__} SET abbreviation_normalized=:abbreviation_normalized WHERE id=:id"
+                ).bindparams(abbreviation_normalized=IngredientUnitModel.normalize(unit.abbreviation), id=unit.id)
+            )
+
+    foods = (
+        session.execute(select(IngredientFoodModel).options(orm.load_only(IngredientFoodModel.name))).scalars().all()
+    )
+    for food in foods:
+        if food.name is not None:
+            session.execute(
+                sa.text(
+                    f"UPDATE {IngredientFoodModel.__tablename__} SET name_normalized=:name_normalized WHERE id=:id"
+                ).bindparams(name_normalized=IngredientFoodModel.normalize(food.name), id=food.id)
+            )
+
+    session.commit()
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.add_column("ingredient_foods", sa.Column("name_normalized", sa.String(), nullable=True))
+    op.create_index(op.f("ix_ingredient_foods_name_normalized"), "ingredient_foods", ["name_normalized"], unique=False)
+    op.add_column("ingredient_units", sa.Column("name_normalized", sa.String(), nullable=True))
+    op.add_column("ingredient_units", sa.Column("abbreviation_normalized", sa.String(), nullable=True))
+    op.create_index(
+        op.f("ix_ingredient_units_abbreviation_normalized"),
+        "ingredient_units",
+        ["abbreviation_normalized"],
+        unique=False,
+    )
+    op.create_index(op.f("ix_ingredient_units_name_normalized"), "ingredient_units", ["name_normalized"], unique=False)
+    # ### end Alembic commands ###
+
+    populate_normalized_fields()
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_index(op.f("ix_ingredient_units_name_normalized"), table_name="ingredient_units")
+    op.drop_index(op.f("ix_ingredient_units_abbreviation_normalized"), table_name="ingredient_units")
+    op.drop_column("ingredient_units", "abbreviation_normalized")
+    op.drop_column("ingredient_units", "name_normalized")
+    op.drop_index(op.f("ix_ingredient_foods_name_normalized"), table_name="ingredient_foods")
+    op.drop_column("ingredient_foods", "name_normalized")
+    # ### end Alembic commands ###

alembic/versions/2023-10-04-14.29.26_dded3119c1fe_added_unique_constraints.py

@@ -0,0 +1,259 @@
+"""added unique constraints
+
+Revision ID: dded3119c1fe
+Revises: 0341b154f79a
+Create Date: 2023-10-04 14:29:26.688065
+
+"""
+from collections import defaultdict
+from dataclasses import dataclass
+from typing import Any
+
+import sqlalchemy as sa
+from pydantic import UUID4
+from sqlalchemy.orm import Session, load_only
+
+from alembic import op
+from mealie.db.models._model_base import SqlAlchemyBase
+from mealie.db.models.group.shopping_list import ShoppingListItem
+from mealie.db.models.labels import MultiPurposeLabel
+from mealie.db.models.recipe.ingredient import IngredientFoodModel, IngredientUnitModel, RecipeIngredientModel
+
+# revision identifiers, used by Alembic.
+revision = "dded3119c1fe"
+down_revision = "0341b154f79a"
+branch_labels = None
+depends_on = None
+
+
+@dataclass
+class TableMeta:
+    tablename: str
+    pk_1: str
+    pk_2: str
+
+    @classmethod
+    def composite_pk(self, pk_1_val: Any, pk_2_val: Any) -> str:
+        return "$$".join([pk_1_val, pk_2_val])
+
+
+def _is_postgres():
+    return op.get_context().dialect.name == "postgresql"
+
+
+def _get_duplicates(session: Session, model: SqlAlchemyBase) -> defaultdict[str, list]:
+    duplicate_map: defaultdict[str, list] = defaultdict(list)
+
+    query = session.execute(sa.text(f"SELECT id, group_id, name FROM {model.__tablename__}"))
+    for row in query.all():
+        id, group_id, name = row
+        key = f"{group_id}$${name}"
+        duplicate_map[key].append(id)
+
+    return duplicate_map
+
+
+def _resolve_duplicate_food(
+    session: Session,
+    keep_food_id: UUID4,
+    dupe_food_id: UUID4,
+):
+    for shopping_list_item in session.query(ShoppingListItem).filter_by(food_id=dupe_food_id).all():
+        shopping_list_item.food_id = keep_food_id
+
+    for recipe_ingredient in (
+        session.query(RecipeIngredientModel)
+        .options(load_only(RecipeIngredientModel.id, RecipeIngredientModel.food_id))
+        .filter_by(food_id=dupe_food_id)
+        .all()
+    ):
+        recipe_ingredient.food_id = keep_food_id
+
+    session.commit()
+    session.execute(
+        sa.text(f"DELETE FROM {IngredientFoodModel.__tablename__} WHERE id=:id").bindparams(id=dupe_food_id)
+    )
+    session.commit()
+
+
+def _resolve_duplicate_unit(
+    session: Session,
+    keep_unit_id: UUID4,
+    dupe_unit_id: UUID4,
+):
+    for shopping_list_item in session.query(ShoppingListItem).filter_by(unit_id=dupe_unit_id).all():
+        shopping_list_item.unit_id = keep_unit_id
+
+    for recipe_ingredient in session.query(RecipeIngredientModel).filter_by(unit_id=dupe_unit_id).all():
+        recipe_ingredient.unit_id = keep_unit_id
+
+    session.commit()
+    session.execute(
+        sa.text(f"DELETE FROM {IngredientUnitModel.__tablename__} WHERE id=:id").bindparams(id=dupe_unit_id)
+    )
+    session.commit()
+
+
+def _resolve_duplicate_label(
+    session: Session,
+    keep_label_id: UUID4,
+    dupe_label_id: UUID4,
+):
+    for shopping_list_item in session.query(ShoppingListItem).filter_by(label_id=dupe_label_id).all():
+        shopping_list_item.label_id = keep_label_id
+
+    for ingredient_food in session.query(IngredientFoodModel).filter_by(label_id=dupe_label_id).all():
+        ingredient_food.label_id = keep_label_id
+
+    session.commit()
+    session.execute(sa.text(f"DELETE FROM {MultiPurposeLabel.__tablename__} WHERE id=:id").bindparams(id=dupe_label_id))
+    session.commit()
+
+
+def _resolve_duplicate_foods_units_labels(session: Session):
+    for model, resolve_func in [
+        (IngredientFoodModel, _resolve_duplicate_food),
+        (IngredientUnitModel, _resolve_duplicate_unit),
+        (MultiPurposeLabel, _resolve_duplicate_label),
+    ]:
+        duplicate_map = _get_duplicates(session, model)
+        for ids in duplicate_map.values():
+            if len(ids) < 2:
+                continue
+
+            keep_id = ids[0]
+            for dupe_id in ids[1:]:
+                resolve_func(session, keep_id, dupe_id)
+
+
+def _remove_duplicates_from_m2m_table(session: Session, table_meta: TableMeta):
+    if _is_postgres():
+        default_pk = "CTID"
+    else:
+        default_pk = "ROWID"
+
+    # some of these tables are missing defined unique pks, so we have to rely on the database default pk
+    query = sa.text(
+        f"""
+        DELETE FROM {table_meta.tablename}
+        WHERE EXISTS (
+            SELECT 1 FROM {table_meta.tablename} t2
+            WHERE {table_meta.tablename}.{table_meta.pk_1} = t2.{table_meta.pk_1}
+            AND {table_meta.tablename}.{table_meta.pk_2} = t2.{table_meta.pk_2}
+            AND {table_meta.tablename}.{default_pk} > t2.{default_pk}
+        )
+        """
+    )
+
+    session.execute(query)
+    session.commit()
+
+
+def _remove_duplicates_from_m2m_tables(session: Session, table_metas: list[TableMeta]):
+    for table_meta in table_metas:
+        _remove_duplicates_from_m2m_table(session, table_meta)
+
+
+def upgrade():
+    bind = op.get_bind()
+    session = Session(bind=bind)
+
+    _resolve_duplicate_foods_units_labels(session)
+    _remove_duplicates_from_m2m_tables(
+        session,
+        [
+            TableMeta("cookbooks_to_categories", "cookbook_id", "category_id"),
+            TableMeta("cookbooks_to_tags", "cookbook_id", "tag_id"),
+            TableMeta("cookbooks_to_tools", "cookbook_id", "tool_id"),
+            TableMeta("group_to_categories", "group_id", "category_id"),
+            TableMeta("plan_rules_to_categories", "group_plan_rule_id", "category_id"),
+            TableMeta("plan_rules_to_tags", "plan_rule_id", "tag_id"),
+            TableMeta("recipes_to_categories", "recipe_id", "category_id"),
+            TableMeta("recipes_to_tags", "recipe_id", "tag_id"),
+            TableMeta("recipes_to_tools", "recipe_id", "tool_id"),
+            TableMeta("users_to_favorites", "user_id", "recipe_id"),
+            TableMeta("shopping_lists_multi_purpose_labels", "shopping_list_id", "label_id"),
+        ],
+    )
+
+    session.commit()
+
+    # ### commands auto generated by Alembic - please adjust! ###
+    # we use batch_alter_table here because otherwise this fails on sqlite
+    # M2M
+    with op.batch_alter_table("cookbooks_to_categories") as batch_op:
+        batch_op.create_unique_constraint("cookbook_id_category_id_key", ["cookbook_id", "category_id"])
+
+    with op.batch_alter_table("cookbooks_to_tags") as batch_op:
+        batch_op.create_unique_constraint("cookbook_id_tag_id_key", ["cookbook_id", "tag_id"])
+
+    with op.batch_alter_table("cookbooks_to_tools") as batch_op:
+        batch_op.create_unique_constraint("cookbook_id_tool_id_key", ["cookbook_id", "tool_id"])
+
+    with op.batch_alter_table("group_to_categories") as batch_op:
+        batch_op.create_unique_constraint("group_id_category_id_key", ["group_id", "category_id"])
+
+    with op.batch_alter_table("plan_rules_to_categories") as batch_op:
+        batch_op.create_unique_constraint("group_plan_rule_id_category_id_key", ["group_plan_rule_id", "category_id"])
+
+    with op.batch_alter_table("plan_rules_to_tags") as batch_op:
+        batch_op.create_unique_constraint("plan_rule_id_tag_id_key", ["plan_rule_id", "tag_id"])
+
+    with op.batch_alter_table("recipes_to_categories") as batch_op:
+        batch_op.create_unique_constraint("recipe_id_category_id_key", ["recipe_id", "category_id"])
+
+    with op.batch_alter_table("recipes_to_tags") as batch_op:
+        batch_op.create_unique_constraint("recipe_id_tag_id_key", ["recipe_id", "tag_id"])
+
+    with op.batch_alter_table("recipes_to_tools") as batch_op:
+        batch_op.create_unique_constraint("recipe_id_tool_id_key", ["recipe_id", "tool_id"])
+
+    with op.batch_alter_table("users_to_favorites") as batch_op:
+        batch_op.create_unique_constraint("user_id_recipe_id_key", ["user_id", "recipe_id"])
+
+    with op.batch_alter_table("shopping_lists_multi_purpose_labels") as batch_op:
+        batch_op.create_unique_constraint("shopping_list_id_label_id_key", ["shopping_list_id", "label_id"])
+
+    # Foods/Units/Labels
+    with op.batch_alter_table("ingredient_foods") as batch_op:
+        batch_op.create_unique_constraint("ingredient_foods_name_group_id_key", ["name", "group_id"])
+
+    with op.batch_alter_table("ingredient_units") as batch_op:
+        batch_op.create_unique_constraint("ingredient_units_name_group_id_key", ["name", "group_id"])
+
+    with op.batch_alter_table("multi_purpose_labels") as batch_op:
+        batch_op.create_unique_constraint("multi_purpose_labels_name_group_id_key", ["name", "group_id"])
+
+    op.create_index(
+        op.f("ix_shopping_lists_multi_purpose_labels_created_at"),
+        "shopping_lists_multi_purpose_labels",
+        ["created_at"],
+        unique=False,
+    )
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+
+    # M2M
+    op.drop_constraint("user_id_recipe_id_key", "users_to_favorites", type_="unique")
+    op.drop_index(
+        op.f("ix_shopping_lists_multi_purpose_labels_created_at"), table_name="shopping_lists_multi_purpose_labels"
+    )
+    op.drop_constraint("recipe_id_tool_id_key", "recipes_to_tools", type_="unique")
+    op.drop_constraint("recipe_id_tag_id_key", "recipes_to_tags", type_="unique")
+    op.drop_constraint("recipe_id_category_id_key", "recipes_to_categories", type_="unique")
+    op.drop_constraint("plan_rule_id_tag_id_key", "plan_rules_to_tags", type_="unique")
+    op.drop_constraint("group_plan_rule_id_category_id_key", "plan_rules_to_categories", type_="unique")
+    op.drop_constraint("group_id_category_id_key", "group_to_categories", type_="unique")
+    op.drop_constraint("cookbook_id_tool_id_key", "cookbooks_to_tools", type_="unique")
+    op.drop_constraint("cookbook_id_tag_id_key", "cookbooks_to_tags", type_="unique")
+    op.drop_constraint("cookbook_id_category_id_key", "cookbooks_to_categories", type_="unique")
+    op.drop_constraint("shopping_list_id_label_id_key", "shopping_lists_multi_purpose_labels", type_="unique")
+
+    # Foods/Units/Labels
+    op.drop_constraint("multi_purpose_labels_name_group_id_key", "multi_purpose_labels", type_="unique")
+    op.drop_constraint("ingredient_units_name_group_id_key", "ingredient_units", type_="unique")
+    op.drop_constraint("ingredient_foods_name_group_id_key", "ingredient_foods", type_="unique")
+    # ### end Alembic commands ###

alembic/versions/2023-10-19-19.22.55_ba1e4a6cfe99_added_plural_names_and_alias_tables_for_.py

@@ -0,0 +1,106 @@
+"""added plural names and alias tables for foods and units
+
+Revision ID: ba1e4a6cfe99
+Revises: dded3119c1fe
+Create Date: 2023-10-19 19:22:55.369319
+
+"""
+import sqlalchemy as sa
+
+import mealie.db.migration_types
+from alembic import op
+
+# revision identifiers, used by Alembic.
+revision = "ba1e4a6cfe99"
+down_revision = "dded3119c1fe"
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.create_table(
+        "ingredient_units_aliases",
+        sa.Column("id", mealie.db.migration_types.GUID(), nullable=False),
+        sa.Column("unit_id", mealie.db.migration_types.GUID(), nullable=False),
+        sa.Column("name", sa.String(), nullable=False),
+        sa.Column("name_normalized", sa.String(), nullable=True),
+        sa.Column("created_at", sa.DateTime(), nullable=True),
+        sa.Column("update_at", sa.DateTime(), nullable=True),
+        sa.ForeignKeyConstraint(
+            ["unit_id"],
+            ["ingredient_units.id"],
+        ),
+        sa.PrimaryKeyConstraint("id", "unit_id"),
+    )
+    op.create_index(
+        op.f("ix_ingredient_units_aliases_created_at"), "ingredient_units_aliases", ["created_at"], unique=False
+    )
+    op.create_index(
+        op.f("ix_ingredient_units_aliases_name_normalized"),
+        "ingredient_units_aliases",
+        ["name_normalized"],
+        unique=False,
+    )
+    op.create_table(
+        "ingredient_foods_aliases",
+        sa.Column("id", mealie.db.migration_types.GUID(), nullable=False),
+        sa.Column("food_id", mealie.db.migration_types.GUID(), nullable=False),
+        sa.Column("name", sa.String(), nullable=False),
+        sa.Column("name_normalized", sa.String(), nullable=True),
+        sa.Column("created_at", sa.DateTime(), nullable=True),
+        sa.Column("update_at", sa.DateTime(), nullable=True),
+        sa.ForeignKeyConstraint(
+            ["food_id"],
+            ["ingredient_foods.id"],
+        ),
+        sa.PrimaryKeyConstraint("id", "food_id"),
+    )
+    op.create_index(
+        op.f("ix_ingredient_foods_aliases_created_at"), "ingredient_foods_aliases", ["created_at"], unique=False
+    )
+    op.create_index(
+        op.f("ix_ingredient_foods_aliases_name_normalized"),
+        "ingredient_foods_aliases",
+        ["name_normalized"],
+        unique=False,
+    )
+    op.add_column("ingredient_foods", sa.Column("plural_name", sa.String(), nullable=True))
+    op.add_column("ingredient_foods", sa.Column("plural_name_normalized", sa.String(), nullable=True))
+    op.create_index(
+        op.f("ix_ingredient_foods_plural_name_normalized"), "ingredient_foods", ["plural_name_normalized"], unique=False
+    )
+    op.add_column("ingredient_units", sa.Column("plural_name", sa.String(), nullable=True))
+    op.add_column("ingredient_units", sa.Column("plural_name_normalized", sa.String(), nullable=True))
+    op.create_index(
+        op.f("ix_ingredient_units_plural_name_normalized"), "ingredient_units", ["plural_name_normalized"], unique=False
+    )
+    op.add_column("ingredient_units", sa.Column("plural_abbreviation", sa.String(), nullable=True))
+    op.add_column("ingredient_units", sa.Column("plural_abbreviation_normalized", sa.String(), nullable=True))
+    op.create_index(
+        op.f("ix_ingredient_units_plural_abbreviation_normalized"),
+        "ingredient_units",
+        ["plural_abbreviation_normalized"],
+        unique=False,
+    )
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_index(op.f("ix_ingredient_units_plural_abbreviation_normalized"), table_name="ingredient_units")
+    op.drop_column("ingredient_units", "plural_abbreviation_normalized")
+    op.drop_column("ingredient_units", "plural_abbreviation")
+    op.drop_index(op.f("ix_ingredient_units_plural_name_normalized"), table_name="ingredient_units")
+    op.drop_column("ingredient_units", "plural_name_normalized")
+    op.drop_column("ingredient_units", "plural_name")
+    op.drop_index(op.f("ix_ingredient_foods_plural_name_normalized"), table_name="ingredient_foods")
+    op.drop_column("ingredient_foods", "plural_name_normalized")
+    op.drop_column("ingredient_foods", "plural_name")
+    op.drop_index(op.f("ix_ingredient_foods_aliases_name_normalized"), table_name="ingredient_foods_aliases")
+    op.drop_index(op.f("ix_ingredient_foods_aliases_created_at"), table_name="ingredient_foods_aliases")
+    op.drop_table("ingredient_foods_aliases")
+    op.drop_index(op.f("ix_ingredient_units_aliases_name_normalized"), table_name="ingredient_units_aliases")
+    op.drop_index(op.f("ix_ingredient_units_aliases_created_at"), table_name="ingredient_units_aliases")
+    op.drop_table("ingredient_units_aliases")
+    # ### end Alembic commands ###

dev/code-generation/gen_py_pytest_routes.py

@@ -25,7 +25,6 @@ def get_path_objects(app: FastAPI):
     for key, value in app.openapi().items():
         if key == "paths":
             for key, value in value.items():
-
                 paths.append(
                     PathObject(
                         route_object=RouteObject(key),
@@ -50,7 +49,6 @@ def read_template(file: Path):
 
 
 def generate_python_templates(static_paths: list[PathObject], function_paths: list[PathObject]):
-
     template = Template(read_template(CodeTemplates.pytest_routes))
     content = template.render(
         paths={

dev/code-generation/gen_py_schema_exports.py

@@ -79,14 +79,12 @@ def find_modules(root: pathlib.Path) -> list[Modules]:
     modules: list[Modules] = []
     for file in root.iterdir():
         if file.is_dir() and file.name not in SKIP:
-
             modules.append(Modules(directory=file))
 
     return modules
 
 
 def main():
-
     modules = find_modules(SCHEMA_PATH)
 
     for module in modules:

dev/code-generation/gen_ts_locales.py

@@ -1,4 +1,5 @@
 import pathlib
+from dataclasses import dataclass
 from pathlib import Path
 
 import dotenv
@@ -15,38 +16,44 @@ BASE = pathlib.Path(__file__).parent.parent.parent
 API_KEY = dotenv.get_key(BASE / ".env", "CROWDIN_API_KEY")
 
 
-NAMES = {
-    "en-US": "American English",
-    "en-GB": "British English",
-    "af-ZA": "Afrikaans (Afrikaans)",
-    "ar-SA": "العربية (Arabic)",
-    "ca-ES": "Català (Catalan)",
-    "cs-CZ": "Čeština (Czech)",
-    "da-DK": "Dansk (Danish)",
-    "de-DE": "Deutsch (German)",
-    "el-GR": "Ελληνικά (Greek)",
-    "es-ES": "Español (Spanish)",
-    "fi-FI": "Suomi (Finnish)",
-    "fr-FR": "Français (French)",
-    "he-IL": "עברית (Hebrew)",
-    "hu-HU": "Magyar (Hungarian)",
-    "it-IT": "Italiano (Italian)",
-    "ja-JP": "日本語 (Japanese)",
-    "ko-KR": "한국어 (Korean)",
-    "no-NO": "Norsk (Norwegian)",
-    "nl-NL": "Nederlands (Dutch)",
-    "pl-PL": "Polski (Polish)",
-    "pt-BR": "Português do Brasil (Brazilian Portuguese)",
-    "pt-PT": "Português (Portuguese)",
-    "ro-RO": "Română (Romanian)",
-    "ru-RU": "Pусский (Russian)",
-    "sr-SP": "српски (Serbian)",
-    "sv-SE": "Svenska (Swedish)",
-    "tr-TR": "Türkçe (Turkish)",
-    "uk-UA": "Українська (Ukrainian)",
-    "vi-VN": "Tiếng Việt (Vietnamese)",
-    "zh-CN": "简体中文 (Chinese simplified)",
-    "zh-TW": "繁體中文 (Chinese traditional)",
+@dataclass
+class LocaleData:
+    name: str
+    dir: str = "ltr"
+
+
+LOCALE_DATA: dict[str, LocaleData] = {
+    "en-US": LocaleData(name="American English"),
+    "en-GB": LocaleData(name="British English"),
+    "af-ZA": LocaleData(name="Afrikaans (Afrikaans)"),
+    "ar-SA": LocaleData(name="العربية (Arabic)", dir="rtl"),
+    "ca-ES": LocaleData(name="Català (Catalan)"),
+    "cs-CZ": LocaleData(name="Čeština (Czech)"),
+    "da-DK": LocaleData(name="Dansk (Danish)"),
+    "de-DE": LocaleData(name="Deutsch (German)"),
+    "el-GR": LocaleData(name="Ελληνικά (Greek)"),
+    "es-ES": LocaleData(name="Español (Spanish)"),
+    "fi-FI": LocaleData(name="Suomi (Finnish)"),
+    "fr-FR": LocaleData(name="Français (French)"),
+    "he-IL": LocaleData(name="עברית (Hebrew)", dir="rtl"),
+    "hu-HU": LocaleData(name="Magyar (Hungarian)"),
+    "it-IT": LocaleData(name="Italiano (Italian)"),
+    "ja-JP": LocaleData(name="日本語 (Japanese)"),
+    "ko-KR": LocaleData(name="한국어 (Korean)"),
+    "no-NO": LocaleData(name="Norsk (Norwegian)"),
+    "nl-NL": LocaleData(name="Nederlands (Dutch)"),
+    "pl-PL": LocaleData(name="Polski (Polish)"),
+    "pt-BR": LocaleData(name="Português do Brasil (Brazilian Portuguese)"),
+    "pt-PT": LocaleData(name="Português (Portuguese)"),
+    "ro-RO": LocaleData(name="Română (Romanian)"),
+    "ru-RU": LocaleData(name="Pусский (Russian)"),
+    "sr-SP": LocaleData(name="српски (Serbian)"),
+    "sv-SE": LocaleData(name="Svenska (Swedish)"),
+    "tr-TR": LocaleData(name="Türkçe (Turkish)"),
+    "uk-UA": LocaleData(name="Українська (Ukrainian)"),
+    "vi-VN": LocaleData(name="Tiếng Việt (Vietnamese)"),
+    "zh-CN": LocaleData(name="简体中文 (Chinese simplified)"),
+    "zh-TW": LocaleData(name="繁體中文 (Chinese traditional)"),
 }
 
 LOCALE_TEMPLATE = """// This Code is auto generated by gen_global_components.py
@@ -55,6 +62,7 @@ export const LOCALES = [{% for locale in locales %}
     name: "{{ locale.name }}",
     value: "{{ locale.locale }}",
     progress: {{ locale.progress }},
+    dir: "{{ locale.dir }}",
   },{% endfor %}
 ]
 
@@ -65,12 +73,14 @@ class TargetLanguage(MealieModel):
     id: str
     name: str
     locale: str
+    dir: str = "ltr"
     threeLettersCode: str
     twoLettersCode: str
     progress: float = 0.0
 
     class Config:
         extra = Extra.allow
+        allow_population_by_field_name = True
 
 
 class CrowdinApi:
@@ -103,15 +113,23 @@ class CrowdinApi:
         models.insert(
             0,
             TargetLanguage(
-                id="en-US", name="English", locale="en-US", threeLettersCode="en", twoLettersCode="en", progress=100
+                id="en-US",
+                name="English",
+                locale="en-US",
+                dir="ltr",
+                threeLettersCode="en",
+                twoLettersCode="en",
+                progress=100,
             ),
         )
 
         progress: list[dict] = self.get_progress()["data"]
 
         for model in models:
-            if model.locale in NAMES:
-                model.name = NAMES[model.locale]
+            if model.locale in LOCALE_DATA:
+                locale_data = LOCALE_DATA[model.locale]
+                model.name = locale_data.name
+                model.dir = locale_data.dir
 
             for p in progress:
                 if p["data"]["languageId"] == model.id:

dev/code-generation/utils/anonymize_backups.py

@@ -0,0 +1,74 @@
+import json
+import logging
+import random
+import string
+from datetime import datetime
+from uuid import UUID
+
+logger = logging.getLogger("anonymize_backups")
+
+
+def is_uuid4(value: str):
+    try:
+        UUID(value)
+        return True
+    except ValueError:
+        return False
+
+
+def is_iso_datetime(value: str):
+    try:
+        datetime.fromisoformat(value)
+        return True
+    except ValueError:
+        return False
+
+
+def random_string(length=10):
+    return "".join(random.choice(string.ascii_lowercase) for _ in range(length))
+
+
+def clean_value(value):
+    try:
+        match value:
+            # preserve non-strings
+            case int(value) | float(value):
+                return value
+            case None:
+                return value
+            # preserve UUIDs and datetimes
+            case str(value) if is_uuid4(value) or is_iso_datetime(value):
+                return value
+            # randomize strings
+            case str(value):
+                return random_string()
+            case _:
+                pass
+
+    except Exception as e:
+        logger.exception(e)
+
+    logger.error(f"Failed to anonymize value: {value}")
+    return value
+
+
+def walk_data_and_anonymize(data):
+    for k, v in data.items():
+        if isinstance(v, list):
+            for item in v:
+                walk_data_and_anonymize(item)
+        else:
+            # preserve alembic version number and enums
+            if k in ["auth_method", "version_num"]:
+                continue
+
+            data[k] = clean_value(v)
+
+
+def anonymize_database_json(input_filepath: str, output_filepath: str):
+    with open(input_filepath) as f:
+        data = json.load(f)
+
+    walk_data_and_anonymize(data)
+    with open(output_filepath, "w") as f:
+        json.dump(data, f)

dev/scripts/all_recipes_stress_test.py

@@ -231,8 +231,7 @@ def recipe_data(name: str, slug: str, id: str, userId: str, groupId: str) -> dic
     }
 
 
-def login(username="changeme@email.com", password="MyPassword"):
-
+def login(username="changeme@example.com", password="MyPassword"):
     payload = {"username": username, "password": password}
     r = requests.post("http://localhost:9000/api/auth/token", payload)
 

docker-compose.dev.yml

@@ -1,48 +0,0 @@
-# WARNING: currently not functional, see #756, #1072
-# Use root/example as user/password credentials
-version: "3.4"
-services:
-  # Vue Frontend
-  mealie-frontend:
-    container_name: mealie-frontend
-    image: mealie-frontend:dev
-    build:
-      context: ./frontend
-      dockerfile: Dockerfile.frontend
-    restart: always
-    ports:
-      - 9920:8080
-    environment:
-      - GLOBAL_MIDDLEWARE=null
-      - BASE_URL=""
-      - ALLOW_SIGNUP=true
-    volumes:
-      - ./frontend/:/app
-      - /app/node_modules
-
-  # Fast API
-  mealie-api:
-    container_name: mealie-api
-    image: mealie-api:dev
-    build:
-      context: ./
-      target: development
-      dockerfile: Dockerfile
-    restart: always
-    ports:
-      - 9921:9000
-    environment:
-      TZ: America/Anchorage # Specify Correct Timezone for Date/Time to line up correctly.
-    volumes:
-      - ./dev/data:/app/dev/data
-      - ./mealie:/app/mealie
-
-  # Mkdocs
-  mealie-docs:
-    container_name: mealie-docs
-    image: squidfunk/mkdocs-material
-    restart: always
-    ports:
-      - 9922:8000
-    volumes:
-      - ./docs:/docs

docker-compose.yml

@@ -1,93 +0,0 @@
-version: "3.4"
-services:
-  mealie-frontend:
-    container_name: mealie-frontend
-    image: mealie-frontend:dev
-    deploy:
-      resources:
-        limits:
-          memory: 500M
-    build:
-      context: ./frontend
-      dockerfile: Dockerfile
-    restart: always
-    volumes:
-      - mealie-data:/app/data/
-    ports:
-      - 9091:3000
-    environment:
-      - API_URL=http://mealie-api:9000
-
-      # =====================================
-      # Light Mode Config
-      - THEME_LIGHT_PRIMARY=#E58325
-      - THEME_LIGHT_ACCENT=#007A99
-      - THEME_LIGHT_SECONDARY=#973542
-      - THEME_LIGHT_SUCCESS=#43A047
-      - THEME_LIGHT_INFO=#1976D2
-      - THEME_LIGHT_WARNING=#FF6D00
-      - THEME_LIGHT_ERROR=#EF5350
-      # =====================================
-      # Dark Mode Config
-      - THEME_DARK_PRIMARY=#E58325
-      - THEME_DARK_ACCENT=#007A99
-      - THEME_DARK_SECONDARY=#973542
-      - THEME_DARK_SUCCESS=#43A047
-      - THEME_DARK_INFO=#1976D2
-      - THEME_DARK_WARNING=#FF6D00
-      - THEME_DARK_ERROR=#EF5350
-  mealie:
-    container_name: mealie-api
-    deploy:
-      resources:
-        limits:
-          memory: 1000M
-    build:
-      context: ./
-      target: production
-      dockerfile: Dockerfile
-    restart: always
-    volumes:
-      - mealie-data:/app/data/
-    ports:
-      - 9092:9000
-    environment:
-      ALLOW_SIGNUP: "false"
-
-      DB_ENGINE: sqlite # Optional: 'sqlite', 'postgres'
-      # =====================================
-      # Postgres Config
-      POSTGRES_USER: mealie
-      POSTGRES_PASSWORD: mealie
-      POSTGRES_SERVER: postgres
-      POSTGRES_PORT: 5432
-      POSTGRES_DB: mealie
-
-      # =====================================
-      # Web Concurrency
-      WEB_GUNICORN: true
-      WORKERS_PER_CORE: 0.5
-      MAX_WORKERS: 1
-      WEB_CONCURRENCY: 1
-
-      # =====================================
-      # Email Configuration
-      # SMTP_HOST=
-      # SMTP_PORT=587
-      # SMTP_FROM_NAME=Mealie
-      # SMTP_AUTH_STRATEGY=TLS # Options: 'TLS', 'SSL', 'NONE'
-      # SMTP_FROM_EMAIL=
-      # SMTP_USER=
-      # SMTP_PASSWORD=
-
-  # postgres:
-  #   container_name: postgres
-  #   image: postgres
-  #   restart: always
-  #   environment:
-  #     POSTGRES_PASSWORD: mealie
-  #     POSTGRES_USER: mealie
-
-volumes:
-  mealie-data:
-    driver: local

docker/Dockerfile

@@ -1,5 +1,21 @@
+FROM node:16 as builder
+
+WORKDIR /app
+
+COPY ./frontend .
+
+RUN yarn install \
+    --prefer-offline \
+    --frozen-lockfile \
+    --non-interactive \
+    --production=false \
+    # https://github.com/docker/build-push-action/issues/471
+    --network-timeout 1000000
+
+RUN yarn generate
+
 ###############################################
-# Base Image
+# Base Image - Python
 ###############################################
 FROM python:3.10-slim as python-base
 
@@ -34,14 +50,14 @@ RUN apt-get update \
     build-essential \
     libpq-dev \
     libwebp-dev \
-    tesseract-ocr-all \
     # LDAP Dependencies
     libsasl2-dev libldap2-dev libssl-dev \
     gnupg gnupg2 gnupg1 \
+    && rm -rf /var/lib/apt/lists/* \
     && pip install -U --no-cache-dir pip
 
 # install poetry - respects $POETRY_VERSION & $POETRY_HOME
-ENV POETRY_VERSION=1.2.1
+ENV POETRY_VERSION=1.3.1
 RUN curl -sSL https://install.python-poetry.org | python3 -
 
 # copy project requirement files here to ensure they will be cached.
@@ -49,34 +65,7 @@ WORKDIR $PYSETUP_PATH
 COPY ./poetry.lock ./pyproject.toml ./
 
 # install runtime deps - uses $POETRY_VIRTUALENVS_IN_PROJECT internally
-RUN poetry install -E pgsql --no-dev
-
-###############################################
-# Development Image
-###############################################
-FROM python-base as development
-ENV PRODUCTION=false
-ENV TESTING=false
-
-# copying poetry and venv into image
-COPY --from=builder-base $POETRY_HOME $POETRY_HOME
-COPY --from=builder-base $PYSETUP_PATH $PYSETUP_PATH
-
-# copy backend
-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
-WORKDIR /
-
-RUN chmod +x $MEALIE_HOME/mealie/run.sh
-ENTRYPOINT $MEALIE_HOME/mealie/run.sh "reload"
+RUN poetry install -E pgsql --only main
 
 ###############################################
 # CRFPP Image
@@ -98,8 +87,9 @@ ENV GIT_COMMIT_HASH=$COMMIT
 RUN apt-get update \
     && apt-get install --no-install-recommends -y \
     gosu \
-    tesseract-ocr-all \
-    && apt-get autoremove \
+    iproute2 \
+    libldap-common \
+    libldap-2.5 \
     && rm -rf /var/lib/apt/lists/*
 
 # copying poetry and venv into image
@@ -122,7 +112,7 @@ 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 --no-dev
+RUN . $VENV_PATH/bin/activate && poetry install -E pgsql --only main
 WORKDIR /
 
 # Grab CRF++ Model Release
@@ -135,5 +125,17 @@ EXPOSE ${APP_PORT}
 
 HEALTHCHECK CMD python $MEALIE_HOME/mealie/scripts/healthcheck.py || exit 1
 
-RUN chmod +x $MEALIE_HOME/mealie/run.sh
-ENTRYPOINT $MEALIE_HOME/mealie/run.sh
+# ----------------------------------
+# Copy Frontend
+
+# copying caddy into image
+ENV STATIC_FILES=/spa/static
+COPY --from=builder /app/dist  ${STATIC_FILES}
+
+ENV HOST 0.0.0.0
+
+EXPOSE ${APP_PORT}
+COPY ./docker/entry.sh $MEALIE_HOME/run.sh
+
+RUN chmod +x $MEALIE_HOME/run.sh
+ENTRYPOINT ["/app/run.sh"]

docker/docker-compose.yml

@@ -0,0 +1,45 @@
+version: "3.4"
+services:
+  mealie:
+    container_name: mealie
+    image: mealie:dev
+    build:
+      context: ../
+      target: production
+      dockerfile: ./docker/Dockerfile
+    restart: always
+    volumes:
+      - mealie-data:/app/data/
+    ports:
+      - 9091:9000
+    environment:
+      ALLOW_SIGNUP: "false"
+
+      DB_ENGINE: sqlite # Optional: 'sqlite', 'postgres'
+      # =====================================
+      # Postgres Config
+      POSTGRES_USER: mealie
+      POSTGRES_PASSWORD: mealie
+      POSTGRES_SERVER: postgres
+      POSTGRES_PORT: 5432
+      POSTGRES_DB: mealie
+
+      # =====================================
+      # Web Concurrency
+      WEB_GUNICORN: "false"
+      WORKERS_PER_CORE: 0.5
+      MAX_WORKERS: 1
+      WEB_CONCURRENCY: 1
+      # =====================================
+      # Email Configuration
+      # SMTP_HOST=
+      # SMTP_PORT=587
+      # SMTP_FROM_NAME=Mealie
+      # SMTP_AUTH_STRATEGY=TLS # Options: 'TLS', 'SSL', 'NONE'
+      # SMTP_FROM_EMAIL=
+      # SMTP_USER=
+      # SMTP_PASSWORD=
+
+volumes:
+  mealie-data:
+    driver: local

docker/entry.sh

@@ -1,13 +1,10 @@
 #!/bin/bash
-
-set -e
-
-# Get Reload Arg `run.sh reload` for dev server
-ARG1=${1:-production}
+# Start Backend API
 
 # Get PUID/PGID
 PUID=${PUID:-911}
 PGID=${PGID:-911}
+BASH_SOURCE=${BASH_SOURCE:-$0}
 
 add_user() {
     groupmod -o -g "$PGID" abc
@@ -41,28 +38,15 @@ init() {
     poetry run python /app/mealie/db/init_db.py
 }
 
-if [ "$ARG1" == "reload" ]; then
-    echo "Hot Reload!"
+change_user
+init
+GUNICORN_PORT=${API_PORT:-9000}
 
-    init
-
-    # Start API
-    python /app/mealie/app.py
+# Start API
+hostip=`/sbin/ip route|awk '/default/ { print $3 }'`
+if [ "$WEB_GUNICORN" = 'true' ]; then
+    echo "Starting Gunicorn"
+    exec gunicorn mealie.app:app -b 0.0.0.0:$GUNICORN_PORT --forwarded-allow-ips=$hostip -k uvicorn.workers.UvicornWorker -c /app/gunicorn_conf.py --preload
 else
-    echo "Production"
-
-    change_user
-
-    init
-
-    GUNICORN_PORT=${API_PORT:-9000}
-
-    # Start API
-
-    if [ $WEB_GUNICORN == 'true' ]; then
-        echo "Starting Gunicorn"
-        gunicorn mealie.app:app -b 0.0.0.0:$GUNICORN_PORT -k uvicorn.workers.UvicornWorker -c /app/gunicorn_conf.py --preload
-    else
-        uvicorn mealie.app:app --host 0.0.0.0 --port $GUNICORN_PORT
-    fi
+    exec uvicorn mealie.app:app --host 0.0.0.0 --forwarded-allow-ips=$hostip --port $GUNICORN_PORT
 fi

docs/docs/assets/stylesheets/custom.css

@@ -55,3 +55,20 @@ th {
 .md-button {
   padding: 0.2rem 0.75rem !important;
 }
+
+.announce-left {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  gap: 1rem;
+}
+
+.announce-left > a {
+  color: #e0e0e0;
+  font-weight: bold;
+}
+
+.announce-left > a:hover {
+  color: var(--md-primary-fg-color);
+  text-decoration: underline;
+}

docs/docs/changelog/v0.1.0.md

@@ -62,7 +62,7 @@ A quality update with major props to [zackbcom](https://github.com/zackbcom) for
 
 ### Recipes
   - Added user feedback on bad URL
-  - Better backend data validation for updating recipes, avoid small syntax errors corrupting database entry. [Closes #8](https://github.com/hay-kot/mealie/issues/8)
+  - Better backend data validation for updating recipes, avoid small syntax errors corrupting database entry. [Closes #8](https://github.com/mealie-recipes/mealie/issues/8)
   - Fixed spacing Closes while editing new recipes in JSON
 
 ## v0.0.0 - Initial Pre-release

docs/docs/changelog/v0.4.2.md

@@ -5,7 +5,7 @@
 **Database Version: v0.4.0**
 
 !!! error "Breaking Changes"
-    1. With a recent refactor some users been experiencing issues with an environmental variable not being set correct. If you are experiencing issues, please provide your comments [Here](https://github.com/hay-kot/mealie/issues/281).
+    1. With a recent refactor some users been experiencing issues with an environmental variable not being set correct. If you are experiencing issues, please provide your comments [Here](https://github.com/mealie-recipes/mealie/issues/281).
 
     2. If you are a developer, you may experience issues with development as a new environmental variable has been introduced. Setting `PRODUCTION=false` will allow you to develop as normal.
 
@@ -31,4 +31,4 @@
 - Unify Logger across the backend
 - mealie.log and last_recipe.json are now downloadable from the frontend from the /admin/about
 - New download schema where you request a token and then use that token to hit a single endpoint to download a file. This is a notable change if you are using the API to download backups. 
-- Recipe images can now be added directly from a URL - [See #117 for details](https://github.com/hay-kot/mealie/issues/117)
+- Recipe images can now be added directly from a URL - [See #117 for details](https://github.com/mealie-recipes/mealie/issues/117)

docs/docs/changelog/v0.5.2.md

@@ -8,7 +8,7 @@
 - Fixed #617 - Section behavior when adding a step
 - Fixed #615 - Recipe Settings are not available when creating new recipe
 - Fixed #625 - API of today's image returns strange characters
-- Fixed [#590](https://github.com/hay-kot/mealie/issues/590) - Duplicate Events when using Gunicorn Workers
+- Fixed [#590](https://github.com/mealie-recipes/mealie/issues/590) - Duplicate Events when using Gunicorn Workers
 
 ## Features and Improvements
 

docs/docs/changelog/v1.0.0.md

@@ -6,14 +6,14 @@
     - FastAPI to 0.78.0
 
 - Recipe Ingredient Editor
-    - [#1140](https://github.com/hay-kot/mealie/issues/1140) - Error in processing the quantity of ingredients #1140 - UI Now prevents entering not-allowed characters in quantity field
+    - [#1140](https://github.com/mealie-recipes/mealie/issues/1140) - Error in processing the quantity of ingredients #1140 - UI Now prevents entering not-allowed characters in quantity field
     - UI now allows no value to be set in addition to a zero (0) value.
-    - [#1237](https://github.com/hay-kot/mealie/issues/1237) - UI: Saving a 0 quantity ingredient displays 0 until the page is refreshed #1237 - UI Now properly reacts to changes in the quantity field.
+    - [#1237](https://github.com/mealie-recipes/mealie/issues/1237) - UI: Saving a 0 quantity ingredient displays 0 until the page is refreshed #1237 - UI Now properly reacts to changes in the quantity field.
 
-- Fix Mealie v0.5.x migration issue [#1183](https://github.com/hay-kot/mealie/issues/1183)
+- Fix Mealie v0.5.x migration issue [#1183](https://github.com/mealie-recipes/mealie/issues/1183)
 - Consolidated Frontend Types thanks to [@PFischbeck](https://github.com/Fischbeck)
 - Added support for SSL/No Auth Email [@nkringle](https://github.com/nkringle)
-- [Implement several notifications for server actions ](https://github.com/hay-kot/mealie/pull/1234)[@miroito](https://github.com/Miroito)
+- [Implement several notifications for server actions ](https://github.com/mealie-recipes/mealie/pull/1234)[@miroito](https://github.com/Miroito)
 - Fix display issue for shared recipe rendering on server [@PFischbeck](https://github.com/Fischbeck)
 
 ## v1.0.0b - 2022-05-09
@@ -36,7 +36,7 @@
 
 - Mealie now stores the original text from parsed ingredients, with the ability to peak at the original text from a recipe. [@miroito](https://github.com/Miroito)
 - Added some management / utility functions for administrators to manage data and cleanup artifacts from the file system.
-- Fix clear url action in recipe creation [#1101](https://github.com/hay-kot/mealie/pull/1101) [@miroito](https://github.com/Miroito)
+- Fix clear url action in recipe creation [#1101](https://github.com/mealie-recipes/mealie/pull/1101) [@miroito](https://github.com/Miroito)
 - Add group statistics calculations and data storage measurements
     - No hard limits are currently imposed on groups - though this may be implemented in the future.
 

docs/docs/changelog/v1.0.0beta-2.md

@@ -1,29 +1,29 @@
 ### Bug Fixes
 
-- Bump isomorphic-dompurify from 0.18.0 to 0.19.0 in /frontend ([#1257](https://github.com/hay-kot/mealie/issues/1257))
-- Bump @nuxtjs/auth-next in /frontend ([#1265](https://github.com/hay-kot/mealie/issues/1265))
-- Bad dev dependency ([#1281](https://github.com/hay-kot/mealie/issues/1281))
-- Add touch support for mealplanner delete ([#1298](https://github.com/hay-kot/mealie/issues/1298))
+- Bump isomorphic-dompurify from 0.18.0 to 0.19.0 in /frontend ([#1257](https://github.com/mealie-recipes/mealie/issues/1257))
+- Bump @nuxtjs/auth-next in /frontend ([#1265](https://github.com/mealie-recipes/mealie/issues/1265))
+- Bad dev dependency ([#1281](https://github.com/mealie-recipes/mealie/issues/1281))
+- Add touch support for mealplanner delete ([#1298](https://github.com/mealie-recipes/mealie/issues/1298))
 
 ### Documentation
 
-- Add references for VSCode dev containers ([#1299](https://github.com/hay-kot/mealie/issues/1299))
-- Docker-compose.dev.yml is currently not functional ([#1300](https://github.com/hay-kot/mealie/issues/1300))
+- Add references for VSCode dev containers ([#1299](https://github.com/mealie-recipes/mealie/issues/1299))
+- Docker-compose.dev.yml is currently not functional ([#1300](https://github.com/mealie-recipes/mealie/issues/1300))
 
 ### Features
 
-- Add reports to bulk recipe import (url) ([#1294](https://github.com/hay-kot/mealie/issues/1294))
-- Rewrite print implementation to support new ing ([#1305](https://github.com/hay-kot/mealie/issues/1305))
+- Add reports to bulk recipe import (url) ([#1294](https://github.com/mealie-recipes/mealie/issues/1294))
+- Rewrite print implementation to support new ing ([#1305](https://github.com/mealie-recipes/mealie/issues/1305))
 
 ### Miscellaneous Tasks
 
-- Github stalebot changes ([#1271](https://github.com/hay-kot/mealie/issues/1271))
-- Bump eslint-plugin-nuxt in /frontend ([#1258](https://github.com/hay-kot/mealie/issues/1258))
-- Bump @vue/runtime-dom in /frontend ([#1259](https://github.com/hay-kot/mealie/issues/1259))
-- Bump nuxt-vite from 0.1.3 to 0.3.5 in /frontend ([#1260](https://github.com/hay-kot/mealie/issues/1260))
-- Bump vue2-script-setup-transform in /frontend ([#1263](https://github.com/hay-kot/mealie/issues/1263))
-- Update dev dependencies ([#1282](https://github.com/hay-kot/mealie/issues/1282))
+- Github stalebot changes ([#1271](https://github.com/mealie-recipes/mealie/issues/1271))
+- Bump eslint-plugin-nuxt in /frontend ([#1258](https://github.com/mealie-recipes/mealie/issues/1258))
+- Bump @vue/runtime-dom in /frontend ([#1259](https://github.com/mealie-recipes/mealie/issues/1259))
+- Bump nuxt-vite from 0.1.3 to 0.3.5 in /frontend ([#1260](https://github.com/mealie-recipes/mealie/issues/1260))
+- Bump vue2-script-setup-transform in /frontend ([#1263](https://github.com/mealie-recipes/mealie/issues/1263))
+- Update dev dependencies ([#1282](https://github.com/mealie-recipes/mealie/issues/1282))
 
 ### Refactor
 
-- Split up recipe create page ([#1283](https://github.com/hay-kot/mealie/issues/1283))
+- Split up recipe create page ([#1283](https://github.com/mealie-recipes/mealie/issues/1283))

docs/docs/changelog/v1.0.0beta-3.md

@@ -1,36 +1,36 @@
 ### Bug Fixes
 
-- Update issue links in v1.0.0beta-2 changelog ([#1312](https://github.com/hay-kot/mealie/issues/1312))
-- Bad import path ([#1313](https://github.com/hay-kot/mealie/issues/1313))
-- Printer page refs ([#1314](https://github.com/hay-kot/mealie/issues/1314))
+- Update issue links in v1.0.0beta-2 changelog ([#1312](https://github.com/mealie-recipes/mealie/issues/1312))
+- Bad import path ([#1313](https://github.com/mealie-recipes/mealie/issues/1313))
+- Printer page refs ([#1314](https://github.com/mealie-recipes/mealie/issues/1314))
 - Consolidate stores to fix mismatched state
-- Bump @vue/composition-api from 1.6.1 to 1.6.2 in /frontend ([#1275](https://github.com/hay-kot/mealie/issues/1275))
-- Shopping list label editor  ([#1333](https://github.com/hay-kot/mealie/issues/1333))
+- Bump @vue/composition-api from 1.6.1 to 1.6.2 in /frontend ([#1275](https://github.com/mealie-recipes/mealie/issues/1275))
+- Shopping list label editor  ([#1333](https://github.com/mealie-recipes/mealie/issues/1333))
 
 ### Features
 
 - Default unit fractions to True
-- Add unit abbreviation support ([#1332](https://github.com/hay-kot/mealie/issues/1332))
-- Attached images by drag and drop for recipe steps ([#1341](https://github.com/hay-kot/mealie/issues/1341))
+- Add unit abbreviation support ([#1332](https://github.com/mealie-recipes/mealie/issues/1332))
+- Attached images by drag and drop for recipe steps ([#1341](https://github.com/mealie-recipes/mealie/issues/1341))
 
 ### Docs
 
-- Render homepage social media link images at 32x32 size ([#1310](https://github.com/hay-kot/mealie/issues/1310))
+- Render homepage social media link images at 32x32 size ([#1310](https://github.com/mealie-recipes/mealie/issues/1310))
 
 ### Miscellaneous Tasks
 
 - Init git-cliff config
-- Bump @types/sortablejs in /frontend ([#1287](https://github.com/hay-kot/mealie/issues/1287))
-- Bump @babel/eslint-parser in /frontend ([#1290](https://github.com/hay-kot/mealie/issues/1290))
+- Bump @types/sortablejs in /frontend ([#1287](https://github.com/mealie-recipes/mealie/issues/1287))
+- Bump @babel/eslint-parser in /frontend ([#1290](https://github.com/mealie-recipes/mealie/issues/1290))
 
 ### Refactor
 
-- Unify recipe-organizer components ([#1340](https://github.com/hay-kot/mealie/issues/1340))
+- Unify recipe-organizer components ([#1340](https://github.com/mealie-recipes/mealie/issues/1340))
 
 ### Security
 
-- Delay server response whenever username is non existing ([#1338](https://github.com/hay-kot/mealie/issues/1338))
+- Delay server response whenever username is non existing ([#1338](https://github.com/mealie-recipes/mealie/issues/1338))
 
 ### Wip
 
-- Pagination-repository ([#1316](https://github.com/hay-kot/mealie/issues/1316))
+- Pagination-repository ([#1316](https://github.com/mealie-recipes/mealie/issues/1316))

docs/docs/changelog/v1.0.0beta-4.md

@@ -63,57 +63,57 @@ If either of the above actions prevent the user from uploading images, the appli
 
 ### Bug Fixes
 
-- For erroneously-translated datetime config ([#1362](https://github.com/hay-kot/mealie/issues/1362))
-- Fixed text color on RecipeCard in RecipePrintView and implemented ingredient sections ([#1351](https://github.com/hay-kot/mealie/issues/1351))
-- Ingredient sections lost after parsing ([#1368](https://github.com/hay-kot/mealie/issues/1368))
-- Increased float rounding precision for CRF parser ([#1369](https://github.com/hay-kot/mealie/issues/1369))
-- Infinite scroll bug on all recipes page ([#1393](https://github.com/hay-kot/mealie/issues/1393))
-- Fast fail of bulk importer ([#1394](https://github.com/hay-kot/mealie/issues/1394))
-- Bump @mdi/js from 5.9.55 to 6.7.96 in /frontend ([#1279](https://github.com/hay-kot/mealie/issues/1279))
-- Bump @nuxtjs/i18n from 7.0.3 to 7.2.2 in /frontend ([#1288](https://github.com/hay-kot/mealie/issues/1288))
-- Bump date-fns from 2.23.0 to 2.28.0 in /frontend ([#1293](https://github.com/hay-kot/mealie/issues/1293))
-- Bump fuse.js from 6.5.3 to 6.6.2 in /frontend ([#1325](https://github.com/hay-kot/mealie/issues/1325))
-- Bump core-js from 3.17.2 to 3.23.1 in /frontend ([#1383](https://github.com/hay-kot/mealie/issues/1383))
-- All-recipes page now sorts alphabetically ([#1405](https://github.com/hay-kot/mealie/issues/1405))
-- Sort recent recipes by created_at instead of date_added ([#1417](https://github.com/hay-kot/mealie/issues/1417))
-- Only show scaler when ingredients amounts enabled ([#1426](https://github.com/hay-kot/mealie/issues/1426))
-- Add missing types for API token deletion ([#1428](https://github.com/hay-kot/mealie/issues/1428))
-- Entry nutrition checker ([#1448](https://github.com/hay-kot/mealie/issues/1448))
-- Use == operator instead of is_ for sql queries ([#1453](https://github.com/hay-kot/mealie/issues/1453))
-- Use `mtime` instead of `ctime` for backup dates  ([#1461](https://github.com/hay-kot/mealie/issues/1461))
-- Mealplan pagination ([#1464](https://github.com/hay-kot/mealie/issues/1464))
-- Properly use pagination for group event notifies ([#1512](https://github.com/hay-kot/mealie/pull/1512))
+- For erroneously-translated datetime config ([#1362](https://github.com/mealie-recipes/mealie/issues/1362))
+- Fixed text color on RecipeCard in RecipePrintView and implemented ingredient sections ([#1351](https://github.com/mealie-recipes/mealie/issues/1351))
+- Ingredient sections lost after parsing ([#1368](https://github.com/mealie-recipes/mealie/issues/1368))
+- Increased float rounding precision for CRF parser ([#1369](https://github.com/mealie-recipes/mealie/issues/1369))
+- Infinite scroll bug on all recipes page ([#1393](https://github.com/mealie-recipes/mealie/issues/1393))
+- Fast fail of bulk importer ([#1394](https://github.com/mealie-recipes/mealie/issues/1394))
+- Bump @mdi/js from 5.9.55 to 6.7.96 in /frontend ([#1279](https://github.com/mealie-recipes/mealie/issues/1279))
+- Bump @nuxtjs/i18n from 7.0.3 to 7.2.2 in /frontend ([#1288](https://github.com/mealie-recipes/mealie/issues/1288))
+- Bump date-fns from 2.23.0 to 2.28.0 in /frontend ([#1293](https://github.com/mealie-recipes/mealie/issues/1293))
+- Bump fuse.js from 6.5.3 to 6.6.2 in /frontend ([#1325](https://github.com/mealie-recipes/mealie/issues/1325))
+- Bump core-js from 3.17.2 to 3.23.1 in /frontend ([#1383](https://github.com/mealie-recipes/mealie/issues/1383))
+- All-recipes page now sorts alphabetically ([#1405](https://github.com/mealie-recipes/mealie/issues/1405))
+- Sort recent recipes by created_at instead of date_added ([#1417](https://github.com/mealie-recipes/mealie/issues/1417))
+- Only show scaler when ingredients amounts enabled ([#1426](https://github.com/mealie-recipes/mealie/issues/1426))
+- Add missing types for API token deletion ([#1428](https://github.com/mealie-recipes/mealie/issues/1428))
+- Entry nutrition checker ([#1448](https://github.com/mealie-recipes/mealie/issues/1448))
+- Use == operator instead of is_ for sql queries ([#1453](https://github.com/mealie-recipes/mealie/issues/1453))
+- Use `mtime` instead of `ctime` for backup dates  ([#1461](https://github.com/mealie-recipes/mealie/issues/1461))
+- Mealplan pagination ([#1464](https://github.com/mealie-recipes/mealie/issues/1464))
+- Properly use pagination for group event notifies ([#1512](https://github.com/mealie-recipes/mealie/pull/1512))
 
 ### Documentation
 
-- Add go bulk import example ([#1388](https://github.com/hay-kot/mealie/issues/1388))
+- Add go bulk import example ([#1388](https://github.com/mealie-recipes/mealie/issues/1388))
 - Fix old link
-- Pagination and filtering, and fixed a few broken links ([#1488](https://github.com/hay-kot/mealie/issues/1488))
+- Pagination and filtering, and fixed a few broken links ([#1488](https://github.com/mealie-recipes/mealie/issues/1488))
 
 ### Features
 
-- Toggle display of ingredient references in recipe instructions ([#1268](https://github.com/hay-kot/mealie/issues/1268))
-- Add custom scaling option ([#1345](https://github.com/hay-kot/mealie/issues/1345))
-- Implemented "order by" API parameters for recipe, food, and unit queries ([#1356](https://github.com/hay-kot/mealie/issues/1356))
-- Implement user favorites page ([#1376](https://github.com/hay-kot/mealie/issues/1376))
-- Extend Apprise JSON notification functionality with programmatic data ([#1355](https://github.com/hay-kot/mealie/issues/1355))
-- Mealplan-webhooks ([#1403](https://github.com/hay-kot/mealie/issues/1403))
-- Added "last-modified" header to supported record types ([#1379](https://github.com/hay-kot/mealie/issues/1379))
-- Re-write get all routes to use pagination ([#1424](https://github.com/hay-kot/mealie/issues/1424))
-- Advanced filtering API ([#1468](https://github.com/hay-kot/mealie/issues/1468))
-- Restore frontend sorting for all recipes ([#1497](https://github.com/hay-kot/mealie/issues/1497))
-- Implemented local storage for sorting and dynamic sort icons on the new recipe sort card ([1506](https://github.com/hay-kot/mealie/pull/1506))
-- create new foods and units from their Data Management pages ([#1511](https://github.com/hay-kot/mealie/pull/1511))
+- Toggle display of ingredient references in recipe instructions ([#1268](https://github.com/mealie-recipes/mealie/issues/1268))
+- Add custom scaling option ([#1345](https://github.com/mealie-recipes/mealie/issues/1345))
+- Implemented "order by" API parameters for recipe, food, and unit queries ([#1356](https://github.com/mealie-recipes/mealie/issues/1356))
+- Implement user favorites page ([#1376](https://github.com/mealie-recipes/mealie/issues/1376))
+- Extend Apprise JSON notification functionality with programmatic data ([#1355](https://github.com/mealie-recipes/mealie/issues/1355))
+- Mealplan-webhooks ([#1403](https://github.com/mealie-recipes/mealie/issues/1403))
+- Added "last-modified" header to supported record types ([#1379](https://github.com/mealie-recipes/mealie/issues/1379))
+- Re-write get all routes to use pagination ([#1424](https://github.com/mealie-recipes/mealie/issues/1424))
+- Advanced filtering API ([#1468](https://github.com/mealie-recipes/mealie/issues/1468))
+- Restore frontend sorting for all recipes ([#1497](https://github.com/mealie-recipes/mealie/issues/1497))
+- Implemented local storage for sorting and dynamic sort icons on the new recipe sort card ([1506](https://github.com/mealie-recipes/mealie/pull/1506))
+- create new foods and units from their Data Management pages ([#1511](https://github.com/mealie-recipes/mealie/pull/1511))
 
 ### Miscellaneous Tasks
 
-- Bump dev deps ([#1418](https://github.com/hay-kot/mealie/issues/1418))
-- Bump @vue/runtime-dom in /frontend ([#1423](https://github.com/hay-kot/mealie/issues/1423))
-- Backend page_all route cleanup ([#1483](https://github.com/hay-kot/mealie/issues/1483))
+- Bump dev deps ([#1418](https://github.com/mealie-recipes/mealie/issues/1418))
+- Bump @vue/runtime-dom in /frontend ([#1423](https://github.com/mealie-recipes/mealie/issues/1423))
+- Backend page_all route cleanup ([#1483](https://github.com/mealie-recipes/mealie/issues/1483))
 
 ### Refactor
 
-- Remove depreciated repo call ([#1370](https://github.com/hay-kot/mealie/issues/1370))
+- Remove depreciated repo call ([#1370](https://github.com/mealie-recipes/mealie/issues/1370))
 
 ### Hotfix
 
@@ -121,6 +121,6 @@ If either of the above actions prevent the user from uploading images, the appli
 
 ### UI
 
-- Improve parser ui text display ([#1437](https://github.com/hay-kot/mealie/issues/1437))
+- Improve parser ui text display ([#1437](https://github.com/mealie-recipes/mealie/issues/1437))
 
 <!-- generated by git-cliff -->

docs/docs/changelog/v1.0.0beta-5.md

@@ -1,3 +1,3 @@
-## NOTICE:
+### NOTICE:
 
 Release changelogs are now published on github releases. This file is kept for historical purposes.

docs/docs/contributors/developers-guide/code-contributions.md

@@ -6,21 +6,22 @@
 We use github to host code, to track issues and feature requests, as well as accept pull requests.
 
 ## We Use [Github Flow](https://guides.github.com/introduction/flow/index.html), So All Code Changes Happen Through Pull Requests
-Pull requests are the best way to propose changes to the codebase (we use [Github Flow](https://guides.github.com/introduction/flow/index.html)). We actively welcome your pull requests: 
+Pull requests are the best way to propose changes to the codebase (we use [Github Flow](https://guides.github.com/introduction/flow/index.html)). We actively welcome your pull requests:
 
-1. Fork the repo and create your branch from `dev`.
+1. Fork the repo and create your branch from `mealie-next`.
 2. Checkout the Discord, the PRs page, or the Projects page to get an idea of what's already being worked on.
-3. If you're interested on working on major changes please get in touch on discord and coordinate with other developers. No sense in doubling up on work if someones already on it. 
+3. If you're interested on working on major changes please get in touch on discord and coordinate with other developers. No sense in doubling up on work if someones already on it.
 4. Once you've got an idea of what changes you want to make, create a draft PR as soon as you can to let us know what you're working on and how we can help!
 5. If you've changed APIs, update the documentation.
-6. Issue that pull request!
-7. If you make changes to the dev branch reflect those changes in the active changelog to keep track of changes. Don't forget to add your name/handle/identifier!
+6. Run tests, including `make backend-all`. Note that the tests do not clean up after themselves and leave things in the database. So be sure to also run `make clean-data` and/or `make backend-clean` inbetween major testing rounds to be sure that you aren't testing on old data.
+6. Issue that pull request! First make a draft PR, make sure that the automated github tests all pass, then mark as ready for review.
+7. Be sure to add release notes to the pull request.
 
-## Any contributions you make will be under the MIT Software License
-In short, when you submit code changes, your submissions are understood to be under the same [MIT License](http://choosealicense.com/licenses/mit/) that covers the project. Feel free to contact the maintainers if that's a concern.
+## Any contributions you make will be under the AGPL Software License
+In short, when you submit code changes, your submissions are understood to be under the same [AGPL License](https://choosealicense.com/licenses/agpl-3.0/) that covers the project. Feel free to contact the maintainers if that's a concern.
 
-## Report bugs using Github's [issues](https://github.com/hay-kot/mealie/issues)
-We use GitHub issues to track public bugs. Report a bug by [opening a new issue](https://github.com/hay-kot/mealie/issues/new); it's that easy!
+## Report bugs using Github's [issues](https://github.com/mealie-recipes/mealie/issues)
+We use GitHub issues to track public bugs. Report a bug by [opening a new issue](https://github.com/mealie-recipes/mealie/issues/new); it's that easy!
 
 ## Write bug reports with detail, background, and sample code
 **Great Bug Reports** tend to have:
@@ -37,7 +38,7 @@ People *love* thorough bug reports. I'm not even kidding.
 
 
 ## License
-By contributing, you agree that your contributions will be licensed under its MIT License.
+By contributing, you agree that your contributions will be licensed under its AGPL License.
 
 ## References
 This document was adapted from the open-source contribution guidelines for [Facebook's Draft](https://github.com/facebook/draft-js/blob/a9316a723f9e918afde44dea68b5f9f39b7d9b00/CONTRIBUTING.md)

docs/docs/contributors/developers-guide/maintainers.md

@@ -0,0 +1,57 @@
+# Maintainers Guide
+
+This is the start of the maintainers guide for Mealie developers. Those who have been invited to the GitHub organization and/or those who whish to play a bigger part in the Mealie developers community may find this helpful.
+
+## Managing Issues
+
+If you are working on issues, it can be helpful to understand the workflow for our repository. When an issue comes in it is tagged with the `bug` and `triage` flags. This is to indicate that they need to be reviewed by a maintainer to determine validity.
+
+After you've reviered an issue it will generally move into one of two states:
+
+`bug:confirmed`
+:   Your were able to verify the issue and we determined we need to fix it
+
+
+`needs more info`
+:   The orignal post does not contain enough information, and if the reporter does not provide additional information, the issue will be automatically closed.
+
+Once you've reviewed an issue and moved it into another category, you should remove the triage label.
+
+### While going through issues try to keep the following in mind
+
+- It is perfectly okay to ignore an issue if it is low quality
+- You should close any issues that ignore the standard report template and request they reopen the issue using the proper template
+- You should **not** try to reproduce issues that don't have clear reproduction steps, don't have a version provided, or are generally unclear.
+- Issues that are not bugs, should likely be converted to discussions.
+
+## Drafting Releases
+
+### Tags
+
+Mealie is published via GitHub actions to the GitHub container registry with the follow tags:
+
+`ghcr.io/mealie-recipes/mealie:nightly`
+: published with every push to `mealie-next` branch - [Actions File](https://github.com/mealie-recipes/mealie/blob/mealie-next/.github/workflows/nightly.yml)
+
+`ghcr.io/mealie-recipes/mealie:latest`
+: published when a new GitHub Release is created - [Actions File](https://github.com/mealie-recipes/mealie/blob/mealie-next/.github/workflows/release.yml)
+
+`ghcr.io/mealie-recipes/mealie:{version}`
+: published when a new GitHub Release is created - [Actions File](https://github.com/mealie-recipes/mealie/blob/mealie-next/.github/workflows/release.yml)
+
+!!! note
+    Both the latest, and {version} tags will be the same container on the release of a new version
+
+### Process
+
+Because we've built all our publishing effors on GitHub Actions we rely primarily on automations to perform our releases. As such creating a new build of Mealie is as simple as creating a new GitHub release. Here are the general steps we take to create a new release
+
+1. Navigate to the [Github Release Page](https://github.com/mealie-recipes/mealie/releases) and click the 'Draft a new release' button.
+2. Choose a tag and increment the version according to the semver specification. i.e, **major** version for breaking changes, **minor** for feature updates, and **patch** for bug fixes.
+3. Name the Release, usually just the tag is fine, however if there is a special feature you'd like to higlight this would be a great place to do it.
+4. Click the "Generate release notes" button which will pull in all the Git Commits as a changelog. For bug fix only releases this is sufficient, however if there are major features, or good quality of life improvements it's good to provide those prior to listing the full changelog.
+
+!!! tip
+    Don't worry about setting the version number in the container or code, it's set during the build process and uses the tag you specified when drafting a new release.
+
+    You can see how this is done in the [Actions File](https://github.com/mealie-recipes/mealie/blob/mealie-next/.github/workflows/partial-builder.yml#L35-L37)

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

@@ -13,9 +13,13 @@ Prerequisites
 - Docker
 - Visual Studio Code
 
+### Linux and MacOS
 First ensure that docker is running. Then when you clone the repo and open with VS Code you should see a popup asking you to reopen the project inside a development container. Click yes and it will build the development container and run the setup required to run both the backend API and the frontend webserver. This also pre-configures pre-commit hooks to ensure that the code is up to date before committing.
 
-Checkout the makefile for all of the available commands.
+### Windows
+Make sure the VSCode Dev Containers extension is installed, then select "Dev Containers: Clone Repository in Container Volume..." in the command pallete (F1). Select your forked repo and choose the `mealie-next` branch, which contains the latest changes. This mounts your repository directly in WSL2, which [greatly improves the performance of the container](https://code.visualstudio.com/docs/devcontainers/containers#_quick-start-open-a-git-repository-or-github-pr-in-an-isolated-container-volume), and enables hot-reloading for the frontend. Running the container on a mounted volume may not work correctly on Windows due to WSL permission mapping issues.
+
+[Checkout the makefile reference](#make-file-reference) for all of the available commands.
 
 !!! tip
     For slow terminal checkout the solution in this [GitHub Issue](https://github.com/microsoft/vscode/issues/133215)
@@ -62,9 +66,13 @@ Once the prerequisites are installed you can cd into the project base directory
 
 Before you start the server you MUST copy the `template.env` and `frontend/template.env` files to their respective locations with the name `.env` and `frontend/.env` respectively. The application will-not run without these files.
 
-### Starting The Server
+## Postgres
+- Whether using a container or manual install, you need to set up your own postgres dev server. The database, username, password, etc should match the `POSTGRES_*` options located in the `.env` file.
+- Install psycog2 with `poetry install -E pgsql` (in the main `mealie` directory, *not* `frontend`)
 
-Once that is complete you're ready to start the servers. You'll need two shells open, One for the server and one for the frontend.
+## Starting The Server
+
+Now you're ready to start the servers. You'll need two shells open, One for the server and one for the frontend.
 
 === "Linux / macOS"
 
@@ -114,3 +122,24 @@ docker-dev           🐳 Build and Start Docker Development Stack (currently no
 docker-prod          🐳 Build and Start Docker Production Stack
 
 ```
+## Internationalization
+### Frontend
+We use vue-i18n package for internationalization. Translations are stored in json format located in [frontend/lang/messages](https://github.com/mealie-recipes/mealie/tree/mealie-next/frontend/lang/messages).
+### Backend
+Translations are stored in json format located in [mealie/lang/messages](https://github.com/mealie-recipes/mealie/tree/mealie-next/mealie/lang/messages).
+
+### Quick frontend localization with VS Code
+[i18n Ally for VScode](https://marketplace.visualstudio.com/items?itemName=lokalise.i18n-ally) is helpful for generating new strings to translate using Code Actions. It also has a nice feature, which shows translations in-place when editing code.
+
+A few settings must be tweaked to make the most of its features. Some settings are stored on project level, but most of them have to be set manually in your workspace or user settings.\
+We've found that the following settings work best:
+
+```
+  "i18n-ally.enabledFrameworks": ["vue"],
+  "i18n-ally.extract.autoDetect": true,
+  "i18n-ally.dirStructure": "auto",
+  "i18n-ally.extract.targetPickingStrategy": "global-previous",
+  "i18n-ally.displayLanguage": "en-US",
+  "i18n-ally.keystyle": "nested",
+  "i18n-ally.sourceLanguage": "en-US",
+```

docs/docs/contributors/guides/ingredient-parser.md

@@ -15,6 +15,6 @@ Alternatively, you can register a new parser by fulfilling the `ABCIngredientPar
 
 
 ## Links
-- [Pretrained Model](https://github.com/hay-kot/mealie-nlp-model)
+- [Pretrained Model](https://github.com/mealie-recipes/mealie-nlp-model)
 - [CRF++ (Forked)](https://github.com/hay-kot/crfpp)
 

docs/docs/contributors/translating.md

@@ -1,6 +1,6 @@
 # Contributing with Translations
 Translations can be a great way **for non-coders** to contribute to project.
-We use **[Crowdin](https://crowdin.com/project/mealie)** to allow several contributors to work on translating Mealie. 
+We use **[Crowdin](https://crowdin.com/project/mealie)** to allow several contributors to work on translating Mealie.
 You can simply help by voting for your preferred translations, or even by completely translating Mealie into a new language.
 
 Translations are regularly pulled from Crowdin and included in each new release.
@@ -8,14 +8,9 @@ Translations are regularly pulled from Crowdin and included in each new release.
 Please use Crowdin as much as possible if you have any question/issue regarding a particular string. You can take a look at [Crowdin Knowledge base](https://support.crowdin.com/for-volunteer-translators/) if you want to know more about how to use this tool.
 
 ## My language is missing in Mealie
-Once your language is translated on Crowdin, we need to manually add it in Mealie. If you believe your language is ready for use, please create an issue on GitHub. 
+Once your language is translated on Crowdin, we need to manually add it in Mealie. If you believe your language is ready for use, please create an issue on GitHub.
 
 ## I can't find a particular text in Crowdin
 There can be several reasons:
 - The text you're looking for is outdated: someone has already changed it or it will be removed/changed in the next release.
 - It is possible some texts are not translatable (yet) for technical reasons. If you spot one, please reach out to us on [Discord](https://discord.gg/QuStdQGSGK) or raise an issue on GitHub.
-
-## Technical information
-We use vue-i18n package for internationalization. Translations are stored in json format located in [frontend/src/locales/messages](https://github.com/hay-kot/mealie/tree/master/frontend/src/locales/messages).
-
-[i18n Ally for VScode](https://marketplace.visualstudio.com/items?itemName=lokalise.i18n-ally) is helpful for generating new strings to translate. It also has a nice feature, which shows translations in-place when editing code.

docs/docs/documentation/community-guide/bulk-url-import.md

@@ -33,7 +33,7 @@ function import_from_file () {
 }
 
 input="list"
-mail="changeme@email.com"
+mail="changeme@example.com"
 password="MyPassword"
 mealie_url=http://localhost:9000
 
@@ -85,7 +85,7 @@ def import_from_file(input_file, token, mealie_url):
       print(response.text)
 
 input_file="list"
-mail="changeme@email.com"
+mail="changeme@example.com"
 password="MyPassword"
 mealie_url="http://localhost:9000"
 

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

@@ -1,25 +1,77 @@
 !!! info
-	This guide was submitted by a community member. Find something wrong? Submit a PR to get it fixed!
-
+  This guide was submitted by a community member. Find something wrong? Submit a PR to get it fixed!
 
 In a lot of ways, Home Assistant is why this project exists! Since Mealie has a robust API it makes it a great fit for interacting with Home Assistant and pulling information into your dashboard.
 
-### Get Todays Meal in Lovelace
-Starting in v0.4.1 you are now able to use the uri `/api​/meal-plans​/today​/image?group_name=Home` to directly access the image to todays meal. This makes it incredibly easy to include the image into your Home Assistant Dashboard using the picture entity. 
+### Display Today's Meal in Lovelace
 
-Here's an example where `sensor.mealie_todays_meal` is pulling in the meal-plan name and I'm using the url to get the image.
+You can use the Mealie API to get access to meal plans in Home Assistant like in the image below.
 
 ![api-extras-gif](../../assets/img/home-assistant-card.png)
 
+Steps:
+
+#### 1. Get your API Token
+
+Create an API token from Mealie's User Settings page (https://hay-kot.github.io/mealie/documentation/users-groups/user-settings/#api-key-generation)
+
+#### 2. Create Home Assistant Sensors
+
+Create REST sensors in home assistant to get the details of today's meal.
+We will create sensors to get the name and ID of the first meal in today's meal plan (note that this may not be what is wanted if there is more than one meal planned for the day). We need the ID as well as the name to be able to retreive the image for the meal.
+
+Make sure the url and port (`http://mealie:9000` ) matches your installation's address and _API_ port.
+
 ```yaml
+- platform: rest
+  resource: "http://mealie:9000/api/groups/mealplans/today"
+  method: GET
+  name: Mealie todays meal
+  headers:
+    Authorization: Bearer <<API_TOKEN>>
+  value_template: "{{ value_json[0].recipe.name }}"
+  force_update: true
+  scan_interval: 30
+```
+
+```yaml
+- platform: rest
+  resource: "http://mealie:9000/api/groups/mealplans/today"
+  method: GET
+  name: Mealie todays meal ID
+  headers:
+    Authorization: Bearer <<API_TOKEN>>
+  value_template: "{{ value_json[0].recipe.id }}"
+  force_update: true
+  scan_interval: 30
+```
+
+#### 3. Create a Camera Entity
+
+We will create a camera entity to display the image of today's meal in Lovelace.
+
+In Home Assistant's `Integrations` page, create a new `generic camera` entity.
+
+In the still image url field put in:
+`http://mealie:9000/api/media/recipes/{{states('sensor.mealie_todays_meal_id')}}/images/min-original.webp`
+
+Under the entity page for the new camera, rename it.
+e.g. `camera.mealie_todays_meal_image`
+
+#### 4. Create a Lovelace Card
+
+Create a picture entity card and set the entity to `mealie_todays_meal` and the camera entity to `camera.mealie_todays_meal_image` or set in the yaml directly.
+
+```yaml
+show_state: true
+show_name: true
+camera_view: auto
 type: picture-entity
 entity: sensor.mealie_todays_meal
 name: Dinner Tonight
-show_state: true
-show_name: true
-image: 'http://localhost:9000/api/meal-plans/today/image?group_name=Home'
-style:
-.: |
+camera_image: camera.mealie_todays_meal_image
+card_mod:
+  style: |
     ha-card {
     max-height: 300px !important;
     overflow: hidden;
@@ -29,19 +81,5 @@ style:
     }
 ```
 
-The sensor that gets the name of the meal can be achieved using the following REST sensor in Home Assistant
-```yaml
-sensor:
-  - platform: rest
-    resource: 'http://localhost:9000/api/meal-plans/today'
-    method: GET
-    name: Mealie todays meal 
-    headers:
-      Authorization: Bearer MySuperSecretBearerCode
-    value_template: "{{ value_json.name }}"
-```
-The Bearer token can be created from the User Settings page (https://hay-kot.github.io/mealie/documentation/users-groups/user-settings/#api-key-generation) 
-
-
 !!! tip
-    Due to how Home Assistant works with images, I had to include the additional styling to get the images to not appear distorted. This includes and [additional installation](https://github.com/thomasloven/lovelace-card-mod) from HACS. 
+Due to how Home Assistant works with images, I had to include the additional styling to get the images to not appear distorted. This requires an [additional installation](https://github.com/thomasloven/lovelace-card-mod) from HACS.

docs/docs/documentation/community-guide/import-recipe-bookmarklet.md

@@ -0,0 +1,21 @@
+<!-- prettier-ignore -->
+!!! info
+    This guide was submitted by a community member. Find something wrong? Submit a PR to get it fixed!
+
+You can use bookmarklets to generate a bookmark that will take your current location, and open a new tab that will try to import that URL into Mealie.
+
+You can use a [bookmarklet generator site](https://caiorss.github.io/bookmarklet-maker/) and the code below to generate a bookmark for your site. Just change the `http://localhost:8080` to your sites web address and follow the instructions.
+
+```js
+var url = document.URL;
+var mealie = "http://localhost:8080";
+var group_slug = "home" // Change this to your group slug. You can obtain this from your URL after logging-in to Mealie
+var use_keywords= "&use_keywords=1" // Optional - use keywords from recipe - update to "" if you don't want that
+var edity = "&edit=1" // Optional - keep in edit mode - update to "" if you don't want that
+
+if (mealie.slice(-1) === "/") {
+    mealie = mealie.slice(0, -1)
+}
+var dest = mealie + "/g/" + group_slug + "/r/create/url?recipe_import_url=" + url + use_keywords + edity;
+window.open(dest, "_blank");
+```

docs/docs/documentation/community-guide/ios.md

@@ -5,20 +5,35 @@
 
 ![Image from apple site](https://help.apple.com/assets/5E8CEA35094622DF10489984/5E8CEA42094622DF1048998D/en_US/ed1f9c157cdefc13e0161e0f70015455.png)
 
-User [brasilikum](https://github.com/brasilikum) opened an issue on the main repo about how they had created an [iOS shortcut](https://github.com/hay-kot/mealie/issues/103) for interested users. This is a useful utility for iOS users who browse for recipes in their web browser from their devices. Recent updates to Mealie has made this original shortcut break. Reddit user [BooNooBooNooB](https://www.reddit.com/user/BooNooBooNooB/) has helped to create a new working version.
+User [brasilikum](https://github.com/brasilikum) opened an issue on the main repo about how they had created an [iOS shortcut](https://github.com/mealie-recipes/mealie/issues/103) for interested users.
+This original method broke after the transition to version 1.X and an issue was raised on [Github](https://github.com/mealie-recipes/mealie/issues/2092) GitHub user [Zippyy](https://github.com/zippyy) has helped to create a working shortcut for version 1.X.
+
+This is a useful utility for iOS users who browse for recipes in their web browser from their devices.
 
 Don't know what an iOS shortcut is? Neither did I! Experienced iOS users may already be familiar with this utility but for the uninitiated, here is the official Apple explanation:
 
 > A shortcut is a quick way to get one or more tasks done with your apps. The Shortcuts app lets you create your own shortcuts with multiple steps. For example, build a “Surf Time” shortcut that grabs the surf report, gives an ETA to the beach, and launches your surf music playlist.
 
-Basically it is a visual scripting language that lets a user build an automation in a guided fashion. The automation can be [shared with anyone](https://www.icloud.com/shortcuts/4c40fcc6f39549f9a189995a449cd44f) but if it is a user creation, you'll have to jump through a few hoops to make an untrusted automation work on your device.
+Basically it is a visual scripting language that lets a user build an automation in a guided fashion. The automation can be [shared with anyone](https://www.icloud.com/shortcuts/cc568d1615bc4f998789f85d1ef74846) but if it is a user creation, you'll have to jump through a few hoops to make an untrusted automation work on your device.
 
-You need to replace `username` and `password` with the login information for your mealie instance.
+This guide assumes that you already know how to [generate API tokens](https://hay-kot.github.io/mealie/documentation/users-groups/user-settings/#api-key-generation) for your user that intends to use an iOS shortcut.
 
-![screenshot](../../assets/img/ios-shortcut-image.jpg)
+First, click the [link](https://www.icloud.com/shortcuts/cc568d1615bc4f998789f85d1ef74846) and begin the setup of the shortcut.
 
-Then, you need to put in your mealie domain. The API port of `:9000` is not needed when putting your domain in the text field.
 
-![screenshot](../img/iOS_host.jpg)
+![screenshot](../../assets/img/sc1half.png)
 
-You should now be able to share a website to the shortcut and have mealie grab all the necessary information!
+Next, you need to replace `url` and `port` with the information for your Mealie instance.
+
+If you have a domain that you use (e.g. `https://mealie.example.com`), put that here. If you just run local, then you need to put in your Mealie instance IP and the port you use (e.g. the default is `9925`).
+
+
+![screenshot](../../assets/img/sc2half.png)
+
+
+Finally, you need to replace the word `keyhere` with your API token. Keep the word `Bearer`!!!
+
+
+![screenshot](../../assets/img/sc3half.png)
+
+You should now be able to share a website to the shortcut and have Mealie grab all the necessary information!

docs/docs/documentation/community-guide/swag.md

@@ -5,7 +5,7 @@
 
 
 
-To make the setup of a Reverse Proxy much easier, Linuxserver.io developed [SWAG](https://github.com/linuxserver/docker-swag)  
+To make the setup of a Reverse Proxy much easier, Linuxserver.io developed [SWAG](https://github.com/linuxserver/docker-swag)
 SWAG - Secure Web Application Gateway (formerly known as letsencrypt, no relation to Let's Encrypt™) sets up an Nginx web server and reverse proxy with PHP support and a built-in certbot client that automates free SSL server certificate generation and renewal processes (Let's Encrypt and ZeroSSL). It also contains fail2ban for intrusion prevention.
 
 ## Step 1: Get a domain
@@ -14,39 +14,38 @@ The first step is to grab a dynamic DNS if you don't have your own subdomain alr
 
 ## Step 2: Set-up SWAG
 
-Then you will need to set up SWAG, the variables of the docker-compose are explained on the Github page of [SWAG](https://github.com/linuxserver/docker-swag).
-This is an example of how to set it up using duckdns and docker-compose.
+Then you will need to set up SWAG, the variables of the docker-compose.yaml file are explained on the Github page of [SWAG](https://github.com/linuxserver/docker-swag).
+This is an example of how to set it up using duckdns and docker compose.
 
-!!! example "docker-compose.yml"
+!!! example "docker-compose.yaml"
 ```yaml
 version: "3.1"
 services:
-swag:
-image: ghcr.io/linuxserver/swag
-container_name: swag
-cap_add:
-- NET_ADMIN
-environment:
-- PUID=1000
-- PGID=1000
-- TZ=Europe/Brussels
-- URL=<mydomain.duckdns>
-- SUBDOMAINS=wildcard
-- VALIDATION=duckdns
-- CERTPROVIDER= #optional
-- DNSPLUGIN= #optional
-- DUCKDNSTOKEN=<duckdnstoken>
-- EMAIL=<e-mail> #optional
-- ONLY_SUBDOMAINS=false #optional
-- EXTRA_DOMAINS=<extradomains> #optional
-- STAGING=false #optional
-volumes:
-- /etc/config/swag:/config
-ports:
-- 443:443
-- 80:80 #optional
-restart: unless-stopped
-
+  swag:
+    image: ghcr.io/linuxserver/swag
+    container_name: swag
+    cap_add:
+      - NET_ADMIN
+    environment:
+      - PUID=1000
+      - PGID=1000
+      - TZ=Europe/Brussels
+      - URL=<mydomain.duckdns>
+      - SUBDOMAINS=wildcard
+      - VALIDATION=duckdns
+      - CERTPROVIDER= #optional
+      - DNSPLUGIN= #optional
+      - DUCKDNSTOKEN=<duckdnstoken>
+      - EMAIL=<e-mail> #optional
+      - ONLY_SUBDOMAINS=false #optional
+      - EXTRA_DOMAINS=<extradomains> #optional
+      - STAGING=false #optional
+    volumes:
+      - /etc/config/swag:/config
+    ports:
+      - 443:443
+      - 80:80 #optional
+    restart: unless-stopped
 ```
 
 Don't forget to change the <code>mydomain.duckns</code> into your personal domain and the <code>duckdnstoken</code> into your token and remove the brackets.
@@ -61,26 +60,25 @@ Alternatively, you can create a new file <code>mealie.subdomain.conf</code> in p
 
 !!! example "mealie.subdomain.conf"
 ```yaml
-    server {
-    listen 443 ssl http2;
-    listen [::]:443 ssl http2;
+server {
+  listen 443 ssl http2;
+  listen [::]:443 ssl http2;
 
-    	server_name mealie.*;
+  server_name mealie.*;
 
-    	include /config/nginx/ssl.conf;
+  include /config/nginx/ssl.conf;
 
-    	client_max_body_size 0;
+  client_max_body_size 0;
 
-    	location / {
-        	include /config/nginx/proxy.conf;
-        	include /config/nginx/resolver.conf;
-        	set $upstream_app mealie-frontend;
-        	set $upstream_port 3000;
-        	set $upstream_proto http;
-        	proxy_pass $upstream_proto://$upstream_app:$upstream_port;
-    		}
-
-	}	
+  location / {
+    include /config/nginx/proxy.conf;
+    include /config/nginx/resolver.conf;
+    set $upstream_app mealie-frontend;
+    set $upstream_port 3000;
+    set $upstream_proto http;
+    proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+  }
+}
 ```
 
 ## Step 4: Port-forward port 443

docs/docs/documentation/getting-started/api-usage.md

@@ -2,13 +2,12 @@
 
 ## Getting a Token
 
-Mealie supports long-live api tokens in the user frontend. See [user settings page](../users-groups/user-settings.md)
-
+Mealie supports long-live api tokens in the user frontend. These can be created on the `/user/profile/api-tokens` page.
 
 ## Key Components
 
 ### Exploring Your Local API
-On your local installation you can access interactive API documentation that provides `curl` examples and expected results. This allows you to easily test and interact with your API to identify places to include your own functionality. You can visit the documentation at `http://mealie.yourdomain.com/docs` or see the example at the [Demo Site](https://demo.mealie.io/docs).
+On your local installation you can access interactive API documentation that provides `curl` examples and expected results. This allows you to easily test and interact with your API to identify places to include your own functionality. You can visit the documentation at `http://<your-mealie-site>/docs` or see the example at the [Demo Site](https://demo.mealie.io/docs).
 
 ### Extras
 #### Recipe Extras
@@ -73,6 +72,33 @@ This filter will find all recipes created on or after a particular date: <br>
 This filter will find all units that have `useAbbreviation` disabled: <br>
 `useAbbreviation = false`
 
+This filter will find all foods that are not named "carrot": <br>
+`name <> "carrot"`
+
+##### Keyword Filters
+The API supports many SQL keywords, such as `IS NULL` and `IN`, as well as their negations (e.g. `IS NOT NULL` and `NOT IN`).
+
+Here is an example of a filter that returns all recipes where the "last made" value is not null: <br>
+`lastMade IS NOT NULL`
+
+This filter will find all recipes that don't start with the word "Test": <br>
+`name NOT LIKE "Test%"`
+
+> **_NOTE:_** for more information on this, [check out the SQL "LIKE" operator](https://www.w3schools.com/sql/sql_like.asp)
+
+This filter will find all recipes that have particular slugs: <br>
+`slug IN ["pasta-fagioli", "delicious-ramen"]`
+
+##### Nested Property filters
+When querying tables with relationships, you can filter properties on related tables. For instance, if you want to query all recipes owned by a particular user: <br>
+`user.username = "SousChef20220320"`
+
+This timeline event filter will return all timeline events for recipes that were created after a particular date: <br>
+`recipe.createdAt >= "2023-02-25"`
+
+This recipe filter will return all recipes that contains a particular set of tags: <br>
+`tags.name CONTAINS ALL ["Easy", "Cajun"]`
+
 ##### Compound Filters
 You can combine multiple filter statements using logical operators (`AND`, `OR`).
 
@@ -90,3 +116,31 @@ You can have multiple filter groups combined by logical operators. You can defin
 
 Here's a filter that will find all recipes updated between two particular times, but exclude the "Pasta Fagioli" recipe: <br>
 `(updatedAt > "2022-07-17T15:47:00Z" AND updatedAt < "2022-07-17T15:50:00Z") AND name <> "Pasta Fagioli"`
+
+#### Advanced Ordering
+Pagination supports `orderBy`, `orderByNullPosition`, and `orderDirection` params to change how you want your query results to be ordered. These can be fine-tuned for more advanced use-cases.
+
+##### Order By
+The pagination `orderBy` attribute allows you to sort your query results by a particular attribute. Sometimes, however, [you may want to sort by more than one attribute](https://www.w3schools.com/sql/sql_orderby.asp). This can be achieved by passing a comma-separated string to the `orderBy` parameter. For instance, if you want to sort recipes by their last made datetime, then by their created datetime, you can pass the following `orderBy` string: <br>
+`lastMade, createdAt`
+
+Similar to the standard SQL `ORDER BY` logic, your attribute orders will be applied sequentially. In the above example, *first* recipes will be sorted by `lastMade`, *then* any recipes with an identical `lastMade` value are sorted by `createdAt`. In addition, standard SQL rules apply when handling results with null values (such as when joining related tables). You can apply the `NULLS FIRST` and `NULLS LAST` SQL expressions by setting the `orderByNullPosition` to "first" or "last". If left empty, the default SQL behavior is applied, [which is different depending on which database you're using](https://learnsql.com/blog/how-to-order-rows-with-nulls/).
+
+##### Order Direction
+The query will be ordered in ascending or descending order, depending on what you pass to the pagination `orderDirection` param. You can either specify "asc" or "desc".
+
+When sorting by multiple attributes, if you *also* want one or more of those sorts to be different directions, you can specify them with a colon. For instance, if, like our previous example, say you want to sort by `lastMade` and `createdAt`. However, this time, you want to sort by `lastMade` ascending, but `createdAt` descending. You could pass this `orderBy` string: <br>
+`lastMade:asc, createdAt:desc`
+
+In the above example, whatever you pass to `orderDirection` will be ignored. If, however, you only specify the direction on one attribute, all other attributes will use the `orderDirection` value.
+
+Consider this `orderBy` string: <br>
+`lastMade:asc, createdAt, slug`
+
+And this `orderDirection` value: <br>
+`desc`
+
+This will result in a recipe query where all recipes are sorted by `lastMade` ascending, then `createdAt` descending, and finally `slug` descending.
+
+Similar to query filters, when querying tables with relationships, you can order by properties on related tables. For instance, if you want to query all foods with labels, sorted by label name, you could use this `orderBy` value: <br>
+`label.name`

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

@@ -1,35 +1,55 @@
 # Frequently Asked Questions
 
+## How do I enable "smart" ingredient handling?
+
+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 reciepes 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.
+
+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  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`)
+
+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.
+
+### Set up Recipes to use Foods and Units
+Do the following for each recipe you want to intelligently handle ingredients.
+
+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`.
+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.
+
+Scaling up this recipe or adding it to a Shopping List will now smartly take care of ingredient amounts and duplicate combinations.
+
 ## 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. Not 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.
 
-**Links**
-
 - [Migration From v0.5.x](./migrating-to-mealie-v1.md)
 
 ## How can I change the theme?
 
-You can change the theme by settings the environment variables on the frontend container.
+You can change the theme by settings the environment variables.
 
-Links:
-
-- [Frontend Theme](./installation/frontend-config#themeing)
-
-## How can I change the language?
-
-Languages need to be set on the frontend and backend containers as ENV variables.
-
-Links
-
-- [Frontend Config](./installation/frontend-config/)
-- [Backend Config](./installation/backend-config/)
+- [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/)
+- [Backend Config](./installation/backend-config.md)
 
 ## Can I serve Mealie on a subpath?
 
@@ -37,14 +57,91 @@ No. Due to limitations from the Javascript Framework, mealie doesn't support ser
 
 ## 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. If you insist on installing Mealie on your local machine, you can use the links below to help guide your path.
+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.
 
-- [Advanced Installation](./installation/advanced/)
+## 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:
 
-## How I can attach an Image or Video to a Recipe?
+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)
 
-Yes. Mealie's Recipe Steps and other fields support the markdown syntax and therefor supports 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.
+## 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
+```
+
+## How do private groups 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.
+- Groups 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 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 --> n1: No
+```
+
+For more information, check out the [Permissions and Public Access guide](./usage/permissions-and-public-access.md).
+
+## 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>
+```
+
+## 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, marinade 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.
+
+## 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 provided 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.

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

@@ -8,7 +8,7 @@
 
 Mealie offers two main ways to create recipes. You can use the integrated recipe-scraper to create recipes from hundreds of websites, or you can create recipes manually using the recipe editor.
 
-[Demo](https://demo.mealie.io/recipe/create/url){ .md-button .md-button--primary .align-right }
+[Creation Demo](https://demo.mealie.io/g/home/r/create/url){ .md-button .md-button--primary .align-right }
 
 ### Importing Recipes
 
@@ -22,7 +22,7 @@ Mealie supports importing recipes from a few other sources besides websites. Cur
 You can access these options on your installation at the `/group/migrations` page on your installation. If you'd like to see another source added, feel free to request so on Github.
 
 
-[Demo](https://demo.mealie.io/group/data/foods){ .md-button .md-button--primary }
+[Import Demo](https://demo.mealie.io/group/migrations){ .md-button .md-button--primary }
 
 
 ### Organizing Recipes
@@ -34,21 +34,21 @@ Mealie has a robust and flexible recipe organization system with a few different
 
 Categories are the overarching organizer for recipes. You can assign as many categories as you'd like to a recipe, but we recommend that you try to limit the categories you assign to a recipe to one or two. This helps keep categories as focused as possible while still allowing you to find recipes that are related to each other. For example, you might assign a recipe to the category **Breakfast**, **Lunch**, **Dinner**, or **Side**.
 
-[Demo](https://demo.mealie.io/recipes/categories){ .md-button .md-button--primary }
+[Categories Demo](https://demo.mealie.io/g/home/recipes/categories){ .md-button .md-button--primary }
 
 #### Tags
 
-Tags, are nearly identical to categories in function but play a secondary role in some cases. As such, we recommend that you use tags freely to help you organize your recipes by more specific topics. For example, if a recipe can be frozen or is a great left-over meal, you could assign the tags **frozen** and **left-over** and easily filter for those at a later time.
+Tags are nearly identical to categories in function but play a secondary role in some cases. As such, we recommend that you use tags freely to help you organize your recipes by more specific topics. For example, if a recipe can be frozen or is a great left-over meal, you could assign the tags **frozen** and **left-over** and easily filter for those at a later time.
 
-[Demo](https://demo.mealie.io/recipes/tags){ .md-button .md-button--primary }
+[Tags Demo](https://demo.mealie.io/g/home/recipes/tags){ .md-button .md-button--primary }
 
 #### Tools
 
-Tools, are another way that some users like to organize their recipes. If a recipe requires some specific equipment if can be helpful to assign the tools to the recipes. This is particularly useful for things that are less common, like a pressure cooker, or a sous vide.
+Tools are another way that some users like to organize their recipes. If a recipe requires some specific equipment, it can be helpful to assign tools to the recipes. This is particularly useful for things that are less common, like a pressure cooker or a sous vide.
 
-Each of the above organizers can be filtered in searches, and have their own pages where you can view all the recipes that are associated with those organizers.
+Each of the above organizers can be filtered in searches and have their own pages where you can view all the recipes that are associated with those organizers.
 
-[Demo](https://demo.mealie.io/recipes/tools){ .md-button .md-button--primary }
+[Tools Demo](https://demo.mealie.io/g/home/recipes/tools){ .md-button .md-button--primary }
 
 #### Cookbooks
 
@@ -60,37 +60,37 @@ Mealie also has the concept of cookbooks. These can be created inside of a group
 - Pasta Sides: Recipes that have both the **Side** category and the **Pasta** tag
 - Dessert Breads: Recipes that have both the **Bread** category and the **Dessert** tag
 
-[Demo](https://demo.mealie.io/group/cookbooks){ .md-button .md-button--primary }
+[Cookbooks Demo](https://demo.mealie.io/g/home/cookbooks){ .md-button .md-button--primary }
 
 ## Meal Planning
 
-Mealie uses a calendar like view to help you plan your meals. It shows you the previous day, and the next 6 days by default. You can toggle through the calendar by clicking the arrows on the top of the page. In editor mode, you can use the random recipe buttons, or manually add an entry.
+Mealie uses a calendar like view to help you plan your meals. It shows you the previous day and the next 6 days by default. You can toggle through the calendar by clicking the arrows on the top of the page. In editor mode, you can use the random recipe buttons or manually add an entry.
 
 !!! tip
     You can also add a "Note" type entry to your meal-plan when you want to include something that might not have a specific recipes. This is great for leftovers, or for ordering out.
 
-[Demo](https://demo.mealie.io/group/mealplan/planner){ .md-button .md-button--primary }
+[Mealplanner Demo](https://demo.mealie.io/group/mealplan/planner/view){ .md-button .md-button--primary }
 
 ### Planner Rules
 
-The meal planner has the concept of plan rules. These offer a flexible way to use your organizers to customize how a random recipe is inserted into your meal plan. You can set rules to restrict the pool of recipes based on the Tags and/or Categories of a recipe. Additionally, since meal plans have a Breakfast, Lunch, Dinner, and Snack labels you can specifically set a rule to be active for a **specific meal type** or even a **specific day of the week.**
+The meal planner has the concept of plan rules. These offer a flexible way to use your organizers to customize how a random recipe is inserted into your meal plan. You can set rules to restrict the pool of recipes based on the Tags and/or Categories of a recipe. Additionally, since meal plans have a Breakfast, Lunch, Dinner, and Snack labels, you can specifically set a rule to be active for a **specific meal type** or even a **specific day of the week.**
 
-[Demo](https://demo.mealie.io/group/mealplan/settings){ .md-button .md-button--primary }
+[Planner Settings Demo](https://demo.mealie.io/group/mealplan/settings){ .md-button .md-button--primary }
 
 ## Shopping Lists
 
-The shopping lists feature is a great way to keep track of what you need to buy for your next meal. You can add items directly to the shopping list, or link a recipe and all of it's ingredients to track meals during the week.
+The shopping lists feature is a great way to keep track of what you need to buy for your next meal. You can add items directly to the shopping list or link a recipe and all of it's ingredients to track meals during the week.
 
 !!! warning
-    At this time there isn't a tight integration between meal-plans and shopping lists, however it's something we have planned for the future.
+    At this time there isn't a tight integration between meal-plans and shopping lists; however, it's something we have planned for the future.
 
 
-[Demo](https://demo.mealie.io/shopping-lists){ .md-button .md-button--primary }
+[Shopping List Demo](https://demo.mealie.io/shopping-lists){ .md-button .md-button--primary }
 
 
 ## Data Management
 
-Managing a robust collection of recipes inevitable requires a lot of data. Mealie has a robust data management system that allows you to easily some of the more important data sets in your collection. Here's some of the features that are available in the `group/data/<type>` pages:
+Managing a robust collection of recipes inevitable requires a lot of data. Mealie has a robust data management system that allows you to easily export some of the more important data sets in your collection. Here's some of the features that are available in the `group/data/<type>` pages:
 
 - Recipes
     - Bulk Actions
@@ -107,28 +107,28 @@ Managing a robust collection of recipes inevitable requires a lot of data. Meali
     - Merge Units into a single unit entry
     - Export as JSON
 
-[Demo](https://demo.mealie.io/group/data/foods){ .md-button .md-button--primary }
+[Data Management Demo](https://demo.mealie.io/group/data/foods){ .md-button .md-button--primary }
 
 ## Server Administration
 
 ### Site Settings
 
-The site settings page contains general information about your installation like the application version, some configuration details, and some utilities to help you confirm your installation is working as expected. For example, you can use the Email Configuration section to validate that your email credentials are setup correctly and that the email service is working as expected. Additionally, there is a docker-volume utility that will confirm your volumes are configured and shared correctly between the front and backend of the application.
+The site settings page contains general information about your installation like the application version, some configuration details, and some utilities to help you confirm your installation is working as expected. For example, you can use the Email Configuration section to validate that your email credentials are set up correctly and that the email service is working as expected. Additionally, there is a docker-volume utility that will confirm your volumes are configured and shared correctly between the front and backend of the application.
 
-[Demo](https://demo.mealie.io/admin/site-settings){ .md-button .md-button--primary }
+[Settings Demo](https://demo.mealie.io/admin/site-settings){ .md-button .md-button--primary }
 
 ### Users and Group
 
 There is a small management area for users and groups that allows you to create, edit, and delete users and groups.
 
-[Demo](https://demo.mealie.io/admin/manage/users){ .md-button .md-button--primary }
+[Users Demo](https://demo.mealie.io/admin/manage/users){ .md-button .md-button--primary }
 
 ### Backups
 
-The backups page provides a full system backup of your installation including all assets and images related to recipes. These are archived into a zip file and stored on the server but can also be downloaded through the UI. Due to some issues in the past Mealie no longer performs automatic backups, **it is advised that during setup you also setup a backup strategy to ensure your data is not lost.**
+The backups page provides a full system backup of your installation including all assets and images related to recipes. These are archived into a zip file and stored on the server but can also be downloaded through the UI. Due to some issues in the past, Mealie no longer performs automatic backups; **it is advised that during setup you also set up a backup strategy to ensure your data is not lost.**
 
 
-[Demo](https://demo.mealie.io/admin/backups){ .md-button .md-button--primary }
+[Backups Demo](https://demo.mealie.io/admin/backups){ .md-button .md-button--primary }
 
 
 !!! note

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

@@ -1,70 +0,0 @@
-# Advanced Installation
-
-!!! warning "Not Required"
-
-    The items below are completely optional and are not required to manage or install your Mealie instance.
-
-### Custom Caddy File
-
-The Docker image provided by Mealie contains both the API and the html bundle in one convenient image. This is done by using a proxy server to serve different parts of the application depending on the URL/URI. Requests sent to `/api/*` or `/docs` will be directed to the API, anything else will be served the static web files. Below is the default Caddyfile that is used to proxy requests. You can override this file by mounting an alternative Caddyfile to `/app/Caddyfile`.
-
-```
-{
-  auto_https off
-  admin off
-}
-
-:80 {
-  @proxied path /api/* /docs /openapi.json
-
-  root * /app/dist
-  encode gzip
-  uri strip_suffix /
-
-  handle_path /api/recipes/image/* {
-    root * /app/data/img/
-    file_server
-  }
-
-  handle @proxied {
-    reverse_proxy http://127.0.0.1:9000
-  }
-
-  handle {
-    try_files {path}.html {path} /
-    file_server
-  }
-}
-```
-
-## Deployed without Docker
-
-!!! error "Unsupported Deployment"
-
-    If you are experiencing a problem with manual deployment, please do not submit a github issue unless it is related to an aspect of the application. For deployment help, the [discord server](https://discord.gg/QuStdQGSGK) is a better place to find support.
-
-Alternatively, this project is built on Python and SQLite so you may run it as a python application on your server. This is not a supported options for deployment and is only here as a reference for those who would like to do this on their own. To get started you can clone this repository into a directory of your choice and use the instructions below as a reference for how to get started.
-
-There are three parts to the Mealie application
-
-- Frontend/Static Files
-- Backend API
-- Proxy Server
-
-### Frontend/ Static Files
-
-The frontend static files are generated with `npm run build`. This is done during the build process with docker. If you choose to deploy this as a system application you must do this process yourself. In the project directory run `cd frontend` to change directories into the frontend directory and run `npm install` and then `npm run build`. This will generate the static files in a `dist` folder in the frontend directory.
-
-### Backend API
-
-The backend API is build with Python, FastAPI, and SQLite and requires Python 3.9, and Poetry. Once the requirements are installed, in the project directory you can run the command `poetry install` to create a python virtual environment and install the python dependencies.
-
-Once the dependencies are installed you should be ready to run the server. To initialize that database you need to first run `python mealie/db/init_db.py`. Then to start The web server, you run the command `uvicorn mealie.app:app --host 0.0.0.0 --port 9000`
-
-### Proxy Server
-
-You must use a proxy server to server up the static files created with `npm run build` and proxy requests to the API. In the docker build this is done with Caddy. You can use the CaddyFile in the section above as a reference. One important thing to keep in mind is that you should drop any trailing `/` in the url. Not doing this may result in failed API requests.
-
-[workers_per_core]: https://github.com/tiangolo/uvicorn-gunicorn-docker/blob/2daa3e3873c837d5781feb4ff6a40a89f791f81b/README.md#workers_per_core
-[max_workers]: https://github.com/tiangolo/uvicorn-gunicorn-docker/blob/2daa3e3873c837d5781feb4ff6a40a89f791f81b/README.md#max_workers
-[web_concurrency]: https://github.com/tiangolo/uvicorn-gunicorn-docker/blob/2daa3e3873c837d5781feb4ff6a40a89f791f81b/README.md#web_concurrency

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

@@ -9,14 +9,12 @@
 | 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_EMAIL |  changeme@email.com   | The default username for the superuser                                              |
 | 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  |         true          | Allow user sign-up without token (should match frontend env)                        |
-
+| ALLOW_SIGNUP  |         true          | Allow user sign-up without token                                                    |
 
 ### Security
 
@@ -36,7 +34,6 @@
 | POSTGRES_PORT     |   5432   | Postgres database port           |
 | POSTGRES_DB       |  mealie  | Postgres database name           |
 
-
 ### Email
 
 | Variables          | Default | Description                                       |
@@ -50,6 +47,7 @@
 | SMTP_PASSWORD      |  None   | Required if SMTP_AUTH_STRATEGY is 'TLS' or 'SSL'  |
 
 ### Webworker
+
 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                                                                                                                       |
@@ -59,15 +57,41 @@ Changing the webworker settings may cause unforeseen memory leak issues with Mea
 | MAX_WORKERS      |    1    | Set the maximum number of workers to use. Default is not set meaning unlimited. More info [here][max_workers]                     |
 | WEB_CONCURRENCY  |    1    | Override the automatic definition of number of workers. More info [here][web_concurrency]                                         |
 
-
 ### LDAP
 
-| Variables           | Default | Description                                                                                                        |
-| ------------------- | :-----: | ------------------------------------------------------------------------------------------------------------------ |
-| LDAP_AUTH_ENABLED   |  False  | Authenticate via an external LDAP server in addidion to built-in Mealie auth                                       |
-| LDAP_SERVER_URL     |  None   | LDAP server URL (e.g. ldap://ldap.example.com)                                                                     |
-| LDAP_TLS_INSECURE   |  False  | Do not verify server certificate when using secure LDAP                                                            |
-| LDAP_TLS_CACERTFILE |  None   | File path to Certificate Authority used to verify server certificate (e.g. `/path/to/ca.crt`)                      |
-| LDAP_BIND_TEMPLATE  |  None   | Templated DN for users, `{}` will be replaced with the username (e.g. `cn={},dc=example,dc=com`, `{}@example.com`) |
-| LDAP_BASE_DN        |  None   | Starting point when searching for users authentication (e.g. `CN=Users,DC=xx,DC=yy,DC=de`)                         |
-| LDAP_ADMIN_FILTER   |  None   | Optional LDAP filter, which tells Mealie the LDAP user is an admin (e.g. `(memberOf=cn=admins,dc=example,dc=com)`) |
+| Variables            | Default | Description                                                                                                                         |
+| -------------------- | :-----: | ----------------------------------------------------------------------------------------------------------------------------------- |
+| LDAP_AUTH_ENABLED    |  False  | Authenticate via an external LDAP server in addidion to built-in Mealie auth                                                        |
+| LDAP_SERVER_URL      |  None   | LDAP server URL (e.g. ldap://ldap.example.com)                                                                                      |
+| LDAP_TLS_INSECURE    |  False  | Do not verify server certificate when using secure LDAP                                                                             |
+| LDAP_TLS_CACERTFILE  |  None   | File path to Certificate Authority used to verify server certificate (e.g. `/path/to/ca.crt`)                                       |
+| LDAP_ENABLE_STARTTLS |  False  | Optional. Use STARTTLS to connect to the server                                                                                     |
+| LDAP_BASE_DN         |  None   | Starting point when searching for users authentication (e.g. `CN=Users,DC=xx,DC=yy,DC=de`)                                          |
+| LDAP_QUERY_BIND      |  None   | Optional bind user for LDAP search queries (e.g. `cn=admin,cn=users,dc=example,dc=com`). If `None` then anonymous bind will be used |
+| LDAP_QUERY_PASSWORD  |  None   | Optional password for the bind user used in LDAP_QUERY_BIND                                                                         |
+| LDAP_USER_FILTER     |  None   | Optional LDAP filter to narrow down eligible users (e.g. `(memberOf=cn=mealie_user,dc=example,dc=com)`)                             |
+| LDAP_ADMIN_FILTER    |  None   | Optional LDAP filter, which tells Mealie the LDAP user is an admin (e.g. `(memberOf=cn=admins,dc=example,dc=com)`)                  |
+| LDAP_ID_ATTRIBUTE    |   uid   | The LDAP attribute that maps to the user's id                                                                                       |
+| LDAP_NAME_ATTRIBUTE  |  name   | The LDAP attribute that maps to the user's name                                                                                     |
+| LDAP_MAIL_ATTRIBUTE  |  mail   | The LDAP attribute that maps to the user's email                                                                                    |
+
+### Themeing
+
+Setting the following environmental variables will change the theme of the frontend. Note that the themes are the same for all users. This is a break-change when migration from v0.x.x -> 1.x.x.
+
+| Variables             | Default | Description                 |
+| --------------------- | :-----: | --------------------------- |
+| THEME_LIGHT_PRIMARY   | #E58325 | Light Theme Config Variable |
+| THEME_LIGHT_ACCENT    | #007A99 | Light Theme Config Variable |
+| THEME_LIGHT_SECONDARY | #973542 | Light Theme Config Variable |
+| THEME_LIGHT_SUCCESS   | #43A047 | Light Theme Config Variable |
+| THEME_LIGHT_INFO      | #1976D2 | Light Theme Config Variable |
+| THEME_LIGHT_WARNING   | #FF6D00 | Light Theme Config Variable |
+| THEME_LIGHT_ERROR     | #EF5350 | Light Theme Config Variable |
+| THEME_DARK_PRIMARY    | #E58325 | Dark Theme Config Variable  |
+| THEME_DARK_ACCENT     | #007A99 | Dark Theme Config Variable  |
+| THEME_DARK_SECONDARY  | #973542 | Dark Theme Config Variable  |
+| THEME_DARK_SUCCESS    | #43A047 | Dark Theme Config Variable  |
+| THEME_DARK_INFO       | #1976D2 | Dark Theme Config Variable  |
+| THEME_DARK_WARNING    | #FF6D00 | Dark Theme Config Variable  |
+| THEME_DARK_ERROR      | #EF5350 | Dark Theme Config Variable  |

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

@@ -1,29 +0,0 @@
-# Frontend Configuration
-
-## Environment Variables
-
-### General
-
-| Variables |        Default         | Description               |
-| --------- | :--------------------: | ------------------------- |
-| API_URL   | http://mealie-api:9000 | URL to proxy API requests |
-
-### Themeing
-Setting the following environmental variables will change the theme of the frontend. Note that the themes are the same for all users. This is a break-change when migration from v0.x.x -> 1.x.x.
-
-| Variables             | Default | Description                 |
-| --------------------- | :-----: | --------------------------- |
-| THEME_LIGHT_PRIMARY   | #E58325 | Light Theme Config Variable |
-| THEME_LIGHT_ACCENT    | #007A99 | Light Theme Config Variable |
-| THEME_LIGHT_SECONDARY | #973542 | Light Theme Config Variable |
-| THEME_LIGHT_SUCCESS   | #43A047 | Light Theme Config Variable |
-| THEME_LIGHT_INFO      | #1976D2 | Light Theme Config Variable |
-| THEME_LIGHT_WARNING   | #FF6D00 | Light Theme Config Variable |
-| THEME_LIGHT_ERROR     | #EF5350 | Light Theme Config Variable |
-| THEME_DARK_PRIMARY    | #E58325 | Dark Theme Config Variable  |
-| THEME_DARK_ACCENT     | #007A99 | Dark Theme Config Variable  |
-| THEME_DARK_SECONDARY  | #973542 | Dark Theme Config Variable  |
-| THEME_DARK_SUCCESS    | #43A047 | Dark Theme Config Variable  |
-| THEME_DARK_INFO       | #1976D2 | Dark Theme Config Variable  |
-| THEME_DARK_WARNING    | #FF6D00 | Dark Theme Config Variable  |
-| THEME_DARK_ERROR      | #EF5350 | Dark Theme Config Variable  |

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

@@ -1,33 +1,47 @@
 # Installation Checklist
 
-To install Mealie on your server there are a few steps for proper configuration. Let's go through them.
+To install Mealie on your server, there are a few steps for proper configuration. Let's go through them.
 
 !!! tip TLDR
-    Don't need step by step? Checkout the
+
+    Don't need step-by-step? Check out:
 
     - [SQLite docker-compose](./sqlite.md)
     - [Postgres docker-compose](./postgres.md)
 
 ## Pre-work
 
-To deploy mealie on your local network it is highly recommended to use docker to deploy the image straight from dockerhub. Using the docker-compose templates provided, you should be able to get a stack up and running easily by changing a few default values and deploying. You can deploy with either SQLite (default) or Postgres. SQLite is sufficient for most use cases. Additionally, with Mealie's automated backup and restore functionality, you can easily move between SQLite and Postgres as you wish.
+To deploy mealie on your local network, it is highly recommended to use Docker to deploy the image straight from the GitHub registry. Using the docker-compose templates provided, you should be able to get a stack up and running easily by changing a few default values and deploying. You can deploy with either SQLite (default) or Postgres. SQLite is sufficient for most use cases. Additionally, with Mealie's automated backup and restore functionality, you can easily move between SQLite and Postgres as you wish.
 
 [Get Docker](https://docs.docker.com/get-docker/)
 
 [Get Docker Compose](https://docs.docker.com/compose/install/)
 
-[Mealie on Dockerhub](https://hub.docker.com/r/hkotel/mealie)
+[Mealie on GitHub registry](https://github.com/mealie-recipes/mealie/pkgs/container/mealie)
 
 - linux/amd64
 - linux/arm64
 
-
 !!! warning "32bit Support"
+
     Due to a build dependency limitation, Mealie is not supported on 32bit ARM systems. If you're running into this limitation on a newer Raspberry Pi, please consider upgrading to a 64bit operating system on the Raspberry Pi.
 
+## Migrating From Other V1 Versions
+
+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:v1.0.0-RC1.1`
+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
+
+For an example of what these changes look like, see the new [SQLite](./sqlite.md) or [PostgreSQL](./postgres.md) docker-compose examples. The container swap should be seemless, at least that's our hope!
 
 ## Step 1: Deployment Type
-SQLite is a popular, open source, self-contained, zero-configuration database that is the ideal choice for Mealie when you have 1-20 Users and your concurrent write operations will be some-what limited. If you need to support many concurrent users, you may want to consider a more robust database such as PostgreSQL.
+
+SQLite is a popular, open source, self-contained, zero-configuration database that is the ideal choice for Mealie when you have 1-20 Users and your concurrent write operations will be some-what limited.
+
+PostgreSQL might be considered if you need to support many concurrent users. In addition, some features are only enabled on PostgreSQL, such as fuzzy search.
 
 You can find the relevant ready to use docker-compose files for supported installations at the links below.
 
@@ -36,57 +50,77 @@ You can find the relevant ready to use docker-compose files for supported instal
 
 ## Step 2: Setting up your files.
 
-The following steps were tested on a Ubuntu 20.04 server, but should work for most other Linux distributions. These steps are not required, but is how I generally will setup services on my server.
-
+The following steps were tested on a Ubuntu 20.04 server, but should work for most other Linux distributions. These steps are not required, but this is how I generally will setup services on my server.
 
 1. SSH into your server and navigate to the home directory of the user you want to run Mealie as. If that is your current user, you can use `cd ~` to ensure you're in the right directory.
-2. Create a directory called `docker` and navigate into it. `mkdir docker && cd docker`
-3. Do the same for mealie `mkdir mealie && cd mealie`
-4. Create a docker-compose.yaml file in the mealie directory. `touch docker-compose.yaml`
-5. Use the text editor or your choice to edit the file and copy the contents of the docker-compose template for the deployment type you want to use. `nano docker-compose.yaml` or `vi docker-compose.yaml`
-
+2. Create a directory called `docker` and navigate into it: `mkdir docker && cd docker` (this is optional, if you organize your docker installs separate from everything else)
+3. Do the same for mealie: `mkdir mealie && cd mealie`
+4. Create a docker-compose.yaml file in the mealie directory: `touch docker-compose.yaml`
+5. Use the text editor of your choice to edit the file and copy the contents of the docker-compose template for the deployment type you want to use: `nano docker-compose.yaml` or `vi docker-compose.yaml`
 
 ## Step 2: Customizing The `docker-compose.yaml` files.
+
 After you've decided setup the files it's important to set a few ENV variables to ensure that you can use all the features of Mealie. I recommend that you verify and check that:
 
 - [x] You've configured the relevant ENV variables for your database selection in the `docker-compose.yaml` files.
-- [x] You've configured the [SMTP server settings](./backend-config.md#email) (used for invitations, password resets, etc)
-- [x] Verified the port mapped on the `mealie-frontend` container is an open port on your server (Default: 9925)
+- [x] You've configured the [SMTP server settings](./backend-config.md#email) (used for invitations, password resets, etc). You can setup a [google app password](https://support.google.com/accounts/answer/185833?hl=en) if you want to send email via gmail.
 - [x] You've set the [`BASE_URL`](./backend-config.md#general) variable.
 - [x] You've set the `DEFAULT_EMAIL` and `DEFAULT_GROUP` variable.
-- [x] Make any theme changes on the frontend container. [See Frontend Config](./frontend-config.md#themeing)
 
 ## Step 3: Startup
-After you've configured your database, and updated the `docker-compose.yaml` files, you can start Mealie by running the following command in the directory where you've added your `docker-compose.yaml`.
+
+After you've configured your database and updated the `docker-compose.yaml` files, you can start Mealie by running the following command in the directory where you've added your `docker-compose.yaml`.
 
 ```bash
-$ docker-compose up -d
+$ docker compose up -d
 ```
 
 You should see the containers start up without error. You should now be able to access the Mealie frontend at [http://localhost:9925](http://localhost:9925).
 
+!!! warning "Default Username"
+
+    Note that the default username (below) has been changed from previous versions
+
 !!! tip "Default Credentials"
 
-    **Username:** changeme@email.com
+    **Username:** changeme@example.com
 
     **Password:** MyPassword
 
 ## Step 4: Validate Installation
 
-After the startup is complete you should see a login screen. Use the default credentials above to login and navigate to `/admin/site-settings`. Here you'll find a summary of your configuration details and their respective status. Before proceeding you should validate that the configuration is correct. For any warnings or errors the page will display an error and notify you of what you need to verify.
-
-!!! tip "Docker Volume"
-    Mealie uses a shared data-volume between the Backend and Frontend containers for images and assets. Ensure that this is configured correctly by using the "Docker Volume Test" section in the settings page. Running this validation will ensure that you have configured your volumes correctly. Mealie will not work correctly without this configured correctly.
+After the startup is complete, you should see a login screen. Use the default credentials above to log in and navigate to `/admin/site-settings`. Here, you'll find a summary of your configuration details and their respective status. Before proceeding, you should validate that the configuration is correct. For any warnings or errors the page will display an error and notify you of what you need to verify.
 
 ## Step 5: Backup
+
 While v1.0.0 is a great step to data-stability and security, it's not a backup. Mealie provides a full site data backup mechanism through the UI.
 
-These backups are just plain .zip files that you can download from the UI or access via the mounted volume on your system. For complete data protection you MUST store these backups somewhere safe, and outside of the server where they are deployed.
+These backups are just plain .zip files that you can download from the UI or access via the mounted volume on your system. For complete data protection you MUST store these backups somewhere safe, outside of the server where they are deployed.
 
 ## Appendix
 
 ### Docker Tags
 
+See all available tags on [GitHub](https://github.com/mealie-recipes/mealie/pkgs/container/mealie). We do not currently publish new images to Dockerhub.
+
+`ghcr.io/mealie-recipes/mealie:nightly`
+
+The nightly build are the latest and greatest builds that are built directly off of every commit to the `mealie-next` branch and as such may contain bugs. These are great to help the community catch bugs before they hit the stable release or if you like living on the edge.
+
+`ghcr.io/mealie-recipes/mealie:<version>`
+
+We also provide versioned containers that allow to pin to a specific release. Each time a new release is built a new tag will be pushed with the version. These are great to pin to a specific version and allows you to have absolute control on when you upgrade your container.
+
+`ghcr.io/mealie-recipes/mealie:latest`
+
+_Note: This tag is not yet available; it will be available with the v1 stable release_
+
+The latest tag provides the latest released image of Mealie.
+
+---
+
+**These tags no are long updated**
+
 `mealie:frontend-v1.0.0beta-x` **and** `mealie:api-v1.0.0beta-x`
 
 These are the tags for the latest beta release of the frontend docker-container. These are currently considered the latest and most stable releases and the recommended way of using Mealie.
@@ -94,16 +128,3 @@ These are the tags for the latest beta release of the frontend docker-container.
 `mealie:frontend-nightly`**and** `mealie:api-nightly`
 
 The nightly build are the latest and greatest builds that are built directly off of every commit to the `mealie-next` branch and as such may contain bugs. These are great to help the community catch bugs before they hit the stable release or if you like living on the edge.
-
-
-### Docker Diagram
-
-While the docker-compose file should work without modification, some users want to tailor it to their installation. This diagram shows network and volume architecture for the default setup. You can use this to help you customize your configuration.
-
-![Docker Diagram](../../../assets/img/docker-diagram.drawio.svg)
-
-In the diagram above there's a few crucial things to note.
-
-1. Port 9925 is the host port, this can be anything you want. The important part is that it's mapped to the mealie-frontend container at port 3000.
-2. The mealie-frontend container communicated with the mealie-api container through the INTERNAL docker network. This requires that the two containers are on the same network and that the network supports name resolution (anything but the default bridge network). The resolution URL can be specified in the docker-compose as the `API_URL` environment variable.
-3. The mealie-data volume is mounted to BOTH the mealie-frontend and mealie-api containers. This is REQUIRED to ensure that images and assets are served up correctly. While the default configuration is a docker-volume, that same can be accomplished by using a local directory mounted to the containers.

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

@@ -1,34 +1,22 @@
 # Installing with PostgreSQL
 
-**For Environmental Variable Configuration See:**
+PostgreSQL might be considered if you need to support many concurrent users. In addition, some features are only enabled on PostgreSQL, such as fuzzy search.
 
-- [Frontend Configuration](./frontend-config.md)
-- [Backend Configuration](./backend-config.md)
+**For Environment Variable Configuration, see** [Backend Configuration](./backend-config.md)
 
 ```yaml
 ---
 version: "3.7"
 services:
-  mealie-frontend:
-    image: hkotel/mealie:frontend-v1.0.0beta-4
-    container_name: mealie-frontend
-    depends_on:
-      - mealie-api
-    environment:
-    # Set Frontend ENV Variables Here
-      - API_URL=http://mealie-api:9000 # (1)
-    restart: always
+  mealie:
+    image: ghcr.io/mealie-recipes/mealie:v1.0.0-RC2
+    container_name: mealie
     ports:
-      - "9925:3000" # (2)
-    volumes:
-      - mealie-data:/app/data/ # (3)
-  mealie-api:
-    image: hkotel/mealie:api-v1.0.0beta-4
-    container_name: mealie-api
+        - "9925:9000"
     deploy:
       resources:
         limits:
-          memory: 1000M # (4)
+          memory: 1000M # (1)
     depends_on:
       - postgres
     volumes:
@@ -53,8 +41,10 @@ services:
     restart: always
   postgres:
     container_name: postgres
-    image: postgres
+    image: postgres:15
     restart: always
+    volumes:
+      - mealie-pgdata:/var/lib/postgresql/data
     environment:
       POSTGRES_PASSWORD: mealie
       POSTGRES_USER: mealie
@@ -62,12 +52,11 @@ services:
 volumes:
   mealie-data:
     driver: local
+  mealie-pgdata:
+    driver: local
 ```
 
 <!-- Updating This? Be Sure to also update the SQLite Annotations -->
 
-1. Whoa whoa whoa, what is this nonsense? The API_URL is the URL the frontend container uses to proxy api requests to the backend server. In this example, the name `mealie-api` resolves to the `mealie-api` container which runs the API server on port 9000. This allows you to access the API without exposing an additional port on the host.
-    <br/> <br/> **Note** that both containers must be on the same docker-network for this to work.
-2.  To access the mealie interface you only need to expose port 3000 on the mealie-frontend container. Here we expose port 9925 on the host, feel free to change this to any port you like.
-3.  Mounting the data directory to the frontend is now required to access the images/assets directory. This can be mounted read-only. Internally the frontend containers runs a Caddy proxy server that serves the assets requested to reduce load on the backend API.
-4.  Setting an explicit memory limit is recommended. Python can pre-allocate larger amounts of memory than is necessary if you have a machine with a lot of RAM. This can cause the container to idle at a high memory usage. Setting a memory limit will improve idle performance.
+1.  To access the mealie interface you only need to expose port 9000 on the mealie container. Here we expose port 9925 on the host, but feel free to change this to any port you like.
+2.  Setting an explicit memory limit is recommended. Python can pre-allocate larger amounts of memory than is necessary if you have a machine with a lot of RAM. This can cause the container to idle at a high memory usage. Setting a memory limit will improve idle performance.

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

@@ -1,34 +1,26 @@
 # Installing with SQLite
 
+!!! Warning
+    If you're plannin on deploying and using Network Attached Storage with Mealie, you should use [Postgres](./postgres.md) instead of SQLite. SQLite is not designed to be used with Network Attached Storage and can cause data corruption, or locked database errors
+
+
 SQLite is a popular, open source, self-contained, zero-configuration database that is the ideal choice for Mealie when you have 1-20 Users. Below is a ready to use docker-compose.yaml file for deploying Mealie on your server.
 
-**For Environmental Variable Configuration See:**
-
-- [Frontend Configuration](./frontend-config.md)
-- [Backend Configuration](./backend-config.md)
+**For Environment Variable Configuration, see** [Backend Configuration](./backend-config.md)
 
 ```yaml
 ---
 version: "3.7"
 services:
-  mealie-frontend:
-    image: hkotel/mealie:frontend-v1.0.0beta-4
-    container_name: mealie-frontend
-    environment:
-    # Set Frontend ENV Variables Here
-      - API_URL=http://mealie-api:9000 # (1)
-    restart: always
+  mealie:
+    image: ghcr.io/mealie-recipes/mealie:v1.0.0-RC2
+    container_name: mealie
     ports:
-      - "9925:3000" # (2)
-    volumes:
-      - mealie-data:/app/data/ # (3)
-  mealie-api:
-    image: hkotel/mealie:api-v1.0.0beta-4
-    container_name: mealie-api
+        - "9925:9000" # (1)
     deploy:
       resources:
         limits:
-          memory: 1000M # (4)
+          memory: 1000M # (2)
     volumes:
       - mealie-data:/app/data/
     environment:
@@ -49,8 +41,5 @@ volumes:
 
 <!-- Updating This? Be Sure to also update the Postgres Annotations -->
 
-1. Whoa whoa whoa, what is this nonsense? The API_URL is the URL the frontend container uses to proxy api requests to the backend server. In this example, the name `mealie-api` resolves to the `mealie-api` container which runs the API server on port 9000. This allows you to access the API without exposing an additional port on the host.
-    <br/> <br/> **Note** that both containers must be on the same docker-network for this to work.
-2.  To access the mealie interface you only need to expose port 3000 on the mealie-frontend container. Here we expose port 9925 on the host, feel free to change this to any port you like.
-3.  Mounting the data directory to the frontend is now required to access the images/assets directory. This can be mounted read-only. Internally the frontend containers runs a Caddy proxy server that serves the assets requested to reduce load on the backend API.
-4.  Setting an explicit memory limit is recommended. Python can pre-allocate larger amounts of memory than is necessary if you have a machine with a lot of RAM. This can cause the container to idle at a high memory usage. Setting a memory limit will improve idle performance.
+1.  To access the mealie interface you only need to expose port 9000 on the container. Here we expose port 9925 on the host, but feel free to change this to any port you like.
+2.  Setting an explicit memory limit is recommended. Python can pre-allocate larger amounts of memory than is necessary if you have a machine with a lot of RAM. This can cause the container to idle at a high memory usage. Setting a memory limit will improve idle performance.

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

@@ -1,65 +1,54 @@
 # About The Project
 
 !!! warning "Mealie v1 Beta Release"
+
     This documentation is for the Mealie v1 Beta release and is not final. As such, it may contain incomplete or incorrect information. You should understand that installing Mealie v1 Beta is a work in progress and while we've committed to maintaining the database schema and provided migrations, we are still in the process of adding new features, and robust testing to ensure the application works as expected.
 
-    You should likely find bugs, errors, and unfinished pages within the application. To find the current status of the release you can checkout the [project on github](https://github.com/hay-kot/mealie/projects/7) or reach out on discord.
-
+    You should likely find bugs, errors, and unfinished pages within the application. To find the current status of the release you can checkout the [project on github](https://github.com/mealie-recipes/mealie/projects/7) or reach out on discord.
 
 Mealie is a self hosted recipe manager and meal planner with a RestAPI backend and a reactive frontend application built in Vue for a pleasant user experience for the whole family. Easily add recipes into your database by providing the url and Mealie will automatically import the relevant data or add a family recipe with the UI editor. Mealie also provides an API for interactions from 3rd party applications.
 
 [Remember to join the Discord](https://discord.gg/QuStdQGSGK)
 
-
 ## Key Features
-- 🔍 Fuzzy search
-- 🏷️ Tag recipes with categories or tags to flexible sorting
+
+- 🔍 Smart search, mix & match of "quoted literal searches" and keyword search. Fuzzy search ("is it brocolli or broccoli?") is also available when using a Postgres database.
+- 🏷️ Tag recipes with categories or tags for flexible sorting
 - 🕸 Import recipes from around the web by URL
 - 📱 Progressive Web App
 - 📆 Create Meal Plans
 - 🛒 Generate shopping lists
 - 🐳 Easy setup with Docker
-- 🎨 Customize your interface with color themes layouts
-- 💾 Export all your data in any format with Jinja2 Templates, with easy data restoration from the user interface.
+- 🎨 Customize your interface with color themed layouts
 - 🌍 localized in many languages
 - ➕ Plus tons more!
-    - Flexible API
-        - Custom key/value pairs for recipes
-        - Webhook support
-        - Interactive API Documentation thanks to [FastAPI](https://fastapi.tiangolo.com/) and [Swagger](https://petstore.swagger.io/)
-    - Raw JSON Recipe Editor
-    - Migration from other platforms
-        - Chowdown
-        - Nextcloud Cookbook
-    - Random meal plan generation
+  - Flexible API
+    - Custom key/value pairs for recipes
+    - Webhook support
+    - Interactive API Documentation thanks to [FastAPI](https://fastapi.tiangolo.com/) and [Swagger](https://petstore.swagger.io/)
+  - Raw JSON Recipe Editor
+  - Migration from other platforms
+    - Chowdown
+    - Nextcloud Cookbook
+    - Copy Me That
+    - Paprika
+    - Tandoor Recipes
+  - Random meal plan generation
+    - Advanced rule configuration to fine tune random recipes
 
 ## FAQ
 
-### 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 of Meal Plan data to remind you to defrost the chicken, marinade 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.
-
-### 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 provided automatic daily backups that export your data in json, plain-text markdown files, and/or custom Jinja2 templates. **This puts you in controls 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.
+See the [Frequently Asked Questions page](./faq.md)
 
 ## Built With
 
-* [Vue.js](https://vuejs.org/)
-* [Vuetify](https://vuetifyjs.com/en/)
-* [FastAPI](https://fastapi.tiangolo.com/)
-* [Docker](https://www.docker.com/)
-
-<!-- ROADMAP -->
-## Road Map
-
-[See Roadmap](../../roadmap.md)
-
+- [Vue.js](https://vuejs.org/)
+- [Vuetify](https://vuetifyjs.com/en/)
+- [FastAPI](https://fastapi.tiangolo.com/)
+- [Docker](https://www.docker.com/)
 
 <!-- CONTRIBUTING -->
+
 ## Contributing
 
 Contributions are what make the open source community such an amazing place to learn, develop, and create. Any contributions you make are **greatly appreciated**. See the [Contributors Guide](../../contributors/non-coders.md) for help getting started.

docs/docs/documentation/getting-started/migrating-to-mealie-v1.md

@@ -1,9 +1,9 @@
 # Migrating to Mealie v1 Release
 
-The version 1 release of Mealie should be seen as an entirely different application. A whole host of changes have been made to improve the application, performance, and developer experience. Most of these improvements required significant breaking changes in the application that made a clean and easy migration impossible. However, if you've used Mealie prior to v1 there is a migration path to get most of your data from the old version to the new v1 version.
+The version 1 release of Mealie should be seen as an entirely different application. A whole host of changes have been made to improve the application, performance, and developer experience. Most of these improvements required significant breaking changes in the application that made a clean and easy migration impossible. However, if you've used Mealie prior to v1, there is a migration path to get most of your data from the old version to the new v1 version.
 
 !!! info "Currently Supported Migration Data"
-    Supporting more data is a work in progress, but not a current priority. I'm open to PR's to add support for additional data.
+    Supporting more data is a work in progress, but not a current priority. I'm open to PRs to add support for additional data.
 
     - [x] Recipes
     - [x] Categories
@@ -16,19 +16,15 @@ The version 1 release of Mealie should be seen as an entirely different applicat
 
 ## Migration Considerations
 
-Before you migrate to v1.0.0-beta-x please consider the following:
+Before you migrate to v1.0.0 please consider the following:
 
 **API Integration Will Break**
 
 Several of the endpoints in the API have changed. This means that you will need to update your code to use the new endpoints.
 
-**Meal Plan Notifications Are Not Yet Implemented**
+**Recipes Are Private By Default**
 
-If you're using the Meal Plan webhook feature it has yet to be implemented in v1. This feature is being significantly improved in v1 and has yet to be fully fleshed out. If you were a heavy user, you may want to wait until v1 to use this feature.
-
-**Recipes are Now Private**
-
-This can be a plus or a minus depending on your use case. If you relied on the old implementation that allowed viewing of recipes without logging in, you will loose that access. We are planning on implementing a public facing interface for groups/tenants to allow unauthenticated users to view public recipes.
+By default, recipes can only be viewed by logged-in users. You can fine-tune public recipe access, or keep your instance fully private. For more information, check out the [Permissions and Public Access guide](../getting-started/usage/permissions-and-public-access.md).
 
 
 ## Step 1: Setting Up The New Application
@@ -37,7 +33,9 @@ Given the nature of the upgrade, it is highly recommended that you stand up a ne
 
 ## Step 2: Exporting Your Data from Pre-v1
 
-In your instance of Mealie prior to v1, perform an export of your data in the Admin section. Be sure to include the recipes when performing the export. Checking additional items won't impact the migration, but they will be ignored if they are included.
+In your instance of Mealie prior to v1, perform an export (backup) of your data in the Admin section. Be sure to include the recipes when performing the export. Checking additional items won't impact the migration, but they will be ignored if they are included. The backups section is located on the admin dashboard in the section labeled "Backups":
+
+![pre-v1-backup-location-image](../../assets/img/pre-v1-backup-location.png)
 
 
 ## Step 3: Using the Migration Tool
@@ -47,11 +45,11 @@ In your new v1 instance, navigate to `/group/migrations` and select "Mealie" fro
 In most cases, it's faster to manually migrate the recipes that didn't take instead of trying to identify why the recipes failed to import. If you're experiencing issues with the migration tool, please open an issue on GitHub.
 
 !!! note "Recipe Owners"
-    When perform any migration, it will automatically assign the owner of the recipe to the user that performed the migration. All group members will still be able to access the recipe, however the owner has special permissions to lock the recipe from edits from other users.
+    When perform any migration, it will automatically assign the owner of the recipe to the user that performed the migration. All group members will still be able to access the recipe; however, the owner has special permissions to lock the recipe from edits from other users.
 
 
 ## Step 4: Reviewing New Features
 
-v1 Comes with a whole host of new features and improvements. Checkout the changelog to get a sense for what's new.
+v1 Comes with a whole host of new features and improvements. Check out the changelog to get a sense for what's new.
 
-- [v1 Changelog](../../changelog/v1.0.0.md)
+- [Github releases changelog](https://github.com/mealie-recipes/mealie/releases)

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

@@ -1,7 +1,7 @@
 # Development Road Map
 
 ## Feature Requests
-See the [Github META issue for tracking feature requests](https://github.com/hay-kot/mealie/issues/122)
+[Please request new features on Github](https://github.com/mealie-recipes/mealie/discussions/new?category=feature-request)
 
-## Progress 
-See the [Github Projects](https://github.com/hay-kot/mealie/projects) to see what is currently being worked on
+## Progress
+See the [Github Projects page](https://github.com/users/hay-kot/projects/2) to see what is currently being worked on

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

@@ -1,7 +1,7 @@
 # Updating Mealie
 
 !!! warning "Read The Release Notes"
-    You MUST read the release notes prior to upgrading your container. Currently Mealie provides no database migrations as doing so would slow down development and hinder major changes that may need to happen prior to v1.0.0. Mealie has a robust backup and restore system for managing your data.
+    You MUST read the release notes prior to upgrading your container. Mealie has a robust backup and restore system for managing your data. Pre-v1.0.0 versions of Mealie use a different database structure, so if you are upgrading from pre-v1.0.0 to v1.0.0, you MUST backup your data and then re-import it. Even if you are already on v1.0.0, it is strongly recommended to backup all data before updating.
 
     ### Before Upgrading
      - Read The Release Notes
@@ -9,13 +9,16 @@
      - Create a Backup and Download from the UI
      - Upgrade
 
+## Upgrading to Mealie v1
+If you are upgrading from pre-v1.0.0 to v1.0.0, make sure you read [Migrating to Mealie v1](./migrating-to-mealie-v1.md)!
+
 ## Backing Up Your Data
 
-[See Backups and Restore Section](../admin/backups-and-exports.md) for details on backing up your data
+[See Backups and Restore Section](../getting-started/usage/backups-and-restoring.md) for details on backing up your data
 
 ## Docker
 For all setups using Docker the updating process looks something like this
 
-- Stop the container using docker-compose down
-- Pull the latest image using docker-compose pull
-- Start the container again using docker-compose up -d
+- Stop the container using `docker compose down`
+- Pull the latest image using `docker compose pull`
+- Start the container again using `docker compose up -d`

docs/docs/documentation/getting-started/usage/backups-and-restoring.md

@@ -34,4 +34,4 @@ ALTER USER mealie WITH SUPERUSER;
 ALTER USER mealie WITH NOSUPERUSER;
 ```
 
-For more information see [GitHub Issue #1500](https://github.com/hay-kot/mealie/issues/1500)
+For more information see [GitHub Issue #1500](https://github.com/mealie-recipes/mealie/issues/1500)

docs/docs/documentation/getting-started/usage/ldap.md

@@ -0,0 +1,8 @@
+# LDAP Authentication
+
+If LDAP is enabled and [configured properly](../installation/backend-config.md), users will be able to log in with their LDAP credentials. If the user does not already have an account in Mealie, then one will be created.
+
+If the user already has an account in Mealie and wants to use their LDAP credentials instead, then you can go to the **User Management** page in the admin panel and change the "Authentication Backend" from `Mealie` to `LDAP`. If for whatever reason, the user no longer wants to use LDAP authentication, then you can switch this back to `Mealie`.
+
+!!! warning "Head's Up"
+    If you switch a user from `LDAP` to `Mealie` who was initially created by LDAP, then the user will have to reset their password through the password reset flow.

docs/docs/documentation/getting-started/usage/permissions-and-public-access.md

@@ -0,0 +1,57 @@
+# Permissions and Public Access
+
+Mealie provides various levels of user access and permissions. This includes:
+- Authentication and registration ([check out the LDAP guide](./ldap.md) for how to configure access using LDAP)
+- Customizable user permissions
+- Fine-tuned public access for non-users
+
+## Customizable User Permissions
+
+Each user can be configured to have varying levels of access. Some of these permissions include:
+- Access to Administrator tools
+- Access to inviting other users
+- Access to manage their group and group data
+
+Administrators can navigate to the Settings page and access the User Management page to configure these settings.
+
+
+[User Management Demo](https://demo.mealie.io/admin/manage/users){ .md-button .md-button--primary }
+
+## Public Recipe Access
+
+By default, groups are set to private, meaning only logged-in users may access the group. In order for a recipe to be viewable by public (not logged-in) users, two criteria must be met:
+
+1. The group must not be private, *and* the group setting for allowing users outside of your group to see your recipes must be enabled. These can be toggled on the Group Settings page
+2. The recipe must be set to public. This can be toggled for each recipe individually, or in bulk using the Recipe Data Management page
+
+Additionally, if the group is not private, public users can view all public group data (public recipes, public cookbooks, etc.) from the home page ([e.g. the demo home page](https://demo.mealie.io/g/home)).
+
+[Group Settings Demo](https://demo.mealie.io/group){ .md-button .md-button--primary }
+
+More broadly, here are the rules for how recipe access is determined:
+
+- 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.
+- Groups 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 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 --> n1: No
+```