Merge pull request #1143 from smilerz/fix_get_facet_api

fix bug in get_facet_api

.env.template

@@ -41,10 +41,17 @@ SHOPPING_MIN_AUTOSYNC_INTERVAL=5
 # Default for user setting sticky navbar
 # STICKY_NAV_PREF_DEFAULT=1
 
-# If staticfiles are stored at a different location uncomment and change accordingly
+# If base URL is something other than just /  (you are serving a subfolder in your proxy for instance http://recipe_app/recipes/)
+# SCRIPT_NAME=/recipes
+
+# If staticfiles are stored at a different location uncomment and change accordingly, MUST END IN /
+# this is not required if you are just using a subfolder
+# This can either be a relative path from the applications base path or the url of an external host
 # STATIC_URL=/static/
 
-# If mediafiles are stored at a different location uncomment and change accordingly
+# If mediafiles are stored at a different location uncomment and change accordingly, MUST END IN /
+# this is not required if you are just using a subfolder
+# This can either be a relative path from the applications base path or the url of an external host
 # MEDIA_URL=/media/
 
 # Serve mediafiles directly using gunicorn. Basically everyone recommends not doing this. Please use any of the examples
@@ -79,8 +86,6 @@ GUNICORN_MEDIA=0
 # when unset: 0 (false)
 REVERSE_PROXY_AUTH=0
 
-# If base URL is something other than just /  (you are serving a subfolder in your proxy for instance http://recipe_app/recipes/)
-# SCRIPT_NAME=/recipes
 # Default settings for spaces, apply per space and can be changed in the admin view
 # SPACE_DEFAULT_MAX_RECIPES=0 # 0=unlimited recipes
 # SPACE_DEFAULT_MAX_USERS=0 # 0=unlimited users per space
@@ -122,11 +127,17 @@ REVERSE_PROXY_AUTH=0
 # SESSION_COOKIE_DOMAIN=.example.com
 # SESSION_COOKIE_NAME=sessionid # use this only to not interfere with non unified django applications under the same top level domain
 
-
 # by default SORT_TREE_BY_NAME is disabled this will store all Keywords and Food in the order they are created
 # enabling this setting makes saving new keywords and foods very slow, which doesn't matter in most usecases.
 # however, when doing large imports of recipes that will create new objects, can increase total run time by 10-15x
 # Keywords and Food can be manually sorted by name in Admin
 # This value can also be temporarily changed in Admin, it will revert the next time the application is started
 # This will be fixed/changed in the future by changing the implementation or finding a better workaround for sorting
-# SORT_TREE_BY_NAME=0
+# SORT_TREE_BY_NAME=0
+# LDAP authentication
+# default 0 (false), when 1 (true) list of allowed users will be fetched from LDAP server
+#LDAP_AUTH=
+#AUTH_LDAP_SERVER_URI=
+#AUTH_LDAP_BIND_DN=
+#AUTH_LDAP_BIND_PASSWORD=
+#AUTH_LDAP_USER_SEARCH_BASE_DN=

.github/FUNDING.yml

@@ -0,0 +1,12 @@
+# 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/workflows/ci.yml

@@ -4,31 +4,32 @@ on: [push]
 
 jobs:
   build:
-    if: github.repository_owner == 'vabene1111'
+    if: github.repository_owner == 'TandoorRecipes'
     runs-on: ubuntu-latest
     strategy:
       max-parallel: 4
       matrix:
-        python-version: [3.9]
+        python-version: ['3.10']
 
     steps:
     - uses: actions/checkout@v1
-    - name: Set up Python 3.9
+    - name: Set up Python 3.10
       uses: actions/setup-python@v1
       with:
-        python-version: 3.9
+        python-version: '3.10'
     # Build Vue frontend
     - uses: actions/setup-node@v2
       with:
         node-version: '14'
-    - name: Install dependencies
+    - name: Install Vue dependencies
       working-directory: ./vue
       run: yarn install
-    - name: Build dependencies
+    - name: Build Vue dependencies
       working-directory: ./vue
       run: yarn build
-    - name: Install dependencies
+    - name: Install Django dependencies
       run: |
+        sudo apt-get install -y libsasl2-dev python-dev libldap2-dev libssl-dev
         python -m pip install --upgrade pip
         pip install -r requirements.txt
         python3 manage.py collectstatic --noinput

.github/workflows/codeql-analysis.yml

@@ -8,7 +8,7 @@ on:
 
 jobs:
   CodeQL-Build:
-    if: github.repository_owner == 'vabene1111'
+    if: github.repository_owner == 'TandoorRecipes'
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository

.github/workflows/docker-publish-beta.yml

@@ -5,7 +5,7 @@ on:
       - 'beta'
 jobs:
   build:
-    if: github.repository_owner == 'vabene1111'
+    if: github.repository_owner == 'TandoorRecipes'
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@master

.github/workflows/docker-publish-dev.yml

@@ -7,7 +7,7 @@ on:
       - '!master'
 jobs:
   build:
-    if: github.repository_owner == 'vabene1111'
+    if: github.repository_owner == 'TandoorRecipes'
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@master
@@ -24,6 +24,9 @@ jobs:
       - uses: actions/setup-node@v2
         with:
           node-version: '14'
+      - name: Clear Cache
+        working-directory: ./vue
+        run: yarn cache clean --all
       - name: Install dependencies
         working-directory: ./vue
         run: yarn install

.github/workflows/docker-publish-latest.yml

@@ -6,7 +6,7 @@ on:
 
 jobs:
   build:
-    if: github.repository_owner == 'vabene1111'
+    if: github.repository_owner == 'TandoorRecipes'
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@master

.github/workflows/docker-publish-release.yml

@@ -1,13 +1,12 @@
 name: publish tagged release docker
 
 on:
-  push:
-    tags:
-    - '*'
+  release:
+    types: [published]
 
 jobs:
   build:
-    if: github.repository_owner == 'vabene1111'
+    if: github.repository_owner == 'TandoorRecipes'
     runs-on: ubuntu-latest
     name: Build image job
     steps:
@@ -50,4 +49,4 @@ jobs:
           DISCORD_WEBHOOK: ${{ secrets.DISCORD_RELEASE_WEBHOOK }}
         uses: Ilshidur/action-discord@0.3.2
         with:
-          args: '🚀 A new Version of tandoor has been released 🥳 \n https://github.com/vabene1111/recipes/releases/tag/{{ steps.get_version.outputs.VERSION }}'
+          args: '🚀 Version {{ EVENT_PAYLOAD.release.tag_name }} of tandoor has been released 🥳 Check it out https://github.com/vabene1111/recipes/releases/tag/{{ EVENT_PAYLOAD.release.tag_name }}'

.github/workflows/docs.yml

@@ -7,12 +7,12 @@ on:
 
 jobs:
   deploy:
-    if: github.repository_owner == 'vabene1111'
+    if: github.repository_owner == 'TandoorRecipes'
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
       - uses: actions/setup-python@v2
         with:
           python-version: 3.x
-      - run: pip install mkdocs-material
+      - run: pip install mkdocs-material mkdocs-include-markdown-plugin
       - run: mkdocs gh-deploy --force

.gitignore

@@ -79,8 +79,8 @@ postgresql/
 /docker-compose.override.yml
 vue/node_modules
 .vscode/
-vue/yarn.lock
 vetur.config.js
 cookbook/static/vue
 vue/webpack-stats.json
 cookbook/templates/sw.js
+.prettierignore

Dockerfile

@@ -1,7 +1,7 @@
 FROM python:3.9-alpine3.12
 
 #Install all dependencies.
-RUN apk add --no-cache postgresql-libs gettext zlib libjpeg libxml2-dev libxslt-dev py-cryptography
+RUN apk add --no-cache postgresql-libs gettext zlib libjpeg libwebp libxml2-dev libxslt-dev py-cryptography
 
 #Print all logs without buffering it.
 ENV PYTHONUNBUFFERED 1
@@ -15,7 +15,7 @@ WORKDIR /opt/recipes
 
 COPY requirements.txt ./
 
-RUN apk add --no-cache --virtual .build-deps gcc musl-dev postgresql-dev zlib-dev jpeg-dev libressl-dev libffi-dev cargo && \
+RUN apk add --no-cache --virtual .build-deps gcc musl-dev postgresql-dev zlib-dev jpeg-dev libwebp-dev libressl-dev libffi-dev cargo openssl-dev openldap-dev && \
     python -m venv venv && \
     /opt/recipes/venv/bin/python -m pip install --upgrade pip && \
     venv/bin/pip install wheel==0.36.2 && \
@@ -25,4 +25,4 @@ RUN apk add --no-cache --virtual .build-deps gcc musl-dev postgresql-dev zlib-de
 #Copy project and execute it.
 COPY . ./
 RUN chmod +x boot.sh
-ENTRYPOINT ["/opt/recipes/boot.sh"]
+ENTRYPOINT ["/opt/recipes/boot.sh"]

README.md

@@ -1,6 +1,6 @@
 <h1 align="center">
   <br>
-  <a href="https://app.tandoor.dev"><img src="https://github.com/vabene1111/recipes/raw/develop/docs/logo_color.svg" height="256px" width="256px"></a>
+  <a href="https://tandoor.dev"><img src="https://github.com/vabene1111/recipes/raw/develop/docs/logo_color.svg" height="256px" width="256px"></a>
   <br>
   Tandoor Recipes
   <br>
@@ -15,49 +15,77 @@
 <a href="https://discord.gg/RhzBrfWgtp" target="_blank" rel="noopener noreferrer"><img src="https://badgen.net/badge/icon/discord?icon=discord&label" ></a>
 <a href="https://hub.docker.com/r/vabene1111/recipes" target="_blank" rel="noopener noreferrer"><img src="https://img.shields.io/docker/pulls/vabene1111/recipes" ></a>
 <a href="https://github.com/vabene1111/recipes/releases/latest" rel="noopener noreferrer"><img src="https://img.shields.io/github/v/release/vabene1111/recipes" ></a>
+<a href="https://app.tandoor.dev/accounts/login/?demo" rel="noopener noreferrer"><img src="https://img.shields.io/badge/demo-available-success" ></a>
 </p>
 
 <p align="center">
+<a href="https://tandoor.dev" target="_blank" rel="noopener noreferrer">Website</a> •
 <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">Documentation</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://discord.gg/RhzBrfWgtp" target="_blank" rel="noopener noreferrer">Discord server</a>
+<a href="https://discord.gg/RhzBrfWgtp" target="_blank" rel="noopener noreferrer">Discord</a>
 </p>
 
 ![Preview](docs/preview.png)
 
-# Your Feedback
+## Core Features
+- 🥗 **Manage your recipes** - Manage your ever growing recipe collection
+- 📆 **Plan** - multiple meals for each day
+- 🛒 **Shopping lists** - via the meal plan or straight from recipes
+- 📚 **Cookbooks** - collect recipes into books
+- 👪 **Share and collaborate** on recipes with friends and family
 
-Share some information on how you use Tandoor to help me improve the application [Google Survey](https://forms.gle/qNfLK2tWTeWHe9Qd7)
+## Made by and for power users
 
-## Features
-
-- 📦 **Sync** files with Dropbox and Nextcloud (more can easily be added)
-- 🔍 Powerful **search** with Djangos [TrigramSimilarity](https://docs.djangoproject.com/en/3.0/ref/contrib/postgres/search/#trigram-similarity)
+- 🔍 Powerful & customizable **search** with fulltext support and [TrigramSimilarity](https://docs.djangoproject.com/en/3.0/ref/contrib/postgres/search/#trigram-similarity)
 - 🏷️ Create and search for **tags**, assign them in batch to all files matching certain filters
-- 📄 **Create recipes** locally within a nice, standardized web interface
-- ⬇️ **Import recipes** from thousands of websites supporting [ld+json or microdata](https://schema.org/Recipe)
-- 📱 Optimized for use on **mobile** devices like phones and tablets
-- 🛒 Generate **shopping** lists from recipes
-- 📆 Create a **Plan** on what to eat when
-- 👪 **Share** recipes with friends and comment on them to suggest or remember changes you made
-- ➗ automatically convert decimal units to **fractions** for those who like this
-- 🐳 Easy setup with **Docker** and included examples for Kubernetes, Unraid and Synology
+- ↔️ Quickly merge and rename ingredients, tags and units 
+- 📥️ **Import recipes** from thousands of websites supporting [ld+json or microdata](https://schema.org/Recipe)
+- ➗ Support for **fractions** or decimals
+- 🐳 Easy setup with **Docker** and included examples for **Kubernetes**, **Unraid** and **Synology**
 - 🎨 Customize your interface with **themes**
-- ✉️ Export and import recipes from other users
+- 📦 **Sync** files with Dropbox and Nextcloud
+  
+## All the must haves
+
+- 📱Optimized for use on **mobile** devices
 - 🌍 localized in many languages thanks to the awesome community
-- ➕ Many more like recipe scaling, image compression, cookbooks, printing views, ...
+- 📥️ **Import your collection** from many other [recipe managers](https://docs.tandoor.dev/features/import_export/)
+- ➕ Many more like recipe scaling, image compression, printing views and supermarkets
 
 This application is meant for people with a collection of recipes they want to share with family and friends or simply
 store them in a nicely organized way. A basic permission system exists but this application is not meant to be run as 
 a public page.
+
+## Docs
+
 Documentation can be found [here](https://docs.tandoor.dev/).
 
-While this application has been around for a while and is actively used by many (including myself), it is still considered
-**beta** software that has a lot of rough edges and unpolished parts.
+## Contributing
+
+You can help out with the ongoing development by looking for potential bugs in our code base, or by contributing new features. We are always welcoming new pull requests containing bug fixes, refactors and new features. We have a list of tasks and bugs on our issue tracker on Github. Please comment on issues if you want to contribute with, to avoid duplicating effort.
+
+## Your Feedback
+
+Share some information on how you use Tandoor to help me improve the application [Google Survey](https://forms.gle/qNfLK2tWTeWHe9Qd7)
+
+## Get in touch
+
+<table>
+  <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>
+  </tr>
+
+  <tr>
+    <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>
+
 ## License
 
-Beginning with version 0.10.0 the code in this repository is licensed under the [GNU AGPL v3](https://www.gnu.org/licenses/agpl-3.0.de.html) license with an
+Beginning with version 0.10.0 the code in this repository is licensed under the [GNU AGPL v3](https://www.gnu.org/licenses/agpl-3.0.de.html) license with a
 [common clause](https://commonsclause.com/) selling exception. See [LICENSE.md](https://github.com/vabene1111/recipes/blob/develop/LICENSE.md) for details.
 
 > NOTE: There appears to be a whole range of legal issues with licensing anything else then the standard completely open licenses.
@@ -68,8 +96,8 @@ Beginning with version 0.10.0 the code in this repository is licensed under the
 **This software and *all* its features are and will always be free for everyone to use and enjoy.**
 
 The reason for the selling exception is that a significant amount of time was spend over multiple years to develop this software.
-A payed hosted version which will be identical in features and code base to the software offered in this repository will
+A paid hosted version which will be identical in features and code base to the software offered in this repository will
 likely be released in the future (including all features needed to sell a hosted version as they might also be useful for personal use).
-This will not only benefit me personally but also everyone who self-hosts this software as any profits made trough selling the hosted option
+This will not only benefit me personally but also everyone who self-hosts this software as any profits made through selling the hosted option
 allow me to spend more time developing and improving the software for everyone. Selling exceptions are [approved by Richard Stallman](http://www.gnu.org/philosophy/selling-exceptions.en.html) and the
 common clause license is very permissive (see the [FAQ](https://commonsclause.com/)).

cookbook/apps.py

@@ -1,26 +1,40 @@
+import traceback
+
 from django.apps import AppConfig
 from django.conf import settings
 from django.db import OperationalError, ProgrammingError
 from django_scopes import scopes_disabled
 
+from recipes.settings import DEBUG
+
 
 class CookbookConfig(AppConfig):
     name = 'cookbook'
 
     def ready(self):
         # post_save signal is only necessary if using full-text search on postgres
-        if settings.DATABASES['default']['ENGINE'] in ['django.db.backends.postgresql_psycopg2', 'django.db.backends.postgresql']:
+        if settings.DATABASES['default']['ENGINE'] in ['django.db.backends.postgresql_psycopg2',
+                                                       'django.db.backends.postgresql']:
             import cookbook.signals  # noqa
 
-        # when starting up run fix_tree to:
-        #   a) make sure that nodes are sorted when switching between sort modes
-        #   b) fix problems, if any, with tree consistency
-        with scopes_disabled():
-            try:
-                from cookbook.models import Keyword, Food
-                Keyword.fix_tree(fix_paths=True)
-                Food.fix_tree(fix_paths=True)
-            except OperationalError:
-                pass  # if model does not exist there is no need to fix it
-            except ProgrammingError:
-                pass  # if migration has not been run database cannot be fixed yet
+        if not settings.DISABLE_TREE_FIX_STARTUP:
+            # when starting up run fix_tree to:
+            #   a) make sure that nodes are sorted when switching between sort modes
+            #   b) fix problems, if any, with tree consistency
+            with scopes_disabled():
+                try:
+                    from cookbook.models import Keyword, Food
+                    Keyword.fix_tree(fix_paths=True)
+                    Food.fix_tree(fix_paths=True)
+                except OperationalError:
+                    if DEBUG:
+                        traceback.print_exc()
+                    pass  # if model does not exist there is no need to fix it
+                except ProgrammingError:
+                    if DEBUG:
+                        traceback.print_exc()
+                    pass  # if migration has not been run database cannot be fixed yet
+                except Exception:
+                    if DEBUG:
+                        traceback.print_exc()
+                    pass  # dont break startup just because fix could not run, need to investigate cases when this happens

cookbook/forms.py

@@ -36,15 +36,36 @@ class DateWidget(forms.DateInput):
 class UserPreferenceForm(forms.ModelForm):
     prefix = 'preference'
 
+    def __init__(self, *args, **kwargs):
+        space = kwargs.pop('space')
+        super().__init__(*args, **kwargs)
+        self.fields['plan_share'].queryset = User.objects.filter(userpreference__space=space).all()
+
     class Meta:
         model = UserPreference
         fields = (
-            'default_unit', 'use_fractions', 'theme', 'nav_color',
+            'default_unit', 'use_fractions', 'use_kj', 'theme', 'nav_color',
             'sticky_navbar', 'default_page', 'show_recent', 'search_style',
             'plan_share', 'ingredient_decimals', 'shopping_auto_sync',
             'comments'
         )
 
+        labels = {
+            'default_unit': _('Default unit'),
+            'use_fractions': _('Use fractions'),
+            'use_kj': _('Use KJ'),
+            'theme': _('Theme'),
+            'nav_color': _('Navbar color'),
+            'sticky_navbar': _('Sticky navbar'),
+            'default_page': _('Default page'),
+            'show_recent': _('Show recent recipes'),
+            'search_style': _('Search style'),
+            'plan_share': _('Plan sharing'),
+            'ingredient_decimals': _('Ingredient decimal places'),
+            'shopping_auto_sync': _('Shopping list auto sync period'),
+            'comments': _('Comments')
+        }
+
         help_texts = {
             'nav_color': _('Color of the top navigation bar. Not all colors work with all themes, just try them out!'),
             # noqa: E501
@@ -52,6 +73,7 @@ class UserPreferenceForm(forms.ModelForm):
             'use_fractions': _(
                 'Enables support for fractions in ingredient amounts (e.g. convert decimals to fractions automatically)'),
             # noqa: E501
+            'use_kj': _('Display nutritional energy amounts in joules instead of calories'),  # noqa: E501
             'plan_share': _(
                 'Users with whom newly created meal plan/shopping list entries should be shared by default.'),
             # noqa: E501
@@ -232,6 +254,12 @@ class SyncForm(forms.ModelForm):
             'storage': SafeModelChoiceField,
         }
 
+        labels = {
+            'storage': _('Storage'),
+            'path': _('Path'),
+            'active': _('Active')
+        }
+
 
 class BatchEditForm(forms.Form):
     search = forms.CharField(label=_('Search String'))
@@ -320,7 +348,8 @@ class InviteLinkForm(forms.ModelForm):
 
     def clean(self):
         space = self.cleaned_data['space']
-        if space.max_users != 0 and (UserPreference.objects.filter(space=space).count() + InviteLink.objects.filter(space=space).count()) >= space.max_users:
+        if space.max_users != 0 and (UserPreference.objects.filter(space=space).count() + InviteLink.objects.filter(
+                space=space).count()) >= space.max_users:
             raise ValidationError(_('Maximum number of users for this space reached.'))
 
     def clean_email(self):
@@ -335,7 +364,7 @@ class InviteLinkForm(forms.ModelForm):
         model = InviteLink
         fields = ('email', 'group', 'valid_until', 'space')
         help_texts = {
-            'email': _('An email address is not required but if present the invite link will be send to the user.'),
+            'email': _('An email address is not required but if present the invite link will be sent to the user.'),
         }
         field_classes = {
             'space': SafeModelChoiceField,
@@ -390,22 +419,31 @@ class UserCreateForm(forms.Form):
 
 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)
+    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')
+        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 desciption of choices.'),
+            'search': _(
+                'Select type method of search.  Click <a href="/docs/search/">here</a> for full desciption 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."),
+            '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 = {

cookbook/helper/image_processing.py

@@ -5,7 +5,7 @@ from PIL import Image
 from io import BytesIO
 
 
-def rescale_image_jpeg(image_object, base_width=720):
+def rescale_image_jpeg(image_object, base_width=1020):
     img = Image.open(image_object)
     icc_profile = img.info.get('icc_profile')  # remember color profile to not mess up colors
     width_percent = (base_width / float(img.size[0]))
@@ -13,20 +13,20 @@ def rescale_image_jpeg(image_object, base_width=720):
 
     img = img.resize((base_width, height), Image.ANTIALIAS)
     img_bytes = BytesIO()
-    img.save(img_bytes, 'JPEG', quality=75, optimize=True, icc_profile=icc_profile)
+    img.save(img_bytes, 'JPEG', quality=90, optimize=True, icc_profile=icc_profile)
 
     return img_bytes
 
 
-def rescale_image_png(image_object, base_width=720):
-    basewidth = 720
-    wpercent = (basewidth / float(image_object.size[0]))
+def rescale_image_png(image_object, base_width=1020):
+    image_object = Image.open(image_object)
+    wpercent = (base_width / float(image_object.size[0]))
     hsize = int((float(image_object.size[1]) * float(wpercent)))
-    img = image_object.resize((basewidth, hsize), Image.ANTIALIAS)
+    img = image_object.resize((base_width, hsize), Image.ANTIALIAS)
 
     im_io = BytesIO()
-    img.save(im_io, 'PNG', quality=70)
-    return img
+    img.save(im_io, 'PNG', quality=90)
+    return im_io
 
 
 def get_filetype(name):
@@ -36,9 +36,11 @@ def get_filetype(name):
         return '.jpeg'
 
 
+# TODO this whole file needs proper documentation, refactoring, and testing
+# TODO also add env variable to define which images sizes should be compressed
 def handle_image(request, image_object, filetype='.jpeg'):
-    if sys.getsizeof(image_object) / 8 > 500:
-        if filetype == '.jpeg':
+    if (image_object.size / 1000) > 500:  # if larger than 500 kb compress
+        if filetype == '.jpeg' or filetype == '.jpg':
             return rescale_image_jpeg(image_object), filetype
         if filetype == '.png':
             return rescale_image_png(image_object), filetype

cookbook/helper/recipe_search.py

@@ -1,17 +1,17 @@
 from collections import Counter
 from datetime import timedelta
 
-from recipes import settings
-from django.contrib.postgres.search import (
-    SearchQuery, SearchRank, TrigramSimilarity
-)
+from django.contrib.postgres.search import SearchQuery, SearchRank, TrigramSimilarity
 from django.core.cache import caches
 from django.db.models import Avg, Case, Count, Func, Max, Q, Subquery, Value, When
 from django.db.models.functions import Coalesce
 from django.utils import timezone, translation
 
+from cookbook.filters import RecipeFilter
+from cookbook.helper.permission_helper import has_group_permission
 from cookbook.managers import DICTIONARY
-from cookbook.models import Food, Keyword, ViewLog, SearchPreference
+from cookbook.models import Food, Keyword, Recipe, SearchPreference, ViewLog
+from recipes import settings
 
 
 class Round(Func):
@@ -38,6 +38,7 @@ def search_recipes(request, queryset, params):
     search_keywords = params.getlist('keywords', [])
     search_foods = params.getlist('foods', [])
     search_books = params.getlist('books', [])
+    search_steps = params.getlist('steps', [])
     search_units = params.get('units', None)
 
     # TODO I think default behavior should be 'AND' which is how most sites operate with facet/filters based on results
@@ -61,7 +62,7 @@ def search_recipes(request, queryset, params):
 
         # return queryset.annotate(last_view=Max('viewlog__pk')).annotate(new=Case(When(pk__in=last_viewed_recipes, then=('last_view')), default=Value(0))).filter(new__gt=0).order_by('-new')
         # queryset that only annotates most recent view (higher pk = lastest view)
-        queryset = queryset.annotate(recent=Coalesce(Max('viewlog__pk'), Value(0)))
+        queryset = queryset.annotate(recent=Coalesce(Max(Case(When(viewlog__created_by=request.user, then='viewlog__pk'))), Value(0)))
         orderby += ['-recent']
 
     # TODO create setting for default ordering - most cooked, rating,
@@ -142,9 +143,9 @@ def search_recipes(request, queryset, params):
 
             # TODO add order by user settings - only do search rank and annotation if rank order is configured
             search_rank = (
-                    SearchRank('name_search_vector', search_query, cover_density=True)
-                    + SearchRank('desc_search_vector', search_query, cover_density=True)
-                    + SearchRank('steps__search_vector', search_query, cover_density=True)
+                SearchRank('name_search_vector', search_query, cover_density=True)
+                + SearchRank('desc_search_vector', search_query, cover_density=True)
+                + SearchRank('steps__search_vector', search_query, cover_density=True)
             )
             queryset = queryset.filter(query_filter).annotate(rank=search_rank)
             orderby += ['-rank']
@@ -191,6 +192,10 @@ def search_recipes(request, queryset, params):
     if search_units:
         queryset = queryset.filter(steps__ingredients__unit__id=search_units)
 
+    # probably only useful in Unit list view, so keeping it simple
+    if search_steps:
+        queryset = queryset.filter(steps__id__in=search_steps)
+
     if search_internal:
         queryset = queryset.filter(internal=True)
 
@@ -395,3 +400,13 @@ def annotated_qs(qs, root=False, fill=False):
     if start_depth and start_depth > 0:
         info['close'] = list(range(0, prev_depth - start_depth + 1))
     return result
+
+
+def old_search(request):
+    if has_group_permission(request.user, ('guest',)):
+        params = dict(request.GET)
+        params['internal'] = None
+        f = RecipeFilter(params,
+                         queryset=Recipe.objects.filter(space=request.user.userpreference.space).all().order_by('name'),
+                         space=request.space)
+        return f.qs

cookbook/helper/recipe_url_import.py

@@ -246,7 +246,10 @@ def parse_instructions(instructions):
                     instruction_text += str(i)
         instructions = instruction_text
 
-    return normalize_string(instructions)
+    normalized_string = normalize_string(instructions)
+    normalized_string = normalized_string.replace('\n', '  \n')
+    normalized_string = normalized_string.replace('  \n  \n', '\n\n')
+    return normalized_string
 
 
 def parse_image(image):

cookbook/helper/scope_middleware.py

@@ -1,5 +1,8 @@
 from django.urls import reverse
 from django_scopes import scope, scopes_disabled
+from rest_framework.authentication import TokenAuthentication
+from rest_framework.authtoken.models import Token
+from rest_framework.exceptions import AuthenticationFailed
 
 from cookbook.views import views
 
@@ -33,6 +36,15 @@ class ScopeMiddleware:
             with scope(space=request.space):
                 return self.get_response(request)
         else:
+            if request.path.startswith('/api/'):
+                try:
+                    if auth := TokenAuthentication().authenticate(request):
+                        request.space = auth[0].userpreference.space
+                        with scope(space=request.space):
+                            return self.get_response(request)
+                except AuthenticationFailed:
+                    pass
+
             with scopes_disabled():
                 request.space = None
                 return self.get_response(request)

cookbook/helper/template_helper.py

@@ -5,7 +5,7 @@ from cookbook.helper.mdx_attributes import MarkdownFormatExtension
 from cookbook.helper.mdx_urlize import UrlizeExtension
 from jinja2 import Template, TemplateSyntaxError, UndefinedError
 from gettext import gettext as _
-
+from markdown.extensions.tables import TableExtension
 
 class IngredientObject(object):
     amount = ""
@@ -41,7 +41,7 @@ def render_instructions(step):  # TODO deduplicate markdown cleanup code
     parsed_md = md.markdown(
         instructions,
         extensions=[
-            'markdown.extensions.fenced_code', 'tables',
+            'markdown.extensions.fenced_code', TableExtension(),
             UrlizeExtension(), MarkdownFormatExtension()
         ]
     )

cookbook/integration/cookbookapp.py

@@ -4,9 +4,12 @@ import json
 import re
 from io import BytesIO
 
+import requests
 import yaml
 
 from cookbook.helper.ingredient_parser import IngredientParser
+from cookbook.helper.recipe_html_import import get_recipe_from_source
+from cookbook.helper.recipe_url_import import iso_duration_to_minutes
 from cookbook.integration.integration import Integration
 from cookbook.models import Recipe, Step, Ingredient, Keyword
 from gettext import gettext as _
@@ -15,53 +18,51 @@ from gettext import gettext as _
 class CookBookApp(Integration):
 
     def import_file_name_filter(self, zip_info_object):
-        return zip_info_object.filename.endswith('.yml')
+        return zip_info_object.filename.endswith('.html')
 
     def get_recipe_from_file(self, file):
-        recipe_yml = yaml.safe_load(file.getvalue().decode("utf-8"))
+        recipe_html = file.getvalue().decode("utf-8")
+
+        recipe_json, recipe_tree, html_data, images = get_recipe_from_source(recipe_html, 'CookBookApp', self.request)
 
         recipe = Recipe.objects.create(
-            name=recipe_yml['name'].strip(),
+            name=recipe_json['name'].strip(),
             created_by=self.request.user, internal=True,
             space=self.request.space)
 
         try:
-            recipe.servings = re.findall('([0-9])+', recipe_yml['recipeYield'])[0]
+            recipe.servings = re.findall('([0-9])+', recipe_json['recipeYield'])[0]
         except Exception as e:
             pass
 
         try:
-            recipe.working_time = recipe_yml['prep_time'].replace(' minutes', '')
-            recipe.waiting_time = recipe_yml['cook_time'].replace(' minutes', '')
+            recipe.working_time = iso_duration_to_minutes(recipe_json['prepTime'])
+            recipe.waiting_time = iso_duration_to_minutes(recipe_json['cookTime'])
         except Exception:
             pass
 
-        if recipe_yml['on_favorites']:
-            recipe.keywords.add(Keyword.objects.get_or_create(name=_('Favorites'), space=self.request.space))
+        step = Step.objects.create(instruction=recipe_json['recipeInstructions'], space=self.request.space, )
 
-        step = Step.objects.create(instruction=recipe_yml['directions'], space=self.request.space, )
-
-        if 'notes' in recipe_yml and recipe_yml['notes'].strip() != '':
-            step.instruction = step.instruction + '\n\n' + recipe_yml['notes']
-
-        if 'nutritional_info' in recipe_yml:
-            step.instruction = step.instruction + '\n\n' + recipe_yml['nutritional_info']
-
-        if 'source' in recipe_yml and recipe_yml['source'].strip() != '':
-            step.instruction = step.instruction + '\n\n' + recipe_yml['source']
+        if 'nutrition' in recipe_json:
+            step.instruction = step.instruction + '\n\n' + recipe_json['nutrition']
 
         step.save()
         recipe.steps.add(step)
 
         ingredient_parser = IngredientParser(self.request, True)
-        for ingredient in recipe_yml['ingredients'].split('\n'):
-            if ingredient.strip() != '':
-                amount, unit, ingredient, note = ingredient_parser.parse(ingredient)
-                f = ingredient_parser.get_food(ingredient)
-                u = ingredient_parser.get_unit(unit)
+        for ingredient in recipe_json['recipeIngredient']:
+                f = ingredient_parser.get_food(ingredient['ingredient']['text'])
+                u = ingredient_parser.get_unit(ingredient['unit']['text'])
                 step.ingredients.add(Ingredient.objects.create(
-                    food=f, unit=u, amount=amount, note=note, space=self.request.space,
+                    food=f, unit=u, amount=ingredient['amount'], note=ingredient['note'], space=self.request.space,
                 ))
 
+        if len(images) > 0:
+            try:
+                response = requests.get(images[0])
+                self.import_recipe_image(recipe, BytesIO(response.content))
+            except Exception as e:
+                print('failed to import image ', str(e))
+
         recipe.save()
         return recipe

cookbook/integration/integration.py

@@ -14,7 +14,7 @@ from django.utils.translation import gettext as _
 from django_scopes import scope
 
 from cookbook.forms import ImportExportBase
-from cookbook.helper.image_processing import get_filetype
+from cookbook.helper.image_processing import get_filetype, handle_image
 from cookbook.models import Keyword, Recipe
 from recipes.settings import DATABASES, DEBUG
 
@@ -52,7 +52,7 @@ class Integration:
                 icon=icon,
                 space=request.space
             )
-        except IntegrityError: # in case, for whatever reason, the name does exist append UUID to it. Not nice but works for now.
+        except IntegrityError:  # in case, for whatever reason, the name does exist append UUID to it. Not nice but works for now.
             self.keyword = parent.add_child(
                 name=f'{name} {str(uuid.uuid4())[0:8]}',
                 description=description,
@@ -123,8 +123,6 @@ class Integration:
         :return: HttpResponseRedirect to the recipe search showing all imported recipes
         """
         with scope(space=self.request.space):
-            self.keyword.name = _('Import') + ' ' + str(il.pk)
-            self.keyword.save()
 
             try:
                 self.files = files
@@ -231,15 +229,14 @@ class Integration:
             self.ignored_recipes.append(recipe.name)
             recipe.delete()
 
-    @staticmethod
-    def import_recipe_image(recipe, image_file, filetype='.jpeg'):
+    def import_recipe_image(self, recipe, image_file, filetype='.jpeg'):
         """
         Adds an image to a recipe naming it correctly
         :param recipe: Recipe object
         :param image_file: ByteIO stream containing the image
         :param filetype: type of file to write bytes to, default to .jpeg if unknown
         """
-        recipe.image = File(image_file, name=f'{uuid.uuid4()}_{recipe.pk}{filetype}')
+        recipe.image = File(handle_image(self.request, File(image_file, name='image'), filetype=filetype)[0], name=f'{uuid.uuid4()}_{recipe.pk}{filetype}')
         recipe.save()
 
     def get_recipe_from_file(self, file):
@@ -269,7 +266,8 @@ class Integration:
         """
         raise NotImplementedError('Method not implemented in integration')
 
-    def handle_exception(self, exception, log=None, message=''):
+    @staticmethod
+    def handle_exception(exception, log=None, message=''):
         if log:
             if message:
                 log.msg += message

cookbook/integration/mealmaster.py

@@ -63,7 +63,7 @@ class MealMaster(Integration):
         current_recipe = ''
 
         for fl in file.readlines():
-            line = fl.decode("ANSI")
+            line = fl.decode("windows-1250")
             if (line.startswith('MMMMM') or line.startswith('-----')) and 'meal-master' in line.lower():
                 if current_recipe != '':
                     recipe_list.append(current_recipe)

cookbook/integration/nextcloud_cookbook.py

@@ -5,8 +5,9 @@ from zipfile import ZipFile
 
 from cookbook.helper.image_processing import get_filetype
 from cookbook.helper.ingredient_parser import IngredientParser
+from cookbook.helper.recipe_url_import import iso_duration_to_minutes
 from cookbook.integration.integration import Integration
-from cookbook.models import Recipe, Step, Ingredient
+from cookbook.models import Recipe, Step, Ingredient, Keyword
 
 
 class NextcloudCookbook(Integration):
@@ -24,9 +25,24 @@ class NextcloudCookbook(Integration):
             created_by=self.request.user, internal=True,
             servings=recipe_json['recipeYield'], space=self.request.space)
 
-        # TODO parse times (given in PT2H3M )
-        # @vabene check recipe_url_import.iso_duration_to_minutes  I think it does what you are looking for
-        # TODO parse keywords
+        try:
+            recipe.working_time = iso_duration_to_minutes(recipe_json['prepTime'])
+            recipe.waiting_time = iso_duration_to_minutes(recipe_json['cookTime'])
+        except Exception:
+            pass
+
+        if 'recipeCategory' in recipe_json:
+            try:
+                recipe.keywords.add(Keyword.objects.get_or_create(space=self.request.space, name=recipe_json['recipeCategory'])[0])
+            except Exception:
+                pass
+
+        if 'keywords' in recipe_json:
+            try:
+                for x in recipe_json['keywords'].split(','):
+                    recipe.keywords.add(Keyword.objects.get_or_create(space=self.request.space, name=x)[0])
+            except Exception:
+                pass
 
         ingredients_added = False
         for s in recipe_json['recipeInstructions']:
@@ -41,19 +57,28 @@ class NextcloudCookbook(Integration):
 
                 ingredient_parser = IngredientParser(self.request, True)
                 for ingredient in recipe_json['recipeIngredient']:
-                    amount, unit, ingredient, note = parse(ingredient)
-                    f = get_food(ingredient, self.request.space)
-                    u = get_unit(unit, self.request.space)
+                    amount, unit, ingredient, note = ingredient_parser.parse(ingredient)
+                    f = ingredient_parser.get_food(ingredient)
+                    u = ingredient_parser.get_unit(unit)
                     step.ingredients.add(Ingredient.objects.create(
                         food=f, unit=u, amount=amount, note=note, space=self.request.space,
                     ))
             recipe.steps.add(step)
 
+        if 'nutrition' in recipe_json:
+            try:
+                recipe.nutrition.calories = recipe_json['nutrition']['calories'].replace(' kcal', '').replace(' ', '')
+                recipe.nutrition.proteins = recipe_json['nutrition']['calories'].replace(' g', '').replace(',', '.').replace(' ', '')
+                recipe.nutrition.fats = recipe_json['nutrition']['calories'].replace(' g', '').replace(',', '.').replace(' ', '')
+                recipe.nutrition.carbohydrates = recipe_json['nutrition']['calories'].replace(' g', '').replace(',', '.').replace(' ', '')
+            except Exception:
+                pass
+
         for f in self.files:
             if '.zip' in f['name']:
                 import_zip = ZipFile(f['file'])
                 for z in import_zip.filelist:
-                    if re.match(f'^Recipes/{recipe.name}/full.jpg$', z.filename):
+                    if re.match(f'^(.)+{recipe.name}/full.jpg$', z.filename):
                         self.import_recipe_image(recipe, BytesIO(import_zip.read(z.filename)), filetype=get_filetype(z.filename))
 
         return recipe

cookbook/integration/plantoeat.py

@@ -78,7 +78,7 @@ class Plantoeat(Integration):
         current_recipe = ''
 
         for fl in file.readlines():
-            line = fl.decode("ANSI")
+            line = fl.decode("windows-1250")
             if line.startswith('--------------'):
                 if current_recipe != '':
                     recipe_list.append(current_recipe)

cookbook/integration/rezkonv.py

@@ -62,7 +62,7 @@ class RezKonv(Integration):
         current_recipe = ''
 
         for fl in file.readlines():
-            line = fl.decode("ANSI")
+            line = fl.decode("windows-1250")
             if line.startswith('=====') and 'rezkonv' in line.lower():
                 if current_recipe != '':
                     recipe_list.append(current_recipe)

cookbook/locale/pl/LC_MESSAGES/django.po

@@ -11,8 +11,8 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-02-09 18:01+0100\n"
-"PO-Revision-Date: 2021-10-02 12:25+0000\n"
-"Last-Translator: Tomasz Klimczak <klemensble@gmail.com>\n"
+"PO-Revision-Date: 2021-11-06 14:06+0000\n"
+"Last-Translator: retmas gh <tandoor@oppai.ovh>\n"
 "Language-Team: Polish <http://translate.tandoor.dev/projects/tandoor/"
 "recipes-backend/pl/>\n"
 "Language: pl\n"
@@ -325,7 +325,7 @@ msgstr "Szukaj"
 #: .\cookbook\templates\meal_plan.html:5 .\cookbook\views\delete.py:165
 #: .\cookbook\views\edit.py:216 .\cookbook\views\new.py:189
 msgid "Meal-Plan"
-msgstr "Plan posiłku"
+msgstr "Plan posiłków"
 
 #: .\cookbook\models.py:79 .\cookbook\templates\base.html:78
 msgid "Books"
@@ -385,7 +385,7 @@ msgstr "Zabierz mnie na stronę główną"
 
 #: .\cookbook\templates\404.html:35
 msgid "Report a Bug"
-msgstr "Raprtuj błąd"
+msgstr "Raportuj błąd"
 
 #: .\cookbook\templates\account\login.html:7
 #: .\cookbook\templates\base.html:166

cookbook/migrations/0158_userpreference_use_kj.py

@@ -0,0 +1,18 @@
+# Generated by Django 3.2.7 on 2021-10-25 05:21
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('cookbook', '0157_alter_searchpreference_trigram'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='userpreference',
+            name='use_kj',
+            field=models.BooleanField(default=False),
+        ),
+    ]

cookbook/models.py

@@ -2,24 +2,30 @@ import operator
 import pathlib
 import re
 import uuid
+from collections import OrderedDict
 from datetime import date, timedelta
+from decimal import Decimal
 
 from annoying.fields import AutoOneToOneField
 from django.contrib import auth
 from django.contrib.auth.models import Group, User
 from django.contrib.postgres.indexes import GinIndex
 from django.contrib.postgres.search import SearchVectorField
-from django.core.files.uploadedfile import UploadedFile, InMemoryUploadedFile
+from django.core.files.uploadedfile import InMemoryUploadedFile, UploadedFile
 from django.core.validators import MinLengthValidator
-from django.db import models, IntegrityError
-from django.db.models import Index, ProtectedError
+from django.db import IntegrityError, models
+from django.db.models import Index, ProtectedError, Q, Subquery
+from django.db.models.fields.related import ManyToManyField
+from django.db.models.functions import Substr
+from django.db.transaction import atomic
 from django.utils import timezone
 from django.utils.translation import gettext as _
-from treebeard.mp_tree import MP_Node, MP_NodeManager
-from django_scopes import ScopedManager, scopes_disabled
 from django_prometheus.models import ExportModelOperationsMixin
-from recipes.settings import (COMMENT_PREF_DEFAULT, FRACTION_PREF_DEFAULT,
-                              STICKY_NAV_PREF_DEFAULT, SORT_TREE_BY_NAME)
+from django_scopes import ScopedManager, scopes_disabled
+from treebeard.mp_tree import MP_Node, MP_NodeManager
+
+from recipes.settings import (COMMENT_PREF_DEFAULT, FRACTION_PREF_DEFAULT, KJ_PREF_DEFAULT,
+                              SORT_TREE_BY_NAME, STICKY_NAV_PREF_DEFAULT)
 
 
 def get_user_name(self):
@@ -37,15 +43,26 @@ def get_model_name(model):
 
 
 class TreeManager(MP_NodeManager):
+    def create(self, *args, **kwargs):
+        return self.get_or_create(*args, **kwargs)[0]
+
     # model.Manager get_or_create() is not compatible with MP_Tree
-    def get_or_create(self, **kwargs):
+    def get_or_create(self, *args, **kwargs):
         kwargs['name'] = kwargs['name'].strip()
         try:
             return self.get(name__exact=kwargs['name'], space=kwargs['space']), False
         except self.model.DoesNotExist:
             with scopes_disabled():
                 try:
-                    return self.model.add_root(**kwargs), True
+                    # ManyToMany fields can't be set this way, so pop them out to save for later
+                    fields = [field.name for field in self.model._meta.get_fields() if issubclass(type(field), ManyToManyField)]
+                    many_to_many = {field: kwargs.pop(field) for field in list(kwargs) if field in fields}
+                    obj = self.model.add_root(**kwargs)
+                    for field in many_to_many:
+                        field_model = getattr(obj, field).model
+                        for related_obj in many_to_many[field]:
+                            getattr(obj, field).add(field_model.objects.get(**dict(related_obj)))
+                    return obj, True
                 except IntegrityError as e:
                     if 'Key (path)' in e.args[0]:
                         self.model.fix_tree(fix_paths=True)
@@ -217,6 +234,7 @@ class UserPreference(models.Model, PermissionModelMixin):
     )
     default_unit = models.CharField(max_length=32, default='g')
     use_fractions = models.BooleanField(default=FRACTION_PREF_DEFAULT)
+    use_kj = models.BooleanField(default=KJ_PREF_DEFAULT)
     default_page = models.CharField(
         choices=PAGES, max_length=64, default=SEARCH
     )
@@ -456,6 +474,9 @@ class Step(ExportModelOperationsMixin('step'), models.Model, PermissionModelMixi
         from cookbook.helper.template_helper import render_instructions
         return render_instructions(self)
 
+    def __str__(self):
+        return f'{self.pk} {self.name}'
+
     class Meta:
         ordering = ['order', 'pk']
         indexes = (GinIndex(fields=["search_vector"]),)

cookbook/schemas.py

@@ -2,73 +2,29 @@ from rest_framework.schemas.openapi import AutoSchema
 from rest_framework.schemas.utils import is_list_view
 
 
-# TODO move to separate class to cleanup
-class RecipeSchema(AutoSchema):
+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(RecipeSchema, self).get_path_parameters(path, method)
-
+            return super().get_path_parameters(path, method)
         parameters = super().get_path_parameters(path, method)
-        parameters.append({
-            "name": 'query', "in": "query", "required": False,
-            "description": 'Query string matched (fuzzy) against recipe name. In the future also fulltext search.',
-            'schema': {'type': 'string', },
-        })
-        parameters.append({
-            "name": 'keywords', "in": "query", "required": False,
-            "description": 'Id of keyword a recipe should have. For multiple repeat parameter.',
-            'schema': {'type': 'string', },
-        })
-        parameters.append({
-            "name": 'foods', "in": "query", "required": False,
-            "description": 'Id of food a recipe should have. For multiple repeat parameter.',
-            'schema': {'type': 'string', },
-        })
-        parameters.append({
-            "name": 'units', "in": "query", "required": False,
-            "description": 'Id of unit a recipe should have.',
-            'schema': {'type': 'int', },
-        })
-        parameters.append({
-            "name": 'rating', "in": "query", "required": False,
-            "description": 'Id of unit a recipe should have.',
-            'schema': {'type': 'int', },
-        })
-        parameters.append({
-            "name": 'books', "in": "query", "required": False,
-            "description": 'Id of book a recipe should have. For multiple repeat parameter.',
-            'schema': {'type': 'string', },
-        })
-        parameters.append({
-            "name": 'keywords_or', "in": "query", "required": False,
-            "description": 'If recipe should have all (AND) or any (OR) of the provided keywords.',
-            'schema': {'type': 'string', },
-        })
-        parameters.append({
-            "name": 'foods_or', "in": "query", "required": False,
-            "description": 'If recipe should have all (AND) or any (OR) any of the provided foods.',
-            'schema': {'type': 'string', },
-        })
-        parameters.append({
-            "name": 'books_or', "in": "query", "required": False,
-            "description": 'If recipe should be in all (AND) or any (OR) any of the provided books.',
-            'schema': {'type': 'string', },
-        })
-        parameters.append({
-            "name": 'internal', "in": "query", "required": False,
-            "description": 'true or false. If only internal recipes should be returned or not.',
-            'schema': {'type': 'string', },
-        })
-        parameters.append({
-            "name": 'random', "in": "query", "required": False,
-            "description": 'true or false. returns the results in randomized order.',
-            'schema': {'type': 'string', },
-        })
-        parameters.append({
-            "name": 'new', "in": "query", "required": False,
-            "description": 'true or false. returns new results first in search results',
-            'schema': {'type': 'string', },
-        })
+        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
 
 
@@ -86,7 +42,8 @@ class TreeSchema(AutoSchema):
         })
         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),
+            "description": 'Return first level children of {obj} with ID [int].  Integer 0 will return root {obj}s.'.format(
+                obj=api_name),
             'schema': {'type': 'int', },
         })
         parameters.append({
@@ -110,3 +67,17 @@ class FilterSchema(AutoSchema):
             'schema': {'type': 'string', },
         })
         return parameters
+
+
+# class QueryOnlySchema(AutoSchema):
+#     def get_path_parameters(self, path, method):
+#         if not is_list_view(path, method, self.view):
+#             return super(QueryOnlySchema, self).get_path_parameters(path, method)
+
+#         parameters = super().get_path_parameters(path, method)
+#         parameters.append({
+#             "name": 'query', "in": "query", "required": False,
+#             "description": 'Query string matched (fuzzy) against object name.',
+#             'schema': {'type': 'string', },
+#         })
+#         return parameters

cookbook/serializer.py

@@ -2,22 +2,21 @@ import random
 from datetime import timedelta
 from decimal import Decimal
 from gettext import gettext as _
+
 from django.contrib.auth.models import User
 from django.db.models import Avg, QuerySet, Sum
 from django.urls import reverse
 from django.utils import timezone
-from drf_writable_nested import (UniqueFieldsMixin,
-                                 WritableNestedModelSerializer)
+from drf_writable_nested import UniqueFieldsMixin, WritableNestedModelSerializer
 from rest_framework import serializers
-from rest_framework.exceptions import ValidationError, NotFound
+from rest_framework.exceptions import NotFound, ValidationError
 
-from cookbook.models import (Comment, CookLog, Food, Ingredient, Keyword,
-                             MealPlan, MealType, NutritionInformation, Recipe,
-                             RecipeBook, RecipeBookEntry, RecipeImport,
-                             ShareLink, ShoppingList, ShoppingListEntry,
-                             ShoppingListRecipe, Step, Storage, Sync, SyncLog,
-                             Unit, UserPreference, ViewLog, SupermarketCategory, Supermarket,
-                             SupermarketCategoryRelation, ImportLog, BookmarkletImport, UserFile, Automation)
+from cookbook.models import (Automation, BookmarkletImport, Comment, CookLog, Food, ImportLog,
+                             Ingredient, Keyword, MealPlan, MealType, NutritionInformation, Recipe,
+                             RecipeBook, RecipeBookEntry, RecipeImport, ShareLink, ShoppingList,
+                             ShoppingListEntry, ShoppingListRecipe, Step, Storage, Supermarket,
+                             SupermarketCategory, SupermarketCategoryRelation, Sync, SyncLog, Unit,
+                             UserFile, UserPreference, ViewLog)
 from cookbook.templatetags.custom_tags import markdown
 
 
@@ -34,20 +33,30 @@ class ExtendedRecipeMixin(serializers.ModelSerializer):
         except KeyError:
             api_serializer = None
         # extended values are computationally expensive and not needed in normal circumstances
-        if self.context.get('request', False) and bool(int(self.context['request'].query_params.get('extended', False))) and self.__class__ == api_serializer:
-            return fields
-        else:
+        try:
+            if bool(int(
+                    self.context['request'].query_params.get('extended', False))) and self.__class__ == api_serializer:
+                return fields
+        except AttributeError:
+            pass
+        except KeyError:
+            pass
+        try:
             del fields['image']
             del fields['numrecipe']
-            return fields
+        except KeyError:
+            pass
+        return fields
 
     def get_image(self, obj):
         # TODO add caching
-        recipes = Recipe.objects.filter(**{self.recipe_filter: obj}, space=obj.space).exclude(image__isnull=True).exclude(image__exact='')
+        recipes = Recipe.objects.filter(**{self.recipe_filter: obj}, space=obj.space).exclude(
+            image__isnull=True).exclude(image__exact='')
         try:
             if recipes.count() == 0 and obj.has_children():
                 obj__in = self.recipe_filter + '__in'
-                recipes = Recipe.objects.filter(**{obj__in: obj.get_descendants()}, space=obj.space).exclude(image__isnull=True).exclude(image__exact='')  # if no recipes found - check whole tree
+                recipes = Recipe.objects.filter(**{obj__in: obj.get_descendants()}, space=obj.space).exclude(
+                    image__isnull=True).exclude(image__exact='')  # if no recipes found - check whole tree
         except AttributeError:
             # probably not a tree
             pass
@@ -128,6 +137,7 @@ class UserNameSerializer(WritableNestedModelSerializer):
 
 
 class UserPreferenceSerializer(serializers.ModelSerializer):
+    plan_share = UserNameSerializer(many=True, read_only=True)
 
     def create(self, validated_data):
         if validated_data['user'] != self.context['request'].user:
@@ -158,7 +168,7 @@ class UserFileSerializer(serializers.ModelSerializer):
                 current_file_size_mb = 0
 
             if ((validated_data['file'].size / 1000 / 1000 + current_file_size_mb - 5)
-                                             > self.context['request'].space.max_file_storage_mb != 0):
+                    > self.context['request'].space.max_file_storage_mb != 0):
                 raise ValidationError(_('You have reached your file upload limit.'))
 
     def create(self, validated_data):
@@ -398,7 +408,10 @@ class FoodSerializer(UniqueFieldsMixin, WritableNestedModelSerializer, ExtendedR
 
     class Meta:
         model = Food
-        fields = ('id', 'name', 'description', 'recipe', 'ignore_shopping', 'supermarket_category', 'image', 'parent', 'numchild', 'numrecipe')
+        fields = (
+            'id', 'name', 'description', 'recipe', 'ignore_shopping', 'supermarket_category', 'image', 'parent',
+            'numchild',
+            'numrecipe')
         read_only_fields = ('id', 'numchild', 'parent', 'image')
 
 
@@ -419,12 +432,13 @@ class IngredientSerializer(WritableNestedModelSerializer):
         )
 
 
-class StepSerializer(WritableNestedModelSerializer):
+class StepSerializer(WritableNestedModelSerializer, ExtendedRecipeMixin):
     ingredients = IngredientSerializer(many=True)
     ingredients_markdown = serializers.SerializerMethodField('get_ingredients_markdown')
     ingredients_vue = serializers.SerializerMethodField('get_ingredients_vue')
     file = UserFileViewSerializer(allow_null=True, required=False)
     step_recipe_data = serializers.SerializerMethodField('get_step_recipe_data')
+    recipe_filter = 'steps'
 
     def create(self, validated_data):
         validated_data['space'] = self.context['request'].space
@@ -436,6 +450,9 @@ class StepSerializer(WritableNestedModelSerializer):
     def get_ingredients_markdown(self, obj):
         return obj.get_instruction_render()
 
+    def get_step_recipes(self, obj):
+        return list(obj.recipe_set.values_list('id', flat=True).all())
+
     def get_step_recipe_data(self, obj):
         # check if root type is recipe to prevent infinite recursion
         # can be improved later to allow multi level embedding
@@ -446,7 +463,7 @@ class StepSerializer(WritableNestedModelSerializer):
         model = Step
         fields = (
             'id', 'name', 'type', 'instruction', 'ingredients', 'ingredients_markdown',
-            'ingredients_vue', 'time', 'order', 'show_as_header', 'file', 'step_recipe', 'step_recipe_data'
+            'ingredients_vue', 'time', 'order', 'show_as_header', 'file', 'step_recipe', 'step_recipe_data', 'numrecipe'
         )
 
 
@@ -604,6 +621,7 @@ class MealPlanSerializer(SpacedModelSerializer, WritableNestedModelSerializer):
     meal_type_name = serializers.ReadOnlyField(source='meal_type.name')  # TODO deprecate once old meal plan was removed
     note_markdown = serializers.SerializerMethodField('get_note_markdown')
     servings = CustomDecimalField()
+    shared = UserNameSerializer(many=True)
 
     def get_note_markdown(self, obj):
         return markdown(obj.note)

cookbook/templates/account/password_reset_from_key.html

@@ -0,0 +1,42 @@
+{% extends "base.html" %}
+{% load crispy_forms_filters %}
+
+{% load i18n %}
+{% load account %}
+
+{% block head_title %}{% trans "Change Password" %}{% endblock %}
+
+{% block content %}
+
+    <div class="row">
+        <div class="col-12" style="text-align: center">
+            <h3>{% if token_fail %}{% trans "Bad Token" %}{% else %}{% trans "Change Password" %}{% endif %}</h3>
+            {% if user.is_authenticated %}
+                {% include "account/snippets/already_logged_in.html" %}
+            {% endif %}
+        </div>
+    </div>
+
+    <div class="row">
+        <div class="col-sm-12 col-lg-6 col-md-6 offset-lg-3 offset-md-3">
+            <hr>
+            {% if token_fail %}
+                {% url 'account_reset_password' as passwd_reset_url %}
+                <p>{% blocktrans %}The password reset link was invalid, possibly because it has already been used.
+                    Please request a <a href="{{ passwd_reset_url }}">new password reset</a>.{% endblocktrans %}</p>
+            {% else %}
+                {% if form %}
+                    <form method="POST" action="{{ action_url }}">
+                        {% csrf_token %}
+                        {{ form | crispy }}
+                        <input type="submit" class="btn btn-warning float-right" name="action"
+                               value="{% trans 'change password' %}"/>
+                    </form>
+                {% else %}
+                    <p>{% trans 'Your password is now changed.' %}</p>
+                {% endif %}
+            {% endif %}
+        </div>
+    </div>
+{% endblock %}
+

cookbook/templates/account/password_reset_from_key_done.html

@@ -0,0 +1,22 @@
+{% extends "base.html" %}
+
+
+{% load i18n %}
+{% load account %}
+
+{% block title %}{% trans "Change Password" %}{% endblock %}
+
+{% block content %}
+    <div class="row">
+        <div class="col-sm-12 col-lg-6 col-md-6 offset-lg-3 offset-md-3">
+            <hr>
+            <h3>{% trans "Change Password" %}</h3>
+
+            {% if user.is_authenticated %}
+                {% include "account/snippets/already_logged_in.html" %}
+            {% endif %}
+
+            <p>{% trans 'Your password is now changed.' %}</p>
+        </div>
+    </div>
+{% endblock %}

cookbook/templates/base.html

@@ -336,6 +336,10 @@
     {% block content_fluid %}
     {% endblock %}
 
+    {% user_prefs request as prefs%}
+    {{ prefs|json_script:'user_preference' }}
+
+
 </div>
 
 {% block script %}
@@ -344,6 +348,8 @@
 <script type="application/javascript">
     localStorage.setItem('SCRIPT_NAME', "{% base_path request 'script' %}")
     localStorage.setItem('BASE_PATH', "{% base_path request 'base' %}")
+    localStorage.setItem('STATIC_URL', "{% base_path request 'static_base' %}")
+    localStorage.setItem('DEBUG', "{% is_debug %}")
     window.addEventListener("load", () => {
         if ("serviceWorker" in navigator) {
             navigator.serviceWorker.register("{% url 'service_worker' %}", {scope: "{% base_path request 'base' %}" + '/'}).then(function (reg) {

cookbook/templates/batch/monitor.html

@@ -17,7 +17,7 @@
             </p>
             <form method="POST" class="post-form">{% csrf_token %}
                 {{ form|crispy }}
-                <input type="submit" value="Submit" class="btn btn-success">
+                <input type="submit" value="{% trans 'Save' %}" class="btn btn-success">
                 <a href="{% url 'list_storage' %}"><button type="button" class="btn btn-primary">{% trans 'Manage External Storage' %}</button></a>
             </form>
 

cookbook/templates/forms/edit_internal_recipe.html

@@ -32,6 +32,9 @@
         window.CUSTOM_LOCALE = '{{ request.LANGUAGE_CODE }}'
         window.RECIPE_ID = {{ recipe.pk }}
         window.DEFAULT_UNIT = '{{request.user.userpreference.default_unit}}'
+        window.USER_PREF = {
+            'use_kj': {% if request.user.userpreference.use_kj %} true {% else %} false {% endif %},
+        }
 
     </script>
 

cookbook/templates/generic/delete_template.html

@@ -1,4 +1,6 @@
 {% extends "base.html" %}
+{% load custom_tags %}
+{% load custom_tags %}
 {% load crispy_forms_tags %}
 {% load i18n %}
 
@@ -12,16 +14,64 @@
 
     <h3>{% trans 'Delete' %} {{ title }}</h3>
 
-    
+
     <form action="." method="post">
         {% csrf_token %}
-        <div class="alert alert-danger" role="alert">
+        <div class="alert alert-warning" role="alert">
             {% blocktrans %}Are you sure you want to delete the {{ title }}: <b>{{ object }}</b> {% endblocktrans %}
         </div>
         {{ form|crispy }}
-        <button class="btn btn-success" type="submit" href="{{ success_url }}"><i class="fas fa-trash-alt"></i> {% trans 'Confirm' %}</button>
-        <a href="javascript:history.back()"  class="btn btn-danger"><i class="fas fa-undo-alt"></i> {% trans 'Cancel' %}</a>
+
+        {% if protected_objects %}
+            <h5>{% trans 'Protected' %} <small class="text-muted">The object you are trying to delete is <b>protected</b> by the following references to it.</small></h5>
+            {% for o in protected_objects %}
+                {% class_name o.model as name %}
+                <u>{{ name }}</u>
+                <ul>
+                    {% for e in o %}
+                        <li>
+                            <span class="badge badge-info">#{{ e.id }}</span> {{ e }}
+                        </li>
+                    {% endfor %}
+                </ul>
+            {% endfor %}
+        {% endif %}
+
+        {% if cascading_objects %}
+            <h5>{% trans 'Cascade' %} <small class="text-muted">The object you are trying to delete is used by the following objects which will <b>also be deleted</b>.</small></h5>
+            {% for o in cascading_objects %}
+                {% class_name o.model as name %}
+                <u>{{ name }}</u>
+                <ul>
+                    {% for e in o %}
+                        <li>
+                            <span class="badge badge-info">#{{ e.id }}</span> {{ e }}
+                        </li>
+                    {% endfor %}
+                </ul>
+            {% endfor %}
+        {% endif %}
+
+        {% if set_null_objects %}
+            <h5>{% trans 'Remove' %} <small class="text-muted">The object you are trying to delete is used by the following objects from which the reference will be removed.</small></h5>
+            {% for o in set_null_objects %}
+                {% class_name o.model as name %}
+                <u>{{ name }}</u>
+                <ul>
+                    {% for e in o %}
+                        <li>
+                            <span class="badge badge-info">#{{ e.id }}</span> {{ e }}
+                        </li>
+                    {% endfor %}
+                </ul>
+            {% endfor %}
+        {% endif %}
+
+        <button class="btn btn-success" type="submit" href="{{ success_url }}" {% if protected_objects %}disabled{% endif %}><i
+                class="fas fa-trash-alt"></i> {% trans 'Confirm' %}</button>
+        <a href="javascript:history.back()" class="btn btn-danger"><i class="fas fa-undo-alt"></i> {% trans 'Cancel' %}
+        </a>
     </form>
-    
+
 
 {% endblock %}

cookbook/templates/generic/model_template.html

@@ -28,6 +28,8 @@
     <script type="application/javascript">
         window.IMAGE_PLACEHOLDER = "{% static 'assets/recipe_no_image.svg' %}"
 
+        window.CUSTOM_LOCALE = '{{ request.LANGUAGE_CODE }}'
+
         {% if current_file_size_mb %}
             window.CURRENT_FILE_SIZE_MB = {{ current_file_size_mb|unlocalize }}
             window.MAX_FILE_SIZE_MB = {{ max_file_size_mb|unlocalize }}

cookbook/templates/meal_plan.html

@@ -1,742 +1,36 @@
 {% extends "base.html" %}
-{% load i18n %}
-{% load static %}
 {% load render_bundle from webpack_loader %}
+{% load static %}
+{% load i18n %}
+{% load l10n %}
+
 {% block title %}{% trans 'Meal-Plan' %}{% endblock %}
 
-{% block extra_head %}
+{% block content_fluid %}
 
-    {% include 'include/vue_base.html' %}
+    <div id="app">
+        <meal-plan-view></meal-plan-view>
+    </div>
 
-    <script src="{% static 'js/moment-with-locales.min.js' %}"></script>
-
-    <script src="{% static 'js/Sortable.min.js' %}"></script>
-    <script src="{% static 'js/vuedraggable.umd.min.js' %}"></script>
-    <script src="{% static 'js/vue-cookies.js' %}"></script>
-
-    <script src="{% static 'js/js.cookie.min.js' %}"></script>
 
 {% endblock %}
 
-{% block content %}
 
-    <div id="app">
-        <div class="row mt-2 mb-1">
-            <div class="col-md-4 offset-md-4">
-                <div class="input-group">
-                    <div class="input-group-prepend">
-                        <button class="btn btn-outline-secondary shadow-none"
-                                @click="changeStartDate(number_of_days * -1)">
-                            <i class="fas fa-arrow-left"></i>
-                        </button>
-                    </div>
-                    <input name="date" id="id_date" class="form-control" type="date" v-model="start_date"
-                           @change="updatePlan()">
-                    <div class="input-group-append">
-                        <button class="btn btn-outline-secondary shadow-none" @click="changeStartDate(number_of_days)">
-                            <i class="fas fa-arrow-right"></i>
-                        </button>
-                    </div>
-                </div>
-            </div>
-            <div class="col-md-4">
-                <a href="{% url 'view_plan_new' %}" class="float-right">
-                    <button class="btn btn-outline-secondary shadow-none">
-                        <i class="fas fa-star"></i> {% trans 'Try the new meal planner' %}
-                    </button>
-                </a>
-            </div>
-        </div>
-
-        <div class="row">
-            <div class="col-md-12">
-                <table class="table table-sm table-striped table-responsive-sm" style=" table-layout:fixed;">
-                    <thead class="thead-dark" style="background-image: url({% static 'assets/header.svg' %});">
-                    <tr>
-                        <th class="thead-blank" v-for="d in dates" style="width: 14.2%; text-align: center;">
-                            [[formatDateDayname(d)]]<br/>[[formatDateDay(d)]].
-                            <button class="btn btn-sm btn-outline-secondary shadow-none" @click="addDayToShopping(d)"><i
-                                    class="fas fa-cart-plus fa-sm"></i></button>
-                        </th>
-                    </tr>
-                    </thead>
-                    <tbody v-for="t in meal_types">
-                    <tr v-if="meal_plan[t.name] !== undefined">
-                        <td :colspan="number_of_days" style="text-align: center">
-                            [[ meal_plan[t.name].name]]
-                            <template
-                                    v-if="t.created_by !== {{ request.user.pk }} && user_names[t.created_by] !== undefined">
-                                ([[ user_names[t.created_by] ]])
-                            </template>
-                        </td>
-                    </tr>
-                    <tr v-if="meal_plan[t.name] !== undefined">
-                        <td v-for="d in  meal_plan[t.name].days">
-                            <draggable class="list-group" :list="d.items" group="plan" style="min-height: 40px"
-                                       @change="dragChanged(d.date, t, $event)"
-                                       :empty-insert-threshold="10" handle=".handle">
-                                <div class="" v-for="(element, index) in d.items" :key="element.id">
-                                    <!-- small layout with handle -->
-                                    <div class="d-block d-md-none">
-                                        <div class="col-">
-                                            <i class="fas fa-arrows-alt handle input-group-text"
-                                               style="width: 100%"></i>
-                                        </div>
-                                        <div class="list-group-item" style="word-wrap: break-word;">
-                                            <a href="#" @click="plan_detail = element" data-toggle="modal"
-                                               data-target="#id_plan_detail_modal">[[ planElementName(element)]]</a>
-                                        </div>
-                                    </div>
-                                    <!-- big layout -->
-                                    <div class="list-group-item handle d-md-block d-none"
-                                         style="word-wrap: break-word; padding: 2;margin-bottom: 4">
-                                        <div class="col-md-12" style="padding: 0">
-                                            <a href="#" @click="plan_detail = element" data-toggle="modal"
-                                               data-target="#id_plan_detail_modal">[[ planElementName(element)]]</a>
-                                        </div>
-                                    </div>
-                                </div>
-                            </draggable>
-                        </td>
-                    </tr>
-                    </tbody>
-                </table>
-            </div>
-        </div>
-
-        <div class="card">
-            <div class="card-header">
-                <i class="fas fa-calendar-plus"></i> {% trans 'New Entry' %} <a href="#" data-toggle="modal"
-                                                                                data-target="#id_plan_help_modal"><i
-                    class="far fa-question-circle"></i></a>
-            </div>
-            <div class="row">
-                <div class="col-md-6">
-
-                    <div class="card-body">
-                        <div class="row">
-                            <div class="col-md-12">
-                                <div class="input-group mb-3">
-                                    <input type="text" class="form-control" v-model="recipe_query" @keyup="getRecipes"
-                                           placeholder="{% trans 'Search Recipe' %}">
-                                    <div class="input-group-append">
-                                        <button class="btn btn-outline-secondary" type="button"
-                                                @click="getRandomRecipes">
-                                            <i class="fas fa-dice"></i>
-                                        </button>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                        <draggable class="list-group" :list="recipes"
-                                   :group="{ name: 'plan', pull: 'clone', put: false }" :clone="cloneRecipe">
-                            <div class="list-group-item d-flex align-items-center justify-content-between"
-                                 v-for="(element, index) in recipes" :key="element.id">
-                                <span>
-                                    <i class="fas fa-arrows-alt"></i> [[element.name]]
-                                </span>
-                                <span class="badge badge-light badge-pill">[[element.servings]]</span>
-                            </div>
-                        </draggable>
-                    </div>
-                </div>
-                <div class="col-md-6">
-                    <div>
-                        <div class="card-body">
-                            <input type="text" class="form-control" v-model="new_note_title"
-                                   placeholder="{% trans 'Title' %}" style="margin-bottom: 8px">
-                            <textarea class="form-control" v-model="new_note_text"
-                                      placeholder="{% trans 'Note (optional)' %}"></textarea>
-                            <small><span
-                                    class="text-muted">{% trans 'You can use markdown to format this field. See the <a href="/docs/markdown/" target="_blank" rel="noopener noreferrer">docs here</a>' %}</span></small>
-                            <br/>
-                            <br/>
-                            <input type="number" class="form-control" v-model="new_note_servings"
-                                   placeholder="{% trans 'Serving Count' %}" style="margin-bottom: 8px">
-                            <br/>
-                            <draggable :list="pseudo_note_list"
-                                       :group="{ name: 'plan', pull: 'clone', put: false }" :clone="cloneNote">
-                                <div class="list-group-item" v-for="(element, index) in pseudo_note_list"
-                                     :key="element.id">
-                                    <i class="fas fa-arrows-alt"></i> {% trans 'Create only note' %}
-                                </div>
-                            </draggable>
-                        </div>
-
-                    </div>
-                </div>
-            </div>
-        </div>
-
-        <br>
-        <div class="row">
-            <div class="col-md-6">
-                <div class="card">
-                    <div class="card-header">
-                        <i class="fas fa-shopping-cart"></i> {% trans 'Shopping List' %}
-                    </div>
-
-                    <div class="card-body">
-                        <template v-if="shopping_list.length < 1">{% trans 'Shopping list currently empty' %}</template>
-                        <template v-else>
-                            <a v-bind:href="getShoppingUrl()" class="btn btn-success"
-                               target="_blank">{% trans 'Open Shopping List' %}</a>
-                            <br/>
-                            <br/>
-                            {% trans 'Recipes' %}
-                            <ul class="list-group" style="margin-top: 8px">
-                                <li class="list-group-item" v-for="item in shopping_list"> [[ item.recipe_name ]]</li>
-                            </ul>
-                        </template>
-                    </div>
-                </div>
-            </div>
-            <div class="col-md-6" style="margin-top: 8px">
-                <div class="card">
-                    <div class="card-header">
-                        <i class="fas fa-shopping-cart"></i> {% trans 'Plan' %}
-                    </div>
-
-                    <div class="card-body">
-                        <div class="row">
-                            <div class="col">
-                                <label>
-                                    {% trans 'Number of Days' %}
-                                    <input class="form-control" type="number" v-model="number_of_days"
-                                           @change="updatePlan(); $cookies.set('number_of_days',number_of_days, -1)">
-                                </label>
-                            </div>
-
-                        </div>
-                        <div class="row">
-                            <div class="col">
-                                <label>
-                                    {% trans 'Weekday offset' %}
-                                    <input class="form-control" type="number" v-model="start_offset"
-                                           @change="updatePlan(); $cookies.set('start_offset',start_offset, -1)">
-                                    <small class="text-muted">{% trans 'Number of days starting from the first day of the week to offset the default view.' %}</small>
-                                </label>
-                            </div>
-
-                        </div>
-
-
-                        <a href="#" data-toggle="modal"
-                           data-target="#id_plan_types_modal">{% trans 'Edit plan types' %}</a> <br/>
-                        <a href="#" data-toggle="modal"
-                           data-target="#id_plan_help_modal">{% trans 'Show help' %}</a><br/>
-                        <a v-bind:href="getIcalUrl()">{% trans 'Week iCal export' %}</a>
-                    </div>
-                </div>
-            </div>
-        </div>
-
-        <br/>
-        <br/>
-
-        <div class="modal fade" id="id_plan_detail_modal" tabindex="-1" role="dialog"
-             aria-hidden="true">
-            <div class="modal-dialog">
-                <div class="modal-content">
-                    <div class="modal-header">
-                        <h5 class="modal-title">
-                            <template v-if="plan_detail.title !==''">[[ plan_detail.title ]]</template>
-                            <template v-else>[[ plan_detail.recipe_name ]]</template>
-                            <small
-                                    class="text-muted"><br/>[[ plan_detail.meal_type_name ]] [[
-                                formatLocalDate(plan_detail.date) ]]</small>
-                        </h5>
-                        <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-                            <span aria-hidden="true">&times;</span>
-                        </button>
-                    </div>
-                    <div class="modal-body">
-                        <template v-if="plan_detail.recipe_name !== undefined ">
-                            <small class="text-muted">{% trans 'Recipe' %}</small><br/>
-                            <a v-bind:href="planDetailRecipeUrl()" target="_blank">[[ plan_detail.recipe_name ]]</a>
-                            <br/>
-                            <br/>
-                            <small class="text-muted">{% trans 'Serving Count' %}</small><br/>
-                            <span>[[ plan_detail.servings ]]</span>
-                        </template>
-
-                        <template v-if="plan_detail.note !== ''">
-                            <small class="text-muted">{% trans 'Note' %}</small><br/>
-                            <span v-html="plan_detail.note_markdown"></span>
-                            <br/>
-                        </template>
-
-                        <br/>
-                        <br/>
-                        <template v-if="plan_detail.created_by !== undefined ">
-                            <small class="text-muted">{% trans 'Created by' %}</small><br/>
-                            [[ user_names[plan_detail.created_by] ]]
-                            <br/>
-                        </template>
-
-                        <template v-if="plan_detail.shared.length > 0">
-                            <small class="text-muted">{% trans 'Shared with' %}</small><br/>
-                            <span>[[ planDetailUserList() ]]</span>
-                            <br/>
-                        </template>
-                    </div>
-                    <div class="modal-footer">
-                        <button type="button" class="btn btn-danger"
-                                @click="deleteEntry(plan_detail)">{% trans 'Delete' %}</button>
-                        <button type="button" class="btn btn-success"
-                                v-if="!shopping_list.includes(plan_detail) && plan_detail.recipe_name !== undefined"
-                                @click="shopping_list.push(plan_detail)">{% trans 'Add to Shopping' %}</button>
-                        <a class="btn btn-primary" v-bind:href="planDetailEditUrl()">{% trans 'Edit' %}</a>
-                        <button type="button" class="btn btn-secondary"
-                                data-dismiss="modal">{% trans 'Close' %}</button>
-                    </div>
-                </div>
-            </div>
-        </div>
-
-        <div class="modal fade" id="id_plan_types_modal" tabindex="-1" role="dialog"
-             aria-hidden="true">
-            <div class="modal-dialog">
-                <div class="modal-content">
-                    <div class="modal-header">
-                        <h5 class="modal-title">{% trans 'Edit plan types' %}</h5>
-                        <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-                            <span aria-hidden="true">&times;</span>
-                        </button>
-                    </div>
-                    <div class="modal-body">
-                        <draggable :list="meal_types_edit" handle=".handle"
-                                   :group="{ name: 'types'}">
-                            <div v-for="(element, index) in meal_types_edit"
-                                 :key="element.id">
-                                <template v-if="!element.delete">
-                                    <div class="input-group mb-3">
-                                        <div class="input-group-prepend handle">
-                                            <button tabindex="-1" class="btn btn-outline-secondary"><i
-                                                    class="fas fa-arrows-alt-v"></i></button>
-                                        </div>
-                                        <input class="form-control" v-model="element.name">
-                                        <div class="input-group-append">
-                                            <button tabindex="-1" class="btn btn-outline-danger" type="button"
-                                                    @click="markTypeDelete(element)"><i class="fas fa-trash-alt"></i>
-                                            </button>
-                                        </div>
-                                    </div>
-                                </template>
-                            </div>
-                        </draggable>
-                    </div>
-                    <div class="modal-footer">
-                        <button type="button" class="btn btn-primary"
-                                @click="meal_types_edit.push({name:'{% trans 'New meal type' %}', delete:false})">{% trans 'New' %}</button>
-                        <button type="button" class="btn btn-success"
-                                @click="updatePlanTypes()">{% trans 'Save' %}</button>
-                        <button type="button" class="btn btn-secondary"
-                                data-dismiss="modal">{% trans 'Close' %}</button>
-                    </div>
-                </div>
-            </div>
-        </div>
-
-        <div class="modal fade" id="id_plan_help_modal" tabindex="-1" role="dialog"
-             aria-hidden="true">
-            <div class="modal-dialog">
-                <div class="modal-content">
-                    <div class="modal-header">
-                        <h5 class="modal-title">{% trans 'Meal Plan Help' %}</h5>
-                        <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-                            <span aria-hidden="true">&times;</span>
-                        </button>
-                    </div>
-                    <div class="modal-body">
-                        {% blocktrans %}
-                            <p>The meal plan module allows planning of meals both with recipes and notes.</p>
-                            <p>Simply select a recipe from the list of recently viewed recipes or search the one you
-                                want and drag it to the desired plan position. You can also add a note and a title and
-                                then drag the recipe to create a plan entry with a custom title and note. Creating only
-                                Notes is possible by dragging the create note box into the plan.</p>
-                            <p>Click on a recipe in order to open the detailed view. There you can also add it to the
-                                shopping list. You can also add all recipes of a day to the shopping list by
-                                clicking the shopping cart at the top of the table.</p>
-                            <p>Since a common use case is to plan meals together you can define
-                                users you want to share your plan with in the settings.
-                            </p>
-                            <p>You can also edit the types of meals you want to plan. If you share your plan with
-                                someone with
-                                different meals, their meal types will appear in your list as well. To prevent
-                                duplicates (e.g. Other and Misc.)
-                                name your meal types the same as the users you share your meals with and they will be
-                                merged.</p>
-                        {% endblocktrans %}
-                    </div>
-                    <div class="modal-footer">
-                        <button type="button" class="btn btn-secondary"
-                                data-dismiss="modal">{% trans 'Close' %}</button>
-                    </div>
-                </div>
-            </div>
-        </div>
-
-    </div>
-
-    <script src="{% url 'javascript-catalog' %}"></script>
+{% block script %}
+    {% if debug %}
+        <script src="{% url 'js_reverse' %}"></script>
+    {% else %}
+        <script src="{% static 'django_js_reverse/reverse.js' %}"></script>
+    {% endif %}
 
     <script type="application/javascript">
-        moment.locale('{{request.LANGUAGE_CODE}}');
+        window.IMAGE_PLACEHOLDER = "{% static 'assets/recipe_no_image.svg' %}"
 
-        let csrftoken = Cookies.get('csrftoken');
-        Vue.http.headers.common['X-CSRFToken'] = csrftoken;
+        window.CUSTOM_LOCALE = '{{ request.LANGUAGE_CODE }}'
 
-        let app = new Vue({
-            delimiters: ['[[', ']]'],
-            el: '#app',
-            data: {
-                start_date: undefined,
-                start_offset: 0,
-                dates: [],
-                number_of_days: $cookies.isKey('number_of_days') ? $cookies.get('number_of_days') : 7,
-                plan_entries: [],
-                meal_types: [],
-                meal_types_edit: [],
-                meal_plan: {},
-                plan_detail: {shared: []},
-                recipes: [],
-                recipe_query: '',
-                pseudo_note_list: [
-                    {id: 0, title: '', text: ''}
-                ],
-                new_note_title: '',
-                new_note_text: '',
-                new_note_servings: '',
-                default_shared_users: [],
-                user_id_update: [],
-                user_names: {},
-                shopping: false,
-                shopping_list: [],
-            },
-            mounted: function () {
-                this.default_shared_users = [{% for u in request.user.userpreference.plan_share.all %}
-                    {{ u.pk }},
-                {% endfor %}]
-
-                this.$set(this.user_names, {{ request.user.pk }}, '{{ request.user.get_user_name }}')
-                this.user_id_update = Array.from(this.default_shared_users)
-
-                this.start_offset = $cookies.isKey('start_offset') ? $cookies.get('start_offset') : 0;
-                this.start_date = moment().weekday(0).add(this.start_offset, 'days').format('YYYY-MM-DD')
-
-                this.updatePlan();
-                this.getRecipes();
-
-                //this.makeToast('success', 'this actually works', 'success')
-            },
-            methods: {
-                makeToast: function (title, message, variant = null) {
-                    this.$bvToast.toast(message, {
-                        title: title,
-                        variant: variant,
-                        toaster: 'b-toaster-top-center',
-                        solid: true
-                    })
-                },
-                updatePlan: function () {
-                    this.dates = [];
-                    for (var i = 0; i <= (this.number_of_days - 1); i++) {
-                        this.dates.push(moment(this.start_date).add(i, 'days'));
-                    }
-
-                    let planEntryPromise = this.getPlanEntries();
-                    let planTypePromise = this.getPlanTypes();
-
-                    Promise.allSettled([planEntryPromise, planTypePromise]).then(() => {
-                        this.buildGrid()
-                    })
-                },
-                getPlanEntries: function () {
-                    return this.$http.get("{% url 'api:mealplan-list' %}?from_date=" + this.dates[0].format('YYYY-MM-DD') + "&to_date=" + this.dates[this.dates.length - 1].format('YYYY-MM-DD')).then((response) => {
-                        this.plan_entries = response.data;
-                    }).catch((err) => {
-                        console.log("getPlanEntries error: ", err);
-                        this.makeToast(gettext('Error'), gettext('There was an error loading a resource!') + err.bodyText, 'danger')
-                    })
-                },
-                getPlanTypes: function () {
-                    return this.$http.get("{% url 'api:mealtype-list' %}").then((response) => {
-                        this.meal_types = response.data;
-                        this.meal_types_edit = jQuery.extend(true, [], response.data);
-                        for (let mte of this.meal_types_edit) {
-                            this.$set(mte, 'delete', false)
-                        }
-
-                        if (this.meal_types.length === 0) {
-                            this.makeToast(gettext('Information'), gettext('To use the meal plan please first create at least one meal plan type.'), 'warning')
-                        }
-                    }).catch((err) => {
-                        console.log("getPlanTypes error: ", err);
-                        this.makeToast(gettext('Error'), gettext('There was an error loading a resource!') + err.bodyText, 'danger')
-                    })
-                },
-                buildGrid: function () {
-                    this.meal_plan = {}
-
-                    for (let e of this.plan_entries) {
-                        let new_type = {id: e.meal_type, name: e.meal_type_name, created_by: e.created_by}
-                        if (this.meal_types.filter(el => el.name === new_type.name).length === 0) {
-                            this.meal_types.push(new_type)
-                        }
-                    }
-
-                    for (let t of this.meal_types) {
-                        this.$set(this.meal_plan, t.name, {
-                            name: t.name,
-                            meal_type: t.id,
-                            days: {}
-                        })
-                        for (let d of this.dates) {
-                            this.$set(this.meal_plan[t.name].days, d.format('YYYY-MM-DD'), {
-                                name: this.formatDateDayname(d),
-                                date: d.format('YYYY-MM-DD'),
-                                items: []
-                            })
-                        }
-                    }
-                    for (let e of this.plan_entries) {
-                        this.meal_plan[e.meal_type_name].days[e.date].items.push(e)
-
-                        for (let u of e.shared) {
-                            if (!this.user_id_update.includes(parseInt(u))) {
-                                this.user_id_update.push(parseInt(u))
-                            }
-                        }
-                    }
-
-                    this.updateUserNames()
-                },
-                getRandomRecipes: function () {
-                    this.$set(this, 'recipe_query', '');
-                    this.getRecipes();
-                },
-                getRecipes: function () {
-                    let url = "{% url 'api:recipe-list' %}?page_size=5"
-                    if (this.recipe_query !== '') {
-                        url += '&query=' + this.recipe_query;
-                    } else {
-                        url += '&random=true'
-                    }
-
-                    this.$http.get(url).then((response) => {
-                        this.recipes = this.removeDuplicates(response.data.results, recipe => recipe.id);
-                    }).catch((err) => {
-                        console.log("getRecipes error: ", err);
-                        this.makeToast(gettext('Error'), gettext('There was an error loading a resource!') + err.bodyText, 'danger')
-                    })
-                },
-                getMdNote: function () {
-                    let url = "{% url 'api:recipe-list' %}?page_size=5"
-                    if (this.recipe_query !== '') {
-                        url += '&query=' + this.recipe_query;
-                    }
-
-                    this.$http.get(url).then((response) => {
-                        this.recipes = response.data.results;
-                    }).catch((err) => {
-                        console.log("getRecipes error: ", err);
-                        this.makeToast(gettext('Error'), gettext('There was an error loading a resource!') + err.bodyText, 'danger')
-                    })
-                },
-                updateUserNames: function () {
-                    return this.$http.get("{% url 'api:username-list' %}?filter_list=[" + this.user_id_update + ']').then((response) => {
-                        for (let u of response.data) {
-                            this.$set(this.user_names, u.id, u.username);
-                        }
-
-                    }).catch((err) => {
-                        console.log("updateUserNames error: ", err);
-                        this.makeToast(gettext('Error'), gettext('There was an error loading a resource!') + err.bodyText, 'danger')
-                    })
-                },
-                dragChanged: function (date, meal_type, evt) {
-                    if (evt.added !== undefined) {
-                        let plan_entry = evt.added.element
-
-                        plan_entry.date = date
-                        plan_entry.meal_type = meal_type
-                        plan_entry.meal_type_name = meal_type.name
-
-                        if (plan_entry.is_new) { // its not a meal plan object
-                            plan_entry.created_by = {{ request.user.id }};
-                            plan_entry.shared = this.default_shared_users
-
-                            this.$http.post(`{% url 'api:mealplan-list' %}`, plan_entry).then((response) => {
-                                let entry = response.data
-                                this.meal_plan[entry.meal_type_name].days[entry.date].items = this.meal_plan[entry.meal_type_name].days[entry.date].items.filter(item => !item.is_new)
-                                this.meal_plan[entry.meal_type_name].days[entry.date].items.push(entry)
-                            }).catch((err) => {
-                                console.log("dragChanged create error", err);
-                            })
-                        } else {
-                            this.$http.put(`{% url 'api:mealplan-list' %}${plan_entry.id}/`, plan_entry).then((response) => {
-                            }).catch((err) => {
-                                console.log("dragChanged update error", err);
-                                this.makeToast(gettext('Error'), gettext('There was an error updating a resource!') + err.bodyText, 'danger')
-                            })
-                        }
-                    }
-                },
-                deleteEntry: function (entry) {
-                    $('#id_plan_detail_modal').modal('hide')
-                    this.$http.delete(`{% url 'api:mealplan-list' %}${entry.id}/`, entry).then((response) => {
-                        this.meal_plan[entry.meal_type_name].days[entry.date].items = this.meal_plan[entry.meal_type_name].days[entry.date].items.filter(item => item !== entry)
-                    }).catch((err) => {
-                        console.log("deleteEntry error: ", err);
-                        this.makeToast(gettext('Error'), gettext('There was an error loading a resource!') + err.bodyText, 'danger')
-                    })
-                },
-                removeDuplicates: function (data, key) {
-                    return [
-                        ...new Map(data.map(item => [key(item), item])).values()
-                    ]
-                },
-                updatePlanTypes: function () {
-                    let promise_list = []
-                    let i = 0
-                    for (let x of this.meal_types_edit) {
-                        x.order = i
-                        i++
-                        if (x.id === undefined && !x.delete) {
-                            x.created_by = {{ request.user.id }}
-                                promise_list.push(this.$http.post("{% url 'api:mealtype-list' %}", x).then((response) => {
-                                }).catch((err) => {
-                                    console.log("updatePlanTypes create error: ", err);
-                                    this.makeToast(gettext('Error'), gettext('There was an error loading a resource!') + err.bodyText, 'danger')
-                                }))
-                        } else if (x.delete) {
-                            if (x.id !== undefined) {
-                                promise_list.push(this.$http.delete(`{% url 'api:mealtype-list' %}${x.id}/`, x).then((response) => {
-                                }).catch((err) => {
-                                    console.log("updatePlanTypes delete error: ", err);
-                                    this.makeToast(gettext('Error'), gettext('There was an error loading a resource!') + err.bodyText, 'danger')
-                                }))
-                            }
-                        } else {
-                            promise_list.push(this.$http.put(`{% url 'api:mealtype-list' %}${x.id}/`, x).then((response) => {
-
-                            }).catch((err) => {
-                                console.log("updatePlanTypes update error: ", err);
-                                this.makeToast(gettext('Error'), gettext('There was an error loading a resource!') + err.bodyText, 'danger')
-                            }))
-                        }
-                    }
-                    Promise.allSettled(promise_list).then(() => {
-                        this.updatePlan()
-                        $('#id_plan_types_modal').modal('hide')
-                    })
-                },
-                markTypeDelete: function (element) {
-                    if (confirm(gettext('When deleting a meal type all entries using that type will be deleted as well. Deletion will apply when configuration is saved. Do you want to proceed?'))) {
-                        element.delete = true
-                    }
-                },
-                cloneRecipe: function (recipe) {
-                    let r = {
-                        id: Math.round(Math.random() * 1000) + 10000,
-                        recipe: recipe,
-                        recipe_name: recipe.name,
-                        servings: (this.new_note_servings > 1) ? this.new_note_servings : recipe.servings,
-                        title: this.new_note_title,
-                        note: this.new_note_text,
-                        is_new: true
-                    }
-                    console.log(recipe)
-
-                    this.new_note_title = ''
-                    this.new_note_text = ''
-                    this.new_note_servings = ''
-
-                    return r
-                },
-                cloneNote: function () {
-                    let new_entry = {
-                        id: Math.round(Math.random() * 1000) + 10000,
-                        title: this.new_note_title,
-                        note: this.new_note_text,
-                        servings: 1,
-                        is_new: true,
-                    }
-
-                    if (new_entry.title === '') {
-                        new_entry.title = gettext('Title')
-                    }
-
-                    this.new_note_title = ''
-                    this.new_note_text = ''
-                    this.new_note_servings = ''
-                    return new_entry
-                },
-                planElementName: function (element) {
-                    if (element.title) {
-                        return element.title
-                    } else if (element.recipe_name) {
-                        return element.recipe_name
-                    } else {
-                        return element.name
-                    }
-                },
-                planDetailRecipeUrl: function () {
-                    return "{% url 'view_recipe' 12345 %}".replace(/12345/, this.plan_detail.recipe.id);
-                },
-                planDetailEditUrl: function () {
-                    return "{% url 'edit_meal_plan' 12345 %}".replace(/12345/, this.plan_detail.id);
-                },
-                planDetailUserList: function () {
-                    let users = []
-                    for (let u of this.plan_detail.shared) {
-                        users.push(this.user_names[u])
-                    }
-                    return users.join(', ')
-                },
-                formatLocalDate: function (date) {
-                    return moment(date).format('LL')
-                },
-                formatDateDay: function (date) {
-                    return moment(date).format('D')
-                },
-                formatDateDayname: function (date) {
-                    return moment(date).format('dddd')
-                },
-                changeStartDate: function (change) {
-                    this.start_date = moment(this.start_date).add(change, 'days').format('YYYY-MM-DD')
-                    this.updatePlan();
-                },
-                getShoppingUrl: function () {
-                    let url = "{% url 'view_shopping' %}"
-                    let first = true
-                    for (let se of this.shopping_list) {
-                        if (first) {
-                            url += `?r=[${se.recipe.id},${se.servings}]`
-                            first = false
-                        } else {
-                            url += `&r=[${se.recipe.id},${se.servings}]`
-                        }
-                    }
-                    return url
-                },
-                getIcalUrl: function () {
-                    if (this.dates.length === 0) {
-                        return ""
-                    }
-                    return "{% url 'api_get_plan_ical' 12345 6789 %}".replace(/12345/, this.dates[0].format('YYYY-MM-DD')).replace(/6789/, this.dates[this.dates.length - 1].format('YYYY-MM-DD'));
-                },
-                addDayToShopping: function (date) {
-                    for (let t of this.meal_types) {
-                        for (let i of this.meal_plan[t.name].days[date.format('YYYY-MM-DD')].items) {
-                            if (!this.shopping_list.includes(i)) {
-                                this.shopping_list.push(i)
-                            }
-                        }
-                    }
-                }
-            }
-        });
+        window.ICAL_URL = '{% url 'api_get_plan_ical' 12345 6789 %}'
+        window.SHOPPING_URL = '{% url 'view_shopping' %}'
     </script>
+
+    {% render_bundle 'meal_plan_view' %}
 {% endblock %}

cookbook/templates/meal_plan_new.html

@@ -27,6 +27,9 @@
         window.IMAGE_PLACEHOLDER = "{% static 'assets/recipe_no_image.svg' %}"
 
         window.CUSTOM_LOCALE = '{{ request.LANGUAGE_CODE }}'
+
+        window.ICAL_URL = '{% url 'api_get_plan_ical' 12345 6789 %}'
+        window.SHOPPING_URL = '{% url 'view_shopping' %}'
     </script>
 
     {% render_bundle 'meal_plan_view' %}

cookbook/templates/recipe_view.html

@@ -69,6 +69,7 @@
         window.USER_PREF = {
             'use_fractions': {% if request.user.userpreference.use_fractions %} true {% else %} false {% endif %},
             'ingredient_decimals': {% if request.user.userpreference.use_fractions %} {{ request.user.userpreference.ingredient_decimals }} {% else %} 2 {% endif %},
+            'use_kj': {% if request.user.userpreference.use_kj %} true {% else %} false {% endif %},
         }
     </script>
 

cookbook/templates/settings.html

@@ -28,10 +28,10 @@
                 {% trans 'Account' %}</a>
         </li>
         <li class="nav-item" role="presentation">
-            <a class="nav-link {% if active_tab == 'prefernces' %} active {% endif %}" id="preferences-tab"
+            <a class="nav-link {% if active_tab == 'preferences' %} active {% endif %}" id="preferences-tab"
                data-toggle="tab" href="#preferences" role="tab"
                aria-controls="preferences"
-               aria-selected="{% if active_tab == 'prefernces' %} 'true' {% else %} 'false' {% endif %}">
+               aria-selected="{% if active_tab == 'preferences' %} 'true' {% else %} 'false' {% endif %}">
                 {% trans 'Preferences' %}</a>
         </li>
         <li class="nav-item" role="presentation">
@@ -178,7 +178,7 @@
                 </div>
                 <div class="card">
                     <div class="card-body">
-                        <h5 class="card-title">{% trans 'Percise' %}</h5>
+                        <h5 class="card-title">{% trans 'Precise' %}</h5>
                         <p class="card-text">{% trans 'Allows fine control over search results but might not return results if too many spelling mistakes are made.' %}</p>
                         <p class="card-text"><small class="text-muted">{% trans 'Perfect for large Databases' %}</small></p>
                         <button class="btn btn-primary card-link" onclick="applyPreset('precise')">{% trans 'Apply' %}</button>
@@ -225,4 +225,4 @@
             window.location.hash = e.target.hash;
         })
     </script>
-{% endblock %}
+{% endblock %}

cookbook/templates/shopping_list.html

@@ -28,13 +28,6 @@
         <span class="col col-md-9">
             <h2>{% trans 'Shopping List' %}</h2>
         </span>
-        <span class="col-md-3">
-            <a href="{% url 'view_shopping_new' %}" class="float-right">
-                <button class="btn btn-outline-secondary shadow-none">
-                    <i class="fas fa-star"></i> {% trans 'Try the new shopping list' %}
-                </button>
-            </a>
-        </span>
         <div class="col col-mdd-3 text-right">
             <b-form-checkbox switch size="lg" v-model="edit_mode"
                              @change="$forceUpdate()">{% trans 'Edit' %}</b-form-checkbox>
@@ -137,7 +130,7 @@
                     <tr v-for="(element, index) in c.entries" :key="element.id"
                         v-bind:class="{ 'text-muted': element.checked }">
                         <td class="handle"><i class="fas fa-sort"></i></td>
-                        <td>[[element.amount]]</td>
+                        <td>[[element.amount.toFixed(2)]]</td>
                         <td>[[element.unit.name]]</td>
                         <td>[[element.food.name]]</td>
                         <td>
@@ -319,7 +312,7 @@
                                         <td><input type="checkbox" style="zoom:1.4;" v-model="x.checked"
                                                    @change="entryChecked(x)">
                                         </td>
-                                        <td>[[x.amount]]</td>
+                                        <td>[[x.amount.toFixed(2)]]</td>
                                         <td>[[x.unit.name]]</td>
                                         <td>[[x.food.name]] <span class="text-muted" v-if="x.recipes.length > 0">([[x.recipes.join(', ')]])</span>
                                         </td>
@@ -505,7 +498,7 @@
                                 servings = this.servings_cache[item.list_recipe]
                             }
 
-                            entry.amount += (item.amount * servings).toFixed(2)
+                            entry.amount += item.amount * servings
 
                             if (item.list_recipe !== null && entry.recipes.indexOf(this.recipe_cache[item.list_recipe]) === -1) {
                                 entry.recipes.push(this.recipe_cache[item.list_recipe])
@@ -514,7 +507,7 @@
                             entry.entries.push(item.id)
                         } else {
                             if (item.list_recipe !== null) {
-                                item.amount = (item.amount * this.servings_cache[item.list_recipe]).toFixed(2)
+                                item.amount = item.amount * this.servings_cache[item.list_recipe]
                             }
                             item.unit = ((element.unit !== undefined && element.unit !== null) ? element.unit : {'name': ''})
                             item.entries = [element.id]
@@ -977,4 +970,4 @@
         });
     </script>
 
-{% endblock %}
+{% endblock %}

cookbook/templates/system.html

@@ -103,5 +103,19 @@
     {% endif %}
     <br/>
     <br/>
+    <h4>Debug</h4>
+    <textarea class="form-control" rows="20">
+Gunicoren Media: {{ gunicorn_media }}
+Sqlite: {{ postgres }}
+Debug: {{ debug }}
 
+{% for key,value in request.META.items %}{% if key in 'SERVER_PORT,REMOTE_HOST,REMOTE_ADDR,SERVER_PROTOCOL' %}{{ key }}:{{ value }}
+{% endif %}{% endfor %}
+{% for key,value in request.META.items %}{% if 'HTTP_' in key  %}{{ key }}:{{ value }}
+{% endif %}{% endfor %}
+{% for key,value in request.META.items %}{% if 'wsgi.' in key  %}{{ key }}:{{ value }}
+{% endif %}{% endfor %}
+    </textarea>
+    <br/>
+    <br/>
 {% endblock %}

cookbook/templates/url_import.html

@@ -1,4 +1,5 @@
 {% extends "base.html" %}
+{% comment %} TODO: refactor to be Vue app {% endcomment %}
 {% load i18n %}
 {% load static %}
 {% load custom_tags %}
@@ -29,26 +30,25 @@
                style="height:50%"
                href="{% bookmarklet request %}"
                title="{% trans 'Drag me to your bookmarks to import recipes from anywhere' %}">
-            <img src="{% static 'assets/favicon-16x16.png' %}">{% trans 'Bookmark Me!' %} </a>
+                <img src="{% static 'assets/favicon-16x16.png' %}">{% trans 'Bookmark Me!' %} </a>
         </div>
-        <nav class="nav nav-pills flex-sm-row" style="margin-bottom:10px">
+        <nav class="nav nav-pills flex-sm-row mb-2">
             <a class="nav-link active" href="#nav-url" data-toggle="tab" role="tab" aria-controls="nav-url"
-               aria-selected="true" @click="mode='url'">URL</a>
+               aria-selected="true" @click="mode='url'">{% trans 'URL' %}</a>
             <a class="nav-link" href="#nav-app" data-toggle="tab" role="tab" aria-controls="nav-app"
-               @click="mode='app'">App</a>
+               @click="mode='app'">{% trans 'App' %}</a>
             <a class="nav-link" href="#nav-source" data-toggle="tab" role="tab" aria-controls="nav-source"
-               @click="mode='source'">Source</a>
+               @click="mode='source'">{% trans 'Source' %}</a>
             <a class="nav-link disabled" href="#nav-text" data-toggle="tab" role="tab" aria-controls="nav-text"
-               @click="mode='text'">Text</a>
+               @click="mode='text'">{% trans 'Text' %}</a>
             <a class="nav-link disabled" href="#nav-file" data-toggle="tab" role="tab" aria-controls="nav-file"
-               @click="mode='file'">File</a>
+               @click="mode='file'">{% trans 'File' %}</a>
         </nav>
 
 
         <div class="tab-content" id="nav-tabContent">
-            <!-- Import URL -->
             <div class="tab-pane fade show active" id="nav-url" role="tabpanel">
-                <div class="btn-group btn-group-toggle" data-toggle="buttons">
+                <div class="btn-group btn-group-toggle mt-2" data-toggle="buttons">
                     <label class="btn btn-outline-info btn-sm active" @click="automatic=true">
                         <input type="radio" autocomplete="off" checked> Automatic
                     </label>
@@ -57,10 +57,13 @@
                         <input type="radio" autocomplete="off"> Manual
                     </label>
                 </div>
-                <div class="input-group my-2">
-                    <input class="form-control" v-model="remote_url" placeholder="{% trans 'Enter website URL' %}">
+                <div role="group" class="input-group mt-4">
+                    <input type="text" v-model="remote_url"
+                           class="form-control form-control-lg form-control-borderless form-control-search form-control"
+                           placeholder="{% trans 'Enter website URL' %}">
                     <div class="input-group-append">
-                        <button @click="loadRecipe()" class="btn btn-primary shadow-none" type="button"
+                        <button @click="loadRecipe()" class="btn btn-primary shadow-none"
+                                type="button"
                                 id="id_btn_search"><i class="fas fa-search"></i>
                         </button>
                     </div>
@@ -106,7 +109,7 @@
 
             <!-- Import JSON or HTML -->
             <div class=" tab-pane fade show" id="nav-source" role="tabpanel">
-                <div class="btn-group btn-group-toggle" data-toggle="buttons">
+                <div class="btn-group btn-group-toggle mt-2" data-toggle="buttons">
                     <label class="btn btn-outline-info btn-sm active" @click="automatic=true">
                         <input type="radio" autocomplete="off" checked> Automatic
                     </label>
@@ -115,7 +118,7 @@
                         <input type="radio" autocomplete="off"> Manual
                     </label>
                 </div>
-                <div class="input-group my-2">
+                <div class="input-group mt-4">
                     <textarea class="form-control input-group-append" v-model="source_data" rows=10
                               placeholder="{% trans 'Paste json or html source here to load recipe.' %}"
                               style="font-size: 12px">
@@ -455,7 +458,8 @@
 
                         <div class="form-group">
                             <label for="id_servings">{% trans 'Servings' %}</label>
-                            <b-form-input id="id_servings" class="form-control" v-model="recipe_data.servings" @change="recipe_data.servings = Math.round($event.replace(',','.'))"></b-form-input>
+                            <b-form-input id="id_servings" class="form-control" v-model="recipe_data.servings"
+                                          @change="recipe_data.servings = Math.round($event.replace(',','.'))"></b-form-input>
                         </div>
                     </div>
 

cookbook/templatetags/custom_tags.py

@@ -1,17 +1,19 @@
+import re
+from gettext import gettext as _
+
 import bleach
 import markdown as md
-import re
 from bleach_allowlist import markdown_attrs, markdown_tags
-from cookbook.helper.mdx_attributes import MarkdownFormatExtension
-from cookbook.helper.mdx_urlize import UrlizeExtension
-from cookbook.models import Space, get_model_name
 from django import template
 from django.db.models import Avg
 from django.templatetags.static import static
 from django.urls import NoReverseMatch, reverse
-from recipes import settings
 from rest_framework.authtoken.models import Token
-from gettext import gettext as _
+
+from cookbook.helper.mdx_attributes import MarkdownFormatExtension
+from cookbook.helper.mdx_urlize import UrlizeExtension
+from cookbook.models import Space, get_model_name
+from recipes import settings
 
 register = template.Library()
 
@@ -26,6 +28,11 @@ def get_class(value):
     return value.__class__
 
 
+@register.simple_tag
+def class_name(value):
+    return value.__class__.__name__
+
+
 @register.simple_tag
 def delete_url(model, pk):
     try:
@@ -87,10 +94,10 @@ def recipe_last(recipe, user):
 @register.simple_tag
 def page_help(page_name):
     help_pages = {
-        'edit_storage': 'https://vabene1111.github.io/recipes/features/external_recipes/',
-        'view_shopping': 'https://vabene1111.github.io/recipes/features/shopping/',
-        'view_import': 'https://vabene1111.github.io/recipes/features/import_export/',
-        'view_export': 'https://vabene1111.github.io/recipes/features/import_export/',
+        'edit_storage': 'https://docs.tandoor.dev/features/external_recipes/',
+        'view_shopping': 'https://docs.tandoor.dev/features/shopping/',
+        'view_import': 'https://docs.tandoor.dev/features/import_export/',
+        'view_export': 'https://docs.tandoor.dev/features/import_export/',
     }
 
     link = help_pages.get(page_name, '')
@@ -119,10 +126,10 @@ def markdown_link():
 @register.simple_tag
 def bookmarklet(request):
     if request.is_secure():
-        prefix = "https://"
+        protocol = "https://"
     else:
-        prefix = "http://"
-    server = prefix + request.get_host()
+        protocol = "http://"
+    server = protocol + request.get_host()
     prefix = settings.JS_REVERSE_SCRIPT_PREFIX
     # TODO is it safe to store the token in clear text in a bookmark?
     if (api_token := Token.objects.filter(user=request.user).first()) is None:
@@ -137,7 +144,7 @@ def bookmarklet(request):
             localStorage.setItem('redirectURL', '" + server + reverse('data_import_url') + "'); \
             localStorage.setItem('token', '" + api_token.__str__() + "'); \
             document.body.appendChild(document.createElement(\'script\')).src=\'" \
-            + server + prefix + static('js/bookmarklet.js') + "? \
+               + server + prefix + static('js/bookmarklet.js') + "? \
             r=\'+Math.floor(Math.random()*999999999);}})();"
     return re.sub(r"[\n\t\s]*", "", bookmark)
 
@@ -148,3 +155,15 @@ def base_path(request, path_type):
         return request._current_scheme_host + request.META.get('HTTP_X_SCRIPT_NAME', '')
     elif path_type == 'script':
         return request.META.get('HTTP_X_SCRIPT_NAME', '')
+    elif path_type == 'static_base':
+        return static('vue/manifest.json').replace('vue/manifest.json', '')
+
+
+@register.simple_tag
+def user_prefs(request):
+    from cookbook.serializer import \
+        UserPreferenceSerializer  # putting it with imports caused circular execution
+    try:
+        return UserPreferenceSerializer(request.user.userpreference, context={'request': request}).data
+    except AttributeError:
+        pass

cookbook/tests/api/test_api_meal_plan.py

@@ -106,7 +106,7 @@ def test_add(arg, request, u1_s2, recipe_1_s1, meal_type):
     r = c.post(
         reverse(LIST_URL),
         {'recipe': {'id': recipe_1_s1.id, 'name': recipe_1_s1.name, 'keywords': []}, 'meal_type': {'id': meal_type.id, 'name': meal_type.name},
-         'date': (datetime.now()).strftime("%Y-%m-%d"), 'servings': 1, 'title': 'test'},
+         'date': (datetime.now()).strftime("%Y-%m-%d"), 'servings': 1, 'title': 'test','shared':[]},
         content_type='application/json'
     )
     response = json.loads(r.content)

cookbook/tests/api/test_api_step.py

@@ -1,11 +1,11 @@
 import json
 
 import pytest
-from django.db.models import Subquery, OuterRef
+from django.db.models import OuterRef, Subquery
 from django.urls import reverse
 from django_scopes import scopes_disabled
 
-from cookbook.models import Step, Ingredient
+from cookbook.models import Ingredient, Step
 
 LIST_URL = 'api:step-list'
 DETAIL_URL = 'api:step-detail'
@@ -23,8 +23,8 @@ def test_list_permission(arg, request):
 
 
 def test_list_space(recipe_1_s1, u1_s1, u1_s2, space_2):
-    assert len(json.loads(u1_s1.get(reverse(LIST_URL)).content)) == 2
-    assert len(json.loads(u1_s2.get(reverse(LIST_URL)).content)) == 0
+    assert len(json.loads(u1_s1.get(reverse(LIST_URL)).content)['results']) == 2
+    assert len(json.loads(u1_s2.get(reverse(LIST_URL)).content)['results']) == 0
 
     with scopes_disabled():
         recipe_1_s1.space = space_2
@@ -32,9 +32,9 @@ def test_list_space(recipe_1_s1, u1_s1, u1_s2, space_2):
         Step.objects.update(space=Subquery(Step.objects.filter(pk=OuterRef('pk')).values('recipe__space')[:1]))
         Ingredient.objects.update(space=Subquery(Ingredient.objects.filter(pk=OuterRef('pk')).values('step__recipe__space')[:1]))
 
-    assert len(json.loads(u1_s1.get(reverse(LIST_URL)).content)) == 0
-    assert len(json.loads(u1_s2.get(reverse(LIST_URL)).content)) == 2
-
+    assert len(json.loads(u1_s1.get(reverse(LIST_URL)).content)['results']) == 0
+    assert len(json.loads(u1_s2.get(reverse(LIST_URL)).content)['results']) == 2
+    
 
 @pytest.mark.parametrize("arg", [
     ['a_u', 403],

cookbook/tests/api/test_api_userpreference.py

@@ -18,10 +18,10 @@ def test_add(u1_s1, u2_s1):
     with scopes_disabled():
         UserPreference.objects.filter(user=auth.get_user(u1_s1)).delete()
 
-    r = u2_s1.post(reverse(LIST_URL), {'user': auth.get_user(u1_s1).id}, content_type='application/json')
+    r = u2_s1.post(reverse(LIST_URL), {'user': auth.get_user(u1_s1).id, 'plan_share': []}, content_type='application/json')
     assert r.status_code == 404
 
-    r = u1_s1.post(reverse(LIST_URL), {'user': auth.get_user(u1_s1).id}, content_type='application/json')
+    r = u1_s1.post(reverse(LIST_URL), {'user': auth.get_user(u1_s1).id, 'plan_share': []}, content_type='application/json')
     assert r.status_code == 200
 
 

cookbook/urls.py

@@ -2,16 +2,17 @@ from pydoc import locate
 
 from django.urls import include, path
 from django.views.generic import TemplateView
-from recipes.version import VERSION_NUMBER
-from rest_framework import routers, permissions
+from rest_framework import permissions, routers
 from rest_framework.schemas import get_schema_view
 
 from cookbook.helper import dal
+from recipes.settings import DEBUG
+from recipes.version import VERSION_NUMBER
 
-from .models import (Comment, Food, InviteLink, Keyword, MealPlan, Recipe,
-                     RecipeBook, RecipeBookEntry, RecipeImport, ShoppingList,
-                     Storage, Supermarket, SupermarketCategory, Sync, SyncLog, Unit, get_model_name, Automation, UserFile)
-from .views import api, data, delete, edit, import_export, lists, new, views, telegram
+from .models import (Automation, Comment, Food, InviteLink, Keyword, MealPlan, Recipe, RecipeBook,
+                     RecipeBookEntry, RecipeImport, ShoppingList, Step, Storage, Supermarket,
+                     SupermarketCategory, Sync, SyncLog, Unit, UserFile, get_model_name)
+from .views import api, data, delete, edit, import_export, lists, new, telegram, views
 
 router = routers.DefaultRouter()
 router.register(r'user-name', api.UserNameViewSet, basename='username')
@@ -58,7 +59,6 @@ urlpatterns = [
     path('search/v2/', views.search_v2, name='view_search_v2'),
     path('books/', views.books, name='view_books'),
     path('plan/', views.meal_plan, name='view_plan'),
-    path('plan_new/', views.meal_plan_new, name='view_plan_new'),
     path('plan/entry/<int:pk>', views.meal_plan_entry, name='view_plan_entry'),
     path('shopping/', views.shopping_list, name='view_shopping'),
     path('shopping/<int:pk>', views.shopping_list, name='view_shopping'),
@@ -68,8 +68,6 @@ urlpatterns = [
     path('history/', views.history, name='view_history'),
     path('supermarket/', views.supermarket, name='view_supermarket'),
     path('abuse/<slug:token>', views.report_share_abuse, name='view_report_share_abuse'),
-    path('test/', views.test, name='view_test'),
-    path('test2/', views.test2, name='view_test2'),
 
     path('import/', import_export.import_recipe, name='view_import'),
     path('import-response/<int:pk>/', import_export.import_response, name='view_import_response'),
@@ -178,7 +176,7 @@ for m in generic_models:
             )
         )
 
-vue_models = [Food, Keyword, Unit, Supermarket, SupermarketCategory, Automation, UserFile]
+vue_models = [Food, Keyword, Unit, Supermarket, SupermarketCategory, Automation, UserFile, Step]
 for m in vue_models:
     py_name = get_model_name(m)
     url_name = py_name.replace('_', '-')
@@ -189,3 +187,7 @@ for m in vue_models:
                 f'list/{url_name}/', c, name=f'list_{py_name}'
             )
         )
+
+if DEBUG:
+    urlpatterns.append(path('test/', views.test, name='view_test'))
+    urlpatterns.append(path('test2/', views.test2, name='view_test2'))

cookbook/views/api.py

@@ -2,11 +2,11 @@ import io
 import json
 import re
 import uuid
+from collections import OrderedDict
 
 import requests
 from annoying.decorators import ajax_request
 from annoying.functions import get_object_or_None
-from collections import OrderedDict
 from django.contrib import messages
 from django.contrib.auth.models import User
 from django.contrib.postgres.search import TrigramSimilarity
@@ -15,12 +15,12 @@ from django.core.files import File
 from django.db.models import Case, ProtectedError, Q, Value, When
 from django.db.models.fields.related import ForeignObjectRel
 from django.http import FileResponse, HttpResponse, JsonResponse
-from django_scopes import scopes_disabled
-from django.shortcuts import redirect, get_object_or_404
+from django.shortcuts import get_object_or_404, redirect
 from django.urls import reverse
 from django.utils.translation import gettext as _
+from django_scopes import scopes_disabled
 from icalendar import Calendar, Event
-from recipe_scrapers import scrape_me, WebsiteNotImplementedError, NoSchemaFoundInWildMode
+from recipe_scrapers import NoSchemaFoundInWildMode, WebsiteNotImplementedError, scrape_me
 from rest_framework import decorators, status, viewsets
 from rest_framework.exceptions import APIException, PermissionDenied
 from rest_framework.pagination import PageNumberPagination
@@ -28,41 +28,40 @@ from rest_framework.parsers import MultiPartParser
 from rest_framework.renderers import JSONRenderer, TemplateHTMLRenderer
 from rest_framework.response import Response
 from rest_framework.viewsets import ViewSetMixin
-from treebeard.exceptions import PathOverflow, InvalidMoveToDescendant, InvalidPosition
+from treebeard.exceptions import InvalidMoveToDescendant, InvalidPosition, PathOverflow
 
 from cookbook.helper.image_processing import handle_image
 from cookbook.helper.ingredient_parser import IngredientParser
-from cookbook.helper.permission_helper import (CustomIsAdmin, CustomIsGuest,
-                                               CustomIsOwner, CustomIsShare,
-                                               CustomIsShared, CustomIsUser,
+from cookbook.helper.permission_helper import (CustomIsAdmin, CustomIsGuest, CustomIsOwner,
+                                               CustomIsShare, CustomIsShared, CustomIsUser,
                                                group_required)
 from cookbook.helper.recipe_html_import import get_recipe_from_source
-
-from cookbook.helper.recipe_search import search_recipes, get_facet
+from cookbook.helper.recipe_search import get_facet, old_search, search_recipes
 from cookbook.helper.recipe_url_import import get_from_scraper
-from cookbook.models import (CookLog, Food, Ingredient, Keyword, MealPlan,
-                             MealType, Recipe, RecipeBook, ShoppingList,
-                             ShoppingListEntry, ShoppingListRecipe, Step,
-                             Storage, Sync, SyncLog, Unit, UserPreference,
-                             ViewLog, RecipeBookEntry, Supermarket, ImportLog, BookmarkletImport, SupermarketCategory, UserFile, ShareLink, SupermarketCategoryRelation, Automation)
+from cookbook.models import (Automation, BookmarkletImport, CookLog, Food, ImportLog, Ingredient,
+                             Keyword, MealPlan, MealType, Recipe, RecipeBook, RecipeBookEntry,
+                             ShareLink, ShoppingList, ShoppingListEntry, ShoppingListRecipe, Step,
+                             Storage, Supermarket, SupermarketCategory, SupermarketCategoryRelation,
+                             Sync, SyncLog, Unit, UserFile, UserPreference, ViewLog)
 from cookbook.provider.dropbox import Dropbox
 from cookbook.provider.local import Local
 from cookbook.provider.nextcloud import Nextcloud
-from cookbook.schemas import FilterSchema, RecipeSchema, TreeSchema
-from cookbook.serializer import (FoodSerializer, IngredientSerializer,
-                                 KeywordSerializer, MealPlanSerializer,
-                                 MealTypeSerializer, RecipeBookSerializer,
-                                 RecipeImageSerializer, RecipeSerializer,
-                                 ShoppingListAutoSyncSerializer,
-                                 ShoppingListEntrySerializer,
-                                 ShoppingListRecipeSerializer,
-                                 ShoppingListSerializer, StepSerializer,
-                                 StorageSerializer, SyncLogSerializer,
-                                 SyncSerializer, UnitSerializer,
-                                 UserNameSerializer, UserPreferenceSerializer,
-                                 ViewLogSerializer, CookLogSerializer, RecipeBookEntrySerializer,
-                                 RecipeOverviewSerializer, SupermarketSerializer, ImportLogSerializer,
-                                 BookmarkletImportSerializer, SupermarketCategorySerializer, UserFileSerializer, SupermarketCategoryRelationSerializer, AutomationSerializer)
+from cookbook.schemas import FilterSchema, QueryParam, QueryParamAutoSchema, TreeSchema
+from cookbook.serializer import (AutomationSerializer, BookmarkletImportSerializer,
+                                 CookLogSerializer, FoodSerializer, ImportLogSerializer,
+                                 IngredientSerializer, KeywordSerializer, MealPlanSerializer,
+                                 MealTypeSerializer, RecipeBookEntrySerializer,
+                                 RecipeBookSerializer, RecipeImageSerializer,
+                                 RecipeOverviewSerializer, RecipeSerializer,
+                                 ShoppingListAutoSyncSerializer, ShoppingListEntrySerializer,
+                                 ShoppingListRecipeSerializer, ShoppingListSerializer,
+                                 StepSerializer, StorageSerializer,
+                                 SupermarketCategoryRelationSerializer,
+                                 SupermarketCategorySerializer, SupermarketSerializer,
+                                 SyncLogSerializer, SyncSerializer, UnitSerializer,
+                                 UserFileSerializer, UserNameSerializer, UserPreferenceSerializer,
+                                 ViewLogSerializer)
+from recipes import settings
 
 
 class StandardFilterMixin(ViewSetMixin):
@@ -109,7 +108,8 @@ class FuzzyFilterMixin(ViewSetMixin):
             if fuzzy:
                 self.queryset = (
                     self.queryset
-                        .annotate(exact=Case(When(name__iexact=query, then=(Value(100))), default=Value(0)))  # put exact matches at the top of the result set
+                        .annotate(exact=Case(When(name__iexact=query, then=(Value(100))),
+                                             default=Value(0)))  # put exact matches at the top of the result set
                         .annotate(trigram=TrigramSimilarity('name', query)).filter(trigram__gt=0.2)
                         .order_by('-exact', '-trigram')
                 )
@@ -117,7 +117,8 @@ class FuzzyFilterMixin(ViewSetMixin):
                 # TODO have this check unaccent search settings or other search preferences?
                 self.queryset = (
                     self.queryset
-                        .annotate(exact=Case(When(name__iexact=query, then=(Value(100))), default=Value(0)))  # put exact matches at the top of the result set
+                        .annotate(exact=Case(When(name__iexact=query, then=(Value(100))),
+                                             default=Value(0)))  # put exact matches at the top of the result set
                         .filter(name__icontains=query).order_by('-exact', 'name')
                 )
 
@@ -201,7 +202,8 @@ class MergeMixin(ViewSetMixin):
                 source.delete()
                 return Response(content, status=status.HTTP_200_OK)
             except Exception:
-                content = {'error': True, 'msg': _(f'An error occurred attempting to merge {source.name} with {target.name}')}
+                content = {'error': True,
+                           'msg': _(f'An error occurred attempting to merge {source.name} with {target.name}')}
                 return Response(content, status=status.HTTP_400_BAD_REQUEST)
 
 
@@ -217,7 +219,7 @@ class TreeMixin(MergeMixin, FuzzyFilterMixin):
             if root.isnumeric():
                 try:
                     root = int(root)
-                except self.model.DoesNotExist:
+                except ValueError:
                     self.queryset = self.model.objects.none()
                 if root == 0:
                     self.queryset = self.model.get_root_nodes()
@@ -245,7 +247,7 @@ class TreeMixin(MergeMixin, FuzzyFilterMixin):
         try:
             child = self.model.objects.get(pk=pk, space=self.request.space)
         except (self.model.DoesNotExist):
-            content = {'error': True, 'msg': _(f'No {self.basename} with id {child} exists')}
+            content = {'error': True, 'msg': _(f'No {self.basename} with id {pk} exists')}
             return Response(content, status=status.HTTP_404_NOT_FOUND)
 
         parent = int(parent)
@@ -274,7 +276,7 @@ class TreeMixin(MergeMixin, FuzzyFilterMixin):
                 child.move(parent, f'{node_location}-child')
             content = {'msg': _(f'{child.name} was moved successfully to parent {parent.name}')}
             return Response(content, status=status.HTTP_200_OK)
-        except (PathOverflow, InvalidMoveToDescendant, InvalidPosition):
+        except (PathOverflow, InvalidMoveToDescendant, InvalidPosition) as e:
             content = {'error': True, 'msg': _('An error occurred attempting to move ') + child.name}
             return Response(content, status=status.HTTP_400_BAD_REQUEST)
 
@@ -409,7 +411,8 @@ class RecipeBookViewSet(viewsets.ModelViewSet, StandardFilterMixin):
     permission_classes = [CustomIsOwner]
 
     def get_queryset(self):
-        self.queryset = self.queryset.filter(created_by=self.request.user).filter(space=self.request.space)
+        self.queryset = self.queryset.filter(Q(created_by=self.request.user) | Q(shared=self.request.user)).filter(
+            space=self.request.space).distinct()
         return super().get_queryset()
 
 
@@ -427,7 +430,9 @@ class RecipeBookEntryViewSet(viewsets.ModelViewSet, viewsets.GenericViewSet):
     permission_classes = [CustomIsOwner]
 
     def get_queryset(self):
-        queryset = self.queryset.filter(Q(book__created_by=self.request.user) | Q(book__shared=self.request.user)).filter(book__space=self.request.space).distinct()
+        queryset = self.queryset.filter(
+            Q(book__created_by=self.request.user) | Q(book__shared=self.request.user)).filter(
+            book__space=self.request.space).distinct()
 
         recipe_id = self.request.query_params.get('recipe', None)
         if recipe_id is not None:
@@ -497,8 +502,21 @@ class StepViewSet(viewsets.ModelViewSet):
     queryset = Step.objects
     serializer_class = StepSerializer
     permission_classes = [CustomIsUser]
+    pagination_class = DefaultPagination
+    query_params = [
+        QueryParam(name='recipe', description=_('ID of recipe a step is part of. For multiple repeat parameter.'),
+                   qtype='int'),
+        QueryParam(name='query', description=_('Query string matched (fuzzy) against object name.'), qtype='string'),
+    ]
+    schema = QueryParamAutoSchema()
 
     def get_queryset(self):
+        recipes = self.request.query_params.getlist('recipe', [])
+        query = self.request.query_params.get('query', None)
+        if len(recipes) > 0:
+            self.queryset = self.queryset.filter(recipe__in=recipes)
+        if query is not None:
+            self.queryset = self.queryset.filter(Q(name__icontains=query) | Q(recipe__name__icontains=query))
         return self.queryset.filter(recipe__space=self.request.space)
 
 
@@ -527,8 +545,31 @@ class RecipeViewSet(viewsets.ModelViewSet):
     # TODO split read and write permission for meal plan guest
     permission_classes = [CustomIsShare | CustomIsGuest]
     pagination_class = RecipePagination
-
-    schema = RecipeSchema()
+    # TODO the boolean params below (keywords_or through new) should be updated to boolean types with front end refactored accordingly
+    query_params = [
+        QueryParam(name='query', description=_(
+            'Query string matched (fuzzy) against recipe name. In the future also fulltext search.')),
+        QueryParam(name='keywords', description=_('ID of keyword a recipe should have. For multiple repeat parameter.'),
+                   qtype='int'),
+        QueryParam(name='foods', description=_('ID of food a recipe should have. For multiple repeat parameter.'),
+                   qtype='int'),
+        QueryParam(name='units', description=_('ID of unit a recipe should have.'), qtype='int'),
+        QueryParam(name='rating', description=_('Rating a recipe should have. [0 - 5]'), qtype='int'),
+        QueryParam(name='books', description=_('ID of book a recipe should be in. For multiple repeat parameter.')),
+        QueryParam(name='keywords_or', description=_(
+            'If recipe should have all (AND=''false'') or any (OR=''<b>true</b>'') of the provided keywords.')),
+        QueryParam(name='foods_or', description=_(
+            'If recipe should have all (AND=''false'') or any (OR=''<b>true</b>'') of the provided foods.')),
+        QueryParam(name='books_or', description=_(
+            'If recipe should be in all (AND=''false'') or any (OR=''<b>true</b>'') of the provided books.')),
+        QueryParam(name='internal',
+                   description=_('If only internal recipes should be returned. [''true''/''<b>false</b>'']')),
+        QueryParam(name='random',
+                   description=_('Returns the results in randomized order. [''true''/''<b>false</b>'']')),
+        QueryParam(name='new',
+                   description=_('Returns new results first in search results. [''true''/''<b>false</b>'']')),
+    ]
+    schema = QueryParamAutoSchema()
 
     def get_queryset(self):
         share = self.request.query_params.get('share', None)
@@ -539,7 +580,16 @@ class RecipeViewSet(viewsets.ModelViewSet):
 
         return super().get_queryset()
 
+    def list(self, request, *args, **kwargs):
+        if self.request.GET.get('debug', False):
+            return JsonResponse({
+                'new': str(self.get_queryset().query),
+                'old': str(old_search(request).query)
+            })
+        return super().list(request, *args, **kwargs)
+
     # TODO write extensive tests for permissions
+
     def get_serializer_class(self):
         if self.action == 'list':
             return RecipeOverviewSerializer
@@ -591,6 +641,20 @@ class ShoppingListEntryViewSet(viewsets.ModelViewSet):
     queryset = ShoppingListEntry.objects
     serializer_class = ShoppingListEntrySerializer
     permission_classes = [CustomIsOwner | CustomIsShared]
+    query_params = [
+        QueryParam(name='id',
+                   description=_('Returns the shopping list entry with a primary key of id.  Multiple values allowed.'),
+                   qtype='int'),
+        QueryParam(
+            name='checked',
+            description=_(
+                'Filter shopping list entries on checked.  [''true'', ''false'', ''both'', ''<b>recent</b>'']<br>  - ''recent'' includes unchecked items and recently completed items.')
+        ),
+        QueryParam(name='supermarket',
+                   description=_('Returns the shopping list entries sorted by supermarket category order.'),
+                   qtype='int'),
+    ]
+    schema = QueryParamAutoSchema()
 
     def get_queryset(self):
         return self.queryset.filter(
@@ -631,7 +695,7 @@ class ViewLogViewSet(viewsets.ModelViewSet):
 class CookLogViewSet(viewsets.ModelViewSet):
     queryset = CookLog.objects
     serializer_class = CookLogSerializer
-    permission_classes = [CustomIsOwner]  # CustomIsShared? since ratings are in the cooklog?
+    permission_classes = [CustomIsOwner]
     pagination_class = DefaultPagination
 
     def get_queryset(self):
@@ -718,10 +782,9 @@ def get_recipe_file(request, recipe_id):
 
 @group_required('user')
 def sync_all(request):
-    if request.space.demo:
-        messages.add_message(
-            request, messages.ERROR, _('This feature is not available in the demo version!')
-        )
+    if request.space.demo or settings.HOSTED:
+        messages.add_message(request, messages.ERROR,
+                             _('This feature is not yet available in the hosted version of tandoor!'))
         return redirect('index')
 
     monitors = Sync.objects.filter(active=True).filter(space=request.user.userpreference.space)
@@ -758,7 +821,8 @@ def share_link(request, pk):
     if request.space.allow_sharing:
         recipe = get_object_or_404(Recipe, pk=pk, space=request.space)
         link = ShareLink.objects.create(recipe=recipe, created_by=request.user, space=request.space)
-        return JsonResponse({'pk': pk, 'share': link.uuid, 'link': request.build_absolute_uri(reverse('view_recipe', args=[pk, link.uuid]))})
+        return JsonResponse({'pk': pk, 'share': link.uuid,
+                             'link': request.build_absolute_uri(reverse('view_recipe', args=[pk, link.uuid]))})
     else:
         return JsonResponse({'error': 'sharing_disabled'}, status=403)
 
@@ -919,7 +983,7 @@ def ingredient_from_string(request):
 
 @group_required('user')
 def get_facets(request):
-    key = request.GET['hash']
+    key = request.GET.get('hash', None)
 
     return JsonResponse(
         {

cookbook/views/data.py

@@ -5,6 +5,7 @@ from io import BytesIO
 
 import requests
 from django.contrib import messages
+from django.core.exceptions import ObjectDoesNotExist
 from django.core.files import File
 from django.db.transaction import atomic
 from django.http import HttpResponse, HttpResponseRedirect
@@ -24,6 +25,7 @@ from cookbook.helper.recipe_url_import import parse_cooktime
 from cookbook.models import (Comment, Food, Ingredient, Keyword, Recipe,
                              RecipeImport, Step, Sync, Unit, UserPreference)
 from cookbook.tables import SyncTable
+from recipes import settings
 
 
 @group_required('user')
@@ -36,6 +38,10 @@ def sync(request):
         messages.add_message(request, messages.WARNING, _('You have more users than allowed in your space.'))
         return HttpResponseRedirect(reverse('index'))
 
+    if request.space.demo or settings.HOSTED:
+        messages.add_message(request, messages.ERROR, _('This feature is not yet available in the hosted version of tandoor!'))
+        return redirect('index')
+
     if request.method == "POST":
         if not has_group_permission(request.user, ['admin']):
             messages.add_message(request, messages.ERROR, _('You do not have the required permissions to view this page!'))
@@ -150,8 +156,15 @@ def import_url(request):
         recipe.steps.add(step)
 
         for kw in data['keywords']:
-            k, created = Keyword.objects.get_or_create(name=kw['text'], space=request.space)
-            recipe.keywords.add(k)
+            if data['all_keywords']: # do not remove this check :) https://github.com/vabene1111/recipes/issues/645
+                k, created = Keyword.objects.get_or_create(name=kw['text'], space=request.space)
+                recipe.keywords.add(k)
+            else:
+                try:
+                    k = Keyword.objects.get(name=kw['text'], space=request.space)
+                    recipe.keywords.add(k)
+                except ObjectDoesNotExist:
+                    pass
 
         ingredient_parser = IngredientParser(request, True)
         for ing in data['recipeIngredient']:
@@ -178,13 +191,12 @@ def import_url(request):
 
             ingredient.save()
             step.ingredients.add(ingredient)
-            print(ingredient)
 
         if 'image' in data and data['image'] != '' and data['image'] is not None:
             try:
                 response = requests.get(data['image'])
 
-                img, filetype = handle_image(request, BytesIO(response.content))
+                img, filetype = handle_image(request, File(BytesIO(response.content), name='image'))
                 recipe.image = File(
                     img, name=f'{uuid.uuid4()}_{recipe.pk}{filetype}'
                 )

cookbook/views/delete.py

@@ -1,7 +1,8 @@
 from django.contrib import messages
+from django.db import models
 from django.db.models import ProtectedError
 from django.http import HttpResponseRedirect
-from django.shortcuts import get_object_or_404
+from django.shortcuts import get_object_or_404, render
 from django.urls import reverse, reverse_lazy
 from django.utils.translation import gettext as _
 from django.views.generic import DeleteView
@@ -23,9 +24,37 @@ class RecipeDelete(GroupRequiredMixin, DeleteView):
     model = Recipe
     success_url = reverse_lazy('index')
 
+    def delete(self, request, *args, **kwargs):
+        self.object = self.get_object()
+        # TODO make this more generic so that all delete functions benefit from this
+        if self.get_context_data()['protected_objects']:
+            return render(request, template_name=self.template_name, context=self.get_context_data())
+
+        success_url = self.get_success_url()
+        self.object.delete()
+        return HttpResponseRedirect(success_url)
+
     def get_context_data(self, **kwargs):
         context = super(RecipeDelete, self).get_context_data(**kwargs)
         context['title'] = _("Recipe")
+
+        # TODO make this more generic so that all delete functions benefit from this
+        self.object = self.get_object()
+        context['protected_objects'] = []
+        context['cascading_objects'] = []
+        context['set_null_objects'] = []
+        for x in self.object._meta.get_fields():
+            try:
+                related = x.related_model.objects.filter(**{x.field.name: self.object})
+                if related.exists() and x.on_delete == models.PROTECT:
+                    context['protected_objects'].append(related)
+                if related.exists() and x.on_delete == models.CASCADE:
+                    context['cascading_objects'].append(related)
+                if related.exists() and x.on_delete == models.SET_NULL:
+                    context['set_null_objects'].append(related)
+            except AttributeError:
+                pass
+
         return context
 
 

cookbook/views/edit.py

@@ -1,14 +1,12 @@
 import os
 
 from django.contrib import messages
-from django.db.models import Q
 from django.http import HttpResponseRedirect
-from django.shortcuts import get_object_or_404, render
+from django.shortcuts import get_object_or_404, render, redirect
 from django.urls import reverse
 from django.utils.translation import gettext as _
 from django.views.generic import UpdateView
 from django.views.generic.edit import FormMixin
-from django_scopes import scopes_disabled
 
 from cookbook.forms import (CommentForm, ExternalRecipeForm,
                             MealPlanForm,
@@ -17,12 +15,13 @@ from cookbook.forms import (CommentForm, ExternalRecipeForm,
 from cookbook.helper.permission_helper import (GroupRequiredMixin,
                                                OwnerRequiredMixin,
                                                group_required)
-from cookbook.models import (Comment, Ingredient, MealPlan,
-                             MealType, Recipe, RecipeBook, RecipeImport,
+from cookbook.models import (Comment, MealPlan,
+                             MealType, Recipe, RecipeImport,
                              Storage, Sync, UserPreference)
 from cookbook.provider.dropbox import Dropbox
 from cookbook.provider.local import Local
 from cookbook.provider.nextcloud import Nextcloud
+from recipes import settings
 
 
 @group_required('guest')
@@ -126,6 +125,10 @@ def edit_storage(request, pk):
         messages.add_message(request, messages.ERROR, _('You cannot edit this storage!'))
         return HttpResponseRedirect(reverse('list_storage'))
 
+    if request.space.demo or settings.HOSTED:
+        messages.add_message(request, messages.ERROR, _('This feature is not yet available in the hosted version of tandoor!'))
+        return redirect('index')
+
     if request.method == "POST":
         form = StorageForm(request.POST, instance=instance)
         if form.is_valid():

cookbook/views/lists.py

@@ -221,6 +221,23 @@ def user_file(request):
     )
 
 
+@group_required('user')
+def step(request):
+    # recipe-param is the name of the parameters used when filtering recipes by this attribute
+    # model-name is the models.js name of the model, probably ALL-CAPS
+    return render(
+        request,
+        'generic/model_template.html',
+        {
+            "title": _("Steps"),
+            "config": {
+                'model': "STEP",  # *REQUIRED* name of the model in models.js
+                'recipe_param': 'steps',
+            }
+        }
+    )
+
+
 @group_required('user')
 def shopping_list_new(request):
     # recipe-param is the name of the parameters used when filtering recipes by this attribute

cookbook/views/new.py

@@ -19,6 +19,7 @@ from cookbook.helper.permission_helper import (GroupRequiredMixin,
 from cookbook.models import (InviteLink, MealPlan, MealType, Recipe,
                              RecipeBook, RecipeImport, ShareLink, Step, UserPreference)
 from cookbook.views.edit import SpaceFormMixing
+from recipes import settings
 
 
 class RecipeCreate(GroupRequiredMixin, CreateView):
@@ -90,6 +91,9 @@ class StorageCreate(GroupRequiredMixin, CreateView):
         obj.created_by = self.request.user
         obj.space = self.request.space
         obj.save()
+        if self.request.space.demo or settings.HOSTED:
+            messages.add_message(self.request, messages.ERROR, _('This feature is not yet available in the hosted version of tandoor!'))
+            return redirect('index')
         return HttpResponseRedirect(reverse('edit_storage', kwargs={'pk': obj.pk}))
 
     def get_context_data(self, **kwargs):

cookbook/views/views.py

@@ -13,7 +13,7 @@ from django.contrib.auth.password_validation import validate_password
 from django.core.exceptions import ValidationError
 from django.db.models import Avg, Q, Sum
 from django.http import HttpResponseRedirect, JsonResponse
-from django.shortcuts import get_object_or_404, render, redirect
+from django.shortcuts import get_object_or_404, redirect, render
 from django.urls import reverse, reverse_lazy
 from django.utils import timezone
 from django.utils.translation import gettext as _
@@ -22,16 +22,15 @@ from django_tables2 import RequestConfig
 from rest_framework.authtoken.models import Token
 
 from cookbook.filters import RecipeFilter
-from cookbook.forms import (CommentForm, Recipe, User,
-                            UserCreateForm, UserNameForm, UserPreference,
-                            UserPreferenceForm, SpaceJoinForm, SpaceCreateForm,
-                            SearchPreferenceForm)
-from cookbook.helper.permission_helper import group_required, share_link_valid, has_group_permission
-from cookbook.models import (Comment, CookLog, InviteLink, MealPlan,
-                             ViewLog, ShoppingList, Space, Keyword, RecipeImport, Unit,
-                             Food, UserFile, ShareLink, SearchPreference, SearchFields)
-from cookbook.tables import (CookLogTable, RecipeTable, RecipeTableSmall,
-                             ViewLogTable, InviteLinkTable)
+from cookbook.forms import (CommentForm, Recipe, SearchPreferenceForm, SpaceCreateForm,
+                            SpaceJoinForm, User, UserCreateForm, UserNameForm, UserPreference,
+                            UserPreferenceForm)
+from cookbook.helper.permission_helper import group_required, has_group_permission, share_link_valid
+from cookbook.models import (Comment, CookLog, Food, InviteLink, Keyword, MealPlan, RecipeImport,
+                             SearchFields, SearchPreference, ShareLink, ShoppingList, Space, Unit,
+                             UserFile, ViewLog)
+from cookbook.tables import (CookLogTable, InviteLinkTable, RecipeTable, RecipeTableSmall,
+                             ViewLogTable)
 from cookbook.views.data import Object
 from recipes.version import BUILD_REF, VERSION_NUMBER
 
@@ -220,11 +219,6 @@ def meal_plan(request):
     return render(request, 'meal_plan.html', {})
 
 
-@group_required('user')
-def meal_plan_new(request):
-    return render(request, 'meal_plan_new.html', {})
-
-
 @group_required('user')
 def supermarket(request):
     return render(request, 'supermarket.html', {})
@@ -292,7 +286,7 @@ def user_settings(request):
     if request.method == "POST":
         if 'preference_form' in request.POST:
             active_tab = 'preferences'
-            form = UserPreferenceForm(request.POST, prefix='preference')
+            form = UserPreferenceForm(request.POST, prefix='preference', space=request.space)
             if form.is_valid():
                 if not up:
                     up = UserPreference(user=request.user)
@@ -307,6 +301,7 @@ def user_settings(request):
                 up.ingredient_decimals = form.cleaned_data['ingredient_decimals']  # noqa: E501
                 up.comments = form.cleaned_data['comments']
                 up.use_fractions = form.cleaned_data['use_fractions']
+                up.use_kj = form.cleaned_data['use_kj']
                 up.sticky_navbar = form.cleaned_data['sticky_navbar']
 
                 up.shopping_auto_sync = form.cleaned_data['shopping_auto_sync']
@@ -335,18 +330,21 @@ def user_settings(request):
                 if not sp:
                     sp = SearchPreferenceForm(user=request.user)
                 fields_searched = (
-                        len(search_form.cleaned_data['icontains'])
-                        + len(search_form.cleaned_data['istartswith'])
-                        + len(search_form.cleaned_data['trigram'])
-                        + len(search_form.cleaned_data['fulltext'])
+                    len(search_form.cleaned_data['icontains'])
+                    + len(search_form.cleaned_data['istartswith'])
+                    + len(search_form.cleaned_data['trigram'])
+                    + len(search_form.cleaned_data['fulltext'])
                 )
                 if fields_searched == 0:
                     search_form.add_error(None, _('You must select at least one field to search!'))
                     search_error = True
-                elif search_form.cleaned_data['search'] in ['websearch', 'raw'] and len(search_form.cleaned_data['fulltext']) == 0:
-                    search_form.add_error('search', _('To use this search method you must select at least one full text search field!'))
+                elif search_form.cleaned_data['search'] in ['websearch', 'raw'] and len(
+                        search_form.cleaned_data['fulltext']) == 0:
+                    search_form.add_error('search',
+                                          _('To use this search method you must select at least one full text search field!'))
                     search_error = True
-                elif search_form.cleaned_data['search'] in ['websearch', 'raw'] and len(search_form.cleaned_data['trigram']) > 0:
+                elif search_form.cleaned_data['search'] in ['websearch', 'raw'] and len(
+                        search_form.cleaned_data['trigram']) > 0:
                     search_form.add_error(None, _('Fuzzy search is not compatible with this search method!'))
                     search_error = True
                 else:
@@ -381,11 +379,12 @@ def user_settings(request):
 
                     sp.save()
     if up:
-        preference_form = UserPreferenceForm(instance=up)
+        preference_form = UserPreferenceForm(instance=up, space=request.space)
     else:
-        preference_form = UserPreferenceForm()
+        preference_form = UserPreferenceForm(space=request.space)
 
-    fields_searched = len(sp.icontains.all()) + len(sp.istartswith.all()) + len(sp.trigram.all()) + len(sp.fulltext.all())
+    fields_searched = len(sp.icontains.all()) + len(sp.istartswith.all()) + len(sp.trigram.all()) + len(
+        sp.fulltext.all())
     if sp and not search_error and fields_searched > 0:
         search_form = SearchPreferenceForm(instance=sp)
     elif not search_error:
@@ -395,7 +394,8 @@ def user_settings(request):
         api_token = Token.objects.create(user=request.user)
 
     # these fields require postgress - just disable them if postgress isn't available
-    if not settings.DATABASES['default']['ENGINE'] in ['django.db.backends.postgresql_psycopg2', 'django.db.backends.postgresql']:
+    if not settings.DATABASES['default']['ENGINE'] in ['django.db.backends.postgresql_psycopg2',
+                                                       'django.db.backends.postgresql']:
         search_form.fields['search'].disabled = True
         search_form.fields['lookup'].disabled = True
         search_form.fields['trigram'].disabled = True

docs/contribute.md

@@ -23,7 +23,7 @@ This application is developed using the Django framework for Python. They have e
 
 1. Clone this repository wherever you like and install the Python language for your OS (at least version 3.8)
 2. Open it in your favorite editor/IDE (e.g. PyCharm)
-    1. If you want, create a virutal environment for all your packages.
+    1. If you want, create a virtual environment for all your packages.
 3. Install all required packages: `pip install -r requirements.txt`
 4. Run the migrations: `python manage.py migrate`
 5. Start the development server: `python manage.py runserver`
@@ -59,6 +59,8 @@ folder of the GitHub repository.
 
 In order to contribute to the documentation you can fork the repository and edit the markdown files in the browser.
 
+Now install mkdocs and dependencies: `pip install mkdocs-material mkdocs-include-markdown-plugin`.
+
 If you want to test the documentation locally run `mkdocs serve` from the project root.
 
 ## Contribute Translations

docs/faq.md

@@ -37,4 +37,13 @@ There is only one installation of the Dropbox system, but it handles multiple us
 For Tandoor that means all people that work together on one recipe collection can be in one space. 
 If you want to host the collection of your friends family or your neighbor you can create a separate space for them (trough the admin interface).
 
-Sharing between spaces is currently not possible but is planned for future releases.
+Sharing between spaces is currently not possible but is planned for future releases.
+
+## Create Admin user / reset passwords
+To create a superuser or reset a lost password if access to the container is lost you need to 
+
+1. execute into the container using `docker-compose exec web_recipes sh`
+2. activate the virtual environment `source venv/bin/activate`
+3. run `python manage.py createsuperuser` and follow the steps shown.
+
+To change a password enter `python manage.py changepassword <username>` in step 3.

docs/features/authentication.md

@@ -60,6 +60,25 @@ Use the superuser account to grant permissions to the newly created users.
 To link an account to an already existing normal user go to the settings page of the user and link it. 
 Here you can also unlink your account if you no longer want to use a social login method.
 
+## LDAP
+
+LDAP authentication can be enabled in the `.env` file by setting `LDAP_AUTH=1`.
+If set, users listed in the LDAP instance will be able to sign in without signing up.
+These variables must be set to configure the connection to the LDAP instance:
+```
+AUTH_LDAP_SERVER_URI=ldap://ldap.example.org:389
+AUTH_LDAP_BIND_DN=uid=admin,ou=users,dc=example,dc=org
+AUTH_LDAP_BIND_PASSWORD=adminpassword
+AUTH_LDAP_USER_SEARCH_BASE_DN=ou=users,dc=example,dc=org
+```
+Additional optional variables:
+```
+AUTH_LDAP_USER_SEARCH_FILTER_STR=(uid=%(user)s)
+AUTH_LDAP_USER_ATTR_MAP={'first_name': 'givenName', 'last_name': 'sn', 'email': 'mail'}
+AUTH_LDAP_ALWAYS_UPDATE_USER=1
+AUTH_LDAP_CACHE_TIMEOUT=3600
+```
+
 ## Reverse Proxy Authentication
 
 !!! Info "Community Contributed Tutorial"

docs/features/import_export.md

@@ -2,13 +2,13 @@ This application features a very versatile import and export feature in order
 to offer the best experience possible and allow you to freely choose where your data goes.
 
 !!! warning "WIP"
-    The Module is relatively new. There is a know issue with [Timeouts](https://github.com/vabene1111/recipes/issues/417) on large exports.
+    The Module is relatively new. There is a known issue with [Timeouts](https://github.com/vabene1111/recipes/issues/417) on large exports.
     A fix is being developed and will likely be released with the next version.
 
-The Module is build with maximum flexibility and expandability in mind and allows to easily add new
+The Module is built with maximum flexibility and expandability in mind and allows to easily add new
 integrations to allow you to both import and export your recipes into whatever format you desire.
 
-Feel like there is an important integration missing ? Just take a look at the [integration issues](https://github.com/vabene1111/recipes/issues?q=is%3Aissue+is%3Aopen+label%3Aintegration) or open a new one
+Feel like there is an important integration missing? Just take a look at the [integration issues](https://github.com/vabene1111/recipes/issues?q=is%3Aissue+is%3Aopen+label%3Aintegration) or open a new one
 if your favorite one is missing.
 
 !!! info "Export"
@@ -36,12 +36,12 @@ Overview of the capabilities of the different integrations.
 | RezKonv     | ✔️      | ❌      |  ❌        |
 | OpenEats     | ✔️      | ❌      |  ⌚        |
 | Plantoeat     | ✔️      | ❌      |  ✔        |
-| CookBookApp     | ✔️      | ⌚      |  ❌        |
+| CookBookApp     | ✔️      | ⌚      |  ✔️        |
 
 ✔ = implemented, ❌ = not implemented and not possible/planned, ⌚ = not yet implemented
 
 ## Default
-The default integration is the build in (and preferred) way to import and export recipes.
+The default integration is the built in (and preferred) way to import and export recipes.
 It is maintained with new fields added and contains all data to transfer your recipes from one installation to another.
 
 It is also one of the few recipe formats that is actually structured in a way that allows for 
@@ -90,7 +90,7 @@ Mealie provides structured data similar to nextcloud.
 
 To migrate your recipes 
 
-1. Go to you Mealie settings and create a new Backup
+1. Go to your Mealie settings and create a new Backup
 2. Download the backup by clicking on it and pressing download (this wasn't working for me, so I had to manually pull it from the server)
 3. Upload the entire `.zip` file to the importer page and import everything
 
@@ -118,7 +118,7 @@ Recipes.zip/
 ```
 
 ## Safron
-Go to you safron settings page and export your recipes.
+Go to your safron settings page and export your recipes.
 Then simply upload the entire `.zip` file to the importer.
 
 !!! warning "Images"
@@ -131,8 +131,8 @@ The `.paprikarecipes` file is basically just a zip with gzipped contents. Simply
 all your recipes. 
 
 ## Pepperplate
-Pepperplate provides a `.zip` files contain all your recipes as `.txt` files. These files are well-structured and allow
-the import of all data without loosing anything.
+Pepperplate provides a `.zip` file containing all of your recipes as `.txt` files. These files are well-structured and allow
+the import of all data without losing anything.
 
 Simply export the recipes from Pepperplate and upload the zip to Tandoor. Images are not included in the export and 
 thus cannot be imported.
@@ -145,7 +145,7 @@ This format is basically completely unstructured and every export looks differen
 and leads to suboptimal results. Images are also not supported as they are not included in the export (at least 
 the tests I had).
 
-Usually the import should recognize all ingredients and put everything else into the instructions. If you import fails
+Usually the import should recognize all ingredients and put everything else into the instructions. If your import fails
 or is worse than this feel free to provide me with more example data and I can try to improve the importer.
 
 As ChefTap cannot import these files anyway there won't be an exporter implemented in Tandoor.
@@ -154,7 +154,7 @@ As ChefTap cannot import these files anyway there won't be an exporter implement
 Meal master can be imported by uploading one or more meal master files. 
 The files should either be `.txt`, `.MMF` or `.MM` files. 
 
-The MealMaster spec allow for many variations. Currently, only the on column format for ingredients is supported.
+The MealMaster spec allow for many variations. Currently, only the one column format for ingredients is supported.
 Second line notes to ingredients are currently also not imported as a note but simply put into the instructions.
 If you have MealMaster recipes that cannot be imported feel free to raise an issue.
 
@@ -166,7 +166,7 @@ The generated file can simply be imported into Tandoor.
 As I only had limited sample data feel free to open an issue if your RezKonv export cannot be imported.
 
 ## Recipekeeper
-Recipe keeper allows to export a zip file containing recipes and images using its apps. 
+Recipe keeper allows you to export a zip file containing recipes and images using its apps. 
 This zip file can simply be imported into Tandoor.
 
 ## OpenEats
@@ -213,8 +213,8 @@ Store the outputted json string in a `.json` file and simply import it using the
 
 ## Plantoeat
 
-Plan to eat allow to export a text file containing all your recipes. Simply upload that text file to Tandoor to import all recipes
+Plan to eat allows you to export a text file containing all your recipes. Simply upload that text file to Tandoor to import all recipes
 
 ## CookBookApp
 
-CookBookApp can export .zip files containing .yml files. Upload the entire ZIP to Tandoor to import all conluded recipes.
+CookBookApp can export .zip files containing .html files. Upload the entire ZIP to Tandoor to import all included recipes.

docs/features/templating.md

@@ -17,7 +17,7 @@ from recipe scaling.
 Currently the only available variable in the Templating context is `ingredients`.
 
 `ingredients` is an array that contains all ingredients of the current recipe step. You can access an ingredient by using
-`{{ ingredient[<index in list>] }}` where the index refers to the position in the list of ingredients starting with zero.
+`{{ ingredients[<index in list>] }}` where the index refers to the position in the list of ingredients starting with zero.
 You can also use the interaction menu of the ingredient to copy its reference.
 
 !!! warning
@@ -28,10 +28,10 @@ You can also use the interaction menu of the ingredient to copy its reference.
 
 You can also access only the amount, unit, note or food inside your instruction text using
 ```
-{{ instructions[0].amount }}
-{{ instructions[0].unit }}
-{{ instructions[0].food }}
-{{ instructions[0].note }}
+{{ ingredients[0].amount }}
+{{ ingredients[0].unit }}
+{{ ingredients[0].food }}
+{{ ingredients[0].note }}
 ```
 
 ## Technical Reasoning
@@ -43,4 +43,4 @@ The template could access them by ID, the food name or the position in the list.
 2. **Name**: very nice to read and easy but does not work when a food occurs twice in a step. Could have workaround but would then be inconsistent.
 3. **Position**: easy to write and understand but breaks when ordering is changed and not really nice to read when instructions are not rendered.
 
-I decided to go for the position based system. If you know of any better way feel free to open an issue or PR.
+I decided to go for the position based system. If you know of any better way feel free to open an issue or PR.

docs/index.md

@@ -1,72 +1,79 @@
 <h1 align="center">
   <br>
-  <a href="https://app.tandoor.dev"><img src="https://github.com/vabene1111/recipes/raw/develop/docs/logo_color.svg" height="256px" width="256px"></a>
+  <a href="https://tandoor.dev"><img src="https://github.com/vabene1111/recipes/raw/develop/docs/logo_color.svg" height="256px" width="256px"></a>
   <br>
   Tandoor Recipes
   <br>
 </h1>
 
-<h4 align="center">This is my personal beta of vabene's excellent recipe app.  It includes many of the new features I've developed and should be considered experimental.</h4>
-## Experimental Features
-- Manual import recipes from URL & Source (HTML/JSON)
-- Bookmarklet to import recipes from any website
-- Full Text Search
-- Hierarchical Keywords
-
-## Coming Next
-- Heirarchical Ingredients
-- Faceted Search
-- Search filter by rating
-- What Can I Make Now?
-- Better ingredient/unit matching on import
-- Custom word replacement on import (e.g. 'grams' automatically imported as 'g')
-- improved ingredient parser (items in parens moved to notes)
-- quick view ingredients
-- quick view associated recipe
-- favorite recipes
-
 <h4 align="center">The recipe manager that allows you to manage your ever growing collection of digital recipes.</h4>
 
 <p align="center">
-
-<img src="https://github.com/vabene1111/recipes/workflows/Continous%20Integration/badge.svg?branch=develop" >
-<img src="https://img.shields.io/github/stars/vabene1111/recipes" >
-<img src="https://img.shields.io/github/forks/vabene1111/recipes" >
-<img src="https://img.shields.io/docker/pulls/vabene1111/recipes" >
-
+<a href="https://github.com/vabene1111/recipes/actions" target="_blank" rel="noopener noreferrer"><img src="https://github.com/vabene1111/recipes/workflows/Continous%20Integration/badge.svg?branch=master" ></a>
+<a href="https://github.com/vabene1111/recipes/stargazers" target="_blank" rel="noopener noreferrer"><img src="https://img.shields.io/github/stars/vabene1111/recipes" ></a>
+<a href="https://github.com/vabene1111/recipes/network/members" target="_blank" rel="noopener noreferrer"><img src="https://img.shields.io/github/forks/vabene1111/recipes" ></a>
+<a href="https://discord.gg/RhzBrfWgtp" target="_blank" rel="noopener noreferrer"><img src="https://badgen.net/badge/icon/discord?icon=discord&label" ></a>
+<a href="https://hub.docker.com/r/vabene1111/recipes" target="_blank" rel="noopener noreferrer"><img src="https://img.shields.io/docker/pulls/vabene1111/recipes" ></a>
+<a href="https://github.com/vabene1111/recipes/releases/latest" rel="noopener noreferrer"><img src="https://img.shields.io/github/v/release/vabene1111/recipes" ></a>
+<a href="https://app.tandoor.dev/accounts/login/?demo" rel="noopener noreferrer"><img src="https://img.shields.io/badge/demo-available-success" ></a>
 </p>
 
 <p align="center">
-<a href="https://docs.tandoor.dev/install/docker.html" rel="noopener noreferrer">Installation</a> •
-<a href="https://docs.tandoor.dev/" target="_blank" rel="noopener noreferrer">Documentation</a> •
-<a href="https://app.tandoor.dev/" target="_blank" rel="noopener noreferrer">Demo</a>
+<a href="https://tandoor.dev" target="_blank" rel="noopener noreferrer">Website</a> •
+<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://discord.gg/RhzBrfWgtp" target="_blank" rel="noopener noreferrer">Discord</a>
 </p>
 
 ![Preview](preview.png)
 
-!!! info "WIP"
-    The documentation is work in progress. New information will be added over time.
-    Feel free to open pull requests to enhance the documentation.
+## Core Features
+- 🥗 **Manage your recipes** with a fast and intuitive editor
+- 📆 **Plan** multiple meals for each day
+- 🛒 **Shopping lists** via the meal plan or straight from recipes
+- 📚 **Cookbooks** collect recipes into books
+- 👪 **Share and collaborate** on recipes with friends and family
 
-## Features
+## Made by and for power users
 
-- 📦 **Sync** files with Dropbox and Nextcloud (more can easily be added)
-- 🔍 Powerful **search** with Djangos [TrigramSimilarity](https://docs.djangoproject.com/en/3.0/ref/contrib/postgres/search/#trigram-similarity)
+- 🔍 Powerful & customizable **search** with fulltext support and [TrigramSimilarity](https://docs.djangoproject.com/en/3.0/ref/contrib/postgres/search/#trigram-similarity)
 - 🏷️ Create and search for **tags**, assign them in batch to all files matching certain filters
-- 📄 **Create recipes** locally within a nice, standardized web interface
-- ⬇️ **Import recipes** from thousands of websites supporting [ld+json or microdata](https://schema.org/Recipe)
-- 📱 Optimized for use on **mobile** devices like phones and tablets
-- 🛒 Generate **shopping** lists from recipes
-- 📆 Create a **Plan** on what to eat when
-- 👪 **Share** recipes with friends and comment on them to suggest or remember changes you made
-- ➗ automatically convert decimal units to **fractions** for those who like this
-- 🐳 Easy setup with **Docker** and included examples for Kubernetes, Unraid and Synology
+- ↔️ Quickly merge and rename ingredients, tags and units 
+- 📥️ **Import recipes** from thousands of websites supporting [ld+json or microdata](https://schema.org/Recipe)
+- ➗ Support for **fractions** or decimals
+- 🐳 Easy setup with **Docker** and included examples for **Kubernetes**, **Unraid** and **Synology**
 - 🎨 Customize your interface with **themes**
-- ✉️ Export and import recipes from other users
+- 📦 **Sync** files with Dropbox and Nextcloud
+  
+## All the must haves
+
+- 📱Optimized for use on **mobile** devices
 - 🌍 localized in many languages thanks to the awesome community
-- ➕ Many more like recipe scaling, image compression, cookbooks, printing views, ...
+- 📥️ **Import your collection** from many other [recipe managers](https://docs.tandoor.dev/features/import_export/)
+- ➕ Many more like recipe scaling, image compression, printing views and supermarkets
 
+This application is meant for people with a collection of recipes they want to share with family and friends or simply
+store them in a nicely organized way. A basic permission system exists but this application is not meant to be run as 
+a public page.
 
+## Your Feedback
+
+Share some information on how you use Tandoor to help me improve the application [Google Survey](https://forms.gle/qNfLK2tWTeWHe9Qd7)
+
+## Get in touch
+
+<table>
+  <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>
+  </tr>
+
+  <tr>
+    <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>
 
 ## Roadmap
 This application has been under rapid development over the last year.

docs/install/docker.md

@@ -65,47 +65,9 @@ This configuration exposes the application through an nginx web server on port 8
 wget https://raw.githubusercontent.com/vabene1111/recipes/develop/docs/install/docker/plain/docker-compose.yml
 ```
 
-```yaml
-version: "3"
-services:
-  db_recipes:
-    restart: always
-    image: postgres:11-alpine
-    volumes:
-      - ./postgresql:/var/lib/postgresql/data
-    env_file:
-      - ./.env
-
-  web_recipes:
-    image: vabene1111/recipes
-    restart: always
-    env_file:
-      - ./.env
-    volumes:
-      - staticfiles:/opt/recipes/staticfiles
-      - nginx_config:/opt/recipes/nginx/conf.d
-      - ./mediafiles:/opt/recipes/mediafiles
-    depends_on:
-      - db_recipes
-
-  nginx_recipes:
-    image: nginx:mainline-alpine
-    restart: always
-    ports:
-      - 80:80
-    env_file:
-      - ./.env
-    depends_on:
-      - web_recipes
-    volumes:
-      - nginx_config:/etc/nginx/conf.d:ro
-      - staticfiles:/static
-      - ./mediafiles:/media
-
-volumes:
-  nginx_config:
-  staticfiles:
-```
+~~~yaml
+{% include "./docker/plain/docker-compose.yml" %}
+~~~
 
 ### Reverse Proxy
 
@@ -123,62 +85,9 @@ If you use traefik, this configuration is the one for you.
 wget https://raw.githubusercontent.com/vabene1111/recipes/develop/docs/install/docker/traefik-nginx/docker-compose.yml
 ```
 
-```yaml
-version: "3"
-services:
-  db_recipes:
-    restart: always
-    image: postgres:11-alpine
-    volumes:
-      - ./postgresql:/var/lib/postgresql/data
-    env_file:
-      - ./.env
-    networks:
-      - default
-
-  web_recipes:
-    image: vabene1111/recipes
-    restart: always
-    env_file:
-      - ./.env
-    volumes:
-      - staticfiles:/opt/recipes/staticfiles
-      - nginx_config:/opt/recipes/nginx/conf.d
-      - ./mediafiles:/opt/recipes/mediafiles
-    depends_on:
-      - db_recipes
-    networks:
-      - default
-
-  nginx_recipes:
-    image: nginx:mainline-alpine
-    restart: always
-    env_file:
-      - ./.env
-    volumes:
-      - nginx_config:/etc/nginx/conf.d:ro
-      - staticfiles:/static
-      - ./mediafiles:/media
-    labels: # traefik example labels
-      - "traefik.enable=true"
-      - "traefik.http.routers.recipes.rule=Host(`recipes.mydomain.com`, `recipes.myotherdomain.com`)"
-      - "traefik.http.routers.recipes.entrypoints=web_secure" # your https endpoint
-      - "traefik.http.routers.recipes.tls.certresolver=le_resolver" # your cert resolver
-    depends_on:
-      - web_recipes
-    networks:
-      - default
-      - traefik
-
-networks:
-  default:
-  traefik: # This is you external traefik network
-    external: true
-
-volumes:
-  nginx_config:
-  staticfiles:
-```
+~~~yaml
+{% include "./docker/traefik-nginx/docker-compose.yml" %}
+~~~
 
 #### nginx-proxy
 
@@ -198,58 +107,9 @@ LETSENCRYPT_EMAIL=
 wget https://raw.githubusercontent.com/vabene1111/recipes/develop/docs/install/docker/nginx-proxy/docker-compose.yml
 ```
 
-```yaml
-version: "3"
-services:
-  db_recipes:
-    restart: always
-    image: postgres:11-alpine
-    volumes:
-      - ./postgresql:/var/lib/postgresql/data
-    env_file:
-      - ./.env
-    networks:
-      - default
-
-  web_recipes:
-    image: vabene1111/recipes
-    restart: always
-    env_file:
-      - ./.env
-    volumes:
-      - staticfiles:/opt/recipes/staticfiles
-      - nginx_config:/opt/recipes/nginx/conf.d
-      - ./mediafiles:/opt/recipes/mediafiles
-    depends_on:
-      - db_recipes
-    networks:
-      - default
-
-  nginx_recipes:
-    image: nginx:mainline-alpine
-    restart: always
-    env_file:
-      - ./.env
-    depends_on:
-      - web_recipes
-    volumes:
-      - nginx_config:/etc/nginx/conf.d:ro
-      - staticfiles:/static
-      - ./mediafiles:/media
-    networks:
-      - default
-      - nginx-proxy
-
-networks:
-  default:
-  nginx-proxy:
-    external:
-      name: nginx-proxy
-
-volumes:
-  nginx_config:
-  staticfiles:
-```
+~~~yaml
+{% include "./docker/nginx-proxy/docker-compose.yml" %}
+~~~
 
 ## Additional Information