updated standard toast function

2026-01-02 12:49:02 -05:00 · 2022-04-23 01:31:15 +02:00
parent 3850287deb
commit e4223787be
20 changed files with 204 additions and 149 deletions
--- a/vue/src/components/AddRecipeToBook.vue
+++ b/vue/src/components/AddRecipeToBook.vue
@@ -87,21 +87,21 @@ export default {
            apiFactory.createRecipeBook({ name: name }).then((r) => {
                this.books.push(r.data)
                this.selected_book = r.data
-                StandardToasts.makeStandardToast(StandardToasts.SUCCESS_CREATE)
+                StandardToasts.makeStandardToast(this,StandardToasts.SUCCESS_CREATE)
            })
        },
        addToBook: function () {
            let apiFactory = new ApiApiFactory()
            apiFactory.createRecipeBookEntry({ book: this.selected_book.id, recipe: this.recipe.id }).then((r) => {
                this.recipe_book_list.push(r.data)
-                StandardToasts.makeStandardToast(StandardToasts.SUCCESS_CREATE)
+                StandardToasts.makeStandardToast(this,StandardToasts.SUCCESS_CREATE)
            })
        },
        removeFromBook: function (book_entry) {
            let apiFactory = new ApiApiFactory()
            apiFactory.destroyRecipeBookEntry(book_entry.id).then((r) => {
                this.recipe_book_list = this.recipe_book_list.filter((e) => e.id !== book_entry.id)
-                StandardToasts.makeStandardToast(StandardToasts.SUCCESS_DELETE)
+                StandardToasts.makeStandardToast(this,StandardToasts.SUCCESS_DELETE)
            })
        },
        loadBookEntries: function () {
--- a/vue/src/components/Badges/Shopping.vue
+++ b/vue/src/components/Badges/Shopping.vue
@@ -66,7 +66,7 @@ export default {
            }
            this.genericAPI(this.Models.FOOD, this.Actions.SHOPPING, params).then((result) => {
                this.shopping = true
-                StandardToasts.makeStandardToast(StandardToasts.SUCCESS_CREATE)
+                StandardToasts.makeStandardToast(this,StandardToasts.SUCCESS_CREATE)
            })
        },
        cancelDelete() {
@@ -80,7 +80,7 @@ export default {
            this.genericAPI(this.Models.FOOD, this.Actions.SHOPPING, params).then(() => {
                this.shopping = false
                this.$refs["shopping" + this.item.id].$emit("close")
-                StandardToasts.makeStandardToast(StandardToasts.SUCCESS_DELETE)
+                StandardToasts.makeStandardToast(this,StandardToasts.SUCCESS_DELETE)
            })
        },
    },
--- a/vue/src/components/CookbookEditCard.vue
+++ b/vue/src/components/CookbookEditCard.vue
@@ -114,10 +114,10 @@ export default {
            apiClient
                .updateRecipeBook(this.book_copy.id, this.book_copy)
                .then((result) => {
-                    StandardToasts.makeStandardToast(StandardToasts.SUCCESS_UPDATE)
+                    StandardToasts.makeStandardToast(this,StandardToasts.SUCCESS_UPDATE)
                })
                .catch((error) => {
-                    StandardToasts.makeStandardToast(StandardToasts.FAIL_UPDATE)
+                    StandardToasts.makeStandardToast(this,StandardToasts.FAIL_UPDATE)
                })
        },
        refreshData: function () {
@@ -135,10 +135,10 @@ export default {
                    .destroyRecipeBook(this.book.id)
                    .then((result) => {
                        this.$emit("refresh")
-                        StandardToasts.makeStandardToast(StandardToasts.SUCCESS_DELETE)
+                        StandardToasts.makeStandardToast(this,StandardToasts.SUCCESS_DELETE)
                    })
                    .catch((error) => {
-                        StandardToasts.makeStandardToast(StandardToasts.FAIL_DELETE)
+                        StandardToasts.makeStandardToast(this,StandardToasts.FAIL_DELETE)
                    })
            }
        },
--- a/vue/src/components/GenericMultiselect.vue
+++ b/vue/src/components/GenericMultiselect.vue
@@ -187,7 +187,7 @@ export default {
            console.log('CREATEING NEW with -> ' , e)
            this.genericAPI(this.model, this.Actions.CREATE, {name: e}).then(result => {
                let createdObj = result.data?.results ?? result.data
-                StandardToasts.makeStandardToast(StandardToasts.SUCCESS_CREATE)
+                StandardToasts.makeStandardToast(this,StandardToasts.SUCCESS_CREATE)
                if (this.multiple) {
                    this.selected_objects.push(createdObj)
                } else {
@@ -196,7 +196,7 @@ export default {
                this.objects.push(createdObj)
                this.selectionChanged()
            }).catch((r, err) => {
-                StandardToasts.makeStandardToast(StandardToasts.FAIL_CREATE)
+                StandardToasts.makeStandardToast(this,StandardToasts.FAIL_CREATE)
            })
        },
    },
--- a/vue/src/components/IngredientsCard.vue
+++ b/vue/src/components/IngredientsCard.vue
@@ -175,20 +175,20 @@ export default {
            this.genericAPI(this.Models.RECIPE, this.Actions.SHOPPING, params)
                .then((result) => {
                    if (del_shopping) {
-                        StandardToasts.makeStandardToast(StandardToasts.SUCCESS_DELETE)
+                        StandardToasts.makeStandardToast(this,StandardToasts.SUCCESS_DELETE)
                    } else if (this.selected_shoppingrecipe) {
-                        StandardToasts.makeStandardToast(StandardToasts.SUCCESS_UPDATE)
+                        StandardToasts.makeStandardToast(this,StandardToasts.SUCCESS_UPDATE)
                    } else {
-                        StandardToasts.makeStandardToast(StandardToasts.SUCCESS_CREATE)
+                        StandardToasts.makeStandardToast(this,StandardToasts.SUCCESS_CREATE)
                    }
                })
                .catch((err) => {
                    if (del_shopping) {
-                        StandardToasts.makeStandardToast(StandardToasts.FAIL_DELETE)
+                        StandardToasts.makeStandardToast(this,StandardToasts.FAIL_DELETE)
                    } else if (this.selected_shoppingrecipe) {
-                        StandardToasts.makeStandardToast(StandardToasts.FAIL_UPDATE)
+                        StandardToasts.makeStandardToast(this,StandardToasts.FAIL_UPDATE)
                    } else {
-                        StandardToasts.makeStandardToast(StandardToasts.FAIL_CREATE)
+                        StandardToasts.makeStandardToast(this,StandardToasts.FAIL_CREATE)
                    }
                    this.$emit("shopping-failed")
                })
--- a/vue/src/components/Modals/AddRecipeToBook.vue
+++ b/vue/src/components/Modals/AddRecipeToBook.vue
@@ -90,23 +90,23 @@ export default {
      apiFactory.createRecipeBook({name: name}).then(r => {
        this.books.push(r.data)
        this.selected_book = r.data
-        StandardToasts.makeStandardToast(StandardToasts.SUCCESS_CREATE)
+        StandardToasts.makeStandardToast(this,StandardToasts.SUCCESS_CREATE)
      })
    },
    addToBook: function () {
      let apiFactory = new ApiApiFactory()
      apiFactory.createRecipeBookEntry({book: this.selected_book.id, recipe: this.recipe.id}).then(r => {
        this.recipe_book_list.push(r.data)
-        StandardToasts.makeStandardToast(StandardToasts.SUCCESS_CREATE)
+        StandardToasts.makeStandardToast(this,StandardToasts.SUCCESS_CREATE)
      }).catch(e => {
-          StandardToasts.makeStandardToast(StandardToasts.FAIL_UPDATE)
+          StandardToasts.makeStandardToast(this,StandardToasts.FAIL_UPDATE)
      })
    },
    removeFromBook: function (book_entry) {
      let apiFactory = new ApiApiFactory()
      apiFactory.destroyRecipeBookEntry(book_entry.id).then(r => {
        this.recipe_book_list = this.recipe_book_list.filter(e => e.id !== book_entry.id)
-        StandardToasts.makeStandardToast(StandardToasts.SUCCESS_DELETE)
+        StandardToasts.makeStandardToast(this,StandardToasts.SUCCESS_DELETE)
      })
    },
    loadBookEntries: function () {
--- a/vue/src/components/Modals/GenericModalForm.vue
+++ b/vue/src/components/Modals/GenericModalForm.vue
@@ -173,13 +173,13 @@ export default {
            this.genericAPI(this.model, this.Actions.DELETE, { id: this.item1.id })
                .then((result) => {
                    this.$emit("finish-action")
-                    StandardToasts.makeStandardToast(StandardToasts.SUCCESS_DELETE)
+                    StandardToasts.makeStandardToast(this,StandardToasts.SUCCESS_DELETE)
                })
                .catch((err) => {
                    if (err.response.status === 403){
-                        StandardToasts.makeStandardToast(StandardToasts.FAIL_DELETE_PROTECTED)
+                        StandardToasts.makeStandardToast(this,StandardToasts.FAIL_DELETE_PROTECTED)
                    }else {
-                        StandardToasts.makeStandardToast(StandardToasts.FAIL_DELETE)
+                        StandardToasts.makeStandardToast(this,StandardToasts.FAIL_DELETE)
                    }
                    this.$emit("finish-action", "cancel")
                })
@@ -190,22 +190,22 @@ export default {
                this.genericAPI(this.model, this.Actions.CREATE, this.form_data)
                    .then((result) => {
                        this.$emit("finish-action", { item: result.data })
-                        StandardToasts.makeStandardToast(StandardToasts.SUCCESS_CREATE)
+                        StandardToasts.makeStandardToast(this,StandardToasts.SUCCESS_CREATE)
                    })
                    .catch((err) => {
                        console.log(err)
-                        StandardToasts.makeStandardToast(StandardToasts.FAIL_CREATE)
+                        StandardToasts.makeStandardToast(this,StandardToasts.FAIL_CREATE)
                        this.$emit("finish-action", "cancel")
                    })
            } else {
                this.genericAPI(this.model, this.Actions.UPDATE, this.form_data)
                    .then((result) => {
                        this.$emit("finish-action")
-                        StandardToasts.makeStandardToast(StandardToasts.SUCCESS_UPDATE)
+                        StandardToasts.makeStandardToast(this,StandardToasts.SUCCESS_UPDATE)
                    })
                    .catch((err) => {
                        console.log(err, err.response)
-                        StandardToasts.makeStandardToast(StandardToasts.FAIL_UPDATE)
+                        StandardToasts.makeStandardToast(this,StandardToasts.FAIL_UPDATE)
                        this.$emit("finish-action", "cancel")
                    })
            }
@@ -224,11 +224,11 @@ export default {
            this.genericAPI(this.model, this.Actions.MOVE, { source: this.item1.id, target: this.form_data.target.id })
                .then((result) => {
                    this.$emit("finish-action", { target: this.form_data.target.id })
-                    StandardToasts.makeStandardToast(StandardToasts.SUCCESS_MOVE)
+                    StandardToasts.makeStandardToast(this,StandardToasts.SUCCESS_MOVE)
                })
                .catch((err) => {
                    console.log(err)
-                    StandardToasts.makeStandardToast(StandardToasts.FAIL_MOVE)
+                    StandardToasts.makeStandardToast(this,StandardToasts.FAIL_MOVE)
                    this.$emit("finish-action", "cancel")
                })
        },
@@ -249,12 +249,12 @@ export default {
            })
                .then((result) => {
                    this.$emit("finish-action", { target: this.form_data.target.id })
-                    StandardToasts.makeStandardToast(StandardToasts.SUCCESS_MERGE)
+                    StandardToasts.makeStandardToast(this,StandardToasts.SUCCESS_MERGE)
                })
                .catch((err) => {
                    //TODO error checking not working with OpenAPI methods
                    console.log("Error", err)
-                    StandardToasts.makeStandardToast(StandardToasts.FAIL_MERGE)
+                    StandardToasts.makeStandardToast(this,StandardToasts.FAIL_MERGE)
                    this.$emit("finish-action", "cancel")
                })

--- a/vue/src/components/Modals/ShoppingModal.vue
+++ b/vue/src/components/Modals/ShoppingModal.vue
@@ -184,11 +184,11 @@ export default {
            apiClient
                .shoppingRecipe(this.recipe.id, shopping_recipe)
                .then((result) => {
-                    StandardToasts.makeStandardToast(StandardToasts.SUCCESS_CREATE)
+                    StandardToasts.makeStandardToast(this,StandardToasts.SUCCESS_CREATE)
                    this.$emit("finish")
                })
                .catch((err) => {
-                    StandardToasts.makeStandardToast(StandardToasts.FAIL_CREATE)
+                    StandardToasts.makeStandardToast(this,StandardToasts.FAIL_CREATE)
                })

            this.$bvModal.hide(`shopping_${this.modal_id}`)
--- a/vue/src/components/RecipeContextMenu.vue
+++ b/vue/src/components/RecipeContextMenu.vue
@@ -162,10 +162,10 @@ export default {
                        this.servings_value = result.data.servings
                        this.addToShopping()
                    }
-                    StandardToasts.makeStandardToast(StandardToasts.SUCCESS_CREATE)
+                    StandardToasts.makeStandardToast(this,StandardToasts.SUCCESS_CREATE)
                })
                .catch((error) => {
-                    StandardToasts.makeStandardToast(StandardToasts.FAIL_CREATE)
+                    StandardToasts.makeStandardToast(this,StandardToasts.FAIL_CREATE)
                })
        },
        createMealPlan(data) {
@@ -228,11 +228,11 @@ export default {
                apiClient
                    .createRecipe(recipe)
                    .then((new_recipe) => {
-                        StandardToasts.makeStandardToast(StandardToasts.SUCCESS_CREATE)
+                        StandardToasts.makeStandardToast(this,StandardToasts.SUCCESS_CREATE)
                        window.open(this.resolveDjangoUrl("view_recipe", new_recipe.data.id))
                    })
                    .catch((error) => {
-                        StandardToasts.makeStandardToast(StandardToasts.FAIL_CREATE)
+                        StandardToasts.makeStandardToast(this,StandardToasts.FAIL_CREATE)
                    })
            })
        },