Merge branch 'develop' into feature/unit-conversion

# Conflicts:
#	vue/src/components/Modals/GenericModalForm.vue

cookbook/templates/base.html

@@ -9,6 +9,7 @@
     {% endblock %}</title>
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+    <meta name="robots" content="noindex,nofollow"/>
 
 
     <link rel="shortcut icon" type="image/x-icon" href="{% static 'assets/favicon.svg' %}">
@@ -49,7 +50,7 @@
     <script type="text/javascript">
         $.fn.select2.defaults.set("theme", "bootstrap");
         {% if request.user.is_authenticated %}
-        window.ACTIVE_SPACE_ID = '{{request.space.id}}';
+            window.ACTIVE_SPACE_ID = '{{request.space.id}}';
         {% endif %}
     </script>
 
@@ -349,6 +350,12 @@
                             <a class="dropdown-item" href="{% url 'view_space_overview' %}"><i
                                     class="fas fa-list"></i> {% trans 'Overview' %}</a>
                         {% endif %}
+                        {% plugin_dropdown_nav_templates as plugin_dropdown_nav_templates %}
+                        {% for pn in plugin_dropdown_nav_templates %}
+                            <div class="dropdown-divider"></div>
+                            {% include pn %}
+                        {% endfor %}
+
                         <div class="dropdown-divider"></div>
                         <a class="dropdown-item" href="{% url 'docs_markdown' %}"><i
                                 class="fab fa-markdown fa-fw"></i> {% trans 'Markdown Guide' %}</a>
@@ -375,6 +382,7 @@
     </div>
 </nav>
 
+
 {% message_of_the_day request as message_of_the_day %}
 {% if message_of_the_day %}
     <div class="bg-info" style=" width: 100%; text-align: center!important; color: #ffffff; padding: 8px">
@@ -439,7 +447,7 @@
     localStorage.setItem('STATIC_URL', "{% base_path request 'static_base' %}")
     localStorage.setItem('DEBUG', "{% is_debug %}")
     localStorage.setItem('USER_ID', "{{request.user.pk}}")
-    
+
     window.addEventListener("load", () => {
         if ("serviceWorker" in navigator) {
             navigator.serviceWorker.register("{% url 'service_worker' %}", {scope: "{% base_path request 'base' %}" + '/'}).then(function (reg) {

cookbook/templatetags/custom_tags.py

@@ -16,7 +16,7 @@ from cookbook.helper.mdx_attributes import MarkdownFormatExtension
 from cookbook.helper.mdx_urlize import UrlizeExtension
 from cookbook.models import Space, get_model_name
 from recipes import settings
-from recipes.settings import STATIC_URL
+from recipes.settings import STATIC_URL, PLUGINS
 
 register = template.Library()
 
@@ -132,6 +132,14 @@ def is_debug():
 def markdown_link():
     return f"{_('You can use markdown to format this field. See the ')}<a target='_blank' href='{reverse('docs_markdown')}'>{_('docs here')}</a>"
 
+@register.simple_tag
+def plugin_dropdown_nav_templates():
+    templates = []
+    for p in PLUGINS:
+        if p['nav_dropdown']:
+            templates.append(p['nav_dropdown'])
+    return templates
+
 
 @register.simple_tag
 def bookmarklet(request):

cookbook/urls.py

@@ -6,7 +6,7 @@ from rest_framework import permissions, routers
 from rest_framework.schemas import get_schema_view
 
 from cookbook.helper import dal
-from recipes.settings import DEBUG
+from recipes.settings import DEBUG, PLUGINS
 from recipes.version import VERSION_NUMBER
 
 from .models import (Automation, Comment, CustomFilter, Food, InviteLink, Keyword, MealPlan, Recipe,
@@ -16,7 +16,13 @@ from .models import (Automation, Comment, CustomFilter, Food, InviteLink, Keywor
 from .views import api, data, delete, edit, import_export, lists, new, telegram, views
 from .views.api import CustomAuthToken, ImportOpenData
 
-router = routers.DefaultRouter()
+# extend DRF default router class to allow including additional routers
+class DefaultRouter(routers.DefaultRouter):
+    def extend(self, r):
+        self.registry.extend(r.registry)
+
+
+router = DefaultRouter()
 router.register(r'automation', api.AutomationViewSet)
 router.register(r'bookmarklet-import', api.BookmarkletImportViewSet)
 router.register(r'cook-log', api.CookLogViewSet)
@@ -56,6 +62,13 @@ router.register(r'user-space', api.UserSpaceViewSet)
 router.register(r'view-log', api.ViewLogViewSet)
 router.register(r'access-token', api.AccessTokenViewSet)
 
+for p in PLUGINS:
+    if c := locate(f'{p["module"]}.urls.{p["api_router_name"]}'):
+        try:
+            router.extend(c)
+        except AttributeError:
+            pass
+
 urlpatterns = [
     path('', views.index, name='index'),
     path('setup/', views.setup, name='view_setup'),
@@ -122,7 +135,6 @@ urlpatterns = [
     path('api/switch-active-space/<int:space_id>/', api.switch_active_space, name='api_switch_active_space'),
     path('api/download-file/<int:file_id>/', api.download_file, name='api_download_file'),
 
-
     path('dal/keyword/', dal.KeywordAutocomplete.as_view(), name='dal_keyword'),
     # TODO is this deprecated? not yet, some old forms remain, could likely be changed to generic API endpoints
     path('dal/food/', dal.IngredientsAutocomplete.as_view(), name='dal_food'),  # TODO is this deprecated?