lots of small fixes

This commit is contained in:
vabene1111
2022-04-22 19:26:49 +02:00
parent 42dfc9d126
commit 3cf0395a18
12 changed files with 153 additions and 1110 deletions

View File

@@ -106,10 +106,12 @@
<div class="row">
<div class="col-12 col-md-8 offset-0 offset-md-2">
<h4 class="text-center flex-grow-1" v-b-tooltip.hover.bottom :title="$t('Click_To_Edit')" v-if="!edit_name"
<h4 class="text-center flex-grow-1" v-b-tooltip.hover.bottom
:title="$t('Click_To_Edit')" v-if="!edit_name"
@click="edit_name = true">{{
recipe_json.name
}} <span class="text-primary"><i class="fa fa-edit"></i> </span> </h4>
}} <span class="text-primary"><i class="fa fa-edit"></i> </span>
</h4>
<b-input-group v-if="edit_name" class="mb-2">
<b-input
class="form-control form-control-borderless form-control-search"
@@ -235,6 +237,11 @@
{{ $t('import_duplicates') }}
</b-form-checkbox>
<a href="recipe_app_info.help_url"
v-if="recipe_app_info !== undefined && recipe_app_info.help_url !== ''">{{
$t('Help')
}}</a>
<b-form-file
class="my-2"
multiple
@@ -312,6 +319,11 @@ export default {
RecipeCard,
ImportViewStepEditor
},
computed: {
recipe_app_info: function () {
return this.INTEGRATIONS.filter(x => 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: {

View File

@@ -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'},
]