Docker/mealie
Docker/mealie
1
0
Fork 0
mirror of https://github.com/mealie-recipes/mealie.git synced 2025-08-02 20:15:24 +02:00
Code Issues Releases Activity

feat: Add Households to Mealie (#3970)

Browse source
This commit is contained in:
Michael Genson 2024-08-22 10:14:32 -05:00 • committed by GitHub
parent 0c29cef17d
commit eb170cc7e5
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
315 changed files with 6975 additions and 3577 deletions
Download patch file Download diff file Expand all files Collapse all files

6
frontend/layouts/admin.vue
View file

@ -64,6 +64,12 @@ export default defineComponent({
title: i18n.tc("user.users"),
restricted: true,
},
{
icon: $globals.icons.household,
to: "/admin/manage/households",
title: i18n.tc("household.households"),
restricted: true,
},
{
icon: $globals.icons.group,
to: "/admin/manage/groups",

18
frontend/layouts/error.vue
View file

@ -1,5 +1,5 @@
<template>
<v-app dark>
<v-app v-if="ready" dark>
<v-card-title>
<slot>
<h1 class="mx-auto">{{ $t("page.404-page-not-found") }}</h1>
@ -75,9 +75,21 @@ export default defineComponent({
}
}
async function handle404() {
const normalizedRoute = route.value.fullPath.replace(/\/$/, "");
const newRoute = normalizedRoute.replace(/^\/group\/(mealplan|members|notifiers|webhooks)(\/.*)?$/, "/household/$1$2");
if (newRoute !== normalizedRoute) {
await router.replace(newRoute);
} else {
await insertGroupSlugIntoRoute();
}
ready.value = true;
}
if (props.error.statusCode === 404) {
// see if adding the groupSlug fixes the error
insertGroupSlugIntoRoute().then(() => { ready.value = true });
handle404();
} else {
ready.value = true;
}