diff --git a/cookbook/templates/base.html b/cookbook/templates/base.html index b0b49cfb1..876663833 100644 --- a/cookbook/templates/base.html +++ b/cookbook/templates/base.html @@ -13,8 +13,8 @@ - - + + @@ -24,9 +24,10 @@ - - - + + + + diff --git a/cookbook/views/api.py b/cookbook/views/api.py index ec64453ac..1087c65c5 100644 --- a/cookbook/views/api.py +++ b/cookbook/views/api.py @@ -708,43 +708,6 @@ def recipe_from_source(request): ) -@group_required('user') -def recipe_from_source(request, url=None, url_text=None): - if url_text: - json_data = url_text - else: - json_data = request.POST['data'] - if 'auto' in request.POST: - auto = request.POST['auto'] - else: - auto = 'true' - - recipe_json, recipe_tree, recipe_html, images = get_recipe_from_source(json_data, url, request.space) - if len(recipe_tree) == 0 and len(recipe_json) == 0: - return JsonResponse( - { - 'error': True, - 'msg': _('No useable data could be found.') # noqa: E501 - }, - status=400 - ) - else: - if auto == "true": - return JsonResponse({'recipe_json': recipe_json}) - else: - # overide keyword structure from dict to list - kws = [] - for kw in recipe_json['keywords']: - kws.append(kw['text']) - recipe_json['keywords'] = kws - return JsonResponse({ - 'recipe_tree': recipe_tree, - 'recipe_json': recipe_json, - 'recipe_html': recipe_html, - 'images': images, - }) - - @group_required('admin') def get_backup(request): if not request.user.is_superuser: diff --git a/requirements.txt b/requirements.txt index ed4de89cd..a8b23e91a 100644 --- a/requirements.txt +++ b/requirements.txt @@ -31,7 +31,7 @@ Jinja2==2.11.3 django-webpack-loader==0.7.0 django-js-reverse==0.9.1 django-allauth==0.44.0 -recipe-scrapers==13.1.1 +recipe-scrapers==12.2.1 django-scopes==1.2.0 pytest==6.2.3 pytest-django==4.2.0