addding missing cli flag to chmod

translation completed for the source file '/cookbook/locale/en/LC_MESSAGES/django.po'
on the 'de' language.

.dockerignore

@@ -7,4 +7,12 @@ docker-compose*
 .gitignore
 README.md
 LICENSE
-.vscode
+.vscode
+.env
+.env.template
+.github
+.idea
+LICENSE.md
+docs
+nginx
+update.sh

.env.template

@@ -1,14 +1,21 @@
-VIRTUAL_HOST=
-LETSENCRYPT_HOST=
-LETSENCRYPT_EMAIL=
+# only set this to true when testing/debugging
+DEBUG=0
 
-DEBUG=1
+# hosts the application can run under e.g. recipes.mydomain.com,cooking.mydomain.com,...
 ALLOWED_HOSTS=*
+
+# random secret key, use for example base64 /dev/urandom | head -c50 to generate one
 SECRET_KEY=
 
+# add only a database password if you want to run with the default postgres, otherwise change settings accordingly
 DB_ENGINE=django.db.backends.postgresql_psycopg2
 POSTGRES_HOST=db_recipes
 POSTGRES_PORT=5432
 POSTGRES_USER=djangodb
 POSTGRES_PASSWORD=
-POSTGRES_DB=djangodb
+POSTGRES_DB=djangodb
+
+# Serve mediafiles directly using gunicorn. Basically everyone recommends not doing this. Please use any of the examples
+# provided that include an additional nxginx container to handle media file serving.
+# If you know what you are doing turn this back on (1) to serve media files using djangos serve() method.
+GUNICORN_MEDIA=0

.github/workflows/ci.yml

@@ -0,0 +1,27 @@
+name: Continous Integration
+
+on: [push]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+    strategy:
+      max-parallel: 4
+      matrix:
+        python-version: [3.8]
+
+    steps:
+    - uses: actions/checkout@v1
+    - name: Set up Python 3.8
+      uses: actions/setup-python@v1
+      with:
+        python-version: 3.8
+    - name: Install dependencies
+      run: |
+        python -m pip install --upgrade pip
+        pip install -r requirements.txt
+        python3 manage.py collectstatic --noinput
+    - name: Django Testing project
+      run: |
+        python3 manage.py test

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

@@ -0,0 +1,18 @@
+name: publish dev image docker
+on:
+  push:
+    branches:
+      - '*'
+      - '*/*'
+      - '!master'
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@master
+      - name: Publish to Registry
+        uses: elgohr/Publish-Docker-Github-Action@2.13
+        with:
+          name: vabene1111/recipes
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}

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

@@ -0,0 +1,19 @@
+name: publish latest image docker
+on:
+  push:
+    branches:
+      - master
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@master
+      - name: Build and publish image
+        uses: ilteoood/docker_buildx@master
+        with:
+          publish: true
+          imageName: vabene1111/recipes
+          tag: latest
+          dockerHubUser: ${{ secrets.DOCKER_USERNAME }}
+          dockerHubPassword: ${{ secrets.DOCKER_PASSWORD }}

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

@@ -0,0 +1,25 @@
+name: publish tagged release docker
+
+on:
+  push:
+    tags:
+    - '*'
+
+jobs:
+  build:
+        runs-on: ubuntu-latest
+        name: Build image job
+        steps:
+            - name: Checkout master
+              uses: actions/checkout@master#
+            - name: Get the version
+              id: get_version
+              run: echo ::set-output name=VERSION::${GITHUB_REF/refs\/tags\//}
+            - name: Build and publish image
+              uses: ilteoood/docker_buildx@master
+              with:
+                publish: true
+                imageName: vabene1111/recipes
+                tag: ${{ steps.get_version.outputs.VERSION }}
+                dockerHubUser: ${{ secrets.DOCKER_USERNAME }}
+                dockerHubPassword: ${{ secrets.DOCKER_PASSWORD }}

.gitignore

@@ -63,35 +63,17 @@ venv/
 
 mediafiles/
 
-*.sqlite3
+*.sqlite3*
 
 \.idea/workspace\.xml
 
 \.idea/misc\.xml
 
-\.idea/recipes\.iml
-
 # Deployment
 
 \.env
 staticfiles/
- postgresql/
+postgresql/
 
-# User-specific stuff
-.idea/**/workspace.xml
-.idea/**/tasks.xml
-.idea/**/usage.statistics.xml
-.idea/**/dictionaries
-.idea/**/shelf
 
-# Generated files
-.idea/**/contentModel.xml
-
-# Sensitive or high-churn files
-.idea/**/dataSources/
-.idea/**/dataSources.ids
-.idea/**/dataSources.local.xml
-.idea/**/sqlDataSources.xml
-.idea/**/dynamic.xml
-.idea/**/uiDesigner.xml
-.idea/**/dbnavigator.xml
+/docker-compose.override.yml

.idea/dictionaries/vabene1111_PC.xml

@@ -0,0 +1,8 @@
+<component name="ProjectDictionaryState">
+  <dictionary name="vabene1111-PC">
+    <words>
+      <w>gunicorn</w>
+      <w>traefik</w>
+    </words>
+  </dictionary>
+</component>

.idea/inspectionProfiles/Project_Default.xml

@@ -1,14 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <profile version="1.0">
-    <option name="myName" value="Project Default" />
-    <inspection_tool class="PyPackageRequirementsInspection" enabled="true" level="WARNING" enabled_by_default="true">
-      <option name="ignoredPackages">
-        <value>
-          <list size="1">
-            <item index="0" class="java.lang.String" itemvalue="psycopg2" />
-          </list>
-        </value>
-      </option>
-    </inspection_tool>
-  </profile>
-</component>

.idea/inspectionProfiles/profiles_settings.xml

@@ -1,6 +1,5 @@
 <component name="InspectionProjectProfileManager">
   <settings>
-    <option name="PROJECT_PROFILE" value="Default" />
     <option name="USE_PROJECT_PROFILE" value="false" />
     <version value="1.0" />
   </settings>

.idea/jsLibraryMappings.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="JavaScriptLibraryMappings">
-    <file url="file://$PROJECT_DIR$" libraries="{pretty-checkbox}" />
-  </component>
-</project>

.idea/recipes.iml

@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="PYTHON_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="django" name="Django">
+      <configuration>
+        <option name="rootFolder" value="$MODULE_DIR$" />
+        <option name="settingsModule" value="recipes/settings.py" />
+        <option name="manageScript" value="$MODULE_DIR$/manage.py" />
+        <option name="environment" value="&lt;map/&gt;" />
+        <option name="doNotUseTestRunner" value="false" />
+        <option name="trackFilePattern" value="migrations" />
+      </configuration>
+    </facet>
+  </component>
+  <component name="NewModuleRootManager">
+    <content url="file://$MODULE_DIR$">
+      <excludeFolder url="file://$MODULE_DIR$/venv" />
+    </content>
+    <orderEntry type="jdk" jdkName="Python 3.8 (recipes)" jdkType="Python SDK" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="jquery-3.4.1" level="application" />
+    <orderEntry type="library" name="pretty-checkbox" level="application" />
+    <orderEntry type="library" name="pdf" level="application" />
+    <orderEntry type="library" name="pdf_viewer" level="application" />
+  </component>
+  <component name="TemplatesService">
+    <option name="TEMPLATE_CONFIGURATION" value="Django" />
+    <option name="TEMPLATE_FOLDERS">
+      <list>
+        <option value="$MODULE_DIR$/templates" />
+        <option value="$MODULE_DIR$/cookbook/templates" />
+      </list>
+    </option>
+  </component>
+</module>

Dockerfile

@@ -1,24 +1,18 @@
-FROM ubuntu:18.04
-
-RUN mkdir /Recipes
-WORKDIR /Recipes
-
-ADD . /Recipes/
-
-RUN apt-get update
-RUN apt-get -y upgrade
-RUN apt-get install -y \
-    python3 \
-    python3-pip \
-    postgresql-client \
-    gettext
-
-RUN pip3 install --upgrade pip
-
-RUN pip3 install -r requirements.txt
-
-RUN apt-get autoremove -y
+FROM python:3.8-alpine
 
+RUN apk add --no-cache postgresql-libs gettext zlib libjpeg libxml2-dev libxslt-dev
 ENV PYTHONUNBUFFERED 1
+EXPOSE 8080
 
-EXPOSE 8080
+RUN mkdir /opt/recipes
+WORKDIR /opt/recipes
+COPY . ./
+RUN chmod +x boot.sh setup.sh
+RUN ln -s /opt/recipes/setup.sh /usr/local/bin/createsuperuser
+
+RUN apk add --no-cache --virtual .build-deps gcc musl-dev postgresql-dev zlib-dev jpeg-dev  && \
+    python -m venv venv && \
+    venv/bin/pip install -r requirements.txt --no-cache-dir &&\
+    apk --purge del .build-deps
+
+ENTRYPOINT ["/opt/recipes/boot.sh"]

README.md

@@ -1,68 +1,68 @@
-# Recipes
-Recipes is a django application to manage, tag and search recipes using either built in models or external storage providers hosting PDF's, Images or other files.
+# Recipes ![CI](https://github.com/vabene1111/recipes/workflows/Continous%20Integration/badge.svg?branch=develop)
+Recipes is a Django application to manage, tag and search recipes using either built in models or external storage providers hosting PDF's, Images or other files.
 
-![Preview](preview.png)
+![Preview](docs/preview.png)
+
+[More Screenshots](https://imgur.com/a/V01151p)
 
 ### Features
 
-- :package: Sync files with Dropbox and Nextcloud (more can easily be added)
-- :mag: Powerful search with djangos [TrigramSimilarity](https://docs.djangoproject.com/en/3.0/ref/contrib/postgres/search/#trigram-similarity)
-- :label: Create and search for tags, assign them in batch to all files matching certain filters
-- :page_facing_up: Create recipes locally within a nice, standardized webinterface 
-- :person_with_blond_hair: Share recipes with friends and comment on them to suggest or remember changes you made
-- :whale: Easy setup with Docker
+- :package: **Sync** files with Dropbox and Nextcloud (more can easily be added)
+- :mag: Powerful **search** with Djangos [TrigramSimilarity](https://docs.djangoproject.com/en/3.0/ref/contrib/postgres/search/#trigram-similarity)
+- :label: Create and search for **tags**, assign them in batch to all files matching certain filters
+- :page_facing_up: **Create recipes** locally within a nice, standardized web interface 
+- :iphone: Optimized for use on **mobile** devices like phones and tablets
+- :shopping_cart: Generate **shopping** lists from recipes
+- :calendar: Create a **Plan** on what to eat when
+- :family: **Share** recipes with friends and comment on them to suggest or remember changes you made
+- :whale: Easy setup with **Docker**
+- :art: Customize your interface with **themes**
+- :envelope: Export and import recipes from other users
+- :heavy_plus_sign: Many more like recipe scaling, image compression, cookbooks, printing views, ...
 
-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.
+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.
+Some Documentation can be found [here](https://github.com/vabene1111/recipes/wiki)
+# Installation
 
-# Documentation
-
-Most things should be straight forward but there are some more complicated things.
-##### Storage Backends
-A `Storage Backend` is a remote storage location where files are stored. To add a new backend klick on `Storage Data` and then on `Storage Backends`. There click the plus button.
-
-Enter a name (just a display name for you to identify it) and an API access Token for the account you want to use.
-Dropboxes API tokens can be found on the [Dropboxes API explorer](https://dropbox.github.io/dropbox-api-v2-explorer/#auth_token/from_oauth1)
-with the button on the top right. For Nextcloud you can use a App apssword created in the settings.
-
-##### Adding Synced Path's
-To add a new path from your Storage backend to the sync list, go to `Storage Data >> Configure Sync` and select the storage backend you want to use.
-Then enter the path you want to monitor starting at the storage root (e.g. `/Folder/RecipesFolder`) and save it.
-
-##### Syncing Data
-To sync the recipes app with the storage backends press `Sync now` under `Storage Data >> Configure Sync`.
-##### Import Recipes
-All files found by the sync can be found under `Manage Data >> Import recipes`. There you can either import all at once without modifying them or import one by one, adding tags while importing.
-##### Batch Edit
-If you have many untagged recipes you may want to edit them all at once. For this go to
-`Storage Data >> Batch Edit`. Enter a word which should be contained in the recipe name and select the tags you want to apply.
-When clicking submit every recipe containing the word will be updated (tags are added).
-
-> Currently the only option is word contains, maybe some more SQL like operators will be added later.
-
-## Installation
+The docker image (`vabene1111/recipes`) simply exposes the application on port `8080`. You may choose any preferred installation method, the following are just examples to make it easier.
 
 ### Docker-Compose
-When cloning this repository a simple docker-compose file is included. It is made for setups already running an nginx-reverse proxy network with lets encrypt companion but can be changed easily. Copy `.env.template` to `.env` and fill in the missing values accordingly.  
-Now simply start the containers and run the `update.sh` script which will apply all migrations and collect static files.
-Create a default user by executing into the container with `docker-compose exec web_recipes sh` and run `python3 manage.py createsuperuser`.
+
+2. Choose one of the included configurations [here](docs/docker).
+2. Download the environment (config) file template and fill it out `wget https://raw.githubusercontent.com/vabene1111/recipes/develop/.env.template -O .env `
+3. Start the container `docker-compose up -d`
+4. Open the page to create the first user. Alternatively use `docker-compose exec web_recipes createsuperuser` 
 
 ### Manual
+**Python >= 3.8** is required to run this! 
+
 Copy `.env.template` to `.env` and fill in the missing values accordingly.  
-You can leave out the docker specific variables (VIRTUAL_HOST, LETSENCRYPT_HOST, LETSENCRYPT_EMAIL). 
-Make sure all variables are available to whatever servers your application.
+Make sure all variables are available to whatever serves your application.
 
 Otherwise simply follow the instructions for any django based deployment
-(for example this one http://uwsgi-docs.readthedocs.io/en/latest/tutorials/Django_and_nginx.html).
+(for example [this one](http://uwsgi-docs.readthedocs.io/en/latest/tutorials/Django_and_nginx.html)).
 
-To start developing:
-1. Clone the repository using your preferred method
-2. Install requirements from `requirements.txt` either globally or in a virtual environment
-3. Run migrations with `manage.py migrate`
-4. Create a first user with `manage.py createsuperuser`
-5. Start development server with `manage.py runserver`
+## Updating
+While intermediate updates can be skipped when updating please make sure to **read the release notes** in case some special action is required to update.
+
+0. Before updating it is recommended to **create a backup!**
+1. Stop the container using `docker-compose down`
+2. Pull the latest image using `docker-compose pull`
+3. Start the container again using `docker-compose up -d`
+
+## Kubernetes
+
+You can find a basic kubernetes setup [here](docs/k8s/). Please see the README in the folder for more detail.
 
 ## Contributing
 Pull Requests and ideas are welcome, feel free to contribute in any way.
+For any questions on how to work with django please refer to their excellent [documentation](https://www.djangoproject.com/start/).
+
+### Translating
+There is a [transifex project](https://www.transifex.com/django-recipes/django-cookbook/) project to enable community driven translations. If you want to contribute a new language or help maintain an already existing one feel free to create a transifex account (using the link above) and request to join the project.
+
+It is also possible to provide the translations directly by creating a new language using `manage.py makemessages -l <language_code> -i venv`. Once finished simply open a PR with the changed files. 
 
 ## License
-This project is licensed under the MIT license. Even though it is not required to publish derivatives i highly encourage pushing changes upstream and letting people profit from any work done on this project.
+This project is licensed under the MIT license. Even though it is not required to publish derivatives, I highly encourage pushing changes upstream and letting people profit from any work done on this project.

boot.sh

@@ -0,0 +1,11 @@
+#!/bin/sh
+source venv/bin/activate
+
+echo "Updating database"
+python manage.py migrate
+python manage.py collectstatic --noinput
+echo "Done"
+
+chmod -R 755 /opt/recipes/mediafiles
+
+exec gunicorn -b :8080 --access-logfile - --error-logfile - recipes.wsgi

cookbook/admin.py

@@ -2,10 +2,103 @@ from django.contrib import admin
 from .models import *
 
 
-admin.site.register(Recipe)
+class UserPreferenceAdmin(admin.ModelAdmin):
+    list_display = ('name', 'theme', 'nav_color', 'default_page', 'search_style')
+
+    @staticmethod
+    def name(obj):
+        return obj.user.get_user_name()
+
+
+admin.site.register(UserPreference, UserPreferenceAdmin)
+
+
+class StorageAdmin(admin.ModelAdmin):
+    list_display = ('name', 'method')
+
+
+admin.site.register(Storage, StorageAdmin)
+
+
+class SyncAdmin(admin.ModelAdmin):
+    list_display = ('storage', 'path', 'active', 'last_checked')
+
+
+admin.site.register(Sync, SyncAdmin)
+
+
+class SyncLogAdmin(admin.ModelAdmin):
+    list_display = ('sync', 'status', 'msg', 'created_at')
+
+
+admin.site.register(SyncLog, SyncLogAdmin)
+
 admin.site.register(Keyword)
 
-admin.site.register(Sync)
-admin.site.register(SyncLog)
-admin.site.register(RecipeImport)
-admin.site.register(Storage)
+
+class RecipeAdmin(admin.ModelAdmin):
+    list_display = ('name', 'internal', 'created_by', 'storage')
+
+    @staticmethod
+    def created_by(obj):
+        return obj.created_by.get_user_name()
+
+
+admin.site.register(Recipe, RecipeAdmin)
+
+admin.site.register(Unit)
+admin.site.register(Ingredient)
+
+
+class RecipeIngredientAdmin(admin.ModelAdmin):
+    list_display = ('recipe', 'ingredient', 'amount', 'unit')
+
+
+admin.site.register(RecipeIngredient, RecipeIngredientAdmin)
+
+
+class CommentAdmin(admin.ModelAdmin):
+    list_display = ('recipe', 'name', 'created_at')
+
+    @staticmethod
+    def name(obj):
+        return obj.created_by.get_user_name()
+
+
+admin.site.register(Comment, CommentAdmin)
+
+
+class RecipeImportAdmin(admin.ModelAdmin):
+    list_display = ('name', 'storage', 'file_path')
+
+
+admin.site.register(RecipeImport, RecipeImportAdmin)
+
+
+class RecipeBookAdmin(admin.ModelAdmin):
+    list_display = ('name', 'user_name')
+
+    @staticmethod
+    def user_name(obj):
+        return obj.created_by.get_user_name()
+
+
+admin.site.register(RecipeBook, RecipeBookAdmin)
+
+
+class RecipeBookEntryAdmin(admin.ModelAdmin):
+    list_display = ('book', 'recipe')
+
+
+admin.site.register(RecipeBookEntry, RecipeBookEntryAdmin)
+
+
+class MealPlanAdmin(admin.ModelAdmin):
+    list_display = ('user', 'recipe', 'meal', 'date')
+
+    @staticmethod
+    def user(obj):
+        return obj.created_by.get_user_name()
+
+
+admin.site.register(MealPlan, MealPlanAdmin)

cookbook/filters.py

@@ -2,14 +2,17 @@ import django_filters
 from django.contrib.postgres.search import TrigramSimilarity
 from django.db.models import Q
 from cookbook.forms import MultiSelectWidget
-from cookbook.models import Recipe, Keyword
+from cookbook.models import Recipe, Keyword, Ingredient
 from django.conf import settings
+from django.utils.translation import gettext as _
 
 
 class RecipeFilter(django_filters.FilterSet):
     name = django_filters.CharFilter(method='filter_name')
     keywords = django_filters.ModelMultipleChoiceFilter(queryset=Keyword.objects.all(), widget=MultiSelectWidget,
                                                         method='filter_keywords')
+    ingredients = django_filters.ModelMultipleChoiceFilter(queryset=Ingredient.objects.all(), widget=MultiSelectWidget,
+                                                           method='filter_ingredients', label=_('Ingredients'))
 
     @staticmethod
     def filter_keywords(queryset, name, value):
@@ -19,6 +22,14 @@ class RecipeFilter(django_filters.FilterSet):
             queryset = queryset.filter(keywords=x)
         return queryset
 
+    @staticmethod
+    def filter_ingredients(queryset, name, value):
+        if not name == 'ingredients':
+            return queryset
+        for x in value:
+            queryset = queryset.filter(recipeingredient__ingredient=x).distinct()
+        return queryset
+
     @staticmethod
     def filter_name(queryset, name, value):
         if not name == 'name':
@@ -32,14 +43,12 @@ class RecipeFilter(django_filters.FilterSet):
 
     class Meta:
         model = Recipe
-        fields = ['name', 'keywords']
+        fields = ['name', 'keywords', 'ingredients', 'internal']
 
 
-class QuickRecipeFilter(django_filters.FilterSet):
-    name = django_filters.CharFilter(lookup_expr='contains')
-    keywords = django_filters.ModelMultipleChoiceFilter(queryset=Keyword.objects.all(), widget=MultiSelectWidget,
-                                                        method='filter_keywords')
+class IngredientFilter(django_filters.FilterSet):
+    name = django_filters.CharFilter(lookup_expr='icontains')
 
     class Meta:
-        model = Recipe
-        fields = ['name', 'keywords']
+        model = Ingredient
+        fields = ['name']

cookbook/forms.py

@@ -1,16 +1,62 @@
 from django import forms
 from django.forms import widgets
+from django.urls import reverse, reverse_lazy
 from django.utils.translation import gettext as _
 from emoji_picker.widgets import EmojiPickerTextInput
 
 from .models import *
 
 
+class SelectWidget(widgets.Select):
+    class Media:
+        js = ('custom/js/form_select.js',)
+
+
 class MultiSelectWidget(widgets.SelectMultiple):
     class Media:
         js = ('custom/js/form_multiselect.js',)
 
 
+# yes there are some stupid browsers that still dont support this but i dont support people using these browsers
+class DateWidget(forms.DateInput):
+    input_type = 'date'
+
+    def __init__(self, **kwargs):
+        kwargs["format"] = "%Y-%m-%d"
+        super().__init__(**kwargs)
+
+
+class UserPreferenceForm(forms.ModelForm):
+    prefix = 'preference'
+
+    class Meta:
+        model = UserPreference
+        fields = ('default_unit', 'theme', 'nav_color', 'default_page', 'show_recent', 'search_style', 'plan_share')
+
+        help_texts = {
+            'nav_color': _('Color of the top navigation bar. Not all colors work with all themes, just try them out!'),
+            'default_unit': _('Default Unit to be used when inserting a new ingredient into a recipe.'),
+            'plan_share': _('Default user to share newly created meal plan entries with.'),
+            'show_recent': _('Show recently viewed recipes on search page.'),
+        }
+
+        widgets = {
+            'plan_share': MultiSelectWidget
+        }
+
+
+class UserNameForm(forms.ModelForm):
+    prefix = 'name'
+
+    class Meta:
+        model = User
+        fields = ('first_name', 'last_name')
+
+        help_texts = {
+            'first_name': _('Both fields are optional. If none are given the username will be displayed instead')
+        }
+
+
 class ExternalRecipeForm(forms.ModelForm):
     file_path = forms.CharField(disabled=True, required=False)
     storage = forms.ModelChoiceField(queryset=Storage.objects.all(), disabled=True, required=False)
@@ -32,6 +78,8 @@ class ExternalRecipeForm(forms.ModelForm):
 
 
 class InternalRecipeForm(forms.ModelForm):
+    ingredients = forms.CharField(widget=forms.HiddenInput(), required=False)
+
     class Meta:
         model = Recipe
         fields = ('name', 'instructions', 'image', 'working_time', 'waiting_time', 'keywords')
@@ -44,6 +92,74 @@ class InternalRecipeForm(forms.ModelForm):
             'waiting_time': _('Waiting time (cooking/baking) in minutes'),
         }
         widgets = {'keywords': MultiSelectWidget}
+        help_texts = {
+            'instructions': _('You can use markdown to format this field. See the <a href="/docs/markdown/">docs here</a>')
+        }
+
+
+class ShoppingForm(forms.Form):
+    recipe = forms.ModelMultipleChoiceField(
+        queryset=Recipe.objects.filter(internal=True).all(),
+        widget=MultiSelectWidget
+    )
+    markdown_format = forms.BooleanField(
+        help_text=_('Include <code>- [ ]</code> in list for easier usage in markdown based documents.'),
+        required=False,
+        initial=False
+    )
+
+
+class ExportForm(forms.Form):
+    recipe = forms.ModelChoiceField(
+        queryset=Recipe.objects.filter(internal=True).all(),
+        widget=SelectWidget
+    )
+    image = forms.BooleanField(
+        help_text=_('Export Base64 encoded image?'),
+        required=False
+    )
+    download = forms.BooleanField(
+        help_text=_('Download export directly or show on page?'),
+        required=False
+    )
+
+
+class ImportForm(forms.Form):
+    recipe = forms.CharField(widget=forms.Textarea, help_text=_('Simply paste a JSON export into this textarea and click import.'))
+
+
+class UnitMergeForm(forms.Form):
+    prefix = 'unit'
+
+    new_unit = forms.ModelChoiceField(
+        queryset=Unit.objects.all(),
+        widget=SelectWidget,
+        label=_('New Unit'),
+        help_text=_('New unit that other gets replaced by.'),
+    )
+    old_unit = forms.ModelChoiceField(
+        queryset=Unit.objects.all(),
+        widget=SelectWidget,
+        label=_('Old Unit'),
+        help_text=_('Unit that should be replaced.'),
+    )
+
+
+class IngredientMergeForm(forms.Form):
+    prefix = 'ingredient'
+
+    new_ingredient = forms.ModelChoiceField(
+        queryset=Ingredient.objects.all(),
+        widget=SelectWidget,
+        label=_('New Ingredient'),
+        help_text=_('New ingredient that other gets replaced by.'),
+    )
+    old_ingredient = forms.ModelChoiceField(
+        queryset=Ingredient.objects.all(),
+        widget=SelectWidget,
+        label=_('Old Ingredient'),
+        help_text=_('Ingredient that should be replaced.'),
+    )
 
 
 class CommentForm(forms.ModelForm):
@@ -68,22 +184,30 @@ class KeywordForm(forms.ModelForm):
         widgets = {'icon': EmojiPickerTextInput}
 
 
+class IngredientForm(forms.ModelForm):
+    class Meta:
+        model = Ingredient
+        fields = ('name', 'recipe')
+        widgets = {'recipe': SelectWidget}
+
+
 class StorageForm(forms.ModelForm):
     username = forms.CharField(widget=forms.TextInput(attrs={'autocomplete': 'new-password'}), required=False)
     password = forms.CharField(widget=forms.TextInput(attrs={'autocomplete': 'new-password', 'type': 'password'}),
-                               required=False)
+                               required=False,
+                               help_text=_('Leave empty for dropbox and enter app password for nextcloud.'))
     token = forms.CharField(widget=forms.TextInput(attrs={'autocomplete': 'new-password', 'type': 'password'}),
-                            required=False)
+                            required=False,
+                            help_text=_('Leave empty for nextcloud and enter api token for dropbox.'))
 
     class Meta:
         model = Storage
         fields = ('name', 'method', 'username', 'password', 'token', 'url')
 
-
-class RecipeBookForm(forms.ModelForm):
-    class Meta:
-        model = RecipeBook
-        fields = ('name',)
+        help_texts = {
+            'url': _(
+                'Leave empty for dropbox and enter only base url for nextcloud (<code>/remote.php/webdav/</code> is added automatically)'),
+        }
 
 
 class RecipeBookEntryForm(forms.ModelForm):
@@ -118,3 +242,38 @@ class ImportRecipeForm(forms.ModelForm):
             'file_uid': _('File ID'),
         }
         widgets = {'keywords': MultiSelectWidget}
+
+
+class RecipeBookForm(forms.ModelForm):
+    class Meta:
+        model = RecipeBook
+        fields = ('name', 'icon', 'description', 'shared')
+        widgets = {'icon': EmojiPickerTextInput, 'shared': MultiSelectWidget}
+
+
+class MealPlanForm(forms.ModelForm):
+
+    def clean(self):
+        cleaned_data = super(MealPlanForm, self).clean()
+
+        if cleaned_data['title'] == '' and cleaned_data['recipe'] is None:
+            raise forms.ValidationError(_('You must provide at least a recipe or a title.'))
+
+        return cleaned_data
+
+    class Meta:
+        model = MealPlan
+        fields = ('recipe', 'title', 'meal', 'note', 'date', 'shared')
+
+        help_texts = {
+            'shared': _('You can list default users to share recipes with in the settings.'),
+            'note': _('You can use markdown to format this field. See the <a href="/docs/markdown/">docs here</a>')
+        }
+
+        widgets = {'recipe': SelectWidget, 'date': DateWidget, 'shared': MultiSelectWidget}
+
+
+class SuperUserForm(forms.Form):
+    name = forms.CharField()
+    password = forms.CharField(widget=forms.TextInput(attrs={'autocomplete': 'new-password', 'type': 'password'}))
+    password_confirm = forms.CharField(widget=forms.TextInput(attrs={'autocomplete': 'new-password', 'type': 'password'}))

cookbook/helper/dal.py

@@ -1,6 +1,6 @@
 from dal import autocomplete
 
-from cookbook.models import Keyword, RecipeIngredients
+from cookbook.models import Keyword, RecipeIngredient, Recipe, Unit, Ingredient
 
 
 class KeywordAutocomplete(autocomplete.Select2QuerySetView):
@@ -19,11 +19,37 @@ class KeywordAutocomplete(autocomplete.Select2QuerySetView):
 class IngredientsAutocomplete(autocomplete.Select2QuerySetView):
     def get_queryset(self):
         if not self.request.user.is_authenticated:
-            return RecipeIngredients.objects.none()
+            return Ingredient.objects.none()
 
-        qs = RecipeIngredients.objects.all()
+        qs = Ingredient.objects.all()
 
         if self.q:
-            qs = qs.filter(name__istartswith=self.q)
+            qs = qs.filter(name__icontains=self.q)
+
+        return qs
+
+
+class RecipeAutocomplete(autocomplete.Select2QuerySetView):
+    def get_queryset(self):
+        if not self.request.user.is_authenticated:
+            return Recipe.objects.none()
+
+        qs = Recipe.objects.all()
+
+        if self.q:
+            qs = qs.filter(name__icontains=self.q)
+
+        return qs
+
+
+class UnitAutocomplete(autocomplete.Select2QuerySetView):
+    def get_queryset(self):
+        if not self.request.user.is_authenticated:
+            return Unit.objects.none()
+
+        qs = Unit.objects.all()
+
+        if self.q:
+            qs = qs.filter(name__icontains=self.q)
 
         return qs

cookbook/helper/mdx_attributes.py

@@ -0,0 +1,24 @@
+import markdown
+
+from markdown.treeprocessors import Treeprocessor
+
+
+class StyleTreeprocessor(Treeprocessor):
+
+    def run_processor(self, node):
+        for child in node:
+            if child.tag == "table":
+                child.set("class", "table table-bordered")
+            if child.tag == "img":
+                child.set("class", "img-fluid")
+            self.run_processor(child)
+        return node
+
+    def run(self, root):
+        self.run_processor(root)
+        return root
+
+
+class MarkdownFormatExtension(markdown.Extension):
+    def extendMarkdown(self, md, md_globals):
+        md.treeprocessors.register(StyleTreeprocessor(), 'StyleTreeprocessor', 10)

cookbook/helper/mdx_urlize.py

@@ -0,0 +1,81 @@
+"""A more liberal autolinker
+
+Inspired by Django's urlize function.
+
+Positive examples:
+
+>>> import markdown
+>>> md = markdown.Markdown(extensions=['urlize'])
+
+>>> md.convert('http://example.com/')
+u'<p><a href="http://example.com/">http://example.com/</a></p>'
+
+>>> md.convert('go to http://example.com')
+u'<p>go to <a href="http://example.com">http://example.com</a></p>'
+
+>>> md.convert('example.com')
+u'<p><a href="http://example.com">example.com</a></p>'
+
+>>> md.convert('example.net')
+u'<p><a href="http://example.net">example.net</a></p>'
+
+>>> md.convert('www.example.us')
+u'<p><a href="http://www.example.us">www.example.us</a></p>'
+
+>>> md.convert('(www.example.us/path/?name=val)')
+u'<p>(<a href="http://www.example.us/path/?name=val">www.example.us/path/?name=val</a>)</p>'
+
+>>> md.convert('go to <http://example.com> now!')
+u'<p>go to <a href="http://example.com">http://example.com</a> now!</p>'
+
+Negative examples:
+
+>>> md.convert('del.icio.us')
+u'<p>del.icio.us</p>'
+
+"""
+
+import markdown
+
+# Global Vars
+URLIZE_RE = '(%s)' % '|'.join([
+    r'<(?:f|ht)tps?://[^>]*>',
+    r'\b(?:f|ht)tps?://[^)<>\s]+[^.,)<>\s]',
+    r'\bwww\.[^)<>\s]+[^.,)<>\s]',
+    r'[^(<\s]+\.(?:com|net|org)\b',
+])
+
+class UrlizePattern(markdown.inlinepatterns.Pattern):
+    """ Return a link Element given an autolink (`http://example/com`). """
+    def handleMatch(self, m):
+        url = m.group(2)
+        
+        if url.startswith('<'):
+            url = url[1:-1]
+            
+        text = url
+        
+        if not url.split('://')[0] in ('http','https','ftp'):
+            if '@' in url and not '/' in url:
+                url = 'mailto:' + url
+            else:
+                url = 'http://' + url
+    
+        el = markdown.util.etree.Element("a")
+        el.set('href', url)
+        el.text = markdown.util.AtomicString(text)
+        return el
+
+class UrlizeExtension(markdown.Extension):
+    """ Urlize Extension for Python-Markdown. """
+
+    def extendMarkdown(self, md, md_globals):
+        """ Replace autolink with UrlizePattern """
+        md.inlinePatterns['autolink'] = UrlizePattern(URLIZE_RE, md)
+
+def makeExtension(*args, **kwargs):
+    return UrlizeExtension(*args, **kwargs)
+
+if __name__ == "__main__":
+    import doctest
+    doctest.testmod()

cookbook/helper/permission_helper.py

@@ -0,0 +1,68 @@
+"""
+Source: https://djangosnippets.org/snippets/1703/
+"""
+from django.contrib import messages
+from django.contrib.auth.decorators import user_passes_test
+from django.utils.translation import gettext as _
+from django.http import HttpResponseRedirect
+from django.urls import reverse_lazy, reverse
+
+
+def get_allowed_groups(groups_required):
+    groups_allowed = tuple(groups_required)
+    if 'guest' in groups_required:
+        groups_allowed = groups_allowed + ('user', 'admin')
+    if 'user' in groups_required:
+        groups_allowed = groups_allowed + ('admin',)
+    return groups_allowed
+
+
+def group_required(*groups_required):
+    """Requires user membership in at least one of the groups passed in."""
+
+    def in_groups(u):
+        groups_allowed = get_allowed_groups(groups_required)
+        if u.is_authenticated:
+            if u.is_superuser | bool(u.groups.filter(name__in=groups_allowed)):
+                return True
+        return False
+
+    return user_passes_test(in_groups, login_url='index')
+
+
+class GroupRequiredMixin(object):
+    """
+        groups_required - list of strings, required param
+    """
+
+    groups_required = None
+
+    def dispatch(self, request, *args, **kwargs):
+        if not request.user.is_authenticated:
+            messages.add_message(request, messages.ERROR, _('You are not logged in and therefore cannot view this page!'))
+            return HttpResponseRedirect(reverse_lazy('login'))
+        else:
+            if not request.user.is_superuser:
+                group_allowed = get_allowed_groups(self.groups_required)
+                user_groups = []
+                for group in request.user.groups.values_list('name', flat=True):
+                    user_groups.append(group)
+                if len(set(user_groups).intersection(group_allowed)) <= 0:
+                    messages.add_message(request, messages.ERROR, _('You do not have the required permissions to view this page!'))
+                    return HttpResponseRedirect(reverse_lazy('index'))
+        return super(GroupRequiredMixin, self).dispatch(request, *args, **kwargs)
+
+
+class OwnerRequiredMixin(object):
+
+    def dispatch(self, request, *args, **kwargs):
+        if not request.user.is_authenticated:
+            messages.add_message(request, messages.ERROR, _('You are not logged in and therefore cannot view this page!'))
+            return HttpResponseRedirect(reverse_lazy('login'))
+        else:
+            obj = self.get_object()
+            if not (obj.created_by == request.user or request.user.is_superuser):
+                messages.add_message(request, messages.ERROR, _('You cannot interact with this object as its not owned by you!'))
+                return HttpResponseRedirect(reverse('index'))
+
+        return super(OwnerRequiredMixin, self).dispatch(request, *args, **kwargs)

cookbook/migrations/0008_mealplan.py

@@ -0,0 +1,27 @@
+# Generated by Django 3.0.2 on 2020-01-17 14:55
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ('cookbook', '0007_auto_20191226_0852'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='MealPlan',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('meal', models.CharField(choices=[('BREAKFAST', 'Breakfast'), ('LUNCH', 'Lunch'), ('DINNER', 'Dinner'), ('OTHER', 'Other')], default='BREAKFAST', max_length=128)),
+                ('note', models.TextField(blank=True)),
+                ('date', models.DateField()),
+                ('recipe', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='cookbook.Recipe')),
+                ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
+            ],
+        ),
+    ]

cookbook/migrations/0009_auto_20200130_1056.py

@@ -0,0 +1,27 @@
+# Generated by Django 3.0.2 on 2020-01-30 09:56
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('cookbook', '0008_mealplan'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Unit',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('name', models.CharField(max_length=128, unique=True)),
+                ('description', models.TextField(blank=True, null=True)),
+            ],
+        ),
+        migrations.AddField(
+            model_name='recipeingredients',
+            name='unit_key',
+            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.PROTECT, to='cookbook.Unit'),
+        ),
+    ]

cookbook/migrations/0010_auto_20200130_1059.py

@@ -0,0 +1,28 @@
+# Generated by Django 3.0.2 on 2020-01-30 09:59
+
+from django.db import migrations
+
+
+def migrate_ingredient_units(apps, schema_editor):
+    Unit = apps.get_model('cookbook', 'Unit')
+    RecipeIngredients = apps.get_model('cookbook', 'RecipeIngredients')
+
+    for u in RecipeIngredients.objects.values('unit').distinct():
+        unit = Unit()
+        unit.name = u['unit']
+        unit.save()
+
+    for i in RecipeIngredients.objects.all():
+        i.unit_key = Unit.objects.get(name=i.unit)
+        i.save()
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('cookbook', '0009_auto_20200130_1056'),
+    ]
+
+    operations = [
+        migrations.RunPython(migrate_ingredient_units),
+    ]

cookbook/migrations/0011_remove_recipeingredients_unit.py

@@ -0,0 +1,17 @@
+# Generated by Django 3.0.2 on 2020-01-30 10:16
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('cookbook', '0010_auto_20200130_1059'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='recipeingredients',
+            name='unit',
+        ),
+    ]

cookbook/migrations/0012_auto_20200130_1116.py

@@ -0,0 +1,18 @@
+# Generated by Django 3.0.2 on 2020-01-30 10:16
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('cookbook', '0011_remove_recipeingredients_unit'),
+    ]
+
+    operations = [
+        migrations.RenameField(
+            model_name='recipeingredients',
+            old_name='unit_key',
+            new_name='unit',
+        ),
+    ]

cookbook/migrations/0013_userpreference.py

@@ -0,0 +1,24 @@
+# Generated by Django 3.0.2 on 2020-02-13 22:15
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ('cookbook', '0012_auto_20200130_1116'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='UserPreference',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('theme', models.CharField(choices=[('BOOTSTRAP', 'Bootstrap'), ('DARKLY', 'Darkly'), ('FLATLY', 'Flatly')], default='BOOTSTRAP', max_length=128)),
+                ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
+            ],
+        ),
+    ]

cookbook/migrations/0014_auto_20200213_2332.py

@@ -0,0 +1,26 @@
+# Generated by Django 3.0.2 on 2020-02-13 22:32
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ('cookbook', '0013_userpreference'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='userpreference',
+            name='theme',
+            field=models.CharField(choices=[('BOOTSTRAP', 'Bootstrap'), ('DARKLY', 'Darkly'), ('FLATLY', 'Flatly'), ('SUPERHERO', 'Superhero')], default='BOOTSTRAP', max_length=128),
+        ),
+        migrations.AlterField(
+            model_name='userpreference',
+            name='user',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, unique=True),
+        ),
+    ]

cookbook/migrations/0015_auto_20200213_2334.py

@@ -0,0 +1,21 @@
+# Generated by Django 3.0.2 on 2020-02-13 22:34
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ('cookbook', '0014_auto_20200213_2332'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='userpreference',
+            name='user',
+            field=models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL),
+        ),
+    ]

cookbook/migrations/0016_auto_20200213_2335.py

@@ -0,0 +1,25 @@
+# Generated by Django 3.0.2 on 2020-02-13 22:35
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ('cookbook', '0015_auto_20200213_2334'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='userpreference',
+            name='id',
+        ),
+        migrations.AlterField(
+            model_name='userpreference',
+            name='user',
+            field=models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, primary_key=True, serialize=False, to=settings.AUTH_USER_MODEL),
+        ),
+    ]

cookbook/migrations/0017_auto_20200216_2257.py

@@ -0,0 +1,18 @@
+# Generated by Django 3.0.2 on 2020-02-16 21:57
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('cookbook', '0016_auto_20200213_2335'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='userpreference',
+            name='theme',
+            field=models.CharField(choices=[('BOOTSTRAP', 'Bootstrap'), ('DARKLY', 'Darkly'), ('FLATLY', 'Flatly'), ('SUPERHERO', 'Superhero')], default='FLATLY', max_length=128),
+        ),
+    ]

cookbook/migrations/0018_auto_20200216_2303.py

@@ -0,0 +1,17 @@
+# Generated by Django 3.0.2 on 2020-02-16 22:03
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('cookbook', '0017_auto_20200216_2257'),
+    ]
+
+    operations = [
+        migrations.RenameModel(
+            old_name='RecipeIngredients',
+            new_name='RecipeIngredient',
+        ),
+    ]

cookbook/migrations/0019_ingredient.py

@@ -0,0 +1,20 @@
+# Generated by Django 3.0.2 on 2020-02-16 22:03
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('cookbook', '0018_auto_20200216_2303'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Ingredient',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('name', models.CharField(max_length=128, unique=True)),
+            ],
+        ),
+    ]

cookbook/migrations/0020_recipeingredient_ingredient.py

@@ -0,0 +1,19 @@
+# Generated by Django 3.0.2 on 2020-02-16 22:08
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('cookbook', '0019_ingredient'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='recipeingredient',
+            name='ingredient',
+            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.PROTECT, to='cookbook.Ingredient'),
+        ),
+    ]

cookbook/migrations/0021_auto_20200216_2309.py

@@ -0,0 +1,26 @@
+# Generated by Django 3.0.2 on 2020-02-16 22:09
+from django.db import migrations
+
+
+def migrate_ingredients(apps, schema_editor):
+    Ingredient = apps.get_model('cookbook', 'Ingredient')
+    RecipeIngredient = apps.get_model('cookbook', 'RecipeIngredient')
+
+    for u in RecipeIngredient.objects.values('name').distinct():
+        ingredient = Ingredient()
+        ingredient.name = u['name']
+        ingredient.save()
+
+    for i in RecipeIngredient.objects.all():
+        i.ingredient = Ingredient.objects.get(name=i.name)
+        i.save()
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ('cookbook', '0020_recipeingredient_ingredient'),
+    ]
+
+    operations = [
+        migrations.RunPython(migrate_ingredients),
+    ]

cookbook/migrations/0022_remove_recipeingredient_name.py

@@ -0,0 +1,17 @@
+# Generated by Django 3.0.2 on 2020-02-16 22:11
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('cookbook', '0021_auto_20200216_2309'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='recipeingredient',
+            name='name',
+        ),
+    ]

cookbook/migrations/0023_auto_20200216_2311.py

@@ -0,0 +1,18 @@
+# Generated by Django 3.0.2 on 2020-02-16 22:11
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('cookbook', '0022_remove_recipeingredient_name'),
+    ]
+
+    operations = [
+        migrations.RenameField(
+            model_name='recipeingredient',
+            old_name='ingredient',
+            new_name='name',
+        ),
+    ]

cookbook/migrations/0024_auto_20200216_2313.py

@@ -0,0 +1,18 @@
+# Generated by Django 3.0.2 on 2020-02-16 22:13
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('cookbook', '0023_auto_20200216_2311'),
+    ]
+
+    operations = [
+        migrations.RenameField(
+            model_name='recipeingredient',
+            old_name='name',
+            new_name='ingredient',
+        ),
+    ]

cookbook/migrations/0025_userpreference_nav_color.py

@@ -0,0 +1,18 @@
+# Generated by Django 3.0.2 on 2020-02-16 23:05
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('cookbook', '0024_auto_20200216_2313'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='userpreference',
+            name='nav_color',
+            field=models.CharField(choices=[('PRIMARY', 'Primary'), ('SECONDARY', 'Secondary'), ('SUCCESS', 'Success'), ('INFO', 'Info'), ('WARNING', 'Warning'), ('DANGER', 'Danger'), ('LIGHT', 'Light'), ('DARK', 'Dark')], default='PRIMARY', max_length=128),
+        ),
+    ]

cookbook/migrations/0026_auto_20200219_1605.py

@@ -0,0 +1,23 @@
+# Generated by Django 3.0.2 on 2020-02-19 15:05
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('cookbook', '0025_userpreference_nav_color'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='recipe',
+            name='cors_link',
+            field=models.CharField(blank=True, max_length=1024, null=True),
+        ),
+        migrations.AlterField(
+            model_name='recipe',
+            name='link',
+            field=models.CharField(blank=True, max_length=512, null=True),
+        ),
+    ]

cookbook/migrations/0027_ingredient_recipe.py

@@ -0,0 +1,19 @@
+# Generated by Django 3.0.4 on 2020-03-17 17:31
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('cookbook', '0026_auto_20200219_1605'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='ingredient',
+            name='recipe',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='cookbook.Recipe'),
+        ),
+    ]

cookbook/migrations/0028_auto_20200317_1901.py

@@ -0,0 +1,19 @@
+# Generated by Django 3.0.4 on 2020-03-17 18:01
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('cookbook', '0027_ingredient_recipe'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='recipeingredient',
+            name='ingredient',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='cookbook.Ingredient'),
+        ),
+    ]

cookbook/migrations/0029_auto_20200317_1901.py

@@ -0,0 +1,19 @@
+# Generated by Django 3.0.4 on 2020-03-17 18:01
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('cookbook', '0028_auto_20200317_1901'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='recipeingredient',
+            name='unit',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='cookbook.Unit'),
+        ),
+    ]

cookbook/migrations/0030_recipeingredient_note.py

@@ -0,0 +1,18 @@
+# Generated by Django 3.0.4 on 2020-03-17 18:02
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('cookbook', '0029_auto_20200317_1901'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='recipeingredient',
+            name='note',
+            field=models.CharField(blank=True, max_length=64, null=True),
+        ),
+    ]

cookbook/migrations/0031_auto_20200407_1841.py

@@ -0,0 +1,18 @@
+# Generated by Django 3.0.4 on 2020-04-07 16:41
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('cookbook', '0030_recipeingredient_note'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='keyword',
+            name='icon',
+            field=models.CharField(blank=True, max_length=16, null=True),
+        ),
+    ]

cookbook/migrations/0032_userpreference_default_unit.py

@@ -0,0 +1,18 @@
+# Generated by Django 3.0.4 on 2020-04-13 20:34
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('cookbook', '0031_auto_20200407_1841'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='userpreference',
+            name='default_unit',
+            field=models.CharField(default='g', max_length=32),
+        ),
+    ]

cookbook/migrations/0033_userpreference_default_page.py

@@ -0,0 +1,18 @@
+# Generated by Django 3.0.4 on 2020-04-13 20:41
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('cookbook', '0032_userpreference_default_unit'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='userpreference',
+            name='default_page',
+            field=models.CharField(choices=[('SEARCH', 'Search'), ('PLAN', 'Meal-Plan')], default='SEARCH', max_length=64),
+        ),
+    ]

cookbook/migrations/0034_auto_20200426_1614.py

@@ -0,0 +1,22 @@
+# Generated by Django 3.0.5 on 2020-04-26 14:14
+
+from django.db import migrations
+
+
+def apply_migration(apps, schema_editor):
+    Group = apps.get_model('auth', 'Group')
+    Group.objects.bulk_create([
+        Group(name=u'guest'),
+        Group(name=u'user'),
+        Group(name=u'admin'),
+    ])
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ('cookbook', '0033_userpreference_default_page'),
+    ]
+
+    operations = [
+        migrations.RunPython(apply_migration)
+    ]

cookbook/migrations/0035_auto_20200427_1637.py

@@ -0,0 +1,28 @@
+# Generated by Django 3.0.5 on 2020-04-27 14:37
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('cookbook', '0034_auto_20200426_1614'),
+    ]
+
+    operations = [
+        migrations.RenameField(
+            model_name='mealplan',
+            old_name='user',
+            new_name='created_by',
+        ),
+        migrations.RenameField(
+            model_name='recipebook',
+            old_name='user',
+            new_name='created_by',
+        ),
+        migrations.AlterField(
+            model_name='userpreference',
+            name='default_page',
+            field=models.CharField(choices=[('SEARCH', 'Search'), ('PLAN', 'Meal-Plan'), ('BOOKS', 'Books')], default='SEARCH', max_length=64),
+        ),
+    ]

cookbook/migrations/0036_auto_20200427_1800.py

@@ -0,0 +1,22 @@
+# Generated by Django 3.0.5 on 2020-04-27 16:00
+
+from django.db import migrations
+
+
+def apply_migration(apps, schema_editor):
+    Group = apps.get_model('auth', 'Group')
+    User = apps.get_model('auth', 'User')
+    for u in User.objects.all():
+        if u.groups.count() < 1:
+            u.groups.add(Group.objects.get(name='admin'))
+            u.save()
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ('cookbook', '0035_auto_20200427_1637'),
+    ]
+
+    operations = [
+        migrations.RunPython(apply_migration)
+    ]

cookbook/migrations/0037_userpreference_search_style.py

@@ -0,0 +1,18 @@
+# Generated by Django 3.0.5 on 2020-05-02 10:45
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('cookbook', '0036_auto_20200427_1800'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='userpreference',
+            name='search_style',
+            field=models.CharField(choices=[('SMALL', 'Small'), ('LARGE', 'Large')], default='LARGE', max_length=64),
+        ),
+    ]

cookbook/migrations/0038_auto_20200502_1259.py

@@ -0,0 +1,23 @@
+# Generated by Django 3.0.5 on 2020-05-02 10:59
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('cookbook', '0037_userpreference_search_style'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='recipebook',
+            name='description',
+            field=models.TextField(blank=True),
+        ),
+        migrations.AddField(
+            model_name='recipebook',
+            name='icon',
+            field=models.CharField(blank=True, max_length=16, null=True),
+        ),
+    ]

cookbook/migrations/0039_recipebook_shared.py

@@ -0,0 +1,20 @@
+# Generated by Django 3.0.5 on 2020-05-02 12:04
+
+from django.conf import settings
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ('cookbook', '0038_auto_20200502_1259'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='recipebook',
+            name='shared',
+            field=models.ManyToManyField(blank=True, related_name='shared_with', to=settings.AUTH_USER_MODEL),
+        ),
+    ]

cookbook/migrations/0040_auto_20200502_1433.py

@@ -0,0 +1,22 @@
+# Generated by Django 3.0.5 on 2020-05-02 12:33
+
+import annoying.fields
+from django.conf import settings
+from django.db import migrations
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ('cookbook', '0039_recipebook_shared'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='userpreference',
+            name='user',
+            field=annoying.fields.AutoOneToOneField(on_delete=django.db.models.deletion.CASCADE, primary_key=True, serialize=False, to=settings.AUTH_USER_MODEL),
+        ),
+    ]

cookbook/migrations/0041_auto_20200502_1446.py

@@ -0,0 +1,24 @@
+# Generated by Django 3.0.5 on 2020-05-02 12:46
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('cookbook', '0040_auto_20200502_1433'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='mealplan',
+            name='title',
+            field=models.CharField(blank=True, default='', max_length=64),
+        ),
+        migrations.AlterField(
+            model_name='mealplan',
+            name='recipe',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='cookbook.Recipe'),
+        ),
+    ]

cookbook/migrations/0042_cooklog.py

@@ -0,0 +1,27 @@
+# Generated by Django 3.0.5 on 2020-05-02 14:47
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ('cookbook', '0041_auto_20200502_1446'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='CookLog',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('created_at', models.DateTimeField(auto_now_add=True)),
+                ('rating', models.IntegerField(null=True)),
+                ('servings', models.IntegerField(default=0)),
+                ('created_by', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
+                ('recipe', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='cookbook.Recipe')),
+            ],
+        ),
+    ]

cookbook/migrations/0043_auto_20200507_2302.py

@@ -0,0 +1,25 @@
+# Generated by Django 3.0.5 on 2020-05-07 21:02
+
+from django.conf import settings
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ('cookbook', '0042_cooklog'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='mealplan',
+            name='shared',
+            field=models.ManyToManyField(blank=True, related_name='plan_share', to=settings.AUTH_USER_MODEL),
+        ),
+        migrations.AddField(
+            model_name='userpreference',
+            name='plan_share',
+            field=models.ManyToManyField(blank=True, related_name='plan_share_default', to=settings.AUTH_USER_MODEL),
+        ),
+    ]

cookbook/migrations/0044_viewlog.py

@@ -0,0 +1,25 @@
+# Generated by Django 3.0.5 on 2020-05-11 10:21
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ('cookbook', '0043_auto_20200507_2302'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='ViewLog',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('created_at', models.DateTimeField(auto_now_add=True)),
+                ('created_by', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
+                ('recipe', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='cookbook.Recipe')),
+            ],
+        ),
+    ]

cookbook/migrations/0045_userpreference_show_recent.py

@@ -0,0 +1,18 @@
+# Generated by Django 3.0.5 on 2020-06-02 08:51
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('cookbook', '0044_viewlog'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='userpreference',
+            name='show_recent',
+            field=models.BooleanField(default=True),
+        ),
+    ]

cookbook/models.py

@@ -1,8 +1,73 @@
-from django.contrib.auth.models import User
+import re
 
+from annoying.fields import AutoOneToOneField
+from django.contrib import auth
+from django.contrib.auth.models import User
+from django.utils.translation import gettext as _
 from django.db import models
 
 
+def get_user_name(self):
+    if not (name := f"{self.first_name} {self.last_name}") == " ":
+        return name
+    else:
+        return self.username
+
+
+auth.models.User.add_to_class('get_user_name', get_user_name)
+
+
+def get_model_name(model):
+    return ('_'.join(re.findall('[A-Z][^A-Z]*', model.__name__))).lower()
+
+
+class UserPreference(models.Model):
+    # Themes
+    BOOTSTRAP = 'BOOTSTRAP'
+    DARKLY = 'DARKLY'
+    FLATLY = 'FLATLY'
+    SUPERHERO = 'SUPERHERO'
+
+    THEMES = ((BOOTSTRAP, 'Bootstrap'), (DARKLY, 'Darkly'), (FLATLY, 'Flatly'), (SUPERHERO, 'Superhero'))
+
+    # Nav colors
+    PRIMARY = 'PRIMARY'
+    SECONDARY = 'SECONDARY'
+    SUCCESS = 'SUCCESS'
+    INFO = 'INFO'
+    WARNING = 'WARNING'
+    DANGER = 'DANGER'
+    LIGHT = 'LIGHT'
+    DARK = 'DARK'
+
+    COLORS = ((PRIMARY, 'Primary'), (SECONDARY, 'Secondary'), (SUCCESS, 'Success'), (INFO, 'Info'), (WARNING, 'Warning'), (DANGER, 'Danger'), (LIGHT, 'Light'), (DARK, 'Dark'))
+
+    # Default Page
+    SEARCH = 'SEARCH'
+    PLAN = 'PLAN'
+    BOOKS = 'BOOKS'
+
+    PAGES = ((SEARCH, _('Search')), (PLAN, _('Meal-Plan')), (BOOKS, _('Books')),)
+
+    # Search Style
+    SMALL = 'SMALL'
+    LARGE = 'LARGE'
+
+    SEARCH_STYLE = ((SMALL, _('Small')), (LARGE, _('Large')),)
+
+    user = AutoOneToOneField(User, on_delete=models.CASCADE, primary_key=True)
+    theme = models.CharField(choices=THEMES, max_length=128, default=FLATLY)
+    nav_color = models.CharField(choices=COLORS, max_length=128, default=PRIMARY)
+    default_unit = models.CharField(max_length=32, default='g')
+    default_page = models.CharField(choices=PAGES, max_length=64, default=SEARCH)
+    search_style = models.CharField(choices=SEARCH_STYLE, max_length=64, default=LARGE)
+    show_recent = models.BooleanField(default=True)
+    plan_share = models.ManyToManyField(User, blank=True, related_name='plan_share_default')
+
+    def __str__(self):
+        return str(self.user)
+
+
 class Storage(models.Model):
     DROPBOX = 'DB'
     NEXTCLOUD = 'NEXTCLOUD'
@@ -38,17 +103,23 @@ class SyncLog(models.Model):
     msg = models.TextField(default="")
     created_at = models.DateTimeField(auto_now_add=True)
 
+    def __str__(self):
+        return f"{self.created_at}:{self.sync} - {self.status}"
+
 
 class Keyword(models.Model):
     name = models.CharField(max_length=64, unique=True)
-    icon = models.CharField(max_length=1, blank=True, null=True)
+    icon = models.CharField(max_length=16, blank=True, null=True)
     description = models.TextField(default="", blank=True)
     created_by = models.IntegerField(default=0)
     created_at = models.DateTimeField(auto_now_add=True)
     updated_at = models.DateTimeField(auto_now=True)
 
     def __str__(self):
-        return "{0} {1}".format(self.icon, self.name)
+        if self.icon:
+            return f"{self.icon} {self.name}"
+        else:
+            return f"{self.name}"
 
 
 class Recipe(models.Model):
@@ -58,7 +129,8 @@ class Recipe(models.Model):
     storage = models.ForeignKey(Storage, on_delete=models.PROTECT, blank=True, null=True)
     file_uid = models.CharField(max_length=256, default="")
     file_path = models.CharField(max_length=512, default="")
-    link = models.CharField(max_length=512, default="")
+    link = models.CharField(max_length=512, null=True, blank=True)
+    cors_link = models.CharField(max_length=1024, null=True, blank=True)
     keywords = models.ManyToManyField(Keyword, blank=True)
     working_time = models.IntegerField(default=0)
     waiting_time = models.IntegerField(default=0)
@@ -70,16 +142,32 @@ class Recipe(models.Model):
     def __str__(self):
         return self.name
 
-    @property
-    def all_tags(self):
-        return ' '.join([(x.icon + x.name) for x in self.keywords.all()])
+
+class Unit(models.Model):
+    name = models.CharField(unique=True, max_length=128)
+    description = models.TextField(blank=True, null=True)
+
+    def __str__(self):
+        return self.name
 
 
-class RecipeIngredients(models.Model):
-    name = models.CharField(max_length=128)
+class Ingredient(models.Model):
+    name = models.CharField(unique=True, max_length=128)
+    recipe = models.ForeignKey(Recipe, null=True, blank=True, on_delete=models.SET_NULL)
+
+    def __str__(self):
+        return self.name
+
+
+class RecipeIngredient(models.Model):
     recipe = models.ForeignKey(Recipe, on_delete=models.CASCADE)
-    unit = models.CharField(max_length=128)
+    ingredient = models.ForeignKey(Ingredient, on_delete=models.PROTECT)
+    unit = models.ForeignKey(Unit, on_delete=models.PROTECT)
     amount = models.DecimalField(default=0, decimal_places=2, max_digits=16)
+    note = models.CharField(max_length=64, null=True, blank=True)
+
+    def __str__(self):
+        return str(self.amount) + ' ' + str(self.unit) + ' ' + str(self.ingredient)
 
 
 class Comment(models.Model):
@@ -89,6 +177,9 @@ class Comment(models.Model):
     created_at = models.DateTimeField(auto_now_add=True)
     updated_at = models.DateTimeField(auto_now=True)
 
+    def __str__(self):
+        return self.text
+
 
 class RecipeImport(models.Model):
     name = models.CharField(max_length=128)
@@ -103,7 +194,10 @@ class RecipeImport(models.Model):
 
 class RecipeBook(models.Model):
     name = models.CharField(max_length=128)
-    user = models.ForeignKey(User, on_delete=models.CASCADE)
+    description = models.TextField(blank=True)
+    icon = models.CharField(max_length=16, blank=True, null=True)
+    shared = models.ManyToManyField(User, blank=True, related_name='shared_with')
+    created_by = models.ForeignKey(User, on_delete=models.CASCADE)
 
     def __str__(self):
         return self.name
@@ -115,3 +209,48 @@ class RecipeBookEntry(models.Model):
 
     def __str__(self):
         return self.recipe.name
+
+
+class MealPlan(models.Model):
+    BREAKFAST = 'BREAKFAST'
+    LUNCH = 'LUNCH'
+    DINNER = 'DINNER'
+    OTHER = 'OTHER'
+    MEAL_TYPES = ((BREAKFAST, _('Breakfast')), (LUNCH, _('Lunch')), (DINNER, _('Dinner')), (OTHER, _('Other')),)
+
+    recipe = models.ForeignKey(Recipe, on_delete=models.CASCADE, blank=True, null=True)
+    title = models.CharField(max_length=64, blank=True, default='')
+    created_by = models.ForeignKey(User, on_delete=models.CASCADE)
+    shared = models.ManyToManyField(User, blank=True, related_name='plan_share')
+    meal = models.CharField(choices=MEAL_TYPES, max_length=128, default=BREAKFAST)
+    note = models.TextField(blank=True)
+    date = models.DateField()
+
+    def get_label(self):
+        if self.title:
+            return self.title
+        return str(self.recipe)
+
+    def get_meal_name(self):
+        meals = dict(self.MEAL_TYPES)
+        return meals.get(self.meal)
+
+
+class CookLog(models.Model):
+    recipe = models.ForeignKey(Recipe, on_delete=models.CASCADE)
+    created_by = models.ForeignKey(User, on_delete=models.CASCADE)
+    created_at = models.DateTimeField(auto_now_add=True)
+    rating = models.IntegerField(null=True)
+    servings = models.IntegerField(default=0)
+
+    def __str__(self):
+        return self.recipe.name
+
+
+class ViewLog(models.Model):
+    recipe = models.ForeignKey(Recipe, on_delete=models.CASCADE)
+    created_by = models.ForeignKey(User, on_delete=models.CASCADE)
+    created_at = models.DateTimeField(auto_now_add=True)
+
+    def __str__(self):
+        return self.recipe.name

cookbook/provider/dropbox.py

@@ -1,3 +1,4 @@
+import base64
 import os
 from datetime import datetime
 
@@ -34,7 +35,7 @@ class Dropbox(Provider):
         import_count = 0
         for recipe in recipes['entries']:  # TODO check if has_more is set and import that as well
             path = recipe['path_lower']
-            if not Recipe.objects.filter(file_path=path).exists() and not RecipeImport.objects.filter(
+            if not Recipe.objects.filter(file_path__iexact=path).exists() and not RecipeImport.objects.filter(
                     file_path=path).exists():
                 name = os.path.splitext(recipe['name'])[0]
                 new_recipe = RecipeImport(name=name, file_path=path, storage=monitor.storage, file_uid=recipe['id'])
@@ -88,6 +89,16 @@ class Dropbox(Provider):
         response = Dropbox.create_share_link(recipe)
         return response['url']
 
+    @staticmethod
+    def get_base64_file(recipe):
+        if not recipe.link:
+            recipe.link = Dropbox.get_share_link(recipe)
+            recipe.save()
+
+        response = requests.get(recipe.link.replace('www.dropbox.', 'dl.dropboxusercontent.'))
+
+        return base64.b64encode(response.content)
+
     @staticmethod
     def rename_file(recipe, new_name):
         url = "https://api.dropboxapi.com/2/files/move_v2"

cookbook/provider/nextcloud.py

@@ -1,8 +1,10 @@
+import base64
 import os
+import tempfile
 from datetime import datetime
 import webdav3.client as wc
 import requests
-
+from io import BytesIO
 from requests.auth import HTTPBasicAuth
 
 from cookbook.models import Recipe, RecipeImport, SyncLog
@@ -14,9 +16,10 @@ class Nextcloud(Provider):
     @staticmethod
     def get_client(storage):
         options = {
-            'webdav_hostname': storage.url + '/remote.php/dav/files/' + storage.username,
+            'webdav_hostname': storage.url,
             'webdav_login': storage.username,
-            'webdav_password': storage.password
+            'webdav_password': storage.password,
+            'webdav_root': '/remote.php/dav/files/' + storage.username
         }
         return wc.Client(options)
 
@@ -30,7 +33,7 @@ class Nextcloud(Provider):
         import_count = 0
         for file in files:
             path = monitor.path + '/' + file
-            if not Recipe.objects.filter(file_path=path).exists() and not RecipeImport.objects.filter(
+            if not Recipe.objects.filter(file_path__iexact=path).exists() and not RecipeImport.objects.filter(
                     file_path=path).exists():
                 name = os.path.splitext(file)[0]
                 new_recipe = RecipeImport(name=name, file_path=path, storage=monitor.storage)
@@ -81,6 +84,20 @@ class Nextcloud(Provider):
 
         return Nextcloud.create_share_link(recipe)
 
+    @staticmethod
+    def get_base64_file(recipe):
+        client = Nextcloud.get_client(recipe.storage)
+
+        tmp_file_path = tempfile.gettempdir() + '/' + recipe.name + '.pdf'
+
+        client.download_file(remote_path=recipe.file_path, local_path=tmp_file_path)
+
+        val = base64.b64encode(open(tmp_file_path, 'rb').read())
+
+        os.remove(tmp_file_path)
+
+        return val
+
     @staticmethod
     def rename_file(recipe, new_name):
         client = Nextcloud.get_client(recipe.storage)

cookbook/provider/provider.py

@@ -11,10 +11,14 @@ class Provider:
     def get_share_link(recipe):
         raise Exception('Method not implemented in storage provider')
 
+    @staticmethod
+    def get_base64_file(recipe):
+        raise Exception('Method not implemented in storage provider')
+
     @staticmethod
     def rename_file(recipe, new_name):
         raise Exception('Method not implemented in storage provider')
 
     @staticmethod
-    def delete_file(recipe, new_name):
+    def delete_file(recipe):
         raise Exception('Method not implemented in storage provider')

cookbook/static/css/select2-bootstrap.css

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

cookbook/static/custom/css/markdown_blockquote.css

@@ -0,0 +1,21 @@
+/* css classes needed to render markdown blockquotes */
+blockquote {
+    background: #f9f9f9;
+    border-left: 4px solid #ccc;
+    margin: 1.5em 10px;
+    padding: .5em 10px;
+    quotes: none;
+}
+
+blockquote:before {
+    color: #ccc;
+    content: open-quote;
+    font-size: 4em;
+    line-height: .1em;
+    margin-right: .25em;
+    vertical-align: -.4em;
+}
+
+blockquote p {
+    display: inline;
+}

cookbook/static/custom/js/form_select.js

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

cookbook/static/recipe_no_image.svg

@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   aria-hidden="true"
+   focusable="false"
+   data-prefix="fas"
+   data-icon="pizza-slice"
+   class="svg-inline--fa fa-pizza-slice fa-w-16"
+   role="img"
+   viewBox="0 0 512 512"
+   version="1.1"
+   id="svg4"
+   sodipodi:docname="recipe_no_image.svg"
+   inkscape:version="0.92.4 (5da689c313, 2019-01-14)">
+  <metadata
+     id="metadata10">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs8" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="3840"
+     inkscape:window-height="2066"
+     id="namedview6"
+     showgrid="false"
+     inkscape:zoom="0.921875"
+     inkscape:cx="309.52383"
+     inkscape:cy="214.71807"
+     inkscape:window-x="2869"
+     inkscape:window-y="54"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg4" />
+  <rect
+     style="fill:#f5f5f6;fill-opacity:1;stroke:#d8dde0;stroke-width:3.77952766;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="rect817"
+     width="1717.1526"
+     height="1092.339"
+     x="-602.57629"
+     y="-290.16949" />
+  <path
+     d="m 198.99508,105.32039 c -9.4835,-0.89523 -18.30973,4.9591 -20.73342,14.20588 l -8.69126,33.14115 c 110.10488,3.23343 184.58794,76.92493 189.24752,186.70242 l 33.41527,-9.29389 c 9.22528,-2.56789 14.95881,-11.59086 13.8614,-21.1439 C 393.84116,202.45866 305.74904,115.43295 198.99508,105.32039 Z m -34.31314,65.96427 -58.59701,223.50695 a 9.5128449,9.5471493 0 0 0 11.73701,11.63209 l 222.4163,-61.9004 C 337.73239,241.51893 268.0087,172.46259 164.68194,171.30821 Z m 16.19707,178.95751 a 18.779213,18.846933 0 1 1 18.77921,-18.84693 18.779213,18.846933 0 0 1 -18.77921,18.84693 z m 28.16882,-89.52293 a 18.779213,18.846933 0 1 1 18.77921,-18.84693 18.779213,18.846933 0 0 1 -18.77921,18.84693 z m 61.03245,61.25253 a 18.779213,18.846933 0 1 1 18.77921,-18.84693 18.779213,18.846933 0 0 1 -18.77921,18.84693 z"
+     id="path2"
+     style="fill:#d9cfbe;fill-opacity:1;stroke-width:0.58790755"
+     inkscape:connector-curvature="0" />
+</svg>

cookbook/static/themes/select2-bootstrap-theme.css

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

cookbook/tables.py

@@ -6,10 +6,16 @@ from django_tables2.utils import A  # alias for Accessor
 from .models import *
 
 
-class RecipeTable(tables.Table):
+class ImageUrlColumn(tables.Column):
+    def render(self, value):
+        if value.url:
+            return value.url
+        return None
+
+
+class RecipeTableSmall(tables.Table):
     id = tables.LinkColumn('edit_recipe', args=[A('id')])
-    name = tables.TemplateColumn(
-        "<a href='#' onClick='openRecipe({{record.id}})'>{{record.name}}</a>")
+    name = tables.LinkColumn('view_recipe', args=[A('id')])
     all_tags = tables.Column(
         attrs={'td': {'class': 'd-none d-lg-table-cell'}, 'th': {'class': 'd-none d-lg-table-cell'}})
 
@@ -19,6 +25,19 @@ class RecipeTable(tables.Table):
         fields = ('id', 'name', 'all_tags')
 
 
+class RecipeTable(tables.Table):
+    edit = tables.TemplateColumn("<a style='color: inherit' href='{% url 'edit_recipe' record.id %}' >" + _('Edit') + "</a>")
+    name = tables.LinkColumn('view_recipe', args=[A('id')])
+    all_tags = tables.Column(
+        attrs={'td': {'class': 'd-none d-lg-table-cell'}, 'th': {'class': 'd-none d-lg-table-cell'}})
+    image = ImageUrlColumn()
+
+    class Meta:
+        model = Recipe
+        template_name = 'recipes_table.html'
+        fields = ('id', 'name', 'all_tags', 'image', 'instructions', 'working_time', 'waiting_time', 'internal')
+
+
 class KeywordTable(tables.Table):
     id = tables.LinkColumn('edit_keyword', args=[A('id')])
 
@@ -28,6 +47,15 @@ class KeywordTable(tables.Table):
         fields = ('id', 'icon', 'name')
 
 
+class IngredientTable(tables.Table):
+    id = tables.LinkColumn('edit_ingredient', args=[A('id')])
+
+    class Meta:
+        model = Keyword
+        template_name = 'generic/table_template.html'
+        fields = ('id', 'name')
+
+
 class StorageTable(tables.Table):
     id = tables.LinkColumn('edit_storage', args=[A('id')])
 
@@ -45,7 +73,7 @@ class ImportLogTable(tables.Table):
         if value == 'SUCCESS':
             return format_html('<span class="badge badge-success">%s</span>' % value)
         else:
-            return format_html('<span class="badge badge-error">%s</span>' % value)
+            return format_html('<span class="badge badge-danger">%s</span>' % value)
 
     class Meta:
         model = SyncLog
@@ -72,9 +100,27 @@ class SyncTable(tables.Table):
 
 class RecipeImportTable(tables.Table):
     id = tables.LinkColumn('new_recipe_import', args=[A('id')])
-    delete = tables.TemplateColumn("<a href='{% url 'delete_import' record.id %}' >" + _('Delete') + "</a>")
+    delete = tables.TemplateColumn("<a href='{% url 'delete_recipe_import' record.id %}' >" + _('Delete') + "</a>")
 
     class Meta:
         model = RecipeImport
         template_name = 'generic/table_template.html'
         fields = ('id', 'name', 'file_path')
+
+
+class ViewLogTable(tables.Table):
+    recipe = tables.LinkColumn('view_recipe', args=[A('recipe_id')])
+
+    class Meta:
+        model = ViewLog
+        template_name = 'generic/table_template.html'
+        fields = ('recipe', 'created_at')
+
+
+class CookLogTable(tables.Table):
+    recipe = tables.LinkColumn('view_recipe', args=[A('recipe_id')])
+
+    class Meta:
+        model = CookLog
+        template_name = 'generic/table_template.html'
+        fields = ('recipe', 'rating', 'serving', 'created_at')

cookbook/templates/base.html

@@ -1,5 +1,6 @@
 {% load static %}
 {% load i18n %}
+{% load theming_tags %}
 
 <html>
 <head>
@@ -18,26 +19,21 @@
     <meta name="msapplication-TileImage" content="/mstile-144x144.png">
 
     <!-- Bootstrap 4 -->
-    <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/css/bootstrap.min.css"
-          integrity="sha384-Vkoo8x4CGsO3+Hhxv8T/Q5PaXtkKtu6ug5TOeNV6gBiFeWPGFN9MuhOf23Q9Ifjh" crossorigin="anonymous">
-    <script src="https://code.jquery.com/jquery-3.4.1.slim.min.js"
-            integrity="sha384-J6qa4849blE2+poT4WnyKhv5vZF5SrPo0iEjwBvKU7imGFAV0wwj1yYfoRSJoZ+n"
-            crossorigin="anonymous"></script>
-    <script src="https://cdn.jsdelivr.net/npm/popper.js@1.16.0/dist/umd/popper.min.js"
-            integrity="sha384-Q6E9RHvbIyZFJoft+2mJbHaEWldlvI9IOYy5n3zV9zzTtmI3UksdQRVvoxMfooAo"
-            crossorigin="anonymous"></script>
-    <script src="https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/js/bootstrap.min.js"
-            integrity="sha384-wfSDF2E50Y2D1uUdj0O3uMBJnjuUD4Ih7YwaYd1iqfktj0Uod8GCExl3Og8ifwB6"
-            crossorigin="anonymous"></script>
+    <link id="id_main_css" href="{% theme_url request %}" rel="stylesheet">
+    <script src="{% static 'js/jquery-3.5.1.min.js' %}"></script>
+
+    <script src="{% static 'js/popper.min.js' %}"></script>
+    <script src="{% static 'js/bootstrap.min.js' %}"></script>
 
     <!-- Select2 for use with django autocomplete light -->
-    <link href="https://cdn.jsdelivr.net/npm/select2@4.0.12/dist/css/select2.min.css" rel="stylesheet"/>
-    <script src="https://cdn.jsdelivr.net/npm/select2@4.0.12/dist/js/select2.min.js"></script>
+    <link href="{% static 'css/select2.min.css' %}" rel="stylesheet"/>
+    <script src="{% static 'js/select2.min.js' %}"></script>
 
     <!-- Bootstrap theme for select2 -->
-    <link rel="stylesheet"
-          href="https://cdnjs.cloudflare.com/ajax/libs/select2-bootstrap-theme/0.1.0-beta.10/select2-bootstrap.css"
-          integrity="sha256-zFnNbsU+u3l0K+MaY92RvJI6AdAVAxK3/QrBApHvlH8=" crossorigin="anonymous"/>
+    <link rel="stylesheet" href="{% static 'css/select2-bootstrap.css' %}"/>
+
+    <link rel="stylesheet" href="{% static 'themes/select2-bootstrap-theme.css' %}"/>
+
     <script type="text/javascript">
         $.fn.select2.defaults.set("theme", "bootstrap");
     </script>
@@ -48,92 +44,127 @@
     {% block extra_head %} <!-- block for templates to put stuff into header -->
     {% endblock %}
 
-    <style>
-        @media (max-width: 1025px) {
-            .container {
-                width: 95% !important;
-                margin-left: 20px !important;
-                margin-right: 20px !important;
-                max-width: 1200px !important;
-            }
-        }
-    </style>
 </head>
 <body>
-<nav class="navbar navbar-expand-lg navbar-dark bg-primary">
-    <!--<a class="navbar-brand" href="{% url 'index' %}">{% trans 'Cookbook' %}</a>-->
+
+<nav class="navbar navbar-expand-lg navbar-dark bg-{% nav_color request %}" id="id_main_nav">
     <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarText"
             aria-controls="navbarText" aria-expanded="false" aria-label="Toggle navigation">
         <span class="navbar-toggler-icon"></span>
     </button>
     <div class="collapse navbar-collapse" id="navbarText">
         <ul class="navbar-nav mr-auto">
-            <li class="nav-item active">
-                <a class="nav-link" href="{% url 'index' %}"><i class="fas fa-book"></i> {% trans 'Cookbook' %}<span
+            <li class="nav-item {% if request.resolver_match.url_name in 'view_search,edit_recipe,edit_internal_recipe,edit_external_recipe,view_recipe' %}active{% endif %}">
+                <a class="nav-link" href="{% url 'view_search' %}"><i
+                        class="fas fa-book"></i> {% trans 'Cookbook' %}<span
                         class="sr-only">(current)</span></a>
             </li>
-            <li class="nav-item">
-                <a class="nav-link" href="{% url 'view_books' %}"><i class="fas fa-bookmark"></i> {% trans 'Books' %}</a>
+
+            <li class="nav-item dropdown {% if request.resolver_match.url_name in 'view_books,view_plan,view_shopping,list_ingredient,view_plan_entry' %}active{% endif %}">
+                <a class="nav-link dropdown-toggle" href="#" id="navbarDropdownMenuLink" data-toggle="dropdown"
+                   aria-haspopup="true" aria-expanded="false">
+                    <i class="fas fa-mortar-pestle"></i> {% trans 'Utensils' %}
+                </a>
+                <div class="dropdown-menu" aria-labelledby="navbarDropdownMenuLink">
+                    <a class="dropdown-item" href="{% url 'view_books' %}"><i
+                            class="fas fa-bookmark fa-fw"></i> {% trans 'Books' %}
+                    </a>
+                    <a class="dropdown-item" href="{% url 'view_plan' %}"><i
+                            class="fas fa-calendar fa-fw"></i> {% trans 'Meal-Plan' %}
+                    </a>
+                    <a class="dropdown-item" href="{% url 'view_shopping' %}"><i
+                            class="fas fa-shopping-cart fa-fw"></i> {% trans 'Shopping' %}
+                    </a>
+                    <a class="dropdown-item" href="{% url 'list_ingredient' %}"><i
+                            class="fas fa-leaf fa-fw"></i> {% trans 'Ingredients' %}
+                    </a>
+                </div>
             </li>
-            <li class="nav-item dropdown">
+            <li class="nav-item dropdown {% if request.resolver_match.url_name in 'list_keyword,data_batch_edit' %}active{% endif %}">
                 <a class="nav-link dropdown-toggle" href="#" id="navbarDropdownMenuLink" data-toggle="dropdown"
                    aria-haspopup="true" aria-expanded="false">
                     <i class="fas fa-tags"></i> {% trans 'Tags' %}
                 </a>
                 <div class="dropdown-menu" aria-labelledby="navbarDropdownMenuLink">
                     <a class="dropdown-item" href="{% url 'list_keyword' %}"><i
-                            class="fas fa-tags"></i> {% trans 'Keyword' %}</a>
+                            class="fas fa-tags fa-fw"></i> {% trans 'Keyword' %}</a>
                     <a class="dropdown-item" href="{% url 'data_batch_edit' %}"><i
-                            class="fas fa-edit"></i> {% trans 'Batch Edit' %}</a>
+                            class="fas fa-edit fa-fw"></i> {% trans 'Batch Edit' %}</a>
                 </div>
             </li>
-            <li class="nav-item dropdown">
+            <li class="nav-item dropdown {% if request.resolver_match.url_name in 'list_storage,data_sync,list_recipe_import,list_sync_log,data_stats,edit_ingredient' %}active{% endif %}">
                 <a class="nav-link dropdown-toggle" href="#" id="navbarDropdownMenuLink" data-toggle="dropdown"
                    aria-haspopup="true" aria-expanded="false"><i class="fas fa-database"></i> {% trans 'Storage Data' %}
                 </a>
                 <div class="dropdown-menu" aria-labelledby="navbarDropdownMenuLink">
                     <a class="dropdown-item" href="{% url 'list_storage' %}"><i
-                            class="fas fa-database"></i> {% trans 'Storage Backends' %}</a>
+                            class="fas fa-database fa-fw"></i> {% trans 'Storage Backends' %}</a>
                     <a class="dropdown-item" href="{% url 'data_sync' %}"><i
-                            class="fas fa-sync-alt"></i> {% trans 'Configure Sync' %}</a>
-                    <a class="dropdown-item" href="{% url 'list_import' %}"><i
-                            class="far fa-file-alt"></i> {% trans 'Import Recipes' %}</a>
-                    <a class="dropdown-item" href="{% url 'list_import_log' %}"><i
-                            class="fas fa-history"></i> {% trans 'Import Log' %}</a>
+                            class="fas fa-sync-alt fa-fw"></i> {% trans 'Configure Sync' %}</a>
+                    <a class="dropdown-item" href="{% url 'list_recipe_import' %}"><i
+                            class="far fa-file-alt fa-fw"></i> {% trans 'Discovered Recipes' %}</a>
+                    <a class="dropdown-item" href="{% url 'list_sync_log' %}"><i
+                            class="fas fa-history fa-fw"></i> {% trans 'Discovery Log' %}</a>
                     <a class="dropdown-item" href="{% url 'data_stats' %}"><i
-                            class="fas fa-chart-line"></i> {% trans 'Statistics' %}</a>
+                            class="fas fa-chart-line fa-fw"></i> {% trans 'Statistics' %}</a>
+                    <a class="dropdown-item" href="{% url 'edit_ingredient' %}"><i
+                            class="fas fa-balance-scale fa-fw"></i> {% trans 'Units & Ingredients' %}</a>
+                    <a class="dropdown-item" href="{% url 'view_import' %}"><i
+                            class="fas fa-file-import"></i> {% trans 'Import Recipe' %}</a>
+
                 </div>
             </li>
         </ul>
 
         <ul class="navbar-nav ml-auto">
-            <li class="nav-item">
-                <a class="nav-link" href="{% url 'admin:index' %}"><i
-                        class="fas fa-user-shield"></i> {% trans 'Admin' %}</a>
-            </li>
-            <li class="nav-item">
-                {% if user.is_authenticated %}
-                    <a class="nav-link" href="{% url 'logout' %}">{% trans 'Logout' %} {{ user.get_username }} <i
-                            class="fas fa-sign-out-alt"></i></a>
-                {% else %}
-                    <a class="nav-link" href="{% url 'login' %}">{% trans 'Login' %} <i class="fas fa-sign-in-alt"></i></a>
-                {% endif %}
-            </li>
-        </ul>
+            {% if user.is_authenticated %}
+                <li class="nav-item dropdown {% if request.resolver_match.url_name in 'view_settings,view_history' %}active{% endif %}">
+                    <a class="nav-link dropdown-toggle" href="#" id="navbarDropdownMenuLink" data-toggle="dropdown"
+                       aria-haspopup="true" aria-expanded="false"><i
+                            class="fas fa-user-alt"></i> {{ user.get_user_name }}
+                    </a>
 
+                    <div class="dropdown-menu dropdown-menu-right" aria-labelledby="navbarDropdownMenuLink">
+                        <a class="dropdown-item" href="{% url 'view_settings' %}"><i
+                                class="fas fa-user-cog fa-fw"></i> {% trans 'Settings' %}</a>
+                        <a class="dropdown-item" href="{% url 'view_history' %}"><i
+                                class="fas fa-history"></i> {% trans 'History' %}</a>
+                        {% if user.is_superuser %}
+                            <a class="dropdown-item" href="{% url 'admin:index' %}"><i
+                                    class="fas fa-user-shield fa-fw"></i> {% trans 'Admin' %}</a>
+                        {% endif %}
+                        <div class="dropdown-divider"></div>
+                        <a class="dropdown-item" href="{% url 'docs_markdown' %}"><i
+                                class="fab fa-markdown fa-fw"></i> {% trans 'Markdown Help' %}</a>
+                        <a class="dropdown-item" href="https://github.com/vabene1111/recipes"><i
+                                class="fab fa-github fa-fw"></i> {% trans 'GitHub' %}</a>
+                        <div class="dropdown-divider"></div>
+                        <a class="dropdown-item" href="{% url 'logout' %}"><i
+                                class="fas fa-sign-out-alt fa-fw"></i> {% trans 'Logout' %}</a>
+                    </div>
+                </li>
+            {% else %}
+                <li class="nav-item">
+                    <a class="nav-link" href="{% url 'login' %}">{% trans 'Login' %} <i class="fas fa-sign-in-alt"></i></a>
+                </li>
+            {% endif %}
+        </ul>
     </div>
 </nav>
 <br/>
 <br/>
 
 <div class="container">
-
     {% for message in messages %}
-        <div class="alert alert-{{ message.tags }} alert-dismissible fade show" role="alert">
-            {{ message }}
-            <button type="button" class="close" data-dismiss="alert" aria-label="Close">
-                <span aria-hidden="true">&times;</span>
-            </button>
+        <div class="row">
+            <div class="col col-md-12">
+                <div class="alert alert-{{ message.tags }} alert-dismissible fade show" role="alert">
+                    {{ message }}
+                    <button type="button" class="close" data-dismiss="alert" aria-label="Close">
+                        <span aria-hidden="true">&times;</span>
+                    </button>
+                </div>
+            </div>
         </div>
     {% endfor %}
 
@@ -141,5 +172,8 @@
     {% endblock %}
 </div>
 
+{% block script %}
+{% endblock script %}
+
 </body>
 </html>

cookbook/templates/books.html

@@ -1,4 +1,5 @@
 {% extends "base.html" %}
+{% load custom_tags %}
 {% load i18n %}
 
 {% block title %}{% trans 'Recipe Books' %}{% endblock %}
@@ -10,53 +11,71 @@
             <h2>{% trans 'Recipe Books' %}</h2>
         </div>
         <div class="col col-md-3" style="text-align: right">
-            <a href="{% url 'new_book' %}" class="btn btn-success"><i
+            <a href="{% url 'new_recipe_book' %}" class="btn btn-success"><i
                     class="fas fa-plus-circle"></i> {% trans 'New Book' %}</a>
         </div>
     </div>
     <br/>
     <br/>
-
     {% for b in book_list %}
         <div class="row">
-            <div class="col col-md-10">
-                <a data-toggle="collapse" href="#collapse_{{ b.book.pk }}" role="button" aria-expanded="false"
-                   aria-controls="collapse_{{ b.book.pk }}"><h4>{{ b.book.name }}</h4></a>
-            </div>
-            <div class="col col-md-2" style="text-align: right">
-                <h4>
+            <div class="col-12">
+                <div class="card" style="margin-top: 2px">
+                    <div class="card-body">
+                        <h5 class="card-title">{% if b.book.icon %}{{ b.book.icon }} {% endif %}{{ b.book.name }}</h5>
+                        <h6 class="card-subtitle mb-2 text-muted">{% if b.book.created_by != request.user %}
+                            {% trans 'by' %} {{ b.book.created_by.get_user_name }}
+                        {% endif %}</h6>
 
-                    <a href="{% url 'edit_recipe_book' b.book.pk %}"> <i class="fas fa-pencil-alt"></i></a>
-                    <a href="{% url 'delete_recipe_book' b.book.pk %}"><i class="fas fa-trash-alt"></i></a>
-                </h4>
-            </div>
-            <hr/>
-        </div>
+                        {% if b.book.description %}
+                            <p class="card-text">{{ b.book.description }}</p>
+                        {% endif %}
+                        <a data-toggle="collapse" href="#collapse_{{ b.book.pk }}" role="button" aria-expanded="false"
+                           aria-controls="collapse_{{ b.book.pk }}" class="card-link">{% trans 'Toggle Recipes' %}</a>
+                        {% if b.book.created_by == request.user or request.user.is_superuser %}
+                            <a href="{% url 'edit_recipe_book' b.book.pk %}" class="card-link">{% trans 'Edit' %}</a>
+                            <a href="{% url 'delete_recipe_book' b.book.pk %}"
+                               class="card-link">{% trans 'Delete' %}</a>
+                        {% endif %}
+                    </div>
+                    <div class="collapse" id="collapse_{{ b.book.pk }}">
+                        {% if b.recipes %}
+                            <ul class="list-group list-group-flush">
+                                {% for r in b.recipes %}
+                                    <li class="list-group-item">
+                                        <div class="row">
+                                            <div class="col-10">
+                                                {% recipe_last r.recipe request.user as last_cooked %}
+                                                <a href="{% url 'view_recipe' r.recipe.pk %}">{{ r.recipe.name }}</a>
+                                                {% recipe_rating r.recipe request.user as rating %}
+                                                {{ rating|safe }}
+                                                {% if last_cooked %}
+                                                    &nbsp;
+                                                    <span class="badge badge-primary">{% trans 'Last cooked' %} {{ last_cooked|date }}</span>
+                                                {% endif %}
 
-        <div class="row">
-            <div class="col col-md-12">
-                <div class="collapse" id="collapse_{{ b.book.pk }}">
-                    {% if b.recipes %}
-                        <ul>
-                            {% for r in b.recipes %}
-                                <div class="row">
-                                    <div class="col col-md-10">
-                                        <li><a href="#" onClick='openRecipe({{ r.recipe.pk }})'>{{ r.recipe.name }}</a></li>
-                                    </div>
-                                    <div class="col col-md-2" style="text-align: right">
-                                        <a href="{% url 'delete_recipe_book_entry' r.pk %}"><i class="fas fa-trash-alt"></i></a>
-                                    </div>
-                                </div>
-                            {% endfor %}
-                        </ul>
-                    {% else %}
-                        {% trans 'There are no recipes in this book yet.' %}
-                    {% endif %}
+                                            </div>
+                                            {% if b.book.created_by == request.user or request.user.is_superuser %}
+                                                <div class="col-2" style="text-align: right">
+                                                    <a href="{% url 'delete_recipe_book_entry' r.pk %}"
+                                                       class="pull-right"><i class="fas fa-trash-alt"></i></a>
+                                                </div>
+                                            {% endif %}
+                                        </div>
+                                    </li>
+                                {% endfor %}
+                            </ul>
+                        {% else %}
+                            <div class="card-body">
+                                <p>
+                                    {% trans 'There are no recipes in this book yet.' %}
+                                </p>
+                            </div>
+                        {% endif %}
+                    </div>
                 </div>
             </div>
         </div>
-        <br/>
     {% endfor %}
 
-    {% include 'include/recipe_open_modal.html' %}
 {% endblock %}

cookbook/templates/export.html

@@ -0,0 +1,70 @@
+{% extends "base.html" %}
+{% load i18n %}
+{% load crispy_forms_filters %}
+{% load static %}
+
+{% block title %}{% trans 'Export Recipes' %}{% endblock %}
+
+{% block extra_head %}
+    {{ form.media }}
+{% endblock %}
+
+{% block content %}
+
+    <div class="row">
+        <div class="col col-md-12">
+            <form action="." method="post">
+                {% csrf_token %}
+                {{ form|crispy }}
+                <button class="btn btn-success" type="submit"><i class="fas fa-file-export"></i> {% trans 'Export' %}
+                </button>
+            </form>
+        </div>
+    </div>
+
+    {% if export %}
+
+        <br/>
+        <div class="row">
+            <div class="col col-md-12">
+                <label for="id_export">
+                    {% trans 'Exported Recipe' %}</label>
+                <textarea id="id_export" class="form-control" rows="12">
+{{ export }}
+</textarea>
+            </div>
+        </div>
+
+        <br/>
+        <div class="row">
+            <div class="col col-md-12 text-center">
+                <button class="btn btn-success" onclick="copy()" style="width: 15vw" data-toggle="tooltip"
+                        data-placement="right" title="{% trans 'Copy to clipboard' %}" id="id_btn_copy"
+                        onmouseout="resetTooltip()"><i
+                        class="far fa-copy"></i></button>
+            </div>
+        </div>
+
+        <script type="text/javascript">
+            function copy() {
+                let json = $('#id_export');
+
+                json.select();
+
+                $('#id_btn_copy').attr('data-original-title', '{% trans 'Copied!' %}').tooltip('show');
+
+                document.execCommand("copy");
+            }
+
+            function resetTooltip() {
+                setTimeout(function () {
+                    $('#id_btn_copy').attr('data-original-title', '{% trans 'Copy list to clipboard' %}');
+                }, 300);
+            }
+
+            $(function () {
+                $('[data-toggle="tooltip"]').tooltip()
+            })
+        </script>
+    {% endif %}
+{% endblock %}

cookbook/templates/forms/edit_internal_recipe.html

@@ -2,20 +2,22 @@
 {% load crispy_forms_tags %}
 {% load i18n %}
 {% load custom_tags %}
+{% load theming_tags %}
 {% load static %}
 
 {% block title %}{% trans 'Edit Recipe' %}{% endblock %}
 
 {% block extra_head %}
     <script src="{% static 'tabulator/tabulator.min.js' %}"></script>
-    <link rel="stylesheet" href="{% static 'tabulator/tabulator_bootstrap4.min.css' %}"/>
+    <link rel="stylesheet" href="{% tabulator_theme_url request %}"/>
+
 {% endblock %}
 
 {% block content %}
 
     <h3>{% trans 'Edit Recipe' %}</h3>
 
-    <form action="." method="post" enctype="multipart/form-data">
+    <form action="." method="post" enctype="multipart/form-data" id="id_form">
         {% csrf_token %}
 
         {% for field in form %}
@@ -24,18 +26,29 @@
             </div>
             {% if field.name == 'name' %}
                 <label>{% trans 'Ingredients' %}</label>
+                {{ form.ingredients.errors }}
                 <div id="ingredients-table"></div>
                 <br>
-                <div class="table-controls">
-                    <button class="btn" id="new_empty" type="button"><i class="fas fa-plus-circle"></i></button>
+                <div class="table-controls" style="text-align: center">
+                    <button class="btn btn-success" id="new_empty" type="button" style="min-width: 20vw"><i
+                            class="fas fa-plus-circle"></i></button>
+                    <button class="btn btn-warning" id="new_header" type="button" data-toggle="tooltip"
+                    data-placement="top" title="{% trans 'Insert a header between the ingredients.' %}"><i class="fas fa-heading"></i></button>
+
+                    <button type="button" class="btn btn-secondary" data-container="body" data-toggle="popover"
+                            data-placement="right" data-html="true" data-trigger="focus"
+                            data-content="{% trans 'Use <b>Ctrl</b>+<b>Space</b> to insert new Ingredient!<br/>You can also save the recipe using <b>Ctrl</b>+<b>Shift</b>+<b>S</b>.' %}">
+                        <i class="fas fa-question"></i>
+                    </button>
+                    <br/>
+                    <br/>
                 </div>
             {% endif %}
         {% endfor %}
 
-        <input type="hidden" id="ingredients_data_input" name="ingredients">
         <hr>
         <button class="btn btn-success" type="submit"><i class="fas fa-save"></i> {% trans 'Save' %}</button>
-        <a href="{% url 'redirect_delete' form.instance|get_class|lower form.instance.pk %}"
+        <a href="{% delete_url form.instance|get_class form.instance.pk %}"
            class="btn btn-danger"><i class="fas fa-trash-alt"></i> {% trans 'Delete' %}</a>
         {% if view_url %}
             <a href="{{ view_url }}" class="btn btn-info"><i class="far fa-eye"></i> {% trans 'View' %}</a>
@@ -46,38 +59,72 @@
         {% endif %}
     </form>
 
-    <script>
-        function selectText(node) {
+    <script type="application/javascript">
 
-            if (document.body.createTextRange) {
-                const range = document.body.createTextRange();
-                range.moveToElementText(node);
-                range.select();
-            } else if (window.getSelection) {
-                const selection = window.getSelection();
-                const range = document.createRange();
-                range.selectNodeContents(node);
-                selection.removeAllRanges();
-                selection.addRange(range);
-            } else {
-                console.warn("Could not select text in node: Unsupported browser.");
-            }
-        }
+        $(function () {
+            $('[data-toggle="popover"]').popover()
+        });
+
+        $('.popover-dismiss').popover({
+            trigger: 'focus'
+        });
+
+        let select2UnitEditor = function (cell, onRendered, success, cancel, editorParams) {
+            return select2Editor(cell, onRendered, success, cancel, editorParams, '{% url 'dal_unit' %}')
+        };
+
+        let select2IngredientEditor = function (cell, onRendered, success, cancel, editorParams) {
+            return select2Editor(cell, onRendered, success, cancel, editorParams, '{% url 'dal_ingredient' %}')
+        };
+
+        let select2Editor = function (cell, onRendered, success, cancel, editorParams, url) {
+
+            let editor = document.createElement("select");
+            editor.setAttribute("class", "form-control");
+            editor.setAttribute("style", "height: 100%; color: #00ff00");
+
+            onRendered(function () {
+                let select_2 = $(editor);
+
+                select_2.select2({
+                    tags: true,
+                    ajax: {
+                        url: url,
+                        dataType: 'json'
+                    }
+                });
+
+                select_2.select2('open');
+
+                select_2.on('select2:select', function (e) {
+                    success(e.params.data.text);
+                });
+
+                select_2.on('select2:close', function (e) {
+                    if (e.target.textContent === "") {
+                        cancel();
+                    }
+                });
+            });
+
+            //add editor to cell
+            return editor;
+        };
 
         //converts multiselct in recipe edit to searchable multiselect
         //shitty solution that needs to be redone at some point
         $(document).ready(function () {
             $('#id_keywords').select2();
 
-            var ingredients = {{ ingredients|safe }}
+            let ingredients = {{ ingredients|safe }}
 
                 ingredients.forEach(function (cur, i) {
                     cur.delete = false
-                })
+                });
 
-            var data = ingredients
+            let data = ingredients;
 
-            var table = new Tabulator("#ingredients-table", {
+            let table = new Tabulator("#ingredients-table", {
                 index: "id",
                 layout: "fitColumns",
                 reactiveData: true,
@@ -86,51 +133,103 @@
                 headerSort: false,
                 columns: [
                     {
-                        title: "{% trans 'Ingredient' %}",
-                        field: "name",
-                        validator: "required",
-                        editor: "input"
+                        title: "<i class='fas fa-sort'></i>",
+                        rowHandle: true,
+                        formatter: "handle",
+                        headerSort: false,
+                        frozen: true,
+                        width: 36,
+                        minWidth: 36
                     },
-                    {title: "{% trans 'Amount' %}", field: "amount", validator: "required", editor: "input"},
-                    {title: "{% trans 'Unit' %}", field: "unit", validator: "required", editor: "input"},
                     {
-                        title: "{% trans 'Delete' %}",
-                        field: "delete",
+                        title: "{% trans 'Ingredient' %}",
+                        field: "ingredient__name",
+                        validator: "required",
+                        editor: select2IngredientEditor
+                    },
+                    {title: "{% trans 'Amount' %}", field: "amount", validator: "required", editor: "number"},
+                    {
+                        title: "{% trans 'Unit' %}",
+                        field: "unit__name",
+                        validator: "required",
+                        editor: select2UnitEditor
+                    },
+                    {title: "{% trans 'Note' %}", field: "note", editor: "input"},
+                    {
+                        formatter: function (cell, formatterParams) {
+                            return "<span style='color:red'><i class=\"fas fa-trash-alt\"></i></span>"
+                        },
                         align: "center",
-                        editor: true,
-                        formatter: "tickCross"
+                        title: "{% trans 'Delete' %}",
+                        headerSort: false,
+                        cellClick: function (e, cell) {
+                            if (confirm('{% trans 'Are you sure that you want to delete this ingredient?' %}'))
+                                cell.getRow().delete();
+                        }
                     },
                     {title: "id", field: "id", visible: false}
                 ],
-                dataEdited: function (data) {
-                    $('#ingredients_data_input').val(JSON.stringify(data))
-
-                    data.forEach(function (cur, i) {
-                        if (cur.delete) {
-                            table.deleteRow(cur.id);
-                        }
-                    })
-                },
                 cellClick: function (e, cell) {
-                    input = cell.getElement().childNodes[0]
-                    input.focus()
-                    input.select()
+                    if (cell._cell.column.definition.editor === "input") {
+                        input = cell.getElement().childNodes[0];
+                        input.focus();
+                        input.select();
+                    }
                 },
             });
 
+            // save ingredient data before submitting form
+            $('#id_form').submit(function () {
+                $('#id_ingredients').val(JSON.stringify(table.getData()));
+                return true;
+            });
+
             // load initial value
-            $('#ingredients_data_input').val(JSON.stringify(data))
+            $('#id_ingredients').val(JSON.stringify(data));
 
-            document.getElementById("new_empty").addEventListener("click", function () {
+            function addIngredientRow() {
                 data.push({
-                    name: "{% trans 'Ingredient' %}",
+                    ingredient__name: "{% trans 'Ingredient' %}",
                     amount: "100",
-                    unit: "g",
+                    unit__name: "{{ request.user.userpreference.default_unit }}",
+                    note: "",
                     id: Math.floor(Math.random() * 10000000),
                     delete: false,
                 });
-            });
+                input = table.rowManager.rows[((table.rowManager.rows).length) - 1].cells[1].getElement()
+                input.focus();
+                input.select();
+            }
+
+            function addHeaderRow(type) {
+                data.push({
+                    ingredient__name: '{% trans 'Header' %}',
+                    amount: "0",
+                    unit__name: "Special:Header",
+                    note: "{% trans 'write header here' %}",
+                    id: Math.floor(Math.random() * 10000000),
+                    delete: false,
+                });
+                input = table.rowManager.rows[((table.rowManager.rows).length) - 1].cells[4].getElement()
+                input.focus();
+                input.select();
+            }
+
+            document.onkeyup = function (e) {
+                if (e.shiftKey && e.ctrlKey && (e.which === 83 || e.keyCode === 83)) {
+                    $('#id_form').submit()
+                } else if (e.ctrlKey && (e.which === 83 || e.keyCode === 32)) {
+                    addIngredientRow();
+                }
+            };
+
+            document.getElementById("new_empty").addEventListener("click", addIngredientRow);
+            document.getElementById("new_header").addEventListener("click", addHeaderRow);
         });
 
+        $(function () {
+            $('[data-toggle="tooltip"]').tooltip()
+        })
+
     </script>
 {% endblock %}

cookbook/templates/forms/ingredients.html

@@ -0,0 +1,43 @@
+{% extends "base.html" %}
+{% load django_tables2 %}
+{% load crispy_forms_tags %}
+{% load static %}
+{% load i18n %}
+
+{% block title %}{% trans "Cookbook" %}{% endblock %}
+
+{% block extra_head %}
+    {{ units_form.media }}
+{% endblock %}
+
+{% block content %}
+
+    <h2><i class="fas fa-shopping-cart"></i> {% trans 'Edit Ingredients' %}</h2>
+    {% blocktrans %}
+        The following form can be used if, accidentally, two (or more) units or ingredients where created that should be
+        the same.
+        It merges two units or ingredients and updates all recipes using them.
+    {% endblocktrans %}
+    <br/>
+    <br/>
+
+    <h4>{% trans 'Units' %}</h4>
+    <form action="{% url 'edit_ingredient' %}" method="post"
+          onsubmit="return confirm('{% trans 'Are you sure that you want to merge these two units ?' %}')">
+        {% csrf_token %}
+        {{ units_form|crispy }}
+        <button class="btn btn-danger" type="submit"
+        ><i
+                class="fas fa-sync-alt"></i> {% trans 'Merge' %}</button>
+    </form>
+
+    <h4>{% trans 'Ingredients' %}</h4>
+    <form action="{% url 'edit_ingredient' %}" method="post"
+          onsubmit="return confirm('{% trans 'Are you sure that you want to merge these two ingredients ?' %}')">
+        {% csrf_token %}
+        {{ ingredients_form|crispy }}
+        <button class="btn btn-danger" type="submit">
+            <i class="fas fa-sync-alt"></i> {% trans 'Merge' %}</button>
+    </form>
+
+{% endblock %}

cookbook/templates/generic/edit_template.html

@@ -13,7 +13,7 @@
 
     <h3>{% trans 'Edit' %} {{ title }}</h3>
 
-    {% if form.Meta.model|get_class == 'Storage' %}
+    {% if form.Meta.model|get_class_name == 'Storage' %}
         {% include 'include/storage_backend_warning.html' %}
     {% endif %}
 
@@ -21,8 +21,8 @@
         {% csrf_token %}
         {{ form|crispy }}
         <button class="btn btn-success" type="submit"><i class="fas fa-save"></i> {% trans 'Save' %}</button>
-        <a href="{% url 'redirect_delete' form.instance|get_class|lower form.instance.pk %}"
-           class="btn btn-danger">{% trans 'Delete' %}</a>
+        <a href="{% delete_url form.instance|get_class form.instance.pk %}"
+           class="btn btn-danger"><i class="fas fa-trash-alt"></i> {% trans 'Delete' %}</a>
         {% if view_url %}
             <a href="{{ view_url }}" class="btn btn-info"><i class="far fa-eye"></i> {% trans 'View' %}</a>
         {% endif %}

cookbook/templates/generic/list_template.html

@@ -15,6 +15,17 @@
                 </a>
             {% endif %}
         </h3>
+
+        {% if filter %}
+            <br/>
+            <br/>
+            <form action="." method="get">
+                {% csrf_token %}
+                {{ filter.form|crispy }}
+                <button type="submit" class="btn btn-success">{% trans 'Filter' %}</button>
+            </form>
+        {% endif %}
+
         {% if import_btn %}
             <a href="{% url 'data_batch_import' %}" class="btn btn-warning">{% trans 'Import all' %}</a>
             <br/>

cookbook/templates/generic/new_template.html

@@ -13,7 +13,7 @@
 
     <h3>{% trans 'New' %} {{ title }} </h3>
 
-    {% if form.Meta.model|get_class == 'Storage' %}
+    {% if form.Meta.model|get_class_name == 'Storage' %}
         {% include 'include/storage_backend_warning.html' %}
     {% endif %}
 
@@ -23,4 +23,15 @@
         <button class="btn btn-success" type="submit"><i class="fas fa-save"></i> {% trans 'Save' %}</button>
     </form>
 
+    {% if default_recipe %}
+        <script type="text/javascript">
+
+            $(document).ready(function () {
+                $('#id_recipe').val({{ default_recipe.pk }}).trigger('change');
+            });
+
+        </script>
+    {% endif %}
+
+
 {% endblock %}

cookbook/templates/generic/table_template.html

@@ -66,7 +66,7 @@
         {% block pagination %}
             {% if table.page and table.paginator.num_pages > 1 %}
                 <nav aria-label="Table navigation">
-                    <ul class="pagination justify-content-center">
+                    <ul class="pagination justify-content-center flex-wrap">
                         {% if table.page.has_previous %}
                             {% block pagination.previous %}
                                 <li class="previous page-item">