-
- -
-
-
-
{% endblock %}
+
+
+{% block script %}
+ {% if debug %}
+
+ {% else %}
+
+ {% endif %}
+
+
+
+ {% render_bundle 'import_view' %}
+{% endblock %}
\ No newline at end of file
diff --git a/cookbook/views/api.py b/cookbook/views/api.py
index 57cb39fa3..06b6e62c1 100644
--- a/cookbook/views/api.py
+++ b/cookbook/views/api.py
@@ -70,7 +70,7 @@ from cookbook.serializer import (AutomationSerializer, BookmarkletImportSerializ
SupermarketCategorySerializer, SupermarketSerializer,
SyncLogSerializer, SyncSerializer, UnitSerializer,
UserFileSerializer, UserNameSerializer, UserPreferenceSerializer,
- ViewLogSerializer, IngredientSimpleSerializer)
+ ViewLogSerializer, IngredientSimpleSerializer, BookmarkletImportListSerializer)
from recipes import settings
@@ -974,6 +974,11 @@ class BookmarkletImportViewSet(viewsets.ModelViewSet):
serializer_class = BookmarkletImportSerializer
permission_classes = [CustomIsUser]
+ def get_serializer_class(self):
+ if self.action == 'list':
+ return BookmarkletImportListSerializer
+ return self.serializer_class
+
def get_queryset(self):
return self.queryset.filter(space=self.request.space).all()
diff --git a/cookbook/views/data.py b/cookbook/views/data.py
index 9980744b4..8dd1e969f 100644
--- a/cookbook/views/data.py
+++ b/cookbook/views/data.py
@@ -10,7 +10,7 @@ from django_tables2 import RequestConfig
from rest_framework.authtoken.models import Token
from cookbook.forms import BatchEditForm, SyncForm
-from cookbook.helper.permission_helper import group_required, has_group_permission
+from cookbook.helper.permission_helper import group_required, has_group_permission, above_space_limit
from cookbook.models import (Comment, Food, Keyword, Recipe, RecipeImport, Sync,
Unit, UserPreference, BookmarkletImport)
from cookbook.tables import SyncTable
@@ -19,12 +19,9 @@ from recipes import settings
@group_required('user')
def sync(request):
- if request.space.max_recipes != 0 and Recipe.objects.filter(space=request.space).count() >= request.space.max_recipes: # TODO move to central helper function
- messages.add_message(request, messages.WARNING, _('You have reached the maximum number of recipes for your space.'))
- return HttpResponseRedirect(reverse('index'))
-
- if request.space.max_users != 0 and UserPreference.objects.filter(space=request.space).count() > request.space.max_users:
- messages.add_message(request, messages.WARNING, _('You have more users than allowed in your space.'))
+ limit, msg = above_space_limit(request.space)
+ if limit:
+ messages.add_message(request, messages.WARNING, msg)
return HttpResponseRedirect(reverse('index'))
if request.space.demo or settings.HOSTED:
@@ -113,12 +110,9 @@ def batch_edit(request):
@group_required('user')
def import_url(request):
- if request.space.max_recipes != 0 and Recipe.objects.filter(space=request.space).count() >= request.space.max_recipes: # TODO move to central helper function
- messages.add_message(request, messages.WARNING, _('You have reached the maximum number of recipes for your space.'))
- return HttpResponseRedirect(reverse('index'))
-
- if request.space.max_users != 0 and UserPreference.objects.filter(space=request.space).count() > request.space.max_users:
- messages.add_message(request, messages.WARNING, _('You have more users than allowed in your space.'))
+ limit, msg = above_space_limit(request.space)
+ if limit:
+ messages.add_message(request, messages.WARNING, msg)
return HttpResponseRedirect(reverse('index'))
if (api_token := Token.objects.filter(user=request.user).first()) is None:
@@ -129,7 +123,7 @@ def import_url(request):
if bookmarklet_import := BookmarkletImport.objects.filter(id=request.GET['id']).first():
bookmarklet_import_id = bookmarklet_import.pk
- return render(request, 'test.html', {'api_token': api_token, 'bookmarklet_import_id': bookmarklet_import_id})
+ return render(request, 'url_import.html', {'api_token': api_token, 'bookmarklet_import_id': bookmarklet_import_id})
class Object(object):
diff --git a/cookbook/views/edit.py b/cookbook/views/edit.py
index ff3134662..50e878662 100644
--- a/cookbook/views/edit.py
+++ b/cookbook/views/edit.py
@@ -9,7 +9,7 @@ from django.views.generic import UpdateView
from django.views.generic.edit import FormMixin
from cookbook.forms import CommentForm, ExternalRecipeForm, MealPlanForm, StorageForm, SyncForm
-from cookbook.helper.permission_helper import GroupRequiredMixin, OwnerRequiredMixin, group_required
+from cookbook.helper.permission_helper import GroupRequiredMixin, OwnerRequiredMixin, group_required, above_space_limit
from cookbook.models import (Comment, MealPlan, MealType, Recipe, RecipeImport, Storage, Sync,
UserPreference)
from cookbook.provider.dropbox import Dropbox
@@ -39,12 +39,9 @@ def convert_recipe(request, pk):
@group_required('user')
def internal_recipe_update(request, pk):
- if request.space.max_recipes != 0 and Recipe.objects.filter(space=request.space).count() > request.space.max_recipes: # TODO move to central helper function
- messages.add_message(request, messages.WARNING, _('You have reached the maximum number of recipes for your space.'))
- return HttpResponseRedirect(reverse('view_recipe', args=[pk]))
-
- if request.space.max_users != 0 and UserPreference.objects.filter(space=request.space).count() > request.space.max_users:
- messages.add_message(request, messages.WARNING, _('You have more users than allowed in your space.'))
+ limit, msg = above_space_limit(request.space)
+ if limit:
+ messages.add_message(request, messages.WARNING, msg)
return HttpResponseRedirect(reverse('view_recipe', args=[pk]))
recipe_instance = get_object_or_404(Recipe, pk=pk, space=request.space)
diff --git a/cookbook/views/import_export.py b/cookbook/views/import_export.py
index daa55d432..d81777fce 100644
--- a/cookbook/views/import_export.py
+++ b/cookbook/views/import_export.py
@@ -10,7 +10,7 @@ from django.urls import reverse
from django.utils.translation import gettext as _
from cookbook.forms import ExportForm, ImportExportBase, ImportForm
-from cookbook.helper.permission_helper import group_required
+from cookbook.helper.permission_helper import group_required, above_space_limit
from cookbook.helper.recipe_search import RecipeSearch
from cookbook.integration.cheftap import ChefTap
from cookbook.integration.chowdown import Chowdown
@@ -84,12 +84,9 @@ def get_integration(request, export_type):
@group_required('user')
def import_recipe(request):
- if request.space.max_recipes != 0 and Recipe.objects.filter(space=request.space).count() >= request.space.max_recipes: # TODO move to central helper function
- messages.add_message(request, messages.WARNING, _('You have reached the maximum number of recipes for your space.'))
- return HttpResponseRedirect(reverse('index'))
-
- if request.space.max_users != 0 and UserPreference.objects.filter(space=request.space).count() > request.space.max_users:
- messages.add_message(request, messages.WARNING, _('You have more users than allowed in your space.'))
+ limit, msg = above_space_limit(request.space)
+ if limit:
+ messages.add_message(request, messages.WARNING, msg)
return HttpResponseRedirect(reverse('index'))
if request.method == "POST":
diff --git a/vue/src/apps/ImportView/ImportView.vue b/vue/src/apps/ImportView/ImportView.vue
index bb39f49d9..c049100d3 100644
--- a/vue/src/apps/ImportView/ImportView.vue
+++ b/vue/src/apps/ImportView/ImportView.vue
@@ -106,10 +106,12 @@
- 
{% trans 'Bookmark Me!' %}
-
-
-
-
-
-
- {% trans 'Import' %}
- -{% trans 'Bookmark Me!' %}
- - -
-
- {% if not request.user.is_authenticated or request.user.userpreference.theme == request.user.userpreference.TANDOOR %} -![]()
- {% else %}
-
- {% endif %}
-
-
-
- - {% if not request.user.is_authenticated or request.user.userpreference.theme == request.user.userpreference.TANDOOR %} -
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- - -
-
-
-
-
-
-
- {% trans 'Preview Recipe Data' %}
-{% trans 'Drag recipe attributes from the right into the appropriate box below.' %}
-
-
-
-
-
-
-
-
-
-
-
- {% trans 'Name' %}
-
-
- {% trans 'Text dragged here will be appended to the name.' %}
-
-
- [[recipe_json.name]]
-
-
-
-
-
-
-
-
- {% trans 'Description' %}
-
-
- {% trans 'Text dragged here will be appended to the description.' %}
-
-
- [[recipe_json.description]]
-
-
-
-
-
-
-
-
- {% trans 'Keywords' %}
-
-
- {% trans 'Keywords dragged here will be appended to current list' %}
-
-
-
-
- [[kw.text]]
-
-
-
-
-
-
- {% trans 'Image' %}
-
-
-
- ![Recipe Image]()
-
-
-
-
-
-
-
-
-
- {% trans 'Servings' %}
-
-
-
-
- [[recipe_json.servings]]
-
-
-
-
-
- {% trans 'Prep Time' %}
-
-
-
-
- [[recipe_json.prepTime]]
-
-
-
-
-
- {% trans 'Cook Time' %}
-
-
-
-
- [[recipe_json.cookTime]]
-
-
-
-
-
-
-
-
- {% trans 'Ingredients' %}
-
-
- {% trans 'Ingredients dragged here will be appended to current list.' %}
-
-
- -
-
-
- [[i.amount]]-[[i.unit.text]]-[[i.ingredient.text]]-[[i.note]]-
-
-
-
-
-
-
-
-
-
- {% trans 'Instructions' %}
-
-
- {% trans 'Recipe instructions dragged here will be appended to current instructions.' %}
-
-
- [[recipe_json.recipeInstructions]]
- - - -
-
-
-
-
-
-
- {% trans 'Discovered Attributes' %}
-
- {% trans 'Drag recipe attributes from below into the appropriate box on the left. Click any node to display its full properties.' %}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {% trans 'Blank Field' %}
-
-
- {% trans 'Items dragged to Blank Field will be appended.' %}
-
- [[blank_field]]
-
-
-
-
-
-
-
-
-
-
-
-
- {% verbatim %}
- [[_.model.name]]
- {% endverbatim %}
-
-
-
-
- -
-
- [[txt]]
-
-
-
-
- -
-
- ![Image]()
-
-
-
-
-
-
-
- [[error.msg]] -
- - [[error.msg]] -
-
-
-
+
-
-
-
-
-
- {% trans 'Information' %}
-- {% blocktrans %} Only websites containing ld+json or microdata information can currently - be imported. Most big recipe pages support this. If you site cannot be imported but - you think - it probably has some kind of structured data feel free to post an example in the - github issues.{% endblocktrans %} -
- {% trans 'Google ld+json Info' %} - {% trans 'GitHub Issues' %} - {% trans 'Recipe Markup Specification' %} -
-
+ {{
+ $t('Help')
+ }}
+
x.id === this.recipe_app)[0]
+ },
+ },
data() {
return {
tab_index: 0,
@@ -343,7 +355,8 @@ export default {
recipe_files: [],
loading: false,
empty_input: false,
- edit_name: false,// Bookmarklet
+ edit_name: false,
+ // Bookmarklet
BOOKMARKLET_CODE: window.BOOKMARKLET_CODE
}
},
@@ -422,7 +435,7 @@ export default {
window.localStorage.setItem(this.LS_IMPORT_RECENT, JSON.stringify(this.recent_urls))
}
- if (this.website_url === '') {
+ if (this.website_url === '' && bookmarklet === undefined) {
this.empty_input = true
setTimeout(() => {
this.empty_input = false
@@ -541,7 +554,7 @@ export default {
`localStorage.setItem("token", "${window.API_TOKEN}");` +
`document.body.appendChild(document.createElement("script")).src="${localStorage.getItem('BASE_PATH')}${resolveDjangoStatic('/js/bookmarklet.js')}?r="+Math.floor(Math.random()*999999999)}` +
`})()`
- }
+ },
},
directives: {
hover: {
diff --git a/vue/src/utils/integration.js b/vue/src/utils/integration.js
index a2e6db1bb..c5a450215 100644
--- a/vue/src/utils/integration.js
+++ b/vue/src/utils/integration.js
@@ -1,24 +1,24 @@
// containing all data and functions regarding the different integrations
export const INTEGRATIONS = [
- {id: 'DEFAULT', name: "Tandoor", import: true, export: true},
- {id: 'CHEFTAP', name: "Cheftap", import: true, export: false},
- {id: 'CHOWDOWN', name: "Chowdown", import: true, export: false},
- {id: 'COOKBOOKAPP', name: "CookBookApp", import: true, export: false},
- {id: 'COOKMATE', name: "Cookmate", import: true, export: false},
- {id: 'COPYMETHAT', name: "CopyMeThat", import: true, export: false},
- {id: 'DOMESTICA', name: "Domestica", import: true, export: false},
- {id: 'MEALIE', name: "Mealie", import: true, export: false},
- {id: 'MEALMASTER', name: "Mealmaster", import: true, export: false},
- {id: 'MELARECIPES', name: "Melarecipes", import: true, export: false},
- {id: 'NEXTCLOUD', name: "Nextcloud Cookbook", import: true, export: false},
- {id: 'OPENEATS', name: "Openeats", import: true, export: false},
- {id: 'PAPRIKA', name: "Paprika", import: true, export: false},
- {id: 'PEPPERPLATE', name: "Pepperplate", import: true, export: false},
- {id: 'PLANTOEAT', name: "Plantoeat", import: true, export: false},
- {id: 'RECETTETEK', name: "RecetteTek", import: true, export: false},
- {id: 'RECIPEKEEPER', name: "Recipekeeper", import: true, export: false},
- {id: 'RECIPESAGE', name: "Recipesage", import: true, export: true},
- {id: 'REZKONV', name: "Rezkonv", import: true, export: false},
- {id: 'SAFRON', name: "Safron", import: true, export: true},
+ {id: 'DEFAULT', name: "Tandoor", import: true, export: true, help_url: 'https://docs.tandoor.dev/features/import_export/#default'},
+ {id: 'CHEFTAP', name: "Cheftap", import: true, export: false, help_url: 'https://docs.tandoor.dev/features/import_export/#cheftap'},
+ {id: 'CHOWDOWN', name: "Chowdown", import: true, export: false, help_url: 'https://docs.tandoor.dev/features/import_export/#chowdown'},
+ {id: 'COOKBOOKAPP', name: "CookBookApp", import: true, export: false, help_url: 'https://docs.tandoor.dev/features/import_export/#cookbookapp'},
+ {id: 'COOKMATE', name: "Cookmate", import: true, export: false, help_url: ''},
+ {id: 'COPYMETHAT', name: "CopyMeThat", import: true, export: false, help_url: 'https://docs.tandoor.dev/features/import_export/#copymethat'},
+ {id: 'DOMESTICA', name: "Domestica", import: true, export: false, help_url: 'https://docs.tandoor.dev/features/import_export/#domestica'},
+ {id: 'MEALIE', name: "Mealie", import: true, export: false, help_url: 'https://docs.tandoor.dev/features/import_export/#mealie'},
+ {id: 'MEALMASTER', name: "Mealmaster", import: true, export: false, help_url: 'https://docs.tandoor.dev/features/import_export/#mealmaster'},
+ {id: 'MELARECIPES', name: "Melarecipes", import: true, export: false, help_url: ''},
+ {id: 'NEXTCLOUD', name: "Nextcloud Cookbook", import: true, export: false, help_url: 'https://docs.tandoor.dev/features/import_export/#nextcloud'},
+ {id: 'OPENEATS', name: "Openeats", import: true, export: false, help_url: 'https://docs.tandoor.dev/features/import_export/#openeats'},
+ {id: 'PAPRIKA', name: "Paprika", import: true, export: false, help_url: 'https://docs.tandoor.dev/features/import_export/#paprika'},
+ {id: 'PEPPERPLATE', name: "Pepperplate", import: true, export: false, help_url: 'https://docs.tandoor.dev/features/import_export/#pepperplate'},
+ {id: 'PLANTOEAT', name: "Plantoeat", import: true, export: false, help_url: 'https://docs.tandoor.dev/features/import_export/#plantoeat'},
+ {id: 'RECETTETEK', name: "RecetteTek", import: true, export: false, help_url: ''},
+ {id: 'RECIPEKEEPER', name: "Recipekeeper", import: true, export: false, help_url: 'https://docs.tandoor.dev/features/import_export/#recipekeeper'},
+ {id: 'RECIPESAGE', name: "Recipesage", import: true, export: true, help_url: 'https://docs.tandoor.dev/features/import_export/#recipesage'},
+ {id: 'REZKONV', name: "Rezkonv", import: true, export: false, help_url: 'https://docs.tandoor.dev/features/import_export/#rezkonv'},
+ {id: 'SAFRON', name: "Safron", import: true, export: true, help_url: 'https://docs.tandoor.dev/features/import_export/#safron'},
]