From 52c16ab7dd4b3df0e6211baea06f0d31625a4dac Mon Sep 17 00:00:00 2001 From: vabene1111 Date: Tue, 22 Feb 2022 17:00:30 +0100 Subject: [PATCH] all types bascially working (lacking bookmark) --- cookbook/views/import_export.py | 2 +- vue/src/apps/ImportView/ImportView.vue | 115 ++++++++++++++++++------- vue/src/locales/en.json | 2 + vue/src/utils/integration.js | 40 ++++----- 4 files changed, 107 insertions(+), 52 deletions(-) diff --git a/cookbook/views/import_export.py b/cookbook/views/import_export.py index f4aea7c0f..5dcb3ff40 100644 --- a/cookbook/views/import_export.py +++ b/cookbook/views/import_export.py @@ -99,7 +99,7 @@ def import_recipe(request): t.setDaemon(True) t.start() - return JsonResponse({'import_id': [il.pk]}) + return JsonResponse({'import_id': il.pk}) except NotImplementedError: return JsonResponse( { diff --git a/vue/src/apps/ImportView/ImportView.vue b/vue/src/apps/ImportView/ImportView.vue index 83e6bc321..bd559fc3b 100644 --- a/vue/src/apps/ImportView/ImportView.vue +++ b/vue/src/apps/ImportView/ImportView.vue @@ -9,14 +9,16 @@
- - + + + Website - + - Additional Options + Additional + Options + - - + + +
@@ -119,7 +125,8 @@ Import - + @@ -134,16 +141,50 @@ - - + + + + + + + {{ $t('import_duplicates') }} + + + + + + - + +
+ + +
+ {{ $t('Import') }} + + - - - Bookmark Text + + + Some pages cannot be imported from their URL, the Bookmarklet can be used to import from + some of them anyway. + 1. Drag the following button to your bookmarks bar Bookmark Text + 2. Open the page you want to import from + 3. Click on the bookmark to perform the import @@ -167,6 +208,7 @@ import {resolveDjangoUrl, ResolveUrlMixin, StandardToasts, ToastMixin} from "@/u import axios from "axios"; import {ApiApiFactory} from "@/utils/openapi/api"; import draggable from "vuedraggable"; +import {INTEGRATIONS} from "@/utils/integration"; Vue.use(BootstrapVue) @@ -181,6 +223,8 @@ export default { }, data() { return { + tab_index: 0, + // URL import LS_IMPORT_RECENT: 'import_recent_urls', //TODO use central helper to manage all local storage keys (and maybe even access) website_url: '', recent_urls: [], @@ -189,10 +233,12 @@ export default { recipe_data: undefined, recipe_tree: undefined, recipe_images: [], - automatic: true, - error: undefined, - loading: false, - preview: false, + // App Import + INTEGRATIONS: INTEGRATIONS, + recipe_app: undefined, + import_duplicates: false, + recipe_files: [], + } }, mounted() { @@ -238,9 +284,7 @@ export default { this.recipe_json = undefined this.recipe_tree = undefined this.recipe_images = [] - this.error = undefined - this.loading = true - this.preview = false + axios.post(resolveDjangoUrl('api_recipe_from_source'), { 'url': this.website_url, 'data': this.source_data, @@ -254,21 +298,30 @@ export default { this.recipe_tree = response.data['recipe_tree']; this.recipe_html = response.data['recipe_html']; - this.recipe_images = response.data['recipe_images']; //todo change on backend as well after old view is deprecated - if (this.automatic) { - this.recipe_data = this.recipe_json; - this.preview = false - } else { - this.preview = true - } - this.loading = false + this.recipe_images = response.data['recipe_images']; + + this.tab_index = 0 }).catch((err) => { - this.error = err.data - this.loading = false - console.log(err.response) StandardToasts.makeStandardToast(StandardToasts.FAIL_FETCH, err.response.data.msg) }) }, + /** + * Import recipes with uploaded files and app integration + */ + importAppRecipe: function () { + let formData = new FormData(); + formData.append('type', this.recipe_app); + formData.append('duplicates', this.import_duplicates) + for (let i = 0; i < this.recipe_files.length; i++) { + formData.append('files', this.recipe_files[i]); + } + axios.post(resolveDjangoUrl('view_import'), formData, {headers: {'Content-Type': 'multipart/form-data'}}).then((response) => { + window.location.href = resolveDjangoUrl('view_import_response', response.data['import_id']) + }).catch((err) => { + console.log(err) + StandardToasts.makeStandardToast(StandardToasts.FAIL_CREATE) + }) + }, /** * Splits the steps of a given recipe at the split character (e.g. \n or \n\n) * @param split_character: character to split steps at diff --git a/vue/src/locales/en.json b/vue/src/locales/en.json index 31fc6e763..930b3302b 100644 --- a/vue/src/locales/en.json +++ b/vue/src/locales/en.json @@ -336,6 +336,8 @@ "Website": "Website", "App": "App", "Bookmarklet": "Bookmarklet", + "import_duplicates": "To prevent duplicates recipes with the same name as existing ones are ignored. Check this box to import everything.", + "paste_json": "Paste json or html source here to load recipe.", "search_no_recipes": "Could not find any recipes!", "search_import_help_text": "Import a recipe from an external website or application.", "search_create_help_text": "Create a new recipe directly in Tandoor.", diff --git a/vue/src/utils/integration.js b/vue/src/utils/integration.js index 5cdedbaea..326d0a30f 100644 --- a/vue/src/utils/integration.js +++ b/vue/src/utils/integration.js @@ -1,22 +1,22 @@ // containing all data and functions regarding the different integrations -export const INTEGRATIONS = { - DEFAULT: {name: "Tandoor", import: true, export: true}, - CHEFTAP: {name: "Cheftap", import: true, export: false}, - CHOWDOWN: {name: "Chowdown", import: true, export: false}, - COOKBOOKAPP: {name: "CookBookApp", import: true, export: false}, - COPYMETHAT: {name: "CopyMeThat", import: true, export: false}, - DOMESTICA: {name: "Domestica", import: true, export: false}, - MEALIE: {name: "Mealie", import: true, export: false}, - MEALMASTER: {name: "Mealmaster", import: true, export: false}, - NEXTCLOUD: {name: "Nextcloud Cookbook", import: true, export: false}, - OPENEATS: {name: "Openeats", import: true, export: false}, - PAPRIKA: {name: "Paprika", import: true, export: false}, - PEPPERPLATE: {name: "Pepperplate", import: true, export: false}, - PLANTOEAT: {name: "Plantoeat", import: true, export: false}, - RECETTETEK: {name: "RecetteTek", import: true, export: false}, - RECIPEKEEPER: {name: "Recipekeeper", import: true, export: false}, - RECIPESAGE: {name: "Recipesage", import: true, export: true}, - REZKONV: {name: "Rezkonv", import: true, export: false}, - SAFRON: {name: "Safron", import: true, export: true}, -} +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: '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: '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}, +]