@@ -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) {
diff --git a/cookbook/templatetags/custom_tags.py b/cookbook/templatetags/custom_tags.py
index b958999a..5ade2985 100644
--- a/cookbook/templatetags/custom_tags.py
+++ b/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 ')}
{_('docs here')}"
+@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):
diff --git a/cookbook/urls.py b/cookbook/urls.py
index 07d21005..356714d2 100644
--- a/cookbook/urls.py
+++ b/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/
/', api.switch_active_space, name='api_switch_active_space'),
path('api/download-file//', 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?
diff --git a/recipes/settings.py b/recipes/settings.py
index e89dbc6d..d05d0373 100644
--- a/recipes/settings.py
+++ b/recipes/settings.py
@@ -80,6 +80,8 @@ DJANGO_TABLES2_PAGE_RANGE = 8
HCAPTCHA_SITEKEY = os.getenv('HCAPTCHA_SITEKEY', '')
HCAPTCHA_SECRET = os.getenv('HCAPTCHA_SECRET', '')
+FDA_API_KEY = os.getenv('FDA_API_KEY', 'DEMO_KEY')
+
SHARING_ABUSE = bool(int(os.getenv('SHARING_ABUSE', False)))
SHARING_LIMIT = int(os.getenv('SHARING_LIMIT', 0))
@@ -144,6 +146,9 @@ try:
'base_path': os.path.join(BASE_DIR, 'recipes', 'plugins', d),
'base_url': plugin_class.base_url,
'bundle_name': plugin_class.bundle_name if hasattr(plugin_class, 'bundle_name') else '',
+ 'api_router_name': plugin_class.api_router_name if hasattr(plugin_class, 'api_router_name') else '',
+ 'nav_main': plugin_class.nav_main if hasattr(plugin_class, 'nav_main') else '',
+ 'nav_dropdown': plugin_class.nav_dropdown if hasattr(plugin_class, 'nav_dropdown') else '',
}
PLUGINS.append(plugin_config)
except Exception:
@@ -412,7 +417,7 @@ for p in PLUGINS:
if p['bundle_name'] != '':
WEBPACK_LOADER[p['bundle_name']] = {
'CACHE': not DEBUG,
- 'BUNDLE_DIR_NAME': f'{p["base_path"]}/vue/', # must end with slash
+ 'BUNDLE_DIR_NAME': f'vue/', # must end with slash
'STATS_FILE': os.path.join(p["base_path"], 'vue', 'webpack-stats.json'),
'POLL_INTERVAL': 0.1,
'TIMEOUT': None,
diff --git a/requirements.txt b/requirements.txt
index 7c90b700..04679001 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -17,7 +17,7 @@ Markdown==3.4.3
Pillow==9.4.0
psycopg2-binary==2.9.5
python-dotenv==0.21.0
-requests==2.28.2
+requests==2.31.0
six==1.16.0
webdavclient3==3.14.6
whitenoise==6.2.0
diff --git a/vue/src/components/Modals/GenericModalForm.vue b/vue/src/components/Modals/GenericModalForm.vue
index 5012a2c7..b8b7da98 100644
--- a/vue/src/components/Modals/GenericModalForm.vue
+++ b/vue/src/components/Modals/GenericModalForm.vue
@@ -109,6 +109,10 @@ export default {
mounted() {
this.id = Math.random()
this.$root.$on("change", this.storeValue) // bootstrap modal placed at document so have to listen at root of component
+
+ if (this.models !== null){
+ this.Models = this.models // override models definition file with prop
+ }
},
computed: {
advancedForm() {
@@ -179,6 +183,7 @@ export default {
if (this.dirty) {
this.dirty = false
this.$emit("finish-action", "cancel")
+ this.$emit("hidden")
}
},
storeValue: function (field, value) {
diff --git a/vue/src/stores/GenericApiStore.js b/vue/src/stores/GenericApiStore.js
new file mode 100644
index 00000000..e69de29b
diff --git a/vue/src/utils/utils.js b/vue/src/utils/utils.js
index fda87dbb..8cb011b2 100644
--- a/vue/src/utils/utils.js
+++ b/vue/src/utils/utils.js
@@ -50,7 +50,7 @@ export class StandardToasts {
static FAIL_MOVE = "FAIL_MOVE"
static FAIL_MERGE = "FAIL_MERGE"
- static makeStandardToast(context, toast, err) {
+ static makeStandardToast(context, toast, err = undefined, always_show_errors = false) {
let title = ''
let msg = ''
let variant = ''
@@ -124,7 +124,7 @@ export class StandardToasts {
}
- let DEBUG = localStorage.getItem("DEBUG") === "True" || false
+ let DEBUG = localStorage.getItem("DEBUG") === "True" || always_show_errors
if (err !== undefined && 'response' in err && 'headers' in err.response) {
if (DEBUG && err.response.headers['content-type'] === 'application/json' && err.response.status < 500) {
@@ -311,7 +311,7 @@ export function calculateHourMinuteSplit(amount) {
let minutes = amount - hours * 60
let output_text = hours + " h"
- if (minutes > 0){
+ if (minutes > 0) {
output_text += " " + minutes + " min"
}
@@ -368,6 +368,9 @@ export const ApiMixin = {
let func = setup.function
let parameters = buildParams(options, setup)
let apiClient = new ApiApiFactory()
+ if (model.apiClient !== undefined) {
+ apiClient = model.apiClient
+ }
return apiClient[func](...parameters)
},
genericGetAPI: function (url, options) {