{% trans 'Bookmark Me!' %}
-
+
-
{% trans 'Preview Recipe Data' %}
{% trans 'Drag recipe attributes from the right into the appropriate box below.' %}
@@ -163,12 +175,14 @@
{% trans 'Name' %}
-
+
- {% trans 'Text dragged here will be appended to the name.'%}
+ {% trans 'Text dragged here will be appended to the name.' %}
+
@@ -178,12 +192,14 @@
-
[[recipe_json.name]]
{% trans 'Description' %}
-
+
- {% trans 'Text dragged here will be appended to the description.'%}
+ {% trans 'Text dragged here will be appended to the description.' %}
+
@@ -193,61 +209,78 @@
-
[[recipe_json.description]]
{% trans 'Keywords' %}
-
+
- {% trans 'Keywords dragged here will be appended to current list'%}
+ {% trans 'Keywords dragged here will be appended to current list' %}
+
-
[[kw.text]]
+ [[kw.text]]
-
+
-
{% trans 'Image' %}
-
+
+
![Recipe Image]()
-
+
-
+
{% trans 'Servings' %}
-
+
-
+
[[recipe_json.servings]]
-
+
{% trans 'Prep Time' %}
-
+
-
+
[[recipe_json.prepTime]]
-
+
-
{% trans 'Cook Time' %}
-
+
-
+
@@ -258,15 +291,18 @@
[[recipe_json.cookTime]]
{% trans 'Ingredients' %}
-
+
- {% trans 'Ingredients dragged here will be appended to current list.'%}
+ {% trans 'Ingredients dragged here will be appended to current list.' %}
+
- +
-
[[i.amount]][[i.unit.text]][[i.ingredient.text]]@@ -280,14 +316,17 @@-- ++{% trans 'Instructions' %} - +-{% trans 'Recipe instructions dragged here will be appended to current instructions.'%}+{% trans 'Recipe instructions dragged here will be appended to current instructions.' %}
- +@@ -296,11 +335,12 @@[[recipe_json.recipeInstructions]]
-@@ -312,55 +352,58 @@+ style="cursor:pointer;" + @click="show_blank=!show_blank" + title="{% trans 'Show Blank Field' %}">{% trans 'Blank Field' %} - +-{% trans 'Items dragged to Blank Field will be appended.'%}+{% trans 'Items dragged to Blank Field will be appended.' %}+ @drop="replacePreview('blank', $event)" + @dragover.prevent + @dragenter.prevent + draggable + @dragstart="htmlDragStart($event)"> [[blank_field]]+ text-field-name="name" + collapse:true + draggable + @item-drag-start="itemDragStart" + @item-click="itemClick"> - -++@@ -409,7 +454,8 @@@@ -371,25 +414,27 @@+ @click="deleteNode(_.vm, _.model, $event)">- + {% verbatim %} - [[_.model.name]] + [[_.model.name]] {% endverbatim %}-
-
+[[txt]] - -+ +-
-
++ +- -
- +@@ -660,6 +706,7 @@ show_blank: false, blank_field: '', recipe_app: 'DEFAULT', + import_duplicates: false, recipe_files: [], images: [], mode: 'url' @@ -675,7 +722,7 @@ this.searchKeywords('') this.searchUnits('') this.searchIngredients('') - let uri = window.location.search.substring(1); + let uri = window.location.search.substring(1); let params = new URLSearchParams(uri); q = params.get("id") if (q) { @@ -701,10 +748,11 @@ this.loading = true this.preview = false this.$http.post("{% url 'api_recipe_from_source' %}", { - 'url': this.remote_url, - 'data': this.source_data, - 'auto':this.automatic, - 'mode':this.mode}, {emulateJSON: true}).then((response) => { + 'url': this.remote_url, + 'data': this.source_data, + 'auto': this.automatic, + 'mode': this.mode + }, {emulateJSON: true}).then((response) => { this.recipe_json = response.data['recipe_json']; this.recipe_tree = response.data['recipe_tree']; this.recipe_html = response.data['recipe_html']; @@ -730,7 +778,7 @@ this.makeToast(gettext('Error'), msg, 'danger') }) }, - loadBookmarklet: function(id_bkmk) { + loadBookmarklet: function (id_bkmk) { this.error = undefined this.loading = true this.$http.get("{% url 'api:bookmarkletimport-detail' 1237654 %}".replace('1237654', id_bkmk)).then((response) => { @@ -745,16 +793,16 @@ this.makeToast(gettext('Error'), gettext('There was an error loading bookmarklet!') + err.bodyText, 'danger') }) }, - deleteBookmarklet: function(id_bkmk) { + deleteBookmarklet: function (id_bkmk) { this.error = undefined - this.$http.delete("{% url 'api:bookmarkletimport-list' %}" + id_bkmk +"/").then((response) => { + this.$http.delete("{% url 'api:bookmarkletimport-list' %}" + id_bkmk + "/").then((response) => { }).catch((err) => { this.error = err.data console.log(err) this.makeToast(gettext('Error'), gettext('There was an error deleting bookmarklet!') + err.bodyText, 'danger') }) }, - showRecipe: function() { + showRecipe: function () { this.preview = false this.recipe_data = this.recipe_json }, @@ -774,7 +822,7 @@ this.importing_recipe = true this.$set(this.recipe_data, 'all_keywords', this.all_keywords) this.$http.post(`{% url 'data_import_url' %}`, this.recipe_data).then((response) => { - let uri = window.location.search.substring(1); + let uri = window.location.search.substring(1); let params = new URLSearchParams(uri); q = params.get("id") if (q) { @@ -787,16 +835,17 @@ this.makeToast(gettext('Error'), gettext('An error occurred while trying to import this recipe!') + err.bodyText, 'danger') }) }, - importAppRecipe: function() { + importAppRecipe: function () { this.error = undefined this.preview = false this.loading = true let formData = new FormData(); let files = [] formData.append('type', this.recipe_app); - for( var i = 0; i < this.recipe_files.length; i++ ){ + formData.append('duplicates', this.import_duplicates) + for (var i = 0; i < this.recipe_files.length; i++) { formData.append('files', this.recipe_files[i]); - } + } this.$http.post("{% url 'view_import' %}", formData, {headers: {'Content-Type': 'multipart/form-data'}}).then((response) => { window.location.href = "{% url 'view_import_response' 1237654 %}".replace('1237654', response.data['import_id']) }).catch((err) => { @@ -891,7 +940,7 @@ this.makeToast(gettext('Error'), gettext('There was an error loading a resource!') + err.bodyText, 'danger') }) }, - deleteNode: function (node ,item, e) { + deleteNode: function (node, item, e) { e.stopPropagation() var index = node.parentItem.indexOf(item) node.parentItem.splice(index, 1) @@ -899,12 +948,12 @@ itemClick: function (node, item, e) { this.makeToast(gettext('Details'), node.model.value, 'info') }, - itemDragStart (node,item,e) { + itemDragStart(node, item, e) { if (node.model.children.length > 0) { e.dataTransfer.setData('hasChildren', true) } e.dataTransfer.setData('value', node.model.value) - + }, htmlDragStart: function (e) { e.dataTransfer.setData('value', e.target.innerText) @@ -912,10 +961,10 @@ imageDragStart: function (e) { e.dataTransfer.setData('value', e.target.src) }, - replacePreview: function(field, e) { + replacePreview: function (field, e) { v = e.dataTransfer.getData('value') if (e.dataTransfer.getData('hasChildren')) { - this.makeToast(gettext('Error'), gettext('Items with children cannot be dropped here!') , 'danger') + this.makeToast(gettext('Error'), gettext('Items with children cannot be dropped here!'), 'danger') return } switch (field) { @@ -926,31 +975,31 @@ this.recipe_json.description = [this.recipe_json.description, v].filter(Boolean).join(" "); break; case 'image': - this.recipe_json.image=v + this.recipe_json.image = v break; case 'keywords': let new_keyword = {'text': v, 'id': null} this.recipe_json.keywords.push(new_keyword) break; case 'servings': - this.recipe_json.servings=parseInt(v.match(/\b\d+\b/)[0]) + this.recipe_json.servings = parseInt(v.match(/\b\d+\b/)[0]) break; case 'prepTime': - this.recipe_json.prepTime=v + this.recipe_json.prepTime = v break; case 'cookTime': - this.recipe_json.cookTime=v + this.recipe_json.cookTime = v break; case 'ingredients': this.$http.post('{% url 'api_ingredient_from_string' %}', {text: v}, {emulateJSON: true}).then((response) => { - let new_ingredient={ - unit: {id: Math.random() * 1000, text: response.body.unit}, - amount: String(response.body.amount), - ingredient: {id: Math.random() * 1000, text: response.body.food}, - note: response.body.note, - original: v - } - this.recipe_json.recipeIngredient.push(new_ingredient) + let new_ingredient = { + unit: {id: Math.random() * 1000, text: response.body.unit}, + amount: String(response.body.amount), + ingredient: {id: Math.random() * 1000, text: response.body.food}, + note: response.body.note, + original: v + } + this.recipe_json.recipeIngredient.push(new_ingredient) }).catch((err) => { console.log(err) this.makeToast(gettext('Error'), gettext('Something went wrong.'), 'danger')
-