Merge branch 'mealie-next' into patch-1

This commit is contained in:
Joschka Rick 2025-01-16 08:55:24 +01:00 committed by GitHub
commit 1d0bfe75f8
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 12 additions and 8 deletions

View file

@ -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')"

View file

@ -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);
}

View file

@ -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",

8
poetry.lock generated
View file

@ -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"

View file

@ -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"