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

Merge branch 'develop' into feature/importer_to_vue

Browse Source
This commit is contained in:
vabene1111
2022-03-15 13:02:10 +01:00
parent 7426bb4e76 4cf8b72e3f
commit e901c6708c
7 changed files with 430 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
vue/src/apps/RecipeSearchView/RecipeSearchView.vue
View File

@@ -1148,7 +1148,10 @@ export default {
},
showSQL: function () {
let params = this.buildParams()
this.genericAPI(this.Models.RECIPE, this.Actions.LIST, params).then((result) => {})
params.options.query.debug = true
this.genericAPI(this.Models.RECIPE, this.Actions.LIST, params).then((result) => {
console.log(result.data)
})
},
// TODO refactor to combine with load KeywordChildren
loadFoodChildren({ action, parentNode, callback }) {

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

@@ -105,7 +105,7 @@
class="btn dropdown-toggle btn-link text-decoration-none text-dark pr-2 dropdown-toggle-no-caret"
@click.stop="openContextMenu($event, s, true)"
>
<i class="fas fa-ellipsis-v fa-lg"></i>
<i class="fas fa-ellipsis-v"></i>
</button>
<b-button
@@ -116,7 +116,7 @@
:aria-expanded="'true' ? x == 'false' : 'true'"
>
<i class="fa fa-chevron-right rotate" />
<span class="h5 ml-2 text-secondary">{{ i }}</span>
<span class="h6 ml-2 text-secondary">{{ i }}</span>
</b-button>
</div>