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

some small ui stuff

Browse Source
This commit is contained in:
vabene1111
2022-02-21 18:29:23 +01:00
parent e04d672750
commit 0d98c77301
2 changed files with 136 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cookbook/helper/recipe_url_import.py
View File

@ -33,7 +33,7 @@ def get_from_scraper(scrape, request):
except Exception:
description = ''
recipe_json['description'] = parse_description(description)
recipe_json['description'] = parse_description(description)[:512]
recipe_json['internal'] = True
try:

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

@ -11,13 +11,19 @@
<div class="col col-md-12">
<b-tabs content-class="mt-3">
<b-tab v-bind:title="$t('Website')" active>
<h6>Website</h6>
<b-card no-body>
<b-card-header header-tag="header" class="p-1" role="tab">
<b-button block v-b-toggle.id_accordion_url variant="info">Website</b-button>
</b-card-header>
<b-collapse id="id_accordion_url" visible accordion="url_import_accordion" role="tabpanel">
<b-card-body>
<b-input-group>
<b-input v-model="website_url" placeholder="Website URL"
@paste="loadRecipe()"></b-input>
<b-input-group-append>
<b-button variant="primary" @click="loadRecipe()"><i class="fas fa-search"></i>
<b-button variant="primary" @click="loadRecipe()"><i
class="fas fa-search"></i>
</b-button>
</b-input-group-append>
</b-input-group>
@ -28,12 +34,16 @@
<a href="#" @click="website_url=x; loadRecipe()">{{ x }}</a>
</li>
</ul>
</b-card-body>
</b-collapse>
</b-card>
<h6>Options</h6>
<!-- preview column -->
<div class="row">
<div class="col col-md-12" v-if="recipe_json !== undefined">
Images
<b-card no-body>
<b-card-header header-tag="header" class="p-1" role="tab">
<b-button block v-b-toggle.id_accordion_add_options variant="info">Additional Options</b-button>
</b-card-header>
<b-collapse id="id_accordion_add_options" accordion="url_import_accordion" role="tabpanel">
<b-card-body v-if="recipe_json !== undefined"> <!-- TODO disable/show message if not imported yet -->
<div class="row">
<div class="col col-md-12 text-center">
@ -54,27 +64,74 @@
</div>
</div>
<div class="row mt-2">
<div class="col col-6">
<b-card title="Used Keywords">
Keywords
<ul>
<li v-for="k in recipe_json.keywords" v-bind:key="k.name">{{ k.label }}</li>
</ul>
unused
<ul>
<li v-for="k in recipe_json.unused_keywords" v-bind:key="k.name">{{
<b-list-group>
<draggable :list="recipe_json.keywords" group="keywords"
:empty-insert-threshold="10">
<b-list-group-item v-for="k in recipe_json.keywords"
v-bind:key="k.name">{{
k.label
}}
</li>
</ul>
Steps
<ul>
<li v-for="s in recipe_json.steps" v-bind:key="s">{{ s }}</li>
</ul>
</b-list-group-item>
</draggable>
</b-list-group>
</b-card>
</div>
<div class="col col-6">
<b-card title="Unused Keywords">
<b-list-group>
<draggable :list="recipe_json.unused_keywords" group="keywords"
:empty-insert-threshold="10">
<b-list-group-item v-for="k in recipe_json.unused_keywords"
v-bind:key="k.name">{{
k.label
}}
</b-list-group-item>
</draggable>
</b-list-group>
</b-card>
</div>
</div>
<h6>Import</h6>
<b-button @click="importRecipe()">Import</b-button>
Steps
<div class="row">
<div class="col col-md-12">
<b-button @click="splitSteps('\n')">Split</b-button>
<b-list-group>
<b-list-group-item v-for="s in recipe_json.steps"
v-bind:key="s.instruction"><span
style="white-space: pre-wrap">{{ s.instruction }}</span>
</b-list-group-item>
</b-list-group>
</div>
</div>
</b-card-body>
</b-collapse>
</b-card>
<b-card no-body>
<b-card-header header-tag="header" class="p-1" role="tab">
<b-button block v-b-toggle.id_accordion_import variant="info">Import</b-button>
</b-card-header>
<b-collapse id="id_accordion_import" visible accordion="url_import_accordion" role="tabpanel">
<b-card-body>
<b-button-group>
<b-button @click="importRecipe()">Import & View</b-button>
<b-button @click="importRecipe()">Import & Edit</b-button>
<b-button @click="importRecipe()">Import & start new import</b-button>
</b-button-group>
</b-card-body>
</b-collapse>
</b-card>
</b-tab>
<b-tab v-bind:title="$t('App')">
@ -109,6 +166,7 @@ import 'bootstrap-vue/dist/bootstrap-vue.css'
import {resolveDjangoUrl, ResolveUrlMixin, StandardToasts, ToastMixin} from "@/utils/utils";
import axios from "axios";
import {ApiApiFactory} from "@/utils/openapi/api";
import draggable from "vuedraggable";
Vue.use(BootstrapVue)
@ -118,7 +176,9 @@ export default {
ResolveUrlMixin,
ToastMixin,
],
components: {},
components: {
draggable
},
data() {
return {
LS_IMPORT_RECENT: 'import_recent_urls', //TODO use central helper to manage all local storage keys (and maybe even access)
@ -146,9 +206,9 @@ export default {
*/
importRecipe: function () {
let apiFactory = new ApiApiFactory()
apiFactory.createRecipe(this.recipe_json).then(response => {
apiFactory.createRecipe(this.recipe_json).then(response => { // save recipe
let recipe = response.data
apiFactory.imageRecipe(response.data.id, undefined, this.recipe_json.image).then(response => {
apiFactory.imageRecipe(response.data.id, undefined, this.recipe_json.image).then(response => { // save recipe image
StandardToasts.makeStandardToast(StandardToasts.SUCCESS_CREATE)
window.location = resolveDjangoUrl('edit_recipe', recipe.id)
}).catch(e => {
@ -209,6 +269,25 @@ export default {
StandardToasts.makeStandardToast(StandardToasts.FAIL_FETCH, err.response.data.msg)
})
},
/**
* 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
*/
splitSteps: function (split_character) {
let steps = []
this.recipe_json.steps.forEach(step => {
step.instruction.split(split_character).forEach(part => {
steps.push({'instruction': part, 'ingredients': []})
})
})
this.recipe_json.steps.forEach(step => {
if (step.ingredients.length > 0) {
console.log('found ingredients', step.ingredients)
steps[0].ingredients = steps[0].ingredients.concat(step.ingredients)
}
})
this.recipe_json.steps = steps
},
/**
* Clear list of recently imported recipe urls
*/