Fix/version number (#960)

* npm install

* set versions

* bump beta label

* bump app version

* v0.5.5 changelog

* allow higher version of python

* add discord release notification

.devcontainer/Dockerfile

@@ -1,40 +0,0 @@
-# See here for image contents: https://github.com/microsoft/vscode-dev-containers/tree/v0.224.2/containers/python-3/.devcontainer/base.Dockerfile
-
-# [Choice] Python version (use -bullseye variants on local arm64/Apple Silicon): 3, 3.10, 3.9, 3.8, 3.7, 3.6, 3-bullseye, 3.10-bullseye, 3.9-bullseye, 3.8-bullseye, 3.7-bullseye, 3.6-bullseye, 3-buster, 3.10-buster, 3.9-buster, 3.8-buster, 3.7-buster, 3.6-buster
-ARG VARIANT="3.10-bullseye"
-FROM mcr.microsoft.com/vscode/devcontainers/python:0-${VARIANT}
-
-# [Choice] Node.js version: none, lts/*, 16, 14, 12, 10
-ARG NODE_VERSION="none"
-RUN if [ "${NODE_VERSION}" != "none" ]; then su vscode -c "umask 0002 && . /usr/local/share/nvm/nvm.sh && nvm install ${NODE_VERSION} 2>&1"; fi
-
-# install poetry - respects $POETRY_VERSION & $POETRY_HOME
-
-RUN echo "export PROMPT_COMMAND='history -a'" >> /home/vscode/.bashrc \
-    && echo "export HISTFILE=~/commandhistory/.bash_history" >> /home/vscode/.bashrc \
-    && chown vscode:vscode -R /home/vscode/
-
-
-ENV PYTHONUNBUFFERED=1 \
-    PYTHONDONTWRITEBYTECODE=1 \
-    PIP_NO_CACHE_DIR=off \
-    PIP_DISABLE_PIP_VERSION_CHECK=on \
-    PIP_DEFAULT_TIMEOUT=100 \
-    POETRY_HOME="/opt/poetry" \
-    POETRY_VIRTUALENVS_CREATE=false
-
-# 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 poetry config virtualenvs.create false
-
-RUN apt-get update \
-    && apt-get install --no-install-recommends -y \
-    curl \
-    build-essential \
-    libpq-dev \
-    libwebp-dev \
-    libsasl2-dev libldap2-dev libssl-dev \
-    gnupg gnupg2 gnupg1
-#     && pip install -U --no-cache-dir pip

.devcontainer/devcontainer.json

@@ -1,59 +0,0 @@
-// For format details, see https://aka.ms/devcontainer.json. For config options, see the README at:
-// https://github.com/microsoft/vscode-dev-containers/tree/v0.224.2/containers/python-3
-{
-  "name": "Python 3",
-  "build": {
-    "dockerfile": "Dockerfile",
-    "context": "..",
-    "args": {
-      // Update 'VARIANT' to pick a Python version: 3, 3.10, 3.9, 3.8, 3.7, 3.6
-      // Append -bullseye or -buster to pin to an OS version.
-      // Use -bullseye variants on local on arm64/Apple Silicon.
-      "VARIANT": "3.10-bullseye",
-      // Options
-      "NODE_VERSION": "16"
-    }
-  },
-  "mounts": [
-    "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"
-  },
-  // 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
-  ],
-  // Use 'onCreateCommand' to run commands at the end of container creation.
-  // Use 'postCreateCommand' to run commands after the container is created.
-  "onCreateCommand": "sudo chown -R vscode:vscode /workspaces/mealie/frontend/node_modules && make setup",
-  // Comment out to connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
-  "remoteUser": "vscode",
-  // "features": {
-  //   "git": "latest"
-  // }
-}

.dockerignore

@@ -2,6 +2,7 @@
 .github
 .dockerignore
 .gitignore
+
 .idea
 .vscode
 
@@ -25,6 +26,4 @@ venv
 */dist
 */data/db
 */mealie/test 
-*/mealie/.temp
-
-model.crfmodel
+*/mealie/.temp

.flake8

@@ -1,10 +1,6 @@
 [flake8]
-extend-ignore = [
+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/ISSUE_TEMPLATE/bug-report.yaml

@@ -1,5 +1,5 @@
 ---
-name: "[v0.5.x] Bug Report"
+name: Bug Report
 description: "submit a bug report for the current release"
 body:
   - type: checkboxes
@@ -18,8 +18,6 @@ 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
   - type: textarea
     id: description
     attributes:

.github/ISSUE_TEMPLATE/v1-task.yaml

@@ -17,7 +17,7 @@ body:
         - You are a contributors who has prior approval via discord/discussions
         - You have otherwise been given approval to post the tasks
 
-        Otherwise, your post will be closed/deleted.
+        Otherwise, your post will be closed/deleted. 
 
         **Interested in Taking This?**
 

.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

@@ -1,72 +0,0 @@
-<!--
-  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.
- -->
-
-## What type of PR is this?
-
-_(REQUIRED)_
-
-<!--
-  Delete any of the following that do not apply:
- -->
-
-- bug
-- cleanup
-- documentation
-- feature
-
-## What this PR does / why we need it:
-
-_(REQUIRED)_
-
-<!--
-  What goal is this change working towards?
-  Provide a bullet pointed summary of how each file was changed.
-  Briefly explain any decisions you made with respect to the changes.
-  Include anything here that you didn't include in *Release Notes*
-  above, such as changes to CI or changes to internal methods.
--->
-
-## Which issue(s) this PR fixes:
-
-_(REQUIRED)_
-
-<!--
-If this PR fixes one of more issues, list them here.
-One line each, like so:
-Fixes #123
-Fixes #39
--->
-
-## Special notes for your reviewer:
-
-_(fill-in or delete this section)_
-
-<!--
-   Is there any particular feedback you would / wouldn't like?
-   Which parts of the code should reviewers focus on?
--->
-
-## Testing
-
-_(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/semantic.yml

@@ -1,5 +0,0 @@
-# Always validate the PR title AND all the commits
-titleAndCommits: true
-# Allows use of Merge commits (eg on github: "Merge branch 'master' into feature/ride-unicorns")
-# this is only relevant when using commitsOnly: true (or titleAndCommits: true)
-allowMergeCommits: true

.github/stale.yaml

@@ -6,12 +6,8 @@ daysUntilClose: 7
 exemptLabels:
   - pinned
   - security
-  - early-stages
-  - "bug: confirmed"
-  - feedback
-  - task
 # Label to use when marking an issue as stale
-staleLabel: stale
+staleLabel: wontfix
 # 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

.github/workflows/build-docs.yml

@@ -0,0 +1,19 @@
+name: Publish docs via GitHub Pages
+on:
+  release:
+    types: [published]
+
+jobs:
+  build:
+    name: Deploy docs
+    runs-on: ubuntu-latest
+    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

.github/workflows/dockerbuild.dev-docs.yml

@@ -0,0 +1,30 @@
+name: Docker Build Dev Docs
+
+on:
+  push:
+    branches:
+      - dev
+
+jobs:
+  push_to_registry:
+    name: Push Docker image to GitHub Packages
+    runs-on: ubuntu-latest
+    permissions:
+      packages: write
+      contents: read
+    steps:
+      - name: Check out the repo
+        uses: actions/checkout@v2
+      - name: Log in to GitHub Docker Registry
+        uses: docker/login-action@v1
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+      - name: Build container image
+        uses: docker/build-push-action@v2
+        with:
+          context: ./docs
+          push: true
+          tags: |
+            ghcr.io/${{ github.repository }}/dev-docs:latest

.github/workflows/dockerbuild.dev.yml

@@ -0,0 +1,49 @@
+name: Docker Build Dev
+
+on:
+  push:
+    branches:
+      - dev
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      #
+      # Checkout
+      #
+      - name: checkout code
+        uses: actions/checkout@v2
+      #
+      # Setup QEMU
+      #
+      - name: Set up QEMU
+        id: qemu
+        uses: docker/setup-qemu-action@v1
+        with:
+          image: tonistiigi/binfmt:latest
+          platforms: all
+      #
+      # Setup Buildx
+      #
+      - name: install buildx
+        id: buildx
+        uses: docker/setup-buildx-action@v1
+        with:
+          install: true
+      #
+      # Login to Docker Hub
+      #
+      - name: Login to Docker Hub
+        uses: docker/login-action@v1
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      #
+      # Build
+      #
+      - name: build the image
+        run: |
+          docker build --push --no-cache \
+            --tag hkotel/mealie:dev \
+            --platform linux/amd64,linux/arm64 .

.github/workflows/dockerbuild.prod.yml

@@ -0,0 +1,48 @@
+name: Docker Build Production
+
+on:
+  release:
+    types: [published]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      #
+      # Checkout
+      #
+      - name: checkout code
+        uses: actions/checkout@v2
+      #
+      # Setup QEMU
+      #
+      - name: Set up QEMU
+        id: qemu
+        uses: docker/setup-qemu-action@v1
+        with:
+          image: tonistiigi/binfmt:latest
+          platforms: all
+      #
+      # Setup Buildx
+      #
+      - name: install buildx
+        id: buildx
+        uses: docker/setup-buildx-action@v1
+        with:
+          install: true
+      #
+      # Login to Docker Hub
+      #
+      - name: Login to Docker Hub
+        uses: docker/login-action@v1
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      #
+      # Build
+      #
+      - name: build the image
+        run: |
+          docker build --push \
+            --tag hkotel/mealie:latest \
+            --platform linux/amd64,linux/arm64 .

.github/workflows/dockerbuild.release.yml

@@ -0,0 +1,65 @@
+name: Docker Build Production
+
+on:
+  release:
+    types: [published]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      #
+      # Get Release Version
+      #
+      - uses: oprypin/find-latest-tag@v1
+        with:
+          repository: hay-kot/mealie # The repository to scan.
+          releases-only: true # We know that all relevant tags have a GitHub release for them.
+        id: mealie_version # The step ID to refer to later.
+      #
+      # Checkout
+      #
+      - name: checkout code
+        uses: actions/checkout@v2
+      #
+      # Setup QEMU
+      #
+      - name: Set up QEMU
+        id: qemu
+        uses: docker/setup-qemu-action@v1
+        with:
+          image: tonistiigi/binfmt:latest
+          platforms: all
+      #
+      # Setup Buildx
+      #
+      - name: install buildx
+        id: buildx
+        uses: docker/setup-buildx-action@v1
+        with:
+          install: true
+      #
+      # Login to Docker Hub
+      #
+      - name: Login to Docker Hub
+        uses: docker/login-action@v1
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      #
+      # Build
+      #
+      - name: build the image
+        run: |
+          docker build --push \
+            --tag hkotel/mealie:${{ steps.mealie_version.outputs.tag }} \
+            --platform linux/amd64,linux/arm64 .
+      #
+      # Release Discord Notification
+      #
+      - name: Discord notification
+        env:
+          DISCORD_WEBHOOK: ${{ secrets.DISCORD_RELEASE_WEBHOOK }}
+        uses: Ilshidur/action-discord@0.3.2
+        with:
+          args: '🚀  Version {{ EVENT_PAYLOAD.release.tag_name }} of Mealie has been released. See the release notes https://github.com/hay-kot/mealie/releases/tag/{{ EVENT_PAYLOAD.release.tag_name }}'

.github/workflows/nightly.yml

@@ -1,64 +0,0 @@
-name: Docker Nightly Production
-
-on:
-  push:
-    branches:
-      - mealie-next
-
-concurrency:
-  group: nightly-${{ github.ref }}
-  cancel-in-progress: true
-
-jobs:
-  backend-tests:
-    name: "Backend Server Tests"
-    uses: ./.github/workflows/partial-backend.yml
-
-  frontend-tests:
-    name: "Frontend and End-to-End Tests"
-    uses: ./.github/workflows/partial-frontend.yml
-
-  build-release:
-    name: Build Tagged Release
-    uses: ./.github/workflows/partial-builder.yml
-    needs:
-      - frontend-tests
-      - backend-tests
-    with:
-      tag: nightly
-    secrets:
-      DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
-      DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
-
-  notify-discord:
-    name: Notify Discord
-    needs:
-      - build-release
-    runs-on: ubuntu-latest
-    steps:
-      - name: Discord notification
-        env:
-          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

.github/workflows/partial-backend.yml

@@ -1,87 +0,0 @@
-name: Backend Test/Lint
-
-on:
-  workflow_call:
-
-jobs:
-  tests:
-    runs-on: ubuntu-latest
-
-    env:
-      PRODUCTION: false
-
-    strategy:
-      fail-fast: true
-      matrix:
-        # Database ENV Variablse as Specified by Mealie
-        Database: [sqlite, postgres]
-
-    # Services
-    services:
-      postgres:
-        image: postgres
-        env:
-          POSTGRES_USER: mealie
-          POSTGRES_PASSWORD: mealie
-          POSTGRES_DB: mealie
-        options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
-        ports:
-          - 5432:5432
-    # Steps
-    steps:
-      - name: Check out repository
-        uses: actions/checkout@v2
-
-      - name: Set up python
-        uses: actions/setup-python@v2
-        with:
-          python-version: "3.10"
-
-      - name: Install Poetry
-        uses: snok/install-poetry@v1
-        with:
-          virtualenvs-create: true
-          virtualenvs-in-project: true
-
-      - name: Load cached venv
-        id: cached-poetry-dependencies
-        uses: actions/cache@v3
-        with:
-          path: .venv
-          key: venv-${{ runner.os }}-${{ hashFiles('**/poetry.lock') }}
-
-      - name: Check venv cache
-        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
-          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
-          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)
-        run: |
-          poetry run black . --check
-          poetry run isort . --check-only
-
-      - name: Lint (Flake8)
-        run: |
-          make backend-lint
-
-      - name: Mypy Typecheck
-        run: |
-          make backend-typecheck
-
-      - name: Pytest
-        env:
-          DB_ENGINE: ${{ matrix.Database }}
-          POSTGRES_SERVER: localhost
-        run: |
-          make backend-test

.github/workflows/partial-builder.yml

@@ -1,80 +0,0 @@
-name: Build Containers
-
-on:
-  workflow_call:
-    inputs:
-      tag:
-        required: true
-        type: string
-    secrets:
-      DOCKERHUB_USERNAME:
-        required: true
-      DOCKERHUB_TOKEN:
-        required: true
-
-jobs:
-  build-frontend:
-    runs-on: ubuntu-latest
-    name: Build Frontend
-    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
-
-      - 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
-        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
-
-      - 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
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-
-      - name: Build Backend Image
-        run: |
-          docker build --push --no-cache \
-            --tag hkotel/mealie:api-${{ inputs.tag }}  \
-            --build-arg COMMIT=$(git rev-parse HEAD) \
-            --platform linux/amd64,linux/arm64 .

.github/workflows/partial-frontend.yml

@@ -1,77 +0,0 @@
-name: Frontend Build/Lin
-
-on:
-  workflow_call:
-
-jobs:
-  lint:
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout 🛎
-        uses: actions/checkout@master
-
-      - name: Setup node env 🏗
-        uses: actions/setup-node@v2.1.5
-        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)"
-
-      - name: Cache node_modules 📦
-        uses: actions/cache@v2.1.4
-        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 }}
-          key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-yarn-
-
-      - name: Install dependencies 👨🏻‍💻
-        run: yarn
-        working-directory: "frontend"
-
-      - name: Run linter 👀
-        run: yarn lint
-        working-directory: "frontend"
-
-      - name: Run tests 🧪
-        run: yarn test:ci
-        working-directory: "frontend"
-
-  build:
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout 🛎
-        uses: actions/checkout@master
-
-      - name: Setup node env 🏗
-        uses: actions/setup-node@v2.1.5
-        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)"
-
-      - name: Cache node_modules 📦
-        uses: actions/cache@v2.1.4
-        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 }}
-          key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-yarn-
-
-      - name: Install dependencies 👨🏻‍💻
-        run: yarn
-        working-directory: "frontend"
-
-      - name: Run Build 🚚
-        run: yarn build
-        working-directory: "frontend"

.github/workflows/pull-requests.yml

@@ -1,15 +0,0 @@
-name: PR CI
-
-on:
-  pull_request:
-    branches:
-      - mealie-next
-
-jobs:
-  backend-tests:
-    name: "Backend Server Tests"
-    uses: ./.github/workflows/partial-backend.yml
-
-  frontend-tests:
-    name: "Frontend and End-to-End Tests"
-    uses: ./.github/workflows/partial-frontend.yml

.github/workflows/release.yml

@@ -1,55 +0,0 @@
-name: Docker Build Production
-
-on:
-  release:
-    types: [published]
-
-jobs:
-  backend-tests:
-    name: "Backend Server Tests"
-    uses: ./.github/workflows/partial-backend.yml
-
-  frontend-tests:
-    name: "Frontend and End-to-End Tests"
-    uses: ./.github/workflows/partial-frontend.yml
-
-  build-release:
-    name: Build Tagged Release
-    uses: ./.github/workflows/partial-builder.yml
-    needs:
-      - backend-tests
-      - frontend-tests
-    with:
-      tag: ${{ github.event.release.tag_name }}
-    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:
-      - build-release
-    runs-on: ubuntu-latest
-    steps:
-      - name: Discord notification
-        env:
-          DISCORD_WEBHOOK: ${{ secrets.DISCORD_RELEASE_WEBHOOK }}
-        uses: Ilshidur/action-discord@0.3.2
-        with:
-          args: "🚀  Version {{ EVENT_PAYLOAD.release.tag_name }} of Mealie has been released. See the release notes https://github.com/hay-kot/mealie/releases/tag/{{ EVENT_PAYLOAD.release.tag_name }}"

.github/workflows/test-all.yml

@@ -0,0 +1,78 @@
+name: Project Tests
+on:
+  push:
+    branches:
+      - master
+      - dev
+  pull_request:
+    branches:
+      - master
+      - dev
+    types: [synchronize, opened, reopened, ready_for_review]
+
+jobs:
+  tests:
+    env:
+      PRODUCTION: false
+    runs-on: ubuntu-latest
+    services:
+      postgres:
+        image: postgres
+        env:
+          POSTGRES_USER: mealie
+          POSTGRES_PASSWORD: mealie
+          POSTGRES_DB: mealie
+        options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
+        ports:
+          - 5432:5432
+    steps:
+      #----------------------------------------------
+      #       check-out repo and set-up python
+      #----------------------------------------------
+      - name: Check out repository
+        uses: actions/checkout@v2
+      - name: Set up python
+        uses: actions/setup-python@v2
+        with:
+          python-version: 3.9
+      #----------------------------------------------
+      #  -----  install & configure poetry  -----
+      #----------------------------------------------
+      - name: Install Poetry
+        uses: snok/install-poetry@v1
+        with:
+          virtualenvs-create: true
+          virtualenvs-in-project: true
+      #----------------------------------------------
+      #       load cached venv if cache exists
+      #----------------------------------------------
+      - name: Load cached venv
+        id: cached-poetry-dependencies
+        uses: actions/cache@v2
+        with:
+          path: .venv
+          key: venv-${{ runner.os }}-${{ hashFiles('**/poetry.lock') }}
+      #----------------------------------------------
+      # install dependencies if cache does not exist
+      #----------------------------------------------
+      - name: Install dependencies
+        run: |
+          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'
+      #----------------------------------------------
+      #              run test suite
+      #----------------------------------------------
+      - name: Run Test Suite
+        run: |
+          make test-all
+      #----------------------------------------------
+      #              run test suite
+      #----------------------------------------------
+      - name: Run Test Suite Postgres
+        env:
+          DB_ENGINE: postgres
+          POSTGRES_SERVER: localhost
+        run: |
+          make test-all

.gitignore

@@ -3,7 +3,6 @@
 *__pycache__/
 *.py[cod]
 *$py.class
-*.temp
 
 # frontend/.env.development
 docs/site/
@@ -11,13 +10,11 @@ docs/site/
 .secret
 frontend/dist/
 
-dev/code-generation/generated/*
 dev/data/backups/*
 dev/data/debug/*
 dev/data/img/*
 dev/data/migration/*
 dev/data/users/*
-dev/data/groups/*
 
 .DS_Store
 node_modules
@@ -55,6 +52,7 @@ develop-eggs/
 downloads/
 eggs/
 .eggs/
+lib/
 lib64/
 parts/
 !frontend/src/components/Recipe/Parts/
@@ -153,8 +151,7 @@ dev/data/recipes/*
 dev/scripts/output/app_routes.py
 dev/scripts/output/javascriptAPI/*
 mealie/services/scraper/ingredient_nlp/model.crfmodel
-dev/code-generation/generated/openapi.json
-dev/code-generation/generated/test_routes.py
-mealie/services/parser_services/crfpp/model.crfmodel
-lcov.info
-dev/code-generation/openapi.json
+.gitignore
+frontend/.nuxt/**
+frontend/static/sw.js
+dev/code-generation/generated/*

.pre-commit-config.yaml

@@ -1,31 +0,0 @@
-repos:
-  - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v2.3.0
-    hooks:
-      - id: check-yaml
-        exclude: "mkdocs.yml"
-      - id: check-json
-        exclude: (.vscode|.devcontainer)
-      - id: check-toml
-      - 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
-    hooks:
-      - id: black
-  - repo: https://github.com/pycqa/flake8
-    rev: "4.0.1"
-    hooks:
-      - id: flake8
-        additional_dependencies:
-          - "flake8-print==4.0.0"

.pylintrc

@@ -476,6 +476,7 @@ ignore-comments=yes
 
 # Ignore docstrings when computing similarities.
 ignore-docstrings=yes
+w54
 # Ignore imports when computing similarities.
 ignore-imports=no
 

.vscode/launch.json

@@ -1,25 +0,0 @@
-{
-  // Use IntelliSense to learn about possible attributes.
-  // Hover to view descriptions of existing attributes.
-  // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
-  "version": "0.2.0",
-  "configurations": [
-    {
-      "name": "Mealie Backend",
-      "type": "python",
-      "request": "launch",
-      "module": "uvicorn",
-      "args": [
-        "mealie.app:app",
-        "--port",
-        "9000"
-      ],
-      "env": {
-        "PRODUCTION": "False",
-      },
-      "justMyCode": false,
-      "jinja": true,
-      "preLaunchTask": "Init Database"
-    }
-  ]
-}

.vscode/settings.json

@@ -1,52 +1,20 @@
 {
-  "cSpell.enableFiletypes": ["!javascript", "!python", "!yaml"],
-  "cSpell.words": [
-    "chowdown",
-    "compression",
-    "hkotel",
-    "nextcloud",
-    "performant",
-    "postgres",
-    "webp"
-  ],
-  "editor.codeActionsOnSave": {
-    "source.fixAll.eslint": true,
-    "source.organizeImports": false
-  },
-  "editor.formatOnSave": true,
-  "eslint.workingDirectories": ["./frontend"],
-  "files.exclude": {
-    "**/__pycache__": true,
-    "**/.DS_Store": true,
-    "**/.git": true,
-    "**/.hg": true,
-    "**/.svn": true,
-    "**/CVS": true
-  },
-  "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.pythonPath": ".venv/bin/python3.9",
   "python.linting.pylintEnabled": false,
-  "python.linting.pylintArgs": ["--rcfile=${workspaceFolder}/.pylintrc"],
+  "python.linting.enabled": true,
+  "python.testing.unittestEnabled": false,
+  "python.testing.nosetestsEnabled": false,
+  "python.testing.pytestEnabled": true,
   "python.testing.autoTestDiscoverOnSaveEnabled": false,
   "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"],
+  "cSpell.enableFiletypes": ["!javascript", "!python", "!yaml"],
+  "i18n-ally.localesPaths": "frontend/src/locales/messages",
+  "i18n-ally.sourceLanguage": "en-US",
+  "i18n-ally.enabledFrameworks": ["vue"],
+  "i18n-ally.keystyle": "nested",
+  "cSpell.words": ["compression", "hkotel", "performant", "postgres", "webp"],
   "search.mode": "reuseEditor",
-  "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",
-    "netlify.toml": "runtime.txt",
-    "docker-compose.yml": "Dockerfile, .dockerignore, docker-compose.dev.yml, docker-compose.yml",
-    "README.md": "LICENSE, SECURITY.md"
-  }
+  "python.linting.flake8Enabled": true,
+  "conventionalCommits.scopes": ["frontend"]
 }

.vscode/tasks.json

@@ -6,9 +6,7 @@
       "command": "make docker-dev",
       "type": "shell",
       "args": [],
-      "problemMatcher": [
-        "$tsc"
-      ],
+      "problemMatcher": ["$tsc"],
       "presentation": {
         "reveal": "always"
       },
@@ -19,9 +17,7 @@
       "command": "make docker-prod",
       "type": "shell",
       "args": [],
-      "problemMatcher": [
-        "$tsc"
-      ],
+      "problemMatcher": ["$tsc"],
       "presentation": {
         "reveal": "always"
       },
@@ -37,16 +33,6 @@
       },
       "problemMatcher": []
     },
-    {
-      "label": "Init Database",
-      "command": "poetry run python mealie/db/init_db.py",
-      "type": "shell",
-      "presentation": {
-        "reveal": "always",
-        "group": "groupA"
-      },
-      "problemMatcher": []
-    },
     {
       "label": "Dev: Start Frontend",
       "command": "make frontend",

Caddyfile

@@ -3,8 +3,8 @@
 	admin off
 }
 
-:3000 {
-	@apidocs path /docs /openapi.json
+:80 {
+	@proxied path /api/* /docs /openapi.json
 
 	@static {
 		file
@@ -20,27 +20,15 @@
 		file_server
 	}
 
-	# Handles User Images
-	handle_path /api/media/users/* {
-		header @static Cache-Control max-age=31536000
-		root * /app/data/users/
-		file_server
-	}
-
-	# Handle Docker Volume Validation File
-	handle_path /api/media/docker/* {
-		root * /app/data/docker-validation/
-		file_server
-	}
-
-
-	handle @apidocs {
+	handle @proxied {
 		uri strip_suffix /
-		reverse_proxy {$API_URL}
+		reverse_proxy http://127.0.0.1:9000
 	}
 
 	handle {
-		uri strip_suffix /
-		reverse_proxy http://127.0.0.1:3001
+		header @static Cache-Control max-age=31536000
+		root * /app/dist
+		try_files {path}.html {path} /
+		file_server
 	}
 }

Dockerfile

@@ -1,7 +1,17 @@
+###############################################
+# Frontend Builder Image
+###############################################
+FROM node:lts-alpine as frontend-build
+WORKDIR /app
+COPY ./frontend/package*.json ./
+RUN npm install
+COPY ./frontend/ .
+RUN npm run build
+
 ###############################################
 # Base Image
 ###############################################
-FROM python:3.10-slim as python-base
+FROM python:3.9-slim as python-base
 
 ENV MEALIE_HOME="/app"
 
@@ -34,15 +44,22 @@ RUN apt-get update \
     build-essential \
     libpq-dev \
     libwebp-dev \
-    tesseract-ocr-all \
     # LDAP Dependencies
-    libsasl2-dev libldap2-dev libssl-dev \
+    libsasl2-dev libldap2-dev libssl-dev \ 
     gnupg gnupg2 gnupg1 \
+    debian-keyring \
+    debian-archive-keyring \
+    apt-transport-https \
+    && curl -1sLf 'https://dl.cloudsmith.io/public/caddy/stable/gpg.key' | apt-key add - \
+    && curl -1sLf 'https://dl.cloudsmith.io/public/caddy/stable/debian.deb.txt' | tee /etc/apt/sources.list.d/caddy-stable.list \
+    && apt-get update \
+    && apt-get install --no-install-recommends -y \
+    caddy \
     && pip install -U --no-cache-dir pip
 
 # install poetry - respects $POETRY_VERSION & $POETRY_HOME
-ENV POETRY_VERSION=1.2.1
-RUN curl -sSL https://install.python-poetry.org | python3 -
+ENV POETRY_VERSION=1.1.6
+RUN curl -sSL https://raw.githubusercontent.com/python-poetry/poetry/master/install-poetry.py | python -
 
 # copy project requirement files here to ensure they will be cached.
 WORKDIR $PYSETUP_PATH
@@ -56,7 +73,6 @@ RUN poetry install -E pgsql --no-dev
 ###############################################
 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
@@ -66,9 +82,8 @@ COPY --from=builder-base $PYSETUP_PATH $PYSETUP_PATH
 COPY ./mealie $MEALIE_HOME/mealie
 COPY ./poetry.lock ./pyproject.toml $MEALIE_HOME/
 
-# Alembic
-COPY ./alembic $MEALIE_HOME/alembic
-COPY ./alembic.ini $MEALIE_HOME/
+#! Future
+# COPY ./alembic ./alembic.ini $MEALIE_HOME/
 
 # venv already has runtime deps installed we get a quicker install
 WORKDIR $MEALIE_HOME
@@ -78,27 +93,16 @@ WORKDIR /
 RUN chmod +x $MEALIE_HOME/mealie/run.sh
 ENTRYPOINT $MEALIE_HOME/mealie/run.sh "reload"
 
-###############################################
-# CRFPP Image
-###############################################
-FROM hkotel/crfpp as crfpp
-
-RUN echo "crfpp-container"
-
 ###############################################
 # Production Image
 ###############################################
 FROM python-base as production
 ENV PRODUCTION=true
-ENV TESTING=false
-
-ARG COMMIT
-ENV GIT_COMMIT_HASH=$COMMIT
 
+# curl for used by healthcheck
 RUN apt-get update \
     && apt-get install --no-install-recommends -y \
-    gosu \
-    tesseract-ocr-all \
+    curl \
     && apt-get autoremove \
     && rm -rf /var/lib/apt/lists/*
 
@@ -106,34 +110,33 @@ RUN apt-get update \
 COPY --from=builder-base $POETRY_HOME $POETRY_HOME
 COPY --from=builder-base $PYSETUP_PATH $PYSETUP_PATH
 
-ENV LD_LIBRARY_PATH=/usr/local/lib
-COPY --from=crfpp /usr/local/lib/ /usr/local/lib
-COPY --from=crfpp /usr/local/bin/crf_learn /usr/local/bin/crf_learn
-COPY --from=crfpp /usr/local/bin/crf_test /usr/local/bin/crf_test
+# copying caddy into image
+COPY --from=builder-base /usr/bin/caddy /usr/bin/caddy
 
 # copy backend
 COPY ./mealie $MEALIE_HOME/mealie
 COPY ./poetry.lock ./pyproject.toml $MEALIE_HOME/
 COPY ./gunicorn_conf.py $MEALIE_HOME
 
-# Alembic
-COPY ./alembic $MEALIE_HOME/alembic
-COPY ./alembic.ini $MEALIE_HOME/
+#! Future
+# COPY ./alembic ./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
 WORKDIR /
 
-# Grab CRF++ Model Release
-RUN python $MEALIE_HOME/mealie/scripts/install_model.py
+# copy frontend
+COPY --from=frontend-build /app/dist $MEALIE_HOME/dist
+COPY ./dev/data/templates $MEALIE_HOME/data/templates
+COPY ./Caddyfile $MEALIE_HOME
 
 VOLUME [ "$MEALIE_HOME/data/" ]
-ENV APP_PORT=9000
+ENV APP_PORT=80
 
 EXPOSE ${APP_PORT}
 
-HEALTHCHECK CMD python $MEALIE_HOME/mealie/scripts/healthcheck.py || exit 1
+HEALTHCHECK CMD curl -fs http://localhost:${APP_PORT} || exit 1
 
 RUN chmod +x $MEALIE_HOME/mealie/run.sh
 ENTRYPOINT $MEALIE_HOME/mealie/run.sh

LICENSE

@@ -1,661 +1,21 @@
-                    GNU AFFERO GENERAL PUBLIC LICENSE
-                       Version 3, 19 November 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The GNU Affero General Public License is a free, copyleft license for
-software and other kinds of works, specifically designed to ensure
-cooperation with the community in the case of network server software.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-our General Public Licenses are intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-  Developers that use our General Public Licenses protect your rights
-with two steps: (1) assert copyright on the software, and (2) offer
-you this License which gives you legal permission to copy, distribute
-and/or modify the software.
-
-  A secondary benefit of defending all users' freedom is that
-improvements made in alternate versions of the program, if they
-receive widespread use, become available for other developers to
-incorporate.  Many developers of free software are heartened and
-encouraged by the resulting cooperation.  However, in the case of
-software used on network servers, this result may fail to come about.
-The GNU General Public License permits making a modified version and
-letting the public access it on a server without ever releasing its
-source code to the public.
-
-  The GNU Affero General Public License is designed specifically to
-ensure that, in such cases, the modified source code becomes available
-to the community.  It requires the operator of a network server to
-provide the source code of the modified version running there to the
-users of that server.  Therefore, public use of a modified version, on
-a publicly accessible server, gives the public access to the source
-code of the modified version.
-
-  An older license, called the Affero General Public License and
-published by Affero, was designed to accomplish similar goals.  This is
-a different license, not a version of the Affero GPL, but Affero has
-released a new version of the Affero GPL which permits relicensing under
-this license.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU Affero General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-  A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-  6. Conveying Non-Source Forms.
-
-  You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-
-  A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-  A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-  "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-  If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-  7. Additional Terms.
-
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-  8. Termination.
-
-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-  9. Acceptance Not Required for Having Copies.
-
-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-  10. Automatic Licensing of Downstream Recipients.
-
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-  11. Patents.
-
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-  12. No Surrender of Others' Freedom.
-
-  If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-  13. Remote Network Interaction; Use with the GNU General Public License.
-
-  Notwithstanding any other provision of this License, if you modify the
-Program, your modified version must prominently offer all users
-interacting with it remotely through a computer network (if your version
-supports such interaction) an opportunity to receive the Corresponding
-Source of your version by providing access to the Corresponding Source
-from a network server at no charge, through some standard or customary
-means of facilitating copying of software.  This Corresponding Source
-shall include the Corresponding Source for any work covered by version 3
-of the GNU General Public License that is incorporated pursuant to the
-following paragraph.
-
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the work with which it is combined will remain governed by version
-3 of the GNU General Public License.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU Affero General Public License from time to time.  Such new versions
-will be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-  Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU Affero General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU Affero General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-  If the Program specifies that a proxy can decide which future
-versions of the GNU Affero General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-  15. Disclaimer of Warranty.
-
-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. Limitation of Liability.
-
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-  17. Interpretation of Sections 15 and 16.
-
-  If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
-
-    You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-  If your software can interact with users remotely through a computer
-network, you should also make sure that it provides a way for users to
-get its source.  For example, if your program is a web application, its
-interface could display a "Source" link that leads users to an archive
-of the code.  There are many ways you could offer source, and different
-solutions will be better for different programs; see section 13 for the
-specific requirements.
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU AGPL, see
-<https://www.gnu.org/licenses/>.
+MIT License
+
+Copyright (c) 2020, Hayden Kotelman
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

README.md

@@ -5,6 +5,10 @@
 [![MIT 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)
+[![Docker Build Production](https://github.com/hay-kot/mealie/actions/workflows/dockerbuild.release.yml/badge.svg)](https://github.com/hay-kot/mealie/actions/workflows/dockerbuild.release.yml)
+[![Project Tests Production](https://github.com/hay-kot/mealie/actions/workflows/test-all.yml/badge.svg)](https://github.com/hay-kot/mealie/actions/workflows/test-all.yml)
+[![Docker Build Dev](https://github.com/hay-kot/mealie/actions/workflows/dockerbuild.dev.yml/badge.svg?branch=dev)](https://github.com/hay-kot/mealie/actions/workflows/dockerbuild.dev.yml)
+[![Project Tests Dev](https://github.com/hay-kot/mealie/actions/workflows/test-all.yml/badge.svg?branch=dev)](https://github.com/hay-kot/mealie/actions/workflows/test-all.yml)
 
 <!-- PROJECT LOGO -->
 <br />
@@ -20,13 +24,19 @@
   <p align="center">
     A Place for All Your Recipes
     <br />
-    <a href="https://nightly.mealie.io"><strong>Explore the docs »</strong></a>
+    <a href="https://hay-kot.github.io/mealie/"><strong>Explore the docs »</strong></a>
   <a href="https://github.com/hay-kot/mealie">
   </a>
     <br />
-    <a href="https://demo.mealie.io/">View Demo</a>
+    <a href="https://mealie-demo.hay-kot.dev/">View Demo</a>
     ·
-    <a href="https://github.com/hay-kot/mealie/issues">Report Bug</a>
+    <a href="https://github.com/hay-kot/mealie/issues">Report Bug</a>    
+    ·
+    <a href="https://hay-kot.github.io/mealie/api/redoc/">API</a>
+    ·
+    <a href="https://github.com/hay-kot/mealie/issues">
+    Request Feature
+    </a>    
     ·
     <a href="https://hub.docker.com/r/hkotel/mealie"> Docker Hub
     </a>
@@ -35,25 +45,60 @@
 
 
 
-[![Product Name Screen Shot][product-screenshot]](https://docs.mealie.io)
+[![Product Name Screen Shot][product-screenshot]](https://example.com)
 
 # 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)
+[Remember to join the Discord](https://discord.gg/QuStdQGSGK)! 
+
+
+
+## Key Features
+- 🔍 Fuzzy search
+- 🏷️ Tag recipes with categories or tags for flexible sorting
+- 🕸 Import recipes from around the web by URL
+- 💪 Powerful bulk Category/Tag assignment
+- 📱 Beautiful Mobile Views
+- 📆 Create Meal Plans
+- 🛒 Generate shopping lists
+- 🐳 Easy setup with Docker
+- 🎨 Customize your interface with color themes 
+- 💾 Export all your data in any format with Jinja2 Templates
+- 🔒 Keep your data safe with automated backup and easy restore options
+- 🌍 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
+
+## 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. 
 
 
 <!-- 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 be learn, inspire, and create. Any contributions you make are **greatly appreciated**. Especially test. Literally any tests. See the [Contributors Guide](https://hay-kot.github.io/mealie/contributors/non-coders/) for help getting started.
 
-- 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!
-
-If you are not a coder, you can still contribute financially. Financial contributions help me prioritize working on this project over others and helps me know that there is a real demand for project development.
+If you are not a coder, you can still contribute financially. financial contributions help me prioritize working on this project over others and helps me know that there is a real demand for project development. 
 
 <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>
 
@@ -62,16 +107,9 @@ If you are not a coder, you can still contribute financially. Financial contribu
 Distributed under the MIT License. See `LICENSE` for more information.
 
 
-## Sponsors
-
-Huge thanks to all the sponsors of this project on [Github Sponsors](https://github.com/sponsors/hay-kot) and Buy Me a Coffee. Without you, this project would surely not be possible.
-
-Thanks to Linode for providing Hosting for the Demo, Beta, and Documentation sites! Another big thanks to JetBrains for providing their IDEs for development.
-
-<div align='center'>
-  <img height="100" src="docs/docs/assets/img/sponsors-linode.svg" />
-  <img height="100" src="docs/docs/assets/img/sponsors-jetbrains.png" />
-</div>
+<!-- CONTACT -->
+## Contact
+Project Link: [https://github.com/hay-kot/mealie](https://github.com/hay-kot/mealie)
 
 
 
@@ -87,7 +125,7 @@ Thanks to Linode for providing Hosting for the Demo, Beta, and Documentation sit
 [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
+[license-url]: https://github.com/hay-kot/mealie/blob/master/LICENSE.txt
 [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

SECURITY.md

@@ -1,9 +0,0 @@
-# Security Policy
-
-## Supported Versions
-
-Since this software is still considered beta/WIP support is always only given for the latest version. Security patches are only available for the latest version and not back-ported to older versions.
-
-## Reporting a Vulnerability
-
-For general security vulnerabilities you're welcome to open a GitHub issues or contribute a fix. If you feel the vulnerability should not be disclosed you can open a generic issue on GitHub and email to the details to [ob92oy0sl@mozmail.com](mailto:ob92oy0sl@mozmail.com) which is monitored by the maintainer.

alembic.ini

@@ -1,72 +0,0 @@
-# A generic, single database configuration.
-
-[alembic]
-# path to migration scripts
-script_location = alembic
-
-# template used to generate migration files
-file_template = %%(year)d-%%(month).2d-%%(day).2d-%%(hour).2d.%%(minute).2d.%%(second).2d_%%(rev)s_%%(slug)s
-
-# sys.path path, will be prepended to sys.path if present.
-# defaults to the current working directory.
-prepend_sys_path = .
-
-# timezone to use when rendering the date within the migration file
-# as well as the filename.
-# If specified, requires the python-dateutil library that can be
-# installed by adding `alembic[tz]` to the pip requirements
-# string value is passed to dateutil.tz.gettz()
-# leave blank for localtime
-# timezone =
-
-# max length of characters to apply to the
-# "slug" field
-# truncate_slug_length = 40
-
-# set to 'true' to run the environment during
-# the 'revision' command, regardless of autogenerate
-# revision_environment = false
-
-# set to 'true' to allow .pyc and .pyo files without
-# a source .py file to be detected as revisions in the
-# versions/ directory
-# sourceless = false
-
-# version location specification; This defaults
-# to alembic/versions.  When using multiple version
-# directories, initial revisions must be specified with --version-path.
-# The path separator used here should be the separator specified by "version_path_separator"
-# version_locations = %(here)s/bar:%(here)s/bat:alembic/versions
-
-# version path separator; As mentioned above, this is the character used to split
-# version_locations. Valid values are:
-#
-# version_path_separator = :
-# version_path_separator = ;
-# version_path_separator = space
-version_path_separator = os  # default: use os.pathsep
-
-# the output encoding used when revision files
-# are written from script.py.mako
-# output_encoding = utf-8
-
-# Will be replaced in alembic/env.py with the actual url
-sqlalchemy.url =
-
-
-[post_write_hooks]
-# post_write_hooks defines scripts or Python functions that are run
-# on newly generated revision scripts.  See the documentation for further
-# detail and examples
-
-hooks = isort, black
-
-# format using "isort" - use the console_scripts runner, against the "isort" entrypoint
-isort.type = console_scripts
-isort.entrypoint = isort
-isort.options = REVISION_SCRIPT_FILENAME
-
-# format using "black" - use the console_scripts runner, against the "black" entrypoint
-black.type = console_scripts
-black.entrypoint = black
-black.options = REVISION_SCRIPT_FILENAME

alembic/README

@@ -1 +0,0 @@
-Generic single-database configuration.

alembic/env.py

@@ -1,77 +0,0 @@
-from sqlalchemy import engine_from_config, pool
-
-import mealie.db.models._all_models  # noqa: F401
-from alembic import context
-from mealie.core.config import get_app_settings
-from mealie.db.models._model_base import SqlAlchemyBase
-
-# this is the Alembic Config object, which provides
-# access to the values within the .ini file in use.
-config = context.config
-
-# add your model's MetaData object here
-# for 'autogenerate' support
-# from myapp import mymodel
-# target_metadata = mymodel.Base.metadata
-target_metadata = SqlAlchemyBase.metadata
-
-# other values from the config, defined by the needs of env.py,
-# can be acquired:
-# my_important_option = config.get_main_option("my_important_option")
-# ... etc.
-
-# Set DB url from config
-settings = get_app_settings()
-config.set_main_option("sqlalchemy.url", settings.DB_URL)
-
-
-def run_migrations_offline():
-    """Run migrations in 'offline' mode.
-
-    This configures the context with just a URL
-    and not an Engine, though an Engine is acceptable
-    here as well.  By skipping the Engine creation
-    we don't even need a DBAPI to be available.
-
-    Calls to context.execute() here emit the given string to the
-    script output.
-
-    """
-    url = config.get_main_option("sqlalchemy.url")
-    context.configure(
-        url=url,
-        target_metadata=target_metadata,
-        literal_binds=True,
-        dialect_opts={"paramstyle": "named"},
-    )
-
-    with context.begin_transaction():
-        context.run_migrations()
-
-
-def run_migrations_online():
-    """Run migrations in 'online' mode.
-
-    In this scenario we need to create an Engine
-    and associate a connection with the context.
-
-    """
-    connectable = engine_from_config(
-        config.get_section(config.config_ini_section),
-        prefix="sqlalchemy.",
-        poolclass=pool.NullPool,
-    )
-
-    with connectable.connect() as connection:
-        context.configure(
-            connection=connection, target_metadata=target_metadata, user_module_prefix="mealie.db.migration_types."
-        )
-
-        with context.begin_transaction():
-            context.run_migrations()
-
-
-if context.is_offline_mode():
-    run_migrations_offline()
-else:
-    run_migrations_online()

alembic/script.py.mako

@@ -1,26 +0,0 @@
-"""${message}
-
-Revision ID: ${up_revision}
-Revises: ${down_revision | comma,n}
-Create Date: ${create_date}
-
-"""
-import sqlalchemy as sa
-
-import mealie.db.migration_types
-from alembic import op
-${imports if imports else ""}
-
-# revision identifiers, used by Alembic.
-revision = ${repr(up_revision)}
-down_revision = ${repr(down_revision)}
-branch_labels = ${repr(branch_labels)}
-depends_on = ${repr(depends_on)}
-
-
-def upgrade():
-    ${upgrades if upgrades else "pass"}
-
-
-def downgrade():
-    ${downgrades if downgrades else "pass"}

alembic/versions/2022-02-21-19.56.24_6b0f5f32d602_initial_tables.py

@@ -1,920 +0,0 @@
-"""Initial tables
-
-Revision ID: 6b0f5f32d602
-Revises: 
-Create Date: 2022-02-21 19:56:24.351115
-
-"""
-import sqlalchemy as sa
-from sqlalchemy import engine_from_config
-
-import mealie.db.migration_types
-from alembic import op
-
-# revision identifiers, used by Alembic.
-revision = "6b0f5f32d602"
-down_revision = None
-branch_labels = None
-depends_on = None
-
-
-# Adapted from https://improveandrepeat.com/2021/09/python-friday-87-handling-pre-existing-tables-with-alembic-and-sqlalchemy/
-def table_exists(table, schema=None):
-    config = op.get_context().config
-    engine = engine_from_config(config.get_section(config.config_ini_section), prefix="sqlalchemy.")
-    insp = sa.inspect(engine)
-    return insp.has_table(table, schema)
-
-
-def upgrade():
-    # Only create initial tables if they don't exist yet, to ease transition from pre-alembic state
-    if table_exists("users"):
-        return
-
-    op.create_table(
-        "groups",
-        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("name", sa.String(), nullable=False),
-        sa.PrimaryKeyConstraint("id"),
-    )
-    op.create_index(op.f("ix_groups_name"), "groups", ["name"], unique=True)
-    op.create_table(
-        "categories",
-        sa.Column("created_at", sa.DateTime(), nullable=True),
-        sa.Column("update_at", sa.DateTime(), nullable=True),
-        sa.Column("group_id", mealie.db.migration_types.GUID(), nullable=False),
-        sa.Column("id", mealie.db.migration_types.GUID(), nullable=False),
-        sa.Column("name", sa.String(), nullable=False),
-        sa.Column("slug", sa.String(), nullable=False),
-        sa.ForeignKeyConstraint(
-            ["group_id"],
-            ["groups.id"],
-        ),
-        sa.PrimaryKeyConstraint("id"),
-        sa.UniqueConstraint("slug", "group_id", name="category_slug_group_id_key"),
-    )
-    op.create_index(op.f("ix_categories_group_id"), "categories", ["group_id"], unique=False)
-    op.create_index(op.f("ix_categories_name"), "categories", ["name"], unique=False)
-    op.create_index(op.f("ix_categories_slug"), "categories", ["slug"], unique=False)
-    op.create_table(
-        "cookbooks",
-        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("position", sa.Integer(), nullable=False),
-        sa.Column("name", sa.String(), nullable=False),
-        sa.Column("slug", sa.String(), nullable=False),
-        sa.Column("description", sa.String(), nullable=True),
-        sa.Column("group_id", mealie.db.migration_types.GUID(), nullable=True),
-        sa.ForeignKeyConstraint(
-            ["group_id"],
-            ["groups.id"],
-        ),
-        sa.PrimaryKeyConstraint("id"),
-    )
-    op.create_table(
-        "group_data_exports",
-        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("group_id", mealie.db.migration_types.GUID(), nullable=True),
-        sa.Column("name", sa.String(), nullable=False),
-        sa.Column("filename", sa.String(), nullable=False),
-        sa.Column("path", sa.String(), nullable=False),
-        sa.Column("size", sa.String(), nullable=False),
-        sa.Column("expires", sa.String(), nullable=False),
-        sa.ForeignKeyConstraint(
-            ["group_id"],
-            ["groups.id"],
-        ),
-        sa.PrimaryKeyConstraint("id"),
-    )
-    op.create_index(op.f("ix_group_data_exports_group_id"), "group_data_exports", ["group_id"], unique=False)
-    op.create_table(
-        "group_events_notifiers",
-        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("name", sa.String(), nullable=False),
-        sa.Column("enabled", sa.Boolean(), nullable=False),
-        sa.Column("apprise_url", sa.String(), nullable=False),
-        sa.Column("group_id", mealie.db.migration_types.GUID(), nullable=True),
-        sa.ForeignKeyConstraint(
-            ["group_id"],
-            ["groups.id"],
-        ),
-        sa.PrimaryKeyConstraint("id"),
-    )
-    op.create_index(op.f("ix_group_events_notifiers_group_id"), "group_events_notifiers", ["group_id"], unique=False)
-    op.create_table(
-        "group_meal_plan_rules",
-        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("group_id", mealie.db.migration_types.GUID(), nullable=False),
-        sa.Column("day", sa.String(), nullable=False),
-        sa.Column("entry_type", sa.String(), nullable=False),
-        sa.ForeignKeyConstraint(
-            ["group_id"],
-            ["groups.id"],
-        ),
-        sa.PrimaryKeyConstraint("id"),
-    )
-    op.create_table(
-        "group_preferences",
-        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("group_id", mealie.db.migration_types.GUID(), nullable=False),
-        sa.Column("private_group", sa.Boolean(), nullable=True),
-        sa.Column("first_day_of_week", sa.Integer(), nullable=True),
-        sa.Column("recipe_public", sa.Boolean(), nullable=True),
-        sa.Column("recipe_show_nutrition", sa.Boolean(), nullable=True),
-        sa.Column("recipe_show_assets", sa.Boolean(), nullable=True),
-        sa.Column("recipe_landscape_view", sa.Boolean(), nullable=True),
-        sa.Column("recipe_disable_comments", sa.Boolean(), nullable=True),
-        sa.Column("recipe_disable_amount", sa.Boolean(), nullable=True),
-        sa.ForeignKeyConstraint(
-            ["group_id"],
-            ["groups.id"],
-        ),
-        sa.PrimaryKeyConstraint("id"),
-    )
-    op.create_index(op.f("ix_group_preferences_group_id"), "group_preferences", ["group_id"], unique=False)
-    op.create_table(
-        "group_reports",
-        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("name", sa.String(), nullable=False),
-        sa.Column("status", sa.String(), nullable=False),
-        sa.Column("category", sa.String(), nullable=False),
-        sa.Column("timestamp", sa.DateTime(), nullable=False),
-        sa.Column("group_id", mealie.db.migration_types.GUID(), nullable=False),
-        sa.ForeignKeyConstraint(
-            ["group_id"],
-            ["groups.id"],
-        ),
-        sa.PrimaryKeyConstraint("id"),
-    )
-    op.create_index(op.f("ix_group_reports_category"), "group_reports", ["category"], unique=False)
-    op.create_index(op.f("ix_group_reports_group_id"), "group_reports", ["group_id"], unique=False)
-    op.create_table(
-        "ingredient_units",
-        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("group_id", mealie.db.migration_types.GUID(), nullable=False),
-        sa.Column("name", sa.String(), nullable=True),
-        sa.Column("description", sa.String(), nullable=True),
-        sa.Column("abbreviation", sa.String(), nullable=True),
-        sa.Column("fraction", sa.Boolean(), nullable=True),
-        sa.ForeignKeyConstraint(
-            ["group_id"],
-            ["groups.id"],
-        ),
-        sa.PrimaryKeyConstraint("id"),
-    )
-    op.create_table(
-        "invite_tokens",
-        sa.Column("id", sa.Integer(), nullable=False),
-        sa.Column("created_at", sa.DateTime(), nullable=True),
-        sa.Column("update_at", sa.DateTime(), nullable=True),
-        sa.Column("token", sa.String(), nullable=False),
-        sa.Column("uses_left", sa.Integer(), nullable=False),
-        sa.Column("group_id", mealie.db.migration_types.GUID(), nullable=True),
-        sa.ForeignKeyConstraint(
-            ["group_id"],
-            ["groups.id"],
-        ),
-        sa.PrimaryKeyConstraint("id"),
-    )
-    op.create_index(op.f("ix_invite_tokens_token"), "invite_tokens", ["token"], unique=True)
-    op.create_table(
-        "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("name", sa.String(length=255), nullable=False),
-        sa.Column("color", sa.String(length=10), nullable=False),
-        sa.Column("group_id", mealie.db.migration_types.GUID(), nullable=False),
-        sa.ForeignKeyConstraint(
-            ["group_id"],
-            ["groups.id"],
-        ),
-        sa.PrimaryKeyConstraint("id"),
-    )
-    op.create_index(op.f("ix_multi_purpose_labels_group_id"), "multi_purpose_labels", ["group_id"], unique=False)
-    op.create_table(
-        "recipes",
-        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("slug", sa.String(), nullable=True),
-        sa.Column("group_id", mealie.db.migration_types.GUID(), nullable=False),
-        sa.Column("user_id", mealie.db.migration_types.GUID(), nullable=True),
-        sa.Column("name", sa.String(), nullable=False),
-        sa.Column("description", sa.String(), nullable=True),
-        sa.Column("image", sa.String(), nullable=True),
-        sa.Column("total_time", sa.String(), nullable=True),
-        sa.Column("prep_time", sa.String(), nullable=True),
-        sa.Column("perform_time", sa.String(), nullable=True),
-        sa.Column("cook_time", sa.String(), nullable=True),
-        sa.Column("recipe_yield", sa.String(), nullable=True),
-        sa.Column("recipeCuisine", sa.String(), nullable=True),
-        sa.Column("rating", sa.Integer(), nullable=True),
-        sa.Column("org_url", sa.String(), nullable=True),
-        sa.Column("date_added", sa.Date(), nullable=True),
-        sa.Column("date_updated", sa.DateTime(), nullable=True),
-        sa.ForeignKeyConstraint(
-            ["group_id"],
-            ["groups.id"],
-        ),
-        sa.ForeignKeyConstraint(["user_id"], ["users.id"], use_alter=True),
-        sa.PrimaryKeyConstraint("id"),
-        sa.UniqueConstraint("slug", "group_id", name="recipe_slug_group_id_key"),
-    )
-    op.create_index(op.f("ix_recipes_group_id"), "recipes", ["group_id"], unique=False)
-    op.create_index(op.f("ix_recipes_slug"), "recipes", ["slug"], unique=False)
-    op.create_index(op.f("ix_recipes_user_id"), "recipes", ["user_id"], unique=False)
-    op.create_table(
-        "server_tasks",
-        sa.Column("id", sa.Integer(), nullable=False),
-        sa.Column("created_at", sa.DateTime(), nullable=True),
-        sa.Column("update_at", sa.DateTime(), nullable=True),
-        sa.Column("name", sa.String(), nullable=False),
-        sa.Column("completed_date", sa.DateTime(), nullable=True),
-        sa.Column("status", sa.String(), nullable=False),
-        sa.Column("log", sa.String(), nullable=True),
-        sa.Column("group_id", mealie.db.migration_types.GUID(), nullable=False),
-        sa.ForeignKeyConstraint(
-            ["group_id"],
-            ["groups.id"],
-        ),
-        sa.PrimaryKeyConstraint("id"),
-    )
-    op.create_index(op.f("ix_server_tasks_group_id"), "server_tasks", ["group_id"], unique=False)
-    op.create_table(
-        "shopping_lists",
-        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("group_id", mealie.db.migration_types.GUID(), nullable=False),
-        sa.Column("name", sa.String(), nullable=True),
-        sa.ForeignKeyConstraint(
-            ["group_id"],
-            ["groups.id"],
-        ),
-        sa.PrimaryKeyConstraint("id"),
-    )
-    op.create_index(op.f("ix_shopping_lists_group_id"), "shopping_lists", ["group_id"], unique=False)
-    op.create_table(
-        "tags",
-        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("group_id", mealie.db.migration_types.GUID(), nullable=False),
-        sa.Column("name", sa.String(), nullable=False),
-        sa.Column("slug", sa.String(), nullable=False),
-        sa.ForeignKeyConstraint(
-            ["group_id"],
-            ["groups.id"],
-        ),
-        sa.PrimaryKeyConstraint("id"),
-        sa.UniqueConstraint("slug", "group_id", name="tags_slug_group_id_key"),
-    )
-    op.create_index(op.f("ix_tags_group_id"), "tags", ["group_id"], unique=False)
-    op.create_index(op.f("ix_tags_name"), "tags", ["name"], unique=False)
-    op.create_index(op.f("ix_tags_slug"), "tags", ["slug"], unique=False)
-    op.create_table(
-        "tools",
-        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("group_id", mealie.db.migration_types.GUID(), nullable=False),
-        sa.Column("name", sa.String(), nullable=False),
-        sa.Column("slug", sa.String(), nullable=False),
-        sa.Column("on_hand", sa.Boolean(), nullable=True),
-        sa.ForeignKeyConstraint(
-            ["group_id"],
-            ["groups.id"],
-        ),
-        sa.PrimaryKeyConstraint("id"),
-        sa.UniqueConstraint("slug", "group_id", name="tools_slug_group_id_key"),
-    )
-    op.create_index(op.f("ix_tools_name"), "tools", ["name"], unique=True)
-    op.create_index(op.f("ix_tools_slug"), "tools", ["slug"], unique=True)
-    op.create_table(
-        "webhook_urls",
-        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("group_id", mealie.db.migration_types.GUID(), nullable=True),
-        sa.Column("enabled", sa.Boolean(), nullable=True),
-        sa.Column("name", sa.String(), nullable=True),
-        sa.Column("url", sa.String(), nullable=True),
-        sa.Column("time", sa.String(), nullable=True),
-        sa.ForeignKeyConstraint(
-            ["group_id"],
-            ["groups.id"],
-        ),
-        sa.PrimaryKeyConstraint("id"),
-    )
-    op.create_index(op.f("ix_webhook_urls_group_id"), "webhook_urls", ["group_id"], unique=False)
-    op.create_table(
-        "api_extras",
-        sa.Column("created_at", sa.DateTime(), nullable=True),
-        sa.Column("update_at", sa.DateTime(), nullable=True),
-        sa.Column("id", sa.Integer(), nullable=False),
-        sa.Column("recipee_id", mealie.db.migration_types.GUID(), nullable=True),
-        sa.Column("key_name", sa.String(), nullable=True),
-        sa.Column("value", sa.String(), nullable=True),
-        sa.ForeignKeyConstraint(
-            ["recipee_id"],
-            ["recipes.id"],
-        ),
-        sa.PrimaryKeyConstraint("id"),
-    )
-    op.create_table(
-        "cookbooks_to_categories",
-        sa.Column("cookbook_id", mealie.db.migration_types.GUID(), nullable=True),
-        sa.Column("category_id", mealie.db.migration_types.GUID(), nullable=True),
-        sa.ForeignKeyConstraint(
-            ["category_id"],
-            ["categories.id"],
-        ),
-        sa.ForeignKeyConstraint(
-            ["cookbook_id"],
-            ["cookbooks.id"],
-        ),
-    )
-    op.create_table(
-        "group_events_notifier_options",
-        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("event_notifier_id", mealie.db.migration_types.GUID(), nullable=False),
-        sa.Column("recipe_created", sa.Boolean(), nullable=False),
-        sa.Column("recipe_updated", sa.Boolean(), nullable=False),
-        sa.Column("recipe_deleted", sa.Boolean(), nullable=False),
-        sa.Column("user_signup", sa.Boolean(), nullable=False),
-        sa.Column("data_migrations", sa.Boolean(), nullable=False),
-        sa.Column("data_export", sa.Boolean(), nullable=False),
-        sa.Column("data_import", sa.Boolean(), nullable=False),
-        sa.Column("mealplan_entry_created", sa.Boolean(), nullable=False),
-        sa.Column("shopping_list_created", sa.Boolean(), nullable=False),
-        sa.Column("shopping_list_updated", sa.Boolean(), nullable=False),
-        sa.Column("shopping_list_deleted", sa.Boolean(), nullable=False),
-        sa.Column("cookbook_created", sa.Boolean(), nullable=False),
-        sa.Column("cookbook_updated", sa.Boolean(), nullable=False),
-        sa.Column("cookbook_deleted", sa.Boolean(), nullable=False),
-        sa.Column("tag_created", sa.Boolean(), nullable=False),
-        sa.Column("tag_updated", sa.Boolean(), nullable=False),
-        sa.Column("tag_deleted", sa.Boolean(), nullable=False),
-        sa.Column("category_created", sa.Boolean(), nullable=False),
-        sa.Column("category_updated", sa.Boolean(), nullable=False),
-        sa.Column("category_deleted", sa.Boolean(), nullable=False),
-        sa.ForeignKeyConstraint(
-            ["event_notifier_id"],
-            ["group_events_notifiers.id"],
-        ),
-        sa.PrimaryKeyConstraint("id"),
-    )
-    op.create_table(
-        "group_meal_plans",
-        sa.Column("id", sa.Integer(), nullable=False),
-        sa.Column("created_at", sa.DateTime(), nullable=True),
-        sa.Column("update_at", sa.DateTime(), nullable=True),
-        sa.Column("date", sa.Date(), nullable=False),
-        sa.Column("entry_type", sa.String(), nullable=False),
-        sa.Column("title", sa.String(), nullable=False),
-        sa.Column("text", sa.String(), nullable=False),
-        sa.Column("group_id", mealie.db.migration_types.GUID(), nullable=True),
-        sa.Column("recipe_id", mealie.db.migration_types.GUID(), nullable=True),
-        sa.ForeignKeyConstraint(
-            ["group_id"],
-            ["groups.id"],
-        ),
-        sa.ForeignKeyConstraint(
-            ["recipe_id"],
-            ["recipes.id"],
-        ),
-        sa.PrimaryKeyConstraint("id"),
-    )
-    op.create_index(op.f("ix_group_meal_plans_date"), "group_meal_plans", ["date"], unique=False)
-    op.create_index(op.f("ix_group_meal_plans_entry_type"), "group_meal_plans", ["entry_type"], unique=False)
-    op.create_index(op.f("ix_group_meal_plans_group_id"), "group_meal_plans", ["group_id"], unique=False)
-    op.create_index(op.f("ix_group_meal_plans_recipe_id"), "group_meal_plans", ["recipe_id"], unique=False)
-    op.create_index(op.f("ix_group_meal_plans_title"), "group_meal_plans", ["title"], unique=False)
-    op.create_table(
-        "group_to_categories",
-        sa.Column("group_id", mealie.db.migration_types.GUID(), nullable=True),
-        sa.Column("category_id", mealie.db.migration_types.GUID(), nullable=True),
-        sa.ForeignKeyConstraint(
-            ["category_id"],
-            ["categories.id"],
-        ),
-        sa.ForeignKeyConstraint(
-            ["group_id"],
-            ["groups.id"],
-        ),
-    )
-    op.create_table(
-        "ingredient_foods",
-        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("group_id", mealie.db.migration_types.GUID(), nullable=False),
-        sa.Column("name", sa.String(), nullable=True),
-        sa.Column("description", sa.String(), nullable=True),
-        sa.Column("label_id", mealie.db.migration_types.GUID(), nullable=True),
-        sa.ForeignKeyConstraint(
-            ["group_id"],
-            ["groups.id"],
-        ),
-        sa.ForeignKeyConstraint(
-            ["label_id"],
-            ["multi_purpose_labels.id"],
-        ),
-        sa.PrimaryKeyConstraint("id"),
-    )
-    op.create_table(
-        "notes",
-        sa.Column("created_at", sa.DateTime(), nullable=True),
-        sa.Column("update_at", sa.DateTime(), nullable=True),
-        sa.Column("id", sa.Integer(), nullable=False),
-        sa.Column("recipe_id", mealie.db.migration_types.GUID(), nullable=True),
-        sa.Column("title", sa.String(), nullable=True),
-        sa.Column("text", sa.String(), nullable=True),
-        sa.ForeignKeyConstraint(
-            ["recipe_id"],
-            ["recipes.id"],
-        ),
-        sa.PrimaryKeyConstraint("id"),
-    )
-    op.create_table(
-        "plan_rules_to_categories",
-        sa.Column("group_plan_rule_id", mealie.db.migration_types.GUID(), nullable=True),
-        sa.Column("category_id", mealie.db.migration_types.GUID(), nullable=True),
-        sa.ForeignKeyConstraint(
-            ["category_id"],
-            ["categories.id"],
-        ),
-        sa.ForeignKeyConstraint(
-            ["group_plan_rule_id"],
-            ["group_meal_plan_rules.id"],
-        ),
-    )
-    op.create_table(
-        "plan_rules_to_tags",
-        sa.Column("plan_rule_id", mealie.db.migration_types.GUID(), nullable=True),
-        sa.Column("tag_id", mealie.db.migration_types.GUID(), nullable=True),
-        sa.ForeignKeyConstraint(
-            ["plan_rule_id"],
-            ["group_meal_plan_rules.id"],
-        ),
-        sa.ForeignKeyConstraint(
-            ["tag_id"],
-            ["tags.id"],
-        ),
-    )
-    op.create_table(
-        "recipe_assets",
-        sa.Column("created_at", sa.DateTime(), nullable=True),
-        sa.Column("update_at", sa.DateTime(), nullable=True),
-        sa.Column("id", sa.Integer(), nullable=False),
-        sa.Column("recipe_id", mealie.db.migration_types.GUID(), nullable=True),
-        sa.Column("name", sa.String(), nullable=True),
-        sa.Column("icon", sa.String(), nullable=True),
-        sa.Column("file_name", sa.String(), nullable=True),
-        sa.ForeignKeyConstraint(
-            ["recipe_id"],
-            ["recipes.id"],
-        ),
-        sa.PrimaryKeyConstraint("id"),
-    )
-    op.create_table(
-        "recipe_instructions",
-        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=True),
-        sa.Column("position", sa.Integer(), nullable=True),
-        sa.Column("type", sa.String(), nullable=True),
-        sa.Column("title", sa.String(), nullable=True),
-        sa.Column("text", sa.String(), nullable=True),
-        sa.ForeignKeyConstraint(
-            ["recipe_id"],
-            ["recipes.id"],
-        ),
-        sa.PrimaryKeyConstraint("id"),
-    )
-    op.create_table(
-        "recipe_nutrition",
-        sa.Column("created_at", sa.DateTime(), nullable=True),
-        sa.Column("update_at", sa.DateTime(), nullable=True),
-        sa.Column("id", sa.Integer(), nullable=False),
-        sa.Column("recipe_id", mealie.db.migration_types.GUID(), nullable=True),
-        sa.Column("calories", sa.String(), nullable=True),
-        sa.Column("fat_content", sa.String(), nullable=True),
-        sa.Column("fiber_content", sa.String(), nullable=True),
-        sa.Column("protein_content", sa.String(), nullable=True),
-        sa.Column("carbohydrate_content", sa.String(), nullable=True),
-        sa.Column("sodium_content", sa.String(), nullable=True),
-        sa.Column("sugar_content", sa.String(), nullable=True),
-        sa.ForeignKeyConstraint(
-            ["recipe_id"],
-            ["recipes.id"],
-        ),
-        sa.PrimaryKeyConstraint("id"),
-    )
-    op.create_table(
-        "recipe_settings",
-        sa.Column("created_at", sa.DateTime(), nullable=True),
-        sa.Column("update_at", sa.DateTime(), nullable=True),
-        sa.Column("id", sa.Integer(), nullable=False),
-        sa.Column("recipe_id", mealie.db.migration_types.GUID(), nullable=True),
-        sa.Column("public", sa.Boolean(), nullable=True),
-        sa.Column("show_nutrition", sa.Boolean(), nullable=True),
-        sa.Column("show_assets", sa.Boolean(), nullable=True),
-        sa.Column("landscape_view", sa.Boolean(), nullable=True),
-        sa.Column("disable_amount", sa.Boolean(), nullable=True),
-        sa.Column("disable_comments", sa.Boolean(), nullable=True),
-        sa.Column("locked", sa.Boolean(), nullable=True),
-        sa.ForeignKeyConstraint(
-            ["recipe_id"],
-            ["recipes.id"],
-        ),
-        sa.PrimaryKeyConstraint("id"),
-    )
-    op.create_table(
-        "recipe_share_tokens",
-        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("group_id", mealie.db.migration_types.GUID(), nullable=False),
-        sa.Column("recipe_id", mealie.db.migration_types.GUID(), nullable=False),
-        sa.Column("expires_at", sa.DateTime(), nullable=False),
-        sa.ForeignKeyConstraint(
-            ["group_id"],
-            ["groups.id"],
-        ),
-        sa.ForeignKeyConstraint(
-            ["recipe_id"],
-            ["recipes.id"],
-        ),
-        sa.PrimaryKeyConstraint("id"),
-    )
-    op.create_index(op.f("ix_recipe_share_tokens_group_id"), "recipe_share_tokens", ["group_id"], unique=False)
-    op.create_table(
-        "recipes_to_categories",
-        sa.Column("recipe_id", mealie.db.migration_types.GUID(), nullable=True),
-        sa.Column("category_id", mealie.db.migration_types.GUID(), nullable=True),
-        sa.ForeignKeyConstraint(
-            ["category_id"],
-            ["categories.id"],
-        ),
-        sa.ForeignKeyConstraint(
-            ["recipe_id"],
-            ["recipes.id"],
-        ),
-    )
-    op.create_table(
-        "recipes_to_tags",
-        sa.Column("recipe_id", mealie.db.migration_types.GUID(), nullable=True),
-        sa.Column("tag_id", mealie.db.migration_types.GUID(), nullable=True),
-        sa.ForeignKeyConstraint(
-            ["recipe_id"],
-            ["recipes.id"],
-        ),
-        sa.ForeignKeyConstraint(
-            ["tag_id"],
-            ["tags.id"],
-        ),
-    )
-    op.create_table(
-        "recipes_to_tools",
-        sa.Column("recipe_id", mealie.db.migration_types.GUID(), nullable=True),
-        sa.Column("tool_id", mealie.db.migration_types.GUID(), nullable=True),
-        sa.ForeignKeyConstraint(
-            ["recipe_id"],
-            ["recipes.id"],
-        ),
-        sa.ForeignKeyConstraint(
-            ["tool_id"],
-            ["tools.id"],
-        ),
-    )
-    op.create_table(
-        "report_entries",
-        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("success", sa.Boolean(), nullable=True),
-        sa.Column("message", sa.String(), nullable=True),
-        sa.Column("exception", sa.String(), nullable=True),
-        sa.Column("timestamp", sa.DateTime(), nullable=False),
-        sa.Column("report_id", mealie.db.migration_types.GUID(), nullable=False),
-        sa.ForeignKeyConstraint(
-            ["report_id"],
-            ["group_reports.id"],
-        ),
-        sa.PrimaryKeyConstraint("id"),
-    )
-    op.create_table(
-        "shopping_list_recipe_reference",
-        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("recipe_id", mealie.db.migration_types.GUID(), nullable=True),
-        sa.Column("recipe_quantity", sa.Float(), nullable=False),
-        sa.ForeignKeyConstraint(
-            ["recipe_id"],
-            ["recipes.id"],
-        ),
-        sa.ForeignKeyConstraint(
-            ["shopping_list_id"],
-            ["shopping_lists.id"],
-        ),
-        sa.PrimaryKeyConstraint("id", "shopping_list_id"),
-    )
-    op.create_index(
-        op.f("ix_shopping_list_recipe_reference_recipe_id"),
-        "shopping_list_recipe_reference",
-        ["recipe_id"],
-        unique=False,
-    )
-    op.create_table(
-        "users",
-        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("full_name", sa.String(), nullable=True),
-        sa.Column("username", sa.String(), nullable=True),
-        sa.Column("email", sa.String(), nullable=True),
-        sa.Column("password", sa.String(), nullable=True),
-        sa.Column("admin", sa.Boolean(), nullable=True),
-        sa.Column("advanced", sa.Boolean(), nullable=True),
-        sa.Column("group_id", mealie.db.migration_types.GUID(), nullable=False),
-        sa.Column("cache_key", sa.String(), nullable=True),
-        sa.Column("can_manage", sa.Boolean(), nullable=True),
-        sa.Column("can_invite", sa.Boolean(), nullable=True),
-        sa.Column("can_organize", sa.Boolean(), nullable=True),
-        sa.Column("owned_recipes_id", mealie.db.migration_types.GUID(), nullable=True),
-        sa.ForeignKeyConstraint(
-            ["group_id"],
-            ["groups.id"],
-        ),
-        sa.ForeignKeyConstraint(
-            ["owned_recipes_id"],
-            ["recipes.id"],
-        ),
-        sa.PrimaryKeyConstraint("id"),
-    )
-    op.create_index(op.f("ix_users_email"), "users", ["email"], unique=True)
-    op.create_index(op.f("ix_users_full_name"), "users", ["full_name"], unique=False)
-    op.create_index(op.f("ix_users_group_id"), "users", ["group_id"], unique=False)
-    op.create_index(op.f("ix_users_username"), "users", ["username"], unique=True)
-    op.create_table(
-        "long_live_tokens",
-        sa.Column("id", sa.Integer(), nullable=False),
-        sa.Column("created_at", sa.DateTime(), nullable=True),
-        sa.Column("update_at", sa.DateTime(), nullable=True),
-        sa.Column("name", sa.String(), nullable=False),
-        sa.Column("token", sa.String(), nullable=False),
-        sa.Column("user_id", mealie.db.migration_types.GUID(), nullable=True),
-        sa.ForeignKeyConstraint(
-            ["user_id"],
-            ["users.id"],
-        ),
-        sa.PrimaryKeyConstraint("id"),
-    )
-    op.create_table(
-        "password_reset_tokens",
-        sa.Column("id", sa.Integer(), nullable=False),
-        sa.Column("created_at", sa.DateTime(), nullable=True),
-        sa.Column("update_at", sa.DateTime(), nullable=True),
-        sa.Column("user_id", mealie.db.migration_types.GUID(), nullable=False),
-        sa.Column("token", sa.String(length=64), nullable=False),
-        sa.ForeignKeyConstraint(
-            ["user_id"],
-            ["users.id"],
-        ),
-        sa.PrimaryKeyConstraint("id"),
-        sa.UniqueConstraint("token"),
-    )
-    op.create_table(
-        "recipe_comments",
-        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("text", sa.String(), nullable=True),
-        sa.Column("recipe_id", mealie.db.migration_types.GUID(), nullable=False),
-        sa.Column("user_id", mealie.db.migration_types.GUID(), nullable=False),
-        sa.ForeignKeyConstraint(
-            ["recipe_id"],
-            ["recipes.id"],
-        ),
-        sa.ForeignKeyConstraint(
-            ["user_id"],
-            ["users.id"],
-        ),
-        sa.PrimaryKeyConstraint("id"),
-    )
-    op.create_table(
-        "recipe_ingredient_ref_link",
-        sa.Column("id", sa.Integer(), nullable=False),
-        sa.Column("created_at", sa.DateTime(), nullable=True),
-        sa.Column("update_at", sa.DateTime(), nullable=True),
-        sa.Column("instruction_id", mealie.db.migration_types.GUID(), nullable=True),
-        sa.Column("reference_id", mealie.db.migration_types.GUID(), nullable=True),
-        sa.ForeignKeyConstraint(
-            ["instruction_id"],
-            ["recipe_instructions.id"],
-        ),
-        sa.PrimaryKeyConstraint("id"),
-    )
-    op.create_table(
-        "recipes_ingredients",
-        sa.Column("created_at", sa.DateTime(), nullable=True),
-        sa.Column("update_at", sa.DateTime(), nullable=True),
-        sa.Column("id", sa.Integer(), nullable=False),
-        sa.Column("position", sa.Integer(), nullable=True),
-        sa.Column("recipe_id", mealie.db.migration_types.GUID(), nullable=True),
-        sa.Column("title", sa.String(), nullable=True),
-        sa.Column("note", sa.String(), nullable=True),
-        sa.Column("unit_id", mealie.db.migration_types.GUID(), nullable=True),
-        sa.Column("food_id", mealie.db.migration_types.GUID(), nullable=True),
-        sa.Column("quantity", sa.Integer(), nullable=True),
-        sa.Column("reference_id", mealie.db.migration_types.GUID(), nullable=True),
-        sa.ForeignKeyConstraint(
-            ["food_id"],
-            ["ingredient_foods.id"],
-        ),
-        sa.ForeignKeyConstraint(
-            ["recipe_id"],
-            ["recipes.id"],
-        ),
-        sa.ForeignKeyConstraint(
-            ["unit_id"],
-            ["ingredient_units.id"],
-        ),
-        sa.PrimaryKeyConstraint("id"),
-    )
-    op.create_table(
-        "shopping_list_items",
-        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=True),
-        sa.Column("is_ingredient", sa.Boolean(), nullable=True),
-        sa.Column("position", sa.Integer(), nullable=False),
-        sa.Column("checked", sa.Boolean(), nullable=True),
-        sa.Column("quantity", sa.Float(), nullable=True),
-        sa.Column("note", sa.String(), nullable=True),
-        sa.Column("is_food", sa.Boolean(), nullable=True),
-        sa.Column("unit_id", mealie.db.migration_types.GUID(), nullable=True),
-        sa.Column("food_id", mealie.db.migration_types.GUID(), nullable=True),
-        sa.Column("label_id", mealie.db.migration_types.GUID(), nullable=True),
-        sa.ForeignKeyConstraint(
-            ["food_id"],
-            ["ingredient_foods.id"],
-        ),
-        sa.ForeignKeyConstraint(
-            ["label_id"],
-            ["multi_purpose_labels.id"],
-        ),
-        sa.ForeignKeyConstraint(
-            ["shopping_list_id"],
-            ["shopping_lists.id"],
-        ),
-        sa.ForeignKeyConstraint(
-            ["unit_id"],
-            ["ingredient_units.id"],
-        ),
-        sa.PrimaryKeyConstraint("id"),
-    )
-    op.create_table(
-        "users_to_favorites",
-        sa.Column("user_id", mealie.db.migration_types.GUID(), nullable=True),
-        sa.Column("recipe_id", mealie.db.migration_types.GUID(), nullable=True),
-        sa.ForeignKeyConstraint(
-            ["recipe_id"],
-            ["recipes.id"],
-        ),
-        sa.ForeignKeyConstraint(
-            ["user_id"],
-            ["users.id"],
-        ),
-    )
-    op.create_table(
-        "shopping_list_item_recipe_reference",
-        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_item_id", mealie.db.migration_types.GUID(), nullable=False),
-        sa.Column("recipe_id", mealie.db.migration_types.GUID(), nullable=True),
-        sa.Column("recipe_quantity", sa.Float(), nullable=False),
-        sa.ForeignKeyConstraint(
-            ["recipe_id"],
-            ["recipes.id"],
-        ),
-        sa.ForeignKeyConstraint(
-            ["shopping_list_item_id"],
-            ["shopping_list_items.id"],
-        ),
-        sa.PrimaryKeyConstraint("id", "shopping_list_item_id"),
-    )
-    op.create_index(
-        op.f("ix_shopping_list_item_recipe_reference_recipe_id"),
-        "shopping_list_item_recipe_reference",
-        ["recipe_id"],
-        unique=False,
-    )
-
-
-def downgrade():
-    op.drop_index(
-        op.f("ix_shopping_list_item_recipe_reference_recipe_id"), table_name="shopping_list_item_recipe_reference"
-    )
-    op.drop_table("shopping_list_item_recipe_reference")
-    op.drop_table("users_to_favorites")
-    op.drop_table("shopping_list_items")
-    op.drop_table("recipes_ingredients")
-    op.drop_table("recipe_ingredient_ref_link")
-    op.drop_table("recipe_comments")
-    op.drop_table("password_reset_tokens")
-    op.drop_table("long_live_tokens")
-    op.drop_index(op.f("ix_users_username"), table_name="users")
-    op.drop_index(op.f("ix_users_group_id"), table_name="users")
-    op.drop_index(op.f("ix_users_full_name"), table_name="users")
-    op.drop_index(op.f("ix_users_email"), table_name="users")
-    op.drop_table("users")
-    op.drop_index(op.f("ix_shopping_list_recipe_reference_recipe_id"), table_name="shopping_list_recipe_reference")
-    op.drop_table("shopping_list_recipe_reference")
-    op.drop_table("report_entries")
-    op.drop_table("recipes_to_tools")
-    op.drop_table("recipes_to_tags")
-    op.drop_table("recipes_to_categories")
-    op.drop_index(op.f("ix_recipe_share_tokens_group_id"), table_name="recipe_share_tokens")
-    op.drop_table("recipe_share_tokens")
-    op.drop_table("recipe_settings")
-    op.drop_table("recipe_nutrition")
-    op.drop_table("recipe_instructions")
-    op.drop_table("recipe_assets")
-    op.drop_table("plan_rules_to_tags")
-    op.drop_table("plan_rules_to_categories")
-    op.drop_table("notes")
-    op.drop_table("ingredient_foods")
-    op.drop_table("group_to_categories")
-    op.drop_index(op.f("ix_group_meal_plans_title"), table_name="group_meal_plans")
-    op.drop_index(op.f("ix_group_meal_plans_recipe_id"), table_name="group_meal_plans")
-    op.drop_index(op.f("ix_group_meal_plans_group_id"), table_name="group_meal_plans")
-    op.drop_index(op.f("ix_group_meal_plans_entry_type"), table_name="group_meal_plans")
-    op.drop_index(op.f("ix_group_meal_plans_date"), table_name="group_meal_plans")
-    op.drop_table("group_meal_plans")
-    op.drop_table("group_events_notifier_options")
-    op.drop_table("cookbooks_to_categories")
-    op.drop_table("api_extras")
-    op.drop_index(op.f("ix_webhook_urls_group_id"), table_name="webhook_urls")
-    op.drop_table("webhook_urls")
-    op.drop_index(op.f("ix_tools_slug"), table_name="tools")
-    op.drop_index(op.f("ix_tools_name"), table_name="tools")
-    op.drop_table("tools")
-    op.drop_index(op.f("ix_tags_slug"), table_name="tags")
-    op.drop_index(op.f("ix_tags_name"), table_name="tags")
-    op.drop_index(op.f("ix_tags_group_id"), table_name="tags")
-    op.drop_table("tags")
-    op.drop_index(op.f("ix_shopping_lists_group_id"), table_name="shopping_lists")
-    op.drop_table("shopping_lists")
-    op.drop_index(op.f("ix_server_tasks_group_id"), table_name="server_tasks")
-    op.drop_table("server_tasks")
-    op.drop_index(op.f("ix_recipes_user_id"), table_name="recipes")
-    op.drop_index(op.f("ix_recipes_slug"), table_name="recipes")
-    op.drop_index(op.f("ix_recipes_group_id"), table_name="recipes")
-    op.drop_table("recipes")
-    op.drop_index(op.f("ix_multi_purpose_labels_group_id"), table_name="multi_purpose_labels")
-    op.drop_table("multi_purpose_labels")
-    op.drop_index(op.f("ix_invite_tokens_token"), table_name="invite_tokens")
-    op.drop_table("invite_tokens")
-    op.drop_table("ingredient_units")
-    op.drop_index(op.f("ix_group_reports_group_id"), table_name="group_reports")
-    op.drop_index(op.f("ix_group_reports_category"), table_name="group_reports")
-    op.drop_table("group_reports")
-    op.drop_index(op.f("ix_group_preferences_group_id"), table_name="group_preferences")
-    op.drop_table("group_preferences")
-    op.drop_table("group_meal_plan_rules")
-    op.drop_index(op.f("ix_group_events_notifiers_group_id"), table_name="group_events_notifiers")
-    op.drop_table("group_events_notifiers")
-    op.drop_index(op.f("ix_group_data_exports_group_id"), table_name="group_data_exports")
-    op.drop_table("group_data_exports")
-    op.drop_table("cookbooks")
-    op.drop_index(op.f("ix_categories_slug"), table_name="categories")
-    op.drop_index(op.f("ix_categories_name"), table_name="categories")
-    op.drop_index(op.f("ix_categories_group_id"), table_name="categories")
-    op.drop_table("categories")
-    op.drop_index(op.f("ix_groups_name"), table_name="groups")
-    op.drop_table("groups")

alembic/versions/2022-03-23-17.43.34_263dd6707191_convert_quantity_from_integer_to_float.py

@@ -1,51 +0,0 @@
-"""convert quantity from integer to float
-
-Revision ID: 263dd6707191
-Revises: 6b0f5f32d602
-Create Date: 2022-03-23 17:43:34.727829
-
-"""
-import sqlalchemy as sa
-
-from alembic import op
-
-# revision identifiers, used by Alembic.
-revision = "263dd6707191"
-down_revision = "6b0f5f32d602"
-branch_labels = None
-depends_on = None
-
-
-def is_postgres():
-    return op.get_context().dialect.name == "postgresql"
-
-
-def upgrade():
-    # ### commands auto generated by Alembic - please adjust! ###
-
-    # SQLite doesn't require migration as types are not enforced.
-    # Postgres Specific Migration
-    if is_postgres():
-        op.alter_column(
-            "recipes_ingredients",
-            "quantity",
-            type_=sa.Float(),
-            existing_type=sa.Integer(),
-        )
-    # ### end Alembic commands ###
-
-
-def downgrade():
-    # ### commands auto generated by Alembic - please adjust! ###
-
-    # SQLite doesn't require migration as types are not enforced.
-    # Postgres Specific Migration
-    if is_postgres():
-        op.alter_column(
-            "recipes_ingredients",
-            "quantity",
-            type_=sa.Integer(),
-            existing_type=sa.Float(),
-        )
-
-    # ### end Alembic commands ###

alembic/versions/2022-03-27-19.30.28_f1a2dbee5fe9_add_original_text_column_to_recipes_.py

@@ -1,24 +0,0 @@
-"""Add original_text column to recipes_ingredients
-
-Revision ID: f1a2dbee5fe9
-Revises: 263dd6707191
-Create Date: 2022-03-27 19:30:28.545846
-
-"""
-import sqlalchemy as sa
-
-from alembic import op
-
-# revision identifiers, used by Alembic.
-revision = "f1a2dbee5fe9"
-down_revision = "263dd6707191"
-branch_labels = None
-depends_on = None
-
-
-def upgrade():
-    op.add_column("recipes_ingredients", sa.Column("original_text", sa.String(), nullable=True))
-
-
-def downgrade():
-    op.drop_column("recipes_ingredients", "original_text")

alembic/versions/2022-03-31-19.19.55_59eb59135381_add_tags_to_cookbooks.py

@@ -1,57 +0,0 @@
-"""add tags to cookbooks
-
-Revision ID: 59eb59135381
-Revises: f1a2dbee5fe9
-Create Date: 2022-03-31 19:19:55.428965
-
-"""
-import sqlalchemy as sa
-
-import mealie.db.migration_types
-from alembic import op
-
-# revision identifiers, used by Alembic.
-revision = "59eb59135381"
-down_revision = "f1a2dbee5fe9"
-branch_labels = None
-depends_on = None
-
-
-def upgrade():
-    # ### commands auto generated by Alembic - please adjust! ###
-    op.create_table(
-        "cookbooks_to_tags",
-        sa.Column("cookbook_id", mealie.db.migration_types.GUID(), nullable=True),
-        sa.Column("tag_id", mealie.db.migration_types.GUID(), nullable=True),
-        sa.ForeignKeyConstraint(
-            ["cookbook_id"],
-            ["cookbooks.id"],
-        ),
-        sa.ForeignKeyConstraint(
-            ["tag_id"],
-            ["tags.id"],
-        ),
-    )
-    op.create_table(
-        "cookbooks_to_tools",
-        sa.Column("cookbook_id", mealie.db.migration_types.GUID(), nullable=True),
-        sa.Column("tool_id", mealie.db.migration_types.GUID(), nullable=True),
-        sa.ForeignKeyConstraint(
-            ["cookbook_id"],
-            ["cookbooks.id"],
-        ),
-        sa.ForeignKeyConstraint(
-            ["tool_id"],
-            ["tools.id"],
-        ),
-    )
-    op.add_column("cookbooks", sa.Column("public", sa.Boolean(), nullable=True))
-    # ### end Alembic commands ###
-
-
-def downgrade():
-    # ### commands auto generated by Alembic - please adjust! ###
-    op.drop_column("cookbooks", "public")
-    op.drop_table("cookbooks_to_tools")
-    op.drop_table("cookbooks_to_tags")
-    # ### end Alembic commands ###

alembic/versions/2022-04-03-10.48.51_09dfc897ad62_add_require_all_for_cookbook_filters.py

@@ -1,45 +0,0 @@
-"""add require_all for cookbook filters
-
-Revision ID: 09dfc897ad62
-Revises: 59eb59135381
-Create Date: 2022-04-03 10:48:51.379968
-
-"""
-import sqlalchemy as sa
-
-import mealie.db.migration_types  # noqa: F401
-from alembic import op
-
-# revision identifiers, used by Alembic.
-revision = "09dfc897ad62"
-down_revision = "59eb59135381"
-branch_labels = None
-depends_on = None
-
-
-def upgrade():
-    # ### commands auto generated by Alembic - please adjust! ###
-    op.add_column("cookbooks", sa.Column("require_all_categories", sa.Boolean(), nullable=True))
-    op.add_column("cookbooks", sa.Column("require_all_tags", sa.Boolean(), nullable=True))
-    op.add_column("cookbooks", sa.Column("require_all_tools", sa.Boolean(), nullable=True))
-
-    # Set Defaults for Existing Cookbooks
-    op.execute(
-        """
-        UPDATE cookbooks
-        SET require_all_categories = TRUE,
-            require_all_tags = TRUE,
-            require_all_tools = TRUE
-        """
-    )
-
-    # ### end Alembic commands ###
-    # ### end Alembic commands ###
-
-
-def downgrade():
-    # ### commands auto generated by Alembic - please adjust! ###
-    op.drop_column("cookbooks", "require_all_tools")
-    op.drop_column("cookbooks", "require_all_tags")
-    op.drop_column("cookbooks", "require_all_categories")
-    # ### end Alembic commands ###

alembic/versions/2022-06-01-11.12.06_ab0bae02578f_add_use_abbreviation_column_to_.py

@@ -1,30 +0,0 @@
-"""Add use_abbreviation column to ingredients
-
-Revision ID: ab0bae02578f
-Revises: 09dfc897ad62
-Create Date: 2022-06-01 11:12:06.748383
-
-"""
-import sqlalchemy as sa
-
-from alembic import op
-
-# revision identifiers, used by Alembic.
-revision = "ab0bae02578f"
-down_revision = "09dfc897ad62"
-branch_labels = None
-depends_on = None
-
-
-def upgrade():
-    # ### commands auto generated by Alembic - please adjust! ###
-    op.add_column("ingredient_units", sa.Column("use_abbreviation", sa.Boolean(), nullable=True))
-
-    op.execute("UPDATE ingredient_units SET use_abbreviation = FALSE WHERE use_abbreviation IS NULL")
-    # ### end Alembic commands ###
-
-
-def downgrade():
-    # ### commands auto generated by Alembic - please adjust! ###
-    op.drop_column("ingredient_units", "use_abbreviation")
-    # ### end Alembic commands ###

alembic/versions/2022-06-15-21.05.34_f30cf048c228_add_new_webhook_fields.py

@@ -1,31 +0,0 @@
-"""add new webhook fields
-
-
-Revision ID: f30cf048c228
-Revises: ab0bae02578f
-Create Date: 2022-06-15 21:05:34.851857
-
-"""
-import sqlalchemy as sa
-
-from alembic import op
-
-# revision identifiers, used by Alembic.
-revision = "f30cf048c228"
-down_revision = "ab0bae02578f"
-branch_labels = None
-depends_on = None
-
-
-def upgrade():
-    # ### commands auto generated by Alembic - please adjust! ###
-    op.add_column("webhook_urls", sa.Column("webhook_type", sa.String(), nullable=True))
-    op.add_column("webhook_urls", sa.Column("scheduled_time", sa.Time(), nullable=True))
-    # ### end Alembic commands ###
-
-
-def downgrade():
-    # ### commands auto generated by Alembic - please adjust! ###
-    op.drop_column("webhook_urls", "scheduled_time")
-    op.drop_column("webhook_urls", "webhook_type")
-    # ### end Alembic commands ###

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

@@ -1,27 +0,0 @@
-"""Add is_ocr_recipe column to recipes
-
-Revision ID: 089bfa50d0ed
-Revises: f30cf048c228
-Create Date: 2022-08-05 17:07:07.389271
-
-"""
-import sqlalchemy as sa
-
-from alembic import op
-
-# revision identifiers, used by Alembic.
-revision = "089bfa50d0ed"
-down_revision = "188374910655"
-branch_labels = None
-depends_on = None
-
-
-def upgrade():
-    op.add_column("recipes", sa.Column("is_ocr_recipe", sa.Boolean(), default=False, nullable=True))
-    op.execute("UPDATE recipes SET is_ocr_recipe = FALSE")
-    #  SQLITE does not support ALTER COLUMN, so the column will stay nullable to prevent making this migration a mess
-    #  The Recipe pydantic model and the SQL server use False as default value anyway for this column so Null should be a very rare sight
-
-
-def downgrade():
-    op.drop_column("recipes", "is_ocr_recipe")

alembic/versions/2022-08-12-19.05.59_188374910655_add_login_attemps_and_locked_at_field_.py

@@ -1,26 +0,0 @@
-"""add login_attemps and locked_at field to user table
-
-Revision ID: 188374910655
-Revises: f30cf048c228
-Create Date: 2022-08-12 19:05:59.776361
-
-"""
-import sqlalchemy as sa
-
-from alembic import op
-
-# revision identifiers, used by Alembic.
-revision = "188374910655"
-down_revision = "f30cf048c228"
-branch_labels = None
-depends_on = None
-
-
-def upgrade():
-    op.add_column("users", sa.Column("login_attemps", sa.Integer(), nullable=True))
-    op.add_column("users", sa.Column("locked_at", sa.DateTime(), nullable=True))
-
-
-def downgrade():
-    op.drop_column("users", "locked_at")
-    op.drop_column("users", "login_attemps")

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

@@ -1,72 +0,0 @@
-"""add extras to shopping lists, list items, and ingredient foods
-
-Revision ID: 44e8d670719d
-Revises: 188374910655
-Create Date: 2022-08-29 13:57:40.452245
-
-"""
-import sqlalchemy as sa
-
-import mealie.db.migration_types
-from alembic import op
-
-# revision identifiers, used by Alembic.
-revision = "44e8d670719d"
-down_revision = "089bfa50d0ed"
-branch_labels = None
-depends_on = None
-
-
-def upgrade():
-    # ### commands auto generated by Alembic - please adjust! ###
-    op.create_table(
-        "shopping_list_extras",
-        sa.Column("created_at", sa.DateTime(), nullable=True),
-        sa.Column("update_at", sa.DateTime(), nullable=True),
-        sa.Column("id", sa.Integer(), nullable=False),
-        sa.Column("key_name", sa.String(), nullable=True),
-        sa.Column("value", sa.String(), nullable=True),
-        sa.Column("shopping_list_id", mealie.db.migration_types.GUID(), nullable=True),
-        sa.ForeignKeyConstraint(
-            ["shopping_list_id"],
-            ["shopping_lists.id"],
-        ),
-        sa.PrimaryKeyConstraint("id"),
-    )
-    op.create_table(
-        "ingredient_food_extras",
-        sa.Column("created_at", sa.DateTime(), nullable=True),
-        sa.Column("update_at", sa.DateTime(), nullable=True),
-        sa.Column("id", sa.Integer(), nullable=False),
-        sa.Column("key_name", sa.String(), nullable=True),
-        sa.Column("value", sa.String(), nullable=True),
-        sa.Column("ingredient_food_id", mealie.db.migration_types.GUID(), nullable=True),
-        sa.ForeignKeyConstraint(
-            ["ingredient_food_id"],
-            ["ingredient_foods.id"],
-        ),
-        sa.PrimaryKeyConstraint("id"),
-    )
-    op.create_table(
-        "shopping_list_item_extras",
-        sa.Column("created_at", sa.DateTime(), nullable=True),
-        sa.Column("update_at", sa.DateTime(), nullable=True),
-        sa.Column("id", sa.Integer(), nullable=False),
-        sa.Column("key_name", sa.String(), nullable=True),
-        sa.Column("value", sa.String(), nullable=True),
-        sa.Column("shopping_list_item_id", mealie.db.migration_types.GUID(), nullable=True),
-        sa.ForeignKeyConstraint(
-            ["shopping_list_item_id"],
-            ["shopping_list_items.id"],
-        ),
-        sa.PrimaryKeyConstraint("id"),
-    )
-    # ### end Alembic commands ###
-
-
-def downgrade():
-    # ### commands auto generated by Alembic - please adjust! ###
-    op.drop_table("shopping_list_item_extras")
-    op.drop_table("ingredient_food_extras")
-    op.drop_table("shopping_list_extras")
-    # ### end Alembic commands ###

cliff.toml

@@ -1,64 +0,0 @@
-# configuration file for git-cliff (0.1.0)
-
-[changelog]
-# changelog header
-header = """
-# Changelog\n
-All notable changes to this project will be documented in this file.\n
-"""
-# template for the changelog body
-# https://tera.netlify.app/docs/#introduction
-body = """
-{% if version %}\
-    ## [{{ version | trim_start_matches(pat="v") }}] - {{ timestamp | date(format="%Y-%m-%d") }}
-{% else %}\
-    ## [unreleased]
-{% endif %}\
-{% for group, commits in commits | group_by(attribute="group") %}
-    ### {{ group | upper_first }}
-    {% for commit in commits %}
-        - {% if commit.breaking %}[**breaking**] {% endif %}{{ commit.message | upper_first }}\
-    {% endfor %}
-{% endfor %}\n
-"""
-# remove the leading and trailing whitespace from the template
-trim = true
-# changelog footer
-footer = """
-<!-- generated by git-cliff -->
-"""
-
-[git]
-# parse the commits based on https://www.conventionalcommits.org
-conventional_commits = true
-# filter out the commits that are not conventional
-filter_unconventional = true
-# regex for preprocessing the commit messages
-commit_preprocessors = [
-    { pattern = '\((\w+\s)?#([0-9]+)\)', replace = "([#${2}](https://github.com/hay-kot/mealie/issues/${2}))"},
-]
-# regex for parsing and grouping commits
-commit_parsers = [
-    { message = "^feat", group = "Features"},
-    { message = "^fix", group = "Bug Fixes"},
-    { message = "^doc", group = "Documentation"},
-    { message = "^perf", group = "Performance"},
-    { message = "^refactor", group = "Refactor"},
-    { message = "^style", group = "Styling"},
-    { message = "^test", group = "Testing"},
-    { message = "^chore\\(release\\): prepare for", skip = true},
-    { message = "^chore", group = "Miscellaneous Tasks"},
-    { body = ".*security", group = "Security"},
-]
-# filter out the commits that are not matched by commit parsers
-filter_commits = false
-# glob pattern for matching git tags
-tag_pattern = "v[0-9]*"
-# regex for skipping tags
-skip_tags = "v0.1.0-beta.1"
-# regex for ignoring tags
-ignore_tags = ""
-# sort the tags chronologically
-date_order = false
-# sort the commits inside sections by oldest/newest order
-sort_commits = "oldest"

crowdin.yml

@@ -1,12 +1,6 @@
 preserve_hierarchy: false
 files:
-  - source: /frontend/lang/messages/en-US.json
-    translation: /frontend/lang/messages/%locale%.json
-  - source: /mealie/lang/messages/en-US.json
-    translation: /mealie/lang/messages/%locale%.json
-  - source: /mealie/repos/seed/resources/foods/locales/en-US.json
-    translation: /mealie/repos/seed/resources/foods/locales/%locale%.json
-  - source: /mealie/repos/seed/resources/units/locales/en-US.json
-    translation: /mealie/repos/seed/resources/units/locales/%locale%.json
-  - source: /mealie/repos/seed/resources/labels/locales/en-US.json
-    translation: /mealie/repos/seed/resources/labels/locales/%locale%.json
+  - source: /frontend/src/locales/messages/en-US.json
+    translation: /frontend/src/locales/messages/%locale%.json
+  - source: /frontend/src/locales/dateTimeFormats/en-US.json
+    translation: /frontend/src/locales/dateTimeFormats/%locale%.json

dev/code-generation/gen_py_pytest_data_paths.py

@@ -1,116 +0,0 @@
-from dataclasses import dataclass
-from pathlib import Path
-
-from slugify import slugify
-from utils import render_python_template
-
-CWD = Path(__file__).parent
-
-TEMPLATE = CWD / "templates" / "test_data.py.j2"
-TEST_DATA = CWD.parent.parent / "tests" / "data"
-GENERATED = CWD / "generated"
-
-
-@dataclass
-class TestDataPath:
-    var: str
-    path: str
-
-    @classmethod
-    def from_path(cls, path: Path):
-        var = str(path)
-        var = var.replace(str(TEST_DATA), "")
-
-        rel_path = var.removeprefix("/")
-
-        # Remove any file extension
-        var = var.split(".")[0]
-        var = var.replace("'", "")
-        var = slugify(var, separator="_")
-
-        return cls(var, rel_path)
-
-
-@dataclass
-class DataDir:
-    name: str
-    path: Path
-    children: list[TestDataPath]
-
-
-def get_data_paths(path: Path) -> list[DataDir]:
-    """
-    Recursively walks the given path and returns a list of TestDataPaths
-    """
-
-    def recursive_test_paths(p: Path) -> list[TestDataPath]:
-        test_paths = []
-        for child in p.iterdir():
-            if child.is_dir():
-                test_paths += recursive_test_paths(child)
-            else:
-                test_paths.append(TestDataPath.from_path(child))
-        return [x for x in test_paths if not None]
-
-    data_paths = []
-
-    for p in path.iterdir():
-        if p.is_dir():
-            data_paths.append(DataDir(p.name, p, recursive_test_paths(p)))
-
-    return data_paths
-
-
-def rename_non_compliant_paths():
-    """
-    Recursively itterates through a directory and renames all files/folders to be
-    kabab case.
-    """
-
-    ignore_files = ["DS_Store", ".gitkeep"]
-
-    ignore_extensions = [".pyc", ".pyo", ".py"]
-
-    def recursive_rename(p: Path):
-        for child in p.iterdir():
-            if str(child).startswith("."):
-                continue
-
-            if child.suffix in ignore_extensions:
-                continue
-
-            if child.name in ignore_files:
-                continue
-
-            if child.is_dir():
-                recursive_rename(child)
-
-            else:
-                new_name = slugify(child.stem)
-                extension = child.suffix
-                if new_name != child.name:
-                    child.rename(child.parent / f"{new_name}{extension}")
-
-    recursive_rename(TEST_DATA)
-
-
-def main():
-    rename_non_compliant_paths()
-
-    GENERATED.mkdir(exist_ok=True)
-    data_dirs = get_data_paths(TEST_DATA)
-
-    all_children = [x.children for x in data_dirs]
-
-    # Flatten list of lists
-    all_children = [item for sublist in all_children for item in sublist]
-
-    render_python_template(
-        TEMPLATE,
-        GENERATED / "__init__.py",
-        {"children": all_children},
-    )
-
-
-if __name__ == "__main__":
-    main()

dev/code-generation/gen_py_pytest_routes.py

@@ -1,84 +0,0 @@
-import json
-from pathlib import Path
-
-from fastapi import FastAPI
-from jinja2 import Template
-from pydantic import BaseModel
-from utils import PROJECT_DIR, CodeTemplates, HTTPRequest, RouteObject
-
-CWD = Path(__file__).parent
-
-OUTFILE = PROJECT_DIR / "tests" / "utils" / "api_routes" / "__init__.py"
-
-
-class PathObject(BaseModel):
-    route_object: RouteObject
-    http_verbs: list[HTTPRequest]
-
-    class Config:
-        arbitrary_types_allowed = True
-
-
-def get_path_objects(app: FastAPI):
-    paths = []
-
-    for key, value in app.openapi().items():
-        if key == "paths":
-            for key, value in value.items():
-
-                paths.append(
-                    PathObject(
-                        route_object=RouteObject(key),
-                        http_verbs=[HTTPRequest(request_type=k, **v) for k, v in value.items()],
-                    )
-                )
-
-    return paths
-
-
-def dump_open_api(app: FastAPI):
-    """Writes the Open API as JSON to a json file"""
-    OPEN_API_FILE = CWD / "openapi.json"
-
-    with open(OPEN_API_FILE, "w") as f:
-        f.write(json.dumps(app.openapi()))
-
-
-def read_template(file: Path):
-    with open(file) as f:
-        return f.read()
-
-
-def generate_python_templates(static_paths: list[PathObject], function_paths: list[PathObject]):
-
-    template = Template(read_template(CodeTemplates.pytest_routes))
-    content = template.render(
-        paths={
-            "prefix": "/api",
-            "static_paths": static_paths,
-            "function_paths": function_paths,
-        }
-    )
-    with open(OUTFILE, "w") as f:
-        f.write(content)
-
-    return
-
-
-def main():
-    from mealie.app import app
-
-    dump_open_api(app)
-    paths = get_path_objects(app)
-
-    static_paths = [x.route_object for x in paths if not x.route_object.is_function]
-    function_paths = [x.route_object for x in paths if x.route_object.is_function]
-
-    static_paths.sort(key=lambda x: x.router_slug)
-    function_paths.sort(key=lambda x: x.router_slug)
-
-    generate_python_templates(static_paths, function_paths)
-
-
-if __name__ == "__main__":
-    main()

dev/code-generation/gen_py_schema_exports.py

@@ -1,102 +0,0 @@
-import pathlib
-import re
-from dataclasses import dataclass, field
-
-from utils import PROJECT_DIR, log, render_python_template
-
-template = """# This file is auto-generated by gen_schema_exports.py
-{% for file in data.module.files %}{{ file.import_str() }}
-{% endfor %}
-
-__all__ = [
-    {% for file in data.module.files %}
-    {%- for class in file.classes -%}
-    "{{ class }}",
-    {%- endfor -%}
-    {%- endfor %}
-]
-
-"""
-
-SCHEMA_PATH = PROJECT_DIR / "mealie" / "schema"
-
-SKIP = {"static", "__pycache__"}
-
-
-class PyFile:
-    import_path: str
-    """The import path of the file"""
-
-    classes: list[str]
-    """A list of classes in the file"""
-
-    def __init__(self, path: pathlib.Path):
-        self.import_path = path.stem
-        self.classes = []
-
-        self.classes = PyFile.extract_classes(path)
-        self.classes.sort()
-
-    def import_str(self) -> str:
-        """Returns a string that can be used to import the file"""
-        return f"from .{self.import_path} import {', '.join(self.classes)}"
-
-    @staticmethod
-    def extract_classes(file_path: pathlib.Path) -> list[str]:
-        name = file_path.stem
-
-        if name == "__init__" or name.startswith("_"):
-            return []
-
-        classes = re.findall(r"(?m)^class\s(\w+)", file_path.read_text())
-        return classes
-
-
-@dataclass
-class Modules:
-    directory: pathlib.Path
-    """The directory to search for modules"""
-
-    files: list[PyFile] = field(default_factory=list)
-    """A list of files in the directory"""
-
-    def __post_init__(self):
-        for file in self.directory.glob("*.py"):
-            if file.name.startswith("_"):
-                continue
-
-            pfile = PyFile(file)
-
-            if len(pfile.classes) > 0:
-                self.files.append(pfile)
-
-            else:
-                log.debug(f"Skipping {file.name} as it has no classes")
-
-
-def find_modules(root: pathlib.Path) -> list[Modules]:
-    """Finds all the top level modules in the provided folder"""
-    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:
-        log.debug(f"Module: {module.directory.name}")
-        for file in module.files:
-            log.debug(f"  File: {file.import_path}")
-            log.debug(f"    Classes: [{', '.join(file.classes)}]")
-
-        render_python_template(template, module.directory / "__init__.py", {"module": module})
-
-
-if __name__ == "__main__":
-    main()

dev/code-generation/gen_ts_locales.py

@@ -1,181 +0,0 @@
-import pathlib
-from pathlib import Path
-
-import dotenv
-import requests
-from jinja2 import Template
-from pydantic import Extra
-from requests import Response
-from utils import CodeDest, CodeKeys, inject_inline, log
-
-from mealie.schema._mealie import MealieModel
-
-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)",
-}
-
-LOCALE_TEMPLATE = """// This Code is auto generated by gen_global_components.py
-export const LOCALES = [{% for locale in locales %}
-  {
-    name: "{{ locale.name }}",
-    value: "{{ locale.locale }}",
-    progress: {{ locale.progress }},
-  },{% endfor %}
-]
-
-"""
-
-
-class TargetLanguage(MealieModel):
-    id: str
-    name: str
-    locale: str
-    threeLettersCode: str
-    twoLettersCode: str
-    progress: float = 0.0
-
-    class Config:
-        extra = Extra.allow
-
-
-class CrowdinApi:
-    project_name = "Mealie"
-    project_id = "451976"
-    api_key = API_KEY
-
-    def __init__(self, api_key: str):
-        api_key = api_key
-
-    @property
-    def headers(self) -> dict:
-        return {
-            "Content-Type": "application/json",
-            "Authorization": f"Bearer {self.api_key}",
-        }
-
-    def get_projects(self) -> Response:
-        return requests.get("https://api.crowdin.com/api/v2/projects", headers=self.headers)
-
-    def get_project(self) -> Response:
-        return requests.get(f"https://api.crowdin.com/api/v2/projects/{self.project_id}", headers=self.headers)
-
-    def get_languages(self) -> list[TargetLanguage]:
-        response = self.get_project()
-        tls = response.json()["data"]["targetLanguages"]
-
-        models = [TargetLanguage(**t) for t in tls]
-
-        models.insert(
-            0,
-            TargetLanguage(
-                id="en-US", name="English", locale="en-US", 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]
-
-            for p in progress:
-                if p["data"]["languageId"] == model.id:
-                    model.progress = p["data"]["translationProgress"]
-
-        models.sort(key=lambda x: x.locale, reverse=True)
-        return models
-
-    def get_progress(self) -> dict:
-        response = requests.get(
-            f"https://api.crowdin.com/api/v2/projects/{self.project_id}/languages/progress?limit=500",
-            headers=self.headers,
-        )
-        return response.json()
-
-
-PROJECT_DIR = Path(__file__).parent.parent.parent
-
-
-datetime_dir = PROJECT_DIR / "frontend" / "lang" / "dateTimeFormats"
-locales_dir = PROJECT_DIR / "frontend" / "lang" / "messages"
-nuxt_config = PROJECT_DIR / "frontend" / "nuxt.config.js"
-
-"""
-This snippet walks the message and dat locales directories and generates the import information
-for the nuxt.config.js file and automatically injects it into the nuxt.config.js file. Note that
-the code generation ID is hardcoded into the script and required in the nuxt config.
-"""
-
-
-def inject_nuxt_values():
-    all_date_locales = [
-        f'"{match.stem}": require("./lang/dateTimeFormats/{match.name}"),' for match in datetime_dir.glob("*.json")
-    ]
-
-    all_langs = []
-    for match in locales_dir.glob("*.json"):
-        lang_string = f'{{ code: "{match.stem}", file: "{match.name}" }},'
-        all_langs.append(lang_string)
-
-    log.debug(f"injecting locales into nuxt config -> {nuxt_config}")
-    inject_inline(nuxt_config, CodeKeys.nuxt_local_messages, all_langs)
-    inject_inline(nuxt_config, CodeKeys.nuxt_local_dates, all_date_locales)
-
-
-def generate_locales_ts_file():
-    api = CrowdinApi("")
-    models = api.get_languages()
-    tmpl = Template(LOCALE_TEMPLATE)
-    rendered = tmpl.render(locales=models)
-
-    log.debug(f"generating locales ts file -> {CodeDest.use_locales}")
-    with open(CodeDest.use_locales, "w") as f:
-        f.write(rendered)  # type:ignore
-
-
-def main():
-    if API_KEY is None or API_KEY == "":
-        log.error("CROWDIN_API_KEY is not set")
-        return
-
-    generate_locales_ts_file()
-    inject_nuxt_values()
-
-
-if __name__ == "__main__":
-    main()

dev/code-generation/gen_ts_types.py

@@ -1,128 +0,0 @@
-from pathlib import Path
-
-from jinja2 import Template
-from pydantic2ts import generate_typescript_defs
-from utils import log
-
-# ============================================================
-
-template = """// This Code is auto generated by gen_global_components.py
-{% for name in global %}import {{ name }} from "@/components/global/{{ name }}.vue";
-{% endfor %}{% for name in layout %}import {{ name }} from "@/components/layout/{{ name }}.vue";
-{% endfor %}
-declare module "vue" {
-  export interface GlobalComponents {
-    // Global Components
-{% for name in global -%}
-    {{ "    " }}{{ name }}: typeof {{ name }};
-{% endfor -%}
-    {{ "    " }}// Layout Components
-{% for name in layout -%}
-    {{ "    " }}{{ name }}: typeof {{ name }};
-{% endfor -%}{{ "  }"}}
-}
-
-export {};
-
-"""
-
-CWD = Path(__file__).parent
-PROJECT_DIR = Path(__file__).parent.parent.parent
-
-
-def generate_global_components_types() -> None:
-    destination_file = PROJECT_DIR / "frontend" / "types" / "components.d.ts"
-
-    component_paths = {
-        "global": PROJECT_DIR / "frontend" / "components" / "global",
-        "layout": PROJECT_DIR / "frontend" / "components" / "Layout",
-    }
-
-    def render_template(template: str, data: dict) -> str | None:
-        tmpl = Template(template)
-        return tmpl.render(**data)
-
-    def build_data() -> dict:
-        data = {}
-        for name, path in component_paths.items():
-            components = [component.stem for component in path.glob("*.vue")]
-            components.sort()
-            data[name] = components
-
-        return data
-
-    def write_template(text: str) -> None:
-        destination_file.write_text(text)
-
-    text = render_template(template, build_data())
-
-    if text:
-        write_template(text)
-
-
-# ============================================================
-# Pydantic To Typescript Generator
-
-
-def generate_typescript_types() -> None:
-    def path_to_module(path: Path):
-        str_path: str = str(path)
-
-        str_path = str_path.removeprefix(str(PROJECT_DIR))
-        str_path = str_path.removeprefix("/")
-        str_path = str_path.replace("/", ".")
-
-        return str_path
-
-    schema_path = PROJECT_DIR / "mealie" / "schema"
-    types_dir = PROJECT_DIR / "frontend" / "lib" / "api" / "types"
-
-    ignore_dirs = ["__pycache__", "static", "_mealie"]
-
-    skipped_files: list[Path] = []
-    skipped_dirs: list[Path] = []
-    failed_modules: list[Path] = []
-
-    for module in schema_path.iterdir():
-        if module.is_dir() and module.stem in ignore_dirs:
-            skipped_dirs.append(module)
-            continue
-
-        if not module.is_dir() or not module.joinpath("__init__.py").is_file():
-            skipped_files.append(module)
-            continue
-
-        ts_out_name = module.name.replace("_", "-") + ".ts"
-        out_path = types_dir.joinpath(ts_out_name)
-
-        try:
-            path_as_module = path_to_module(module)
-            generate_typescript_defs(path_as_module, str(out_path), exclude=("MealieModel"))  # type: ignore
-        except Exception as e:
-            failed_modules.append(module)
-            log.error(f"Module Error: {e}")
-
-    log.debug("\n📁 Skipped Directories:")
-    for skipped_dir in skipped_dirs:
-        log.debug(f"   📁 {skipped_dir.name}")
-
-    log.debug("📄 Skipped Files:")
-    for f in skipped_files:
-        log.debug(f"   📄 {f.name}")
-
-    if len(failed_modules) > 0:
-        log.error("❌ Failed Modules:")
-        for f in failed_modules:
-            log.error(f"   ❌ {f.name}")
-
-
-def main():
-    log.debug("\n-- Starting Global Components Generator --")
-    generate_global_components_types()
-
-    log.debug("\n-- Starting Pydantic To Typescript Generator --")
-    generate_typescript_types()
-
-
-if __name__ == "__main__":
-    main()

dev/code-generation/main.py

@@ -1,28 +0,0 @@
-from pathlib import Path
-
-import gen_py_pytest_data_paths
-import gen_py_pytest_routes
-import gen_py_schema_exports
-import gen_ts_locales
-import gen_ts_types
-from utils import log
-
-CWD = Path(__file__).parent
-
-
-def main():
-    items = [
-        (gen_py_schema_exports.main, "schema exports"),
-        (gen_ts_types.main, "frontend types"),
-        (gen_ts_locales.main, "locales"),
-        (gen_py_pytest_data_paths.main, "test data paths"),
-        (gen_py_pytest_routes.main, "pytest routes"),
-    ]
-
-    for func, name in items:
-        log.info(f"Generating {name}...")
-        func()
-
-
-if __name__ == "__main__":
-    main()

dev/code-generation/templates/test_data.py.j2

@@ -1,7 +0,0 @@
-from pathlib import Path
-
-CWD = Path(__file__).parent
-
-{% for f in data.children %}
-{{ f.var }} = CWD / "{{ f.path }}"
-{% endfor %}

dev/code-generation/templates/test_routes.py.j2

@@ -1,11 +0,0 @@
-# This Content is Auto Generated for Pytest
-prefix = "{{paths.prefix}}"
-{% for path in paths.static_paths %}
-{{ path.router_slug }} = "{{path.prefix}}{{ path.route }}"
-"""`{{path.prefix}}{{ path.route }}`"""{% endfor %}
-{% for path in paths.function_paths  %}
-
-def {{path.router_slug}}({{path.var|join(", ")}}):
-    """`{{ paths.prefix }}{{ path.route }}`"""
-    return f"{prefix}{{ path.route }}"
-{% endfor %}

dev/code-generation/utils/__init__.py

@@ -1,25 +0,0 @@
-from .open_api_parser import OpenAPIParser
-from .route import HTTPRequest, ParameterIn, RequestBody, RequestType, RouteObject, RouterParameter
-from .static import PROJECT_DIR, CodeDest, CodeKeys, CodeTemplates, Directories
-from .template import CodeSlicer, find_start_end, get_indentation_of_string, inject_inline, log, render_python_template
-
-__all__ = [
-    "CodeDest",
-    "CodeKeys",
-    "CodeSlicer",
-    "CodeTemplates",
-    "Directories",
-    "find_start_end",
-    "get_indentation_of_string",
-    "HTTPRequest",
-    "inject_inline",
-    "log",
-    "OpenAPIParser",
-    "ParameterIn",
-    "PROJECT_DIR",
-    "render_python_template",
-    "RequestBody",
-    "RequestType",
-    "RouteObject",
-    "RouterParameter",
-]

dev/code-generation/utils/open_api_parser.py

@@ -1,132 +0,0 @@
-import json
-import re
-from pathlib import Path
-from typing import Any
-
-from fastapi import FastAPI
-from humps import camelize
-from slugify import slugify
-
-from .static import Directories
-
-
-def get_openapi_spec_by_ref(app, type_reference: str) -> dict:
-    if not type_reference:
-        return None
-
-    schemas = app["components"]["schemas"]
-    type_text = type_reference.split("/")[-1]
-    return schemas.get(type_text, type_reference)
-
-
-def recursive_dict_search(data: dict[str, Any], key: str) -> Any:
-    """
-    Walks a dictionary searching for a key and returns all the keys
-    matching the provided key"""
-    if key in data:
-        return data[key]
-    for _, v in data.items():
-        if isinstance(v, dict):
-            result = recursive_dict_search(v, key)
-            if result:
-                return result
-    return None
-
-
-class APIFunction:
-    def __init__(self, app, route: str, verb: str, data: dict):
-        self.name_camel = camelize(data.get("summary"))
-        self.name_snake = slugify(data.get("summary"), separator="_")
-
-        self.http_verb = verb
-        self.path_vars = re.findall(r"\{(.*?)\}", route)
-        self.path_is_func = "{" in route
-        self.js_route = route.replace("{", "${")
-        self.py_route = route
-
-        self.body_schema = get_openapi_spec_by_ref(app, recursive_dict_search(data, "$ref"))
-
-    def path_args(self) -> str:
-        return ", ".join(x + ": string | number" for x in self.path_vars)
-
-    # body: Optional[list[str]] = []
-    # path_params: Optional[list[str]] = []
-    # query_params: Optional[list[str]] = []
-
-
-# class APIModule(BaseModel):
-#     name: str
-#     functions: list[APIFunction]
-
-
-class OpenAPIParser:
-    def __init__(self, app: FastAPI) -> None:
-        self.app = app
-        self.spec = app.openapi()
-
-        self.modules = {}
-
-    def dump(self, out_path: Path) -> Path:
-        """Writes the Open API as JSON to a json file"""
-        OPEN_API_FILE = out_path or Directories.out_dir / "openapi.json"
-
-        with open(OPEN_API_FILE, "w") as f:
-            f.write(json.dumps(self.spec, indent=4))
-
-    def _group_by_module_tag(self):
-        """
-        Itterates over all routes and groups them by module. Modules are determined
-        by the suffix text before : in the first tag for the router. These are used
-        to generate the typescript class interface for interacting with the API
-        """
-        modules = {}
-
-        all_paths = self.spec["paths"]
-        for path, http_verbs in all_paths.items():
-            for _, value in http_verbs.items():
-                if "tags" in value:
-                    tag: str = value["tags"][0]
-                    if ":" in tag:
-                        tag = tag.removeprefix('"').split(":")[0].replace(" ", "")
-                        if modules.get(tag):
-                            modules[tag][path] = http_verbs
-                        else:
-                            modules[tag] = {path: http_verbs}
-
-        return modules
-
-    def _get_openapi_spec(self, type_reference: str) -> dict:
-        schemas = self.app["components"]["schemas"]
-        type_text = type_reference.split("/")[-1]
-        return schemas.get(type_text, type_reference)
-
-    def _fill_schema_references(self, raw_modules: dict) -> dict:
-        for _, routes in raw_modules.items():
-            for _, verbs in routes.items():
-                for _, value in verbs.items():
-                    if "requestBody" in value:
-                        try:
-                            schema_ref = value["requestBody"]["content"]["application/json"]["schema"]["$ref"]
-                            schema = self._get_openapi_spec(schema_ref)
-                            value["requestBody"]["content"]["application/json"]["schema"] = schema
-                        except Exception:
-                            continue
-
-        return raw_modules
-
-    def get_by_module(self) -> dict:
-        """Returns paths where tags are split by : and left right is considered the module"""
-        raw_modules = self._group_by_module_tag()
-
-        modules = {}
-        for module_name, routes in raw_modules.items():
-            for route, verbs in routes.items():
-                for verb, value in verbs.items():
-                    function = APIFunction(self.spec, route, verb, value)
-
-                    if modules.get(module_name):
-                        modules[module_name].append(function)
-                    else:
-                        modules[module_name] = [function]
-
-        return modules

dev/code-generation/utils/route.py

@@ -1,96 +0,0 @@
-import re
-from enum import Enum
-from typing import Optional
-
-from humps import camelize
-from pydantic import BaseModel, Extra, Field
-from slugify import slugify
-
-
-class RouteObject:
-    def __init__(self, route_string) -> None:
-        self.prefix = "/" + route_string.split("/")[1]
-        self.route = "/" + route_string.split("/", 2)[2]
-        self.js_route = self.route.replace("{", "${")
-        self.parts = route_string.split("/")[1:]
-        self.var = re.findall(r"\{(.*?)\}", route_string)
-        self.is_function = "{" in self.route
-        self.router_slug = slugify("_".join(self.parts[1:]), separator="_")
-        self.router_camel = camelize(self.router_slug)
-
-
-class RequestType(str, Enum):
-    get = "get"
-    put = "put"
-    post = "post"
-    patch = "patch"
-    delete = "delete"
-
-
-class ParameterIn(str, Enum):
-    query = "query"
-    path = "path"
-    header = "header"
-
-
-class RouterParameter(BaseModel):
-    required: bool = False
-    name: str
-    location: ParameterIn = Field(..., alias="in")
-
-    class Config:
-        extra = Extra.allow
-
-
-class RequestBody(BaseModel):
-    required: bool = False
-
-    class Config:
-        extra = Extra.allow
-
-
-class HTTPRequest(BaseModel):
-    request_type: RequestType
-    description: str = ""
-    summary: str
-    requestBody: Optional[RequestBody]
-
-    parameters: list[RouterParameter] = []
-    tags: list[str] | None = []
-
-    class Config:
-        extra = Extra.allow
-
-    def list_as_js_object_string(self, parameters, braces=True):
-        if len(parameters) == 0:
-            return ""
-
-        if braces:
-            return "{" + ", ".join(parameters) + "}"
-        else:
-            return ", ".join(parameters)
-
-    def payload(self):
-        return "payload" if self.requestBody else ""
-
-    def function_args(self):
-        all_params = [p.name for p in self.parameters]
-        if self.requestBody:
-            all_params.append("payload")
-        return self.list_as_js_object_string(all_params)
-
-    def query_params(self):
-        params = [param.name for param in self.parameters if param.location == ParameterIn.query]
-        return self.list_as_js_object_string(params)
-
-    def path_params(self):
-        params = [param.name for param in self.parameters if param.location == ParameterIn.path]
-        return self.list_as_js_object_string(parameters=params, braces=False)
-
-    @property
-    def summary_camel(self):
-        return camelize(slugify(self.summary))
-
-    @property
-    def js_docs(self):
-        return self.description.replace("\n", "  \n  * ")

dev/code-generation/utils/static.py

@@ -1,26 +0,0 @@
-from pathlib import Path
-
-PARENT = Path(__file__).parent.parent
-PROJECT_DIR = Path(__file__).parent.parent.parent.parent
-
-
-class Directories:
-    out_dir = PARENT / "generated"
-
-
-class CodeTemplates:
-    interface = PARENT / "templates" / "interface.js"
-    pytest_routes = PARENT / "templates" / "test_routes.py.j2"
-
-
-class CodeDest:
-    interface = PARENT / "generated" / "interface.js"
-    pytest_routes = PARENT / "generated" / "test_routes.py"
-    use_locales = PROJECT_DIR / "frontend" / "composables" / "use-locales" / "available-locales.ts"
-
-
-class CodeKeys:
-    """Hard coded comment IDs that are used to generate code"""
-
-    nuxt_local_messages = "MESSAGE_LOCALES"
-    nuxt_local_dates = "DATE_LOCALES"

dev/code-generation/utils/template.py

@@ -1,108 +0,0 @@
-import logging
-import re
-from dataclasses import dataclass
-from pathlib import Path
-
-import black
-import isort
-from jinja2 import Template
-from rich.logging import RichHandler
-
-FORMAT = "%(message)s"
-logging.basicConfig(level=logging.INFO, format=FORMAT, datefmt="[%X]", handlers=[RichHandler()])
-
-log = logging.getLogger("rich")
-
-
-def render_python_template(template_file: Path | str, dest: Path, data: dict):
-    """Render and Format a Jinja2 Template for Python Code"""
-    if isinstance(template_file, Path):
-        tplt = Template(template_file.read_text())
-    else:
-        tplt = Template(template_file)
-
-    text = tplt.render(data=data)
-
-    text = black.format_str(text, mode=black.FileMode())
-
-    dest.write_text(text)
-    isort.file(dest)
-
-
-@dataclass
-class CodeSlicer:
-    start: int
-    end: int
-
-    indentation: str
-    text: list[str]
-
-    _next_line = None
-
-    def purge_lines(self) -> None:
-        start = self.start + 1
-        end = self.end
-        del self.text[start:end]
-
-    def push_line(self, string: str) -> None:
-        self._next_line = self._next_line or self.start + 1
-        self.text.insert(self._next_line, self.indentation + string + "\n")
-        self._next_line += 1
-
-
-def get_indentation_of_string(line: str, comment_char: str = "//") -> str:
-    return re.sub(rf"{comment_char}.*", "", line).removesuffix("\n")
-
-
-def find_start_end(file_text: list[str], gen_id: str) -> tuple[int, int, str]:
-    start = None
-    end = None
-    indentation = None
-
-    for i, line in enumerate(file_text):
-        if "CODE_GEN_ID:" in line and gen_id in line:
-            start = i
-            indentation = get_indentation_of_string(line)
-        if f"END: {gen_id}" in line:
-            end = i
-
-    if start is None or end is None:
-        raise Exception("Could not find start and end of code generation block")
-
-    if start > end:
-        raise Exception(f"Start ({start=}) of code generation block is after end ({end=})")
-
-    return start, end, indentation
-
-
-def inject_inline(file_path: Path, key: str, code: list[str]) -> None:
-    """Injects a list of strings into the file where the key is found in the format defined
-    by the code-generation. Strings are properly indented and a '\n' is added to the end of
-    each string.
-
-    Start -> 'CODE_GEN_ID: <key>'
-    End -> 'END: <key>'
-
-    If no 'CODE_GEN_ID: <key>' is found, and exception is raised
-
-    Args:
-        file_path (Path): Write to file
-        key (str): CODE_GEN_ID: <key>
-        code (list[str]): List of strings to inject.
-
-    """
-
-    with open(file_path) as f:
-        file_text = f.readlines()
-
-    start, end, indentation = find_start_end(file_text, key)
-
-    slicer = CodeSlicer(start, end, indentation, file_text)
-
-    slicer.purge_lines()
-
-    for line in code:
-        slicer.push_line(line)
-
-    with open(file_path, "w") as file:
-        file.writelines(slicer.text)

dev/scripts/all_recipes_stress_test.py

@@ -1,337 +0,0 @@
-import json
-import random
-import string
-import time
-from dataclasses import dataclass
-
-import requests
-from rich.console import Console
-from rich.table import Table
-
-console = Console()
-
-
-def random_string(length: int) -> str:
-    return "".join(random.choice(string.ascii_lowercase) for _ in range(length))
-
-
-def payload_factory() -> dict:
-    return {"name": random_string(15)}
-
-
-def recipe_data(name: str, slug: str, id: str, userId: str, groupId: str) -> dict:
-    return {
-        "id": id,
-        "userId": userId,
-        "groupId": groupId,
-        "name": name,
-        "slug": slug,
-        "image": "tNRG",
-        "recipeYield": "9 servings",
-        "totalTime": "33 Minutes",
-        "prepTime": "20 Minutes",
-        "cookTime": None,
-        "performTime": "13 Minutes",
-        "description": "These Levain Bakery-Style Peanut Butter Cookies are the ULTIMATE for serious PB lovers! Supremely thick and chewy with gooey centers and a soft texture, they're packed with peanut butter flavor and Reese's Pieces for the most amazing cookie ever!",
-        "recipeCategory": [],
-        "tags": [],
-        "tools": [],
-        "rating": None,
-        "orgURL": "https://thedomesticrebel.com/2021/04/28/levain-bakery-style-ultimate-peanut-butter-cookies/",
-        "recipeIngredient": [
-            {
-                "title": None,
-                "note": "1 cup unsalted butter, cut into cubes",
-                "unit": None,
-                "food": None,
-                "disableAmount": True,
-                "quantity": 1,
-                "originalText": None,
-                "referenceId": "ea3b6702-9532-4fbc-a40b-f99917831c26",
-            },
-            {
-                "title": None,
-                "note": "1 cup light brown sugar",
-                "unit": None,
-                "food": None,
-                "disableAmount": True,
-                "quantity": 1,
-                "originalText": None,
-                "referenceId": "c5bbfefb-1e23-4ffd-af88-c0363a0fae82",
-            },
-            {
-                "title": None,
-                "note": "1/2 cup granulated white sugar",
-                "unit": None,
-                "food": None,
-                "disableAmount": True,
-                "quantity": 1,
-                "originalText": None,
-                "referenceId": "034f481b-c426-4a17-b983-5aea9be4974b",
-            },
-            {
-                "title": None,
-                "note": "2 large eggs",
-                "unit": None,
-                "food": None,
-                "disableAmount": True,
-                "quantity": 1,
-                "originalText": None,
-                "referenceId": "37c1f796-3bdb-4856-859f-dbec90bc27e4",
-            },
-            {
-                "title": None,
-                "note": "2 tsp vanilla extract",
-                "unit": None,
-                "food": None,
-                "disableAmount": True,
-                "quantity": 1,
-                "originalText": None,
-                "referenceId": "85561ace-f249-401d-834c-e600a2f6280e",
-            },
-            {
-                "title": None,
-                "note": "1/2 cup creamy peanut butter",
-                "unit": None,
-                "food": None,
-                "disableAmount": True,
-                "quantity": 1,
-                "originalText": None,
-                "referenceId": "ac91bda0-e8a8-491a-976a-ae4e72418cfd",
-            },
-            {
-                "title": None,
-                "note": "1 tsp cornstarch",
-                "unit": None,
-                "food": None,
-                "disableAmount": True,
-                "quantity": 1,
-                "originalText": None,
-                "referenceId": "4d1256b3-115e-4475-83cd-464fbc304cb0",
-            },
-            {
-                "title": None,
-                "note": "1 tsp baking soda",
-                "unit": None,
-                "food": None,
-                "disableAmount": True,
-                "quantity": 1,
-                "originalText": None,
-                "referenceId": "64627441-39f9-4ee3-8494-bafe36451d12",
-            },
-            {
-                "title": None,
-                "note": "1/2 tsp salt",
-                "unit": None,
-                "food": None,
-                "disableAmount": True,
-                "quantity": 1,
-                "originalText": None,
-                "referenceId": "7ae212d0-3cd1-44b0-899e-ec5bd91fd384",
-            },
-            {
-                "title": None,
-                "note": "1 cup cake flour",
-                "unit": None,
-                "food": None,
-                "disableAmount": True,
-                "quantity": 1,
-                "originalText": None,
-                "referenceId": "06967994-8548-4952-a8cc-16e8db228ebd",
-            },
-            {
-                "title": None,
-                "note": "2 cups all-purpose flour",
-                "unit": None,
-                "food": None,
-                "disableAmount": True,
-                "quantity": 1,
-                "originalText": None,
-                "referenceId": "bdb33b23-c767-4465-acf8-3b8e79eb5691",
-            },
-            {
-                "title": None,
-                "note": "2 cups peanut butter chips",
-                "unit": None,
-                "food": None,
-                "disableAmount": True,
-                "quantity": 1,
-                "originalText": None,
-                "referenceId": "12ba0af8-affd-4fb2-9cca-6f1b3e8d3aef",
-            },
-            {
-                "title": None,
-                "note": "1½ cups Reese's Pieces candies",
-                "unit": None,
-                "food": None,
-                "disableAmount": True,
-                "quantity": 1,
-                "originalText": None,
-                "referenceId": "4bdc0598-a3eb-41ee-8af0-4da9348fbfe2",
-            },
-        ],
-        "dateAdded": "2022-09-03",
-        "dateUpdated": "2022-09-10T15:18:19.866085",
-        "createdAt": "2022-09-03T18:31:17.488118",
-        "updateAt": "2022-09-10T15:18:19.869630",
-        "recipeInstructions": [
-            {
-                "id": "60ae53a3-b3ff-40ee-bae3-89fea0b1c637",
-                "title": "",
-                "text": "Preheat oven to 410° degrees F. Line 2 baking sheets with parchment paper or silicone liners; set aside.",
-                "ingredientReferences": [],
-            },
-            {
-                "id": "4e1c30c2-2e96-4a0a-b750-23c9ea3640f8",
-                "title": "",
-                "text": "In the bowl of a stand mixer, cream together the cubed butter, brown sugar and granulated sugar with the paddle attachment for 30 seconds on low speed. Increase speed to medium and beat for another 30 seconds, then increase to medium-high speed and beat for another 30 seconds until mixture is creamy and smooth. Beat in the eggs, one at a time, followed by the vanilla extract and peanut butter, scraping down the sides and bottom of the bowl as needed.",
-                "ingredientReferences": [],
-            },
-            {
-                "id": "9fb8e2a2-d410-445c-bafc-c059203e6f4b",
-                "title": "",
-                "text": "Add in the cornstarch, baking soda, salt, cake flour, and all-purpose flour and mix on low speed until just combined. Fold in the peanut butter chips and Reese's Pieces candies by hand until fully incorporated. Chill the dough uncovered in the fridge for 15 minutes.",
-                "ingredientReferences": [],
-            },
-            {
-                "id": "1ceb9aa4-49f7-4d4a-996f-3c715eb74642",
-                "title": "",
-                "text": 'Using a digital kitchen scale for accuracy, weigh out 6 ounces of cookie dough in a loose, rough textured ball. I like to make my cookie dough balls kind of tall as well. You do not want the dough balls to be smooth and compacted. Place on the baking sheet. Repeat with remaining dough balls, staggering on the baking sheet at least 3" apart from one another, and only placing 4 dough balls per baking sheet.',
-                "ingredientReferences": [],
-            },
-            {
-                "id": "591993fc-72bb-4091-8a12-84640c523fc1",
-                "title": "",
-                "text": "Bake one baking sheet at a time in the center rack of the oven for 10-13 minutes or until the tops are light golden brown and the exterior is dry and dull looking. Centers will be slightly underdone and gooey; this is okay and the cookies will finish cooking some once removed from the oven. Let stand on the baking sheets for at least 30 minutes before serving; the cookies are very delicate and fragile once removed from the oven and need time to set before being moved. Keep remaining dough refrigerated while other cookies bake.",
-                "ingredientReferences": [],
-            },
-        ],
-        "nutrition": {
-            "calories": None,
-            "fatContent": None,
-            "proteinContent": None,
-            "carbohydrateContent": None,
-            "fiberContent": None,
-            "sodiumContent": None,
-            "sugarContent": None,
-        },
-        "settings": {
-            "public": True,
-            "showNutrition": False,
-            "showAssets": False,
-            "landscapeView": False,
-            "disableComments": False,
-            "disableAmount": True,
-            "locked": False,
-        },
-        "assets": [],
-        "notes": [],
-        "extras": {},
-        "comments": [],
-    }
-
-
-def login(username="changeme@email.com", password="MyPassword"):
-
-    payload = {"username": username, "password": password}
-    r = requests.post("http://localhost:9000/api/auth/token", payload)
-
-    # Bearer
-    token = json.loads(r.text).get("access_token")
-    return {"Authorization": f"Bearer {token}"}
-
-
-def populate_data(token):
-    for _ in range(300):
-        payload = payload_factory()
-        r = requests.post("http://localhost:9000/api/recipes", json=payload, headers=token)
-
-        if r.status_code != 201:
-            console.print(f"Error: {r.status_code}")
-            console.print(r.text)
-            exit()
-
-        recipe_json = requests.get(f"http://localhost:9000/api/recipes/{payload['name']}", headers=token)
-
-        if recipe_json.status_code != 200:
-            console.print(f"Error: {recipe_json.status_code}")
-            console.print(recipe_json.text)
-            exit()
-
-        recipe = json.loads(recipe_json.text)
-        update_data = recipe_data(recipe["name"], recipe["slug"], recipe["id"], recipe["userId"], recipe["groupId"])
-
-        r = requests.put(f"http://localhost:9000/api/recipes/{update_data['slug']}", json=update_data, headers=token)
-        if r.status_code != 200:
-            console.print(f"Error: {r.status_code}")
-            console.print(r.text)
-            exit()
-
-
-@dataclass(slots=True)
-class Result:
-    recipes: int
-    time: float
-
-
-def time_request(url, headers) -> Result:
-    start = time.time()
-    r = requests.get(url, headers=headers)
-    end = time.time()
-
-    return Result(len(r.json()["items"]), end - start)
-
-
-def main():
-    token = login()
-    # populate_data(token)
-
-    results: list[Result] = []
-
-    for _ in range(10):
-        result = time_request("http://localhost:9000/api/recipes?perPage=-1&page=1&loadFood=true", token)
-        results.append(result)
-
-    min, max, average = 99, 0, 0
-
-    for result in results:
-        if result.time < min:
-            min = result.time
-
-        if result.time > max:
-            max = result.time
-
-        average += result.time
-
-    tbl1 = Table(title="Requests")
-
-    tbl1.add_column("Recipes", justify="right", style="cyan", no_wrap=True)
-    tbl1.add_column("Time", justify="right", style="magenta")
-
-    for result in results:
-        tbl1.add_row(
-            str(result.recipes),
-            str(result.time),
-        )
-
-    tbl2 = Table(title="Summary")
-
-    tbl2.add_column("Min", justify="right", style="green")
-    tbl2.add_column("Max", justify="right", style="green")
-    tbl2.add_column("Average", justify="right", style="green")
-
-    tbl2.add_row(
-        str(round(min * 1000)) + "ms",
-        str(round(max * 1000)) + "ms",
-        str(round((average / len(results)) * 1000)) + "ms",
-    )
-
-    console = Console()
-    console.print(tbl1)
-    console.print(tbl2)
-
-    # Best Time 289 / 405/ 247
-
-
-if __name__ == "__main__":
-    main()

dev/scripts/api_docs_gen.py

@@ -1,9 +1,7 @@
 import json
 
 from mealie.app import app
-from mealie.core.config import determine_data_dir
-
-DATA_DIR = determine_data_dir()
+from mealie.core.config import DATA_DIR
 
 """Script to export the ReDoc documentation page into a standalone HTML file."""
 

dev/scripts/app_routes_gen.py

@@ -0,0 +1,141 @@
+import re
+from enum import Enum
+from itertools import groupby
+from pathlib import Path
+
+import slugify
+from fastapi import FastAPI
+from humps import camelize
+from jinja2 import Template
+from mealie.app import app
+from pydantic import BaseModel
+
+CWD = Path(__file__).parent
+OUT_DIR = CWD / "output"
+OUT_FILE = OUT_DIR / "app_routes.py"
+
+JS_DIR = OUT_DIR / "javascriptAPI"
+JS_OUT_FILE = JS_DIR / "apiRoutes.js"
+TEMPLATES_DIR = CWD / "templates"
+
+PYTEST_TEMPLATE = TEMPLATES_DIR / "pytest_routes.j2"
+JS_REQUESTS = TEMPLATES_DIR / "js_requests.j2"
+JS_ROUTES = TEMPLATES_DIR / "js_routes.j2"
+JS_INDEX = TEMPLATES_DIR / "js_index.j2"
+
+JS_DIR.mkdir(exist_ok=True, parents=True)
+
+
+class RouteObject:
+    def __init__(self, route_string) -> None:
+        self.prefix = "/" + route_string.split("/")[1]
+        self.route = "/" + route_string.split("/", 2)[2]
+        self.js_route = self.route.replace("{", "${")
+        self.parts = route_string.split("/")[1:]
+        self.var = re.findall(r"\{(.*?)\}", route_string)
+        self.is_function = "{" in self.route
+        self.router_slug = slugify.slugify("_".join(self.parts[1:]), separator="_")
+        self.router_camel = camelize(self.router_slug)
+
+    def __repr__(self) -> str:
+        return f"""Route: {self.route}
+Parts: {self.parts}
+Function: {self.is_function}
+Var: {self.var}
+Slug: {self.router_slug}
+"""
+
+
+class RequestType(str, Enum):
+    get = "get"
+    put = "put"
+    post = "post"
+    patch = "patch"
+    delete = "delete"
+
+
+class HTTPRequest(BaseModel):
+    request_type: RequestType
+    description: str = ""
+    summary: str
+    tags: list[str]
+
+    @property
+    def summary_camel(self):
+        return camelize(self.summary)
+
+    @property
+    def js_docs(self):
+        return self.description.replace("\n", "  \n  * ")
+
+
+class PathObject(BaseModel):
+    route_object: RouteObject
+    http_verbs: list[HTTPRequest]
+
+    class Config:
+        arbitrary_types_allowed = True
+
+
+def get_path_objects(app: FastAPI):
+    paths = []
+
+    for key, value in app.openapi().items():
+        if key == "paths":
+            for key, value in value.items():
+
+                paths.append(
+                    PathObject(
+                        route_object=RouteObject(key),
+                        http_verbs=[HTTPRequest(request_type=k, **v) for k, v in value.items()],
+                    )
+                )
+
+    return paths
+
+
+def read_template(file: Path):
+    with open(file, "r") as f:
+        return f.read()
+
+
+def generate_template(app):
+    paths = get_path_objects(app)
+
+    static_paths = [x.route_object for x in paths if not x.route_object.is_function]
+    function_paths = [x.route_object for x in paths if x.route_object.is_function]
+
+    static_paths.sort(key=lambda x: x.router_slug)
+    function_paths.sort(key=lambda x: x.router_slug)
+
+    template = Template(read_template(PYTEST_TEMPLATE))
+    content = template.render(paths={"prefix": "/api", "static_paths": static_paths, "function_paths": function_paths})
+    with open(OUT_FILE, "w") as f:
+        f.write(content)
+
+    template = Template(read_template(JS_ROUTES))
+    content = template.render(
+        paths={"prefix": "/api", "static_paths": static_paths, "function_paths": function_paths, "all_paths": paths}
+    )
+    with open(JS_OUT_FILE, "w") as f:
+        f.write(content)
+
+    all_tags = []
+    for k, g in groupby(paths, lambda x: x.http_verbs[0].tags[0]):
+        template = Template(read_template(JS_REQUESTS))
+        content = template.render(paths={"all_paths": list(g), "export_name": camelize(k)})
+
+        all_tags.append(camelize(k))
+
+        with open(JS_DIR.joinpath(camelize(k) + ".js"), "w") as f:
+            f.write(content)
+
+    template = Template(read_template(JS_INDEX))
+    content = template.render(files={"files": all_tags})
+
+    with open(JS_DIR.joinpath("index.js"), "w") as f:
+        f.write(content)
+
+
+if __name__ == "__main__":
+    generate_template(app)

dev/scripts/github_get_release_fixes.py

@@ -0,0 +1,32 @@
+import json
+
+import requests
+from pydantic import BaseModel
+
+
+class GithubIssue(BaseModel):
+    url: str
+    number: int
+    title: str
+
+
+def get_issues_by_label(label="fixed-pending-release") -> list[GithubIssue]:
+
+    issues_url = f"https://api.github.com/repos/hay-kot/mealie/issues?labels={label}"
+
+    response = requests.get(issues_url)
+    issues = json.loads(response.text)
+    return [GithubIssue(**issue) for issue in issues]
+
+
+def format_markdown_list(issues: list[GithubIssue]) -> str:
+    return "\n".join(f"- [{issue.number}]({issue.url}) - {issue.title}" for issue in issues)
+
+
+def main() -> None:
+    issues = get_issues_by_label()
+    print(format_markdown_list(issues))
+
+
+if __name__ == "__main__":
+    main()

dev/scripts/output/app_routes.py

@@ -0,0 +1,156 @@
+# This Content is Auto Generated for Pytest
+
+
+class AppRoutes:
+    def __init__(self) -> None:
+        self.prefix = '/api'
+
+        self.about_events = "/api/about/events"
+        self.about_events_notifications = "/api/about/events/notifications"
+        self.about_events_notifications_test = "/api/about/events/notifications/test"
+        self.about_recipes_defaults = "/api/about/recipes/defaults"
+        self.auth_refresh = "/api/auth/refresh"
+        self.auth_token = "/api/auth/token"
+        self.auth_token_long = "/api/auth/token/long"
+        self.backups_available = "/api/backups/available"
+        self.backups_export_database = "/api/backups/export/database"
+        self.backups_upload = "/api/backups/upload"
+        self.categories = "/api/categories"
+        self.categories_empty = "/api/categories/empty"
+        self.debug = "/api/debug"
+        self.debug_last_recipe_json = "/api/debug/last-recipe-json"
+        self.debug_log = "/api/debug/log"
+        self.debug_statistics = "/api/debug/statistics"
+        self.debug_version = "/api/debug/version"
+        self.groups = "/api/groups"
+        self.groups_self = "/api/groups/self"
+        self.meal_plans_all = "/api/meal-plans/all"
+        self.meal_plans_create = "/api/meal-plans/create"
+        self.meal_plans_this_week = "/api/meal-plans/this-week"
+        self.meal_plans_today = "/api/meal-plans/today"
+        self.meal_plans_today_image = "/api/meal-plans/today/image"
+        self.migrations = "/api/migrations"
+        self.recipes_category = "/api/recipes/category"
+        self.recipes_create = "/api/recipes/create"
+        self.recipes_create_from_zip = "/api/recipes/create-from-zip"
+        self.recipes_create_url = "/api/recipes/create-url"
+        self.recipes_summary = "/api/recipes/summary"
+        self.recipes_summary_uncategorized = "/api/recipes/summary/uncategorized"
+        self.recipes_summary_untagged = "/api/recipes/summary/untagged"
+        self.recipes_tag = "/api/recipes/tag"
+        self.recipes_test_scrape_url = "/api/recipes/test-scrape-url"
+        self.shopping_lists = "/api/shopping-lists"
+        self.site_settings = "/api/site-settings"
+        self.site_settings_custom_pages = "/api/site-settings/custom-pages"
+        self.site_settings_webhooks_test = "/api/site-settings/webhooks/test"
+        self.tags = "/api/tags"
+        self.tags_empty = "/api/tags/empty"
+        self.themes = "/api/themes"
+        self.themes_create = "/api/themes/create"
+        self.users = "/api/users"
+        self.users_api_tokens = "/api/users/api-tokens"
+        self.users_self = "/api/users/self"
+        self.users_sign_ups = "/api/users/sign-ups"
+        self.utils_download = "/api/utils/download"
+
+    def about_events_id(self, id):
+        return f"{self.prefix}/about/events/{id}"
+
+    def about_events_notifications_id(self, id):
+        return f"{self.prefix}/about/events/notifications/{id}"
+
+    def backups_file_name_delete(self, file_name):
+        return f"{self.prefix}/backups/{file_name}/delete"
+
+    def backups_file_name_download(self, file_name):
+        return f"{self.prefix}/backups/{file_name}/download"
+
+    def backups_file_name_import(self, file_name):
+        return f"{self.prefix}/backups/{file_name}/import"
+
+    def categories_category(self, category):
+        return f"{self.prefix}/categories/{category}"
+
+    def debug_log_num(self, num):
+        return f"{self.prefix}/debug/log/{num}"
+
+    def groups_id(self, id):
+        return f"{self.prefix}/groups/{id}"
+
+    def meal_plans_id(self, id):
+        return f"{self.prefix}/meal-plans/{id}"
+
+    def meal_plans_id_shopping_list(self, id):
+        return f"{self.prefix}/meal-plans/{id}/shopping-list"
+
+    def meal_plans_plan_id(self, plan_id):
+        return f"{self.prefix}/meal-plans/{plan_id}"
+
+    def media_recipes_recipe_slug_assets_file_name(self, recipe_slug, file_name):
+        return f"{self.prefix}/media/recipes/{recipe_slug}/assets/{file_name}"
+
+    def media_recipes_recipe_slug_images_file_name(self, recipe_slug, file_name):
+        return f"{self.prefix}/media/recipes/{recipe_slug}/images/{file_name}"
+
+    def migrations_import_type_file_name_delete(self, import_type, file_name):
+        return f"{self.prefix}/migrations/{import_type}/{file_name}/delete"
+
+    def migrations_import_type_file_name_import(self, import_type, file_name):
+        return f"{self.prefix}/migrations/{import_type}/{file_name}/import"
+
+    def migrations_import_type_upload(self, import_type):
+        return f"{self.prefix}/migrations/{import_type}/upload"
+
+    def recipes_recipe_slug(self, recipe_slug):
+        return f"{self.prefix}/recipes/{recipe_slug}"
+
+    def recipes_recipe_slug_assets(self, recipe_slug):
+        return f"{self.prefix}/recipes/{recipe_slug}/assets"
+
+    def recipes_recipe_slug_image(self, recipe_slug):
+        return f"{self.prefix}/recipes/{recipe_slug}/image"
+
+    def recipes_recipe_slug_zip(self, recipe_slug):
+        return f"{self.prefix}/recipes/{recipe_slug}/zip"
+
+    def recipes_slug_comments(self, slug):
+        return f"{self.prefix}/recipes/{slug}/comments"
+
+    def recipes_slug_comments_id(self, slug, id):
+        return f"{self.prefix}/recipes/{slug}/comments/{id}"
+
+    def shopping_lists_id(self, id):
+        return f"{self.prefix}/shopping-lists/{id}"
+
+    def site_settings_custom_pages_id(self, id):
+        return f"{self.prefix}/site-settings/custom-pages/{id}"
+
+    def tags_tag(self, tag):
+        return f"{self.prefix}/tags/{tag}"
+
+    def themes_id(self, id):
+        return f"{self.prefix}/themes/{id}"
+
+    def users_api_tokens_token_id(self, token_id):
+        return f"{self.prefix}/users/api-tokens/{token_id}"
+
+    def users_id(self, id):
+        return f"{self.prefix}/users/{id}"
+
+    def users_id_favorites(self, id):
+        return f"{self.prefix}/users/{id}/favorites"
+
+    def users_id_favorites_slug(self, id, slug):
+        return f"{self.prefix}/users/{id}/favorites/{slug}"
+
+    def users_id_image(self, id):
+        return f"{self.prefix}/users/{id}/image"
+
+    def users_id_password(self, id):
+        return f"{self.prefix}/users/{id}/password"
+
+    def users_id_reset_password(self, id):
+        return f"{self.prefix}/users/{id}/reset-password"
+
+    def users_sign_ups_token(self, token):
+        return f"{self.prefix}/users/sign-ups/{token}"

dev/scripts/publish-release-branch.sh

@@ -0,0 +1,11 @@
+git checkout dev
+git merge --strategy=ours master    # keep the content of this branch, but record a merge
+git checkout master
+git merge dev             # fast-forward master up to the merge
+
+
+## TODOs
+
+# Create New Branch v0.x.x
+# Push Branch Version to Github
+# Create Pull Request

dev/scripts/templates/js_index.j2

@@ -0,0 +1,7 @@
+{% for api in files.files  %}
+import { {{ api }}API } from "./{{api}}.js" {% endfor %}
+
+export const api = {
+{% for api in files.files  %}
+    {{api}}: {{api}}API, {% endfor %}
+}

dev/scripts/templates/js_requests.j2

@@ -0,0 +1,19 @@
+// This Content is Auto Generated
+import { API_ROUTES } from "./apiRoutes"
+
+export const {{paths.export_name}}API = { {% for path in paths.all_paths  %} {% for verb in path.http_verbs  %} {% if path.route_object.is_function %}
+  /** {{ verb.js_docs }} {% for v in path.route_object.var %}
+   * @param {{ v }} {% endfor %}
+   */
+  {{ verb.summary_camel }}({{path.route_object.var|join(", ")}}) {
+    const response = await apiReq.{{ verb.request_type.value }}(API_ROUTES.{{ path.route_object.router_camel }}({{path.route_object.var|join(", ")}}))
+    return response.data
+  }, {% else %}
+  /** {{ verb.js_docs }} {% for v in path.route_object.var %}
+   * @param {{ v }} {% endfor %}
+   */
+  {{ verb.summary_camel }}() {
+    const response = await apiReq.{{ verb.request_type.value }}(API_ROUTES.{{ path.route_object.router_camel }})
+    return response.data
+  },{% endif %} {% endfor %} {% endfor %}
+}

dev/scripts/templates/js_routes.j2

@@ -0,0 +1,7 @@
+// This Content is Auto Generated
+const prefix = '{{paths.prefix}}'
+export const API_ROUTES = { {% for path in paths.static_paths %}
+  {{ path.router_camel }}: `${prefix}{{ path.route }}`,{% endfor %}
+{% for path in paths.function_paths  %}
+  {{path.router_camel}}: ({{path.var|join(", ")}}) => `${prefix}{{ path.js_route }}`,{% endfor %}
+}

dev/scripts/templates/pytest_routes.j2

@@ -0,0 +1,12 @@
+# This Content is Auto Generated for Pytest
+
+
+class AppRoutes:
+    def __init__(self) -> None:
+        self.prefix = '{{paths.prefix}}'
+{% for path in paths.static_paths %}
+        self.{{ path.router_slug }} = "{{path.prefix}}{{ path.route }}"{% endfor %}
+{% for path in paths.function_paths  %}
+    def {{path.router_slug}}(self, {{path.var|join(", ")}}):
+        return f"{self.prefix}{{ path.route }}"
+{% endfor %}

docker-compose.dev.yml

@@ -1,6 +1,5 @@
-# WARNING: currently not functional, see #756, #1072
-# Use root/example as user/password credentials
-version: "3.4"
+# Use changeme@email.com/MyPassword as user/password credentials
+version: "3.1"
 services:
   # Vue Frontend
   mealie-frontend:
@@ -8,14 +7,12 @@ services:
     image: mealie-frontend:dev
     build:
       context: ./frontend
-      dockerfile: Dockerfile.frontend
+      dockerfile: frontend.Dockerfile
     restart: always
     ports:
       - 9920:8080
     environment:
-      - GLOBAL_MIDDLEWARE=null
-      - BASE_URL=""
-      - ALLOW_SIGNUP=true
+      VUE_APP_API_BASE_URL: "http://mealie-api:9000"
     volumes:
       - ./frontend/:/app
       - /app/node_modules

docker-compose.yml

@@ -1,93 +1,30 @@
-version: "3.4"
+version: "3.1"
 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
+    container_name: mealie
     restart: always
-    volumes:
-      - mealie-data:/app/data/
+    depends_on:
+      - "postgres"
     ports:
-      - 9092:9000
+      - 9090:80
     environment:
-      ALLOW_SIGNUP: "false"
-
-      DB_ENGINE: sqlite # Optional: 'sqlite', 'postgres'
-      # =====================================
-      # Postgres Config
+      DB_ENGINE: postgres # Optional: 'sqlite', 'postgres'
       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
+      # WORKERS_PER_CORE: 0.5
+      # MAX_WORKERS: 8
+      # WEB_CONCURRENCY: 2
+  postgres:
+    container_name: postgres
+    image: postgres
+    restart: always
+    environment:
+      POSTGRES_PASSWORD: mealie
+      POSTGRES_USER: mealie

docs/Caddyfile

@@ -0,0 +1,15 @@
+{
+  auto_https off
+}
+
+:80 {
+  root * /srv
+  encode gzip
+  uri strip_suffix /
+
+  handle {
+    try_files {path} {path}/ /index.html
+    file_server 
+  }
+
+}

docs/Dockerfile

@@ -0,0 +1,10 @@
+FROM python:3.8-slim as build-stage
+WORKDIR /app
+RUN pip install --no-cache-dir mkdocs mkdocs-material
+COPY . .
+RUN mkdocs build
+
+FROM caddy:alpine
+WORKDIR /app
+COPY ./Caddyfile /etc/caddy/Caddyfile
+COPY --from=build-stage /app/site /srv

docs/docker-compose.yml

@@ -0,0 +1,11 @@
+version: "3"
+services:
+  wiki:
+    container_name: mealie-docs
+    image: mealie-docs
+    ports:
+      - 8888:80
+    build:
+      context: .
+      dockerfile: Dockerfile
+    restart: always

docs/docs/assets/img/docker-diagram.drawio.svg

@@ -1,294 +0,0 @@
-<svg host="65bd71144e" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="800px" height="377px" viewBox="-0.5 -0.5 800 377" content="&lt;mxfile&gt;&lt;diagram id=&quot;3dpkjlI-_KjnuoPEQ-Vt&quot; name=&quot;Page-1&quot;&gt;5VlNU9swEP01maGHeiwp/jpCAuXQTpmhM22PwhaJB8fyKApJ+uu7jqVYihxIMRAoPiTW6sPye29XK3lARrPVF0Gr6TeesWKA/Ww1IOMBxsiPMPzVlrWywNVYJiLPlK01XOd/mO6qrIs8Y3OroeS8kHllG1NeliyVlo0KwZd2s1te2E+t6IQ5huuUFq71Z57JaWONA7+1X7J8MtVPRr6qmVHdWBnmU5rxpWEi5wMyEpzL5m62GrGiRk/j0vS72FO7nZhgpTykAw6aHve0WKiXUxOTa/22gi/KjNUd/AE5W05zya4rmta1SyAYbFM5K6CE4FYNx4Rkq71zQts3BY0wPmNSrKGJ6oDDpodWx7ApLlukoyRpbFMDZRKpflSxO9mO3AIANwqDbjzIi8DhvHsHQvvhiCMvDiI0xM1vYqEzjD2jLg5iB6wAR57RQDufBR1GntECDYf9kRw6SI55eseEgyfAIG3Q5lLwOzbiBRdgKXkJLc9u86LYMdEin5RQTAFcGJic1aDm4KanqmKWZ1n9mE6WbB5veSmv1aT2KfafWbOFrH3eFLLv4Q4p45rU/hS4vj1jgBn7TKv8AVmjV5F1GGKvQ7gKq9i3KrVoDegQgGS6hQbbxDEcerjDdfpgilxQL3/8uHLgZBmsGKrIihu+PG8NByE55wuRqsGUFiQVEyYtbuvHPIi2YAWV+b29cPUBINonqlsBLsTK7OjKGiL/gYD5ZpUV7wM2o5I6oELiUNW36brIAV1BHof2puHh683WQNO7yYad7wsJwzAdf5uEC6T+PJ4eh10LkI6K+NEVLO5YshAKOnns5dsuBdCFVhX8dpLwrE4euE4eH8vJkevlO0hcPBkMwECsf6lld1P4XRe8QBfHK7NyvDZLV0zk8Db1ar8xPjV8Pjuym66nQtC10aDieSnnxshXtcGIVFFghRFCdhIG3BWIWg6b57WMbid+GMm+Q/II4k09wSOnvEFg4ZCEXhQnxuVEiMTfJkx2XuuhZ0hlEXl1sR+ka71rNoUdHS1kaJZbNSUJBDVySny9/T1iUgCzsV3NUth2g26mAcjeN+nMz0rUdxYh3aYXkO7OqVeG+bIS9F0JaiUcQYOJA90J+uQg93/uOAm2NR11p6g7u8+OFlYE7U7O+pCE3WXnBH8UkoIE2yct74MyN7afkA9DGSYeMYO8naMFxPPNi7wVzvAH5iwivheaiNqrfRA+tuU8Emfu8fMIkKGwNRfvh7leh/+bwxv73HQPPS93btpxdv3RaGhOZ1+VBii2372a7Wz7+ZCc/wU=&lt;/diagram&gt;&lt;/mxfile&gt;">
-    <defs/>
-    <g>
-        <rect x="0" y="0" width="799" height="376" fill="rgb(255, 255, 255)" stroke="rgb(0, 0, 0)" pointer-events="all"/>
-        <rect x="261.86" y="34.57" width="527.14" height="321.43" fill="rgb(255, 255, 255)" stroke="rgb(0, 0, 0)" pointer-events="all"/>
-        <rect x="261.86" y="6" width="70.29" height="28.57" fill="none" stroke="none" pointer-events="all"/>
-        <g transform="translate(-0.5 -0.5)">
-            <switch>
-                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
-                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 68px; height: 1px; padding-top: 20px; margin-left: 263px;">
-                        <div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
-                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; font-weight: bold; white-space: normal; overflow-wrap: normal;">
-                                Docker
-                            </div>
-                        </div>
-                    </div>
-                </foreignObject>
-                <text x="297" y="24" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle" font-weight="bold">
-                    Docker
-                </text>
-            </switch>
-        </g>
-        <rect x="636.71" y="66.71" width="128.86" height="64.29" rx="9.64" ry="9.64" fill="rgb(255, 255, 255)" stroke="rgb(0, 0, 0)" pointer-events="all"/>
-        <g transform="translate(-0.5 -0.5)">
-            <switch>
-                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
-                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 127px; height: 1px; padding-top: 99px; margin-left: 638px;">
-                        <div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
-                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">
-                                mealie-api
-                            </div>
-                        </div>
-                    </div>
-                </foreignObject>
-                <text x="701" y="102" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">
-                    mealie-api
-                </text>
-            </switch>
-        </g>
-        <path d="M 513.71 98.86 L 565.33 98.86 Q 575.33 98.86 585.33 98.86 L 630.35 98.86" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/>
-        <path d="M 635.6 98.86 L 628.6 102.36 L 630.35 98.86 L 628.6 95.36 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/>
-        <g transform="translate(-0.5 -0.5)">
-            <switch>
-                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
-                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 99px; margin-left: 576px;">
-                        <div data-drawio-colors="color: rgb(0, 0, 0); background-color: rgb(255, 255, 255); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
-                            <div style="display: inline-block; font-size: 11px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; background-color: rgb(255, 255, 255); white-space: nowrap;">
-                                HTTP
-                            </div>
-                        </div>
-                    </div>
-                </foreignObject>
-                <text x="576" y="102" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="11px" text-anchor="middle">
-                    HTTP
-                </text>
-            </switch>
-        </g>
-        <rect x="384.86" y="66.71" width="128.86" height="64.29" rx="9.64" ry="9.64" fill="rgb(255, 255, 255)" stroke="rgb(0, 0, 0)" pointer-events="all"/>
-        <g transform="translate(-0.5 -0.5)">
-            <switch>
-                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
-                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 127px; height: 1px; padding-top: 99px; margin-left: 386px;">
-                        <div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
-                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">
-                                mealie-frontend
-                            </div>
-                        </div>
-                    </div>
-                </foreignObject>
-                <text x="449" y="102" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">
-                    mealie-frontend
-                </text>
-            </switch>
-        </g>
-        <path d="M 660.14 229.57 C 660.14 221.29 678.5 214.57 701.14 214.57 C 712.02 214.57 722.45 216.15 730.13 218.96 C 737.82 221.78 742.14 225.59 742.14 229.57 L 742.14 315.29 C 742.14 323.57 723.79 330.29 701.14 330.29 C 678.5 330.29 660.14 323.57 660.14 315.29 Z" fill="rgb(255, 255, 255)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/>
-        <path d="M 742.14 229.57 C 742.14 237.86 723.79 244.57 701.14 244.57 C 678.5 244.57 660.14 237.86 660.14 229.57" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/>
-        <g transform="translate(-0.5 -0.5)">
-            <switch>
-                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
-                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 80px; height: 1px; padding-top: 285px; margin-left: 661px;">
-                        <div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
-                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">
-                                mealie-data
-                            </div>
-                        </div>
-                    </div>
-                </foreignObject>
-                <text x="701" y="289" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">
-                    mealie-data
-                </text>
-            </switch>
-        </g>
-        <path d="M 701.05 131 L 701.05 162.79 Q 701.05 172.79 701.05 182.79 L 701.05 208.2" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/>
-        <path d="M 701.05 213.45 L 697.55 206.45 L 701.05 208.2 L 704.55 206.45 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/>
-        <g transform="translate(-0.5 -0.5)">
-            <switch>
-                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
-                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 173px; margin-left: 701px;">
-                        <div data-drawio-colors="color: rgb(0, 0, 0); background-color: rgb(255, 255, 255); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
-                            <div style="display: inline-block; font-size: 11px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; background-color: rgb(255, 255, 255); white-space: nowrap;">
-                                /app/data
-                            </div>
-                        </div>
-                    </div>
-                </foreignObject>
-                <text x="701" y="176" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="11px" text-anchor="middle">
-                    /app/data
-                </text>
-            </switch>
-        </g>
-        <path d="M 449.29 131 L 449.29 262.43 Q 449.29 272.43 459.29 272.43 L 653.77 272.43" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/>
-        <path d="M 659.02 272.43 L 652.02 275.93 L 653.77 272.43 L 652.02 268.93 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/>
-        <g transform="translate(-0.5 -0.5)">
-            <switch>
-                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
-                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 272px; margin-left: 484px;">
-                        <div data-drawio-colors="color: rgb(0, 0, 0); background-color: rgb(255, 255, 255); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
-                            <div style="display: inline-block; font-size: 11px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; background-color: rgb(255, 255, 255); white-space: nowrap;">
-                                /app/data/
-                            </div>
-                        </div>
-                    </div>
-                </foreignObject>
-                <text x="484" y="276" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="11px" text-anchor="middle">
-                    /app/data/
-                </text>
-            </switch>
-        </g>
-        <rect x="29" y="82.79" width="90.57" height="32.14" fill="rgb(255, 255, 255)" stroke="rgb(0, 0, 0)" pointer-events="all"/>
-        <g transform="translate(-0.5 -0.5)">
-            <switch>
-                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
-                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 89px; height: 1px; padding-top: 99px; margin-left: 30px;">
-                        <div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
-                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">
-                                Client
-                            </div>
-                        </div>
-                    </div>
-                </foreignObject>
-                <text x="74" y="102" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">
-                    Client
-                </text>
-            </switch>
-        </g>
-        <path d="M 320.43 98.86 L 342.48 98.86 Q 352.48 98.86 362.48 98.86 L 378.49 98.86" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/>
-        <path d="M 383.74 98.86 L 376.74 102.36 L 378.49 98.86 L 376.74 95.36 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/>
-        <rect x="203.29" y="86" width="117.14" height="25.71" rx="3.86" ry="3.86" fill="rgb(255, 255, 255)" stroke="rgb(0, 0, 0)" pointer-events="all"/>
-        <g transform="translate(-0.5 -0.5)">
-            <switch>
-                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
-                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 115px; height: 1px; padding-top: 99px; margin-left: 204px;">
-                        <div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
-                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">
-                                9925:3000
-                            </div>
-                        </div>
-                    </div>
-                </foreignObject>
-                <text x="262" y="102" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">
-                    9925:3000
-                </text>
-            </switch>
-        </g>
-        <path d="M 119.57 98.86 L 151.05 98.86 Q 161.05 98.86 171.05 98.86 L 196.92 98.86" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/>
-        <path d="M 202.17 98.86 L 195.17 102.36 L 196.92 98.86 L 195.17 95.36 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/>
-        <g transform="translate(-0.5 -0.5)">
-            <switch>
-                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
-                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 99px; margin-left: 161px;">
-                        <div data-drawio-colors="color: rgb(0, 0, 0); background-color: rgb(255, 255, 255); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
-                            <div style="display: inline-block; font-size: 11px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; background-color: rgb(255, 255, 255); white-space: nowrap;">
-                                HTTP
-                            </div>
-                        </div>
-                    </div>
-                </foreignObject>
-                <text x="161" y="102" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="11px" text-anchor="middle">
-                    HTTP
-                </text>
-            </switch>
-        </g>
-        <rect x="297" y="60.29" width="70.29" height="38.57" fill="none" stroke="none" pointer-events="all"/>
-        <g transform="translate(-0.5 -0.5)">
-            <switch>
-                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
-                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 68px; height: 1px; padding-top: 80px; margin-left: 298px;">
-                        <div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
-                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; font-weight: bold; white-space: normal; overflow-wrap: normal;">
-                                (1)
-                            </div>
-                        </div>
-                    </div>
-                </foreignObject>
-                <text x="332" y="83" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle" font-weight="bold">
-                    (1)
-                </text>
-            </switch>
-        </g>
-        <rect x="566.43" y="60.29" width="70.29" height="38.57" fill="none" stroke="none" pointer-events="all"/>
-        <g transform="translate(-0.5 -0.5)">
-            <switch>
-                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
-                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 68px; height: 1px; padding-top: 80px; margin-left: 567px;">
-                        <div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
-                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; font-weight: bold; white-space: normal; overflow-wrap: normal;">
-                                (2)
-                            </div>
-                        </div>
-                    </div>
-                </foreignObject>
-                <text x="602" y="83" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle" font-weight="bold">
-                    (2)
-                </text>
-            </switch>
-        </g>
-        <rect x="497.31" y="239" width="70.29" height="38.57" fill="none" stroke="none" pointer-events="all"/>
-        <g transform="translate(-0.5 -0.5)">
-            <switch>
-                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
-                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 68px; height: 1px; padding-top: 258px; margin-left: 498px;">
-                        <div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
-                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; font-weight: bold; white-space: normal; overflow-wrap: normal;">
-                                (3)
-                            </div>
-                        </div>
-                    </div>
-                </foreignObject>
-                <text x="532" y="262" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle" font-weight="bold">
-                    (3)
-                </text>
-            </switch>
-        </g>
-        <rect x="704.66" y="142.57" width="70.29" height="38.57" fill="none" stroke="none" pointer-events="all"/>
-        <g transform="translate(-0.5 -0.5)">
-            <switch>
-                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
-                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 68px; height: 1px; padding-top: 162px; margin-left: 706px;">
-                        <div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
-                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; font-weight: bold; white-space: normal; overflow-wrap: normal;">
-                                (3)
-                            </div>
-                        </div>
-                    </div>
-                </foreignObject>
-                <text x="740" y="165" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle" font-weight="bold">
-                    (3)
-                </text>
-            </switch>
-        </g>
-        <rect x="384.86" y="44" width="70.29" height="28.57" fill="none" stroke="none" pointer-events="all"/>
-        <g transform="translate(-0.5 -0.5)">
-            <switch>
-                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
-                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 68px; height: 1px; padding-top: 58px; margin-left: 386px;">
-                        <div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
-                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; font-weight: bold; white-space: normal; overflow-wrap: normal;">
-                                Container
-                            </div>
-                        </div>
-                    </div>
-                </foreignObject>
-                <text x="420" y="62" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle" font-weight="bold">
-                    Container
-                </text>
-            </switch>
-        </g>
-        <rect x="636.71" y="44" width="70.29" height="28.57" fill="none" stroke="none" pointer-events="all"/>
-        <g transform="translate(-0.5 -0.5)">
-            <switch>
-                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
-                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 68px; height: 1px; padding-top: 58px; margin-left: 638px;">
-                        <div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
-                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; font-weight: bold; white-space: normal; overflow-wrap: normal;">
-                                Container
-                            </div>
-                        </div>
-                    </div>
-                </foreignObject>
-                <text x="672" y="62" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle" font-weight="bold">
-                    Container
-                </text>
-            </switch>
-        </g>
-    </g>
-    <switch>
-        <g requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"/>
-        <a transform="translate(0,-5)" xlink:href="https://www.diagrams.net/doc/faq/svg-export-text-problems" target="_blank">
-            <text text-anchor="middle" font-size="10px" x="50%" y="100%">
-                Viewer does not support full SVG 1.1
-            </text>
-        </a>
-    </switch>
-</svg>