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

added err msg to all standard toasts

Browse Source
This commit is contained in:
vabene1111 2022-04-23 01:41:08 +02:00
parent e4223787be
commit 30d5587fbe
14 changed files with 66 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -132,8 +132,8 @@ export default {
this.refreshData()
StandardToasts.makeStandardToast(this,StandardToasts.SUCCESS_CREATE)
})
.catch((error) => {
StandardToasts.makeStandardToast(this,StandardToasts.FAIL_CREATE)
.catch((err) => {
StandardToasts.makeStandardToast(this,StandardToasts.FAIL_CREATE, err)
})
},
appendRecipeFilter: function (page, book) {

3
vue/src/apps/ExportView/ExportView.vue
View File

@ -117,8 +117,7 @@ export default {
this.recipe_list.push(response.data)
})
.catch((err) => {
console.log(err)
StandardToasts.makeStandardToast(this,StandardToasts.FAIL_FETCH)
StandardToasts.makeStandardToast(this,StandardToasts.FAIL_FETCH, err)
})
// .then((e) => this.searchRecipes(""))
},

10
vue/src/apps/IngredientEditorView/IngredientEditorView.vue
View File

@ -187,7 +187,7 @@ export default {
this.ingredients = result.data
this.loading = false
}).catch((err) => {
StandardToasts.makeStandardToast(this,StandardToasts.FAIL_FETCH)
StandardToasts.makeStandardToast(this,StandardToasts.FAIL_FETCH, err)
this.loading = false
})
}
@ -208,8 +208,8 @@ export default {
let apiClient = new ApiApiFactory()
apiClient.updateIngredient(i.id, i).then(r => {
this.$set(i, 'changed', false)
}).catch((r, e) => {
StandardToasts.makeStandardToast(this,StandardToasts.FAIL_UPDATE)
}).catch(err => {
StandardToasts.makeStandardToast(this,StandardToasts.FAIL_UPDATE, err)
})
})
},
@ -219,8 +219,8 @@ export default {
apiClient.destroyIngredient(i.id).then(r => {
StandardToasts.makeStandardToast(this,StandardToasts.SUCCESS_DELETE)
this.ingredients = this.ingredients.filter(li => li.id !== i.id)
}).catch(e => {
StandardToasts.makeStandardToast(this,StandardToasts.FAIL_DELETE)
}).catch(err => {
StandardToasts.makeStandardToast(this,StandardToasts.FAIL_DELETE, err)
})
}
}

28
vue/src/apps/MealPlanView/MealPlanView.vue
View File

@ -450,8 +450,8 @@ export default {
.then((e) => {
this.periodChangedCallback(this.current_period)
})
.catch((error) => {
StandardToasts.makeStandardToast(this,StandardToasts.FAIL_UPDATE)
.catch((err) => {
StandardToasts.makeStandardToast(this,StandardToasts.FAIL_UPDATE, err)
})
this.refreshMealTypes()
@ -473,8 +473,8 @@ export default {
updated++
}
})
.catch((error) => {
StandardToasts.makeStandardToast(this,StandardToasts.FAIL_UPDATE)
.catch((err) => {
StandardToasts.makeStandardToast(this,StandardToasts.FAIL_UPDATE, err)
})
})
},
@ -490,8 +490,8 @@ export default {
this.periodChangedCallback(this.current_period)
StandardToasts.makeStandardToast(this,StandardToasts.SUCCESS_UPDATE)
})
.catch((error) => {
StandardToasts.makeStandardToast(this,StandardToasts.FAIL_UPDATE)
.catch((err) => {
StandardToasts.makeStandardToast(this,StandardToasts.FAIL_UPDATE, err)
})
} else {
this.$set(this.meal_types[index], "editing", true)
@ -506,8 +506,8 @@ export default {
this.periodChangedCallback(this.current_period)
StandardToasts.makeStandardToast(this,StandardToasts.SUCCESS_DELETE)
})
.catch((error) => {
StandardToasts.makeStandardToast(this,StandardToasts.FAIL_DELETE)
.catch((err) => {
StandardToasts.makeStandardToast(this,StandardToasts.FAIL_DELETE, err)
})
},
updateEmoji: function (field, value) {
@ -582,8 +582,8 @@ export default {
.then((e) => {
list.splice(index, 1)
})
.catch((error) => {
StandardToasts.makeStandardToast(this,StandardToasts.FAIL_UPDATE)
.catch((err) => {
StandardToasts.makeStandardToast(this,StandardToasts.FAIL_UPDATE, err)
})
}
})
@ -634,8 +634,8 @@ export default {
let apiClient = new ApiApiFactory()
apiClient.updateMealPlan(entry.id, entry).catch((error) => {
StandardToasts.makeStandardToast(this,StandardToasts.FAIL_UPDATE)
apiClient.updateMealPlan(entry.id, entry).catch((err) => {
StandardToasts.makeStandardToast(this,StandardToasts.FAIL_UPDATE, err)
})
},
createEntry(entry) {
@ -645,8 +645,8 @@ export default {
apiClient
.createMealPlan(entry)
.catch((error) => {
StandardToasts.makeStandardToast(this,StandardToasts.FAIL_UPDATE)
.catch((err) => {
StandardToasts.makeStandardToast(this,StandardToasts.FAIL_UPDATE, err)
})
.then((entry_result) => {
this.plan_entries.push(entry_result.data)

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

@ -275,8 +275,7 @@ export default {
}
})
.catch((err) => {
console.log(err, Object.keys(err))
StandardToasts.makeStandardToast(this,StandardToasts.FAIL_FETCH)
StandardToasts.makeStandardToast(this,StandardToasts.FAIL_FETCH, err)
})
},
getThis: function (id, callback) {
@ -295,8 +294,7 @@ export default {
StandardToasts.makeStandardToast(this,StandardToasts.SUCCESS_CREATE)
})
.catch((err) => {
console.log(err)
StandardToasts.makeStandardToast(this,StandardToasts.FAIL_CREATE)
StandardToasts.makeStandardToast(this,StandardToasts.FAIL_CREATE, err)
})
} else {
this.genericAPI(this.this_model, this.Actions.UPDATE, item)
@ -305,8 +303,7 @@ export default {
StandardToasts.makeStandardToast(this,StandardToasts.SUCCESS_UPDATE)
})
.catch((err) => {
console.log(err, err.response)
StandardToasts.makeStandardToast(this,StandardToasts.FAIL_UPDATE)
StandardToasts.makeStandardToast(this,StandardToasts.FAIL_UPDATE, err)
})
}
},
@ -432,7 +429,7 @@ export default {
})
.catch((err) => {
console.log(err)
StandardToasts.makeStandardToast(this,StandardToasts.FAIL_FETCH)
StandardToasts.makeStandardToast(this,StandardToasts.FAIL_FETCH, err)
})
},
getRecipes: function (col, item) {

25
vue/src/apps/RecipeEditView/RecipeEditView.vue
View File

@ -821,8 +821,7 @@ export default {
})
.catch((err) => {
this.loading = false
console.log(err)
StandardToasts.makeStandardToast(this,StandardToasts.FAIL_FETCH)
StandardToasts.makeStandardToast(this,StandardToasts.FAIL_FETCH, err)
})
},
updateRecipe: function (view_after) {
@ -863,8 +862,7 @@ export default {
}
})
.catch((err) => {
console.log(err)
StandardToasts.makeStandardToast(this,StandardToasts.FAIL_UPDATE)
StandardToasts.makeStandardToast(this,StandardToasts.FAIL_UPDATE, err)
})
},
uploadImage: function (file) {
@ -878,8 +876,7 @@ export default {
StandardToasts.makeStandardToast(this,StandardToasts.SUCCESS_UPDATE)
})
.catch((err) => {
StandardToasts.makeStandardToast(this,StandardToasts.FAIL_UPDATE)
console.log(err.request, err.response)
StandardToasts.makeStandardToast(this,StandardToasts.FAIL_UPDATE, err)
})
}
},
@ -894,8 +891,7 @@ export default {
StandardToasts.makeStandardToast(this,StandardToasts.SUCCESS_DELETE)
})
.catch((err) => {
StandardToasts.makeStandardToast(this,StandardToasts.FAIL_DELETE)
console.log(err.request, err.response)
StandardToasts.makeStandardToast(this,StandardToasts.FAIL_DELETE, err)
})
}
},
@ -990,8 +986,7 @@ export default {
this.keywords_loading = false
})
.catch((err) => {
console.log(err)
StandardToasts.makeStandardToast(this,StandardToasts.FAIL_FETCH)
StandardToasts.makeStandardToast(this,StandardToasts.FAIL_FETCH, err)
})
},
searchFiles: function (query) {
@ -1005,8 +1000,7 @@ export default {
this.files_loading = false
})
.catch((err) => {
console.log(err)
StandardToasts.makeStandardToast(this,StandardToasts.FAIL_FETCH)
StandardToasts.makeStandardToast(this,StandardToasts.FAIL_FETCH, err)
})
},
searchRecipes: function (query) {
@ -1017,8 +1011,7 @@ export default {
this.recipes_loading = false
})
.catch((err) => {
console.log(err)
StandardToasts.makeStandardToast(this,StandardToasts.FAIL_FETCH)
StandardToasts.makeStandardToast(this,StandardToasts.FAIL_FETCH, err)
})
},
searchUnits: function (query) {
@ -1042,7 +1035,7 @@ export default {
this.units_loading = false
})
.catch((err) => {
StandardToasts.makeStandardToast(this,StandardToasts.FAIL_FETCH)
StandardToasts.makeStandardToast(this,StandardToasts.FAIL_FETCH, err)
})
},
searchFoods: function (query) {
@ -1067,7 +1060,7 @@ export default {
this.foods_loading = false
})
.catch((err) => {
StandardToasts.makeStandardToast(this,StandardToasts.FAIL_FETCH)
StandardToasts.makeStandardToast(this,StandardToasts.FAIL_FETCH, err)
})
},
fileCreated: function (data) {

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

@ -1499,8 +1499,7 @@ export default {
StandardToasts.makeStandardToast(this,StandardToasts.SUCCESS_CREATE)
})
.catch((err) => {
console.log(err, Object.keys(err))
StandardToasts.makeStandardToast(this,StandardToasts.FAIL_CREATE)
StandardToasts.makeStandardToast(this,StandardToasts.FAIL_CREATE, err)
})
},
addField: function (field, count) {

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

@ -1121,8 +1121,7 @@ export default {
this.clear += 1
})
.catch((err) => {
console.log(err)
StandardToasts.makeStandardToast(this,StandardToasts.FAIL_CREATE)
StandardToasts.makeStandardToast(this,StandardToasts.FAIL_CREATE, err)
})
},
deleteSupermarket: function (s) {
@ -1133,8 +1132,7 @@ export default {
StandardToasts.makeStandardToast(this,StandardToasts.SUCCESS_DELETE)
})
.catch((err) => {
console.log(err)
StandardToasts.makeStandardToast(this,StandardToasts.FAIL_DELETE)
StandardToasts.makeStandardToast(this,StandardToasts.FAIL_DELETE, err)
})
},
deleteCategory: function (c) {
@ -1149,8 +1147,7 @@ export default {
StandardToasts.makeStandardToast(this,StandardToasts.SUCCESS_DELETE)
})
.catch((err) => {
console.log(err)
StandardToasts.makeStandardToast(this,StandardToasts.FAIL_DELETE)
StandardToasts.makeStandardToast(this,StandardToasts.FAIL_DELETE, err)
})
},
resetFilters: function () {
@ -1192,8 +1189,7 @@ export default {
StandardToasts.makeStandardToast(this,StandardToasts.SUCCESS_DELETE)
})
.catch((err) => {
console.log(err)
StandardToasts.makeStandardToast(this,StandardToasts.FAIL_DELETE)
StandardToasts.makeStandardToast(this,StandardToasts.FAIL_DELETE, err)
})
},
deleteThis: function (item) {
@ -1209,8 +1205,7 @@ export default {
entries.forEach((x) => {
promises.push(
api.destroyShoppingListEntry(x).catch((err) => {
console.log(err)
StandardToasts.makeStandardToast(this,StandardToasts.FAIL_DELETE)
StandardToasts.makeStandardToast(this,StandardToasts.FAIL_DELETE, err)
})
)
})
@ -1265,9 +1260,8 @@ export default {
}
})
.catch((err) => {
console.log(err)
if (!autosync) {
StandardToasts.makeStandardToast(this,StandardToasts.FAIL_FETCH)
StandardToasts.makeStandardToast(this,StandardToasts.FAIL_FETCH, err)
}
})
},
@ -1356,8 +1350,7 @@ export default {
StandardToasts.makeStandardToast(this,StandardToasts.SUCCESS_UPDATE)
})
.catch((err) => {
console.log(err)
StandardToasts.makeStandardToast(this,StandardToasts.FAIL_UPDATE)
StandardToasts.makeStandardToast(this,StandardToasts.FAIL_UPDATE, err)
})
},
saveThis: function (thisItem, toast = true) {
@ -1372,8 +1365,7 @@ export default {
}
})
.catch((err) => {
console.log(err)
StandardToasts.makeStandardToast(this,StandardToasts.FAIL_CREATE)
StandardToasts.makeStandardToast(this,StandardToasts.FAIL_CREATE, err)
})
} else {
return api
@ -1384,8 +1376,7 @@ export default {
}
})
.catch((err) => {
console.log(err, err.response)
StandardToasts.makeStandardToast(this,StandardToasts.FAIL_UPDATE)
StandardToasts.makeStandardToast(this,StandardToasts.FAIL_UPDATE, err)
})
}
},
@ -1415,8 +1406,7 @@ export default {
})
.catch((err) => {
this.auto_sync_blocked = false
console.log(err, err.response)
StandardToasts.makeStandardToast(this,StandardToasts.FAIL_UPDATE)
StandardToasts.makeStandardToast(this,StandardToasts.FAIL_UPDATE, err)
})
},
updateFood: function (food, field) {
@ -1435,8 +1425,7 @@ export default {
}
})
.catch((err) => {
console.log(err, Object.keys(err))
StandardToasts.makeStandardToast(this,StandardToasts.FAIL_UPDATE)
StandardToasts.makeStandardToast(this,StandardToasts.FAIL_UPDATE, err)
})
},
updateServings(e, plan) {

8
vue/src/components/CookbookEditCard.vue
View File

@ -116,8 +116,8 @@ export default {
.then((result) => {
StandardToasts.makeStandardToast(this,StandardToasts.SUCCESS_UPDATE)
})
.catch((error) => {
StandardToasts.makeStandardToast(this,StandardToasts.FAIL_UPDATE)
.catch((err) => {
StandardToasts.makeStandardToast(this,StandardToasts.FAIL_UPDATE, err)
})
},
refreshData: function () {
@ -137,8 +137,8 @@ export default {
this.$emit("refresh")
StandardToasts.makeStandardToast(this,StandardToasts.SUCCESS_DELETE)
})
.catch((error) => {
StandardToasts.makeStandardToast(this,StandardToasts.FAIL_DELETE)
.catch((err) => {
StandardToasts.makeStandardToast(this,StandardToasts.FAIL_DELETE, err)
})
}
},

6
vue/src/components/IngredientsCard.vue
View File

@ -184,11 +184,11 @@ export default {
})
.catch((err) => {
if (del_shopping) {
StandardToasts.makeStandardToast(this,StandardToasts.FAIL_DELETE)
StandardToasts.makeStandardToast(this,StandardToasts.FAIL_DELETE, err)
} else if (this.selected_shoppingrecipe) {
StandardToasts.makeStandardToast(this,StandardToasts.FAIL_UPDATE)
StandardToasts.makeStandardToast(this,StandardToasts.FAIL_UPDATE, err)
} else {
StandardToasts.makeStandardToast(this,StandardToasts.FAIL_CREATE)
StandardToasts.makeStandardToast(this,StandardToasts.FAIL_CREATE, err)
}
this.$emit("shopping-failed")
})

4
vue/src/components/Modals/AddRecipeToBook.vue
View File

@ -98,8 +98,8 @@ export default {
apiFactory.createRecipeBookEntry({book: this.selected_book.id, recipe: this.recipe.id}).then(r => {
this.recipe_book_list.push(r.data)
StandardToasts.makeStandardToast(this,StandardToasts.SUCCESS_CREATE)
}).catch(e => {
StandardToasts.makeStandardToast(this,StandardToasts.FAIL_UPDATE)
}).catch(err => {
StandardToasts.makeStandardToast(this,StandardToasts.FAIL_UPDATE, err)
})
},
removeFromBook: function (book_entry) {

14
vue/src/components/Modals/GenericModalForm.vue
View File

@ -177,9 +177,9 @@ export default {
})
.catch((err) => {
if (err.response.status === 403){
StandardToasts.makeStandardToast(this,StandardToasts.FAIL_DELETE_PROTECTED)
StandardToasts.makeStandardToast(this,StandardToasts.FAIL_DELETE_PROTECTED, err)
}else {
StandardToasts.makeStandardToast(this,StandardToasts.FAIL_DELETE)
StandardToasts.makeStandardToast(this,StandardToasts.FAIL_DELETE, err)
}
this.$emit("finish-action", "cancel")
})
@ -204,8 +204,7 @@ export default {
StandardToasts.makeStandardToast(this,StandardToasts.SUCCESS_UPDATE)
})
.catch((err) => {
console.log(err, err.response)
StandardToasts.makeStandardToast(this,StandardToasts.FAIL_UPDATE)
StandardToasts.makeStandardToast(this,StandardToasts.FAIL_UPDATE, err)
this.$emit("finish-action", "cancel")
})
}
@ -227,8 +226,7 @@ export default {
StandardToasts.makeStandardToast(this,StandardToasts.SUCCESS_MOVE)
})
.catch((err) => {
console.log(err)
StandardToasts.makeStandardToast(this,StandardToasts.FAIL_MOVE)
StandardToasts.makeStandardToast(this,StandardToasts.FAIL_MOVE, err)
this.$emit("finish-action", "cancel")
})
},
@ -252,9 +250,7 @@ export default {
StandardToasts.makeStandardToast(this,StandardToasts.SUCCESS_MERGE)
})
.catch((err) => {
//TODO error checking not working with OpenAPI methods
console.log("Error", err)
StandardToasts.makeStandardToast(this,StandardToasts.FAIL_MERGE)
StandardToasts.makeStandardToast(this,StandardToasts.FAIL_MERGE, err)
this.$emit("finish-action", "cancel")
})

2
vue/src/components/Modals/ShoppingModal.vue
View File

@ -188,7 +188,7 @@ export default {
this.$emit("finish")
})
.catch((err) => {
StandardToasts.makeStandardToast(this,StandardToasts.FAIL_CREATE)
StandardToasts.makeStandardToast(this,StandardToasts.FAIL_CREATE, err)
})
this.$bvModal.hide(`shopping_${this.modal_id}`)

8
vue/src/components/RecipeContextMenu.vue
View File

@ -164,8 +164,8 @@ export default {
}
StandardToasts.makeStandardToast(this,StandardToasts.SUCCESS_CREATE)
})
.catch((error) => {
StandardToasts.makeStandardToast(this,StandardToasts.FAIL_CREATE)
.catch((err) => {
StandardToasts.makeStandardToast(this,StandardToasts.FAIL_CREATE, err)
})
},
createMealPlan(data) {
@ -231,8 +231,8 @@ export default {
StandardToasts.makeStandardToast(this,StandardToasts.SUCCESS_CREATE)
window.open(this.resolveDjangoUrl("view_recipe", new_recipe.data.id))
})
.catch((error) => {
StandardToasts.makeStandardToast(this,StandardToasts.FAIL_CREATE)
.catch((err) => {
StandardToasts.makeStandardToast(this,StandardToasts.FAIL_CREATE, err)
})
})
},