Remove unsupported platform from Docker build

Sync 7 commits from fork: chore(deps): bump boto3 from 1.42.4 to 1.42.5 in the pip-patches group

.devcontainer/Dockerfile

@@ -1,7 +1,7 @@
-FROM python:3.13-alpine3.22
+FROM python:3.10-alpine3.18
 
 #Install all dependencies.
-RUN apk add --no-cache postgresql-libs postgresql-client gettext zlib libjpeg libwebp libxml2-dev libxslt-dev openldap git yarn libgcc libstdc++ nginx tini envsubst nodejs npm
+RUN apk add --no-cache postgresql-libs postgresql-client gettext zlib libjpeg libwebp libxml2-dev libxslt-dev openldap git yarn
 
 #Print all logs without buffering it.
 ENV PYTHONUNBUFFERED 1
@@ -19,10 +19,8 @@ RUN \
     if [ `apk --print-arch` = "armv7" ]; then \
     printf "[global]\nextra-index-url=https://www.piwheels.org/simple\n" > /etc/pip.conf ; \
     fi
-RUN apk add --no-cache --virtual .build-deps gcc musl-dev postgresql-dev zlib-dev jpeg-dev libwebp-dev openssl-dev libffi-dev cargo openldap-dev python3-dev xmlsec-dev xmlsec build-base g++ curl rust && \
-    python -m pip install --upgrade pip && \
-    pip debug -v && \
-    pip install wheel==0.45.1 && \
-    pip install setuptools_rust==1.10.2 && \
-    pip install -r /tmp/pip-tmp/requirements.txt --no-cache-dir &&\
+RUN apk add --no-cache --virtual .build-deps gcc musl-dev postgresql-dev zlib-dev jpeg-dev libwebp-dev openssl-dev libffi-dev cargo openldap-dev python3-dev && \
+    echo -n "INPUT ( libldap.so )" > /usr/lib/libldap_r.so && \
+    pip3 --disable-pip-version-check --no-cache-dir install -r /tmp/pip-tmp/requirements.txt && \
+    rm -rf /tmp/pip-tmp && \
     apk --purge del .build-deps

.devcontainer/devcontainer.json

@@ -20,10 +20,6 @@
 				"ms-python.python"
 			]
 		}
-	},
-
-	"containerEnv": {
-		"CSRF_TRUSTED_ORIGINS": "http://localhost:8000,http://localhost:8080"
 	}
 
 	// Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root.

.dockerignore

@@ -29,4 +29,3 @@ vue/babel.config*
 vue/package.json
 vue/tsconfig.json
 vue/src/utils/openapi
-venv

.env.template

@@ -6,9 +6,6 @@
 # random secret key, use for example `base64 /dev/urandom | head -c50` to generate one
 SECRET_KEY=
 
-# your default timezone See https://timezonedb.com/time-zones for a list of timezones
-TZ=Europe/Berlin
-
 # allowed hosts (see documentation), should be set to your hostname(s) but might be * (default) for some proxies/providers
 # ALLOWED_HOSTS=recipes.mydomain.com
 

.github/FUNDING.yml

@@ -1,12 +0,0 @@
-# These are supported funding model platforms
-
-github: [vabene1111]
-patreon: # Replace with a single Patreon username
-open_collective: # Replace with a single Open Collective username
-ko_fi: # Replace with a single Ko-fi username
-tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
-community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
-liberapay: # Replace with a single Liberapay username
-issuehunt: # Replace with a single IssueHunt username
-otechie: # Replace with a single Otechie username
-custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']

.github/dependabot.yml

@@ -1,26 +1,92 @@
-# To get started with Dependabot version updates, you'll need to specify which
-# package ecosystems to update and where the package manifests are located.
-# Please see the documentation for all configuration options:
-# https://docs.github.com/en/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file
 
 version: 2
 updates:
-  - package-ecosystem: "devcontainers"
-    directory: "/"
-    schedule:
-      interval: weekly
-
   - package-ecosystem: "pip"
-    directory: "/"
+    open-pull-requests-limit: 20
     schedule:
-      interval: "monthly"
+      interval: "daily"
+    cooldown:
+      semver-major-days: 30
+      semver-minor-days: 7
+      semver-patch-days: 3
+      exclude:
+        - "recipe-scrapers"
+    directory: "/"
+    groups:
+      pip-patches:
+        exclude-patterns: ["pytest*"]
+        update-types: ["patch"]
+      pip-minors:
+        exclude-patterns: ["pytest*"]
+        update-types: ["minor"]
+      pip-pytest:
+        patterns: ["pytest*"]
+        update-types: ["minor", "patch"]
+
+    commit-message:
+      prefix: "chore"
+      include: "scope"
+    labels:
+      - "python"
+      - "dependencies"
+      - "automerge"
 
   - package-ecosystem: "npm"
-    directory: "/vue3/"
+    open-pull-requests-limit: 20
     schedule:
       interval: "monthly"
+    cooldown:
+      semver-major-days: 30
+      semver-minor-days: 3
+      semver-patch-days: 3
+    directory: "vue"
+    ignore:
+      - dependency-name: "vue"
+        update-types: ["version-update:semver-major"]
+      - dependency-name: "vue*"
+        update-types: ["version-update:semver-major"]
+      - dependency-name: "pinia"
+        update-types: ["version-update:semver-major"]
+    groups:
+      npm-patches:
+        patterns: ["*"]
+        update-types: ["patch"]
+      npm-minors:
+        patterns: ["*"]
+        update-types: ["minor"]
+    commit-message:
+      prefix: "chore"
+      include: "scope"
+    labels:
+      - "javascript"
+      - "dependencies"
 
   - package-ecosystem: "github-actions"
-    directory: "/"
+    open-pull-requests-limit: 20
     schedule:
-      interval: "monthly"
+      interval: "weekly"
+    directory: "/.github/"
+    groups:
+      actions-updates:
+          patterns: ["*"]
+          update-types: ["patch", "minor"]
+    commit-message:
+      prefix: "chore"
+      include: "scope"
+    labels:
+      - "github_actions"
+      - "dependencies"
+      - "automerge"
+
+  - package-ecosystem: "docker"
+    open-pull-requests-limit: 5
+    schedule:
+      interval: "weekly"
+    directory: "/"
+    commit-message:
+      prefix: "chore"
+      include: "scope"
+    labels:
+      - "docker"
+      - "dependencies"
+

.github/workflows/build-docker-open-data.yml

@@ -0,0 +1,112 @@
+name: Build Docker Container with open data plugin installed
+
+on:  
+  push:
+    branches: [disabled]
+
+jobs:
+  build-container:
+    name: Build ${{ matrix.name }} Container
+    runs-on: ubuntu-latest
+    if: github.repository_owner == 'TandoorRecipes'
+    continue-on-error: ${{ matrix.continue-on-error }}
+    permissions:
+      contents: read
+      packages: write
+    strategy:
+      matrix:
+        include:
+          # Standard build config
+          - name: Standard
+            dockerfile: Dockerfile
+            platforms: linux/amd64,linux/arm64
+            suffix: ""
+            continue-on-error: false
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Get version number
+        id: get_version
+        run: |
+          if [[ "$GITHUB_REF" = refs/tags/* ]]; then
+            echo "VERSION=${GITHUB_REF/refs\/tags\//}" >> $GITHUB_OUTPUT
+          elif [[ "$GITHUB_REF" = refs/heads/beta ]]; then
+            echo VERSION=beta >> $GITHUB_OUTPUT
+          else
+            echo VERSION=develop >> $GITHUB_OUTPUT
+          fi
+
+      # clone open data plugin
+      - name: clone open data plugin repo
+        uses: actions/checkout@master
+        with:
+          repository: TandoorRecipes/open_data_plugin
+          ref: master
+          path: ./recipes/plugins/open_data_plugin
+
+      # Build Vue frontend
+      - uses: actions/setup-node@v4
+        with:
+          node-version: '18'
+          cache: yarn
+          cache-dependency-path: vue/yarn.lock
+      - name: Install dependencies
+        working-directory: ./vue
+        run: yarn install --frozen-lockfile
+      - name: Build dependencies
+        working-directory: ./vue
+        run: yarn build
+
+      - name: Setup Open Data Plugin Links
+        working-directory: ./recipes/plugins/open_data_plugin
+        run: python setup_repo.py
+        
+      - name: Build Open Data Frontend
+        working-directory: ./recipes/plugins/open_data_plugin/vue
+        run: yarn build
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+      - name: Set up Buildx
+        uses: docker/setup-buildx-action@v3
+      - name: Login to Docker Hub
+        uses: docker/login-action@v3
+        if: github.secret_source == 'Actions'
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@v3
+        if: github.secret_source == 'Actions'
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ github.token }}
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: |
+            vabene1111/recipes
+            ghcr.io/TandoorRecipes/recipes
+          flavor: |
+            latest=false
+            suffix=${{ matrix.suffix }}
+          tags: |
+            type=raw,value=latest,suffix=-open-data-plugin,enable=${{ startsWith(github.ref, 'refs/tags/') }}
+            type=semver,suffix=-open-data-plugin,pattern={{version}}
+            type=semver,suffix=-open-data-plugin,pattern={{major}}.{{minor}}
+            type=semver,suffix=-open-data-plugin,pattern={{major}}
+            type=ref,suffix=-open-data-plugin,event=branch
+      - name: Build and Push
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          file: ${{ matrix.dockerfile }}
+          pull: true
+          push: ${{ github.secret_source == 'Actions' }}
+          platforms: ${{ matrix.platforms }}
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+          cache-from: type=gha
+          cache-to: type=gha,mode=max

.github/workflows/build-docker.yml

@@ -1,6 +1,8 @@
 name: Build Docker Container
 
-on: push
+on:
+  push:
+    branches: [tandoor-1]
 
 jobs:
   build-container:
@@ -23,28 +25,17 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - name: Get version number
-        id: get_version
-        run: |
-          if [[ "$GITHUB_REF" = refs/tags/* ]]; then
-            echo "VERSION=${GITHUB_REF/refs\/tags\//}" >> $GITHUB_OUTPUT
-          elif [[ "$GITHUB_REF" = refs/heads/beta ]]; then
-            echo VERSION=beta >> $GITHUB_OUTPUT
-          else
-            echo VERSION=develop >> $GITHUB_OUTPUT
-          fi
-
-      # Build Vue 3 frontend
+      # Build Vue frontend
       - uses: actions/setup-node@v4
         with:
-          node-version: '22'
+          node-version: '20'
           cache: yarn
-          cache-dependency-path: vue3/yarn.lock
+          cache-dependency-path: vue/yarn.lock
       - name: Install dependencies
-        working-directory: ./vue3
+        working-directory: ./vue
         run: yarn install --frozen-lockfile
       - name: Build dependencies
-        working-directory: ./vue3
+        working-directory: ./vue
         run: yarn build
 
       - name: Set up QEMU
@@ -75,11 +66,8 @@ jobs:
             latest=false
             suffix=${{ matrix.suffix }}
           tags: |
-            type=raw,value=latest,enable=${{ startsWith(github.ref, 'refs/tags/') }}
-            type=semver,pattern={{version}}
-            type=semver,pattern={{major}}.{{minor}}
-            type=semver,pattern={{major}}
-            type=ref,event=branch
+            type=raw,value=tandoor-v1-{{date 'YYYYMMDD'}}
+            type=raw,value=tandoor-v1
       - name: Build and Push
         uses: docker/build-push-action@v5
         with:
@@ -93,34 +81,3 @@ jobs:
           cache-from: type=gha
           cache-to: type=gha,mode=max
 
-  notify-stable:
-    name: Notify Stable
-    runs-on: ubuntu-latest
-    needs: build-container
-    if: startsWith(github.ref, 'refs/tags/')
-    steps:
-      - name: Set tag name
-        run: |
-          # Strip "refs/tags/" prefix
-          echo "VERSION=${GITHUB_REF#refs/tags/}" >> $GITHUB_ENV
-      # Send stable discord notification
-      - name: Discord notification
-        env:
-          DISCORD_WEBHOOK: ${{ secrets.DISCORD_RELEASE_WEBHOOK }}
-        uses: Ilshidur/action-discord@0.4.0
-        with:
-          args: '🚀 Version {{ VERSION }} of tandoor has been released 🥳 Check it out https://github.com/vabene1111/recipes/releases/tag/{{ VERSION }}'
-
-  notify-beta:
-    name: Notify Beta
-    runs-on: ubuntu-latest
-    needs: build-container
-    if: github.ref == 'refs/heads/beta'
-    steps:
-      # Send beta discord notification
-      - name: Discord notification
-        env:
-          DISCORD_WEBHOOK: ${{ secrets.DISCORD_BETA_WEBHOOK }}
-        uses: Ilshidur/action-discord@0.4.0
-        with:
-          args: '🚀 The Tandoor 2 Image has been updated! 🥳'

.github/workflows/ci.yml

@@ -1,6 +1,11 @@
 name: Continuous Integration
 
-on: [push, pull_request]
+on: 
+  push:
+    branches: [disabled]
+  pull_request:
+    branches: [disabled]
+
 
 jobs:
     build:
@@ -9,13 +14,14 @@ jobs:
         strategy:
             max-parallel: 4
             matrix:
-                python-version: ["3.12"]
-                node-version: ["22"]
+                python-version: ["3.10"]
+                node-version: ["18"]
+
         steps:
             - uses: actions/checkout@v4
-            - uses: awalsh128/cache-apt-pkgs-action@v1.5.1
+            - uses: awalsh128/cache-apt-pkgs-action@v1.4.3
               with:
-                  packages: libsasl2-dev python3-dev libxml2-dev libxmlsec1-dev libxslt-dev libxmlsec1-openssl libxslt-dev libldap2-dev libssl-dev gcc musl-dev postgresql-dev zlib-dev jpeg-dev libwebp-dev openssl-dev libffi-dev cargo openldap-dev python3-dev xmlsec-dev xmlsec build-base g++ curl
+                  packages: libsasl2-dev python3-dev libxml2-dev libxmlsec1-dev libxslt-dev libxmlsec1-openssl libldap2-dev libssl-dev gcc musl-dev postgresql-dev zlib-dev jpeg-dev libwebp-dev openssl-dev libffi-dev cargo openldap-dev python3-dev xmlsec-dev xmlsec build-base g++ curl
                   version: 1.0
 
             # Setup python & dependencies
@@ -36,9 +42,10 @@ jobs:
               with:
                   path: |
                       ./cookbook/static
+                      ./vue/webpack-stats.json
                       ./staticfiles
                   key: |
-                      ${{ runner.os }}-${{ matrix.python-version }}-${{ matrix.node-version }}-collectstatic-${{ hashFiles('**/*.css', '**/*.js', 'vue3/src/*') }}
+                      ${{ runner.os }}-${{ matrix.python-version }}-${{ matrix.node-version }}-collectstatic-${{ hashFiles('**/*.css', '**/*.js', 'vue/src/*') }}
 
             # Build Vue frontend & Dependencies
             - name: Set up Node ${{ matrix.node-version }}
@@ -47,28 +54,30 @@ jobs:
               with:
                   node-version: ${{ matrix.node-version }}
                   cache: "yarn"
-                  cache-dependency-path: ./vue3/yarn.lock
+                  cache-dependency-path: ./vue/yarn.lock
 
             - name: Install Vue dependencies
               if: steps.django_cache.outputs.cache-hit != 'true'
-              working-directory: ./vue3
+              working-directory: ./vue
               run: yarn install
 
             - name: Build Vue dependencies
               if: steps.django_cache.outputs.cache-hit != 'true'
-              working-directory: ./vue3
+              working-directory: ./vue
               run: yarn build
 
             - name: Compile Django StaticFiles
               if: steps.django_cache.outputs.cache-hit != 'true'
               run: |
                   python3 manage.py collectstatic --noinput
+                  python3 manage.py collectstatic_js_reverse
 
             - uses: actions/cache/save@v4
               if: steps.django_cache.outputs.cache-hit != 'true'
               with:
                   path: |
                       ./cookbook/static
+                      ./vue/webpack-stats.json
                       ./staticfiles
                   key: |
                       ${{ runner.os }}-${{ matrix.python-version }}-${{ matrix.node-version }}-collectstatic-${{ hashFiles('**/*.css', '**/*.js', 'vue/src/*') }}

.github/workflows/codeql-analysis.yml

@@ -2,9 +2,10 @@ name: "Code scanning - action"
 
 on:
   push:
+    branches: [disabled]
   pull_request:
-  schedule:
-    - cron: '0 13 * * 2'
+    branches: [disabled]
+
 
 jobs:
   CodeQL-Build:

.github/workflows/create-upstream-pr.yml

@@ -0,0 +1,235 @@
+name: Create Upstream PR
+
+on:
+  workflow_run:
+    workflows: ["Push Workflow"]
+    types:
+      - completed
+    branches: [working]
+  workflow_dispatch:
+
+permissions:
+  contents: write
+  pull-requests: write
+
+jobs:
+  create-upstream-pr:
+    runs-on: ubuntu-latest
+    concurrency:
+      group: upstream-pr
+      cancel-in-progress: true
+    if: github.event_name == 'workflow_dispatch' || github.event.workflow_run.conclusion == 'success'
+    steps:
+      - name: Generate GitHub App token (for branch push)
+        id: generate_token_push
+        uses: actions/create-github-app-token@v2
+        with:
+          app-id: ${{ secrets.BOT_APP_ID }}
+          private-key: ${{ secrets.BOT_PRIVATE_KEY }}
+
+      - name: Checkout fork
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+          token: ${{ steps.generate_token_push.outputs.token }}
+
+      - name: Setup git user
+        run: |
+          git config user.name "GitHub Action"
+          git config user.email "action@github.com"
+
+      - name: Add upstream remote
+        run: |
+          git remote get-url upstream || git remote add upstream https://github.com/TandoorRecipes/recipes.git
+          git fetch upstream
+
+      - name: Ensure jq is available
+        run: |
+          if ! command -v jq &> /dev/null; then
+            sudo apt-get update && sudo apt-get install -y jq
+          fi
+
+      - name: Create upstream PR branch
+        id: create_branch
+        run: |
+          BRANCH_NAME="upstream-pr-$(date +%Y%m%d-%H%M%S)"
+          git checkout -b "$BRANCH_NAME" || { echo "❌ Failed to create branch $BRANCH_NAME"; exit 1; }
+          echo "branch_name=$BRANCH_NAME" >> $GITHUB_OUTPUT
+          echo "✅ Created branch: $BRANCH_NAME"
+
+      - name: Restore upstream infrastructure files
+        id: restore_infra
+        run: |
+          BRANCH_NAME="${{ steps.create_branch.outputs.branch_name }}"
+          git checkout "$BRANCH_NAME"
+          git rm .gitattributes || echo "ℹ️ .gitattributes not present, skipping removal."
+          git checkout upstream/tandoor-1 -- .github/workflows/ || echo "ℹ️ No workflows to restore."
+          git checkout upstream/tandoor-1 -- cookbook/version_info.py || echo "ℹ️ No version_info.py to restore."
+          git add .
+          if ! git diff --cached --quiet; then
+            git commit -m $'Restore upstream infrastructure files for PR\n\n- Removed fork-specific .gitattributes\n- Restored upstream .github/workflows/\n- Restored upstream cookbook/version_info.py'
+            echo "✅ Infrastructure files restored and committed."
+          else
+            echo "ℹ️ No infrastructure changes to commit."
+          fi
+
+      - name: Push branch to fork (after infra commit)
+        env:
+          GITHUB_TOKEN: ${{ steps.generate_token_push.outputs.token }}
+        run: |
+          BRANCH_NAME="${{ steps.create_branch.outputs.branch_name }}"
+          echo "Pushing branch $BRANCH_NAME after infra file restore."
+          git push --set-upstream https://x-access-token:${GITHUB_TOKEN}@github.com/${GITHUB_REPOSITORY}.git "$BRANCH_NAME"
+          echo "✅ Branch pushed: $BRANCH_NAME (infra files)"
+
+
+      - name: Merge upstream branch
+        id: merge_upstream
+        run: |
+          BRANCH_NAME="${{ steps.create_branch.outputs.branch_name }}"
+          git checkout "$BRANCH_NAME"
+          if git merge --no-edit upstream/tandoor-1; then
+            echo "✅ Merged upstream/tandoor-1 into $BRANCH_NAME"
+            if ! git diff --cached --quiet || [ -n "$(git log origin/$BRANCH_NAME..$BRANCH_NAME --oneline)" ]; then
+              echo "merge_commit=true" >> $GITHUB_OUTPUT
+            else
+              echo "merge_commit=false" >> $GITHUB_OUTPUT
+            fi
+          else
+            echo "❌ Merge conflict detected during merge with upstream/tandoor-1. Please resolve conflicts manually." >&2
+            exit 1
+          fi
+
+      - name: Push branch to fork (after merge)
+        if: steps.merge_upstream.outputs.merge_commit == 'true'
+        env:
+          GITHUB_TOKEN: ${{ steps.generate_token_push.outputs.token }}
+        run: |
+          BRANCH_NAME="${{ steps.create_branch.outputs.branch_name }}"
+          echo "Pushing branch $BRANCH_NAME after merge."
+          git push https://x-access-token:${GITHUB_TOKEN}@github.com/${GITHUB_REPOSITORY}.git "$BRANCH_NAME"
+          echo "✅ Branch pushed: $BRANCH_NAME (after merge)"
+
+
+      - name: Get commit list
+        id: get_commits
+        run: |
+          BRANCH_NAME="${{ steps.create_branch.outputs.branch_name }}"
+          COMMITS_RAW=$(git log upstream/tandoor-1..$BRANCH_NAME --oneline)
+          if [ -z "$COMMITS_RAW" ]; then
+            echo "has_changes=false" >> $GITHUB_OUTPUT
+            echo "✅ No commits to contribute - exiting gracefully"
+            exit 0
+          fi
+          echo "commits_raw<<EOF" >> $GITHUB_OUTPUT
+          printf "%s\n" "$COMMITS_RAW" >> $GITHUB_OUTPUT
+          echo "EOF" >> $GITHUB_OUTPUT
+          echo "has_changes=true" >> $GITHUB_OUTPUT
+
+
+      - name: Get changed files
+        id: get_files
+        run: |
+          BRANCH_NAME="${{ steps.create_branch.outputs.branch_name }}"
+          CHANGED_FILES=$(git diff upstream/tandoor-1..$BRANCH_NAME --name-only)
+          echo "changed_files<<EOF" >> $GITHUB_OUTPUT
+          printf "%s\n" "$CHANGED_FILES" >> $GITHUB_OUTPUT
+          echo "EOF" >> $GITHUB_OUTPUT
+          CODE_COUNT=$(echo "$CHANGED_FILES" | grep -c '^' || true)
+          echo "code_count=$CODE_COUNT" >> $GITHUB_OUTPUT
+
+      - name: Summarize changes
+        id: summarize_changes
+        run: |
+          CODE_COUNT=${{ steps.get_files.outputs.code_count }}
+          CHANGES_SUMMARY="Modified $CODE_COUNT code files"
+          echo "changes_summary=$CHANGES_SUMMARY" >> $GITHUB_OUTPUT
+
+      - name: Prepare commit subjects and JSON
+        id: prepare_commits
+        run: |
+          COMMITS_RAW="${{ steps.get_commits.outputs.commits_raw }}"
+          CODE_FILES=( $(echo "${{ steps.get_files.outputs.changed_files }}") )
+          FILTERED_COMMITS_JSON="[]"
+          COMMIT_SUBJECTS_ARRAY=()
+          INFRA_PATTERNS='^\.github/|^cookbook/version_info\.py$|^\.gitattributes$'
+          while IFS= read -r commit_line; do
+            if [ -z "$commit_line" ]; then continue; fi
+            COMMIT_SHA=$(echo "$commit_line" | cut -d' ' -f1)
+            COMMIT_SUBJECT=$(echo "$commit_line" | cut -d' ' -f2-)
+            mapfile -t COMMIT_FILES < <(git diff-tree --no-commit-id --name-only -r "$COMMIT_SHA" | grep -Ev "$INFRA_PATTERNS")
+            # Only include commit if it touches at least one non-infra file that is still different
+            INCLUDE_COMMIT=false
+            for file in "${COMMIT_FILES[@]}"; do
+              for code_file in "${CODE_FILES[@]}"; do
+                if [ "$file" = "$code_file" ]; then
+                  INCLUDE_COMMIT=true
+                  break 2
+                fi
+              done
+            done
+            if [ "$INCLUDE_COMMIT" = true ]; then
+              COMMIT_SUBJECTS_ARRAY+=("- $COMMIT_SUBJECT")
+              FILES_JSON=$(printf '%s\n' "${COMMIT_FILES[@]}" | jq -R . | jq -s .)
+              COMMIT_JSON=$(jq -n --arg sha "$COMMIT_SHA" --arg subject "$COMMIT_SUBJECT" --argjson files "$FILES_JSON" '{sha: $sha, subject: $subject, files: $files}')
+              FILTERED_COMMITS_JSON=$(echo "$FILTERED_COMMITS_JSON" | jq --argjson item "$COMMIT_JSON" '. + [$item]')
+            fi
+          done <<< "$COMMITS_RAW"
+          echo 'commits_json<<EOF' >> $GITHUB_OUTPUT
+          printf "%s\n" "$FILTERED_COMMITS_JSON" >> $GITHUB_OUTPUT
+          echo 'EOF' >> $GITHUB_OUTPUT
+          echo "commit_subjects<<EOF" >> $GITHUB_OUTPUT
+          printf '%s\n' "${COMMIT_SUBJECTS_ARRAY[@]}" >> $GITHUB_OUTPUT
+          echo 'EOF' >> $GITHUB_OUTPUT
+
+
+      - name: Build PR content
+        if: steps.get_commits.outputs.has_changes == 'true'
+        id: build_pr_content
+        uses: actions/github-script@v7
+        env:
+          COMMITS_JSON: ${{ steps.prepare_commits.outputs.commits_json }}
+          CHANGES_SUMMARY: ${{ steps.summarize_changes.outputs.changes_summary }}
+          BRANCH_NAME: ${{ steps.create_branch.outputs.branch_name }}
+          GITHUB_REPOSITORY: ${{ github.repository }}
+        with:
+          github-token: ${{ steps.generate_token_push.outputs.token }}
+          script: |
+            const commits = JSON.parse(process.env.COMMITS_JSON || '[]');
+            const changesSummary = process.env.CHANGES_SUMMARY || 'Changes from fork';
+            const branchName = process.env.BRANCH_NAME || '';
+            const repo = process.env.GITHUB_REPOSITORY || '';
+            const [owner, reponame] = repo.split('/');
+            const nCommits = commits.length;
+            let prTitle = 'Sync ' + nCommits + ' commit' + (nCommits !== 1 ? 's' : '') + ' from fork:';
+            if (nCommits > 0) {
+              prTitle += ' ' + commits[0].subject;
+            }
+            let prBody = `This PR syncs ${nCommits} commit${nCommits !== 1 ? 's' : ''} from branch ${branchName}.\n\n`;
+            prBody += `**Changes Summary:**\n${changesSummary}\n\n`;
+            prBody += `Commits included:\n`;
+            for (const c of commits) {
+              prBody += `- ${c.subject} ([${c.sha}](https://github.com/${owner}/${reponame}/commit/${c.sha}))\n`;
+            }
+            prBody += `\n---\n`;
+            core.setOutput('prTitle', prTitle);
+            core.setOutput('prBody', prBody);
+
+
+      - name: Print PR creation instructions
+        if: steps.get_commits.outputs.has_changes == 'true'
+        env:
+          BRANCH_NAME: ${{ steps.create_branch.outputs.branch_name }}
+          PR_TITLE: ${{ steps.build_pr_content.outputs.prTitle }}
+          PR_BODY: ${{ steps.build_pr_content.outputs.prBody }}
+        run: |
+          echo "✅ Branch pushed: $BRANCH_NAME"
+          echo
+          echo "To create a pull request, open:"
+          echo "https://github.com/TandoorRecipes/recipes/compare/tandoor-1...${{ github.repository_owner }}:$BRANCH_NAME?expand=1"
+          echo
+          echo "Suggested PR title:"
+          echo "$PR_TITLE"
+          echo
+          echo "Suggested PR body:"
+          echo "$PR_BODY"

.github/workflows/dependabot-automerge.yml

@@ -0,0 +1,68 @@
+name: Dependabot Auto-merge
+
+on:
+  pull_request_target:
+    types: [opened,  synchronize, reopened, ready_for_review]
+
+permissions:
+  contents: read
+
+jobs:
+  validate:
+    if: contains(github.event.pull_request.labels.*.name, 'automerge') && github.event.pull_request.user.login != 'dependabot[bot]'
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      issues: write
+      pull-requests: write
+    steps:
+      - name: Remove automerge label
+        uses: actions-ecosystem/action-remove-labels@d05162525702062b6bdef750ed8594fc024b3ed7  # v1.3.0
+        with:
+          labels: automerge
+
+      - name: Add invalid label
+        uses: actions-ecosystem/action-add-labels@1a9c3715c0037e96b97bb38cb4c4b56a1f1d4871  # v1.1.0
+        with:
+          labels: invalid
+          
+      - name: Comment restriction
+        uses: peter-evans/create-or-update-comment@71345be0265236311c031f5c7866368bd1eff043  # v4.0.0
+        with:
+          issue-number: ${{ github.event.pull_request.number }}
+          body: |
+            ⚠️ **Automerge Restriction Notice**
+            
+            The `automerge` label has been removed from this PR because it has restricted use. Only PRs created by `dependabot[bot]` are allowed to use the automerge functionality.
+            
+            If you believe this is an error, please contact a repository maintainer.
+  
+  auto-merge:
+    if: github.actor == 'dependabot[bot]' && contains(github.event.pull_request.labels.*.name, 'automerge')
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      pull-requests: write
+    steps:
+      - name: Generate token
+        id: generate_token
+        uses: actions/create-github-app-token@v2
+        with:
+          app-id: ${{ secrets.BOT_APP_ID }}
+          private-key: ${{ secrets.BOT_PRIVATE_KEY }}
+
+      - name: Auto-approve PR
+        uses: hmarr/auto-approve-action@b40d6c9ed2fa10c9a2749eca7eb004418a705501  # v4.0.0
+        with:
+          github-token: ${{ steps.generate_token.outputs.token }}
+          review-message: |
+            🤖 **Dependabot Auto-merge**
+            
+            This PR has been automatically approved and enabled for auto-merge. It will be merged automatically once all required checks pass.
+          
+      - name: Enable auto-merge
+        uses: daneden/enable-automerge-action@f8558b65c5b8d8bfb592c4e74e3d491624a38fbd  # v1.0.0
+        with:
+          github-token: ${{ steps.generate_token.outputs.token }}
+          allowed-author: "dependabot[bot]"
+          merge-method: REBASE # Allowed values: MERGE | SQUASH | REBASE

.github/workflows/docker-publish.yml

@@ -0,0 +1,75 @@
+name: publish docker image
+on:
+  workflow_dispatch:
+  workflow_call:
+permissions:
+  contents: read
+  packages: write
+
+jobs:
+  build-container:
+    concurrency:
+      group: docker-build-${{ github.ref }}
+    name: Build Tandoor Container
+    runs-on: ubuntu-latest
+    continue-on-error: ${{ matrix.continue-on-error }}
+    permissions:
+      contents: read
+      packages: write
+    strategy:
+      matrix:
+        include:
+          # Standard build config
+          - name: Standard
+            dockerfile: Dockerfile
+            platforms: linux/amd64
+            suffix: ""
+            continue-on-error: false
+    steps:
+      - uses: actions/checkout@v4
+      - name: Get version number
+        id: get_version
+        run: |
+          echo VERSION=latest >> $GITHUB_OUTPUT
+
+      # Build Vue frontend
+      - uses: actions/setup-node@v4
+        with:
+          node-version: '20'
+          cache: yarn
+          cache-dependency-path: vue/yarn.lock
+      - name: Install dependencies
+        working-directory: ./vue
+        run: yarn install --frozen-lockfile
+      - name: Build dependencies
+        working-directory: ./vue
+        run: yarn build
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@05340d1c670183e7caabdb33ae9f1c80fae3b0c2  # v3.1.0
+      - name: Set up Buildx
+        uses: docker/setup-buildx-action@e468171a9de216ec08956ac3ada2f0791b6bd435  # v3.7.1
+      - name: Login to Docker Hub
+        uses: docker/login-action@3d100841f68d4548bf57e52eb27bd33ec5069f55  # v3.3.0
+        with:
+          username: ${{ secrets.USERNAME }}
+          password: ${{ secrets.PASSWORD }}
+      - name: Docker Metadata
+        id: meta
+        uses: docker/metadata-action@be19121bfd18b9c1ac415d9571d4f67b9b357886  # v5.6.0
+        with:
+          images: |
+            smilerz/recipes
+          tags: |
+            type=raw,value=latest,enable={{is_default_branch}}
+      - name: Build and Push
+        uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83  # v6.10.0
+        with:
+          context: .
+          file: ${{ matrix.dockerfile }}
+          pull: true
+          push: true
+          platforms: ${{ matrix.platforms }}
+          tags: '${{ steps.meta.outputs.tags }}'
+          cache-from: type=gha
+          cache-to: type=gha,mode=max

.github/workflows/push-orchestrator.yml

@@ -0,0 +1,57 @@
+name: Push Workflow
+
+on:
+  push:
+    branches: [working]
+
+permissions:
+  contents: read
+
+jobs:
+
+  detect-pr-merge:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      pull-requests: read
+    outputs:
+      pr_merged: ${{ steps.detect_pr.outputs.result }}
+    steps:      
+      - name: Check if commit is part of a PR
+        id: detect_pr
+        uses: actions/github-script@v7
+        with:
+          script: |
+            const prs = await github.rest.repos.listPullRequestsAssociatedWithCommit({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              commit_sha: context.sha
+            });
+
+            const pr = prs.data.find(pr => pr.merged_at);
+            const merged = pr ? 'true' : 'false';
+            
+            // Set the output explicitly
+            core.setOutput('pr_merged', merged);
+            return merged;
+
+
+  run-ci:
+    needs: detect-pr-merge
+    if: needs.detect-pr-merge.outputs.pr_merged != 'true'
+    permissions:
+      contents: read
+      actions: write
+    uses: ./.github/workflows/ci.yml
+    secrets: inherit
+
+  docker-publish:
+    permissions:
+      contents: read
+      packages: write
+    needs: [detect-pr-merge, run-ci]
+    if: |
+      needs.detect-pr-merge.outputs.pr_merged == 'true' ||
+      needs.run-ci.result == 'success'
+    uses: ./.github/workflows/docker-publish.yml
+    secrets: inherit

.github/workflows/stage-branch-for-pr.yml

@@ -0,0 +1,268 @@
+name: Stage Branch for PR
+
+on:
+  workflow_run:
+    workflows: ["Push Workflow"]
+    types:
+      - completed
+    branches: [working]
+  workflow_dispatch:
+
+permissions:
+  contents: write
+  pull-requests: write
+  issues: write
+
+jobs:
+  create-upstream-pr:
+    runs-on: ubuntu-latest
+    concurrency:
+      group: upstream-pr
+      cancel-in-progress: true
+    if: github.event_name == 'workflow_dispatch' || github.event.workflow_run.conclusion == 'success'
+    steps:
+      - name: Generate GitHub App token (for branch push)
+        id: generate_token_push
+        uses: actions/create-github-app-token@v2
+        with:
+          app-id: ${{ secrets.BOT_APP_ID }}
+          private-key: ${{ secrets.BOT_PRIVATE_KEY }}
+
+      - name: Checkout fork
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+          token: ${{ steps.generate_token_push.outputs.token }}
+
+      - name: Setup git user
+        run: |
+          git config user.name "GitHub Action"
+          git config user.email "action@github.com"
+
+      - name: Add upstream remote
+        run: |
+          git remote get-url upstream || git remote add upstream https://github.com/TandoorRecipes/recipes.git
+          git fetch upstream
+
+      - name: Ensure jq is available
+        run: |
+          if ! command -v jq &> /dev/null; then
+            sudo apt-get update && sudo apt-get install -y jq
+          fi
+
+      - name: Create upstream PR branch
+        id: create_branch
+        run: |
+          BRANCH_NAME="upstream-pr-$(date +%Y%m%d-%H%M%S)"
+          git checkout -b "$BRANCH_NAME" || { echo "❌ Failed to create branch $BRANCH_NAME"; exit 1; }
+          echo "branch_name=$BRANCH_NAME" >> $GITHUB_OUTPUT
+          echo "✅ Created branch: $BRANCH_NAME"
+
+      - name: Restore upstream infrastructure files
+        id: restore_infra
+        run: |
+          BRANCH_NAME="${{ steps.create_branch.outputs.branch_name }}"
+          git checkout "$BRANCH_NAME"
+          git rm .gitattributes || echo "ℹ️ .gitattributes not present, skipping removal."
+          git checkout upstream/tandoor-1 -- .github/workflows/ || echo "ℹ️ No workflows to restore."
+          git checkout upstream/tandoor-1 -- cookbook/version_info.py || echo "ℹ️ No version_info.py to restore."
+          git add .
+          if ! git diff --cached --quiet; then
+            git commit -m $'Restore upstream infrastructure files for PR\n\n- Removed fork-specific .gitattributes\n- Restored upstream .github/workflows/\n- Restored upstream cookbook/version_info.py'
+            echo "✅ Infrastructure files restored and committed."
+          else
+            echo "ℹ️ No infrastructure changes to commit."
+          fi
+
+      - name: Push branch to fork (after infra commit)
+        env:
+          GITHUB_TOKEN: ${{ steps.generate_token_push.outputs.token }}
+        run: |
+          BRANCH_NAME="${{ steps.create_branch.outputs.branch_name }}"
+          echo "Pushing branch $BRANCH_NAME after infra file restore."
+          git push --set-upstream https://x-access-token:${GITHUB_TOKEN}@github.com/${GITHUB_REPOSITORY}.git "$BRANCH_NAME"
+          echo "✅ Branch pushed: $BRANCH_NAME (infra files)"
+
+
+      - name: Merge upstream branch
+        id: merge_upstream
+        run: |
+          BRANCH_NAME="${{ steps.create_branch.outputs.branch_name }}"
+          git checkout "$BRANCH_NAME"
+          if git merge --no-edit upstream/tandoor-1; then
+            echo "✅ Merged upstream/tandoor-1 into $BRANCH_NAME"
+            if ! git diff --cached --quiet || [ -n "$(git log origin/$BRANCH_NAME..$BRANCH_NAME --oneline)" ]; then
+              echo "merge_commit=true" >> $GITHUB_OUTPUT
+            else
+              echo "merge_commit=false" >> $GITHUB_OUTPUT
+            fi
+          else
+            echo "❌ Merge conflict detected during merge with upstream/tandoor-1. Please resolve conflicts manually." >&2
+            exit 1
+          fi
+
+      - name: Push branch to fork (after merge)
+        if: steps.merge_upstream.outputs.merge_commit == 'true'
+        env:
+          GITHUB_TOKEN: ${{ steps.generate_token_push.outputs.token }}
+        run: |
+          BRANCH_NAME="${{ steps.create_branch.outputs.branch_name }}"
+          echo "Pushing branch $BRANCH_NAME after merge."
+          git push https://x-access-token:${GITHUB_TOKEN}@github.com/${GITHUB_REPOSITORY}.git "$BRANCH_NAME"
+          echo "✅ Branch pushed: $BRANCH_NAME (after merge)"
+
+
+      - name: Get commit list
+        id: get_commits
+        run: |
+          BRANCH_NAME="${{ steps.create_branch.outputs.branch_name }}"
+          COMMITS_RAW=$(git log upstream/tandoor-1..$BRANCH_NAME --oneline)
+          if [ -z "$COMMITS_RAW" ]; then
+            echo "has_changes=false" >> $GITHUB_OUTPUT
+            echo "✅ No commits to contribute - exiting gracefully"
+            exit 0
+          fi
+          echo "commits_raw<<EOF" >> $GITHUB_OUTPUT
+          printf "%s\n" "$COMMITS_RAW" >> $GITHUB_OUTPUT
+          echo "EOF" >> $GITHUB_OUTPUT
+          echo "has_changes=true" >> $GITHUB_OUTPUT
+
+
+      - name: Get changed files
+        id: get_files
+        run: |
+          BRANCH_NAME="${{ steps.create_branch.outputs.branch_name }}"
+          INFRA_PATTERNS='^\.github/|^cookbook/version_info\.py$|^\.gitattributes$'
+          CHANGED_FILES=$(git diff upstream/tandoor-1..$BRANCH_NAME --name-only | grep -Ev "$INFRA_PATTERNS" || true)
+          echo "changed_files<<EOF" >> $GITHUB_OUTPUT
+          printf "%s\n" "$CHANGED_FILES" >> $GITHUB_OUTPUT
+          echo "EOF" >> $GITHUB_OUTPUT
+          CODE_COUNT=$(echo "$CHANGED_FILES" | grep -c '^' || true)
+          echo "code_count=$CODE_COUNT" >> $GITHUB_OUTPUT
+
+      - name: Summarize changes
+        id: summarize_changes
+        run: |
+          CODE_COUNT=${{ steps.get_files.outputs.code_count }}
+          CHANGED_FILES="${{ steps.get_files.outputs.changed_files }}"
+          if [ "$CODE_COUNT" -eq 0 ]; then
+            CHANGES_SUMMARY="No code files changed. No PR required."
+          else
+            CHANGES_SUMMARY="Modified $CODE_COUNT code files"
+            CHANGES_SUMMARY+=$'\nFiles changed:'
+            CHANGES_SUMMARY+=$'\n'$(echo "$CHANGED_FILES" | sed '/^$/d; s/^/- /')
+          fi
+          echo "changes_summary<<EOF" >> $GITHUB_OUTPUT
+          echo "$CHANGES_SUMMARY" >> $GITHUB_OUTPUT
+          echo "EOF" >> $GITHUB_OUTPUT
+
+      - name: Prepare commit subjects and JSON
+        id: prepare_commits
+        run: |
+          COMMITS_RAW="${{ steps.get_commits.outputs.commits_raw }}"
+          CODE_FILES=( $(echo "${{ steps.get_files.outputs.changed_files }}") )
+          FILTERED_COMMITS_JSON="[]"
+          COMMIT_SUBJECTS_ARRAY=()
+          INFRA_PATTERNS='^\.github/|^cookbook/version_info\.py$|^\.gitattributes$'
+          while IFS= read -r commit_line; do
+            if [ -z "$commit_line" ]; then continue; fi
+            COMMIT_SHA=$(echo "$commit_line" | cut -d' ' -f1)
+            COMMIT_SUBJECT=$(echo "$commit_line" | cut -d' ' -f2-)
+            mapfile -t COMMIT_FILES < <(git diff-tree --no-commit-id --name-only -r "$COMMIT_SHA" | grep -Ev "$INFRA_PATTERNS")
+            # Only include commit if it touches at least one non-infra file that is still different
+            INCLUDE_COMMIT=false
+            for file in "${COMMIT_FILES[@]}"; do
+              for code_file in "${CODE_FILES[@]}"; do
+                if [ "$file" = "$code_file" ]; then
+                  INCLUDE_COMMIT=true
+                  break 2
+                fi
+              done
+            done
+            if [ "$INCLUDE_COMMIT" = true ]; then
+              COMMIT_SUBJECTS_ARRAY+=("- $COMMIT_SUBJECT")
+              FILES_JSON=$(printf '%s\n' "${COMMIT_FILES[@]}" | jq -R . | jq -s .)
+              COMMIT_JSON=$(jq -n --arg sha "$COMMIT_SHA" --arg subject "$COMMIT_SUBJECT" --argjson files "$FILES_JSON" '{sha: $sha, subject: $subject, files: $files}')
+              FILTERED_COMMITS_JSON=$(echo "$FILTERED_COMMITS_JSON" | jq --argjson item "$COMMIT_JSON" '. + [$item]')
+            fi
+          done <<< "$COMMITS_RAW"
+          echo 'commits_json<<EOF' >> $GITHUB_OUTPUT
+          printf "%s\n" "$FILTERED_COMMITS_JSON" >> $GITHUB_OUTPUT
+          echo 'EOF' >> $GITHUB_OUTPUT
+          echo "commit_subjects<<EOF" >> $GITHUB_OUTPUT
+          printf '%s\n' "${COMMIT_SUBJECTS_ARRAY[@]}" >> $GITHUB_OUTPUT
+          echo 'EOF' >> $GITHUB_OUTPUT
+
+
+      - name: Build PR content
+        if: steps.get_commits.outputs.has_changes == 'true'
+        id: build_pr_content
+        uses: actions/github-script@v7
+        env:
+          COMMITS_JSON: ${{ steps.prepare_commits.outputs.commits_json }}
+          CHANGES_SUMMARY: ${{ steps.summarize_changes.outputs.changes_summary }}
+          BRANCH_NAME: ${{ steps.create_branch.outputs.branch_name }}
+          GITHUB_REPOSITORY: ${{ github.repository }}
+        with:
+          github-token: ${{ steps.generate_token_push.outputs.token }}
+          script: |
+            const commits = JSON.parse(process.env.COMMITS_JSON || '[]');
+            const changesSummary = process.env.CHANGES_SUMMARY || 'Changes from fork';
+            const branchName = process.env.BRANCH_NAME || '';
+            const repo = process.env.GITHUB_REPOSITORY || '';
+            const [owner, reponame] = repo.split('/');
+            const nCommits = commits.length;
+            let prTitle = 'Sync ' + nCommits + ' commit' + (nCommits !== 1 ? 's' : '') + ' from fork:';
+            if (nCommits > 0) {
+              prTitle += ' ' + commits[0].subject;
+            }
+            let prBody = `This PR syncs ${nCommits} commit${nCommits !== 1 ? 's' : ''} from branch ${branchName}.\n\n`;
+            prBody += `**Changes Summary:**\n${changesSummary}\n\n`;
+            prBody += `Commits included:\n`;
+            for (const c of commits) {
+              prBody += `- ${c.subject} ([${c.sha}](https://github.com/${owner}/${reponame}/commit/${c.sha}))\n`;
+            }
+            core.setOutput('prTitle', prTitle);
+            core.setOutput('prBody', prBody);
+
+
+      - name: Open issue for PR checklist
+        if: steps.get_files.outputs.code_count != '0' && steps.prepare_commits.outputs.commit_subjects != ''
+        uses: actions/github-script@v7
+        env:
+          BRANCH_NAME: ${{ steps.create_branch.outputs.branch_name }}
+          PR_TITLE: ${{ steps.build_pr_content.outputs.prTitle }}
+          PR_BODY: ${{ steps.build_pr_content.outputs.prBody }}
+          GITHUB_REPOSITORY: ${{ github.repository }}
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          script: |
+            const branch = process.env.BRANCH_NAME || '';
+            const prTitle = process.env.PR_TITLE || '';
+            const prBody = process.env.PR_BODY || '';
+            const repo = process.env.GITHUB_REPOSITORY || '';
+            const [owner, reponame] = repo.split('/');
+            const prLink = `https://github.com/TandoorRecipes/recipes/compare/tandoor-1...${owner}:${branch}?expand=1&title=${encodeURIComponent(prTitle)}`;
+            const issueTitle = `Manual Upstream PR Checklist: ${branch}`;
+            const issueBody = [
+              `A new branch is ready for upstream PR submission.`,
+              '',
+              `- [ ] Submit PR: [Create PR](${prLink})`,
+              '- [ ] PR merged',
+              '- [ ] Branch deleted',
+              '',
+              '**Suggested PR title:**',
+              '```',
+              prTitle,
+              '```',
+              '**Suggested PR body:**',
+              '```',
+              prBody,
+              '```',
+            ].join('\n');
+            await github.rest.issues.create({
+              owner,
+              repo: reponame,
+              title: issueTitle,
+              body: issueBody
+            });

.gitignore

@@ -75,10 +75,8 @@ cookbook/static/vue
 vue/webpack-stats.json
 /docker-compose.override.yml
 vue/node_modules
-/recipes/plugins
-vetur.config.js
-cookbook/static/vue
-vue/webpack-stats.json
+plugins
+vue3/node_modules
 cookbook/templates/sw.js
 vue/.yarn
 vue3/.vite
@@ -87,8 +85,4 @@ vue3/.vite
 vetur.config.js
 venv/
 .idea/easy-i18n.xml
-cookbook/static/vue3
-vue3/node_modules
-cookbook/tests/other/docs/reports/tests/tests.html
-cookbook/tests/other/docs/reports/tests/pytest.xml
-vue3/src/plugins
+cookbook/static/vue3

.idea/prettier.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="PrettierConfiguration">
-    <option name="myConfigurationMode" value="AUTOMATIC" />
-  </component>
-</project>

.idea/recipes.iml

@@ -18,7 +18,7 @@
       <excludeFolder url="file://$MODULE_DIR$/staticfiles" />
       <excludeFolder url="file://$MODULE_DIR$/venv" />
     </content>
-    <orderEntry type="jdk" jdkName="Python 3.12 (recipes)" jdkType="Python SDK" />
+    <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
   <component name="TemplatesService">

.idea/vcs.xml

@@ -2,7 +2,5 @@
 <project version="4">
   <component name="VcsDirectoryMappings">
     <mapping directory="" vcs="Git" />
-    <mapping directory="$PROJECT_DIR$/recipes/plugins/enterprise_plugin" vcs="Git" />
-    <mapping directory="$PROJECT_DIR$/recipes/plugins/open_data_plugin" vcs="Git" />
   </component>
 </project>

.idea/watcherTasks.xml

@@ -5,7 +5,7 @@
       <option name="arguments" value="-m flake8 $FilePath$ --config $ContentRoot$\.flake8" />
       <option name="checkSyntaxErrors" value="true" />
       <option name="description" />
-      <option name="exitCodeBehavior" value="NEVER" />
+      <option name="exitCodeBehavior" value="ALWAYS" />
       <option name="fileExtension" value="py" />
       <option name="immediateSync" value="false" />
       <option name="name" value="Flake8 Watcher" />
@@ -27,65 +27,5 @@
       <option name="workingDir" value="" />
       <envs />
     </TaskOptions>
-    <TaskOptions isEnabled="false">
-      <option name="arguments" value="-m isort $FilePath$" />
-      <option name="checkSyntaxErrors" value="true" />
-      <option name="description" />
-      <option name="exitCodeBehavior" value="ERROR" />
-      <option name="fileExtension" value="py" />
-      <option name="immediateSync" value="false" />
-      <option name="name" value="isort Watcher" />
-      <option name="output" value="$FilePath$" />
-      <option name="outputFilters">
-        <array />
-      </option>
-      <option name="outputFromStdout" value="false" />
-      <option name="program" value="$PyInterpreterDirectory$/python" />
-      <option name="runOnExternalChanges" value="false" />
-      <option name="scopeName" value="Project Files" />
-      <option name="trackOnlyRoot" value="false" />
-      <option name="workingDir" value="" />
-      <envs />
-    </TaskOptions>
-    <TaskOptions isEnabled="false">
-      <option name="arguments" value="-m yapf -i $FilePath$" />
-      <option name="checkSyntaxErrors" value="true" />
-      <option name="description" />
-      <option name="exitCodeBehavior" value="NEVER" />
-      <option name="fileExtension" value="py" />
-      <option name="immediateSync" value="false" />
-      <option name="name" value="YAPF" />
-      <option name="output" value="$FilePath$" />
-      <option name="outputFilters">
-        <array />
-      </option>
-      <option name="outputFromStdout" value="false" />
-      <option name="program" value="$PyInterpreterDirectory$/python" />
-      <option name="runOnExternalChanges" value="false" />
-      <option name="scopeName" value="Project Files" />
-      <option name="trackOnlyRoot" value="false" />
-      <option name="workingDir" value="" />
-      <envs />
-    </TaskOptions>
-    <TaskOptions isEnabled="false">
-      <option name="arguments" value="--cwd $ProjectFileDir$\vue prettier -w --config $ProjectFileDir$\.prettierrc $FilePath$" />
-      <option name="checkSyntaxErrors" value="true" />
-      <option name="description" />
-      <option name="exitCodeBehavior" value="ERROR" />
-      <option name="fileExtension" value="*" />
-      <option name="immediateSync" value="true" />
-      <option name="name" value="Prettier" />
-      <option name="output" value="" />
-      <option name="outputFilters">
-        <array />
-      </option>
-      <option name="outputFromStdout" value="false" />
-      <option name="program" value="yarn" />
-      <option name="runOnExternalChanges" value="true" />
-      <option name="scopeName" value="Prettier" />
-      <option name="trackOnlyRoot" value="false" />
-      <option name="workingDir" value="" />
-      <envs />
-    </TaskOptions>
   </component>
 </project>

.vscode/launch.json

@@ -1,18 +1,18 @@
 {
-    // Use IntelliSense to learn about possible attributes.
-    // Hover to view descriptions of existing attributes.
-    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
-    "version": "0.2.0",
-    "configurations": [
-      {
-        "name": "Python Debugger: Django",
-        "type": "debugpy",
-        "request": "launch",
-        "program": "${workspaceFolder}/manage.py",
-        "args": ["runserver"],
-        "django": true,
-        "justMyCode": true
-      },
+  // Use IntelliSense to learn about possible attributes.
+  // Hover to view descriptions of existing attributes.
+  // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "name": "Python Debugger: Django",
+      "type": "debugpy",
+      "request": "launch",
+      "program": "${workspaceFolder}/manage.py",
+      "args": ["runserver"],
+      "django": true,
+      "justMyCode": true
+    },
     {
       "name": "Python: Debug Tests",
       "type": "debugpy",
@@ -24,7 +24,7 @@
       "console": "integratedTerminal",
       "env": {
         // coverage and pytest can't both be running at the same time
-        "PYTEST_ADDOPTS": "--no-cov -n 0"
+        "PYTEST_ADDOPTS": "--no-cov"
       },
       "django": true,
       "justMyCode": true

.vscode/settings.json

@@ -1,14 +1,15 @@
 {
-    "python.testing.pytestArgs": [
-        "cookbook/tests"
-    ],
-    "python.testing.unittestEnabled": false,
-    "python.testing.pytestEnabled": true,
-    "editor.formatOnSave": true,
-    "editor.defaultFormatter": "esbenp.prettier-vscode",
-    "[python]": {
-        "editor.defaultFormatter": "eeyore.yapf",
-    },
-    "yapf.args": [],
-    "isort.args": []
+  "python.testing.pytestArgs": ["cookbook/tests"],
+  "python.testing.unittestEnabled": false,
+  "python.testing.pytestEnabled": true,
+  "editor.formatOnSave": true,
+  "editor.defaultFormatter": "esbenp.prettier-vscode",
+  "[python]": {
+    "editor.defaultFormatter": "eeyore.yapf"
+  },
+  "editor.codeActionsOnSave": {
+    "source.organizeImports": "explicit"
+  },
+  "yapf.args": [],
+  "isort.args": []
 }

.vscode/tasks.json

@@ -1,83 +1,75 @@
 {
-  "version": "2.0.0",
-  "tasks": [
-    {
-      "label": "Run Migrations",
-      "type": "shell",
-      "command": "python3 manage.py migrate"
-    },
-    {
-      "label": "Collect Static Files",
-      "type": "shell",
-      "command": "python3 manage.py collectstatic",
-      "dependsOn": ["Yarn Build"]
-    },
-    {
-      "label": "Setup Dev Server",
-      "dependsOn": ["Run Migrations"]
-    },
-    {
-      "label": "Run Dev Server",
-      "type": "shell", 
-      "dependsOn": ["Setup Dev Server"],
-      "command": "DEBUG=1 python3 manage.py runserver"
-    },
-    {
-      "label": "Yarn Install",
-      "type": "shell",
-      "command": "yarn install --force",
-      "options": {
-        "cwd": "${workspaceFolder}/vue3"
-      }
-    },
-    {
-      "label": "Generate API",
-      "type": "shell",
-      "command": "openapi-generator-cli generate -g typescript-fetch -i http://127.0.0.1:8000/openapi/",
-      "options": {
-        "cwd": "${workspaceFolder}/vue3/src/openapi"
-      }
-    },
-    {
-      "label": "Yarn Dev",
-      "type": "shell",
-      "command": "yarn dev",
-      "dependsOn": ["Yarn Install"],
-      "options": {
-        "cwd": "${workspaceFolder}/vue3"
-      }
-    },
-    {
-      "label": "Yarn Build",
-      "type": "shell",
-      "command": "yarn build",
-      "dependsOn": ["Yarn Install"],
-      "options": {
-        "cwd": "${workspaceFolder}/vue3"
+    "version": "2.0.0",
+    "tasks": [
+      {
+        "label": "Run Migrations",
+        "type": "shell",
+        "command": "python3 manage.py migrate",
       },
-      "group": "build"
-    },
-    {
-      "label": "Setup Tests",
-      "dependsOn": ["Run Migrations", "Collect Static Files"]
-    },
-    {
-      "label": "Run all pytests",
-      "type": "shell",
-      "command": "python3 -m pytest cookbook/tests",
-      "dependsOn": ["Setup Tests"],
-      "group": "test"
-    },
-    {
-      "label": "Setup Documentation Dependencies",
-      "type": "shell",
-      "command": "pip install mkdocs-material mkdocs-include-markdown-plugin"
-    },
-    {
-      "label": "Serve Documentation",
-      "type": "shell",
-      "command": "mkdocs serve",
-      "dependsOn": ["Setup Documentation Dependencies"]
-    }
-  ]
-}
+      {
+        "label": "Collect Static Files",
+        "type": "shell",
+        "command": "python3 manage.py collectstatic",
+        "dependsOn": ["Yarn Build"],
+      },
+      {
+        "label": "Setup Dev Server",
+        "dependsOn": ["Run Migrations", "Yarn Build"],
+      },
+      {
+        "label": "Run Dev Server",
+        "type": "shell",
+        "dependsOn": ["Setup Dev Server"],
+        "command": "python3 manage.py runserver",
+      },
+      {
+        "label": "Yarn Install",
+        "type": "shell",
+        "command": "yarn install",
+        "options": {
+          "cwd": "${workspaceFolder}/vue"
+        }
+      },
+      {
+        "label": "Yarn Serve",
+        "type": "shell",
+        "command": "yarn serve",
+        "dependsOn": ["Yarn Install"],
+        "options": {
+          "cwd": "${workspaceFolder}/vue"
+        }
+      },
+      {
+        "label": "Yarn Build",
+        "type": "shell",
+        "command": "yarn build",
+        "dependsOn": ["Yarn Install"],
+        "options": {
+          "cwd": "${workspaceFolder}/vue"
+        },
+        "group": "build",
+      },
+      {
+        "label": "Setup Tests",
+        "dependsOn": ["Run Migrations", "Collect Static Files"],
+      },
+      {
+        "label": "Run all pytests",
+        "type": "shell",
+        "command": "python3 -m pytest cookbook/tests",
+        "dependsOn": ["Setup Tests"],
+        "group": "test",
+      },
+      {
+        "label": "Setup Documentation Dependencies",
+        "type": "shell",
+        "command": "pip install mkdocs-material mkdocs-include-markdown-plugin",
+      },
+      {
+        "label": "Serve Documentation",
+        "type": "shell",
+        "command": "mkdocs serve",
+        "dependsOn": ["Setup Documentation Dependencies"],
+      }
+    ]
+}

Dockerfile

@@ -1,14 +1,15 @@
-FROM python:3.13-alpine3.22
+FROM python:3.12.12-alpine3.21
 
 #Install all dependencies.
-RUN apk add --no-cache postgresql-libs postgresql-client gettext zlib libjpeg libwebp libxml2-dev libxslt-dev openldap git libgcc libstdc++ nginx tini envsubst nodejs npm
+RUN apk add --no-cache postgresql-libs postgresql-client gettext zlib libjpeg libwebp libxml2-dev libxslt-dev openldap git
 
 #Print all logs without buffering it.
-ENV PYTHONUNBUFFERED=1 \
-    DOCKER=true
+ENV PYTHONUNBUFFERED 1
+
+ENV DOCKER true
 
 #This port will be used by gunicorn.
-EXPOSE 80 8080
+EXPOSE 8080
 
 #Create app dir and install requirements.
 RUN mkdir /opt/recipes
@@ -16,27 +17,24 @@ WORKDIR /opt/recipes
 
 COPY requirements.txt ./
 
+RUN \
+    if [ `apk --print-arch` = "armv7" ]; then \
+    printf "[global]\nextra-index-url=https://www.piwheels.org/simple\n" > /etc/pip.conf ; \
+    fi
 # remove Development dependencies from requirements.txt
 RUN sed -i '/# Development/,$d' requirements.txt
-RUN apk add --no-cache --virtual .build-deps gcc musl-dev postgresql-dev zlib-dev jpeg-dev libwebp-dev openssl-dev libffi-dev cargo openldap-dev python3-dev xmlsec-dev xmlsec build-base g++ curl rust && \
+RUN apk add --no-cache --virtual .build-deps gcc musl-dev postgresql-dev zlib-dev jpeg-dev libwebp-dev openssl-dev libffi-dev cargo openldap-dev python3-dev xmlsec-dev xmlsec build-base  && \
+    echo -n "INPUT ( libldap.so )" > /usr/lib/libldap_r.so && \
     python -m venv venv && \
     /opt/recipes/venv/bin/python -m pip install --upgrade pip && \
-    venv/bin/pip debug -v && \
-    venv/bin/pip install wheel==0.45.1 && \
-    venv/bin/pip install setuptools_rust==1.10.2 && \
+    venv/bin/pip install wheel==0.42.0 && \
+    venv/bin/pip install setuptools_rust==1.9.0 && \
     venv/bin/pip install -r requirements.txt --no-cache-dir &&\
     apk --purge del .build-deps
 
 #Copy project and execute it.
 COPY . ./
 
-# delete default nginx config and link it to tandoors config
-# create symlinks to access and error log to show them on stdout
-RUN rm -rf /etc/nginx/http.d && \
-    ln -s /opt/recipes/http.d /etc/nginx/http.d && \
-    ln -sf /dev/stdout /var/log/nginx/access.log && \
-    ln -sf /dev/stderr /var/log/nginx/error.log
-
 # commented for now https://github.com/TandoorRecipes/recipes/issues/3478
 #HEALTHCHECK --interval=30s \
 #            --timeout=5s \
@@ -50,4 +48,4 @@ RUN /opt/recipes/venv/bin/python version.py
 RUN find . -type d -name ".git" | xargs rm -rf
 
 RUN chmod +x boot.sh
-ENTRYPOINT ["/sbin/tini", "--", "/opt/recipes/boot.sh"]
+ENTRYPOINT ["/opt/recipes/boot.sh"]

README.md

@@ -23,7 +23,6 @@
 <a href="https://docs.tandoor.dev/install/docker/" target="_blank" rel="noopener noreferrer">Installation</a> •
 <a href="https://docs.tandoor.dev/" target="_blank" rel="noopener noreferrer">Docs</a> •
 <a href="https://app.tandoor.dev/accounts/login/?demo" target="_blank" rel="noopener noreferrer">Demo</a> •
-<a href="https://community.tandoor.dev" target="_blank" rel="noopener noreferrer">Community</a> •
 <a href="https://discord.gg/RhzBrfWgtp" target="_blank" rel="noopener noreferrer">Discord</a>
 </p>
 
@@ -82,13 +81,13 @@ Share some information on how you use Tandoor to help me improve the application
 
 <table>
   <tr>
-    <td><a href="https://community.tandoor.dev">Community</a></td>
-    <td>Get support, share best practices, discuss feature ideas, and meet other Tandoor users.</td>
+    <td><a href="https://discord.gg/RhzBrfWgtp">Discord</a></td>
+    <td>We have a public Discord server that anyone can join. This is where all our developers and contributors hang out and where we make announcements</td>
   </tr>
 
   <tr>
-    <td><a href="https://discord.gg/RhzBrfWgtp">Discord</a></td>
-    <td>We have a public Discord server that anyone can join. This is where all our developers and contributors hang out and where we make announcements</td>
+    <td><a href="https://twitter.com/TandoorRecipes">Twitter</a></td>
+    <td>You can follow our Twitter account to get updates on new features or releases</td>
   </tr>
 </table>
 

boot.sh

@@ -1,21 +1,11 @@
 #!/bin/sh
 source venv/bin/activate
 
-# these are envsubst in the nginx config, make sure they default to something sensible when unset
-export TANDOOR_PORT="${TANDOOR_PORT:-8080}"
-export MEDIA_ROOT=${MEDIA_ROOT:-/opt/recipes/mediafiles};
-export STATIC_ROOT=${STATIC_ROOT:-/opt/recipes/staticfiles};
-
+TANDOOR_PORT="${TANDOOR_PORT:-8080}"
 GUNICORN_WORKERS="${GUNICORN_WORKERS:-3}"
 GUNICORN_THREADS="${GUNICORN_THREADS:-2}"
 GUNICORN_LOG_LEVEL="${GUNICORN_LOG_LEVEL:-'info'}"
-
-PLUGINS_BUILD="${PLUGINS_BUILD:-0}"
-
-if [ "${TANDOOR_PORT}" -eq 80 ]; then
-    echo "TANDOOR_PORT set to 8080 because 80 is now taken by the integrated nginx"
-    TANDOOR_PORT=8080
-fi
+NGINX_CONF_FILE=/opt/recipes/nginx/conf.d/Recipes.conf
 
 display_warning() {
     echo "[WARNING]"
@@ -24,6 +14,11 @@ display_warning() {
 
 echo "Checking configuration..."
 
+# Nginx config file must exist if gunicorn is not active
+if [ ! -f "$NGINX_CONF_FILE" ] && [ $GUNICORN_MEDIA -eq 0 ]; then
+    display_warning "Nginx configuration file could not be found at the default location!\nPath: ${NGINX_CONF_FILE}"
+fi
+
 # SECRET_KEY (or a valid file at SECRET_KEY_FILE) must be set in .env file
 
 if [ -f "${SECRET_KEY_FILE}" ]; then
@@ -84,31 +79,20 @@ echo "Database is ready"
 
 echo "Migrating database"
 
-python manage.py migrate
 
-if [ "${PLUGINS_BUILD}" -eq 1 ]; then
-    echo "Running yarn build at startup because PLUGINS_BUILD is enabled"
-    python plugin.py
-fi
+python manage.py migrate
 
 echo "Collecting static files, this may take a while..."
 
+python manage.py collectstatic_js_reverse
 python manage.py collectstatic --noinput
 
 echo "Done"
 
-chmod -R 755 ${MEDIA_ROOT:-/opt/recipes/mediafiles}
+chmod -R 755 /opt/recipes/mediafiles
 
 ipv6_disable=$(cat /sys/module/ipv6/parameters/disable)
 
-# prepare nginx config
-envsubst '$MEDIA_ROOT $STATIC_ROOT $TANDOOR_PORT' < /opt/recipes/http.d/Recipes.conf.template > /opt/recipes/http.d/Recipes.conf
-
-# start nginx
-echo "Starting nginx"
-nginx
-
-echo "Starting gunicorn"
 # Check if IPv6 is enabled, only then run gunicorn with ipv6 support
 if [ "$ipv6_disable" -eq 0 ]; then
     exec gunicorn -b "[::]:$TANDOOR_PORT" --workers $GUNICORN_WORKERS --threads $GUNICORN_THREADS --access-logfile - --error-logfile - --log-level $GUNICORN_LOG_LEVEL recipes.wsgi

cookbook/admin.py

@@ -7,11 +7,10 @@ from django.utils import translation
 from django_scopes import scopes_disabled
 from treebeard.admin import TreeAdmin
 from treebeard.forms import movenodeform_factory
-from allauth.account.decorators import secure_admin_login
 
 from cookbook.managers import DICTIONARY
 
-from .models import (BookmarkletImport, Comment, CookLog, CustomFilter, Food, ImportLog, Ingredient, InviteLink,
+from .models import (BookmarkletImport, Comment, CookLog, Food, ImportLog, Ingredient, InviteLink,
                      Keyword, MealPlan, MealType, NutritionInformation, Property, PropertyType,
                      Recipe, RecipeBook, RecipeBookEntry, RecipeImport, SearchPreference, ShareLink,
                      ShoppingListEntry, ShoppingListRecipe, Space, Step, Storage,
@@ -19,8 +18,6 @@ from .models import (BookmarkletImport, Comment, CookLog, CustomFilter, Food, Im
                      TelegramBot, Unit, UnitConversion, UserFile, UserPreference, UserSpace,
                      ViewLog, ConnectorConfig)
 
-admin.site.login = secure_admin_login(admin.site.login)
-
 
 class CustomUserAdmin(UserAdmin):
     def has_add_permission(self, request, obj=None):
@@ -106,13 +103,6 @@ class ConnectorConfigAdmin(admin.ModelAdmin):
 admin.site.register(ConnectorConfig, ConnectorConfigAdmin)
 
 
-class CustomFilterAdmin(admin.ModelAdmin):
-    list_display = ('id', 'type', 'name')
-
-
-admin.site.register(CustomFilter, CustomFilterAdmin)
-
-
 class SyncAdmin(admin.ModelAdmin):
     list_display = ('storage', 'path', 'active', 'last_checked')
     search_fields = ('storage__name', 'path')

cookbook/connectors/connector.py

@@ -2,7 +2,7 @@ from abc import ABC, abstractmethod
 from dataclasses import dataclass
 from typing import Optional
 
-from cookbook.models import ShoppingListEntry, User, ConnectorConfig
+from cookbook.models import ConnectorConfig, ShoppingListEntry, User
 
 
 @dataclass
@@ -12,10 +12,7 @@ class UserDTO:
 
     @staticmethod
     def create_from_user(instance: User) -> 'UserDTO':
-        return UserDTO(
-            username=instance.username,
-            first_name=instance.first_name if instance.first_name else None
-        )
+        return UserDTO(username=instance.username, first_name=instance.first_name if instance.first_name else None)
 
 
 @dataclass
@@ -42,6 +39,7 @@ class ShoppingListEntryDTO:
 
 # A Connector is 'destroyed' & recreated each time 'any' ConnectorConfig in a space changes.
 class Connector(ABC):
+
     @abstractmethod
     def __init__(self, config: ConnectorConfig):
         pass

cookbook/connectors/connector_manager.py

@@ -7,14 +7,14 @@ from dataclasses import dataclass
 from enum import Enum
 from logging import Logger
 from types import UnionType
-from typing import List, Any, Dict, Optional, Type
+from typing import Any, Dict, List, Optional, Type
 
 from django.conf import settings
 from django_scopes import scope
 
 from cookbook.connectors.connector import Connector, ShoppingListEntryDTO
 from cookbook.connectors.homeassistant import HomeAssistant
-from cookbook.models import ShoppingListEntry, Space, ConnectorConfig
+from cookbook.models import ConnectorConfig, ShoppingListEntry, Space
 
 REGISTERED_CLASSES: UnionType | Type = ShoppingListEntry
 
@@ -58,7 +58,10 @@ class ConnectorManager(metaclass=Singleton):
         self._logger = logging.getLogger("recipes.connector")
         self._logger.debug("ConnectorManager initializing")
         self._queue = queue.Queue(maxsize=settings.EXTERNAL_CONNECTORS_QUEUE_SIZE)
-        self._worker = threading.Thread(target=self.worker, args=(0, self._queue,), daemon=True)
+        self._worker = threading.Thread(target=self.worker, args=(
+            0,
+            self._queue,
+        ), daemon=True)
         self._worker.start()
 
     # Called by post save & post delete signals

cookbook/connectors/homeassistant.py

@@ -5,14 +5,16 @@ from urllib.parse import urljoin
 
 from aiohttp import request, ClientResponseError
 
-from cookbook.connectors.connector import Connector, ShoppingListEntryDTO
-from cookbook.models import ConnectorConfig
+from cookbook.connectors.connector import Connector
+from cookbook.models import ShoppingListEntry, ConnectorConfig, Space
 
 
 class HomeAssistant(Connector):
     _config: ConnectorConfig
     _logger: Logger
 
+    _required_foreign_keys = ("food", "unit", "created_by")
+
     def __init__(self, config: ConnectorConfig):
         if not config.token or not config.url or not config.todo_entity:
             raise ValueError("config for HomeAssistantConnector in incomplete")
@@ -32,7 +34,7 @@ class HomeAssistant(Connector):
             response.raise_for_status()
             return await response.json()
 
-    async def on_shopping_list_entry_created(self, shopping_list_entry: ShoppingListEntryDTO) -> None:
+    async def on_shopping_list_entry_created(self, space: Space, shopping_list_entry: ShoppingListEntry) -> None:
         if not self._config.on_shopping_list_entry_created_enabled:
             return
 
@@ -53,15 +55,20 @@ class HomeAssistant(Connector):
         except ClientResponseError as err:
             self._logger.warning(f"received an exception from the api: {err.request_info.url=}, {err.request_info.method=}, {err.status=}, {err.message=}, {type(err)=}")
 
-    async def on_shopping_list_entry_updated(self, shopping_list_entry: ShoppingListEntryDTO) -> None:
+    async def on_shopping_list_entry_updated(self, space: Space, shopping_list_entry: ShoppingListEntry) -> None:
         if not self._config.on_shopping_list_entry_updated_enabled:
             return
         pass
 
-    async def on_shopping_list_entry_deleted(self, shopping_list_entry: ShoppingListEntryDTO) -> None:
+    async def on_shopping_list_entry_deleted(self, space: Space, shopping_list_entry: ShoppingListEntry) -> None:
         if not self._config.on_shopping_list_entry_deleted_enabled:
             return
 
+        if not all(k in shopping_list_entry._state.fields_cache for k in self._required_foreign_keys):
+            # Sometimes the food foreign key is not loaded, and we cant load it from an async process
+            self._logger.debug("required property was not present in ShoppingListEntry")
+            return
+
         item, _ = _format_shopping_list_entry(shopping_list_entry)
 
         self._logger.debug(f"removing {item=} from {self._config.todo_entity}")
@@ -81,19 +88,19 @@ class HomeAssistant(Connector):
         pass
 
 
-def _format_shopping_list_entry(shopping_list_entry: ShoppingListEntryDTO) -> Tuple[str, str]:
-    item = shopping_list_entry.food_name
-    if shopping_list_entry.amount:
+def _format_shopping_list_entry(shopping_list_entry: ShoppingListEntry) -> Tuple[str, str]:
+    item = shopping_list_entry.food.name
+    if shopping_list_entry.amount > 0:
         item += f" ({shopping_list_entry.amount:.2f}".rstrip('0').rstrip('.')
-        if shopping_list_entry.base_unit:
-            item += f" {shopping_list_entry.base_unit})"
-        elif shopping_list_entry.unit_name:
-            item += f" {shopping_list_entry.unit_name})"
+        if shopping_list_entry.unit and shopping_list_entry.unit.base_unit and len(shopping_list_entry.unit.base_unit) > 0:
+            item += f" {shopping_list_entry.unit.base_unit})"
+        elif shopping_list_entry.unit and shopping_list_entry.unit.name and len(shopping_list_entry.unit.name) > 0:
+            item += f" {shopping_list_entry.unit.name})"
         else:
             item += ")"
 
     description = "From TandoorRecipes"
-    if shopping_list_entry.created_by.first_name:
+    if shopping_list_entry.created_by.first_name and len(shopping_list_entry.created_by.first_name) > 0:
         description += f", by {shopping_list_entry.created_by.first_name}"
     else:
         description += f", by {shopping_list_entry.created_by.username}"

cookbook/forms.py

@@ -1,5 +1,6 @@
 from datetime import datetime
 
+
 from allauth.account.forms import ResetPasswordForm, SignupForm
 from allauth.socialaccount.forms import SignupForm as SocialSignupForm
 from django import forms
@@ -13,6 +14,7 @@ from hcaptcha.fields import hCaptchaField
 
 from .models import Comment, InviteLink, Keyword, Recipe, SearchPreference, Space, Storage, Sync, User, UserPreference, ConnectorConfig
 
+
 class SelectWidget(widgets.Select):
     class Media:
         js = ('custom/js/form_select.js',)
@@ -21,6 +23,49 @@ class SelectWidget(widgets.Select):
 class MultiSelectWidget(widgets.SelectMultiple):
     class Media:
         js = ('custom/js/form_multiselect.js',)
+
+
+# Yes there are some stupid browsers that still dont support this but
+# I dont support people using these browsers.
+class DateWidget(forms.DateInput):
+    input_type = 'date'
+
+    def __init__(self, **kwargs):
+        kwargs["format"] = "%Y-%m-%d"
+        super().__init__(**kwargs)
+
+
+class UserNameForm(forms.ModelForm):
+    prefix = 'name'
+
+    class Meta:
+        model = User
+        fields = ('first_name', 'last_name')
+
+        help_texts = {'first_name': _('Both fields are optional. If none are given the username will be displayed instead')}
+
+
+class ExternalRecipeForm(forms.ModelForm):
+    file_path = forms.CharField(disabled=True, required=False)
+    file_uid = forms.CharField(disabled=True, required=False)
+
+    def __init__(self, *args, **kwargs):
+        space = kwargs.pop('space')
+        super().__init__(*args, **kwargs)
+        self.fields['keywords'].queryset = Keyword.objects.filter(space=space).all()
+
+    class Meta:
+        model = Recipe
+        fields = ('name', 'description', 'servings', 'working_time', 'waiting_time', 'file_path', 'file_uid', 'keywords')
+
+        labels = {
+            'name': _('Name'), 'keywords': _('Keywords'), 'working_time': _('Preparation time in minutes'), 'waiting_time': _('Waiting time (cooking/baking) in minutes'),
+            'file_path': _('Path'), 'file_uid': _('Storage UID'),
+        }
+        widgets = {'keywords': MultiSelectWidget}
+        field_classes = {'keywords': SafeModelMultipleChoiceField, }
+
+
 class ImportExportBase(forms.Form):
     DEFAULT = 'DEFAULT'
     PAPRIKA = 'PAPRIKA'
@@ -52,6 +97,7 @@ class ImportExportBase(forms.Form):
                                       (PLANTOEAT, 'Plantoeat'), (COOKBOOKAPP, 'CookBookApp'), (COPYMETHAT, 'CopyMeThat'), (PDF, 'PDF'), (MELARECIPES, 'Melarecipes'),
                                       (COOKMATE, 'Cookmate'), (REZEPTSUITEDE, 'Recipesuite.de'), (GOURMET, 'Gourmet')))
 
+
 class MultipleFileInput(forms.ClearableFileInput):
     allow_multiple_selected = True
 
@@ -75,6 +121,8 @@ class ImportForm(ImportExportBase):
     files = MultipleFileField(required=True)
     duplicates = forms.BooleanField(help_text=_('To prevent duplicates recipes with the same name as existing ones are ignored. Check this box to import everything.'),
                                     required=False)
+
+
 class ExportForm(ImportExportBase):
     recipes = forms.ModelMultipleChoiceField(widget=MultiSelectWidget, queryset=Recipe.objects.none(), required=False)
     all = forms.BooleanField(required=False)
@@ -85,7 +133,125 @@ class ExportForm(ImportExportBase):
         super().__init__(*args, **kwargs)
         self.fields['recipes'].queryset = Recipe.objects.filter(space=space).all()
 
-from .models import InviteLink, SearchPreference, Space, User, UserPreference
+
+class CommentForm(forms.ModelForm):
+    prefix = 'comment'
+
+    class Meta:
+        model = Comment
+        fields = ('text',)
+
+        labels = {'text': _('Add your comment: '), }
+        widgets = {'text': forms.Textarea(attrs={'rows': 2, 'cols': 15}), }
+
+
+class StorageForm(forms.ModelForm):
+    username = forms.CharField(widget=forms.TextInput(attrs={'autocomplete': 'new-password'}), required=False)
+    password = forms.CharField(widget=forms.TextInput(attrs={'autocomplete': 'new-password', 'type': 'password'}),
+                               required=False,
+                               help_text=_('Leave empty for dropbox and enter app password for nextcloud.'))
+    token = forms.CharField(widget=forms.TextInput(attrs={'autocomplete': 'new-password', 'type': 'password'}),
+                            required=False,
+                            help_text=_('Leave empty for nextcloud and enter api token for dropbox.'))
+
+    class Meta:
+        model = Storage
+        fields = ('name', 'method', 'username', 'password', 'token', 'url', 'path')
+
+        help_texts = {'url': _('Leave empty for dropbox and enter only base url for nextcloud (<code>/remote.php/webdav/</code> is added automatically)'), }
+
+
+class ConnectorConfigForm(forms.ModelForm):
+    enabled = forms.BooleanField(
+        help_text="Is the connector enabled",
+        required=False,
+    )
+
+    on_shopping_list_entry_created_enabled = forms.BooleanField(
+        help_text="Enable action for ShoppingListEntry created events",
+        required=False,
+    )
+
+    on_shopping_list_entry_updated_enabled = forms.BooleanField(
+        help_text="Enable action for ShoppingListEntry updated events",
+        required=False,
+    )
+
+    on_shopping_list_entry_deleted_enabled = forms.BooleanField(
+        help_text="Enable action for ShoppingListEntry deleted events",
+        required=False,
+    )
+
+    supports_description_field = forms.BooleanField(
+        help_text="Does the connector todo entity support the description field",
+        initial=True,
+        required=False,
+    )
+
+    update_token = forms.CharField(
+        widget=forms.TextInput(attrs={'autocomplete': 'update-token', 'type': 'password'}),
+        required=False,
+        help_text=_('<a href="https://www.home-assistant.io/docs/authentication/#your-account-profile">Long Lived Access Token</a> for your HomeAssistant instance')
+    )
+
+    url = forms.URLField(
+        required=False,
+        help_text=_('Something like http://homeassistant.local:8123/api'),
+    )
+
+    class Meta:
+        model = ConnectorConfig
+
+        fields = (
+            'name', 'type', 'enabled', 'on_shopping_list_entry_created_enabled', 'on_shopping_list_entry_updated_enabled',
+            'on_shopping_list_entry_deleted_enabled', 'supports_description_field', 'url', 'todo_entity',
+        )
+
+        help_texts = {
+            'url': _('http://homeassistant.local:8123/api for example'),
+        }
+
+
+class SyncForm(forms.ModelForm):
+
+    def __init__(self, *args, **kwargs):
+        space = kwargs.pop('space')
+        super().__init__(*args, **kwargs)
+        self.fields['storage'].queryset = Storage.objects.filter(space=space).all()
+
+    class Meta:
+        model = Sync
+        fields = ('storage', 'path', 'active')
+
+        field_classes = {'storage': SafeModelChoiceField, }
+
+        labels = {'storage': _('Storage'), 'path': _('Path'), 'active': _('Active')}
+
+
+class BatchEditForm(forms.Form):
+    search = forms.CharField(label=_('Search String'))
+    keywords = forms.ModelMultipleChoiceField(queryset=Keyword.objects.none(), required=False, widget=MultiSelectWidget)
+
+    def __init__(self, *args, **kwargs):
+        space = kwargs.pop('space')
+        super().__init__(*args, **kwargs)
+        self.fields['keywords'].queryset = Keyword.objects.filter(space=space).all().order_by('id')
+
+
+class ImportRecipeForm(forms.ModelForm):
+
+    def __init__(self, *args, **kwargs):
+        space = kwargs.pop('space')
+        super().__init__(*args, **kwargs)
+        self.fields['keywords'].queryset = Keyword.objects.filter(space=space).all()
+
+    class Meta:
+        model = Recipe
+        fields = ('name', 'keywords', 'file_path', 'file_uid')
+
+        labels = {'name': _('Name'), 'keywords': _('Keywords'), 'file_path': _('Path'), 'file_uid': _('File ID'), }
+        widgets = {'keywords': MultiSelectWidget}
+        field_classes = {'keywords': SafeModelChoiceField, }
 
 
 class InviteLinkForm(forms.ModelForm):
@@ -173,3 +339,38 @@ class UserCreateForm(forms.Form):
     name = forms.CharField(label='Username')
     password = forms.CharField(widget=forms.TextInput(attrs={'autocomplete': 'new-password', 'type': 'password'}))
     password_confirm = forms.CharField(widget=forms.TextInput(attrs={'autocomplete': 'new-password', 'type': 'password'}))
+
+
+class SearchPreferenceForm(forms.ModelForm):
+    prefix = 'search'
+    trigram_threshold = forms.DecimalField(min_value=0.01,
+                                           max_value=1,
+                                           decimal_places=2,
+                                           widget=NumberInput(attrs={'class': "form-control-range", 'type': 'range'}),
+                                           help_text=_('Determines how fuzzy a search is if it uses trigram similarity matching (e.g. low values mean more typos are ignored).'))
+    preset = forms.CharField(widget=forms.HiddenInput(), required=False)
+
+    class Meta:
+        model = SearchPreference
+        fields = ('search', 'lookup', 'unaccent', 'icontains', 'istartswith', 'trigram', 'fulltext', 'trigram_threshold')
+
+        help_texts = {
+            'search': _('Select type method of search.  Click <a href="/docs/search/">here</a> for full description of choices.'), 'lookup':
+                _('Use fuzzy matching on units, keywords and ingredients when editing and importing recipes.'), 'unaccent':
+                _('Fields to search ignoring accents.  Selecting this option can improve or degrade search quality depending on language'), 'icontains':
+                _("Fields to search for partial matches.  (e.g. searching for 'Pie' will return 'pie' and 'piece' and 'soapie')"), 'istartswith':
+                _("Fields to search for beginning of word matches. (e.g. searching for 'sa' will return 'salad' and 'sandwich')"), 'trigram':
+                _("Fields to 'fuzzy' search. (e.g. searching for 'recpie' will find 'recipe'.)  Note: this option will conflict with 'web' and 'raw' methods of search."),
+            'fulltext':
+                _("Fields to full text search.  Note: 'web', 'phrase', and 'raw' search methods only function with fulltext fields."),
+        }
+
+        labels = {
+            'search': _('Search Method'), 'lookup': _('Fuzzy Lookups'), 'unaccent': _('Ignore Accent'), 'icontains': _("Partial Match"), 'istartswith': _("Starts With"),
+            'trigram': _("Fuzzy Search"), 'fulltext': _("Full Text")
+        }
+
+        widgets = {
+            'search': SelectWidget, 'unaccent': MultiSelectWidget, 'icontains': MultiSelectWidget, 'istartswith': MultiSelectWidget, 'trigram': MultiSelectWidget, 'fulltext':
+                MultiSelectWidget,
+        }

cookbook/helper/automation_helper.py

@@ -109,7 +109,7 @@ class AutomationEngine:
         Moves a string that should never be treated as a unit to next token and optionally replaced with default unit
         e.g. NEVER_UNIT: param1: egg, param2: None would modify ['1', 'egg', 'white'] to ['1', '', 'egg', 'white']
         or NEVER_UNIT: param1: egg, param2: pcs would modify ['1', 'egg', 'yolk'] to ['1', 'pcs', 'egg', 'yolk']
-        :param1 tokens: string that should never be considered a unit, will be moved to token[2]
+        :param1 string: string that should never be considered a unit, will be moved to token[2]
         :param2 (optional) unit as string: will insert unit string into token[1]
         :return: unit as string (possibly changed by automation)
         """
@@ -135,7 +135,7 @@ class AutomationEngine:
                 new_unit = self.never_unit[tokens[1].lower()]
                 never_unit = True
             except KeyError:
-                return tokens, never_unit
+                return tokens
         else:
             if a := Automation.objects.annotate(param_1_lower=Lower('param_1')).filter(space=self.request.space, type=Automation.NEVER_UNIT, param_1_lower__in=[
                     tokens[1].lower(), alt_unit.lower()], disabled=False).order_by('order').first():
@@ -144,7 +144,7 @@ class AutomationEngine:
 
         if never_unit:
             tokens.insert(1, new_unit)
-        return tokens, never_unit
+        return tokens
 
     def apply_transpose_automation(self, string):
         """

cookbook/helper/drf_spectacular_hooks.py

@@ -1,102 +0,0 @@
-# custom processing for schema
-# reason: DRF writable nested needs ID's to decide if a nested object should be created or updated
-# the API schema/client make ID's read only by default and strips them entirely in request objects (with COMPONENT_SPLIT_REQUEST enabled)
-# change the schema to make IDs optional but writable so they are included in the request
-
-def custom_postprocessing_hook(result, generator, request, public):
-    for c in result['components']['schemas'].keys():
-        # handle schemas used by the client to do requests on the server
-        if 'properties' in result['components']['schemas'][c] and 'id' in result['components']['schemas'][c]['properties']:
-            # make ID field not read only so it's not stripped from the request on the client
-            result['components']['schemas'][c]['properties']['id']['readOnly'] = False
-            # make ID field not required
-            if 'required' in result['components']['schemas'][c] and 'id' in result['components']['schemas'][c]['required']:
-                result['components']['schemas'][c]['required'].remove('id')
-
-    return result
-
-
-# TODO remove below once legacy API has been fully deprecated
-from drf_spectacular.openapi import AutoSchema  # noqa: E402 isort: skip
-import functools  # noqa: E402 isort: skip
-import re  # noqa: E402 isort: skip
-
-
-class LegacySchema(AutoSchema):
-    operation_id_base = None
-
-    @functools.cached_property
-    def path(self):
-        path = re.sub(pattern=self.path_prefix, repl='', string=self.path, flags=re.IGNORECASE)
-        # remove path variables
-        return re.sub(pattern=r'\{[\w\-]+\}', repl='', string=path)
-
-    def get_operation_id(self):
-        """
-        Compute an operation ID from the view type and get_operation_id_base method.
-        """
-        method_name = getattr(self.view, 'action', self.method.lower())
-        if self._is_list_view():
-            action = 'list'
-        elif method_name not in self.method_mapping:
-            action = self._to_camel_case(method_name)
-        else:
-            action = self.method_mapping[self.method.lower()]
-
-        name = self.get_operation_id_base(action)
-
-        return action + name
-
-    def get_operation_id_base(self, action):
-        """
-        Compute the base part for operation ID from the model, serializer or view name.
-        """
-        model = getattr(getattr(self.view, 'queryset', None), 'model', None)
-
-        if self.operation_id_base is not None:
-            name = self.operation_id_base
-
-        # Try to deduce the ID from the view's model
-        elif model is not None:
-            name = model.__name__
-
-        # Try with the serializer class name
-        elif self.get_serializer() is not None:
-            name = self.get_serializer().__class__.__name__
-            if name.endswith('Serializer'):
-                name = name[:-10]
-
-        # Fallback to the view name
-        else:
-            name = self.view.__class__.__name__
-            if name.endswith('APIView'):
-                name = name[:-7]
-            elif name.endswith('View'):
-                name = name[:-4]
-
-            # Due to camel-casing of classes and `action` being lowercase, apply title in order to find if action truly
-            # comes at the end of the name
-            if name.endswith(action.title()):  # ListView, UpdateAPIView, ThingDelete ...
-                name = name[:-len(action)]
-
-        if action == 'list' and not name.endswith('s'):  # listThings instead of listThing
-            name += 's'
-
-        return name
-
-    def get_serializer(self):
-        view = self.view
-
-        if not hasattr(view, 'get_serializer'):
-            return None
-
-        try:
-            return view.get_serializer()
-        except Exception:
-            return None
-
-    def _to_camel_case(self, snake_str):
-        components = snake_str.split('_')
-        # We capitalize the first letter of each component except the first one
-        # with the 'title' method and join them together.
-        return components[0] + ''.join(x.title() for x in components[1:])

cookbook/helper/image_processing.py

@@ -37,7 +37,7 @@ def get_filetype(name):
 
 def is_file_type_allowed(filename, image_only=False):
     is_file_allowed = False
-    allowed_file_types = ['.pdf', '.docx', '.xlsx', '.css', '.mp4', '.mov']
+    allowed_file_types = ['.pdf', '.docx', '.xlsx']
     allowed_image_types = ['.png', '.jpg', '.jpeg', '.gif', '.webp']
     check_list = allowed_image_types
     if not image_only:
@@ -50,18 +50,6 @@ def is_file_type_allowed(filename, image_only=False):
     return is_file_allowed
 
 
-def strip_image_meta(image_object, file_format):
-    image_object = Image.open(image_object)
-
-    data = list(image_object.getdata())
-    image_without_exif = Image.new(image_object.mode, image_object.size)
-    image_without_exif.putdata(data)
-
-    im_io = BytesIO()
-    image_without_exif.save(im_io, file_format)
-    return im_io
-
-
 # TODO this whole file needs proper documentation, refactoring, and testing
 # TODO also add env variable to define which images sizes should be compressed
 # filetype argument can not be optional, otherwise this function will treat all images as if they were a jpeg
@@ -72,21 +60,9 @@ def handle_image(request, image_object, filetype):
     except Exception:
         return None
 
-    file_format = None
-    if filetype == '.jpeg' or filetype == '.jpg':
-        file_format = 'JPEG'
-    if filetype == '.png':
-        file_format = 'PNG'
-    if filetype == '.webp':
-        file_format = 'WEBP'
-
     if (image_object.size / 1000) > 500:  # if larger than 500 kb compress
         if filetype == '.jpeg' or filetype == '.jpg':
             return rescale_image_jpeg(image_object)
         if filetype == '.png':
             return rescale_image_png(image_object)
-    else:
-        return strip_image_meta(image_object, file_format)
-
-    # TODO webp and gifs bypass the scaling and metadata checks, fix
     return image_object

cookbook/helper/ingredient_parser.py

@@ -58,8 +58,7 @@ class IngredientParser:
     def parse_fraction(self, x):
         if len(x) == 1 and 'fraction' in unicodedata.decomposition(x):
             frac_split = unicodedata.decomposition(x[-1:]).split()
-            return (float((frac_split[1]).replace('003', ''))
-                    / float((frac_split[3]).replace('003', '')))
+            return (float((frac_split[1]).replace('003', '')) / float((frac_split[3]).replace('003', '')))
         else:
             frac_split = x.split('/')
             if not len(frac_split) == 2:
@@ -78,12 +77,7 @@ class IngredientParser:
 
         did_check_frac = False
         end = 0
-        while (end < len(x) and (x[end] in string.digits
-                                 or (
-            (x[end] == '.' or x[end] == ',' or x[end] == '/')
-            and end + 1 < len(x)
-            and x[end + 1] in string.digits
-        ))):
+        while (end < len(x) and (x[end] in string.digits or ((x[end] == '.' or x[end] == ',' or x[end] == '/') and end + 1 < len(x) and x[end + 1] in string.digits))):
             end += 1
         if end > 0:
             if "/" in x[:end]:
@@ -107,8 +101,9 @@ class IngredientParser:
         if unit is not None and unit.strip() == '':
             unit = None
 
-        if unit is not None and (unit.startswith('(') or unit.startswith(
-                '-')):  # i dont know any unit that starts with ( or - so its likely an alternative like 1L (500ml) Water or 2-3
+        if unit is not None and (
+            unit.startswith('(') or unit.startswith('-')
+        ):  # i dont know any unit that starts with ( or - so its likely an alternative like 1L (500ml) Water or 2-3
             unit = None
             note = x
         return amount, unit, note
@@ -176,6 +171,7 @@ class IngredientParser:
         # if something like this is detected move it to the beginning so the parser can handle it
         if len(ingredient) < 1000 and re.search(r'^([^\W\d_])+(.)*[1-9](\d)*\s*([^\W\d_])+', ingredient):
             match = re.search(r'[1-9](\d)*\s*([^\W\d_])+', ingredient)
+            print(f'reording from {ingredient} to {ingredient[match.start():match.end()] + " " + ingredient.replace(ingredient[match.start():match.end()], "")}')
             ingredient = ingredient[match.start():match.end()] + ' ' + ingredient.replace(ingredient[match.start():match.end()], '')
 
         # if the string contains parenthesis early on remove it and place it at the end
@@ -210,46 +206,39 @@ class IngredientParser:
                 # three arguments if it already has a unit there can't be
                 # a fraction for the amount
                 if len(tokens) > 2:
-                    never_unit_applied = False
                     if not self.ignore_rules:
-                        tokens, never_unit_applied = self.automation.apply_never_unit_automation(tokens)
-
-                    if never_unit_applied:
-                        unit = tokens[1]
-                        food, note = self.parse_food(tokens[2:])
-                    else:
-                        try:
-                            if unit is not None:
-                                # a unit is already found, no need to try the second argument for a fraction
-                                # probably not the best method to do it, but I didn't want to make an if check and paste the exact same thing in the else as already is in the except
-                                raise ValueError
-                            # try to parse second argument as amount and add that, in case of '2 1/2' or '2 ½'
-                            if tokens[1]:
-                                amount += self.parse_fraction(tokens[1])
-                            # assume that units can't end with a comma
-                            if len(tokens) > 3 and not tokens[2].endswith(','):
-                                # try to use third argument as unit and everything else as food, use everything as food if it fails
-                                try:
-                                    food, note = self.parse_food(tokens[3:])
-                                    unit = tokens[2]
-                                except ValueError:
-                                    food, note = self.parse_food(tokens[2:])
-                            else:
+                        tokens = self.automation.apply_never_unit_automation(tokens)
+                    try:
+                        if unit is not None:
+                            # a unit is already found, no need to try the second argument for a fraction
+                            # probably not the best method to do it, but I didn't want to make an if check and paste the exact same thing in the else as already is in the except
+                            raise ValueError
+                        # try to parse second argument as amount and add that, in case of '2 1/2' or '2 ½'
+                        amount += self.parse_fraction(tokens[1])
+                        # assume that units can't end with a comma
+                        if len(tokens) > 3 and not tokens[2].endswith(','):
+                            # try to use third argument as unit and everything else as food, use everything as food if it fails
+                            try:
+                                food, note = self.parse_food(tokens[3:])
+                                unit = tokens[2]
+                            except ValueError:
                                 food, note = self.parse_food(tokens[2:])
-                        except ValueError:
-                            # assume that units can't end with a comma
-                            if not tokens[1].endswith(','):
-                                # try to use second argument as unit and everything else as food, use everything as food if it fails
-                                try:
-                                    food, note = self.parse_food(tokens[2:])
-                                    if unit is None:
-                                        unit = tokens[1]
-                                    else:
-                                        note = tokens[1]
-                                except ValueError:
-                                    food, note = self.parse_food(tokens[1:])
-                            else:
+                        else:
+                            food, note = self.parse_food(tokens[2:])
+                    except ValueError:
+                        # assume that units can't end with a comma
+                        if not tokens[1].endswith(','):
+                            # try to use second argument as unit and everything else as food, use everything as food if it fails
+                            try:
+                                food, note = self.parse_food(tokens[2:])
+                                if unit is None:
+                                    unit = tokens[1]
+                                else:
+                                    note = tokens[1]
+                            except ValueError:
                                 food, note = self.parse_food(tokens[1:])
+                        else:
+                            food, note = self.parse_food(tokens[1:])
                 else:
                     # only two arguments, first one is the amount
                     # which means this is the food
@@ -270,7 +259,6 @@ class IngredientParser:
 
         if food and not self.ignore_rules:
             food = self.automation.apply_food_automation(food)
-
         if len(food) > Food._meta.get_field('name').max_length:  # test if food name is to long
             # try splitting it at a space and taking only the first arg
             if len(food.split()) > 1 and len(food.split()[0]) < Food._meta.get_field('name').max_length:

cookbook/helper/mdx_attributes.py

@@ -7,9 +7,7 @@ class StyleTreeprocessor(Treeprocessor):
     def run_processor(self, node):
         for child in node:
             if child.tag == "table":
-                child.set("class", "markdown-table")
-            if child.tag == "th" or child.tag == "td":
-                child.set("class", "markdown-table-cell")
+                child.set("class", "table table-bordered")
             if child.tag == "img":
                 child.set("class", "img-fluid")
             self.run_processor(child)

cookbook/helper/open_data_importer.py

@@ -6,8 +6,6 @@ from cookbook.models import (Food, FoodProperty, Property, PropertyType, Superma
                              SupermarketCategory, SupermarketCategoryRelation, Unit, UnitConversion)
 import re
 
-from recipes.settings import DEBUG
-
 
 class OpenDataImportResponse:
     total_created = 0
@@ -341,7 +339,7 @@ class OpenDataImporter:
             obj_dict = {
                 'name': self.data[datatype][k]['name'],
                 'plural_name': self.data[datatype][k]['plural_name'] if self.data[datatype][k]['plural_name'] != '' else None,
-                'supermarket_category_id': self.slug_id_cache['category'][self.data[datatype][k]['store_category']] if self.data[datatype][k]['store_category'] in self.slug_id_cache['category'] else None,
+                'supermarket_category_id': self.slug_id_cache['category'][self.data[datatype][k]['store_category']],
                 'fdc_id': re.sub(r'\D', '', self.data[datatype][k]['fdc_id']) if self.data[datatype][k]['fdc_id'] != '' else None,
                 'open_data_slug': k,
                 'properties_food_unit_id': None,
@@ -369,28 +367,12 @@ class OpenDataImporter:
                 create_list.append({'data': obj_dict})
 
         if self.update_existing and len(update_list) > 0:
-            try:
-                model_type.objects.bulk_update(update_list, field_list)
-                od_response.total_updated += len(update_list)
-            except Exception:
-                if DEBUG:
-                    print('========= LOAD FOOD FAILED ============')
-                    print(update_list)
-                    print(existing_data_names)
-                    print(existing_data_slugs)
-                    traceback.print_exc()
+            model_type.objects.bulk_update(update_list, field_list)
+            od_response.total_updated += len(update_list)
 
         if len(create_list) > 0:
-            try:
-                Food.load_bulk(create_list, None)
-                od_response.total_created += len(create_list)
-            except Exception:
-                if DEBUG:
-                    print('========= LOAD FOOD FAILED ============')
-                    print(create_list)
-                    print(existing_data_names)
-                    print(existing_data_slugs)
-                    traceback.print_exc()
+            Food.load_bulk(create_list, None)
+            od_response.total_created += len(create_list)
 
         # --------------- PROPERTY STUFF -----------------------
         model_type = Property

cookbook/helper/permission_helper.py

@@ -160,15 +160,18 @@ class GroupRequiredMixin(object):
     def dispatch(self, request, *args, **kwargs):
         if not has_group_permission(request.user, self.groups_required):
             if not request.user.is_authenticated:
-                messages.add_message(request, messages.ERROR, _('You are not logged in and therefore cannot view this page!'))
+                messages.add_message(request, messages.ERROR,
+                                     _('You are not logged in and therefore cannot view this page!'))
                 return HttpResponseRedirect(reverse_lazy('account_login') + '?next=' + request.path)
             else:
-                messages.add_message(request, messages.ERROR, _('You do not have the required permissions to view this page!'))
+                messages.add_message(request, messages.ERROR,
+                                     _('You do not have the required permissions to view this page!'))
                 return HttpResponseRedirect(reverse_lazy('index'))
         try:
             obj = self.get_object()
             if obj.get_space() != request.space:
-                messages.add_message(request, messages.ERROR, _('You do not have the required permissions to view this page!'))
+                messages.add_message(request, messages.ERROR,
+                                     _('You do not have the required permissions to view this page!'))
                 return HttpResponseRedirect(reverse_lazy('index'))
         except AttributeError:
             pass

cookbook/helper/property_helper.py

@@ -44,17 +44,13 @@ class FoodPropertyHelper:
             if i.food is not None:
                 conversions = uch.get_conversions(i)
                 for pt in property_types:
-                    # if a property could be calculated with an actual value
                     found_property = False
-                    # if food has a value for the given property type (no matter if conversion is possible)
-                    has_property_value = False
-                    if i.food.properties_food_amount == 0 or i.food.properties_food_unit is None and not (i.amount == 0 or i.no_amount):  # if food is configured incorrectly
-                        computed_properties[pt.id]['food_values'][i.food.id] = {'id': i.food.id, 'food': {'id': i.food.id, 'name': i.food.name}, 'value': None}
+                    if i.food.properties_food_amount == 0 or i.food.properties_food_unit is None:  # if food is configured incorrectly
+                        computed_properties[pt.id]['food_values'][i.food.id] = {'id': i.food.id, 'food': i.food.name, 'value': None}
                         computed_properties[pt.id]['missing_value'] = True
                     else:
                         for p in i.food.properties.all():
                             if p.property_type == pt and p.property_amount is not None:
-                                has_property_value = True
                                 for c in conversions:
                                     if c.unit == i.food.properties_food_unit:
                                         found_property = True
@@ -62,19 +58,12 @@ class FoodPropertyHelper:
                                         computed_properties[pt.id]['food_values'] = self.add_or_create(
                                             computed_properties[p.property_type.id]['food_values'], c.food.id, (c.amount / i.food.properties_food_amount) * p.property_amount, c.food)
                     if not found_property:
-                        # if no amount and food does not exist yet add it but don't count as missing
-                        if i.amount == 0 or i.no_amount and i.food.id not in computed_properties[pt.id]['food_values']:
-                            computed_properties[pt.id]['food_values'][i.food.id] = {'id': i.food.id, 'food': {'id': i.food.id, 'name': i.food.name}, 'value': 0}
-                        # if amount is present but unit is missing indicate it in the result
-                        elif i.unit is None:
-                            if i.food.id not in computed_properties[pt.id]['food_values']:
-                                computed_properties[pt.id]['food_values'][i.food.id] = {'id': i.food.id, 'food': {'id': i.food.id, 'name': i.food.name}, 'value': 0}
-                            computed_properties[pt.id]['food_values'][i.food.id]['missing_unit'] = True
+                        if i.amount == 0:  # don't count ingredients without an amount as missing
+                            computed_properties[pt.id]['missing_value'] = computed_properties[pt.id]['missing_value'] or False  # don't override if another food was already missing
+                            computed_properties[pt.id]['food_values'][i.food.id] = {'id': i.food.id, 'food': i.food.name, 'value': 0}
                         else:
                             computed_properties[pt.id]['missing_value'] = True
-                            computed_properties[pt.id]['food_values'][i.food.id] = {'id': i.food.id, 'food': {'id': i.food.id, 'name': i.food.name}, 'value': None}
-                            if has_property_value and i.unit is not None:
-                                computed_properties[pt.id]['food_values'][i.food.id]['missing_conversion'] = {'base_unit': {'id': i.unit.id, 'name': i.unit.name}, 'converted_unit': {'id': i.food.properties_food_unit.id, 'name': i.food.properties_food_unit.name}}
+                            computed_properties[pt.id]['food_values'][i.food.id] = {'id': i.food.id, 'food': i.food.name, 'value': None}
 
         return computed_properties
 
@@ -85,5 +74,5 @@ class FoodPropertyHelper:
         if key in d and d[key]['value']:
             d[key]['value'] += value
         else:
-            d[key] = {'id': food.id, 'food': {'id': food.id, 'name': food.name}, 'value': value}
+            d[key] = {'id': food.id, 'food': food.name, 'value': value}
         return d

cookbook/helper/recipe_search.py

@@ -9,8 +9,7 @@ from django.utils import timezone, translation
 
 from cookbook.helper.HelperFunctions import Round, str2bool
 from cookbook.managers import DICTIONARY
-from cookbook.models import (CookLog, CustomFilter, Food, Keyword, Recipe, SearchFields,
-                             SearchPreference, ViewLog)
+from cookbook.models import CookLog, CustomFilter, Food, Keyword, Recipe, SearchFields, SearchPreference, ViewLog
 from recipes import settings
 
 
@@ -22,11 +21,8 @@ class RecipeSearch():
         self._request = request
         self._queryset = None
         if f := params.get('filter', None):
-            custom_filter = (
-                CustomFilter.objects.filter(id=f, space=self._request.space)
-                .filter(Q(created_by=self._request.user) | Q(shared=self._request.user) | Q(recipebook__shared=self._request.user))
-                .first()
-            )
+            custom_filter = (CustomFilter.objects.filter(id=f, space=self._request.space).filter(
+                Q(created_by=self._request.user) | Q(shared=self._request.user) | Q(recipebook__shared=self._request.user)).first())
             if custom_filter:
                 self._params = {**json.loads(custom_filter.search)}
                 self._original_params = {**(params or {})}
@@ -38,7 +34,7 @@ class RecipeSearch():
         else:
             self._params = {**(params or {})}
         if self._request.user.is_authenticated:
-            CACHE_KEY = f'search_pref_{request.user.id}'
+            CACHE_KEY = f"search_pref_{request.user.id}"
             cached_result = cache.get(CACHE_KEY, default=None)
             if cached_result is not None:
                 self._search_prefs = cached_result
@@ -47,64 +43,43 @@ class RecipeSearch():
             cache.set(CACHE_KEY, self._search_prefs, timeout=10)
         else:
             self._search_prefs = SearchPreference()
-        self._string = self._params.get('query').strip(
-        ) if self._params.get('query', None) else None
-
-        self._rating = self._params.get('rating', None)
-        self._rating_gte = self._params.get('rating_gte', None)
-        self._rating_lte = self._params.get('rating_lte', None)
-
+        self._string = self._params.get("query").strip() if self._params.get("query", None) else None
+        self._rating = self._params.get("rating", None)
         self._keywords = {
-            'or': self._params.get('keywords_or', None) or self._params.get('keywords', None),
-            'and': self._params.get('keywords_and', None),
-            'or_not': self._params.get('keywords_or_not', None),
-            'and_not': self._params.get('keywords_and_not', None)
+            "or": self._params.get("keywords_or", None) or self._params.get("keywords", None),
+            "and": self._params.get("keywords_and", None),
+            "or_not": self._params.get("keywords_or_not", None),
+            "and_not": self._params.get("keywords_and_not", None),
         }
         self._foods = {
-            'or': self._params.get('foods_or', None) or self._params.get('foods', None),
-            'and': self._params.get('foods_and', None),
-            'or_not': self._params.get('foods_or_not', None),
-            'and_not': self._params.get('foods_and_not', None)
+            "or": self._params.get("foods_or", None) or self._params.get("foods", None),
+            "and": self._params.get("foods_and", None),
+            "or_not": self._params.get("foods_or_not", None),
+            "and_not": self._params.get("foods_and_not", None),
         }
         self._books = {
-            'or': self._params.get('books_or', None) or self._params.get('books', None),
-            'and': self._params.get('books_and', None),
-            'or_not': self._params.get('books_or_not', None),
-            'and_not': self._params.get('books_and_not', None)
+            "or": self._params.get("books_or", None) or self._params.get("books", None),
+            "and": self._params.get("books_and", None),
+            "or_not": self._params.get("books_or_not", None),
+            "and_not": self._params.get("books_and_not", None),
         }
-        self._steps = self._params.get('steps', None)
-        self._units = self._params.get('units', None)
-        self._internal = str2bool(self._params.get('internal', None))
-        self._sort_order = self._params.get('sort_order', None)
-        if self._sort_order == 'random':
-            self._random = True
-            self.sort_order = None
-        else:
-            self._random = str2bool(self._params.get('random', False))
-        self._new = str2bool(self._params.get('new', False))
-        self._num_recent = int(self._params.get('num_recent', 0))
-        self._include_children = str2bool(
-            self._params.get('include_children', None))
-        self._timescooked = self._params.get('timescooked', None)
-        self._timescooked_gte = self._params.get('timescooked_gte', None)
-        self._timescooked_lte = self._params.get('timescooked_lte', None)
-
-        self._createdon = self._params.get('createdon', None)
-        self._createdon_gte = self._params.get('createdon_gte', None)
-        self._createdon_lte = self._params.get('createdon_lte', None)
-
-        self._updatedon = self._params.get('updatedon', None)
-        self._updatedon_gte = self._params.get('updatedon_gte', None)
-        self._updatedon_lte = self._params.get('updatedon_lte', None)
-
-        self._viewedon_gte = self._params.get('viewedon_gte', None)
-        self._viewedon_lte = self._params.get('viewedon_lte', None)
-
-        self._cookedon_gte = self._params.get('cookedon_gte', None)
-        self._cookedon_lte = self._params.get('cookedon_lte', None)
-
-        self._createdby = self._params.get('createdby', None)
-        self._makenow = self._params.get('makenow', None)
+        self._steps = self._params.get("steps", None)
+        self._units = self._params.get("units", None)
+        # TODO add created by
+        # TODO image exists
+        self._sort_order = self._params.get("sort_order", None)
+        self._internal = str2bool(self._params.get("internal", None))
+        self._random = str2bool(self._params.get("random", False))
+        self._new = str2bool(self._params.get("new", False))
+        self._num_recent = int(self._params.get("num_recent", 0))
+        self._include_children = str2bool(self._params.get("include_children", None))
+        self._timescooked = self._params.get("timescooked", None)
+        self._cookedon = self._params.get("cookedon", None)
+        self._createdon = self._params.get("createdon", None)
+        self._updatedon = self._params.get("updatedon", None)
+        self._viewedon = self._params.get("viewedon", None)
+        self._makenow = self._params.get("makenow", None)
+        self._never_used_food = str2bool(self._params.get("never_used_food", False))
         # this supports hidden feature to find recipes missing X ingredients
         if isinstance(self._makenow, bool) and self._makenow == True:
             self._makenow = 0
@@ -116,7 +91,7 @@ class RecipeSearch():
             except (ValueError, TypeError):
                 self._makenow = None
 
-        self._search_type = self._search_prefs.search or 'plain'
+        self._search_type = self._search_prefs.search or "plain"
         if self._string:
             if self._postgres:
                 self._unaccent_include = self._search_prefs.unaccent.values_list('field', flat=True)
@@ -134,11 +109,7 @@ class RecipeSearch():
 
             if self._search_type not in ['websearch', 'raw'] and self._trigram_include:
                 self._trigram = True
-            self.search_query = SearchQuery(
-                self._string,
-                search_type=self._search_type,
-                config=self._language,
-            )
+            self.search_query = SearchQuery(self._string, search_type=self._search_type, config=self._language, )
             self.search_rank = None
         self.orderby = []
         self._filters = None
@@ -147,26 +118,23 @@ class RecipeSearch():
     def get_queryset(self, queryset):
         self._queryset = queryset
         self._queryset = self._queryset.prefetch_related('keywords')
-
         self._build_sort_order()
         self._recently_viewed(num_recent=self._num_recent)
-
-        self._cooked_on_filter()
-        self._created_on_filter()
-        self._updated_on_filter()
-        self._viewed_on_filter()
-
-        self._created_by_filter(created_by_user_id=self._createdby)
-        self._favorite_recipes()
+        self._cooked_on_filter(cooked_date=self._cookedon)
+        self._created_on_filter(created_date=self._createdon)
+        self._updated_on_filter(updated_date=self._updatedon)
+        self._viewed_on_filter(viewed_date=self._viewedon)
+        self._favorite_recipes(times_cooked=self._timescooked)
         self._new_recipes()
         self.keyword_filters(**self._keywords)
         self.food_filters(**self._foods)
         self.book_filters(**self._books)
-        self.rating_filter()
+        self.rating_filter(rating=self._rating)
         self.internal_filter(internal=self._internal)
         self.step_filters(steps=self._steps)
         self.unit_filters(units=self._units)
         self._makenow_filter(missing=self._makenow)
+        self._never_used_food_filter()
         self.string_filters(string=self._string)
         return self._queryset.filter(space=self._request.space).order_by(*self.orderby)
 
@@ -174,22 +142,22 @@ class RecipeSearch():
         for x in args:
             if x in self.orderby:
                 return True
-            elif '-' + x in self.orderby:
+            elif "-" + x in self.orderby:
                 return True
         return False
 
     def _build_sort_order(self):
         if self._random:
-            self.orderby = ['?']
+            self.orderby = ["?"]
         else:
             order = []
             # TODO add userpreference for default sort order and replace '-favorite'
-            default_order = ['name']
+            default_order = ["name"]
             # recent and new_recipe are always first; they float a few recipes to the top
             if self._num_recent:
-                order += ['-recent']
+                order += ["-recent"]
             if self._new:
-                order += ['-new_recipe']
+                order += ["-new_recipe"]
 
             # if a sort order is provided by user - use that order
             if self._sort_order:
@@ -198,20 +166,18 @@ class RecipeSearch():
                 else:
                     order += self._sort_order
                 if not self._postgres or not self._string:
-                    if 'score' in order:
-                        order.remove('score')
-                    if '-score' in order:
-                        order.remove('-score')
+                    if "score" in order:
+                        order.remove("score")
+                    if "-score" in order:
+                        order.remove("-score")
             # if no sort order provided prioritize text search, followed by the default search
             elif self._postgres and self._string and (self._trigram or self._fulltext_include):
-                order += ['-score', *default_order]
+                order += ["-score", *default_order]
             # otherwise sort by the remaining order_by attributes or favorite by default
             else:
                 order += default_order
-            order[:] = [Lower('name').asc() if x ==
-                                               'name' else x for x in order]
-            order[:] = [Lower('name').desc() if x ==
-                                                '-name' else x for x in order]
+            order[:] = [Lower("name").asc() if x == "name" else x for x in order]
+            order[:] = [Lower("name").desc() if x == "-name" else x for x in order]
             self.orderby = order
 
     def string_filters(self, string=None):
@@ -246,104 +212,100 @@ class RecipeSearch():
                 self._queryset = self._queryset.annotate(score=F('rank') + F('simularity'))
         else:
             query_filter = Q()
-            for f in [x + '__unaccent__iexact' if x in self._unaccent_include else x + '__iexact' for x in SearchFields.objects.all().values_list('field', flat=True)]:
+            for f in [x + "__unaccent__iexact" if x in self._unaccent_include else x + "__iexact" for x in SearchFields.objects.all().values_list("field", flat=True)]:
                 query_filter |= Q(**{"%s" % f: self._string})
             self._queryset = self._queryset.filter(query_filter).distinct()
 
-    def _cooked_on_filter(self):
-        if self._sort_includes('lastcooked') or self._cookedon_gte or self._cookedon_lte:
-            lessthan = self._sort_includes('-lastcooked') or self._cookedon_lte
+    def _cooked_on_filter(self, cooked_date=None):
+        if self._sort_includes('lastcooked') or cooked_date:
+            lessthan = self._sort_includes('-lastcooked') or '-' in (cooked_date or [])[:1]
             if lessthan:
                 default = timezone.now() - timedelta(days=100000)
             else:
                 default = timezone.now()
             self._queryset = self._queryset.annotate(
-                lastcooked=Coalesce(Max(Case(When(cooklog__created_by=self._request.user, cooklog__space=self._request.space, then='cooklog__created_at'))), Value(default))
-            )
+                lastcooked=Coalesce(Max(Case(When(cooklog__created_by=self._request.user, cooklog__space=self._request.space, then='cooklog__created_at'))), Value(default)))
+        if cooked_date is None:
+            return
 
-        if self._cookedon_lte:
-            self._queryset = self._queryset.filter(lastcooked__date__lte=self._cookedon_lte).exclude(lastcooked=default)
-        elif self._cookedon_gte:
-            self._queryset = self._queryset.filter(lastcooked__date__gte=self._cookedon_gte).exclude(lastcooked=default)
+        cooked_date = date(*[int(x) for x in cooked_date.split('-') if x != ''])
+
+        if lessthan:
+            self._queryset = self._queryset.filter(lastcooked__date__lte=cooked_date).exclude(lastcooked=default)
+        else:
+            self._queryset = self._queryset.filter(lastcooked__date__gte=cooked_date).exclude(lastcooked=default)
+
+    def _created_on_filter(self, created_date=None):
+        if created_date is None:
+            return
+        lessthan = '-' in created_date[:1]
+        created_date = date(*[int(x) for x in created_date.split('-') if x != ''])
+        if lessthan:
+            self._queryset = self._queryset.filter(created_at__date__lte=created_date)
+        else:
+            self._queryset = self._queryset.filter(created_at__date__gte=created_date)
+
+    def _updated_on_filter(self, updated_date=None):
+        if updated_date is None:
+            return
+        lessthan = '-' in updated_date[:1]
+        updated_date = date(*[int(x) for x in updated_date.split('-') if x != ''])
+        if lessthan:
+            self._queryset = self._queryset.filter(updated_at__date__lte=updated_date)
+        else:
+            self._queryset = self._queryset.filter(updated_at__date__gte=updated_date)
 
     def _viewed_on_filter(self, viewed_date=None):
-        if self._sort_includes('lastviewed') or self._viewedon_gte or self._viewedon_lte:
+        if self._sort_includes("lastviewed") or viewed_date:
             longTimeAgo = timezone.now() - timedelta(days=100000)
             self._queryset = self._queryset.annotate(
-                lastviewed=Coalesce(Max(Case(When(viewlog__created_by=self._request.user, viewlog__space=self._request.space, then='viewlog__created_at'))), Value(longTimeAgo))
-            )
-
-        if self._viewedon_lte:
-            self._queryset = self._queryset.filter(lastviewed__date__lte=self._viewedon_lte).exclude(lastviewed=longTimeAgo)
-        elif self._viewedon_gte:
-            self._queryset = self._queryset.filter(lastviewed__date__gte=self._viewedon_gte).exclude(lastviewed=longTimeAgo)
-
-    def _created_on_filter(self):
-        if self._createdon:
-            self._queryset = self._queryset.filter(created_at__date=self._createdon)
-        elif self._createdon_lte:
-            self._queryset = self._queryset.filter(created_at__date__lte=self._createdon_lte)
-        elif self._createdon_gte:
-            self._queryset = self._queryset.filter(created_at__date__gte=self._createdon_gte)
-
-    def _updated_on_filter(self):
-        if self._updatedon:
-            self._queryset = self._queryset.filter(updated_at__date__date=self._updatedon)
-        elif self._updatedon_lte:
-            self._queryset = self._queryset.filter(updated_at__date__lte=self._updatedon_lte)
-        elif self._updatedon_gte:
-            self._queryset = self._queryset.filter(updated_at__date__gte=self._updatedon_gte)
-
-    def _created_by_filter(self, created_by_user_id=None):
-        if created_by_user_id is None:
+                lastviewed=Coalesce(Max(Case(When(viewlog__created_by=self._request.user, viewlog__space=self._request.space, then='viewlog__created_at'))), Value(longTimeAgo)))
+        if viewed_date is None:
             return
-        self._queryset = self._queryset.filter(created_by__id=created_by_user_id)
+        lessthan = '-' in viewed_date[:1]
+        viewed_date = date(*[int(x) for x in viewed_date.split('-') if x != ''])
+
+        if lessthan:
+            self._queryset = self._queryset.filter(lastviewed__date__lte=viewed_date).exclude(lastviewed=longTimeAgo)
+        else:
+            self._queryset = self._queryset.filter(lastviewed__date__gte=viewed_date).exclude(lastviewed=longTimeAgo)
 
     def _new_recipes(self, new_days=7):
         # TODO make new days a user-setting
         if not self._new:
             return
-        self._queryset = self._queryset.annotate(
-            new_recipe=Case(
-                When(created_at__gte=(timezone.now() - timedelta(days=new_days)), then=('pk')),
-                default=Value(0),
-            )
-        )
+        self._queryset = self._queryset.annotate(new_recipe=Case(When(created_at__gte=(timezone.now() - timedelta(days=new_days)), then=('pk')), default=Value(0), ))
 
     def _recently_viewed(self, num_recent=None):
         if not num_recent:
-            if self._sort_includes('lastviewed'):
-                self._queryset = self._queryset.annotate(lastviewed=Coalesce(
-                    Max(Case(When(viewlog__created_by=self._request.user, viewlog__space=self._request.space, then='viewlog__pk'))), Value(0)))
+            if self._sort_includes("lastviewed"):
+                self._queryset = self._queryset.annotate(
+                    lastviewed=Coalesce(Max(Case(When(viewlog__created_by=self._request.user, viewlog__space=self._request.space, then="viewlog__pk"))), Value(0)))
             return
 
-        num_recent_recipes = (
-            ViewLog.objects.filter(created_by=self._request.user, space=self._request.space)
-            .values('recipe').annotate(recent=Max('created_at')).order_by('-recent')[:num_recent]
-        )
+        num_recent_recipes = (ViewLog.objects.filter(created_by=self._request.user,
+                                                     space=self._request.space).values('recipe').annotate(recent=Max('created_at')).order_by('-recent')[:num_recent])
         self._queryset = self._queryset.annotate(recent=Coalesce(Max(Case(When(pk__in=num_recent_recipes.values('recipe'), then='viewlog__pk'))), Value(0)))
 
-    def _favorite_recipes(self):
-        if self._sort_includes('favorite') or self._timescooked or self._timescooked_gte or self._timescooked_lte:
-            less_than = self._timescooked_lte and not self._sort_includes('-favorite')
+    def _favorite_recipes(self, times_cooked=None):
+        if self._sort_includes('favorite') or times_cooked:
+            less_than = '-' in (str(times_cooked) or []) and not self._sort_includes('-favorite')
             if less_than:
                 default = 1000
             else:
                 default = 0
-            favorite_recipes = (
-                CookLog.objects.filter(created_by=self._request.user, space=self._request.space, recipe=OuterRef('pk'))
-                .values('recipe')
-                .annotate(count=Count('pk', distinct=True))
-                .values('count')
-            )
+            favorite_recipes = (CookLog.objects.filter(created_by=self._request.user, space=self._request.space,
+                                                       recipe=OuterRef('pk')).values('recipe').annotate(count=Count('pk', distinct=True)).values('count'))
             self._queryset = self._queryset.annotate(favorite=Coalesce(Subquery(favorite_recipes), default))
+        if times_cooked is None:
+            return
 
-        if self._timescooked:
+        if times_cooked == "0":
             self._queryset = self._queryset.filter(favorite=0)
-        elif self._timescooked_lte:
-            self._queryset = self._queryset.filter(favorite__lte=int(self._timescooked_lte)).exclude(favorite=0)
-        elif self._timescooked_gte:
-            self._queryset = self._queryset.filter(favorite__gte=int(self._timescooked_gte))
+        elif less_than:
+            self._queryset = self._queryset.filter(favorite__lte=int(times_cooked.replace('-', ''))).exclude(favorite=0)
+        else:
+            self._queryset = self._queryset.filter(favorite__gte=int(times_cooked))
 
     def keyword_filters(self, **kwargs):
         if all([kwargs[x] is None for x in kwargs]):
@@ -355,23 +317,23 @@ class RecipeSearch():
                 kwargs[kw_filter] = [kwargs[kw_filter]]
 
             keywords = Keyword.objects.filter(pk__in=kwargs[kw_filter])
-            if 'or' in kw_filter:
+            if "or" in kw_filter:
                 if self._include_children:
                     f_or = Q(keywords__in=Keyword.include_descendants(keywords))
                 else:
                     f_or = Q(keywords__in=keywords)
-                if 'not' in kw_filter:
+                if "not" in kw_filter:
                     self._queryset = self._queryset.exclude(f_or)
                 else:
                     self._queryset = self._queryset.filter(f_or)
-            elif 'and' in kw_filter:
+            elif "and" in kw_filter:
                 recipes = Recipe.objects.all()
                 for kw in keywords:
                     if self._include_children:
                         f_and = Q(keywords__in=kw.get_descendants_and_self())
                     else:
                         f_and = Q(keywords=kw)
-                    if 'not' in kw_filter:
+                    if "not" in kw_filter:
                         recipes = recipes.filter(f_and)
                     else:
                         self._queryset = self._queryset.filter(f_and)
@@ -388,24 +350,24 @@ class RecipeSearch():
                 kwargs[fd_filter] = [kwargs[fd_filter]]
 
             foods = Food.objects.filter(pk__in=kwargs[fd_filter])
-            if 'or' in fd_filter:
+            if "or" in fd_filter:
                 if self._include_children:
                     f_or = Q(steps__ingredients__food__in=Food.include_descendants(foods))
                 else:
                     f_or = Q(steps__ingredients__food__in=foods)
 
-                if 'not' in fd_filter:
+                if "not" in fd_filter:
                     self._queryset = self._queryset.exclude(f_or)
                 else:
                     self._queryset = self._queryset.filter(f_or)
-            elif 'and' in fd_filter:
+            elif "and" in fd_filter:
                 recipes = Recipe.objects.all()
                 for food in foods:
                     if self._include_children:
                         f_and = Q(steps__ingredients__food__in=food.get_descendants_and_self())
                     else:
                         f_and = Q(steps__ingredients__food=food)
-                    if 'not' in fd_filter:
+                    if "not" in fd_filter:
                         recipes = recipes.filter(f_and)
                     else:
                         self._queryset = self._queryset.filter(f_and)
@@ -421,16 +383,25 @@ class RecipeSearch():
             units = [units]
         self._queryset = self._queryset.filter(steps__ingredients__unit__in=units)
 
-    def rating_filter(self):
-        if self._rating or self._rating_lte or self._rating_gte or self._sort_includes('rating'):
-            self._queryset = self._queryset.annotate(rating=Round(Avg(Case(When(cooklog__created_by=self._request.user, then='cooklog__rating'), default=0))))
+    def rating_filter(self, rating=None):
+        if rating or self._sort_includes('rating'):
+            lessthan = '-' in (rating or [])
+            reverse = 'rating' in (self._sort_order or []) and '-rating' not in (self._sort_order or [])
+            if lessthan or reverse:
+                default = 100
+            else:
+                default = 0
+            # TODO make ratings a settings user-only vs all-users
+            self._queryset = self._queryset.annotate(rating=Round(Avg(Case(When(cooklog__created_by=self._request.user, then="cooklog__rating"), default=default))))
+        if rating is None:
+            return
 
-        if self._rating:
-            self._queryset = self._queryset.filter(rating=round(int(self._rating)))
-        elif self._rating_gte:
-            self._queryset = self._queryset.filter(rating__gte=int(self._rating_gte))
-        elif self._rating_lte:
-            self._queryset = self._queryset.filter(rating__gte=int(self._rating_lte)).exclude(rating=0)
+        if rating == "0":
+            self._queryset = self._queryset.filter(rating=0)
+        elif lessthan:
+            self._queryset = self._queryset.filter(rating__lte=int(rating[1:])).exclude(rating=0)
+        else:
+            self._queryset = self._queryset.filter(rating__gte=int(rating))
 
     def internal_filter(self, internal=None):
         if not internal:
@@ -446,13 +417,13 @@ class RecipeSearch():
             if not isinstance(kwargs[bk_filter], list):
                 kwargs[bk_filter] = [kwargs[bk_filter]]
 
-            if 'or' in bk_filter:
+            if "or" in bk_filter:
                 f = Q(recipebookentry__book__id__in=kwargs[bk_filter])
-                if 'not' in bk_filter:
+                if "not" in bk_filter:
                     self._queryset = self._queryset.exclude(f)
                 else:
                     self._queryset = self._queryset.filter(f)
-            elif 'and' in bk_filter:
+            elif "and" in bk_filter:
                 recipes = Recipe.objects.all()
                 for book in kwargs[bk_filter]:
                     if 'not' in bk_filter:
@@ -525,62 +496,66 @@ class RecipeSearch():
                     trigram += TrigramSimilarity(f, self._string)
                 else:
                     trigram = TrigramSimilarity(f, self._string)
-            self._fuzzy_match = (
-                Recipe.objects.annotate(trigram=trigram)
-                .distinct()
-                .annotate(simularity=Max('trigram'))
-                .values('id', 'simularity')
-                .filter(simularity__gt=self._search_prefs.trigram_threshold)
-            )
+            self._fuzzy_match = (Recipe.objects.annotate(trigram=trigram).distinct().annotate(simularity=Max('trigram')).values('id', 'simularity').filter(
+                simularity__gt=self._search_prefs.trigram_threshold))
             self._filters += [Q(pk__in=self._fuzzy_match.values('pk'))]
 
     def _makenow_filter(self, missing=None):
         if missing is None or (isinstance(missing, bool) and missing == False):
             return
         shopping_users = [*self._request.user.get_shopping_share(), self._request.user]
+        onhand_filter = Q(steps__ingredients__food__onhand_users__in=shopping_users)  # food onhand
 
-        onhand_filter = (
-                Q(steps__ingredients__food__onhand_users__in=shopping_users)  # food onhand
-                # or substitute food onhand
-                | Q(steps__ingredients__food__substitute__onhand_users__in=shopping_users)
-                | Q(steps__ingredients__food__in=self.__children_substitute_filter(shopping_users))
-                | Q(steps__ingredients__food__in=self.__sibling_substitute_filter(shopping_users))
-        )
-        makenow_recipes = Recipe.objects.annotate(
-            count_food=Count('steps__ingredients__food__pk', filter=Q(steps__ingredients__food__isnull=False), distinct=True),
-            count_onhand=Count('steps__ingredients__food__pk', filter=onhand_filter, distinct=True),
-            count_ignore_shopping=Count(
-                'steps__ingredients__food__pk', filter=Q(steps__ingredients__food__ignore_shopping=True, steps__ingredients__food__recipe__isnull=True), distinct=True
-            ),
-            has_child_sub=Case(When(steps__ingredients__food__in=self.__children_substitute_filter(shopping_users), then=Value(1)), default=Value(0)),
-            has_sibling_sub=Case(When(steps__ingredients__food__in=self.__sibling_substitute_filter(shopping_users), then=Value(1)), default=Value(0))
-        ).annotate(missingfood=F('count_food') - F('count_onhand') - F('count_ignore_shopping')).filter(missingfood__lte=missing)
+        # ignore substitutions when also using the never_used_food filter
+        if not self._never_used_food:
+            # or substitute food onhand
+            onhand_filter |= (Q(steps__ingredients__food__substitute__onhand_users__in=shopping_users)
+                              | Q(steps__ingredients__food__in=self.__children_substitute_filter(shopping_users))
+                              | Q(steps__ingredients__food__in=self.__sibling_substitute_filter(shopping_users)))
+        makenow_recipes = (Recipe.objects.annotate(count_food=Count("steps__ingredients__food__pk", filter=Q(steps__ingredients__food__isnull=False), distinct=True),
+                                                   count_onhand=Count("steps__ingredients__food__pk", filter=onhand_filter, distinct=True),
+                                                   count_ignore_shopping=Count("steps__ingredients__food__pk",
+                                                                               filter=Q(steps__ingredients__food__ignore_shopping=True,
+                                                                                        steps__ingredients__food__recipe__isnull=True),
+                                                                               distinct=True),
+                                                   has_child_sub=Case(When(steps__ingredients__food__in=self.__children_substitute_filter(shopping_users), then=Value(1)),
+                                                                      default=Value(0)),
+                                                   has_sibling_sub=Case(When(steps__ingredients__food__in=self.__sibling_substitute_filter(shopping_users), then=Value(1)),
+                                                                        default=Value(0)),
+                                                   ).annotate(missingfood=F("count_food") - F("count_onhand") - F("count_ignore_shopping")).filter(missingfood=missing))
+        makenow_recipes = Recipe.objects.annotate(count_food=Count('steps__ingredients__food__pk', filter=Q(steps__ingredients__food__isnull=False), distinct=True),
+                                                  count_onhand=Count('steps__ingredients__food__pk', filter=onhand_filter, distinct=True),
+                                                  count_ignore_shopping=Count('steps__ingredients__food__pk',
+                                                                              filter=Q(steps__ingredients__food__ignore_shopping=True,
+                                                                                       steps__ingredients__food__recipe__isnull=True),
+                                                                              distinct=True),
+                                                  has_child_sub=Case(When(steps__ingredients__food__in=self.__children_substitute_filter(shopping_users), then=Value(1)),
+                                                                     default=Value(0)),
+                                                  has_sibling_sub=Case(When(steps__ingredients__food__in=self.__sibling_substitute_filter(shopping_users), then=Value(1)),
+                                                                       default=Value(0))).annotate(missingfood=F('count_food') - F('count_onhand')
+                                                                                                   - F('count_ignore_shopping')).filter(missingfood__lte=missing)
         self._queryset = self._queryset.distinct().filter(id__in=makenow_recipes.values('id'))
 
+    def _never_used_food_filter(self):
+        # filters recipes to include foods that have never been used
+        if not self._never_used_food:
+            return
+        self._queryset = self._queryset.filter(steps__ingredients__food__in=Food.objects.filter(~Q(ingredient__step__recipe__cooklog__isnull=False)).distinct())
+
     @staticmethod
     def __children_substitute_filter(shopping_users=None):
         children_onhand_subquery = Food.objects.filter(path__startswith=OuterRef('path'), depth__gt=OuterRef('depth'), onhand_users__in=shopping_users)
-        return (
-            Food.objects.exclude(  # list of foods that are onhand and children of: foods that are not onhand and are set to use children as substitutes
-                Q(onhand_users__in=shopping_users) | Q(ignore_shopping=True, recipe__isnull=True) | Q(substitute__onhand_users__in=shopping_users)
-            )
-            .exclude(depth=1, numchild=0)
-            .filter(substitute_children=True)
-            .annotate(child_onhand_count=Exists(children_onhand_subquery))
-            .filter(child_onhand_count=True)
-        )
+        return (Food.objects.exclude(  # list of foods that are onhand and children of: foods that are not onhand and are set to use children as substitutes
+            Q(onhand_users__in=shopping_users) | Q(ignore_shopping=True, recipe__isnull=True)
+            | Q(substitute__onhand_users__in=shopping_users)).exclude(depth=1, numchild=0).filter(substitute_children=True).annotate(
+                child_onhand_count=Exists(children_onhand_subquery)).filter(child_onhand_count=True))
 
     @staticmethod
     def __sibling_substitute_filter(shopping_users=None):
-        sibling_onhand_subquery = Food.objects.filter(
-            path__startswith=Substr(OuterRef('path'), 1, Food.steplen * (OuterRef('depth') - 1)), depth=OuterRef('depth'), onhand_users__in=shopping_users
-        )
-        return (
-            Food.objects.exclude(  # list of foods that are onhand and siblings of: foods that are not onhand and are set to use siblings as substitutes
-                Q(onhand_users__in=shopping_users) | Q(ignore_shopping=True, recipe__isnull=True) | Q(substitute__onhand_users__in=shopping_users)
-            )
-            .exclude(depth=1, numchild=0)
-            .filter(substitute_siblings=True)
-            .annotate(sibling_onhand=Exists(sibling_onhand_subquery))
-            .filter(sibling_onhand=True)
-        )
+        sibling_onhand_subquery = Food.objects.filter(path__startswith=Substr(OuterRef('path'), 1, Food.steplen * (OuterRef('depth') - 1)),
+                                                      depth=OuterRef('depth'),
+                                                      onhand_users__in=shopping_users)
+        return (Food.objects.exclude(  # list of foods that are onhand and siblings of: foods that are not onhand and are set to use siblings as substitutes
+            Q(onhand_users__in=shopping_users) | Q(ignore_shopping=True, recipe__isnull=True)
+            | Q(substitute__onhand_users__in=shopping_users)).exclude(depth=1, numchild=0).filter(substitute_siblings=True).annotate(
+                sibling_onhand=Exists(sibling_onhand_subquery)).filter(sibling_onhand=True))

cookbook/helper/recipe_url_import.py

@@ -106,14 +106,14 @@ def get_from_scraper(scrape, request):
 
     # assign image
     try:
-        recipe_json['image_url'] = parse_image(scrape.image()) or None
+        recipe_json['image'] = parse_image(scrape.image()) or None
     except Exception:
-        recipe_json['image_url'] = None
-    if not recipe_json['image_url']:
+        recipe_json['image'] = None
+    if not recipe_json['image']:
         try:
-            recipe_json['image_url'] = parse_image(scrape.schema.data.get('image')) or ''
+            recipe_json['image'] = parse_image(scrape.schema.data.get('image')) or ''
         except Exception:
-            recipe_json['image_url'] = ''
+            recipe_json['image'] = ''
 
     # assign keywords
     try:
@@ -205,7 +205,6 @@ def get_from_scraper(scrape, request):
     except Exception:
         pass
 
-    recipe_json['properties'] = []
     try:
         recipe_json['properties'] = get_recipe_properties(request.space, scrape.schema.nutrients())
         print(recipe_json['properties'])
@@ -228,13 +227,6 @@ def get_recipe_properties(space, property_data):
         "property-proteins": "proteinContent",
         "property-fats": "fatContent",
     }
-
-    serving_size = 1
-    try:
-        serving_size = parse_servings(property_data['servingSize'])
-    except KeyError:
-        pass
-
     recipe_properties = []
     for pt in PropertyType.objects.filter(space=space, open_data_slug__in=list(properties.keys())).all():
         for p in list(properties.keys()):
@@ -245,7 +237,7 @@ def get_recipe_properties(space, property_data):
                             'id': pt.id,
                             'name': pt.name,
                         },
-                        'property_amount': parse_servings(property_data[properties[p]]) / serving_size,
+                        'property_amount': parse_servings(property_data[properties[p]]) / parse_servings(property_data['servingSize']),
                     })
 
     return recipe_properties
@@ -432,9 +424,9 @@ def parse_keywords(keyword_json, request):
         if len(kw) != 0:
             kw = automation_engine.apply_keyword_automation(kw)
             if k := Keyword.objects.filter(name__iexact=kw, space=request.space).first():
-                keywords.append({'label': str(k), 'name': k.name, 'id': k.id, 'import_keyword': True})
+                keywords.append({'label': str(k), 'name': k.name, 'id': k.id})
             else:
-                keywords.append({'label': kw, 'name': kw, 'import_keyword': False})
+                keywords.append({'label': kw, 'name': kw})
 
     return keywords
 
@@ -491,11 +483,7 @@ def get_images_from_soup(soup, url):
         u = u.split('?')[0]
         filename = re.search(r'/([\w_-]+[.](jpg|jpeg|gif|png))$', u)
         if filename:
-            if u.startswith('//'):
-                # urls from e.g. ottolenghi.co.uk start with //
-                u = 'https:' + u
-            if ('http' not in u) and url:
-                print(f'rewriting URL {u}')
+            if (('http' not in u) and (url)):
                 # sometimes an image source can be relative
                 # if it is provide the base url
                 u = '{}://{}{}'.format(prot, site, u)

cookbook/helper/scope_middleware.py

@@ -12,7 +12,7 @@ class ScopeMiddleware:
         self.get_response = get_response
 
     def __call__(self, request):
-        prefix = settings.SCRIPT_NAME or ''
+        prefix = settings.JS_REVERSE_SCRIPT_PREFIX or ''
 
         # need to disable scopes for writing requests into userpref and enable for loading ?
         if request.path.startswith(prefix + '/api/user-preference/'):

cookbook/helper/shopping_helper.py

@@ -153,9 +153,8 @@ class RecipeShoppingEditor():
             return True
 
         for sle in ShoppingListEntry.objects.filter(list_recipe=self._shopping_list_recipe):
-            if sle.ingredient: # TODO temporarily dont scale manual entries until ingredient_amount or some other base amount has been migrated to SLE
-                sle.amount = sle.ingredient.amount * Decimal(self._servings_factor)
-                sle.save()
+            sle.amount = sle.ingredient.amount * Decimal(self._servings_factor)
+            sle.save()
         self._shopping_list_recipe.servings = self.servings
         self._shopping_list_recipe.save()
         return True

cookbook/helper/template_helper.py

@@ -70,7 +70,7 @@ def render_instructions(step):  # TODO deduplicate markdown cleanup code
     parsed_md = md.markdown(
         instructions,
         extensions=[
-            'markdown.extensions.fenced_code', 'markdown.extensions.sane_lists', 'markdown.extensions.nl2br', TableExtension(),
+            'markdown.extensions.fenced_code', TableExtension(),
             UrlizeExtension(), MarkdownFormatExtension()
         ]
     )

cookbook/integration/cookbookapp.py

@@ -60,15 +60,14 @@ class CookBookApp(Integration):
                 food=f, unit=u, amount=ingredient.get('amount', None), note=ingredient.get('note', None), original_text=ingredient.get('original_text', None), space=self.request.space,
             ))
 
-        try:
-            for url in images:
-                # import the first valid image which is not cookbookapp branding
-                if validate_import_url(url) and not url.startswith("https://media.cookbookmanager.com/brand/"):
+        if len(images) > 0:
+            try:
+                url = images[0]
+                if validate_import_url(url):
                     response = requests.get(url)
                     self.import_recipe_image(recipe, BytesIO(response.content))
-                    break
-        except Exception as e:
-            print('failed to import image ', str(e))
+            except Exception as e:
+                print('failed to import image ', str(e))
 
         recipe.save()
         return recipe

cookbook/integration/recettetek.py

@@ -1,10 +1,10 @@
+import imghdr
 import json
 import re
 from io import BytesIO
 from zipfile import ZipFile
 
 import requests
-from PIL import Image
 
 from django.utils.translation import gettext as _
 
@@ -128,7 +128,7 @@ class RecetteTek(Integration):
                     url = file['originalPicture']
                     if validate_import_url(url):
                         response = requests.get(url)
-                        if Image.open(BytesIO(response.content)).verify():
+                        if imghdr.what(BytesIO(response.content)) is not None:
                             self.import_recipe_image(recipe, BytesIO(response.content), filetype=get_filetype(file['originalPicture']))
                         else:
                             raise Exception("Original image failed to download.")

cookbook/locale/es/LC_MESSAGES/django.po

@@ -14,7 +14,7 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2024-08-01 15:04+0200\n"
-"PO-Revision-Date: 2025-06-23 08:28+0000\n"
+"PO-Revision-Date: 2025-01-29 13:44+0000\n"
 "Last-Translator: Ángel <1024mb@users.noreply.translate.tandoor.dev>\n"
 "Language-Team: Spanish <http://translate.tandoor.dev/projects/tandoor/"
 "recipes-backend/es/>\n"
@@ -284,12 +284,14 @@ msgid "You have more users than allowed in your space."
 msgstr "Tenés mas usuarios que los permitidos en tu espacio"
 
 #: .\cookbook\helper\recipe_url_import.py:310
+#, fuzzy
+#| msgid "Use fractions"
 msgid "reverse rotation"
-msgstr "rotación inversa"
+msgstr "Usar fracciones"
 
 #: .\cookbook\helper\recipe_url_import.py:311
 msgid "careful rotation"
-msgstr "rotación cuidadosa"
+msgstr ""
 
 #: .\cookbook\helper\recipe_url_import.py:312
 msgid "knead"
@@ -396,9 +398,8 @@ msgid "Section"
 msgstr "Sección"
 
 #: .\cookbook\management\commands\fix_duplicate_properties.py:15
-#, fuzzy
 msgid "Fixes foods with "
-msgstr "Corrige alimentos con "
+msgstr ""
 
 #: .\cookbook\management\commands\rebuildindex.py:14
 msgid "Rebuilds full text search index on Recipe"
@@ -435,14 +436,16 @@ msgid "Other"
 msgstr "Otro"
 
 #: .\cookbook\migrations\0190_auto_20230525_1506.py:17
+#, fuzzy
+#| msgid "Fats"
 msgid "Fat"
-msgstr "Grasa"
+msgstr "Grasas"
 
 #: .\cookbook\migrations\0190_auto_20230525_1506.py:17
 #: .\cookbook\migrations\0190_auto_20230525_1506.py:18
 #: .\cookbook\migrations\0190_auto_20230525_1506.py:19
 msgid "g"
-msgstr "gr."
+msgstr ""
 
 #: .\cookbook\migrations\0190_auto_20230525_1506.py:18
 msgid "Carbohydrates"
@@ -465,8 +468,6 @@ msgid ""
 "Maximum file storage for space in MB. 0 for unlimited, -1 to disable file "
 "upload."
 msgstr ""
-"Almacenamiento máximo de archivos para el espacio en MB. 0 para ilimitado, -"
-"1 para desactivar la carga de archivos."
 
 #: .\cookbook\models.py:454 .\cookbook\templates\search.html:7
 #: .\cookbook\templates\settings.html:18
@@ -497,16 +498,18 @@ msgid "Nutrition"
 msgstr "Información Nutricional"
 
 #: .\cookbook\models.py:918
+#, fuzzy
+#| msgid "Merge"
 msgid "Allergen"
-msgstr "Alérgeno"
+msgstr "Combinar"
 
 #: .\cookbook\models.py:919
 msgid "Price"
-msgstr "Precio"
+msgstr ""
 
 #: .\cookbook\models.py:919
 msgid "Goal"
-msgstr "Objetivo"
+msgstr ""
 
 #: .\cookbook\models.py:1408 .\cookbook\templates\search_info.html:28
 msgid "Simple"
@@ -529,40 +532,54 @@ msgid "Food Alias"
 msgstr "Alias de la Comida"
 
 #: .\cookbook\models.py:1468
+#, fuzzy
+#| msgid "Units"
 msgid "Unit Alias"
-msgstr "Alias de unidad"
+msgstr "Unidades"
 
 #: .\cookbook\models.py:1469
+#, fuzzy
+#| msgid "Keywords"
 msgid "Keyword Alias"
-msgstr "Alias de palabra clave"
+msgstr "Palabras clave"
 
 #: .\cookbook\models.py:1470
+#, fuzzy
+#| msgid "Description"
 msgid "Description Replace"
-msgstr "Reemplazo de descripción"
+msgstr "Descripción"
 
 #: .\cookbook\models.py:1471
+#, fuzzy
+#| msgid "Instructions"
 msgid "Instruction Replace"
-msgstr "Reemplazo de instrucciones"
+msgstr "Instrucciones"
 
 #: .\cookbook\models.py:1472
+#, fuzzy
+#| msgid "New Unit"
 msgid "Never Unit"
-msgstr "Unidad prohibida"
+msgstr "Nueva Unidad"
 
 #: .\cookbook\models.py:1473
 msgid "Transpose Words"
-msgstr "Transponer palabras"
+msgstr ""
 
 #: .\cookbook\models.py:1474
+#, fuzzy
+#| msgid "Food Alias"
 msgid "Food Replace"
-msgstr "Reemplazo de alimento"
+msgstr "Alias de la Comida"
 
 #: .\cookbook\models.py:1475
+#, fuzzy
+#| msgid "Description"
 msgid "Unit Replace"
-msgstr "Reemplazo de unidad"
+msgstr "Descripción"
 
 #: .\cookbook\models.py:1476
 msgid "Name Replace"
-msgstr "Reemplazo de nombre"
+msgstr ""
 
 #: .\cookbook\models.py:1503 .\cookbook\views\delete.py:40
 #: .\cookbook\views\edit.py:210 .\cookbook\views\new.py:39
@@ -570,8 +587,10 @@ msgid "Recipe"
 msgstr "Receta"
 
 #: .\cookbook\models.py:1504
+#, fuzzy
+#| msgid "Food"
 msgid "Food"
-msgstr "Alimento"
+msgstr "Comida"
 
 #: .\cookbook\models.py:1505 .\cookbook\templates\base.html:149
 msgid "Keyword"
@@ -629,26 +648,22 @@ msgstr "Invitación para Tandoor Recipes"
 
 #: .\cookbook\serializer.py:1426
 msgid "Existing shopping list to update"
-msgstr "Lista de compras existente para actualizar"
+msgstr ""
 
 #: .\cookbook\serializer.py:1428
 msgid ""
 "List of ingredient IDs from the recipe to add, if not provided all "
 "ingredients will be added."
 msgstr ""
-"Lista de IDs de ingredientes de la receta para agregar; si no se "
-"proporciona, se agregarán todos los ingredientes."
 
 #: .\cookbook\serializer.py:1430
 msgid ""
 "Providing a list_recipe ID and servings of 0 will delete that shopping list."
 msgstr ""
-"Proporcionar un ID list_recipe y porciones igual a 0 eliminará esa lista de "
-"compras."
 
 #: .\cookbook\serializer.py:1439
 msgid "Amount of food to add to the shopping list"
-msgstr "Cantidad de alimento a agregar a la lista de compras"
+msgstr ""
 
 #: .\cookbook\serializer.py:1441
 msgid "ID of unit to use for the shopping list"

cookbook/locale/fr/LC_MESSAGES/django.po

@@ -14,8 +14,8 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2024-08-01 15:04+0200\n"
-"PO-Revision-Date: 2025-08-10 11:36+0000\n"
-"Last-Translator: Enzo La Rafale <enzo.chaussivert@gmail.com>\n"
+"PO-Revision-Date: 2025-02-16 14:58+0000\n"
+"Last-Translator: Elvis Gosselin <elvis.gosselin@tutanota.com>\n"
 "Language-Team: French <http://translate.tandoor.dev/projects/tandoor/"
 "recipes-backend/fr/>\n"
 "Language: fr\n"
@@ -405,7 +405,7 @@ msgstr "Rubrique"
 
 #: .\cookbook\management\commands\fix_duplicate_properties.py:15
 msgid "Fixes foods with "
-msgstr "Corriger les aliments avec "
+msgstr ""
 
 #: .\cookbook\management\commands\rebuildindex.py:14
 msgid "Rebuilds full text search index on Recipe"
@@ -442,6 +442,8 @@ msgid "Other"
 msgstr "Autre"
 
 #: .\cookbook\migrations\0190_auto_20230525_1506.py:17
+#, fuzzy
+#| msgid "Fats"
 msgid "Fat"
 msgstr "Matières grasses"
 
@@ -449,7 +451,7 @@ msgstr "Matières grasses"
 #: .\cookbook\migrations\0190_auto_20230525_1506.py:18
 #: .\cookbook\migrations\0190_auto_20230525_1506.py:19
 msgid "g"
-msgstr "g"
+msgstr ""
 
 #: .\cookbook\migrations\0190_auto_20230525_1506.py:18
 msgid "Carbohydrates"
@@ -465,7 +467,7 @@ msgstr "Calories"
 
 #: .\cookbook\migrations\0190_auto_20230525_1506.py:20
 msgid "kcal"
-msgstr "kcal"
+msgstr ""
 
 #: .\cookbook\models.py:325
 msgid ""
@@ -552,24 +554,30 @@ msgid "Instruction Replace"
 msgstr "Remplacer l'instruction"
 
 #: .\cookbook\models.py:1472
+#, fuzzy
+#| msgid "New Unit"
 msgid "Never Unit"
-msgstr "Aucune unité"
+msgstr "Nouvelle unité"
 
 #: .\cookbook\models.py:1473
 msgid "Transpose Words"
-msgstr "Transposer les mots"
+msgstr ""
 
 #: .\cookbook\models.py:1474
+#, fuzzy
+#| msgid "Food Alias"
 msgid "Food Replace"
-msgstr "Aliment alternatif"
+msgstr "Aliment équivalent"
 
 #: .\cookbook\models.py:1475
+#, fuzzy
+#| msgid "Description Replace"
 msgid "Unit Replace"
-msgstr "Remplacer l'unité"
+msgstr "Remplacer la Description"
 
 #: .\cookbook\models.py:1476
 msgid "Name Replace"
-msgstr "Remplacer le nom"
+msgstr ""
 
 #: .\cookbook\models.py:1503 .\cookbook\views\delete.py:40
 #: .\cookbook\views\edit.py:210 .\cookbook\views\new.py:39
@@ -1032,8 +1040,10 @@ msgid "Properties"
 msgstr "Propriétés"
 
 #: .\cookbook\templates\base.html:301 .\cookbook\views\lists.py:255
+#, fuzzy
+#| msgid "Account Connections"
 msgid "Unit Conversions"
-msgstr "Conversions d'unités"
+msgstr "Comptes connectés"
 
 #: .\cookbook\templates\base.html:318 .\cookbook\templates\index.html:47
 msgid "Import Recipe"
@@ -1053,8 +1063,10 @@ msgid "Space Settings"
 msgstr "Paramètres de groupe"
 
 #: .\cookbook\templates\base.html:340
+#, fuzzy
+#| msgid "External Recipes"
 msgid "External Connectors"
-msgstr "Connecteurs externes"
+msgstr "Recettes externes"
 
 #: .\cookbook\templates\base.html:345 .\cookbook\templates\system.html:13
 msgid "System"
@@ -1518,8 +1530,10 @@ msgid "Back"
 msgstr "Retour"
 
 #: .\cookbook\templates\property_editor.html:7
+#, fuzzy
+#| msgid "Ingredient Editor"
 msgid "Property Editor"
-msgstr "Éditeur de propriété"
+msgstr "Éditeur d’ingrédients"
 
 #: .\cookbook\templates\recipe_view.html:36
 msgid "Comments"
@@ -1997,8 +2011,10 @@ msgid "Sign in using"
 msgstr "Se connecter avec"
 
 #: .\cookbook\templates\space_manage.html:7
+#, fuzzy
+#| msgid "Space Membership"
 msgid "Space Management"
-msgstr "Gestion de l'espace"
+msgstr "Adhésion à l'espace"
 
 #: .\cookbook\templates\space_manage.html:26
 msgid "Space:"
@@ -2211,8 +2227,10 @@ msgid "Info"
 msgstr "Info"
 
 #: .\cookbook\templates\system.html:110 .\cookbook\templates\system.html:127
+#, fuzzy
+#| msgid "Use fractions"
 msgid "Migrations"
-msgstr "Migrations"
+msgstr "Utiliser les fractions"
 
 #: .\cookbook\templates\system.html:116
 msgid ""
@@ -2247,8 +2265,10 @@ msgid "Hide"
 msgstr "Cacher"
 
 #: .\cookbook\templates\system.html:210
+#, fuzzy
+#| msgid "Show Log"
 msgid "Show"
-msgstr "Afficher"
+msgstr "Afficher le journal"
 
 #: .\cookbook\templates\url_import.html:8
 msgid "URL Import"
@@ -2333,9 +2353,11 @@ msgstr ""
 "MM-DD."
 
 #: .\cookbook\views\api.py:744
+#, fuzzy
+#| msgid "ID of recipe a step is part of. For multiple repeat parameter."
 msgid "Filter meal plans with MealType ID. For multiple repeat parameter."
 msgstr ""
-"Filtrer le planning des repas avec l'identifiant MealType. Pour plusieurs "
+"Identifiant de la recette dont fait partie une étape. Pour plusieurs "
 "paramètres de répétition."
 
 #: .\cookbook\views\api.py:872
@@ -2438,27 +2460,18 @@ msgstr ""
 #: .\cookbook\views\api.py:922
 msgid "ID of book a recipe should be in. For multiple repeat parameter."
 msgstr ""
-"ID du livre dans lequel une recette doit se trouver. Pour plusieurs "
-"paramètres de répétition."
 
 #: .\cookbook\views\api.py:923
 msgid "Book IDs, repeat for multiple. Return recipes with any of the books"
 msgstr ""
-"IDs de livre, répéter pour plusieurs livres. Renvoie les recettes dans "
-"n'importe quel livre."
 
 #: .\cookbook\views\api.py:924
 msgid "Book IDs, repeat for multiple. Return recipes with all of the books."
 msgstr ""
-"IDs de livre, répéter pour plusieurs livres. Renvoie les recettes dans tous "
-"les livre."
 
 #: .\cookbook\views\api.py:925
-#, fuzzy
 msgid "Book IDs, repeat for multiple. Exclude recipes with any of the books."
 msgstr ""
-"Identifiants de livres : répéter pour plusieurs. Exclure les recettes de "
-"l'un des livres."
 
 #: .\cookbook\views\api.py:926
 msgid "Book IDs, repeat for multiple. Exclude recipes with all of the books."

cookbook/locale/lv/LC_MESSAGES/django.po

@@ -11,7 +11,7 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2024-08-01 15:04+0200\n"
-"PO-Revision-Date: 2025-07-21 09:43+0000\n"
+"PO-Revision-Date: 2024-11-05 10:58+0000\n"
 "Last-Translator: Aija Kozlovska <kozlovska.aija@gmail.com>\n"
 "Language-Team: Latvian <http://translate.tandoor.dev/projects/tandoor/"
 "recipes-backend/lv/>\n"
@@ -20,7 +20,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2;\n"
-"X-Generator: Weblate 5.8.4\n"
+"X-Generator: Weblate 5.6.2\n"
 
 #: .\cookbook\forms.py:45
 msgid ""
@@ -83,8 +83,8 @@ msgid ""
 "Leave empty for dropbox and enter only base url for nextcloud (<code>/remote."
 "php/webdav/</code> is added automatically)"
 msgstr ""
-"Atstājiet tukšu Dropbox un ievadiet tikai Nextcloud bāzes URL (<code> /remote"
-".php/webdav/ </code> tiek pievienots automātiski)"
+"Atstājiet tukšu Dropbox un ievadiet tikai Nextcloud bāzes URL (<kods> /"
+"remote.php/webdav/ </code> tiek pievienots automātiski)"
 
 #: .\cookbook\forms.py:188
 msgid ""
@@ -147,65 +147,48 @@ msgid ""
 "Determines how fuzzy a search is if it uses trigram similarity matching (e."
 "g. low values mean more typos are ignored)."
 msgstr ""
-"Nosaka cik precīza ir meklēšana gadījumā, ja tiek izmantota trigram līdzība ("
-"jo zemāka vērtība, jo vairāk rakstīšanas kļūdas tiek ignorētas)."
 
 #: .\cookbook\forms.py:340
 msgid ""
 "Select type method of search.  Click <a href=\"/docs/search/\">here</a> for "
 "full description of choices."
 msgstr ""
-"Izvēlies meklēšanas veidu. Spied <a href=\"/docs/search/\">šeit</a>, lai "
-"apskatītu visas iespējas."
 
 #: .\cookbook\forms.py:341
 msgid ""
 "Use fuzzy matching on units, keywords and ingredients when editing and "
 "importing recipes."
 msgstr ""
-"Izmanto aptuveno meklēšanu vienībām, atslēgas vārdiem un sastāvdaļām "
-"importējot un labojot receptes."
 
 #: .\cookbook\forms.py:342
 msgid ""
 "Fields to search ignoring accents.  Selecting this option can improve or "
 "degrade search quality depending on language"
 msgstr ""
-"Lauki, kurus meklējot ignorēt akcentus.  Šī varianta izvēlēšanās var uzlabot "
-"vai pasliktināt meklēšanas kvalitāti atkarībā no valodas"
 
 #: .\cookbook\forms.py:343
 msgid ""
 "Fields to search for partial matches.  (e.g. searching for 'Pie' will return "
 "'pie' and 'piece' and 'soapie')"
 msgstr ""
-"Lauki, kuros meklēt aptuveno līdzību. (piem. meklējot vārdu 'Kūka' tiks "
-"atrasts arī 'kūka' un 'ābolkūka')"
 
 #: .\cookbook\forms.py:344
 msgid ""
 "Fields to search for beginning of word matches. (e.g. searching for 'sa' "
 "will return 'salad' and 'sandwich')"
 msgstr ""
-"Lauki, kuros meklēt vārdu līdzības sākumu. (piem meklējot 'la' atradīt "
-"'lapas' un 'laims')"
 
 #: .\cookbook\forms.py:345
 msgid ""
 "Fields to 'fuzzy' search. (e.g. searching for 'recpie' will find 'recipe'.)  "
 "Note: this option will conflict with 'web' and 'raw' methods of search."
 msgstr ""
-"Lauki, kuriem izmantot aptuveno meklēšanu. (piem. meklējot 'recpte' tiks "
-"atrasts 'recepte'.)  Piezīme: šis variants konfliktēs ar 'web' un 'raw' "
-"meklēšanas metodēm."
 
 #: .\cookbook\forms.py:346
 msgid ""
 "Fields to full text search.  Note: 'web', 'phrase', and 'raw' search methods "
 "only function with fulltext fields."
 msgstr ""
-"Lauki priekš pilnās teksta meklēšanas.  Piezīme: 'web', 'phrase' un 'raw' "
-"meklēšanas metodes darbojās tikai ar pilno teksta meklēšanu."
 
 #: .\cookbook\forms.py:350
 #, fuzzy
@@ -215,11 +198,11 @@ msgstr "Meklēt"
 
 #: .\cookbook\forms.py:350
 msgid "Fuzzy Lookups"
-msgstr "Aptuvenā meklēšana"
+msgstr ""
 
 #: .\cookbook\forms.py:350
 msgid "Ignore Accent"
-msgstr "Ignorēt akcentus"
+msgstr ""
 
 #: .\cookbook\forms.py:350
 msgid "Partial Match"
@@ -762,8 +745,8 @@ msgid ""
 "            ."
 msgstr ""
 "Lūdzu apstipriniet, ka\n"
-"            <a href=\"mailto:%(email)s\">%(email)s</a> ir e-pasta adrese "
-"lietotājam %(user_display)\n"
+"            <a href=\"mailto:%(email)s\">%(email)s</a> ir lietotāja "
+"%(user_display) e-pasta adrese\n"
 "            ."
 
 #: .\cookbook\templates\account\email_confirm.html:22
@@ -1348,7 +1331,7 @@ msgstr ""
 #: .\cookbook\templates\markdown_info.html:57
 #: .\cookbook\templates\markdown_info.html:73
 msgid "or by leaving a blank line in between."
-msgstr "vai atstājot tukšu rindu starp."
+msgstr "vai atstājot tukšu rindu starp  ."
 
 #: .\cookbook\templates\markdown_info.html:59
 #: .\cookbook\templates\markdown_info.html:74
@@ -1460,7 +1443,7 @@ msgstr "Nav Tiesību"
 
 #: .\cookbook\templates\no_groups_info.html:17
 msgid "You do not have any groups and therefor cannot use this application."
-msgstr "Jūs neesat nevienā grupā un tādēļ nevarat izmantot šo lietotni."
+msgstr "Jūs neesat nevienā grupā un tādēļ nevarat izmantot šo lietotni!"
 
 #: .\cookbook\templates\no_groups_info.html:18
 #: .\cookbook\templates\no_perm_info.html:15
@@ -1477,7 +1460,7 @@ msgid ""
 "You do not have the required permissions to view this page or perform this "
 "action."
 msgstr ""
-"Jums nav nepieciešamo atļauju, lai skatītu šo vietni vai veiktu šo darbību."
+"Jums nav nepieciešamo atļauju, lai skatītu šo vietni vai veiktu šo darbību!"
 
 #: .\cookbook\templates\offline.html:6
 msgid "Offline"
@@ -1565,16 +1548,6 @@ msgid ""
 "html#TEXTSEARCH-PARSING-QUERIES>Postgresql's website.</a>\n"
 "            "
 msgstr ""
-" \n"
-"            Pilnā teksta meklēšanas mēģinājums vienkāršot dotos vārdus, lai "
-"tie sakristu ar tipiskajiem variantiem.  Piemēram: 'griezt', 'griezšana', "
-"'griezums' tiks vienkāršots uz 'griez'.\n"
-"            Lai kontrolētu meklētāja darbību ievadot vairākus meklējamos "
-"vārdus, ir pieejamas vairākas zemāk aprakstītās metodes.\n"
-"            Pilno tehnisko informāciju par tām var apskatīt <a "
-"href=https://www.postgresql.org/docs/current/textsearch-controls.html"
-"#TEXTSEARCH-PARSING-QUERIES>Postgresql mājas lapā.</a>\n"
-"            "
 
 #: .\cookbook\templates\search_info.html:29
 msgid ""
@@ -2574,12 +2547,22 @@ msgid "Unable to determine PostgreSQL version."
 msgstr ""
 
 #: .\cookbook\views\views.py:317
+#, fuzzy
+#| msgid ""
+#| "\n"
+#| "            This application is not running with a Postgres database "
+#| "backend. This is ok but not recommended as some\n"
+#| "            features only work with postgres databases.\n"
+#| "        "
 msgid ""
 "This application is not running with a Postgres database backend. This is ok "
 "but not recommended as some features only work with postgres databases."
 msgstr ""
-"Šī lietojumprogramma nedarbojas, izmantojot Postgres datubāzi. Tas ir labi, "
-"bet nav ieteicams, jo dažas funkcijas darbojas tikai ar Postgres datu bāzēm."
+"\n"
+"             Šī lietojumprogramma nedarbojas, izmantojot Postgres datubāzi. "
+"Tas ir labi, bet nav ieteicams, jo dažas\n"
+"             funkcijas darbojas tikai ar Postgres datu bāzēm.\n"
+"        "
 
 #: .\cookbook\views\views.py:360
 #, fuzzy

cookbook/locale/nl/LC_MESSAGES/django.po

@@ -13,8 +13,8 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2024-08-01 15:04+0200\n"
-"PO-Revision-Date: 2025-07-31 19:14+0000\n"
-"Last-Translator: Justin Straver <justin.straver@gmail.com>\n"
+"PO-Revision-Date: 2025-02-16 14:58+0000\n"
+"Last-Translator: Cots Partier <cots.pastier.34@icloud.com>\n"
 "Language-Team: Dutch <http://translate.tandoor.dev/projects/tandoor/"
 "recipes-backend/nl/>\n"
 "Language: nl\n"
@@ -46,7 +46,7 @@ msgstr "Voorbereidingstijd in minuten"
 
 #: .\cookbook\forms.py:62
 msgid "Waiting time (cooking/baking) in minutes"
-msgstr "Wachttijd in minuten (koken en bakken)"
+msgstr "Wacht tijd in minuten (koken en bakken)"
 
 #: .\cookbook\forms.py:63 .\cookbook\forms.py:222 .\cookbook\forms.py:246
 msgid "Path"

cookbook/locale/sv/LC_MESSAGES/django.po

@@ -8,8 +8,8 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2024-08-01 15:04+0200\n"
-"PO-Revision-Date: 2025-08-10 11:36+0000\n"
-"Last-Translator: Elias Sjögreen <eliassjogreen1@gmail.com>\n"
+"PO-Revision-Date: 2025-02-07 08:58+0000\n"
+"Last-Translator: Mattias G <mattias.granlund@gmail.com>\n"
 "Language-Team: Swedish <http://translate.tandoor.dev/projects/tandoor/"
 "recipes-backend/sv/>\n"
 "Language: sv\n"
@@ -641,8 +641,6 @@ msgstr "ID eller enhet att använda för inköpslistan"
 #: .\cookbook\serializer.py:1443
 msgid "When set to true will delete all food from active shopping lists."
 msgstr ""
-"Om det här alternativet är aktiverat kommer alla matvaror att raderas från "
-"de aktiva inköpslistorna."
 
 #: .\cookbook\tables.py:69 .\cookbook\tables.py:83
 #: .\cookbook\templates\generic\delete_template.html:7
@@ -725,13 +723,10 @@ msgid ""
 "You currently do not have any e-mail address set up. You should really add "
 "an e-mail address so you can receive notifications, reset your password, etc."
 msgstr ""
-"Just nu har du inga e-post adresser konfigurerade. Du borde verkligen lägga "
-"till en e-post adress så att du kan får notiser, återställa ditt lösenord, "
-"mm."
 
 #: .\cookbook\templates\account\email.html:64
 msgid "Add E-mail Address"
-msgstr "Lägg till en e-post adress"
+msgstr ""
 
 #: .\cookbook\templates\account\email.html:69
 msgid "Add E-mail"
@@ -739,12 +734,12 @@ msgstr "Lägg till email"
 
 #: .\cookbook\templates\account\email.html:79
 msgid "Do you really want to remove the selected e-mail address?"
-msgstr "Vill du verkligen ta bort den valda e-postadressen?"
+msgstr ""
 
 #: .\cookbook\templates\account\email_confirm.html:6
 #: .\cookbook\templates\account\email_confirm.html:10
 msgid "Confirm E-mail Address"
-msgstr "Bekräfta e-postadress"
+msgstr ""
 
 #: .\cookbook\templates\account\email_confirm.html:16
 #, python-format
@@ -754,10 +749,6 @@ msgid ""
 "for user %(user_display)s\n"
 "            ."
 msgstr ""
-"Vänligen bekräfra att\n"
-"            <a href=\"mailto:%(email)s\">%(email)s</a> är e-postadressen för "
-"användaren %(user_display)s\n"
-"            ."
 
 #: .\cookbook\templates\account\email_confirm.html:22
 #: .\cookbook\templates\generic\delete_template.html:72
@@ -771,9 +762,6 @@ msgid ""
 "            <a href=\"%(email_url)s\">issue a new e-mail confirmation "
 "request</a>."
 msgstr ""
-"Denna e-post bekräftelselänk är utgången eller felaktig. Vänligen\n"
-"            <a href=\"%(email_url)s\">skapa en ny "
-"e-postbekräftelsebegäran</a>."
 
 #: .\cookbook\templates\account\login.html:8 .\cookbook\templates\base.html:388
 #: .\cookbook\templates\openid\login.html:8
@@ -797,17 +785,19 @@ msgstr "Logga in"
 #: .\cookbook\templates\account\password_reset_done.html:33
 #: .\cookbook\templates\socialaccount\signup.html:8
 #: .\cookbook\templates\socialaccount\signup.html:57
+#, fuzzy
+#| msgid "Sign In"
 msgid "Sign Up"
-msgstr "Registrera dig"
+msgstr "Logga in"
 
 #: .\cookbook\templates\account\login.html:38
 msgid "Lost your password?"
-msgstr "Glömt ditt lösenord?"
+msgstr ""
 
 #: .\cookbook\templates\account\login.html:39
 #: .\cookbook\templates\account\password_reset.html:29
 msgid "Reset My Password"
-msgstr "Återställ mitt lösenord"
+msgstr ""
 
 #: .\cookbook\templates\account\login.html:50
 msgid "Social Login"
@@ -834,8 +824,10 @@ msgstr "Är du säker på att du vill logga ut?"
 #: .\cookbook\templates\account\password_reset_from_key.html:13
 #: .\cookbook\templates\account\password_reset_from_key_done.html:7
 #: .\cookbook\templates\account\password_reset_from_key_done.html:13
+#, fuzzy
+#| msgid "Changes saved!"
 msgid "Change Password"
-msgstr "Ändra lösenord"
+msgstr "Ändringar sparade!"
 
 #: .\cookbook\templates\account\password_change.html:12
 #: .\cookbook\templates\account\password_set.html:12
@@ -858,20 +850,18 @@ msgid ""
 "Forgotten your password? Enter your e-mail address below, and we'll send you "
 "an e-mail allowing you to reset it."
 msgstr ""
-"Glömt ditt lösenord? Ange din e-postadress nedanför så skickar vi ett "
-"återställningmail."
 
 #: .\cookbook\templates\account\password_reset.html:32
+#, fuzzy
+#| msgid "Password reset is not implemented for the time being!"
 msgid "Password reset is disabled on this instance."
-msgstr "Återställning av lösenord är avaktiverat på denna instans."
+msgstr "Återställning av lösenord har ännu inte lagts till!"
 
 #: .\cookbook\templates\account\password_reset_done.html:25
 msgid ""
 "We have sent you an e-mail. Please contact us if you do not receive it "
 "within a few minutes."
 msgstr ""
-"Vi har skickat ett e-postmeddelande till dig. Om du inte har fått det inom "
-"några minuter, vänligen kontakta oss."
 
 #: .\cookbook\templates\account\password_reset_from_key.html:13
 #, fuzzy

cookbook/locale/zh_Hant/LC_MESSAGES/django.po

@@ -8,22 +8,22 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2024-08-01 15:04+0200\n"
-"PO-Revision-Date: 2025-08-02 07:49+0000\n"
-"Last-Translator: TC Kuo <tckuo7@gmail.com>\n"
-"Language-Team: Chinese (Traditional Han script) <http://translate.tandoor."
-"dev/projects/tandoor/recipes-backend/zh_Hant/>\n"
+"PO-Revision-Date: 2024-11-04 10:29+0000\n"
+"Last-Translator: Johnny Ip <ip.iohnny@gmail.com>\n"
+"Language-Team: Chinese (Traditional) <http://translate.tandoor.dev/projects/"
+"tandoor/recipes-backend/zh_Hant/>\n"
 "Language: zh_Hant\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Weblate 5.8.4\n"
+"X-Generator: Weblate 5.6.2\n"
 
 #: .\cookbook\forms.py:45
 msgid ""
 "Both fields are optional. If none are given the username will be displayed "
 "instead"
-msgstr "這兩個欄位都是可選的。如果沒有輸入,將顯示用戶名"
+msgstr "這兩個字段都是可選的。如果沒有輸入,將顯示用戶名"
 
 #: .\cookbook\forms.py:62 .\cookbook\forms.py:246
 msgid "Name"
@@ -31,7 +31,7 @@ msgstr "名字"
 
 #: .\cookbook\forms.py:62 .\cookbook\forms.py:246 .\cookbook\views\lists.py:103
 msgid "Keywords"
-msgstr "關鍵字"
+msgstr "關鍵詞"
 
 #: .\cookbook\forms.py:62
 msgid "Preparation time in minutes"
@@ -51,13 +51,14 @@ msgstr "存儲ID"
 
 #: .\cookbook\forms.py:93
 msgid "Default"
-msgstr "預設"
+msgstr "默認"
 
 #: .\cookbook\forms.py:121
 msgid ""
 "To prevent duplicates recipes with the same name as existing ones are "
 "ignored. Check this box to import everything."
-msgstr "為防止重複，忽略與現有同名的食譜。選中此框可導入所有內容（包括同名食譜）。"
+msgstr ""
+"為防止重復，忽略與現有同名的菜譜。選中此框可導入所有內容（包括同名菜譜）。"
 
 #: .\cookbook\forms.py:143
 msgid "Add your comment: "
@@ -240,7 +241,7 @@ msgstr "你沒有必要的權限來查看這個頁面！"
 #: .\cookbook\helper\permission_helper.py:237
 #: .\cookbook\helper\permission_helper.py:252
 msgid "You cannot interact with this object as it is not owned by you!"
-msgstr "你不能與此對象互動，因為它不屬於你！"
+msgstr "你不能與此對象交互，因為它不屬於你！"
 
 #: .\cookbook\helper\permission_helper.py:402
 msgid "You have reached the maximum number of recipes for your space."
@@ -310,16 +311,16 @@ msgstr "在導入過程中發生了一個意外的錯誤。請確認你上傳的
 
 #: .\cookbook\integration\integration.py:217
 msgid "The following recipes were ignored because they already existed:"
-msgstr "以下食譜被忽略了，因為它們已經存在了："
+msgstr "以下菜譜被忽略了，因為它們已經存在了："
 
 #: .\cookbook\integration\integration.py:221
 #, python-format
 msgid "Imported %s recipes."
-msgstr "導入了%s食譜。"
+msgstr "導入了%s菜譜。"
 
 #: .\cookbook\integration\openeats.py:28
 msgid "Recipe source:"
-msgstr "食譜來源："
+msgstr "菜譜來源："
 
 #: .\cookbook\integration\paprika.py:49
 msgid "Notes"
@@ -327,7 +328,7 @@ msgstr "說明"
 
 #: .\cookbook\integration\paprika.py:52
 msgid "Nutritional Information"
-msgstr "營養資訊"
+msgstr "營養信息"
 
 #: .\cookbook\integration\paprika.py:56
 msgid "Source"
@@ -644,7 +645,7 @@ msgstr "電子郵件地址"
 #: .\cookbook\templates\socialaccount\connections.html:10
 #: .\cookbook\templates\user_settings.html:8
 msgid "Settings"
-msgstr "設定"
+msgstr "設置"
 
 #: .\cookbook\templates\account\email.html:13
 msgid "Email"
@@ -1877,7 +1878,7 @@ msgstr "你可以被邀請加入現有空間或創建自己的空間。"
 
 #: .\cookbook\templates\space_overview.html:53
 msgid "Owner"
-msgstr "擁有者"
+msgstr "所有者"
 
 #: .\cookbook\templates\space_overview.html:57
 msgid "Leave Space"

cookbook/migrations/0223_auto_20250831_1111.py

@@ -1,34 +0,0 @@
-# Generated by Django 4.2.22 on 2025-08-31 09:11
-
-from django.db import migrations
-from django_scopes import scopes_disabled
-
-
-def migrate_comments(apps, schema_editor):
-    with scopes_disabled():
-        Comment = apps.get_model('cookbook', 'Comment')
-        CookLog = apps.get_model('cookbook', 'CookLog')
-
-        cook_logs = []
-
-        for c in Comment.objects.all():
-            cook_logs.append(CookLog(
-                recipe=c.recipe,
-                created_by=c.created_by,
-                created_at=c.created_at,
-                comment=c.text,
-                space=c.recipe.space,
-            ))
-
-        CookLog.objects.bulk_create(cook_logs, unique_fields=('recipe', 'comment', 'created_at', 'created_by'))
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('cookbook', '0222_alter_shoppinglistrecipe_created_by_and_more'),
-    ]
-
-    operations = [
-        migrations.RunPython(migrate_comments),
-    ]

cookbook/migrations/0223_userpreference_ingredient_context_and_more.py

@@ -0,0 +1,23 @@
+# Generated by Django 4.2.22 on 2025-07-13 19:55
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('cookbook', '0222_alter_shoppinglistrecipe_created_by_and_more'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='userpreference',
+            name='ingredient_context',
+            field=models.BooleanField(default=False),
+        ),
+        migrations.AlterField(
+            model_name='userpreference',
+            name='use_fractions',
+            field=models.BooleanField(default=True),
+        ),
+    ]

cookbook/models.py

@@ -126,7 +126,7 @@ class TreeModel(MP_Node):
         return None
 
     @property
-    def full_name(self) -> str:
+    def full_name(self):
         """
         Returns a string representation of a tree node and it's ancestors,
         e.g. 'Cuisine > Asian > Chinese > Catonese'.
@@ -191,7 +191,7 @@ class TreeModel(MP_Node):
 
         return queryset.model.objects.filter(id__in=queryset.values_list('id')).exclude(descendants)
 
-    def include_ancestors(queryset=None):
+    def include_ancestors(queryset=None, filter=None):
         """
         :param queryset: Model Queryset to add ancestors
         :param filter: Filter (include) the ancestors nodes with the provided Q filter
@@ -487,6 +487,7 @@ class UserPreference(models.Model, PermissionModelMixin):
     shopping_recent_days = models.PositiveIntegerField(default=7)
     csv_delim = models.CharField(max_length=2, default=",")
     csv_prefix = models.CharField(max_length=10, blank=True, )
+    ingredient_context = models.BooleanField(default=False)
 
     created_at = models.DateTimeField(auto_now_add=True)
     objects = ScopedManager(space='space')
@@ -767,6 +768,22 @@ class Food(ExportModelOperationsMixin('food'), TreeModel, PermissionModelMixin):
                 obj.inherit_fields.set(fields)
         obj.save()
 
+    def get_substitutes(self, onhand=False, shopping_users=None):
+        # filters = ~Q(id=self.id)
+        filters = Q()
+        if self.substitute:
+            filters |= Q(id__in=self.substitute.values('id'))
+        if self.substitute_children:
+            filters |= Q(path__startswith=self.path, depth__gt=self.depth)
+        if self.substitute_siblings:
+            sibling_path = self.path[:Food.steplen * (self.depth - 1)]
+            filters |= Q(path__startswith=sibling_path, depth=self.depth)
+
+        qs = Food.objects.filter(filters).exclude(id=self.id)
+        if onhand:
+            qs = qs.filter(onhand_users__in=shopping_users)
+        return qs
+
     @staticmethod
     def reset_inheritance(space=None, food=None):
         # resets inherited fields to the space defaults and updates all inherited fields to root object values
@@ -912,19 +929,12 @@ class PropertyType(models.Model, PermissionModelMixin, MergeModelMixin):
     GOAL = 'GOAL'
     OTHER = 'OTHER'
 
-    CHOICES = (
-        (NUTRITION, _('Nutrition')),
-        (ALLERGEN, _('Allergen')),
-        (PRICE, _('Price')),
-        (GOAL, _('Goal')),
-        (OTHER, _('Other')),
-    )
-
     name = models.CharField(max_length=128)
     unit = models.CharField(max_length=64, blank=True, null=True)
     order = models.IntegerField(default=0)
     description = models.CharField(max_length=512, blank=True, null=True)
-    category = models.CharField(max_length=64, choices=CHOICES, null=True, blank=True)
+    category = models.CharField(max_length=64, choices=((NUTRITION, _('Nutrition')), (ALLERGEN, _('Allergen')),
+                                                        (PRICE, _('Price')), (GOAL, _('Goal')), (OTHER, _('Other'))), null=True, blank=True)
     open_data_slug = models.CharField(max_length=128, null=True, blank=True, default=None)
 
     fdc_id = models.IntegerField(null=True, default=None, blank=True)
@@ -1094,19 +1104,6 @@ class RecipeImport(models.Model, PermissionModelMixin):
     def __str__(self):
         return self.name
 
-    def convert_to_recipe(self, user):
-        recipe = Recipe(
-            name=self.name,
-            file_path=self.file_path,
-            storage=self.storage,
-            file_uid=self.file_uid,
-            created_by=user,
-            space=self.space
-        )
-        recipe.save()
-        self.delete()
-        return recipe
-
 
 class RecipeBook(ExportModelOperationsMixin('book'), models.Model, PermissionModelMixin):
     name = models.CharField(max_length=128)
@@ -1470,21 +1467,19 @@ class Automation(ExportModelOperationsMixin('automations'), models.Model, Permis
     UNIT_REPLACE = 'UNIT_REPLACE'
     NAME_REPLACE = 'NAME_REPLACE'
 
-    automation_types = (
-        (FOOD_ALIAS, _('Food Alias')),
-        (UNIT_ALIAS, _('Unit Alias')),
-        (KEYWORD_ALIAS, _('Keyword Alias')),
-        (DESCRIPTION_REPLACE, _('Description Replace')),
-        (INSTRUCTION_REPLACE, _('Instruction Replace')),
-        (NEVER_UNIT, _('Never Unit')),
-        (TRANSPOSE_WORDS, _('Transpose Words')),
-        (FOOD_REPLACE, _('Food Replace')),
-        (UNIT_REPLACE, _('Unit Replace')),
-        (NAME_REPLACE, _('Name Replace')),
-    )
-
     type = models.CharField(max_length=128,
-                            choices=automation_types)
+                            choices=(
+                                (FOOD_ALIAS, _('Food Alias')),
+                                (UNIT_ALIAS, _('Unit Alias')),
+                                (KEYWORD_ALIAS, _('Keyword Alias')),
+                                (DESCRIPTION_REPLACE, _('Description Replace')),
+                                (INSTRUCTION_REPLACE, _('Instruction Replace')),
+                                (NEVER_UNIT, _('Never Unit')),
+                                (TRANSPOSE_WORDS, _('Transpose Words')),
+                                (FOOD_REPLACE, _('Food Replace')),
+                                (UNIT_REPLACE, _('Unit Replace')),
+                                (NAME_REPLACE, _('Name Replace')),
+                            ))
     name = models.CharField(max_length=128, default='')
     description = models.TextField(blank=True, null=True)
 

cookbook/provider/dropbox.py

@@ -31,7 +31,7 @@ class Dropbox(Provider):
         except ValueError:
             log_entry = SyncLog(status='ERROR', msg=str(r), sync=monitor)
             log_entry.save()
-            return log_entry
+            return r
 
         import_count = 0
         # TODO check if has_more is set and import that as well
@@ -59,7 +59,7 @@ class Dropbox(Provider):
         monitor.last_checked = datetime.now()
         monitor.save()
 
-        return log_entry
+        return True
 
     @staticmethod
     def create_share_link(recipe):

cookbook/provider/local.py

@@ -42,7 +42,7 @@ class Local(Provider):
         monitor.last_checked = datetime.now()
         monitor.save()
 
-        return log_entry
+        return True
 
     @staticmethod
     def get_file(recipe):

cookbook/provider/nextcloud.py

@@ -66,7 +66,7 @@ class Nextcloud(Provider):
         monitor.last_checked = datetime.now()
         monitor.save()
 
-        return log_entry
+        return True
 
     @staticmethod
     def create_share_link(recipe):

cookbook/schemas.py

@@ -0,0 +1,69 @@
+from rest_framework.schemas.openapi import AutoSchema
+from rest_framework.schemas.utils import is_list_view
+
+
+class QueryParam(object):
+    def __init__(self, name, description=None, qtype='string', required=False):
+        self.name = name
+        self.description = description
+        self.qtype = qtype
+        self.required = required
+
+    def __str__(self):
+        return f'{self.name}, {self.qtype}, {self.description}'
+
+
+class QueryParamAutoSchema(AutoSchema):
+    def get_path_parameters(self, path, method):
+        if not is_list_view(path, method, self.view):
+            return super().get_path_parameters(path, method)
+        parameters = super().get_path_parameters(path, method)
+        for q in self.view.query_params:
+            parameters.append({
+                "name": q.name, "in": "query", "required": q.required,
+                "description": q.description,
+                'schema': {'type': q.qtype, },
+            })
+
+        return parameters
+
+
+class TreeSchema(AutoSchema):
+    def get_path_parameters(self, path, method):
+        if not is_list_view(path, method, self.view):
+            return super(TreeSchema, self).get_path_parameters(path, method)
+
+        api_name = path.split('/')[2]
+        parameters = super().get_path_parameters(path, method)
+        parameters.append({
+            "name": 'query', "in": "query", "required": False,
+            "description": 'Query string matched against {} name.'.format(api_name),
+            'schema': {'type': 'string', },
+        })
+        parameters.append({
+            "name": 'root', "in": "query", "required": False,
+            "description": 'Return first level children of {obj} with ID [int].  Integer 0 will return root {obj}s.'.format(
+                obj=api_name),
+            'schema': {'type': 'integer', },
+        })
+        parameters.append({
+            "name": 'tree', "in": "query", "required": False,
+            "description": 'Return all self and children of {} with ID [int].'.format(api_name),
+            'schema': {'type': 'integer', },
+        })
+        return parameters
+
+
+class FilterSchema(AutoSchema):
+    def get_path_parameters(self, path, method):
+        if not is_list_view(path, method, self.view):
+            return super(FilterSchema, self).get_path_parameters(path, method)
+
+        api_name = path.split('/')[2]
+        parameters = super().get_path_parameters(path, method)
+        parameters.append({
+            "name": 'query', "in": "query", "required": False,
+            "description": 'Query string matched against {} name.'.format(api_name),
+            'schema': {'type': 'string', },
+        })
+        return parameters

cookbook/signals.py

@@ -120,6 +120,37 @@ def update_food_inheritance(sender, instance=None, created=False, **kwargs):
         child.save()
 
 
+@receiver(post_save, sender=MealPlan)
+def auto_add_shopping(sender, instance=None, created=False, weak=False, **kwargs):
+    print("MEAL_AUTO_ADD Signal trying to auto add to shopping")
+    if not instance:
+        print("MEAL_AUTO_ADD Instance is none")
+        return
+
+    try:
+        space = instance.get_space()
+        user = instance.get_owner()
+        with scope(space=space):
+            slr_exists = instance.shoppinglistrecipe_set.exists()
+
+        if not created and slr_exists:
+            for x in instance.shoppinglistrecipe_set.all():
+                # assuming that permissions checks for the MealPlan have happened upstream
+                if instance.servings != x.servings:
+                    SLR = RecipeShoppingEditor(id=x.id, user=user, space=instance.space)
+                    SLR.edit_servings(servings=instance.servings)
+        elif not user.userpreference.mealplan_autoadd_shopping or not instance.recipe:
+            print("MEAL_AUTO_ADD No recipe or no setting")
+            return
+
+        if created:
+            SLR = RecipeShoppingEditor(user=user, space=space)
+            SLR.create(mealplan=instance, servings=instance.servings)
+            print("MEAL_AUTO_ADD Created SLR")
+    except AttributeError:
+        pass
+
+
 @receiver(post_save, sender=Unit)
 def clear_unit_cache(sender, instance=None, created=False, **kwargs):
     if instance:

cookbook/static/assets/logo_color_plan.svg

@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 26.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1"
-	 id="svg48" inkscape:export-xdpi="48" inkscape:export-ydpi="48" sodipodi:docname="logo_color_shopping.svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:serif="http://www.serif.com/" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:svg="http://www.w3.org/2000/svg"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 558.1 558.1"
-	 style="enable-background:new 0 0 558.1 558.1;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill-rule:evenodd;clip-rule:evenodd;fill:url(#ellipse2_00000062882008473870802360000001235346600214014370_);}
-	.st1{clip-path:url(#SVGID_00000040562990235419179500000014537515251997333940_);}
-	.st2{fill-rule:evenodd;clip-rule:evenodd;fill:#161616;}
-	.st3{fill-rule:evenodd;clip-rule:evenodd;fill:#FFCB76;}
-	.st4{fill-rule:evenodd;clip-rule:evenodd;fill:#FF6F00;}
-	.st5{clip-path:url(#SVGID_00000026884998257896383920000012290328997039565247_);}
-	.st6{fill-rule:evenodd;clip-rule:evenodd;fill:#FFD100;}
-	.st7{fill:#161616;}
-</style>
-<sodipodi:namedview  bordercolor="#666666" borderopacity="1" gridtolerance="10" guidetolerance="10" id="namedview50" inkscape:current-layer="svg48" inkscape:cx="256" inkscape:cy="256" inkscape:pageopacity="0" inkscape:pageshadow="2" inkscape:window-height="1377" inkscape:window-maximized="1" inkscape:window-width="2560" inkscape:window-x="2552" inkscape:window-y="-8" inkscape:zoom="2.0039062" objecttolerance="10" pagecolor="#ffffff" showgrid="false">
-	</sodipodi:namedview>
-<g id="Kreis" transform="matrix(0.92371046,0,0,0.95776263,3.7134303,-54.329713)">
-	
-		<linearGradient id="ellipse2_00000072976586691886204630000005673338158137684613_" gradientUnits="userSpaceOnUse" x1="-24.1585" y1="348.0664" x2="-23.1585" y2="348.0664" gradientTransform="matrix(2.147900e-06 0 0 -2.227081e-06 4347.1548 66.3621)">
-		<stop  offset="0" style="stop-color:#272727"/>
-		<stop  offset="1" style="stop-color:#6C6C6C"/>
-	</linearGradient>
-	
-		<ellipse id="ellipse2" style="fill-rule:evenodd;clip-rule:evenodd;fill:url(#ellipse2_00000072976586691886204630000005673338158137684613_);" cx="298.1" cy="348.1" rx="302.1" ry="291.3"/>
-	<g>
-		<defs>
-			<circle id="SVGID_1_" cx="298.1" cy="348.1" r="279"/>
-		</defs>
-		<clipPath id="SVGID_00000080899089203538361760000014164288875061347472_">
-			<use xlink:href="#SVGID_1_"  style="overflow:visible;"/>
-		</clipPath>
-		<g id="g18" style="clip-path:url(#SVGID_00000080899089203538361760000014164288875061347472_);">
-			<g id="Shadow" transform="matrix(1.10322,0,0,1.064,-5.58287,50.5786)">
-				<path id="path7" class="st2" d="M163.2,477.5l271.2,271.2L759.1,557L416.4,214.2L163.2,477.5z"/>
-				<g id="g11" transform="translate(-4.22105,0.775864)">
-					<path id="path9" class="st2" d="M223.4,188.6L545.8,511l121-106.1L326,64.1l-3.2,78.4L223.4,188.6z"/>
-				</g>
-				<g id="g15" transform="translate(-85.3876,27.8512)">
-					<path id="path13" class="st2" d="M328.5,154.7l322.4,322.4l3.1-71.6L313.3,64.7l-3.6,82.2L328.5,154.7z"/>
-				</g>
-			</g>
-		</g>
-	</g>
-</g>
-<g id="g23" transform="matrix(0.93750213,0,0,0.93750213,15.953517,15.99888)">
-	<path id="path21" class="st3" d="M280.6,238.7c35.1,0,65.8-14.8,85.3-30.1c19.7-15.6,48.3-12.5,64.2,6.9
-		c26.2,31.7,41.8,71.9,41.8,115.6c0,71.6-44.2,159.9-105.6,190.9c-26.4,13.3-53.8,19.6-85.6,19.6l0,0h-0.1h-0.1l0,0
-		c-31.8,0-59.2-6.3-85.6-19.6C133.5,491.1,89.3,402.7,89.3,331.2c0-43.7,15.7-83.9,41.8-115.6c15.9-19.4,44.5-22.5,64.2-6.9
-		C214.8,224,245.5,238.7,280.6,238.7L280.6,238.7z"/>
-</g>
-<g id="Flame-2" transform="matrix(0.61547875,0,0,0.56833279,-138.25728,-438.60298)" serif:id="Flame 2">
-	<path id="path25" class="st4" d="M636,823.4c-2.8-4-2.8-9.6-0.1-13.7c2.8-4.1,7.7-5.6,12.1-3.9c22.2,8.9,51.2,22.5,73.8,40.9
-		c46.9,38.3,59.7,63.9,70.2,90.3c12.4,31.2,14.2,63.5,11.6,86c-7.6,64.6-56,117.9-125,117.9c-69,0-123.9-52.8-125-117.9
-		c-0.7-39.2,12.1-70.5,26.1-92.8c3.5-5.6,10-7.8,15.8-5.6c5.8,2.3,9.5,8.6,8.8,15.3c-2,14.1-3.3,28.8-2.7,40.6
-		c2.2,39.8,25.9,50,50.2,49.8c25.9-0.2,52.1-22.2,42.7-78.4C686.3,902.9,656.8,853.5,636,823.4L636,823.4z"/>
-	<g>
-		<defs>
-			<path id="SVGID_00000067227953264718972400000007310393595166440114_" d="M636,823.4c-2.8-4-2.8-9.6-0.1-13.7
-				c2.8-4.1,7.7-5.6,12.1-3.9c22.2,8.9,51.2,22.5,73.8,40.9c46.9,38.3,59.7,63.9,70.2,90.3c12.4,31.2,14.2,63.5,11.6,86
-				c-7.6,64.6-56,117.9-125,117.9c-69,0-123.9-52.8-125-117.9c-0.7-39.2,12.1-70.5,26.1-92.8c3.5-5.6,10-7.8,15.8-5.6
-				c5.8,2.3,9.5,8.6,8.8,15.3c-2,14.1-3.3,28.8-2.7,40.6c2.2,39.8,25.9,50,50.2,49.8c25.9-0.2,52.1-22.2,42.7-78.4
-				C686.3,902.9,656.8,853.5,636,823.4L636,823.4z"/>
-		</defs>
-		<clipPath id="SVGID_00000178886517717031376290000002615817110574070691_">
-			<use xlink:href="#SVGID_00000067227953264718972400000007310393595166440114_"  style="overflow:visible;"/>
-		</clipPath>
-		<g id="g34" style="clip-path:url(#SVGID_00000178886517717031376290000002615817110574070691_);">
-			<g id="g32" transform="matrix(1.28784,-0.270602,0.285942,1.59598,247.349,825.209)">
-				<path id="path30" class="st6" d="M279.8,36.7c28.5,13.5,59.3,44.8,67.8,85.1c14.1,67-25.3,85.6-59.1,84
-					c-54.2-2.6-72.4-45.5-36.2-97.1C274.8,76.8,253.9,24.5,279.8,36.7z"/>
-			</g>
-		</g>
-	</g>
-</g>
-<path class="st7" d="M245.7,280.1c6.2,0,11.1,5,11.1,11.1v11.1h44.5v-11.1c0-6.2,5-11.1,11.1-11.1s11.1,5,11.1,11.1v11.1h16.7
-	c9.2,0,16.7,7.5,16.7,16.7v16.7H201.2V319c0-9.2,7.5-16.7,16.7-16.7h16.7v-11.1C234.5,285,239.5,280.1,245.7,280.1z M201.2,346.8
-	h155.8v94.6c0,9.2-7.5,16.7-16.7,16.7H217.8c-9.2,0-16.7-7.5-16.7-16.7V346.8z M223.4,374.6v11.1c0,3.1,2.5,5.6,5.6,5.6h11.1
-	c3.1,0,5.6-2.5,5.6-5.6v-11.1c0-3.1-2.5-5.6-5.6-5.6H229C225.9,369.1,223.4,371.6,223.4,374.6z M267.9,374.6v11.1
-	c0,3.1,2.5,5.6,5.6,5.6h11.1c3.1,0,5.6-2.5,5.6-5.6v-11.1c0-3.1-2.5-5.6-5.6-5.6h-11.1C270.4,369.1,267.9,371.6,267.9,374.6z
-	 M318,369.1c-3.1,0-5.6,2.5-5.6,5.6v11.1c0,3.1,2.5,5.6,5.6,5.6h11.1c3.1,0,5.6-2.5,5.6-5.6v-11.1c0-3.1-2.5-5.6-5.6-5.6H318z
-	 M223.4,419.1v11.1c0,3.1,2.5,5.6,5.6,5.6h11.1c3.1,0,5.6-2.5,5.6-5.6v-11.1c0-3.1-2.5-5.6-5.6-5.6H229
-	C225.9,413.6,223.4,416.1,223.4,419.1z M273.5,413.6c-3.1,0-5.6,2.5-5.6,5.6v11.1c0,3.1,2.5,5.6,5.6,5.6h11.1c3.1,0,5.6-2.5,5.6-5.6
-	v-11.1c0-3.1-2.5-5.6-5.6-5.6H273.5z M312.4,419.1v11.1c0,3.1,2.5,5.6,5.6,5.6h11.1c3.1,0,5.6-2.5,5.6-5.6v-11.1
-	c0-3.1-2.5-5.6-5.6-5.6H318C314.9,413.6,312.4,416.1,312.4,419.1z"/>
-</svg>

cookbook/static/assets/logo_color_shopping.svg

@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 26.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1"
-	 id="svg48" inkscape:export-xdpi="48" inkscape:export-ydpi="48" sodipodi:docname="logo_color_shopping.svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:serif="http://www.serif.com/" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:svg="http://www.w3.org/2000/svg"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 558.1 558.1"
-	 style="enable-background:new 0 0 558.1 558.1;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill-rule:evenodd;clip-rule:evenodd;fill:url(#ellipse2_00000123406314579419878720000015292012387505797789_);}
-	.st1{clip-path:url(#SVGID_00000069378195777491616980000011609770225407185072_);}
-	.st2{fill-rule:evenodd;clip-rule:evenodd;fill:#161616;}
-	.st3{fill-rule:evenodd;clip-rule:evenodd;fill:#FFCB76;}
-	.st4{fill-rule:evenodd;clip-rule:evenodd;fill:#FF6F00;}
-	.st5{clip-path:url(#SVGID_00000129168706913539839680000006972943119257724314_);}
-	.st6{fill-rule:evenodd;clip-rule:evenodd;fill:#FFD100;}
-</style>
-<sodipodi:namedview  bordercolor="#666666" borderopacity="1" gridtolerance="10" guidetolerance="10" id="namedview50" inkscape:current-layer="svg48" inkscape:cx="256" inkscape:cy="256" inkscape:pageopacity="0" inkscape:pageshadow="2" inkscape:window-height="1377" inkscape:window-maximized="1" inkscape:window-width="2560" inkscape:window-x="2552" inkscape:window-y="-8" inkscape:zoom="2.0039062" objecttolerance="10" pagecolor="#ffffff" showgrid="false">
-	</sodipodi:namedview>
-<g id="Kreis" transform="matrix(0.92371046,0,0,0.95776263,3.7134303,-54.329713)">
-	
-		<linearGradient id="ellipse2_00000092432231847401152480000013557045245219773118_" gradientUnits="userSpaceOnUse" x1="-24.1585" y1="348.0664" x2="-23.1585" y2="348.0664" gradientTransform="matrix(2.147900e-06 0 0 -2.227081e-06 4347.1548 66.3621)">
-		<stop  offset="0" style="stop-color:#272727"/>
-		<stop  offset="1" style="stop-color:#6C6C6C"/>
-	</linearGradient>
-	
-		<ellipse id="ellipse2" style="fill-rule:evenodd;clip-rule:evenodd;fill:url(#ellipse2_00000092432231847401152480000013557045245219773118_);" cx="298.1" cy="348.1" rx="302.1" ry="291.3"/>
-	<g>
-		<defs>
-			<circle id="SVGID_1_" cx="298.1" cy="348.1" r="279"/>
-		</defs>
-		<clipPath id="SVGID_00000078750348294658121660000005213362532985289101_">
-			<use xlink:href="#SVGID_1_"  style="overflow:visible;"/>
-		</clipPath>
-		<g id="g18" style="clip-path:url(#SVGID_00000078750348294658121660000005213362532985289101_);">
-			<g id="Shadow" transform="matrix(1.10322,0,0,1.064,-5.58287,50.5786)">
-				<path id="path7" class="st2" d="M163.2,477.5l271.2,271.2L759.1,557L416.4,214.2L163.2,477.5z"/>
-				<g id="g11" transform="translate(-4.22105,0.775864)">
-					<path id="path9" class="st2" d="M223.4,188.6L545.8,511l121-106.1L326,64.1l-3.2,78.4L223.4,188.6z"/>
-				</g>
-				<g id="g15" transform="translate(-85.3876,27.8512)">
-					<path id="path13" class="st2" d="M328.5,154.7l322.4,322.4l3.1-71.6L313.3,64.7l-3.6,82.2L328.5,154.7z"/>
-				</g>
-			</g>
-		</g>
-	</g>
-</g>
-<g id="g23" transform="matrix(0.93750213,0,0,0.93750213,15.953517,15.99888)">
-	<path id="path21" class="st3" d="M280.6,238.7c35.1,0,65.8-14.8,85.3-30.1c19.7-15.6,48.3-12.5,64.2,6.9
-		c26.2,31.7,41.8,71.9,41.8,115.6c0,71.6-44.2,159.9-105.6,190.9c-26.4,13.3-53.8,19.6-85.6,19.6l0,0h-0.1h-0.1l0,0
-		c-31.8,0-59.2-6.3-85.6-19.6C133.5,491.1,89.3,402.7,89.3,331.2c0-43.7,15.7-83.9,41.8-115.6c15.9-19.4,44.5-22.5,64.2-6.9
-		C214.8,224,245.5,238.7,280.6,238.7L280.6,238.7z"/>
-</g>
-<g id="Flame-2" transform="matrix(0.61547875,0,0,0.56833279,-138.25728,-438.60298)" serif:id="Flame 2">
-	<path id="path25" class="st4" d="M636,823.4c-2.8-4-2.8-9.6-0.1-13.7c2.8-4.1,7.7-5.6,12.1-3.9c22.2,8.9,51.2,22.5,73.8,40.9
-		c46.9,38.3,59.7,63.9,70.2,90.3c12.4,31.2,14.2,63.5,11.6,86c-7.6,64.6-56,117.9-125,117.9c-69,0-123.9-52.8-125-117.9
-		c-0.7-39.2,12.1-70.5,26.1-92.8c3.5-5.6,10-7.8,15.8-5.6c5.8,2.3,9.5,8.6,8.8,15.3c-2,14.1-3.3,28.8-2.7,40.6
-		c2.2,39.8,25.9,50,50.2,49.8c25.9-0.2,52.1-22.2,42.7-78.4C686.3,902.9,656.8,853.5,636,823.4L636,823.4z"/>
-	<g>
-		<defs>
-			<path id="SVGID_00000170974775404888027640000005842834300324528060_" d="M636,823.4c-2.8-4-2.8-9.6-0.1-13.7
-				c2.8-4.1,7.7-5.6,12.1-3.9c22.2,8.9,51.2,22.5,73.8,40.9c46.9,38.3,59.7,63.9,70.2,90.3c12.4,31.2,14.2,63.5,11.6,86
-				c-7.6,64.6-56,117.9-125,117.9c-69,0-123.9-52.8-125-117.9c-0.7-39.2,12.1-70.5,26.1-92.8c3.5-5.6,10-7.8,15.8-5.6
-				c5.8,2.3,9.5,8.6,8.8,15.3c-2,14.1-3.3,28.8-2.7,40.6c2.2,39.8,25.9,50,50.2,49.8c25.9-0.2,52.1-22.2,42.7-78.4
-				C686.3,902.9,656.8,853.5,636,823.4L636,823.4z"/>
-		</defs>
-		<clipPath id="SVGID_00000137101924108689735560000002063526552501109413_">
-			<use xlink:href="#SVGID_00000170974775404888027640000005842834300324528060_"  style="overflow:visible;"/>
-		</clipPath>
-		<g id="g34" style="clip-path:url(#SVGID_00000137101924108689735560000002063526552501109413_);">
-			<g id="g32" transform="matrix(1.28784,-0.270602,0.285942,1.59598,247.349,825.209)">
-				<path id="path30" class="st6" d="M279.8,36.7c28.5,13.5,59.3,44.8,67.8,85.1c14.1,67-25.3,85.6-59.1,84
-					c-54.2-2.6-72.4-45.5-36.2-97.1C274.8,76.8,253.9,24.5,279.8,36.7z"/>
-			</g>
-		</g>
-	</g>
-</g>
-<path id="path958" class="st2" d="M182.4,290.6c0-4.5,3.6-8.1,8.1-8.1h15.4c7.4,0,14,4.3,17.1,10.8h139.1c8.9,0,15.4,8.5,13.1,17.1
-	l-13.9,51.5c-2.9,10.6-12.5,18-23.5,18h-97.6l1.8,9.6c0.7,3.8,4.1,6.6,8,6.6h97.6c4.5,0,8.1,3.6,8.1,8.1s-3.6,8.1-8.1,8.1H250
-	c-11.7,0-21.8-8.3-23.9-19.8L208.6,301c-0.2-1.3-1.4-2.2-2.7-2.2h-15.4C186,298.8,182.4,295.1,182.4,290.6L182.4,290.6z
-	 M225.7,439.5c0-9,7.3-16.3,16.2-16.3c9,0,16.3,7.3,16.3,16.2c0,0,0,0,0,0c0,9-7.3,16.3-16.2,16.3
-	C233,455.8,225.7,448.5,225.7,439.5C225.7,439.6,225.7,439.5,225.7,439.5z M339.4,423.3c9,0,16.2,7.3,16.3,16.2
-	c0,9-7.3,16.2-16.2,16.3c0,0,0,0,0,0c-9,0-16.2-7.3-16.3-16.2C323.2,430.6,330.4,423.3,339.4,423.3
-	C339.4,423.3,339.4,423.3,339.4,423.3z"/>
-</svg>

cookbook/static/css/select2-bootstrap.css

@@ -0,0 +1,721 @@
+/*!
+ * Select2 Bootstrap Theme v0.1.0-beta.10 (https://select2.github.io/select2-bootstrap-theme)
+ * Copyright 2015-2017 Florian Kissling and contributors (https://github.com/select2/select2-bootstrap-theme/graphs/contributors)
+ * Licensed under MIT (https://github.com/select2/select2-bootstrap-theme/blob/master/LICENSE)
+ */
+
+.select2-container--bootstrap {
+  display: block;
+  /*------------------------------------*      #COMMON STYLES
+  \*------------------------------------*/
+  /**
+   * Search field in the Select2 dropdown.
+   */
+  /**
+   * No outline for all search fields - in the dropdown
+   * and inline in multi Select2s.
+   */
+  /**
+   * Adjust Select2's choices hover and selected styles to match
+   * Bootstrap 3's default dropdown styles.
+   *
+   * @see http://getbootstrap.com/components/#dropdowns
+   */
+  /**
+   * Clear the selection.
+   */
+  /**
+   * Address disabled Select2 styles.
+   *
+   * @see https://select2.github.io/examples.html#disabled
+   * @see http://getbootstrap.com/css/#forms-control-disabled
+   */
+  /*------------------------------------*      #DROPDOWN
+  \*------------------------------------*/
+  /**
+   * Dropdown border color and box-shadow.
+   */
+  /**
+   * Limit the dropdown height.
+   */
+  /*------------------------------------*      #SINGLE SELECT2
+  \*------------------------------------*/
+  /*------------------------------------*    #MULTIPLE SELECT2
+  \*------------------------------------*/
+  /**
+   * Address Bootstrap control sizing classes
+   *
+   * 1. Reset Bootstrap defaults.
+   * 2. Adjust the dropdown arrow button icon position.
+   *
+   * @see http://getbootstrap.com/css/#forms-control-sizes
+   */
+  /* 1 */
+  /*------------------------------------*    #RTL SUPPORT
+  \*------------------------------------*/
+}
+
+.select2-container--bootstrap .select2-selection {
+  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+  box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+  background-color: #fff;
+  border: 1px solid #ccc;
+  border-radius: 4px;
+  color: #555555;
+  font-size: 14px;
+  outline: 0;
+}
+
+.select2-container--bootstrap .select2-selection.form-control {
+  border-radius: 4px;
+}
+
+.select2-container--bootstrap .select2-search--dropdown .select2-search__field {
+  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+  box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+  background-color: #fff;
+  border: 1px solid #ccc;
+  border-radius: 4px;
+  color: #555555;
+  font-size: 14px;
+}
+
+.select2-container--bootstrap .select2-search__field {
+  outline: 0;
+  /* Firefox 18- */
+  /**
+     * Firefox 19+
+     *
+     * @see http://stackoverflow.com/questions/24236240/color-for-styled-placeholder-text-is-muted-in-firefox
+     */
+}
+
+.select2-container--bootstrap .select2-search__field::-webkit-input-placeholder {
+  color: #999;
+}
+
+.select2-container--bootstrap .select2-search__field:-moz-placeholder {
+  color: #999;
+}
+
+.select2-container--bootstrap .select2-search__field::-moz-placeholder {
+  color: #999;
+  opacity: 1;
+}
+
+.select2-container--bootstrap .select2-search__field:-ms-input-placeholder {
+  color: #999;
+}
+
+.select2-container--bootstrap .select2-results__option {
+  padding: 6px 12px;
+  /**
+     * Disabled results.
+     *
+     * @see https://select2.github.io/examples.html#disabled-results
+     */
+  /**
+     * Hover state.
+     */
+  /**
+     * Selected state.
+     */
+}
+
+.select2-container--bootstrap .select2-results__option[role=group] {
+  padding: 0;
+}
+
+.select2-container--bootstrap .select2-results__option[aria-disabled=true] {
+  color: #777777;
+  cursor: not-allowed;
+}
+
+.select2-container--bootstrap .select2-results__option[aria-selected=true] {
+  background-color: #f5f5f5;
+  color: #262626;
+}
+
+.select2-container--bootstrap .select2-results__option--highlighted[aria-selected] {
+  background-color: #337ab7;
+  color: #fff;
+}
+
+.select2-container--bootstrap .select2-results__option .select2-results__option {
+  padding: 6px 12px;
+}
+
+.select2-container--bootstrap .select2-results__option .select2-results__option .select2-results__group {
+  padding-left: 0;
+}
+
+.select2-container--bootstrap .select2-results__option .select2-results__option .select2-results__option {
+  margin-left: -12px;
+  padding-left: 24px;
+}
+
+.select2-container--bootstrap .select2-results__option .select2-results__option .select2-results__option .select2-results__option {
+  margin-left: -24px;
+  padding-left: 36px;
+}
+
+.select2-container--bootstrap .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option {
+  margin-left: -36px;
+  padding-left: 48px;
+}
+
+.select2-container--bootstrap .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option {
+  margin-left: -48px;
+  padding-left: 60px;
+}
+
+.select2-container--bootstrap .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option {
+  margin-left: -60px;
+  padding-left: 72px;
+}
+
+.select2-container--bootstrap .select2-results__group {
+  color: #777777;
+  display: block;
+  padding: 6px 12px;
+  font-size: 12px;
+  line-height: 1.42857143;
+  white-space: nowrap;
+}
+
+.select2-container--bootstrap.select2-container--focus .select2-selection, .select2-container--bootstrap.select2-container--open .select2-selection {
+  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(102, 175, 233, 0.6);
+  box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(102, 175, 233, 0.6);
+  -webkit-transition: border-color ease-in-out 0.15s, box-shadow ease-in-out 0.15s;
+  -o-transition: border-color ease-in-out 0.15s, box-shadow ease-in-out 0.15s;
+  -webkit-transition: border-color ease-in-out 0.15s, -webkit-box-shadow ease-in-out 0.15s;
+  transition: border-color ease-in-out 0.15s, -webkit-box-shadow ease-in-out 0.15s;
+  transition: border-color ease-in-out 0.15s, box-shadow ease-in-out 0.15s;
+  transition: border-color ease-in-out 0.15s, box-shadow ease-in-out 0.15s, -webkit-box-shadow ease-in-out 0.15s;
+  border-color: #66afe9;
+}
+
+.select2-container--bootstrap.select2-container--open {
+  /**
+     * Make the dropdown arrow point up while the dropdown is visible.
+     */
+  /**
+     * Handle border radii of the container when the dropdown is showing.
+     */
+}
+
+.select2-container--bootstrap.select2-container--open .select2-selection .select2-selection__arrow b {
+  border-color: transparent transparent #999 transparent;
+  border-width: 0 4px 4px 4px;
+}
+
+.select2-container--bootstrap.select2-container--open.select2-container--below .select2-selection {
+  border-bottom-right-radius: 0;
+  border-bottom-left-radius: 0;
+  border-bottom-color: transparent;
+}
+
+.select2-container--bootstrap.select2-container--open.select2-container--above .select2-selection {
+  border-top-right-radius: 0;
+  border-top-left-radius: 0;
+  border-top-color: transparent;
+}
+
+.select2-container--bootstrap .select2-selection__clear {
+  color: #999;
+  cursor: pointer;
+  float: right;
+  font-weight: bold;
+  margin-right: 10px;
+}
+
+.select2-container--bootstrap .select2-selection__clear:hover {
+  color: #333;
+}
+
+.select2-container--bootstrap.select2-container--disabled .select2-selection {
+  border-color: #ccc;
+  -webkit-box-shadow: none;
+  box-shadow: none;
+}
+
+.select2-container--bootstrap.select2-container--disabled .select2-selection,
+.select2-container--bootstrap.select2-container--disabled .select2-search__field {
+  cursor: not-allowed;
+}
+
+.select2-container--bootstrap.select2-container--disabled .select2-selection,
+.select2-container--bootstrap.select2-container--disabled .select2-selection--multiple .select2-selection__choice {
+  background-color: #eeeeee;
+}
+
+.select2-container--bootstrap.select2-container--disabled .select2-selection__clear,
+.select2-container--bootstrap.select2-container--disabled .select2-selection--multiple .select2-selection__choice__remove {
+  display: none;
+}
+
+.select2-container--bootstrap .select2-dropdown {
+  -webkit-box-shadow: 0 6px 12px rgba(0, 0, 0, 0.175);
+  box-shadow: 0 6px 12px rgba(0, 0, 0, 0.175);
+  border-color: #66afe9;
+  overflow-x: hidden;
+  margin-top: -1px;
+}
+
+.select2-container--bootstrap .select2-dropdown--above {
+  -webkit-box-shadow: 0px -6px 12px rgba(0, 0, 0, 0.175);
+  box-shadow: 0px -6px 12px rgba(0, 0, 0, 0.175);
+  margin-top: 1px;
+}
+
+.select2-container--bootstrap .select2-results > .select2-results__options {
+  max-height: 200px;
+  overflow-y: auto;
+}
+
+.select2-container--bootstrap .select2-selection--single {
+  height: 34px;
+  line-height: 1.42857143;
+  padding: 6px 24px 6px 12px;
+  /**
+     * Adjust the single Select2's dropdown arrow button appearance.
+     */
+}
+
+.select2-container--bootstrap .select2-selection--single .select2-selection__arrow {
+  position: absolute;
+  bottom: 0;
+  right: 12px;
+  top: 0;
+  width: 4px;
+}
+
+.select2-container--bootstrap .select2-selection--single .select2-selection__arrow b {
+  border-color: #999 transparent transparent transparent;
+  border-style: solid;
+  border-width: 4px 4px 0 4px;
+  height: 0;
+  left: 0;
+  margin-left: -4px;
+  margin-top: -2px;
+  position: absolute;
+  top: 50%;
+  width: 0;
+}
+
+.select2-container--bootstrap .select2-selection--single .select2-selection__rendered {
+  color: #555555;
+  padding: 0;
+}
+
+.select2-container--bootstrap .select2-selection--single .select2-selection__placeholder {
+  color: #999;
+}
+
+.select2-container--bootstrap .select2-selection--multiple {
+  min-height: 34px;
+  padding: 0;
+  height: auto;
+  /**
+     * Make Multi Select2's choices match Bootstrap 3's default button styles.
+     */
+  /**
+     * Minus 2px borders.
+     */
+  /**
+     * Clear the selection.
+     */
+}
+
+.select2-container--bootstrap .select2-selection--multiple .select2-selection__rendered {
+  -webkit-box-sizing: border-box;
+     -moz-box-sizing: border-box;
+          box-sizing: border-box;
+  display: block;
+  line-height: 1.42857143;
+  list-style: none;
+  margin: 0;
+  overflow: hidden;
+  padding: 0;
+  width: 100%;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+.select2-container--bootstrap .select2-selection--multiple .select2-selection__placeholder {
+  color: #999;
+  float: left;
+  margin-top: 5px;
+}
+
+.select2-container--bootstrap .select2-selection--multiple .select2-selection__choice {
+  color: #555555;
+  background: #fff;
+  border: 1px solid #ccc;
+  border-radius: 4px;
+  cursor: default;
+  float: left;
+  margin: 5px 0 0 6px;
+  padding: 0 6px;
+}
+
+.select2-container--bootstrap .select2-selection--multiple .select2-search--inline .select2-search__field {
+  background: transparent;
+  padding: 0 12px;
+  height: 32px;
+  line-height: 1.42857143;
+  margin-top: 0;
+  min-width: 5em;
+}
+
+.select2-container--bootstrap .select2-selection--multiple .select2-selection__choice__remove {
+  color: #999;
+  cursor: pointer;
+  display: inline-block;
+  font-weight: bold;
+  margin-right: 3px;
+}
+
+.select2-container--bootstrap .select2-selection--multiple .select2-selection__choice__remove:hover {
+  color: #333;
+}
+
+.select2-container--bootstrap .select2-selection--multiple .select2-selection__clear {
+  margin-top: 6px;
+}
+
+.select2-container--bootstrap .select2-selection--single.input-sm,
+.input-group-sm .select2-container--bootstrap .select2-selection--single,
+.form-group-sm .select2-container--bootstrap .select2-selection--single {
+  border-radius: 3px;
+  font-size: 12px;
+  height: 30px;
+  line-height: 1.5;
+  padding: 5px 22px 5px 10px;
+  /* 2 */
+}
+
+.select2-container--bootstrap .select2-selection--single.input-sm .select2-selection__arrow b,
+.input-group-sm .select2-container--bootstrap .select2-selection--single .select2-selection__arrow b,
+.form-group-sm .select2-container--bootstrap .select2-selection--single .select2-selection__arrow b {
+  margin-left: -5px;
+}
+
+.select2-container--bootstrap .select2-selection--multiple.input-sm,
+.input-group-sm .select2-container--bootstrap .select2-selection--multiple,
+.form-group-sm .select2-container--bootstrap .select2-selection--multiple {
+  min-height: 30px;
+  border-radius: 3px;
+}
+
+.select2-container--bootstrap .select2-selection--multiple.input-sm .select2-selection__choice,
+.input-group-sm .select2-container--bootstrap .select2-selection--multiple .select2-selection__choice,
+.form-group-sm .select2-container--bootstrap .select2-selection--multiple .select2-selection__choice {
+  font-size: 12px;
+  line-height: 1.5;
+  margin: 4px 0 0 5px;
+  padding: 0 5px;
+}
+
+.select2-container--bootstrap .select2-selection--multiple.input-sm .select2-search--inline .select2-search__field,
+.input-group-sm .select2-container--bootstrap .select2-selection--multiple .select2-search--inline .select2-search__field,
+.form-group-sm .select2-container--bootstrap .select2-selection--multiple .select2-search--inline .select2-search__field {
+  padding: 0 10px;
+  font-size: 12px;
+  height: 28px;
+  line-height: 1.5;
+}
+
+.select2-container--bootstrap .select2-selection--multiple.input-sm .select2-selection__clear,
+.input-group-sm .select2-container--bootstrap .select2-selection--multiple .select2-selection__clear,
+.form-group-sm .select2-container--bootstrap .select2-selection--multiple .select2-selection__clear {
+  margin-top: 5px;
+}
+
+.select2-container--bootstrap .select2-selection--single.input-lg,
+.input-group-lg .select2-container--bootstrap .select2-selection--single,
+.form-group-lg .select2-container--bootstrap .select2-selection--single {
+  border-radius: 6px;
+  font-size: 18px;
+  height: 46px;
+  line-height: 1.3333333;
+  padding: 10px 31px 10px 16px;
+  /* 1 */
+}
+
+.select2-container--bootstrap .select2-selection--single.input-lg .select2-selection__arrow,
+.input-group-lg .select2-container--bootstrap .select2-selection--single .select2-selection__arrow,
+.form-group-lg .select2-container--bootstrap .select2-selection--single .select2-selection__arrow {
+  width: 5px;
+}
+
+.select2-container--bootstrap .select2-selection--single.input-lg .select2-selection__arrow b,
+.input-group-lg .select2-container--bootstrap .select2-selection--single .select2-selection__arrow b,
+.form-group-lg .select2-container--bootstrap .select2-selection--single .select2-selection__arrow b {
+  border-width: 5px 5px 0 5px;
+  margin-left: -5px;
+  margin-left: -10px;
+  margin-top: -2.5px;
+}
+
+.select2-container--bootstrap .select2-selection--multiple.input-lg,
+.input-group-lg .select2-container--bootstrap .select2-selection--multiple,
+.form-group-lg .select2-container--bootstrap .select2-selection--multiple {
+  min-height: 46px;
+  border-radius: 6px;
+}
+
+.select2-container--bootstrap .select2-selection--multiple.input-lg .select2-selection__choice,
+.input-group-lg .select2-container--bootstrap .select2-selection--multiple .select2-selection__choice,
+.form-group-lg .select2-container--bootstrap .select2-selection--multiple .select2-selection__choice {
+  font-size: 18px;
+  line-height: 1.3333333;
+  border-radius: 4px;
+  margin: 9px 0 0 8px;
+  padding: 0 10px;
+}
+
+.select2-container--bootstrap .select2-selection--multiple.input-lg .select2-search--inline .select2-search__field,
+.input-group-lg .select2-container--bootstrap .select2-selection--multiple .select2-search--inline .select2-search__field,
+.form-group-lg .select2-container--bootstrap .select2-selection--multiple .select2-search--inline .select2-search__field {
+  padding: 0 16px;
+  font-size: 18px;
+  height: 44px;
+  line-height: 1.3333333;
+}
+
+.select2-container--bootstrap .select2-selection--multiple.input-lg .select2-selection__clear,
+.input-group-lg .select2-container--bootstrap .select2-selection--multiple .select2-selection__clear,
+.form-group-lg .select2-container--bootstrap .select2-selection--multiple .select2-selection__clear {
+  margin-top: 10px;
+}
+
+.select2-container--bootstrap .select2-selection.input-lg.select2-container--open .select2-selection--single {
+  /**
+     * Make the dropdown arrow point up while the dropdown is visible.
+     */
+}
+
+.select2-container--bootstrap .select2-selection.input-lg.select2-container--open .select2-selection--single .select2-selection__arrow b {
+  border-color: transparent transparent #999 transparent;
+  border-width: 0 5px 5px 5px;
+}
+
+.input-group-lg .select2-container--bootstrap .select2-selection.select2-container--open .select2-selection--single {
+  /**
+     * Make the dropdown arrow point up while the dropdown is visible.
+     */
+}
+
+.input-group-lg .select2-container--bootstrap .select2-selection.select2-container--open .select2-selection--single .select2-selection__arrow b {
+  border-color: transparent transparent #999 transparent;
+  border-width: 0 5px 5px 5px;
+}
+
+.select2-container--bootstrap[dir="rtl"] {
+  /**
+     * Single Select2
+     *
+     * 1. Makes sure that .select2-selection__placeholder is positioned
+     *    correctly.
+     */
+  /**
+     * Multiple Select2
+     */
+}
+
+.select2-container--bootstrap[dir="rtl"] .select2-selection--single {
+  padding-left: 24px;
+  padding-right: 12px;
+}
+
+.select2-container--bootstrap[dir="rtl"] .select2-selection--single .select2-selection__rendered {
+  padding-right: 0;
+  padding-left: 0;
+  text-align: right;
+  /* 1 */
+}
+
+.select2-container--bootstrap[dir="rtl"] .select2-selection--single .select2-selection__clear {
+  float: left;
+}
+
+.select2-container--bootstrap[dir="rtl"] .select2-selection--single .select2-selection__arrow {
+  left: 12px;
+  right: auto;
+}
+
+.select2-container--bootstrap[dir="rtl"] .select2-selection--single .select2-selection__arrow b {
+  margin-left: 0;
+}
+
+.select2-container--bootstrap[dir="rtl"] .select2-selection--multiple .select2-selection__choice,
+.select2-container--bootstrap[dir="rtl"] .select2-selection--multiple .select2-selection__placeholder,
+.select2-container--bootstrap[dir="rtl"] .select2-selection--multiple .select2-search--inline {
+  float: right;
+}
+
+.select2-container--bootstrap[dir="rtl"] .select2-selection--multiple .select2-selection__choice {
+  margin-left: 0;
+  margin-right: 6px;
+}
+
+.select2-container--bootstrap[dir="rtl"] .select2-selection--multiple .select2-selection__choice__remove {
+  margin-left: 2px;
+  margin-right: auto;
+}
+
+/*------------------------------------*  #ADDITIONAL GOODIES
+\*------------------------------------*/
+/**
+ * Address Bootstrap's validation states
+ *
+ * If a Select2 widget parent has one of Bootstrap's validation state modifier
+ * classes, adjust Select2's border colors and focus states accordingly.
+ * You may apply said classes to the Select2 dropdown (body > .select2-container)
+ * via JavaScript match Bootstraps' to make its styles match.
+ *
+ * @see http://getbootstrap.com/css/#forms-control-validation
+ */
+.has-warning .select2-dropdown,
+.has-warning .select2-selection {
+  border-color: #8a6d3b;
+}
+
+.has-warning .select2-container--focus .select2-selection,
+.has-warning .select2-container--open .select2-selection {
+  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #c0a16b;
+  box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #c0a16b;
+  border-color: #66512c;
+}
+
+.has-warning.select2-drop-active {
+  border-color: #66512c;
+}
+
+.has-warning.select2-drop-active.select2-drop.select2-drop-above {
+  border-top-color: #66512c;
+}
+
+.has-error .select2-dropdown,
+.has-error .select2-selection {
+  border-color: #a94442;
+}
+
+.has-error .select2-container--focus .select2-selection,
+.has-error .select2-container--open .select2-selection {
+  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #ce8483;
+  box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #ce8483;
+  border-color: #843534;
+}
+
+.has-error.select2-drop-active {
+  border-color: #843534;
+}
+
+.has-error.select2-drop-active.select2-drop.select2-drop-above {
+  border-top-color: #843534;
+}
+
+.has-success .select2-dropdown,
+.has-success .select2-selection {
+  border-color: #3c763d;
+}
+
+.has-success .select2-container--focus .select2-selection,
+.has-success .select2-container--open .select2-selection {
+  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #67b168;
+  box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #67b168;
+  border-color: #2b542c;
+}
+
+.has-success.select2-drop-active {
+  border-color: #2b542c;
+}
+
+.has-success.select2-drop-active.select2-drop.select2-drop-above {
+  border-top-color: #2b542c;
+}
+
+/**
+ * Select2 widgets in Bootstrap Input Groups
+ *
+ * @see http://getbootstrap.com/components/#input-groups
+ * @see https://github.com/twbs/bootstrap/blob/master/less/input-groups.less
+ */
+/**
+ * Reset rounded corners
+ */
+.input-group > .select2-hidden-accessible:first-child + .select2-container--bootstrap > .selection > .select2-selection,
+.input-group > .select2-hidden-accessible:first-child + .select2-container--bootstrap > .selection > .select2-selection.form-control {
+  border-bottom-right-radius: 0;
+  border-top-right-radius: 0;
+}
+
+.input-group > .select2-hidden-accessible:not(:first-child) + .select2-container--bootstrap:not(:last-child) > .selection > .select2-selection,
+.input-group > .select2-hidden-accessible:not(:first-child) + .select2-container--bootstrap:not(:last-child) > .selection > .select2-selection.form-control {
+  border-radius: 0;
+}
+
+.input-group > .select2-hidden-accessible:not(:first-child):not(:last-child) + .select2-container--bootstrap:last-child > .selection > .select2-selection,
+.input-group > .select2-hidden-accessible:not(:first-child):not(:last-child) + .select2-container--bootstrap:last-child > .selection > .select2-selection.form-control {
+  border-bottom-left-radius: 0;
+  border-top-left-radius: 0;
+}
+
+.input-group > .select2-container--bootstrap {
+  display: table;
+  table-layout: fixed;
+  position: relative;
+  z-index: 2;
+  width: 100%;
+  margin-bottom: 0;
+  /**
+   * Adjust z-index like Bootstrap does to show the focus-box-shadow
+   * above appended buttons in .input-group and .form-group.
+   */
+  /**
+   * Adjust alignment of Bootstrap buttons in Bootstrap Input Groups to address
+   * Multi Select2's height which - depending on how many elements have been selected -
+   * may grow taller than its initial size.
+   *
+   * @see http://getbootstrap.com/components/#input-groups
+   */
+}
+
+.input-group > .select2-container--bootstrap > .selection > .select2-selection.form-control {
+  float: none;
+}
+
+.input-group > .select2-container--bootstrap.select2-container--open, .input-group > .select2-container--bootstrap.select2-container--focus {
+  z-index: 3;
+}
+
+.input-group > .select2-container--bootstrap,
+.input-group > .select2-container--bootstrap .input-group-btn,
+.input-group > .select2-container--bootstrap .input-group-btn .btn {
+  vertical-align: top;
+}
+
+/**
+ * Temporary fix for https://github.com/select2/select2-bootstrap-theme/issues/9
+ *
+ * Provides `!important` for certain properties of the class applied to the
+ * original `<select>` element to hide it.
+ *
+ * @see https://github.com/select2/select2/pull/3301
+ * @see https://github.com/fk/select2/commit/31830c7b32cb3d8e1b12d5b434dee40a6e753ada
+ */
+.form-control.select2-hidden-accessible {
+  position: absolute !important;
+  width: 1px !important;
+}
+
+/**
+ * Display override for inline forms
+ */
+@media (min-width: 768px) {
+  .form-inline .select2-container--bootstrap {
+    display: inline-block;
+  }
+}

cookbook/static/custom/js/form_multiselect.js

@@ -0,0 +1,3 @@
+$(document).ready(function () {
+    $('.multiselectwidget').select2();
+});

cookbook/static/custom/js/form_select.js

@@ -0,0 +1,3 @@
+$(document).ready(function () {
+    $('.selectwidget').select2();
+});

cookbook/static/js/bookmarklet_v3.js

@@ -35,7 +35,7 @@
                 // process response
                 if (xhr.readyState == 4 && xhr.status == 201) {
                     // parse JSON data
-                    window.open(redirect.concat('?bookmarklet_import=', JSON.parse(xhr.response).id) )
+                    window.open(redirect.concat('?id=', JSON.parse(xhr.response).id) )
                 } else {
                     console.error('Error!');
                 }

cookbook/static/js/js.cookie.min.js

@@ -0,0 +1 @@
+!function(e){var n;if("function"==typeof define&&define.amd&&(define(e),n=!0),"object"==typeof exports&&(module.exports=e(),n=!0),!n){var t=window.Cookies,o=window.Cookies=e();o.noConflict=function(){return window.Cookies=t,o}}}(function(){function f(){for(var e=0,n={};e<arguments.length;e++){var t=arguments[e];for(var o in t)n[o]=t[o]}return n}function a(e){return e.replace(/(%[0-9A-Z]{2})+/g,decodeURIComponent)}return function e(u){function c(){}function t(e,n,t){if("undefined"!=typeof document){"number"==typeof(t=f({path:"/"},c.defaults,t)).expires&&(t.expires=new Date(1*new Date+864e5*t.expires)),t.expires=t.expires?t.expires.toUTCString():"";try{var o=JSON.stringify(n);/^[\{\[]/.test(o)&&(n=o)}catch(e){}n=u.write?u.write(n,e):encodeURIComponent(String(n)).replace(/%(23|24|26|2B|3A|3C|3E|3D|2F|3F|40|5B|5D|5E|60|7B|7D|7C)/g,decodeURIComponent),e=encodeURIComponent(String(e)).replace(/%(23|24|26|2B|5E|60|7C)/g,decodeURIComponent).replace(/[\(\)]/g,escape);var r="";for(var i in t)t[i]&&(r+="; "+i,!0!==t[i]&&(r+="="+t[i].split(";")[0]));return document.cookie=e+"="+n+r}}function n(e,n){if("undefined"!=typeof document){for(var t={},o=document.cookie?document.cookie.split("; "):[],r=0;r<o.length;r++){var i=o[r].split("="),c=i.slice(1).join("=");n||'"'!==c.charAt(0)||(c=c.slice(1,-1));try{var f=a(i[0]);if(c=(u.read||u)(c,f)||a(c),n)try{c=JSON.parse(c)}catch(e){}if(t[f]=c,e===f)break}catch(e){}}return e?t[e]:t}}return c.set=t,c.get=function(e){return n(e,!1)},c.getJSON=function(e){return n(e,!0)},c.remove=function(e,n){t(e,"",f(n,{expires:-1}))},c.defaults={},c.withConverter=e,c}(function(){})});

cookbook/static/js/js.cookie.min.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["js.cookie.js"],"names":["factory","registeredInModuleLoader","define","amd","exports","module","OldCookies","window","Cookies","api","noConflict","extend","i","result","arguments","length","attributes","key","decode","s","replace","decodeURIComponent","init","converter","set","value","document","path","defaults","expires","Date","toUTCString","JSON","stringify","test","e","write","encodeURIComponent","String","escape","stringifiedAttributes","attributeName","split","cookie","get","json","jar","cookies","parts","slice","join","charAt","name","read","parse","getJSON","remove","withConverter"],"mappings":"CAOE,SAAUA,GACX,IAAIC,EASJ,GARsB,mBAAXC,QAAyBA,OAAOC,MAC1CD,OAAOF,GACPC,GAA2B,GAEL,iBAAZG,UACVC,OAAOD,QAAUJ,IACjBC,GAA2B,IAEvBA,EAA0B,CAC9B,IAAIK,EAAaC,OAAOC,QACpBC,EAAMF,OAAOC,QAAUR,IAC3BS,EAAIC,WAAa,WAEhB,OADAH,OAAOC,QAAUF,EACVG,IAfT,CAkBC,WACD,SAASE,IAGR,IAFA,IAAIC,EAAI,EACJC,EAAS,GACND,EAAIE,UAAUC,OAAQH,IAAK,CACjC,IAAII,EAAaF,UAAWF,GAC5B,IAAK,IAAIK,KAAOD,EACfH,EAAOI,GAAOD,EAAWC,GAG3B,OAAOJ,EAGR,SAASK,EAAQC,GAChB,OAAOA,EAAEC,QAAQ,mBAAoBC,oBA0HtC,OAvHA,SAASC,EAAMC,GACd,SAASd,KAET,SAASe,EAAKP,EAAKQ,EAAOT,GACzB,GAAwB,oBAAbU,SAAX,CAQkC,iBAJlCV,EAAaL,EAAO,CACnBgB,KAAM,KACJlB,EAAImB,SAAUZ,IAEKa,UACrBb,EAAWa,QAAU,IAAIC,KAAkB,EAAb,IAAIA,KAAkC,MAArBd,EAAWa,UAI3Db,EAAWa,QAAUb,EAAWa,QAAUb,EAAWa,QAAQE,cAAgB,GAE7E,IACC,IAAIlB,EAASmB,KAAKC,UAAUR,GACxB,UAAUS,KAAKrB,KAClBY,EAAQZ,GAER,MAAOsB,IAETV,EAAQF,EAAUa,MACjBb,EAAUa,MAAMX,EAAOR,GACvBoB,mBAAmBC,OAAOb,IACxBL,QAAQ,4DAA6DC,oBAExEJ,EAAMoB,mBAAmBC,OAAOrB,IAC9BG,QAAQ,2BAA4BC,oBACpCD,QAAQ,UAAWmB,QAErB,IAAIC,EAAwB,GAC5B,IAAK,IAAIC,KAAiBzB,EACpBA,EAAWyB,KAGhBD,GAAyB,KAAOC,GACE,IAA9BzB,EAAWyB,KAWfD,GAAyB,IAAMxB,EAAWyB,GAAeC,MAAM,KAAK,KAGrE,OAAQhB,SAASiB,OAAS1B,EAAM,IAAMQ,EAAQe,GAG/C,SAASI,EAAK3B,EAAK4B,GAClB,GAAwB,oBAAbnB,SAAX,CAUA,IANA,IAAIoB,EAAM,GAGNC,EAAUrB,SAASiB,OAASjB,SAASiB,OAAOD,MAAM,MAAQ,GAC1D9B,EAAI,EAEDA,EAAImC,EAAQhC,OAAQH,IAAK,CAC/B,IAAIoC,EAAQD,EAAQnC,GAAG8B,MAAM,KACzBC,EAASK,EAAMC,MAAM,GAAGC,KAAK,KAE5BL,GAA6B,MAArBF,EAAOQ,OAAO,KAC1BR,EAASA,EAAOM,MAAM,GAAI,IAG3B,IACC,IAAIG,EAAOlC,EAAO8B,EAAM,IAIxB,GAHAL,GAAUpB,EAAU8B,MAAQ9B,GAAWoB,EAAQS,IAC9ClC,EAAOyB,GAEJE,EACH,IACCF,EAASX,KAAKsB,MAAMX,GACnB,MAAOR,IAKV,GAFAW,EAAIM,GAAQT,EAER1B,IAAQmC,EACX,MAEA,MAAOjB,KAGV,OAAOlB,EAAM6B,EAAI7B,GAAO6B,GAoBzB,OAjBArC,EAAIe,IAAMA,EACVf,EAAImC,IAAM,SAAU3B,GACnB,OAAO2B,EAAI3B,GAAK,IAEjBR,EAAI8C,QAAU,SAAUtC,GACvB,OAAO2B,EAAI3B,GAAK,IAEjBR,EAAI+C,OAAS,SAAUvC,EAAKD,GAC3BQ,EAAIP,EAAK,GAAIN,EAAOK,EAAY,CAC/Ba,SAAU,MAIZpB,EAAImB,SAAW,GAEfnB,EAAIgD,cAAgBnC,EAEbb,EAGDa,CAAK"}