mirrors/recipes
1
0
Fork 0
mirror of https://github.com/TandoorRecipes/recipes.git synced 2026-01-01 12:18:45 -05:00
Code Issues Packages Projects Releases Wiki Activity

converted ingredient parser to class and added automation beta hint

Browse Source
This commit is contained in:
vabene1111
2021-09-16 17:52:11 +02:00
parent ecd300d2db
commit a7dc23194e
28 changed files with 505 additions and 337 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
vue/src/apps/ModelListView/ModelListView.vue
View File

@@ -8,11 +8,22 @@
:show="show_modal"
@finish-action="finishAction"/>
<div class="row">
<div class="col-md-2 d-none d-md-block">
</div>
<div class="col-xl-8 col-12">
<div class="container-fluid d-flex flex-column flex-grow-1">
<div class="row" v-if="this_model === Models.AUTOMATION">
<div class="col-md-12">
<b-alert show variant="warning">
<b-badge>BETA</b-badge>
{{ $t('warning_feature_beta') }}
</b-alert>
</div>
</div>
<div class="row">
<div class="col-md-6" style="margin-top: 1vh">
<h3>
@@ -38,11 +49,11 @@
<!-- model isn't paginated and loads in one API call -->
<div v-if="!paginated">
<generic-horizontal-card v-for="i in items_left" v-bind:key="i.id"
:item=i
:model="this_model"
@item-action="startAction($event, 'left')"
@finish-action="finishAction"/>
</div>
:item=i
:model="this_model"
@item-action="startAction($event, 'left')"
@finish-action="finishAction"/>
</div>
<!-- model is paginated and needs managed -->
<generic-infinite-cards v-if="paginated"
:card_counts="left_counts"
@@ -343,7 +354,7 @@ export default {
this.makeToast(this.$t('Error'), err.bodyText, 'danger')
})
if (automate){
if (automate) {
let apiClient = new ApiApiFactory()
let automation = {
@@ -352,13 +363,13 @@ export default {
param_2: target.id
}
if (this.this_model === this.Models.FOOD){
if (this.this_model === this.Models.FOOD) {
automation.type = 'FOOD_ALIAS'
}
if (this.this_model === this.Models.UNIT){
if (this.this_model === this.Models.UNIT) {
automation.type = 'UNIT_ALIAS'
}
if (this.this_model === this.Models.KEYWORD){
if (this.this_model === this.Models.KEYWORD) {
automation.type = 'KEYWORD_ALIAS'
}

2
vue/src/components/GenericContextMenu.vue
View File

@@ -21,7 +21,7 @@
</b-dropdown-item>
<b-dropdown-item v-if="show_merge" v-on:click="$emit('item-action', 'merge-automate')">
<i class="fas fa-robot fa-fw"></i> {{$t('Merge')}} & {{$t('Automate')}}
<i class="fas fa-robot fa-fw"></i> {{$t('Merge')}} & {{$t('Automate')}} <b-badge v-b-tooltip.hover :title="$t('warning_feature_beta')">BETA</b-badge>
</b-dropdown-item>
</b-dropdown>

2
vue/src/components/GenericHorizontalCard.vue
View File

@@ -86,7 +86,7 @@
<i class="fas fa-compress-arrows-alt fa-fw"></i> <b>{{$t('Merge')}}</b>: <span v-html="$t('merge_confirmation', {'source': source.name,'target':item.name})"></span>
</b-list-group-item>
<b-list-group-item v-if="useMerge" action v-on:click="$emit('item-action',{'action': 'merge-automate', 'target': item, 'source': source}); closeMenu()">
<i class="fas fa-robot fa-fw"></i> <b>{{$t('Merge')}} & {{$t('Automate')}}</b>: <span v-html="$t('merge_confirmation', {'source': source.name,'target':item.name})"></span> {{$t('create_rule')}}
<i class="fas fa-robot fa-fw"></i> <b>{{$t('Merge')}} & {{$t('Automate')}}</b>: <span v-html="$t('merge_confirmation', {'source': source.name,'target':item.name})"></span> {{$t('create_rule')}} <b-badge v-b-tooltip.hover :title="$t('warning_feature_beta')" >BETA</b-badge>
</b-list-group-item>
<b-list-group-item action v-on:click="closeMenu()">
<i class="fas fa-times fa-fw"></i> <b>{{$t('Cancel')}}</b>

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

@@ -1,4 +1,5 @@
{
"warning_feature_beta": "This feature is currently in a BETA (testing) state. Please expect bugs and possibly breaking changes in the future (possibly loosing feature related data) when using this feature.",
"err_fetching_resource": "There was an error fetching a resource!",
"err_creating_resource": "There was an error creating a resource!",
"err_updating_resource": "There was an error updating a resource!",

255
vue/webpack-stats.json
View File

@@ -1,183 +1,294 @@
{
"status": "done",
"assets": {
"../../templates/sw.js": {
"name": "../../templates/sw.js",
"path": "..\\..\\templates\\sw.js"
},
"css/chunk-vendors.css": {
"name": "css/chunk-vendors.css",
"path": "css\\chunk-vendors.css"
},
"js/chunk-vendors.js": {
"name": "js/chunk-vendors.js",
"path": "js\\chunk-vendors.js"
},
"css/cookbook_view.css": {
"name": "css/cookbook_view.css",
"path": "css\\cookbook_view.css"
"path": "js\\chunk-vendors.js",
"publicPath": "http://localhost:8080/js/chunk-vendors.js"
},
"js/cookbook_view.js": {
"name": "js/cookbook_view.js",
"path": "js\\cookbook_view.js"
},
"css/edit_internal_recipe.css": {
"name": "css/edit_internal_recipe.css",
"path": "css\\edit_internal_recipe.css"
"path": "js\\cookbook_view.js",
"publicPath": "http://localhost:8080/js/cookbook_view.js"
},
"js/edit_internal_recipe.js": {
"name": "js/edit_internal_recipe.js",
"path": "js\\edit_internal_recipe.js"
"path": "js\\edit_internal_recipe.js",
"publicPath": "http://localhost:8080/js/edit_internal_recipe.js"
},
"js/import_response_view.js": {
"name": "js/import_response_view.js",
"path": "js\\import_response_view.js"
},
"css/meal_plan_view.css": {
"name": "css/meal_plan_view.css",
"path": "css\\meal_plan_view.css"
"path": "js\\import_response_view.js",
"publicPath": "http://localhost:8080/js/import_response_view.js"
},
"js/meal_plan_view.js": {
"name": "js/meal_plan_view.js",
"path": "js\\meal_plan_view.js"
},
"css/model_list_view.css": {
"name": "css/model_list_view.css",
"path": "css\\model_list_view.css"
"path": "js\\meal_plan_view.js",
"publicPath": "http://localhost:8080/js/meal_plan_view.js"
},
"js/model_list_view.js": {
"name": "js/model_list_view.js",
"path": "js\\model_list_view.js"
"path": "js\\model_list_view.js",
"publicPath": "http://localhost:8080/js/model_list_view.js"
},
"js/offline_view.js": {
"name": "js/offline_view.js",
"path": "js\\offline_view.js"
},
"css/recipe_search_view.css": {
"name": "css/recipe_search_view.css",
"path": "css\\recipe_search_view.css"
"path": "js\\offline_view.js",
"publicPath": "http://localhost:8080/js/offline_view.js"
},
"js/recipe_search_view.js": {
"name": "js/recipe_search_view.js",
"path": "js\\recipe_search_view.js"
},
"css/recipe_view.css": {
"name": "css/recipe_view.css",
"path": "css\\recipe_view.css"
"path": "js\\recipe_search_view.js",
"publicPath": "http://localhost:8080/js/recipe_search_view.js"
},
"js/recipe_view.js": {
"name": "js/recipe_view.js",
"path": "js\\recipe_view.js"
"path": "js\\recipe_view.js",
"publicPath": "http://localhost:8080/js/recipe_view.js"
},
"js/supermarket_view.js": {
"name": "js/supermarket_view.js",
"path": "js\\supermarket_view.js"
"path": "js\\supermarket_view.js",
"publicPath": "http://localhost:8080/js/supermarket_view.js"
},
"js/user_file_view.js": {
"name": "js/user_file_view.js",
"path": "js\\user_file_view.js"
"path": "js\\user_file_view.js",
"publicPath": "http://localhost:8080/js/user_file_view.js"
},
"recipe_search_view.html": {
"name": "recipe_search_view.html",
"path": "recipe_search_view.html"
"path": "recipe_search_view.html",
"publicPath": "http://localhost:8080/recipe_search_view.html"
},
"recipe_view.html": {
"name": "recipe_view.html",
"path": "recipe_view.html"
"path": "recipe_view.html",
"publicPath": "http://localhost:8080/recipe_view.html"
},
"offline_view.html": {
"name": "offline_view.html",
"path": "offline_view.html"
"path": "offline_view.html",
"publicPath": "http://localhost:8080/offline_view.html"
},
"import_response_view.html": {
"name": "import_response_view.html",
"path": "import_response_view.html"
"path": "import_response_view.html",
"publicPath": "http://localhost:8080/import_response_view.html"
},
"supermarket_view.html": {
"name": "supermarket_view.html",
"path": "supermarket_view.html"
"path": "supermarket_view.html",
"publicPath": "http://localhost:8080/supermarket_view.html"
},
"user_file_view.html": {
"name": "user_file_view.html",
"path": "user_file_view.html"
"path": "user_file_view.html",
"publicPath": "http://localhost:8080/user_file_view.html"
},
"model_list_view.html": {
"name": "model_list_view.html",
"path": "model_list_view.html"
"path": "model_list_view.html",
"publicPath": "http://localhost:8080/model_list_view.html"
},
"edit_internal_recipe.html": {
"name": "edit_internal_recipe.html",
"path": "edit_internal_recipe.html"
"path": "edit_internal_recipe.html",
"publicPath": "http://localhost:8080/edit_internal_recipe.html"
},
"cookbook_view.html": {
"name": "cookbook_view.html",
"path": "cookbook_view.html"
"path": "cookbook_view.html",
"publicPath": "http://localhost:8080/cookbook_view.html"
},
"meal_plan_view.html": {
"name": "meal_plan_view.html",
"path": "meal_plan_view.html"
"path": "meal_plan_view.html",
"publicPath": "http://localhost:8080/meal_plan_view.html"
},
"manifest.json": {
"name": "manifest.json",
"path": "manifest.json"
"path": "manifest.json",
"publicPath": "http://localhost:8080/manifest.json"
},
"model_list_view.7cf8cfb04383ac21dae2.hot-update.js": {
"name": "model_list_view.7cf8cfb04383ac21dae2.hot-update.js",
"path": "model_list_view.7cf8cfb04383ac21dae2.hot-update.js",
"publicPath": "http://localhost:8080/model_list_view.7cf8cfb04383ac21dae2.hot-update.js"
},
"7cf8cfb04383ac21dae2.hot-update.json": {
"name": "7cf8cfb04383ac21dae2.hot-update.json",
"path": "7cf8cfb04383ac21dae2.hot-update.json",
"publicPath": "http://localhost:8080/7cf8cfb04383ac21dae2.hot-update.json"
},
"model_list_view.65f25fe27091809f7fcf.hot-update.js": {
"name": "model_list_view.65f25fe27091809f7fcf.hot-update.js",
"path": "model_list_view.65f25fe27091809f7fcf.hot-update.js",
"publicPath": "http://localhost:8080/model_list_view.65f25fe27091809f7fcf.hot-update.js"
},
"65f25fe27091809f7fcf.hot-update.json": {
"name": "65f25fe27091809f7fcf.hot-update.json",
"path": "65f25fe27091809f7fcf.hot-update.json",
"publicPath": "http://localhost:8080/65f25fe27091809f7fcf.hot-update.json"
},
"model_list_view.032182ad6990812f8035.hot-update.js": {
"name": "model_list_view.032182ad6990812f8035.hot-update.js",
"path": "model_list_view.032182ad6990812f8035.hot-update.js",
"publicPath": "http://localhost:8080/model_list_view.032182ad6990812f8035.hot-update.js"
},
"032182ad6990812f8035.hot-update.json": {
"name": "032182ad6990812f8035.hot-update.json",
"path": "032182ad6990812f8035.hot-update.json",
"publicPath": "http://localhost:8080/032182ad6990812f8035.hot-update.json"
},
"model_list_view.cbedf3e2489989eec8dd.hot-update.js": {
"name": "model_list_view.cbedf3e2489989eec8dd.hot-update.js",
"path": "model_list_view.cbedf3e2489989eec8dd.hot-update.js",
"publicPath": "http://localhost:8080/model_list_view.cbedf3e2489989eec8dd.hot-update.js"
},
"cbedf3e2489989eec8dd.hot-update.json": {
"name": "cbedf3e2489989eec8dd.hot-update.json",
"path": "cbedf3e2489989eec8dd.hot-update.json",
"publicPath": "http://localhost:8080/cbedf3e2489989eec8dd.hot-update.json"
},
"model_list_view.87a9208c092e31885f51.hot-update.js": {
"name": "model_list_view.87a9208c092e31885f51.hot-update.js",
"path": "model_list_view.87a9208c092e31885f51.hot-update.js",
"publicPath": "http://localhost:8080/model_list_view.87a9208c092e31885f51.hot-update.js"
},
"87a9208c092e31885f51.hot-update.json": {
"name": "87a9208c092e31885f51.hot-update.json",
"path": "87a9208c092e31885f51.hot-update.json",
"publicPath": "http://localhost:8080/87a9208c092e31885f51.hot-update.json"
},
"cookbook_view.307bb5ac629ff8f5dba5.hot-update.js": {
"name": "cookbook_view.307bb5ac629ff8f5dba5.hot-update.js",
"path": "cookbook_view.307bb5ac629ff8f5dba5.hot-update.js",
"publicPath": "http://localhost:8080/cookbook_view.307bb5ac629ff8f5dba5.hot-update.js"
},
"edit_internal_recipe.307bb5ac629ff8f5dba5.hot-update.js": {
"name": "edit_internal_recipe.307bb5ac629ff8f5dba5.hot-update.js",
"path": "edit_internal_recipe.307bb5ac629ff8f5dba5.hot-update.js",
"publicPath": "http://localhost:8080/edit_internal_recipe.307bb5ac629ff8f5dba5.hot-update.js"
},
"import_response_view.307bb5ac629ff8f5dba5.hot-update.js": {
"name": "import_response_view.307bb5ac629ff8f5dba5.hot-update.js",
"path": "import_response_view.307bb5ac629ff8f5dba5.hot-update.js",
"publicPath": "http://localhost:8080/import_response_view.307bb5ac629ff8f5dba5.hot-update.js"
},
"meal_plan_view.307bb5ac629ff8f5dba5.hot-update.js": {
"name": "meal_plan_view.307bb5ac629ff8f5dba5.hot-update.js",
"path": "meal_plan_view.307bb5ac629ff8f5dba5.hot-update.js",
"publicPath": "http://localhost:8080/meal_plan_view.307bb5ac629ff8f5dba5.hot-update.js"
},
"model_list_view.307bb5ac629ff8f5dba5.hot-update.js": {
"name": "model_list_view.307bb5ac629ff8f5dba5.hot-update.js",
"path": "model_list_view.307bb5ac629ff8f5dba5.hot-update.js",
"publicPath": "http://localhost:8080/model_list_view.307bb5ac629ff8f5dba5.hot-update.js"
},
"offline_view.307bb5ac629ff8f5dba5.hot-update.js": {
"name": "offline_view.307bb5ac629ff8f5dba5.hot-update.js",
"path": "offline_view.307bb5ac629ff8f5dba5.hot-update.js",
"publicPath": "http://localhost:8080/offline_view.307bb5ac629ff8f5dba5.hot-update.js"
},
"recipe_search_view.307bb5ac629ff8f5dba5.hot-update.js": {
"name": "recipe_search_view.307bb5ac629ff8f5dba5.hot-update.js",
"path": "recipe_search_view.307bb5ac629ff8f5dba5.hot-update.js",
"publicPath": "http://localhost:8080/recipe_search_view.307bb5ac629ff8f5dba5.hot-update.js"
},
"recipe_view.307bb5ac629ff8f5dba5.hot-update.js": {
"name": "recipe_view.307bb5ac629ff8f5dba5.hot-update.js",
"path": "recipe_view.307bb5ac629ff8f5dba5.hot-update.js",
"publicPath": "http://localhost:8080/recipe_view.307bb5ac629ff8f5dba5.hot-update.js"
},
"supermarket_view.307bb5ac629ff8f5dba5.hot-update.js": {
"name": "supermarket_view.307bb5ac629ff8f5dba5.hot-update.js",
"path": "supermarket_view.307bb5ac629ff8f5dba5.hot-update.js",
"publicPath": "http://localhost:8080/supermarket_view.307bb5ac629ff8f5dba5.hot-update.js"
},
"user_file_view.307bb5ac629ff8f5dba5.hot-update.js": {
"name": "user_file_view.307bb5ac629ff8f5dba5.hot-update.js",
"path": "user_file_view.307bb5ac629ff8f5dba5.hot-update.js",
"publicPath": "http://localhost:8080/user_file_view.307bb5ac629ff8f5dba5.hot-update.js"
},
"307bb5ac629ff8f5dba5.hot-update.json": {
"name": "307bb5ac629ff8f5dba5.hot-update.json",
"path": "307bb5ac629ff8f5dba5.hot-update.json",
"publicPath": "http://localhost:8080/307bb5ac629ff8f5dba5.hot-update.json"
},
"model_list_view.e2073a90ad8ff66f374c.hot-update.js": {
"name": "model_list_view.e2073a90ad8ff66f374c.hot-update.js",
"path": "model_list_view.e2073a90ad8ff66f374c.hot-update.js",
"publicPath": "http://localhost:8080/model_list_view.e2073a90ad8ff66f374c.hot-update.js"
},
"e2073a90ad8ff66f374c.hot-update.json": {
"name": "e2073a90ad8ff66f374c.hot-update.json",
"path": "e2073a90ad8ff66f374c.hot-update.json",
"publicPath": "http://localhost:8080/e2073a90ad8ff66f374c.hot-update.json"
},
"model_list_view.1b14899ea7152cc46f4e.hot-update.js": {
"name": "model_list_view.1b14899ea7152cc46f4e.hot-update.js",
"path": "model_list_view.1b14899ea7152cc46f4e.hot-update.js",
"publicPath": "http://localhost:8080/model_list_view.1b14899ea7152cc46f4e.hot-update.js"
},
"1b14899ea7152cc46f4e.hot-update.json": {
"name": "1b14899ea7152cc46f4e.hot-update.json",
"path": "1b14899ea7152cc46f4e.hot-update.json",
"publicPath": "http://localhost:8080/1b14899ea7152cc46f4e.hot-update.json"
},
"model_list_view.7a2ce4182c97623ab7e8.hot-update.js": {
"name": "model_list_view.7a2ce4182c97623ab7e8.hot-update.js",
"path": "model_list_view.7a2ce4182c97623ab7e8.hot-update.js",
"publicPath": "http://localhost:8080/model_list_view.7a2ce4182c97623ab7e8.hot-update.js"
},
"7a2ce4182c97623ab7e8.hot-update.json": {
"name": "7a2ce4182c97623ab7e8.hot-update.json",
"path": "7a2ce4182c97623ab7e8.hot-update.json",
"publicPath": "http://localhost:8080/7a2ce4182c97623ab7e8.hot-update.json"
}
},
"chunks": {
"recipe_search_view": [
"css/chunk-vendors.css",
"js/chunk-vendors.js",
"css/recipe_search_view.css",
"js/recipe_search_view.js"
],
"recipe_view": [
"css/chunk-vendors.css",
"js/chunk-vendors.js",
"css/recipe_view.css",
"js/recipe_view.js"
],
"offline_view": [
"css/chunk-vendors.css",
"js/chunk-vendors.js",
"js/offline_view.js"
],
"import_response_view": [
"css/chunk-vendors.css",
"js/chunk-vendors.js",
"js/import_response_view.js"
],
"supermarket_view": [
"css/chunk-vendors.css",
"js/chunk-vendors.js",
"js/supermarket_view.js"
],
"user_file_view": [
"css/chunk-vendors.css",
"js/chunk-vendors.js",
"js/user_file_view.js"
],
"model_list_view": [
"css/chunk-vendors.css",
"js/chunk-vendors.js",
"css/model_list_view.css",
"js/model_list_view.js"
"js/model_list_view.js",
"model_list_view.7a2ce4182c97623ab7e8.hot-update.js"
],
"edit_internal_recipe": [
"css/chunk-vendors.css",
"js/chunk-vendors.js",
"css/edit_internal_recipe.css",
"js/edit_internal_recipe.js"
],
"cookbook_view": [
"css/chunk-vendors.css",
"js/chunk-vendors.js",
"css/cookbook_view.css",
"js/cookbook_view.js"
],
"meal_plan_view": [
"css/chunk-vendors.css",
"js/chunk-vendors.js",
"css/meal_plan_view.css",
"js/meal_plan_view.js"
]
}
},
"publicPath": "http://localhost:8080/"
}