Chore/bump deps (#853)

* add LDAP dep

* bump extruct and scraper

* allow for disabling auto backup

* v0.5.4 changelog

.dockerignore

@@ -1,3 +1,29 @@
+.git
+.github
+.dockerignore
+.gitignore
+
+.idea
+.vscode
+
+__pycache__/
+*.py[cod]
+*$py.class
+*.so
+htmlcov/
+.coverage
+.coverage.*
+.pytest_cache/
+.venv
+venv
+
+.DS_Store
+.AppleDouble
+.LSOverride
+._*
+
 */node_modules
 */dist
-*/data/db
+*/data/db
+*/mealie/test 
+*/mealie/.temp

.flake8

@@ -0,0 +1,6 @@
+[flake8]
+ignore = [
+    E501 # Line Length - See Black Config in pyproject.toml
+    E402 # Import Not at Top of File
+]
+exclude = _all_models.py

.github/ISSUE_TEMPLATE/bug-report.yaml

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

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,38 +0,0 @@
----
-name: Bug Report
-about: Create a bug report to help us improve
-title: ''
-labels: bug
-assignees: ''
-
----
-
-**Describe the bug**
-<!-- A clear and concise description of what the bug is. -->
-
-**Steps To Reproduce**
-Please be specific!
-1. Go to '...'
-2. Click on '....'
-3. etc.
-
-**Sample Code**
-<!-- If applicable, please include Sample code to reproduce the issue. -->
-
-**Expected behavior**
-<!-- A clear and concise description of what you expected to happen. -->
-
-**Actual Behavior**
-<!-- A clear and concise description of what actually happens. -->
-
-**Screenshots**
-<!-- If applicable, add screenshots to help explain your problem. -->
-
-**Device Information (please complete the following information):**
- - OS: [e.g., WSL2 on Win10, Mac]
- - Deployment: [e.g., Docker-version, docker-compose, Python application]
- - Browser: [e.g., chrome, safari]
- - Version: [e.g., 0.2.0-dev]
-
-**Additional context**
-<!-- Add any other context about the problem here. If applicable, please include why you think the bug is occurring and/or troubleshooting you have already performed. -->

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

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

.github/ISSUE_TEMPLATE/v1-task.yaml

@@ -0,0 +1,38 @@
+---
+name: v1.0.0b Task
+description: "CONTRIBUTORS ONLY: Submit a Task that needs to be completed"
+title: "[v1.0.0b] [Task] - TASK DESCRIPTION"
+labels:
+  - task
+  - v1
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for your interest in Mealie! 🚀
+
+        This is a place for Mealie contributors to find tasks that need to get done around the repository. Tasks are different than issues as they are generally related to providing a new feature or improve an existing feature. They are _generally_ not related to an issue.
+
+        **DO NOT** create a task unless
+        - 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. 
+
+        **Interested in Taking This?**
+
+        If you're interested in completing this tasks and it hasn't already been taken, comment below and to let others know you're working on it. As you work through the task, I ask that you submit a draft pull request as soon as possible, and tag this issue so we can all collaborate as best as possible.
+  - type: textarea
+    id: problem
+    attributes:
+      label: What is the problem this task addresses?
+      placeholder: A clear and concise description of what the problem this task will address.
+    validations:
+      required: true
+  - type: textarea
+    id: solution
+    attributes:
+      label: Proposed/Possible Solution(s)?
+      placeholder: Provide as much context around the idea as possible with potential files and roadblocks that may come up
+    validations:
+      required: true

.github/stale.yaml

@@ -0,0 +1,17 @@
+# Number of days of inactivity before an issue becomes stale
+daysUntilStale: 60
+# Number of days of inactivity before a stale issue is closed
+daysUntilClose: 7
+# Issues with these labels will never be considered stale
+exemptLabels:
+  - pinned
+  - security
+# Label to use when marking an issue as 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
+  recent activity. It will be closed if no further activity occurs. Thank you
+  for your contributions.
+# Comment to post when closing a stale issue. Set to `false` to disable
+closeComment: false

.github/workflows/build-docs.yml

@@ -1,8 +1,7 @@
 name: Publish docs via GitHub Pages
 on:
-  push:
-    branches:
-      - master
+  release:
+    types: [published]
 
 jobs:
   build:
@@ -10,7 +9,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout main
-        uses: actions/checkout@v1
+        uses: actions/checkout@v2
 
       - name: Deploy docs
         uses: mhausenblas/mkdocs-deploy-gh-pages@master

.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

@@ -44,6 +44,6 @@ jobs:
       #
       - name: build the image
         run: |
-          docker build --push \
+          docker build --push --no-cache \
             --tag hkotel/mealie:dev \
-            --platform linux/amd64,linux/arm/v7,linux/arm64 .
+            --platform linux/amd64,linux/arm64 .

.github/workflows/dockerbuild.prod.yml

@@ -1,9 +1,8 @@
 name: Docker Build Production
 
 on:
-  push:
-    branches:
-      - master
+  release:
+    types: [published]
 
 jobs:
   build:
@@ -46,4 +45,4 @@ jobs:
         run: |
           docker build --push \
             --tag hkotel/mealie:latest \
-            --platform linux/amd64,linux/arm/v7,linux/arm64 .
+            --platform linux/amd64,linux/arm64 .

.github/workflows/dockerbuild.release.yml

@@ -0,0 +1,56 @@
+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 .

.github/workflows/pytest.yml

@@ -1,54 +0,0 @@
-name: Project Tests
-on:
-  push:
-    branches:
-      - master
-      - dev
-  pull_request:
-    branches:
-      - master
-      - dev
-
-jobs:
-  tests:
-    runs-on: ubuntu-latest
-    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.8
-      #----------------------------------------------
-      #  -----  install & configure poetry  -----
-      #----------------------------------------------
-      - name: Install Poetry
-        uses: snok/install-poetry@v1.1.1
-        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: poetry install
-        if: steps.cached-poetry-dependencies.outputs.cache-hit != 'true'
-      #----------------------------------------------
-      #              run test suite
-      #----------------------------------------------
-      - name: Run tests
-        run: |
-          source .venv/bin/activate
-          pytest mealie/tests/

.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

@@ -1,27 +1,20 @@
 # Byte-compiled / optimized / DLL files
 .env
-__pycache__/
+*__pycache__/
 *.py[cod]
 *$py.class
+
 # frontend/.env.development
 docs/site/
-mealie/temp/*
-mealie/temp/api.html
-.temp/
+*temp/*
+.secret
+frontend/dist/
 
-
-app_data/backups/*
-app_data/debug/*
-app_data/img/*
-app_data/migration/*
-
-#Exception to keep folders
-!mealie/dist/.gitkeep
-!app_data/backups/.gitkeep
-!app_data/backups/dev_sample_data*
-!app_data/debug/.gitkeep
-!app_data/migration/.gitkeep
-!app_data/img/.gitkeep
+dev/data/backups/*
+dev/data/debug/*
+dev/data/img/*
+dev/data/migration/*
+dev/data/users/*
 
 .DS_Store
 node_modules
@@ -62,6 +55,7 @@ eggs/
 lib/
 lib64/
 parts/
+!frontend/src/components/Recipe/Parts/
 sdist/
 var/
 wheels/
@@ -90,6 +84,7 @@ coverage.xml
 *.cover
 .hypothesis/
 .pytest_cache/
+test.db
 
 # Translations
 *.mo
@@ -145,11 +140,18 @@ ENV/
 # mypy
 .mypy_cache/
 
-# IDE settings
-# .vscode/
-
 # Node Modules
 node_modules/
-mealie/data/debug/last_recipe.json
+*.db
 *.sqlite
-app_data/db/test.db
+scratch.py
+dev/data/backups/dev_sample_data*.zip
+!dev/data/backups/test*.zip
+dev/data/recipes/*
+dev/scripts/output/app_routes.py
+dev/scripts/output/javascriptAPI/*
+mealie/services/scraper/ingredient_nlp/model.crfmodel
+.gitignore
+frontend/.nuxt/**
+frontend/static/sw.js
+dev/code-generation/generated/*

.vscode/settings.json

@@ -1,21 +1,20 @@
 {
   "python.formatting.provider": "black",
   "python.pythonPath": ".venv/bin/python3.9",
-  "python.linting.pylintEnabled": true,
+  "python.linting.pylintEnabled": false,
   "python.linting.enabled": true,
-  "python.autoComplete.extraPaths": ["mealie", "mealie/mealie"],
-  "python.analysis.extraPaths": ["mealie", "mealie/mealie"],
-
   "python.testing.unittestEnabled": false,
   "python.testing.nosetestsEnabled": false,
   "python.testing.pytestEnabled": true,
   "python.testing.autoTestDiscoverOnSaveEnabled": false,
-  "cSpell.enableFiletypes": ["!javascript", "!python"],
-  "python.testing.pytestArgs": ["mealie"],
-  "i18n-ally.localesPaths": "frontend/src/locales",
+  "python.testing.pytestArgs": ["tests"],
+  "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": [
-    "performant"
-  ]
+  "cSpell.words": ["compression", "hkotel", "performant", "postgres", "webp"],
+  "search.mode": "reuseEditor",
+  "python.linting.flake8Enabled": true,
+  "conventionalCommits.scopes": ["frontend"]
 }

.vscode/tasks.json

@@ -3,7 +3,7 @@
   "tasks": [
     {
       "label": "DEV: Build and Start Docker Compose",
-      "command": "./dev/scripts/docker-compose.dev.sh",
+      "command": "make docker-dev",
       "type": "shell",
       "args": [],
       "problemMatcher": ["$tsc"],
@@ -14,7 +14,7 @@
     },
     {
       "label": "Production: Build and Start Docker Compose",
-      "command": "./dev/scripts/docker-compose.sh",
+      "command": "make docker-prod",
       "type": "shell",
       "args": [],
       "problemMatcher": ["$tsc"],
@@ -24,31 +24,43 @@
       "group": "test"
     },
     {
-      "label": "Dev: Start local Backend",
-      "command": "../${config:python.pythonPath}",
-      "args": ["app.py"],
-      "options": {
-        "cwd": "${workspaceFolder}/mealie/"
-      },
+      "label": "Dev: Start Backend",
+      "command": "make backend",
       "type": "shell",
-      "problemMatcher": [],
       "presentation": {
         "reveal": "always",
         "group": "groupA"
-      }
+      },
+      "problemMatcher": []
     },
     {
-      "label": "Dev: Start local Frontend",
-      "command": "npm run serve",
+      "label": "Dev: Start Frontend",
+      "command": "make frontend",
       "type": "shell",
-      "options": {
-        "cwd": "${workspaceFolder}/frontend/"
-      },
-      "problemMatcher": [],
       "presentation": {
         "reveal": "always",
         "group": "groupA"
-      }
+      },
+      "problemMatcher": []
+    },
+    {
+      "label": "Dev: Start Docs Server",
+      "command": "make docs",
+      "type": "shell",
+      "presentation": {
+        "reveal": "always",
+        "group": "groupA"
+      },
+      "problemMatcher": []
+    },
+    {
+      "label": "Run python tests",
+      "command": "make test",
+      "type": "shell",
+      "presentation": {
+        "reveal": "always"
+      },
+      "problemMatcher": []
     }
   ]
 }

Caddyfile

@@ -0,0 +1,34 @@
+{
+	auto_https off
+	admin off
+}
+
+:80 {
+	@proxied path /api/* /docs /openapi.json
+
+	@static {
+		file
+		path *.ico *.css *.js *.gif *.jpg *.jpeg *.png *.svg *.woff *.woff2 *.webp
+	}
+
+	encode gzip zstd
+
+	# Handles Recipe Images / Assets
+	handle_path /api/media/recipes/* {
+		header @static Cache-Control max-age=31536000
+		root * /app/data/recipes/
+		file_server
+	}
+
+	handle @proxied {
+		uri strip_suffix /
+		reverse_proxy http://127.0.0.1:9000
+	}
+
+	handle {
+		header @static Cache-Control max-age=31536000
+		root * /app/dist
+		try_files {path}.html {path} /
+		file_server
+	}
+}

Dockerfile

@@ -1,38 +1,142 @@
-FROM node:lts-alpine as build-stage
+###############################################
+# 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
 
-FROM python:3.9-alpine
+###############################################
+# Base Image
+###############################################
+FROM python:3.9-slim as python-base
 
-RUN apk add --no-cache  libxml2-dev libxslt-dev libxml2 
-ENV ENV prod
-EXPOSE 80
-WORKDIR /app
+ENV MEALIE_HOME="/app"
 
-COPY ./pyproject.toml /app/
+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_IN_PROJECT=true \
+    POETRY_NO_INTERACTION=1 \
+    PYSETUP_PATH="/opt/pysetup" \
+    VENV_PATH="/opt/pysetup/.venv"
 
-RUN apk add --update --no-cache --virtual .build-deps \
+# prepend poetry and venv to path
+ENV PATH="$POETRY_HOME/bin:$VENV_PATH/bin:$PATH"
+
+# create user account
+RUN useradd -u 911 -U -d $MEALIE_HOME -s /bin/bash abc \
+    && usermod -G users abc \
+    && mkdir $MEALIE_HOME
+
+###############################################
+# Builder Image
+###############################################
+FROM python-base as builder-base
+RUN apt-get update \
+    && apt-get install --no-install-recommends -y \
     curl \
-    g++ \
-    python3-dev \
-    musl-dev \
-    gcc \
-    build-base && \
-    curl -sSL https://raw.githubusercontent.com/python-poetry/poetry/master/get-poetry.py | POETRY_HOME=/opt/poetry python && \
-    cd /usr/local/bin && \
-    ln -s /opt/poetry/bin/poetry && \
-    poetry config virtualenvs.create false && \
-    cd /app/ && poetry install --no-root --no-dev && \
-    apk --purge del .build-deps
+    build-essential \
+    libpq-dev \
+    libwebp-dev \
+    # LDAP Dependencies
+    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.1.6
+RUN curl -sSL https://raw.githubusercontent.com/python-poetry/poetry/master/install-poetry.py | python -
 
-COPY ./mealie /app
-COPY --from=build-stage /app/dist /app/dist
-RUN rm -rf /app/test /app/.temp
+# copy project requirement files here to ensure they will be cached.
+WORKDIR $PYSETUP_PATH
+COPY ./poetry.lock ./pyproject.toml ./
 
+# install runtime deps - uses $POETRY_VIRTUALENVS_IN_PROJECT internally
+RUN poetry install -E pgsql --no-dev
 
-VOLUME [ "/app/data/" ]
-CMD ["uvicorn", "app:app", "--host", "0.0.0.0", "--port", "80"]
+###############################################
+# Development Image
+###############################################
+FROM python-base as development
+ENV PRODUCTION=false
+
+# copying poetry and venv into image
+COPY --from=builder-base $POETRY_HOME $POETRY_HOME
+COPY --from=builder-base $PYSETUP_PATH $PYSETUP_PATH
+
+# copy backend
+COPY ./mealie $MEALIE_HOME/mealie
+COPY ./poetry.lock ./pyproject.toml $MEALIE_HOME/
+
+#! 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
+WORKDIR /
+
+RUN chmod +x $MEALIE_HOME/mealie/run.sh
+ENTRYPOINT $MEALIE_HOME/mealie/run.sh "reload"
+
+###############################################
+# Production Image
+###############################################
+FROM python-base as production
+ENV PRODUCTION=true
+
+# curl for used by healthcheck
+RUN apt-get update \
+    && apt-get install --no-install-recommends -y \
+    curl \
+    && apt-get autoremove \
+    && rm -rf /var/lib/apt/lists/*
+
+# copying poetry and venv into image
+COPY --from=builder-base $POETRY_HOME $POETRY_HOME
+COPY --from=builder-base $PYSETUP_PATH $PYSETUP_PATH
+
+# 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
+
+#! 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 /
+
+# 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=80
+
+EXPOSE ${APP_PORT}
+
+HEALTHCHECK CMD curl -fs http://localhost:${APP_PORT} || exit 1
+
+RUN chmod +x $MEALIE_HOME/mealie/run.sh
+ENTRYPOINT $MEALIE_HOME/mealie/run.sh

Dockerfile.dev

@@ -1,21 +0,0 @@
-FROM python:3
-
-RUN apt-get update -y && \
-    apt-get install -y python-pip python-dev
-
-RUN curl -sSL https://raw.githubusercontent.com/python-poetry/poetry/master/get-poetry.py | POETRY_HOME=/opt/poetry python && \
-    cd /usr/local/bin && \
-    ln -s /opt/poetry/bin/poetry && \
-    poetry config virtualenvs.create false
-
-COPY ./pyproject.toml ./poetry.lock* /app/
-
-WORKDIR /app
-
-RUN poetry install --no-root
-
-COPY ./mealie /app
-
-ENTRYPOINT [ "python" ]
-
-CMD [ "app.py" ]

README.md

@@ -4,6 +4,11 @@
 [![Issues][issues-shield]][issues-url]
 [![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 />
@@ -23,11 +28,11 @@
   <a href="https://github.com/hay-kot/mealie">
   </a>
     <br />
-    <a href="https://github.com/hay-kot/mealie"><s>View Demo</s></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://hay-kot.github.io/mealie/api/docs/">API</a>
+    <a href="https://hay-kot.github.io/mealie/api/redoc/">API</a>
     ·
     <a href="https://github.com/hay-kot/mealie/issues">
     Request Feature
@@ -39,54 +44,66 @@
 
 
 
-<!-- ABOUT THE PROJECT -->
-## About The Project
-
 
 [![Product Name Screen Shot][product-screenshot]](https://example.com)
 
-**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.  
+# About The Project
 
-Mealie also provides a secure API for interactions from 3rd party applications. **Why does my recipe manager need an API?** An API allows integration into applications like [Home Assistant]() 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. See the section on [Meal Plan hooks](#hooks) for more information. Additionally, you can access any available API from the backend server. To explore the API spin up your server and navigate to http://yourserver.com/docs for interactive API documentation. 
+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)! 
 
 
 
-### Main Features
-#### Recipes
-  - Automatic web scrapping for common recipe platforms
-  - Interactive API Documentation thanks to [FastAPI](https://fastapi.tiangolo.com/) and [Swagger](https://petstore.swagger.io/)
-  - UI Recipe Editor
-  - JSON Recipe Editor in browser
-  - Custom tags and categories
-  - Rate recipes
-  - Add notes to recipes
-#### Meal Planner
-  - Random Meal plan generation based off categories
-  - Expose notes in the API to allow external applications to access relevant information for meal plans
-#### Database Import / Export
-  - Easily Import / Export your recipes from the UI
-  - Export recipes in into custom files using Jinja2 templates
+## 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
 
-### Built With
+## FAQ
 
-* [Vue.js](https://vuejs.org/)
-* [Vuetify](https://vuetifyjs.com/en/)
-* [FastAPI](https://fastapi.tiangolo.com/)
-* [Docker](https://www.docker.com/)
+### 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**. Especially test. Literally any tests. See the [Contributors Guide](https://hay-kot.github.io/mealie/contributors/developers-guide/code-contributions/) for help getting started.
+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.
 
 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: 60px !important;width: 217px !important;" ></a>
+<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>
 
 <!-- LICENSE -->
 ## License
-
 Distributed under the MIT License. See `LICENSE` for more information.
 
 
@@ -96,16 +113,6 @@ Project Link: [https://github.com/hay-kot/mealie](https://github.com/hay-kot/mea
 
 
 
-<!-- ACKNOWLEDGEMENTS -->
-## Acknowledgements
-
-* [Talk Python Training for helping me learn python](https://training.talkpython.fm/)
-* [Academind for helping me learn Javascript and Vue.js](https://academind.com/)
-
-
-
-
-
 <!-- MARKDOWN LINKS & IMAGES -->
 <!-- https://www.markdownguide.org/basic-syntax/#reference-style-links -->
 [contributors-shield]: https://img.shields.io/github/contributors/hay-kot/mealie.svg?style=flat-square
@@ -121,4 +128,4 @@ Project Link: [https://github.com/hay-kot/mealie](https://github.com/hay-kot/mea
 [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/img/home_screenshot.png
+[product-screenshot]: docs/docs/assets/img/home_screenshot.png

crowdin.yml

@@ -0,0 +1,6 @@
+preserve_hierarchy: false
+files:
+  - 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/data/templates/recipes.md

@@ -1,19 +1,17 @@
 
 
-![Recipe Image](../images/{{ recipe.image }})
+![Recipe Image](../../images/{{ recipe.slug }}/original.jpg)
 
 # {{ recipe.name }}
 {{ recipe.description }}
 
 ## Ingredients
-{% for ingredient in recipe.recipeIngredient %}
-- [ ] {{ ingredient }}
-{% endfor %}
+{% for ingredient in recipe.recipeIngredient %} 
+- [ ] {{ ingredient }} {% endfor %}
 
 ## Instructions
-{% for step in recipe.recipeInstructions %}
-- [ ] {{ step.text }}
-{% endfor %}
+{% for step in recipe.recipeInstructions %} 
+- [ ] {{ step.text }} {% endfor %}
 
 {% for note in recipe.notes %}
 **{{ note.title }}:** {{ note.text }}

dev/dev-notes.md

@@ -1,48 +0,0 @@
-# Getting A Developer Instance Started
-For the best experience developing I recommend using docker. I've used both WSL2 and Ubuntu to develop mealie and have had no issues with cross compatibility with docker. 2 Scripts are available along ith docker-compose files to make development instances easier. After cloning the repo you can set the scripts in /dev/scripts/ as executable and then use VSCode tasks to execute the scripts or execute them from the CLI. 
-
-`docker-compose.dev.sh` Will spin up a development stack with hot-reloading enabled. 
-`docker-compose.sh` Will spin up a production version of the stack.  
-
-After the stack is running navigate to the [admin page localhost:9090/settings/site](http://localhost:9090/settings/site). On the Backups and Exports section import the backup labeled dev_sample_data_{DATE}.zip. This will give you some recipe data to work with. 
-
-Once you're up and running you should be able to make changes and see them reflected on the frontend/backend. If you're not sure what to work on you can check:
-
-- The Todo's below.
-- The [Development Road Map](https://hay-kot.github.io/mealie/2.0%20-%20roadmap/)
-- The [Current Open Issues](https://github.com/hay-kot/mealie/issues)
-
-Don't forget to [join the Discord](https://discord.gg/R6QDyJgbD2)! 
-
-# Todo's
-
-Test
-- [ ] Image Upload Test
-- [ ] Rename and Upload Image Test
-- [x] Chowdown Migration End Point Test
-
-Frontend
-- [ ] No Meal Today Page instead of Null 
-- [ ] Recipe Print Page 
-- [ ] Recipe Editor Data Validation Client Side
-- [ ] Organize Home Page my Category, ideally user selectable.
-- [ ] Advanced Search Page, draft started
-  - [ ] Filter by Category
-  - [ ] Filter by Tags
-- [ ] Search Bar Results Redesign
-
-Backend
-- [ ] Database Import
-  - [x] Recipes
-  - [x] Images
-  - [ ] Meal Plans
-  - [x] Settings
-  - [x] Themes
-- [ ] Remove Print / Debug Code
-- [ ] Support how to sections and how to steps
-- [ ] Recipe request by category/tags
-
-SQL
-- [ ] Setup Database Migrations
-
-# Draft Changelog

dev/non-working-links.txt

@@ -1 +0,0 @@
-http://www.cookingforkeeps.com/2013/02/05/blue-cheese-stuffed-turkey-meatballs-with-raspberry-balsamic-glaze-2/

dev/scratch/build.py

@@ -1,32 +0,0 @@
-import requests
-import json
-
-POST_URL = "http://localhost:9921/api/recipe/create-url"
-URL_LIST = [
-    "https://www.bonappetit.com/recipe/hallacas"
-    "https://www.bonappetit.com/recipe/oat-and-pecan-brittle-cookies",
-    "https://www.bonappetit.com/recipe/tequila-beer-and-citrus-cocktail",
-    "https://www.bonappetit.com/recipe/corn-and-crab-beignets-with-yaji-aioli",
-    "https://www.bonappetit.com/recipe/nan-e-berenji",
-    "https://www.bonappetit.com/recipe/ginger-citrus-cookies",
-    "https://www.bonappetit.com/recipe/chocolate-pizzettes-cookies",
-    "https://www.bonappetit.com/recipe/swedish-glogg",
-    "https://www.bonappetit.com/recipe/roasted-beets-with-dukkah-and-sage",
-    "https://www.bonappetit.com/recipe/collard-greens-salad-with-pickled-fennel-and-coconut"
-    "https://www.bonappetit.com/recipe/sparkling-wine-cocktail",
-    "https://www.bonappetit.com/recipe/pretzel-and-potato-chip-moon-pies",
-    "https://www.bonappetit.com/recipe/coffee-hazlenut-biscotti",
-    "https://www.bonappetit.com/recipe/curry-cauliflower-rice",
-    "https://www.bonappetit.com/recipe/life-of-the-party-layer-cake",
-    "https://www.bonappetit.com/recipe/marranitos-enfiestados",
-]
-
-
-if __name__ == "__main__":
-    for url in URL_LIST:
-        data = {"url": url}
-        data = json.dumps(data)
-        try:
-            response = requests.post(POST_URL, data)
-        except:
-            continue

dev/scratch/write_settings.py

@@ -1,39 +0,0 @@
-import json
-
-import requests
-
-POST_URL = "http://localhost:9921/api/site-settings/themes/create/"
-GET_URL = "http://localhost:9921/api/site-settings/themes/"
-
-SITE_SETTINGS = [
-    {
-        "name": "default",
-        "colors": {
-            "primary": "#E58325",
-            "accent": "#00457A",
-            "secondary": "#973542",
-            "success": "#5AB1BB",
-            "info": "#FFFD99",
-            "warning": "#FF4081",
-            "error": "#EF5350",
-        },
-    },
-    {
-        "name": "purple",
-        "colors": {
-            "accent": "#4527A0",
-            "primary": "#FF4081",
-            "secondary": "#26C6DA",
-            "success": "#4CAF50",
-            "info": "#2196F3",
-            "warning": "#FB8C00",
-            "error": "#FF5252",
-        },
-    },
-]
-
-if __name__ == "__main__":
-    for theme in SITE_SETTINGS:
-        data = json.dumps(theme)
-        response = requests.post(POST_URL, data)
-        response = requests.get(GET_URL)

dev/scripts/api_docs_gen.py

@@ -0,0 +1,44 @@
+import json
+
+from mealie.app import app
+from mealie.core.config import DATA_DIR
+
+"""Script to export the ReDoc documentation page into a standalone HTML file."""
+
+HTML_TEMPLATE = """<!-- Custom HTML site displayed as the Home chapter -->
+{% extends "main.html" %}
+{% block tabs %}
+{{ super() }}
+
+<style>
+    body {
+        margin: 0;
+        padding: 0;
+    }
+</style>
+
+
+<div id="redoc-container"></div>
+<script src="https://cdn.jsdelivr.net/npm/redoc/bundles/redoc.standalone.js"> </script>
+<script>
+    var spec = MY_SPECIFIC_TEXT;
+    Redoc.init(spec, {}, document.getElementById("redoc-container"));
+</script>
+
+
+{% endblock %}
+{% block content %}{% endblock %}
+{% block footer %}{% endblock %}
+"""
+
+HTML_PATH = DATA_DIR.parent.parent.joinpath("docs/docs/overrides/api.html")
+
+
+def generate_api_docs(my_app):
+    with open(HTML_PATH, "w") as fd:
+        text = HTML_TEMPLATE.replace("MY_SPECIFIC_TEXT", json.dumps(my_app.openapi()))
+        fd.write(text)
+
+
+if __name__ == "__main__":
+    generate_api_docs(app)

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/docker-compose.dev.sh

@@ -1 +0,0 @@
-docker-compose -f docker-compose.dev.yml -p dev-mealie up --build

dev/scripts/docker-compose.sh

@@ -1 +0,0 @@
-docker-compose -p mealie up --build

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/scrape_recipe.py

@@ -1,27 +0,0 @@
-"""
-Helper script to download raw recipe data from a URL and dump it to disk.
-The resulting files can be used as test input data.
-"""
-
-import sys, json, pprint
-import requests
-import extruct
-from scrape_schema_recipe import scrape_url
-from w3lib.html import get_base_url
-
-for url in sys.argv[1:]:
-    try:
-        data = scrape_url(url)[0]
-        slug = list(filter(None, url.split("/")))[-1]
-        filename = f"{slug}.json"
-        with open(filename, "w") as f:
-            json.dump(data, f, indent=4, default=str)
-        print(f"Saved {filename}")
-    except Exception as e:
-        print(f"Error for {url}: {e}")
-        print("Trying extruct instead")
-        pp = pprint.PrettyPrinter(indent=2)
-        r = requests.get(url)
-        base_url = get_base_url(r.text, r.url)
-        data = extruct.extract(r.text, base_url=base_url)
-        pp.pprint(data)

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,8 +1,9 @@
-# Use root/example as user/password credentials
+# Use changeme@email.com/MyPassword as user/password credentials
 version: "3.1"
 services:
   # Vue Frontend
   mealie-frontend:
+    container_name: mealie-frontend
     image: mealie-frontend:dev
     build:
       context: ./frontend
@@ -18,25 +19,27 @@ services:
 
   # Fast API
   mealie-api:
+    container_name: mealie-api
     image: mealie-api:dev
     build:
       context: ./
-      dockerfile: Dockerfile.dev
+      target: development
+      dockerfile: Dockerfile
     restart: always
     ports:
       - 9921:9000
     environment:
-      db_type: sqlite
       TZ: America/Anchorage # Specify Correct Timezone for Date/Time to line up correctly.
     volumes:
-      - ./app_data:/app_data
-      - ./mealie:/app
+      - ./dev/data:/app/dev/data
+      - ./mealie:/app/mealie
 
+  # Mkdocs
   mealie-docs:
+    container_name: mealie-docs
     image: squidfunk/mkdocs-material
     restart: always
     ports:
-      - 9923:8000
+      - 9922:8000
     volumes:
       - ./docs:/docs
-

docker-compose.yml

@@ -3,10 +3,28 @@ services:
   mealie:
     build:
       context: ./
+      target: production
       dockerfile: Dockerfile
     container_name: mealie
     restart: always
+    depends_on:
+      - "postgres"
     ports:
       - 9090:80
     environment:
-      db_type: sqlite
+      DB_ENGINE: postgres # Optional: 'sqlite', 'postgres'
+      POSTGRES_USER: mealie
+      POSTGRES_PASSWORD: mealie
+      POSTGRES_SERVER: postgres
+      POSTGRES_PORT: 5432
+      POSTGRES_DB: mealie
+      # 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/api/api-usage.md

@@ -1,14 +0,0 @@
-# Usage
-
-## Key Components
-### Recipe Extras
-Recipes extras are a key feature of the Mealie API. They allow you to create custom json key/value pairs within a recipe to reference from 3rd part applications. You can use these keys to contain information to trigger automation or custom messages to relay to your desired device. 
-
-For example you could add `{"message": "Remember to thaw the chicken"}` to a recipe and use the webhooks built into mealie to send that message payload to a destination to be processed.
-
-![api-extras-gif](../gifs/api-extras.gif)
-
-
-## Examples
-
-Have Ideas? Submit a PR!

docs/docs/api/redoc.md

@@ -0,0 +1,4 @@
+---
+title: API
+template: api.html
+---

docs/docs/assets/js/extra.js

@@ -0,0 +1,11 @@
+/* Add target="_blank" to external links */
+/* Source: https://html.com/attributes/a-target/#:~:text=browser */
+function externalLinks() {
+  for (var c = document.getElementsByTagName("a"), a = 0; a < c.length; a++) {
+    var b = c[a];
+    b.getAttribute("href") &&
+      b.hostname !== location.hostname &&
+      (b.target = "_blank");
+  }
+}
+externalLinks();

docs/docs/assets/stylesheets/custom.css

@@ -0,0 +1,53 @@
+[data-md-color-scheme="mealie"] {
+  --md-primary-fg-color: #e58325;
+  --md-primary-fg-color--light: #e58325;
+  --md-accent-fg-color: #e58325;
+  --md-custom-h2-color: #333;
+  --md-accent-fg-color--light: #e58325;
+  --md-default-accent-bg-color: #f7fafc;
+}
+
+[data-md-color-scheme="slate"] {
+  --md-primary-fg-color: #e58325;
+  --md-primary-fg-color--dark: #e58325;
+  --md-accent-fg-color: #e58325;
+  --md-accent-fg-color--dark: #e58325;
+  --md-custom-h2-color: rgb(167, 167, 167);
+  --md-default-bg-color: #1a1b1b;
+  --md-default-accent-bg-color: #1f1e1e;
+}
+
+/* frontpage elements */
+.tx-hero h1 {
+  font-size: 2.41rem !important;
+}
+a.md-button.md-button--primary {
+  background-color: var(--md-accent-fg-color);
+  border-color: var(--md-accent-fg-color);
+  color: #ffffff;
+}
+a.md-button.md-button--primary:hover {
+  color: #000000;
+}
+a.md-button.md-button:hover {
+  color: #ffffff;
+}
+
+/* Add icon after external links */
+/* Ignore auto-generated material theme links */
+a[target="_blank"]:not([class*="md-"]):after {
+  content: " " url("../svg/open-in-new.svg");
+}
+
+/* Site width etc.*/
+.md-grid {
+  max-width: 64rem !important;
+}
+
+.md-typeset table:not([class]) th {
+  background-color: #e58325;
+}
+
+th {
+  font-weight: bold;
+}

docs/docs/assets/svg/open-in-new.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12" viewBox="0 0 24 24">
+<path fill="rgb(229,131,37)" d="M14,3V5H17.59L7.76,14.83L9.17,16.24L19,6.41V10H21V3M19,19H5V5H12V3H5C3.89,3 3,3.9 3,5V19A2,2 0 0,0 5,21H19A2,2 0 0,0 21,19V12H19V19Z" />
+</svg>

docs/docs/changelog/.template.md

@@ -0,0 +1,30 @@
+# vx.x.x COOL TITLE GOES HERE
+
+**App Version: vx.x.x**
+
+**Database Version: vx.x.x**
+
+## Breaking Changes
+
+!!! error "Breaking Changes"
+
+    #### Database
+
+    #### ENV Variables
+
+
+## Bug Fixes
+- Fixed ...
+
+## Features and Improvements
+
+### General
+- New Thing 1
+
+
+### UI Improvements
+- 
+
+
+### Behind the Scenes
+- Refactoring...

docs/docs/changelog/v0.1.0.md

@@ -1,79 +1,5 @@
-# Release Notes
+# v0.1.0 - Initial Beta
 
-## v0.3.0 - Draft!
-
-### Features and Improvements
-  - Open search with `/` hotkey! 
-  - Unified and improved snackbar notifications
-  - Recipe Viewer
-    - Categories, Tags, and Notes will not be displayed below the steps on smaller screens
-  - Recipe Editor
-    - Text areas now auto grow to fit content
-    - Description, Steps, and Notes support Markdown! This includes inline html in Markdown. 
-
-### Development / Misc
-  - Added async file response for images, downloading files.
-  - Breakup recipe view component
-
-## v0.2.0 - Now with Test!
-This is, what I think, is a big release! Tons of new features and some great quality of life improvements with some additional features. You may find that I made promises to include some fixes/features in v0.2.0. The short of is I greatly underestimated the work needed to refactor the database to a usable state and integrate categories in a way that is useful for users. This shouldn't be taken as a sign that I'm dropping those feature requests or ignoring them. I felt it was better to push a release in the current state rather than drag on development to try and fulfil all of the promises I made. 
-
-!!! warning "Upgrade Process"
-    Database Breaks! I have not yet implemented a database migration service. As such, upgrades cannot be done by simply pulling the image. You must first export your recipes, update your deployment, and then import your recipes. This pattern is likely to be how upgrades take place prior to v1.0. After v1.0 migrations will be done automatically.
-
-### Bug Fixes
-  - Remove ability to save recipe with no name
-  - Fixed data validation error on missing parameters
-  - Fixed failed database initialization at startup - Closes #98
-  - Fixed misaligned text on various cards
-  - Fixed bug that blocked opening links in new tabs - Closes #122
-  - Fixed router link bugs - Closes #122
-  - Fixed navigation on keyboard selection - Closes #139
-
-### Features and Improvements
-  - 🐳 Dockerfile now 1/5 of the size!
-  - 🌎 UI Language Selection + Additional Supported Language
-  - **Home Page**
-    - By default your homepage will display only the recently added recipes. You can configured sections to show on the home-screen based of categories on the settings page. 
-    - A new sidebar is now shown on the main page that lists all the categories in the database. Clicking on them navigates into a page that shows only recipes. 
-    - Basic Sort functionality has been added. More options are on the way! 
-  - **Meal Planner**
-    - Improved Search (Fuzzy Search)
-    - New Scheduled card support 
-  - **Recipe Editor**
-    - Ingredients are now sortable via drag-and-drop
-    - Known categories now show up in the dropdown - Closes 83
-    - Initial code for data validation to prevent errors
-  - **Migrations**
-    - Card based redesign
-    - Upload from the UI
-    - Unified Chowdown / Nextcloud import process. (Removed Git as a dependency)
-  - **API**
-    - Category and Tag endpoints added
-    - Major Endpoint refactor
-    - Improved API documentation
-    - Link to your Local API is now on your `/settings/site`. You can use it to explore your API. 
-
-  - **Style**
-    - Continued work on button/style unification
-    - Adding icons to buttons
-    - New Color Theme Picker UI
-
-### Development
-  - Fixed Vetur config file. Autocomplete in VSCode works!
-  - File/Folder restructuring 
-  - Added Prettier config
-  - Fixed incorrect layout code
-  - FastAPI Route tests for major operations - WIP (shallow testing)
-
-### Breaking Changes 
-
-!!! error "Breaking Changes"
-    - API endpoints have been refactored to adhear to a more consistent standard. This is a WIP and more changes are likely to occur. 
-    - Officially Dropped MongoDB Support
-    - Database Breaks! We have not yet implemented a database migration service. As such, upgrades cannot be done by simply pulling the image. You must first export your recipes, update your deployment, and then import your recipes. This pattern is likely to be how upgrades take place prior to v1.0. After v1.0 migrations will be done automatically. 
-
-## v0.1.0 - Initial Beta
 ### Bug Fixes
   - Fixed Can't delete recipe after changing name - Closes Closes #67
   - Fixed No image when added by URL, and can't add an image - Closes Closes #66

docs/docs/changelog/v0.2.0.md

@@ -0,0 +1,72 @@
+# v0.2.1 - Hot Fixes!
+
+### Features and Improvements
+  - Fixes upload image error when no photo was scrapped
+  - Fixes no last_recipe.json not updating
+  - Added markdown rendering for notes
+  - New notifications
+  - Minor UI improvements
+  - Recipe editor refactor
+  - Settings/Theme models refactor
+
+### Development / Misc
+  - Added async file response for images, downloading files.
+  - Breakup recipe view component
+
+# v0.2.0 - Now with Test!
+This is, what I think, is a big release! Tons of new features and some great quality of life improvements with some additional features. You may find that I made promises to include some fixes/features in v0.2.0. The short of is I greatly underestimated the work needed to refactor the database to a usable state and integrate categories in a way that is useful for users. This shouldn't be taken as a sign that I'm dropping those feature requests or ignoring them. I felt it was better to push a release in the current state rather than drag on development to try and fulfil all of the promises I made. 
+
+!!! warning "Upgrade Process"
+    Database Breaks! I have not yet implemented a database migration service. As such, upgrades cannot be done by simply pulling the image. You must first export your recipes, update your deployment, and then import your recipes. This pattern is likely to be how upgrades take place prior to v1.0. After v1.0 migrations will be done automatically.
+
+### Bug Fixes
+  - Remove ability to save recipe with no name
+  - Fixed data validation error on missing parameters
+  - Fixed failed database initialization at startup - Closes #98
+  - Fixed misaligned text on various cards
+  - Fixed bug that blocked opening links in new tabs - Closes #122
+  - Fixed router link bugs - Closes #122
+  - Fixed navigation on keyboard selection - Closes #139
+
+### Features and Improvements
+  - 🐳 Dockerfile now 1/5 of the size!
+  - 🌎 UI Language Selection + Additional Supported Language
+  - **Home Page**
+    - By default your homepage will display only the recently added recipes. You can configured sections to show on the home-screen based of categories on the settings page. 
+    - A new sidebar is now shown on the main page that lists all the categories in the database. Clicking on them navigates into a page that shows only recipes. 
+    - Basic Sort functionality has been added. More options are on the way! 
+  - **Meal Planner**
+    - Improved Search (Fuzzy Search)
+    - New Scheduled card support 
+  - **Recipe Editor**
+    - Ingredients are now sortable via drag-and-drop
+    - Known categories now show up in the dropdown - Closes 83
+    - Initial code for data validation to prevent errors
+  - **Migrations**
+    - Card based redesign
+    - Upload from the UI
+    - Unified Chowdown / Nextcloud import process. (Removed Git as a dependency)
+  - **API**
+    - Category and Tag endpoints added
+    - Major Endpoint refactor
+    - Improved API documentation
+    - Link to your Local API is now on your `/settings/site`. You can use it to explore your API. 
+
+  - **Style**
+    - Continued work on button/style unification
+    - Adding icons to buttons
+    - New Color Theme Picker UI
+
+### Development
+  - Fixed Vetur config file. Autocomplete in VSCode works!
+  - File/Folder restructuring 
+  - Added Prettier config
+  - Fixed incorrect layout code
+  - FastAPI Route tests for major operations - WIP (shallow testing)
+
+### Breaking Changes 
+
+!!! error "Breaking Changes"
+    - API endpoints have been refactored to adhear to a more consistent standard. This is a WIP and more changes are likely to occur. 
+    - Officially Dropped MongoDB Support
+    - Database Breaks! We have not yet implemented a database migration service. As such, upgrades cannot be done by simply pulling the image. You must first export your recipes, update your deployment, and then import your recipes. This pattern is likely to be how upgrades take place prior to v1.0. After v1.0 migrations will be done automatically. 

docs/docs/changelog/v0.3.0.md

@@ -0,0 +1,29 @@
+# v0.3.0
+
+### Bug Fixes
+  - Fixed open search on `/` when in input. - Closes #174
+  - Error when importing recipe: KeyError: '@type' - Closes #145
+  - Fixed Import Issue - bhg.com - Closes #138
+  - Scraper not working with recipe containing HowToSection - Closes #73
+
+### Features and Improvements
+  - Improved Nextcloud Imports
+  - Improved Recipe Parser!
+  - Open search with `/` hotkey! 
+  - Database and App version are now split
+  - Unified and improved snackbar notifications
+  - New Category/Tag endpoints to filter all recipes by Category or Tag
+  - Category sidebar now has show/hide behavior on mobile
+  - Settings menu on mobile is improved
+  - **Meal Planner**
+    - You can now restrict recipe categories used for random meal-plan creation in the settings menu
+    - Recipe picker dialog will now display recipes when the search bar is empty
+    - Minor UI improvements
+    - **Shopping lists!** Shopping list can now be generated from a meal plan. Currently ingredients are split by recipes or there is a beta feature that attempts to sort them by similarity.
+  - **Recipe Viewer**
+    - Categories, Tags, and Notes will now be displayed below the steps on smaller screens
+  - **Recipe Editor**
+    - Text areas now auto grow to fit content
+    - Description, Steps, and Notes support Markdown! This includes inline html in Markdown. 
+  - **Imports**
+    - A revamped dialog has been created to provide more information on restoring backups. Exceptions on the backend are now sent to the frontend and are easily viewable to see what went wrong when you restored a backup. This functionality will be ported over to the migrations in a future release. 

docs/docs/changelog/v0.4.0.md

@@ -0,0 +1,86 @@
+# v0.4.0 Whoa, What a Release!
+
+**App Version: v0.4.0**
+
+**Database Version: v0.4.0**
+
+## Breaking Changes
+
+!!! error "Breaking Changes"
+
+    #### Database
+    A new database will be created. You must export your data and then import it after upgrading.
+
+    #### Site Settings
+    With the addition of group settings and a re-write of the database layer of the application backend, there is no migration path for your current site settings. Webhooks Settings, Meal Plan Categories are now managed by groups. Site settings, mainly homepage settings, are now site specific and managed by administrators. When upgrading be sure to uncheck the settings when importing your old data. 
+
+    #### ENV Variables
+    Names have been changed to be more consistent with industry standards. See the [Installation Page](/mealie/getting-started/install/) for new parameters.  
+
+## Bug Fixes
+- Fixed Search Results Limited to 100 - #198
+- Fixed recipes from marmiton.org not fully scrapped  - #196
+- Fixed Unable to get a page to load - #194
+- Fixed Recipe's from Epicurious don't upload. - #193
+- Fixed Edited blank recipe in meal plan is not saved - #184
+- Fixed Create a new meal plan allows selection of an end date that is prior to the start date - #183
+- Fixed Original URL not saved to imported recipe in 0.3.0-dev - #183
+- Fixed "IndexError: list index out of range" when viewing shopping list for meal plan containing days without a recipe selected - #178
+
+## Features and Improvements
+
+### General
+  - Documentation Rewrite
+  - [New Demo Site!](https://mealie-demo.hay-kot.dev/)
+  - New Documentation
+    - Landing Page
+    - Custom Caddy Configuration
+    - User Management 
+    - Introduction
+  - Updated Documentation
+    - Everything!
+  - The API Reference is now better embedded inside of the docs
+  - New default external port in documentation (Port 9000 -> 9925). This is only the port exposed by the host to the docker image. It doesn't change any existing functionality. 
+
+### User Authentication 
+  - Authentication! Tons of stuff went into creating a flexible authentication platform for a lot of different use cases. Review the documentation for more information on how to use the authentication, and how everything works together. More complex management of recipes and user restrictions are in the works, but this is a great start! Some key features include
+    - Sign Up Links
+    - Admin and User Roles
+    - Password Change
+    - Group Management
+    - Create/Edit/Delete Restrictions
+
+### Custom Pages
+  - You can now create custom pages that are displayed on the homepage sidebar to organize categories of recipes into pages. For example, if you have several categories that encompass "Entrée" you can group all those categories together under the "Entrée" page. See [Building Pages](/mealie/site-administration/building-pages/) for more information.
+!!! tip 
+    Note that this replaces the behavior of automatically adding categories to the sidebar.
+
+### UI Improvements
+  - Completed Redesign of the Admin Panel
+    - Profile Pages
+    - Side Panel Menu
+  - Improved UI for Recipe Search
+  - Language selector is now displayed on all pages and does not require an account
+
+### Recipe Data
+  - Recipe Database Refactoring. Tons of new information is now stored for recipes in the database. Not all is accessible via the UI, but it's coming.
+    - Nutrition Information
+      - calories
+      - fatContent
+      - fiberContent
+      - proteinContent
+      - sodiumContent
+      - sugarContent
+    - recipeCuisine has been added
+    - "categories" has been migrated to "recipeCategory" to adhere closer to the standard schema
+    - "tool" - a list of tools used for the recipe
+
+### Behind the Scenes
+  - Removed CDN dependencies
+  - Database Model Refactoring
+  - Import/Export refactoring
+  - File/Folder Name Refactoring
+  - Development is now easier with a makefile
+  - Mealie is now a proper package using poetry 
+  - Test refactoring
+  - Test Coverage 83% up from 75%!

docs/docs/changelog/v0.4.1.md

@@ -0,0 +1,35 @@
+# v0.4.1
+
+**App Version: v0.4.1**
+
+**Database Version: v0.4.0**
+
+!!! error "Breaking Changes"
+
+    #### Recipe Images
+    While it *shouldn't* be a breaking change, I feel it is important to note that you may experience issues with the new image migration. Recipe images are now minified, this is done on start-up, import, migration, and when a new recipe is created. The initial boot or load may be a bit slow if you have lots of recipes but you likely won't notice. What you may notice is that if your recipe slug and the image name do not match, you will encounter issues with your images showing up. This can be resolved by finding the image directory and rename it to the appropriate slug. I did fix multiple edge cases, but it is likely more exists. As always make a backup before you update! 
+
+    On the plus side, this comes with a huge performance increase! 🎉
+
+- Add markdown support for ingredients - Resolves #32
+- Ingredients editor improvements
+- Fix Tags/Categories render problems on recipes
+- Tags redirect to new tag pages
+- Categories redirect to category pages
+- Fix Backup download blocked by authentication
+- Random meal-planner will no longer duplicate recipes unless no other options
+- New Quick Week button to generate next 5 day week of recipe slots.
+- Minor UI tweaks
+- Recipe Cards now display 2 recipe tags
+- Recipe images are now minified. This comes with a serious performance improvement. On initial startup you may experience some delays. Images are migrated to the new structure on startup, depending on the size of your database this can take some time. 
+    - Note that original images are still kept for large displays like on the individual recipe pages.
+    - A smaller image is used for recipe cards
+    - A 'tiny' image is used for search images. 
+- Advanced Search Page. You can now use the search page to filter recipes to include/exclude tags and categories as well as select And/Or matching criteria. 
+- Added link to advanced search on quick search
+- Better support for NextCloud imports
+    - Translate keywords to tags
+    - Fix rollback on failure
+- Recipe Tag/Category Input components have been unified and now share a single way to interact. To add a new category in the recipe editor you need to click to '+' icon next to the input and fill out the form. This is the same for adding a Tag. 
+
+

docs/docs/changelog/v0.4.2.md

@@ -0,0 +1,34 @@
+# v0.4.2
+
+**App Version: v0.4.2**
+
+**Database Version: v0.4.0**
+
+!!! error "Breaking Changes"
+    1. With a recent refactor some users been experiencing issues with an environmental variable not being set correct. If you are experiencing issues, please provide your comments [Here](https://github.com/hay-kot/mealie/issues/281).
+
+    2. If you are a developer, you may experience issues with development as a new environmental variable has been introduced. Setting `PRODUCTION=false` will allow you to develop as normal.
+
+## Bug Fixes
+- Fixed Initialization script (v0.4.1a Hot Fix) - Closes #274
+- Fixed nested list error on recipe scrape - Closes #306
+- Fixed ingredient checkboxes - Closes #304
+- Removed link on recent - Closes #297
+- Categories sidebar is auto generated if no pages are created - Closes #291
+- Fix tag issues on creating custom pages - Closes #290
+- Validate paths on export - Closes #275
+- Walk Nextcloud import directory - Closes #254
+
+## General Improvements
+- Improved Nextcloud Migration. Mealie will now walk the directories in a zip file looking for directories that match the pattern of a Nextcloud Recipe. Closes #254
+    - Rewrite Keywords to Tag Fields
+    - Rewrite url to orgURL
+- Improved Chowdown Migration
+- Migration report is now similar to the Backup report
+- Tags/Categories are now title cased on import "dinner" -> "Dinner"
+- Depreciate `ENV` variable to `PRODUCTION`
+- Set `PRODUCTION` env variable to default to true
+- Unify Logger across the backend
+- mealie.log and last_recipe.json are now downloadable from the frontend from the /admin/about
+- New download schema where you request a token and then use that token to hit a single endpoint to download a file. This is a notable change if you are using the API to download backups. 
+- Recipe images can now be added directly from a URL - [See #117 for details](https://github.com/hay-kot/mealie/issues/117)

docs/docs/changelog/v0.4.3.md

@@ -0,0 +1,14 @@
+# v0.4.3
+
+**App Version: v0.4.3**
+
+**Database Version: v0.4.0**
+
+## Bug Fixes
+- Fix Upload error for Migrations
+- Fixes #315 - Cannot select another language
+- Fixes #314 - case-sensitive emails
+- Fixes #312 - Profile Image Reload
+
+## Improvements
+- New TOKEN_TIME and DEFAULT_EMAIL env variables

docs/docs/changelog/v0.5.0.md

@@ -0,0 +1,129 @@
+# v0.5.0 Too Many Changes! 
+
+**App Version: v0.5.0**
+
+**Database Version: v0.5.0**
+
+## Breaking Changes
+
+!!! error "Breaking Changes"
+
+    #### Database
+    Database version has been bumped from v0.4.x -> v0.5.0. You will need to export and import your data. Moving forward, we will be using database migrations (BETA) to do this automatically. Note that you still must backup your data. If you don't, it's entirely possible something may go wrong and you could lose your data on upgrade. 
+
+    #### Image Directory
+    the /data/img directory has been depreciated. All images are now stored in the /recipes/{slug}/image directory. Images should be migrated automatically, but you may experience issues related to this change. 
+
+    #### API Usage
+    If you have been using the API directly, many of the routes and status codes have changed. You may experience issues with directly consuming the API.
+
+    #### Arm/v7 Support
+    Mealie will no longer build in CI/CD due to a issue with the rust compiler on 32 bit devices. You can reference [this issue on the matrix-org/synapse](https://github.com/matrix-org/synapse/issues/9403) Github page that are facing a similar issue. You may still be able to build the docker image you-self. 
+
+!!! warning "Potential Data Loss"
+    With this release comes a major rework of how files are stored on disk and where things belong. Migration of files should be done automatically. We have tested extensively with many different backups and user bases and have found that no one experienced data-loss. HOWEVER, with all the major changes that have occurred, it is vital that to prevent any data-loss you must create a backup and store that backup outside of your mealie instance. If you do not do this, you may lose your data. 
+
+## Bug Fixes
+- Fixed #25 - Allow changing rating without going into edit
+- Fixed #475 - trim whitespace on login
+- Fixes #435 - Better Email Regex
+- Fixed #428 - Meal Planner now works on iOS devices
+- Fixed #419 - Typos
+- Fixed #418 - You can now "export" shopping lists
+- Fixed #356 - Shopping List items are now grouped
+- Fixed #329 - Fixed profile image not loading
+- Fixed #461 - Proper JSON serialization on webhooks
+- Fixed #332 - Language settings are saved for one browser
+- Fixes #281 - Slow Handling of Large Sets of Recipes
+- Fixed #356 - Shopping lists generate duplicate items
+- Fixed #271 - Slow handling of larger data sets
+- Fixed #472, #469, #458, #456 - Improve Recipe Parser
+
+## Features and Improvements
+
+### Highlights
+- Recipe Parser
+  - Recipes can now be imported with a bookmarklet!
+  - Significant improvement in supported sites with the new [Recipe Scraper Library](https://github.com/hhursev/recipe-scrapers)
+  - UI Debugging now available at `/recipes/debugger`
+  - Better error messages on failure
+  - ⚠️ last_recipe.json is now depreciated
+- Beta Support for Postgres! 🎉 See the getting started page for details
+- Recipe Features
+    - New button bar for editors with improved accessibility and performance
+    - Step Sections now supported
+    - Recipe Assets
+    - Add Asset image to recipe step
+    - Additional View Settings. 
+    - Better print support
+- New Toolbox Page!
+    - Bulk assign categories and tags by keyword search
+    - Title case all Categories or Tags with 1 click
+    - Create/Rename/Delete Operations for Tags/Categories
+    - Remove Unused Categories or Tags with 1 click
+- Recipe Cards now have a menu button for quick actions!
+    - Edit
+    - Delete
+    - Integrated Share with supported OS/Browsers
+    - Print
+- New Profile Dashboard!
+    - Edit Your Profile
+    - Create/Edit Themes
+    - View other users in your Group
+    - See what's for dinner
+    - Manage Long Live API Tokens (New)
+- New Admin Dashboard! 🎉
+    - Now you can get some insight on your application with application statics and events.
+    - See uncategorized/untagged recipes and organize them!
+    - Backup/Restore right from your dashboard
+    - See server side events. Now you can know who deleted your favorite recipe! 
+- New Event Notifications through the Apprise Library
+    - Get notified when specific server side events occur
+
+### Meal Planner
+- Multiple Recipes per day
+- Supports meals without recipes (Enter title and description)
+- Generate share-link from created meal-planners
+- Shopping lists can be directly generated from the meal plan
+
+### General
+- User can now favorite recipes
+- New 'Dark' Color Theme Packaged with Mealie
+- Updated Recipe Card Sections Toolbar
+    - New Sort Options (They work this time!) 
+        - Alphabetical
+        - Rating
+        - Created Date
+        - Updated Date
+        - Shuffle (Random Sort)
+    - New 'Random' Recipe button on recipe sections. Random recipes are selected from the filtered results below. For example, on the "Cakes" category page, you will only get recipes in the "Cakes" category. 
+- Rating can be updated without entering the editor - Closes #25
+- Updated recipe editor styles and moved notes to below the steps. 
+- Redesigned search bar
+- 'Dinner this week' shows a warning when no meal is planned yet
+- 'Dinner today' shows a warning when no meal is planned yet
+- More localization
+- Start date for Week is now selectable
+- Languages are now managed through Crowdin
+- Application Bar was Rewritten
+    - Sidebar can now be toggled everywhere. 
+    - New and improved mobile friendly bottom bar
+    - Improved styling for search bar in desktop
+    - Improved search layout on mobile
+- Profile image now shown on all sidebars
+- Switched from Flash Messages to Snackbar (Removed dependency)
+
+### Performance
+- Images are now served up by the Caddy increase performance and offloading some loads from the API server
+- Requesting all recipes from the server has been rewritten to refresh less often and manage client side data better.
+- All images are now converted to .webp for better compression
+
+### Behind the Scenes
+- The database layer has been added for future recipe scaling. 
+- Black and Flake8 now run as CI/CD checks
+- New debian based docker image
+- Unified Sidebar Components
+- Refactor UI components to fit Vue best practices (WIP)
+- The API returns more consistent status codes
+- The API returns error code instead of error text when appropriate 
+    - ⚠️ May cause side-effects if you were directly consuming the API

docs/docs/changelog/v0.5.1.md

@@ -0,0 +1,11 @@
+# v0.5.1
+
+**App Version: v0.5.1**
+
+**Database Version: v0.5.0**
+
+
+## Bug Fixes
+- Fixed #538 - Missing Ingredients on Editor
+- Fixed error on webhooks for new groups
+- Fixed various icons references

docs/docs/changelog/v0.5.2.md

@@ -0,0 +1,65 @@
+# v0.5.2 - DRAFT
+
+**App Version: v0.5.2**
+
+**Database Version: v0.5.0**
+
+## Bug Fixes
+- Fixed #617 - Section behavior when adding a step
+- Fixed #615 - Recipe Settings are not available when creating new recipe
+- Fixed #625 - API of today's image returns strange characters
+- Fixed [#590](https://github.com/hay-kot/mealie/issues/590) - Duplicate Events when using Gunicorn Workers
+
+## Features and Improvements
+
+### General
+- Recipe Instructions now collapse when checked
+- Default recipe settings can be set through ENV variables
+- Recipe Ingredient lists can now container ingredient sections. 
+- You can now download and upload individual recipes
+
+
+### Localization
+
+Huge thanks to [@sephrat](https://github.com/sephrat) for all his work on the project. He's very consistent in his contributions to the project and nearly every release has had some of his code in it! Here's some highlights from this release
+
+  - Lazy Load Translations (Huge Performance Increase!)
+  - Tons of localization additions all around the site.
+  - All of the work that goes into managing and making Crowdin a great feature the application
+
+#### Here a list of contributors on Crowding who make Mealie possible in different locals
+
+| Name                         | Languages          | Translated (Words) | Target Words |
+| ---------------------------- | ------------------ | :----------------: | :----------: |
+| retmas-gh                    | Polish             |        550         |     625      |
+| startos                      | Italian            |        310         |     322      |
+| CMBoii                       | Spanish            |        256         |     291      |
+| sephrat                      | French             |        255         |     296      |
+| Daniel Tildeman (tildeman)   | Swedish            |        233         |     228      |
+| Rourke                       | Dutch              |        216         |     214      |
+| Andreas Waschinski (Wascha)  | German             |        207         |     202      |
+| wengtad                      | Chinese Simplified |        176         |     343      |
+| Matthias Borremans (MrBorri) | Dutch              |         96         |      89      |
+| Adam Syndoman (pypckompsite) | Polish             |         68         |      65      |
+| JonasSchubert                | German             |         22         |      23      |
+| ThrawnJL                     | Danish             |         7          |      7       |
+| NicholasBrody                | Dutch              |         7          |      7       |
+| Giel Janssens (gieljnssns)   | Dutch              |         4          |      4       |
+| kentora                      | Danish             |         3          |      2       |
+
+
+
+### Docker 
+
+#### Huge thanks to [@wengtad](https://github.com/wengtad) for all his work on improving the deployment with docker. 
+
+  - Optimize Docker Dev Size (Frontend: from ~1.52GB to ~429MB | API: from ~657MB to ~380MB)
+  - Optimize Docker Prod Size (from ~542MB to ~373MB)
+  - Add Gunicorn
+  - Add Gunicorn and Webworkers to Dockerfile #550
+  - Add Docs for Gunicorn
+  - Add PUID/PGID to Docker. Fixes Initialization scripts fail to run when not executing as root user inside container #350,
+  - Not able to run correctly in docker if user permissions are specified #429
+  - Merge Dockerfile.dev into Dockerfile (dev shared same base together with prod)
+  - Add Docs for PUID/PGID
+  - Add Docker healthcheck (for this is not necessary, I could remove if you want)

docs/docs/changelog/v0.5.3.md

@@ -0,0 +1,31 @@
+# v0.5.3 - Bug Fixes
+
+**App Version: v0.5.3**
+
+**Database Version: v0.5.0**
+
+## Breaking Changes
+
+!!! error "Breaking Changes"
+    #### None
+
+
+## Bug Fixes
+- [755](https://api.github.com/repos/hay-kot/mealie/issues/755) - Mealie Categories Not Displaying Until After Settings Opened 
+- [748](https://api.github.com/repos/hay-kot/mealie/issues/748) - categories - Internal Server Error 
+- [689](https://api.github.com/repos/hay-kot/mealie/issues/689) - Importing a recipe with time information
+- [671](https://api.github.com/repos/hay-kot/mealie/issues/671) - Localization not loading on upgrade to v0.5.2
+- [655](https://api.github.com/repos/hay-kot/mealie/issues/655) - Clicking on "tags" on a mobile phone doesn't work (Wrong link, "Internal server error")
+- [654](https://api.github.com/repos/hay-kot/mealie/issues/654) - Ram Usage
+- Fixed Missing minus in shopping list UI [688](https://github.com/hay-kot/mealie/pull/688)
+
+## Features and Improvements
+
+### General
+- Recipe Images are no clickable [678](https://github.com/hay-kot/mealie/pull/678)
+- Additional Translations
+- Improved Recipe Parser thanks to [@cadamswaite](https://github.com/hay-kot/mealie/pulls?q=is%3Apr+author%3Acadamswaite)
+    - URL Scraper will now choose the best image from the list provided by the site
+    - Fixed the debugger to provide more meaningful data
+    - Fix issues parsing time formats
+    - Added support for parsing scraped nutrition details

docs/docs/changelog/v0.5.4.md

@@ -0,0 +1,28 @@
+# v0.5.4 - Bug Fixes
+
+**App Version: v0.5.4**
+
+**Database Version: v0.5.0**
+
+## Breaking Changes
+
+!!! error "Breaking Changes"
+
+    None
+
+## What's Changed
+* Add support for new languages by @sephrat in https://github.com/hay-kot/mealie/pull/781
+* Allow arrow keys to function when SearchDialog is not open by @asymworks in https://github.com/hay-kot/mealie/pull/777
+* Use firefox user agent when making requests by @cadamswaite in https://github.com/hay-kot/mealie/pull/780
+* Improve the SWAG Community Guide by @BryceStevenWilley in https://github.com/hay-kot/mealie/pull/793
+* New Crowdin updates by @hay-kot in https://github.com/hay-kot/mealie/pull/818
+* Add LDAP authentication support (v2, onto dev) by @dvdkon in https://github.com/hay-kot/mealie/pull/803
+* Auto backup is now disabled by default. Enable it by setting the AUTO_BACKUP_ENABLED env variable to true.
+
+
+## New Contributors
+* @asymworks made their first contribution in https://github.com/hay-kot/mealie/pull/777
+* @dvdkon made their first contribution in https://github.com/hay-kot/mealie/pull/803
+
+**Full Changelog**: https://github.com/hay-kot/mealie/compare/v0.5.3...v0.5.4
+

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

@@ -1,9 +1,6 @@
 # Contributing to Mealie
 
-!!! Warning
-    It should be known going into this that this is my first open source project, and my first public github repo I'm actively managing. If something does not make sense, or is not best practice. PLEASE feel free to reach out and let me know. I'm all about improving workflow and making it easier for contributors. 
-
-[Please Join the Discord](https://discord.gg/R6QDyJgbD2). We are building a community of developers working on the project.
+[Please Join the Discord](https://discord.gg/QuStdQGSGK). We are building a community of developers working on the project.
 
 ## We Develop with Github
 We use github to host code, to track issues and feature requests, as well as accept pull requests.
@@ -12,11 +9,12 @@ We use github to host code, to track issues and feature requests, as well as acc
 Pull requests are the best way to propose changes to the codebase (we use [Github Flow](https://guides.github.com/introduction/flow/index.html)). We actively welcome your pull requests: 
 
 1. Fork the repo and create your branch from `dev`.
-2. Read the page in in [dev/dev-notes.md](https://github.com/hay-kot/mealie/blob/master/dev/dev-notes.md) to get an idea on where the project is at.
+2. Checkout the Discord, the PRs page, or the Projects page to get an idea of what's already being worked on.
 3. If you're interested on working on major changes please get in touch on discord and coordinate with other developers. No sense in doubling up on work if someones already on it. 
-4. If you've changed APIs, update the documentation.
-5. Issue that pull request!
-6. If you make changes to the dev branch reflect those changes in the dev/dev-notes.md to keep track of changes. Don't forget to add your name/handle/identifier! 
+4. Once you've got an idea of what changes you want to make, create a draft PR as soon as you can to let us know what you're working on and how we can help!
+5. If you've changed APIs, update the documentation.
+6. Issue that pull request!
+7. If you make changes to the dev branch reflect those changes in the active changelog to keep track of changes. Don't forget to add your name/handle/identifier!
 
 ## Any contributions you make will be under the MIT Software License
 In short, when you submit code changes, your submissions are understood to be under the same [MIT License](http://choosealicense.com/licenses/mit/) that covers the project. Feel free to contact the maintainers if that's a concern.

docs/docs/contributors/developers-guide/general-guidelines.md

@@ -1,3 +1,7 @@
 # Guidelines
 
-TODO
+## Python
+
+## Vue
+
+[See The Style Guide](../developers-guide/style-guide.md)

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

@@ -1,40 +1,51 @@
 # Development: Getting Started
 
-After reading through the [Code Contributions Guide](https://hay-kot.github.io/mealie/contributors/developers-guide/code-contributions/) and forking the repo you can start working. This project is developed with :whale: docker and as such you will be greatly aided by using docker for development. It's not necessary but it is helpful.
+After reading through the [Code Contributions Guide](../developers-guide/code-contributions.md) and forking the repo you can start working. This project is developed with :whale: docker and as such you will be greatly aided by using docker for development. It's not necessary but it is helpful.
 
 ## With Docker
-`cd` into frontend directory and run `npm install` to install the node modules. 
+Prerequisites
 
-There are 2 scripts to help set up the docker containers in dev/scripts/. 
-
-`docker-compose.dev.sh` - Will spin up a docker development server
-`docker-compose.sh` - Will spin up a docker production server
-
-There are VSCode tasks created in the .vscode folder. You can use these to quickly execute the scripts above using the command palette.
+- Docker
+- docker-compose
 
+You can easily start the development stack by running `make docker-dev` in the root of the project directory. This will run and build the docker-compose.dev.yml file.
 
 ## Without Docker
 Prerequisites
 
-- Python 3.8+
+- Python 3.9+
 - Poetry
 - Nodejs
 - npm
 
-change directories into the mealie directory and run poetry install. cd into the frontend directory and run npm install. After installing dependencies, you can use vscode tasks to run the front and backend server. Use the command pallette to access the tasks. 
+Once the prerequisites are installed you can cd into the project base directory and run `make setup` to install the python and node dependencies. Once that is complete you can run `make backend` and `make frontend` to start the backend and frontend servers. 
 
-Alternatively you can run `npm run serve` in the frontend directory and `python app.py` in the mealie directory to get everything up and running for development. 
+## Make File Reference 
 
-## Trouble Shooting
+Run `make help` for reference
 
-!!! Error "Symptom: Vue Development Server Wont Start"
-    **Error:** `TypeError: Cannot read property 'upgrade' of undefined`
+```
+clean-purge          ⚠️ Removes All Developer Data for a fresh server start
+clean                🧹 Remove all build, test, coverage and Python artifacts
+clean-pyc            🧹 Remove Python file artifacts
+clean-test           🧹 Remove test and coverage artifacts
+test-all             🧪 Check Lint Format and Testing
+test                 🧪 Run tests quickly with the default Python
+lint                 🧺 Check style with flake8
+coverage             ☂️ Check code coverage quickly with the default Python
+setup                🏗 Setup Development Instance
+backend              🎬 Start Mealie Backend Development Server
+frontend             🎬 Start Mealie Frontend Development Server
+frontend-build       🏗 Build Frontend in frontend/dist
+docs                 📄 Start Mkdocs Development Server
+docker-dev           🐳 Build and Start Docker Development Stack
+docker-prod          🐳 Build and Start Docker Production Stack
+code-gen             🤖 Run Code-Gen Scripts
 
-    **Solution:** You may be missing the `/frontend/.env.development.` The contents should be `VUE_APP_API_BASE_URL=http://127.0.0.1:9921`. This is a reference to proxy the the API requests from Vue to 127.0.0.1 at port 9921 where FastAPI should be running.
+```
 
-!!! Error "Symptom: FastAPI Development Server Wont Start"
-    **Error:** `RuntimeError: Directory '/app/dist' does not exist`
+## Before you Commit! 
 
-    **Solution:** Create an empty /mealie/dist directory. This directory is served as static content by FastAPI. It is provided during the build process and may be missing in development. 
+Before you commit any changes on the backend/python side you'll want to run `make format` to format all the code with black. `make lint` to check with flake8, and `make test` to run pytests. You can also use `make test-all` to run both `lint` and `test`. 
 
-Run into another issue? [Ask for help on discord](https://discord.gg/R6QDyJgbD2)
+Run into another issue? [Ask for help on discord](https://discord.gg/QuStdQGSGK)