Merge branch 'develop' into beta
This commit is contained in:
vabene1111
commit
26ff3f56ea
@ -114,7 +114,7 @@ def get_from_scraper(scrape, request):
|
|||||||
except Exception:
|
except Exception:
|
||||||
pass
|
pass
|
||||||
|
|
||||||
if source_url := scrape.canonical_url():
|
if source_url := scrape.url:
|
||||||
recipe_json['source_url'] = source_url
|
recipe_json['source_url'] = source_url
|
||||||
try:
|
try:
|
||||||
keywords.append(source_url.replace('http://', '').replace('https://', '').split('/')[0])
|
keywords.append(source_url.replace('http://', '').replace('https://', '').split('/')[0])
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
Django==3.2.13
|
Django==3.2.13
|
||||||
cryptography==36.0.2
|
cryptography==37.0.1
|
||||||
django-annoying==0.10.6
|
django-annoying==0.10.6
|
||||||
django-autocomplete-light==3.9.4
|
django-autocomplete-light==3.9.4
|
||||||
django-cleanup==6.0.0
|
django-cleanup==6.0.0
|
||||||
|
|||||||
@ -24,9 +24,8 @@
|
|||||||
<div class="row justify-content-center">
|
<div class="row justify-content-center">
|
||||||
<div class="col-12 justify-content-cente">
|
<div class="col-12 justify-content-cente">
|
||||||
<b-checkbox v-model="import_multiple" switch><span
|
<b-checkbox v-model="import_multiple" switch><span
|
||||||
v-if="import_multiple">Multiple Recipes</span><span
|
v-if="import_multiple"><i class="far fa-copy fa-fw"></i> {{ $t('Multiple') }}</span><span
|
||||||
v-if="!import_multiple">Single Recipe</span></b-checkbox>
|
v-if="!import_multiple"><i class="far fa-file fa-fw"></i> {{ $t('Single') }}</span></b-checkbox>
|
||||||
<!-- TODO localize or maybe icons ? -->
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<b-input-group class="mt-2" :class="{ bounce: empty_input }"
|
<b-input-group class="mt-2" :class="{ bounce: empty_input }"
|
||||||
@ -52,23 +51,25 @@
|
|||||||
@click="autoImport()">{{ $t('Import') }}
|
@click="autoImport()">{{ $t('Import') }}
|
||||||
</b-button>
|
</b-button>
|
||||||
|
|
||||||
<div class="row mt-2"> <!-- TODO remove -->
|
<!-- recent imports, nice for testing/development -->
|
||||||
<div class="col col-md-12">
|
<!-- <div class="row mt-2"> -->
|
||||||
<div v-if="!import_multiple">
|
<!-- <div class="col col-md-12">-->
|
||||||
<a href="#" @click="clearRecentImports()">Clear recent
|
<!-- <div v-if="!import_multiple">-->
|
||||||
imports</a>
|
<!-- <a href="#" @click="clearRecentImports()">Clear recent-->
|
||||||
<ul>
|
<!-- imports</a>-->
|
||||||
<li v-for="x in recent_urls" v-bind:key="x">
|
<!-- <ul>-->
|
||||||
<a href="#"
|
<!-- <li v-for="x in recent_urls" v-bind:key="x">-->
|
||||||
@click="loadRecipe(x, false, undefined)">{{
|
<!-- <a href="#"-->
|
||||||
x
|
<!-- @click="loadRecipe(x, false, undefined)">{{-->
|
||||||
}}</a>
|
<!-- x-->
|
||||||
</li>
|
<!-- }}</a>-->
|
||||||
</ul>
|
<!-- </li>-->
|
||||||
|
<!-- </ul>-->
|
||||||
|
|
||||||
|
<!-- </div>-->
|
||||||
|
<!-- </div>-->
|
||||||
|
<!-- </div>-->
|
||||||
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</b-collapse>
|
</b-collapse>
|
||||||
@ -455,9 +456,7 @@ export default {
|
|||||||
// URL import
|
// URL import
|
||||||
LS_IMPORT_RECENT: 'import_recent_urls', //TODO use central helper to manage all local storage keys (and maybe even access)
|
LS_IMPORT_RECENT: 'import_recent_urls', //TODO use central helper to manage all local storage keys (and maybe even access)
|
||||||
website_url: '',
|
website_url: '',
|
||||||
website_url_list: 'https://madamedessert.de/schokoladenpudding-rezept-mit-echter-schokolade/\nhttps://www.essen-und-trinken.de/rezepte/58294-rzpt-schokoladenpudding\n' +
|
website_url_list: '',
|
||||||
'https://www.chefkoch.de/rezepte/1825781296124455/Schokoladenpudding-selbst-gemacht.html\ntest.com\nhttps://bla.com',
|
|
||||||
|
|
||||||
import_multiple: false,
|
import_multiple: false,
|
||||||
recent_urls: [],
|
recent_urls: [],
|
||||||
source_data: '',
|
source_data: '',
|
||||||
|
|||||||
@ -291,6 +291,7 @@
|
|||||||
aria-hidden="true"></i
|
aria-hidden="true"></i
|
||||||
></span>
|
></span>
|
||||||
</h5>
|
</h5>
|
||||||
|
<span class="text-muted" v-if="supermarket.description !== ''">{{ supermarket.description }}</span>
|
||||||
</b-col>
|
</b-col>
|
||||||
</b-row>
|
</b-row>
|
||||||
</b-card-header>
|
</b-card-header>
|
||||||
|
|||||||
@ -389,6 +389,8 @@
|
|||||||
"Keyword": "Keyword",
|
"Keyword": "Keyword",
|
||||||
"Advanced": "Advanced",
|
"Advanced": "Advanced",
|
||||||
"Page": "Page",
|
"Page": "Page",
|
||||||
|
"Single": "Single",
|
||||||
|
"Multiple": "Multiple",
|
||||||
"Reset": "Reset",
|
"Reset": "Reset",
|
||||||
"Options": "Options",
|
"Options": "Options",
|
||||||
"Create Food": "Create Food",
|
"Create Food": "Create Food",
|
||||||
|
|||||||
@ -383,5 +383,16 @@
|
|||||||
"additional_options": "Opcje dodatkowe",
|
"additional_options": "Opcje dodatkowe",
|
||||||
"err_deleting_protected_resource": "Obiekt, który próbujesz usunąć, jest nadal używany i nie można go usunąć.",
|
"err_deleting_protected_resource": "Obiekt, który próbujesz usunąć, jest nadal używany i nie można go usunąć.",
|
||||||
"Protected": "Chroniony",
|
"Protected": "Chroniony",
|
||||||
"Ingredient Editor": "Edytor składników"
|
"Ingredient Editor": "Edytor składników",
|
||||||
|
"one_url_per_line": "Jeden URL na linię",
|
||||||
|
"Website": "Strona internetowa",
|
||||||
|
"App": "Aplikacja",
|
||||||
|
"Bookmarklet": "Skryptozakładka",
|
||||||
|
"click_image_import": "Kliknij obraz, który chcesz zaimportować do tego przepisu",
|
||||||
|
"no_more_images_found": "Nie znaleziono dodatkowych zdjęć na stronie internetowej.",
|
||||||
|
"import_duplicates": "Aby zapobiec duplikatom przepisy tej samej nazwie, co istniejące, są ignorowane. Zaznacz to pole, aby zaimportować wszystko.",
|
||||||
|
"paste_json": "Wklej tutaj źródło json lub html, aby załadować przepis.",
|
||||||
|
"Click_To_Edit": "Kliknij aby edytować",
|
||||||
|
"Imported_From": "Zaimportowane z",
|
||||||
|
"Options": "Opcje"
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user