From 6097ff2a3485bdc23d62a992334a8a4e53b96bee Mon Sep 17 00:00:00 2001 From: John Corser Date: Wed, 15 Jan 2025 11:49:21 -0500 Subject: [PATCH 1/3] feat: add delete option to three dots menu (#4842) Co-authored-by: John Corser Co-authored-by: Kuchenpirat <24235032+Kuchenpirat@users.noreply.github.com> --- frontend/components/Domain/Recipe/RecipeActionMenu.vue | 2 +- frontend/components/Domain/Recipe/RecipeContextMenu.vue | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/frontend/components/Domain/Recipe/RecipeActionMenu.vue b/frontend/components/Domain/Recipe/RecipeActionMenu.vue index 6822d830b..6de10c9ee 100644 --- a/frontend/components/Domain/Recipe/RecipeActionMenu.vue +++ b/frontend/components/Domain/Recipe/RecipeActionMenu.vue @@ -47,7 +47,6 @@ :recipe-id="recipe.id" :recipe-scale="recipeScale" :use-items="{ - delete: false, edit: false, download: loggedIn, duplicate: loggedIn, @@ -57,6 +56,7 @@ printPreferences: true, share: loggedIn, recipeActions: true, + delete: loggedIn, }" class="ml-1" @print="$emit('print')" diff --git a/frontend/components/Domain/Recipe/RecipeContextMenu.vue b/frontend/components/Domain/Recipe/RecipeContextMenu.vue index b54189251..a0a47832c 100644 --- a/frontend/components/Domain/Recipe/RecipeContextMenu.vue +++ b/frontend/components/Domain/Recipe/RecipeContextMenu.vue @@ -276,7 +276,7 @@ export default defineComponent({ delete: { title: i18n.tc("general.delete"), icon: $globals.icons.delete, - color: "error", + color: undefined, event: "delete", isPublic: false, }, @@ -383,7 +383,10 @@ export default defineComponent({ } async function deleteRecipe() { - await api.recipes.deleteOne(props.slug); + const { data } = await api.recipes.deleteOne(props.slug); + if (data?.slug) { + router.push(`/g/${groupSlug.value}`); + } context.emit("delete", props.slug); } From 04eeaa5acf84b0d9f8f3109d7899c0d60213e0dc Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 15 Jan 2025 15:10:44 -0600 Subject: [PATCH 2/3] fix(deps): update dependency aniso8601 to v10 (#4874) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- poetry.lock | 8 ++++---- pyproject.toml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/poetry.lock b/poetry.lock index 948590b26..fae47a6bf 100644 --- a/poetry.lock +++ b/poetry.lock @@ -32,13 +32,13 @@ tz = ["backports.zoneinfo"] [[package]] name = "aniso8601" -version = "9.0.1" +version = "10.0.0" description = "A library for parsing ISO 8601 strings." optional = false python-versions = "*" files = [ - {file = "aniso8601-9.0.1-py2.py3-none-any.whl", hash = "sha256:1d2b7ef82963909e93c4f24ce48d4de9e66009a21bf1c1e1c85bdd0812fe412f"}, - {file = "aniso8601-9.0.1.tar.gz", hash = "sha256:72e3117667eedf66951bb2d93f4296a56b94b078a8a95905a052611fb3f1b973"}, + {file = "aniso8601-10.0.0-py2.py3-none-any.whl", hash = "sha256:3c943422efaa0229ebd2b0d7d223effb5e7c89e24d2267ebe76c61a2d8e290cb"}, + {file = "aniso8601-10.0.0.tar.gz", hash = "sha256:ff1d0fc2346688c62c0151547136ac30e322896ed8af316ef7602c47da9426cf"}, ] [package.extras] @@ -3421,4 +3421,4 @@ pgsql = ["psycopg2-binary"] [metadata] lock-version = "2.0" python-versions = "^3.12" -content-hash = "1561f8552de2253187d19299bb098f0ab53b1def90a0fa121a3cba379d5b0da8" +content-hash = "9b9bb87e23f58b14a1d010aeca8093f52df30d794ee5a5028f853dbb8ba883f6" diff --git a/pyproject.toml b/pyproject.toml index 4ac2da76f..7c439ab96 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -15,7 +15,7 @@ PyYAML = "^6.0.1" SQLAlchemy = "^2" aiofiles = "^24.0.0" alembic = "^1.11.3" -aniso8601 = "9.0.1" +aniso8601 = "10.0.0" appdirs = "1.4.4" apprise = "^1.4.5" bcrypt = "^4.0.1" From 07bbda808f939b0c150f120eca1d3c18a9302c21 Mon Sep 17 00:00:00 2001 From: Borriborri Date: Wed, 15 Jan 2025 22:20:29 +0100 Subject: [PATCH 3/3] fix: PWA - Allow CORS and add UseCredentials to nuxt.config.js (#4902) Co-authored-by: Michael Genson <71845777+michael-genson@users.noreply.github.com> --- frontend/nuxt.config.js | 1 + 1 file changed, 1 insertion(+) diff --git a/frontend/nuxt.config.js b/frontend/nuxt.config.js index d513e065e..5ac923a44 100644 --- a/frontend/nuxt.config.js +++ b/frontend/nuxt.config.js @@ -370,6 +370,7 @@ export default { dir: "auto", name: "Mealie", short_name: "Mealie", + crossorigin: "use-credentials", id: "mealie", description: "Mealie is a recipe management and meal planning app", theme_color: process.env.THEME_LIGHT_PRIMARY || "#E58325",