cgiacofei/TandoorRecipes
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' into beta

Browse Source
This commit is contained in:
vabene1111 2022-05-03 16:58:44 +02:00
commit 26ff3f56ea
6 changed files with 38 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cookbook/helper/recipe_url_import.py
View File

@ -114,7 +114,7 @@ def get_from_scraper(scrape, request):
except Exception:
pass
if source_url := scrape.canonical_url():
if source_url := scrape.url:
recipe_json['source_url'] = source_url
try:
keywords.append(source_url.replace('http://', '').replace('https://', '').split('/')[0])

2
requirements.txt
View File

@ -1,5 +1,5 @@
Django==3.2.13
cryptography==36.0.2
cryptography==37.0.1
django-annoying==0.10.6
django-autocomplete-light==3.9.4
django-cleanup==6.0.0

43
vue/src/apps/ImportView/ImportView.vue
View File

@ -24,9 +24,8 @@
<div class="row justify-content-center">
<div class="col-12 justify-content-cente">
<b-checkbox v-model="import_multiple" switch><span
v-if="import_multiple">Multiple Recipes</span><span
v-if="!import_multiple">Single Recipe</span></b-checkbox>
<!-- TODO localize or maybe icons ? -->
v-if="import_multiple"><i class="far fa-copy fa-fw"></i> {{ $t('Multiple') }}</span><span
v-if="!import_multiple"><i class="far fa-file fa-fw"></i> {{ $t('Single') }}</span></b-checkbox>
</div>
</div>
<b-input-group class="mt-2" :class="{ bounce: empty_input }"
@ -52,23 +51,25 @@
@click="autoImport()">{{ $t('Import') }}
</b-button>
<div class="row mt-2"> <!-- TODO remove -->
<div class="col col-md-12">
<div v-if="!import_multiple">
<a href="#" @click="clearRecentImports()">Clear recent
imports</a>
<ul>
<li v-for="x in recent_urls" v-bind:key="x">
<a href="#"
@click="loadRecipe(x, false, undefined)">{{
x
}}</a>
</li>
</ul>
<!-- recent imports, nice for testing/development -->
<!-- <div class="row mt-2"> -->
<!-- <div class="col col-md-12">-->
<!-- <div v-if="!import_multiple">-->
<!-- <a href="#" @click="clearRecentImports()">Clear recent-->
<!-- imports</a>-->
<!-- <ul>-->
<!-- <li v-for="x in recent_urls" v-bind:key="x">-->
<!-- <a href="#"-->
<!-- @click="loadRecipe(x, false, undefined)">{{-->
<!-- x-->
<!-- }}</a>-->
<!-- </li>-->
<!-- </ul>-->
<!-- </div>-->
<!-- </div>-->
<!-- </div>-->
</div>
</div>
</div>
</div>
</div>
</b-collapse>
@ -455,9 +456,7 @@ export default {
// URL import
LS_IMPORT_RECENT: 'import_recent_urls', //TODO use central helper to manage all local storage keys (and maybe even access)
website_url: '',
website_url_list: 'https://madamedessert.de/schokoladenpudding-rezept-mit-echter-schokolade/\nhttps://www.essen-und-trinken.de/rezepte/58294-rzpt-schokoladenpudding\n' +
'https://www.chefkoch.de/rezepte/1825781296124455/Schokoladenpudding-selbst-gemacht.html\ntest.com\nhttps://bla.com',
website_url_list: '',
import_multiple: false,
recent_urls: [],
source_data: '',

1
vue/src/apps/ShoppingListView/ShoppingListView.vue
View File

@ -291,6 +291,7 @@
aria-hidden="true"></i
></span>
</h5>
<span class="text-muted" v-if="supermarket.description !== ''">{{ supermarket.description }}</span>
</b-col>
</b-row>
</b-card-header>

2
vue/src/locales/en.json
View File

@ -389,6 +389,8 @@
"Keyword": "Keyword",
"Advanced": "Advanced",
"Page": "Page",
"Single": "Single",
"Multiple": "Multiple",
"Reset": "Reset",
"Options": "Options",
"Create Food": "Create Food",

13
vue/src/locales/pl.json
View File

@ -383,5 +383,16 @@
"additional_options": "Opcje dodatkowe",
"err_deleting_protected_resource": "Obiekt, który próbujesz usunąć, jest nadal używany i nie można go usunąć.",
"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"
}