github/mealie
1
0
Fork 0
mirror of https://github.com/hay-kot/mealie.git synced 2025-08-22 22:43:34 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 15

Merge branch 'mealie-next' into fix/fix-openai-prompt

Browse source
This commit is contained in:
Kuchenpirat 2025-06-20 18:19:24 +02:00 • committed by GitHub
commit afd678a87a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 16 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

8
frontend/components/Layout/DefaultLayout.vue
View file

@ -1,5 +1,6 @@
<template> <template>
<v-app dark> <v-app dark>
<NuxtPwaManifest />
<TheSnackbar /> <TheSnackbar />
<AppHeader> <AppHeader>
@ -135,12 +136,7 @@ export default defineNuxtComponent({
const isAdmin = computed(() => $auth.user.value?.admin); const isAdmin = computed(() => $auth.user.value?.admin);
const route = useRoute(); const route = useRoute();
const groupSlug = computed(() => route.params.groupSlug as string || $auth.user.value?.groupSlug || ""); const groupSlug = computed(() => route.params.groupSlug as string || $auth.user.value?.groupSlug || "");
const { cookbooks } = isOwnGroup.value ? useCookbooks() : usePublicCookbooks(groupSlug.value || "");
const loggedInCookbooks = useCookbooks();
const publicCookbooks = usePublicCookbooks(groupSlug.value || "");
const cookbooks = computed(() =>
isOwnGroup.value ? loggedInCookbooks.cookbooks.value : publicCookbooks.cookbooks.value,
);
const cookbookPreferences = useCookbookPreferences(); const cookbookPreferences = useCookbookPreferences();
const { store: households } = isOwnGroup.value ? useHouseholdStore() : usePublicHouseholdStore(groupSlug.value || ""); const { store: households } = isOwnGroup.value ? useHouseholdStore() : usePublicHouseholdStore(groupSlug.value || "");

1
frontend/layouts/basic.vue
View file

@ -1,5 +1,6 @@
<template> <template>
<v-app dark> <v-app dark>
<NuxtPwaManifest />
<TheSnackbar /> <TheSnackbar />
<AppHeader :menu="false" /> <AppHeader :menu="false" />

1
frontend/layouts/blank.vue
View file

@ -1,5 +1,6 @@
<template> <template>
<v-app dark> <v-app dark>
<NuxtPwaManifest />
<TheSnackbar /> <TheSnackbar />
<v-banner <v-banner

4
frontend/nuxt.config.ts
View file

@ -67,7 +67,7 @@ export default defineNuxtConfig({
viewTransition: true, viewTransition: true,
}, },
css: ["~/assets/css/main.css", "~/assets/style-overrides.scss"], css: ["~/assets/css/main.css", "~/assets/css/fonts.css", "~/assets/style-overrides.scss"],
runtimeConfig: { runtimeConfig: {
sessionPassword: process.env.SESSION_PASSWORD || "password-with-at-least-32-characters", sessionPassword: process.env.SESSION_PASSWORD || "password-with-at-least-32-characters",
@ -172,7 +172,7 @@ export default defineNuxtConfig({
googleFonts: { googleFonts: {
fontsPath: "/assets/fonts", fontsPath: "/assets/fonts",
download: true, download: false, // Disable automatic downloading
families: { families: {
Roboto: [100, 300, 400, 500, 700, 900], Roboto: [100, 300, 400, 500, 700, 900],
}, },

6
frontend/pages/admin/site-settings.vue
View file

@ -251,6 +251,12 @@ export default defineNuxtComponent({
layout: "admin", layout: "admin",
}); });
// For some reason the layout is not set automatically, so we set it here,
// even though it's defined above in the page meta.
onMounted(() => {
setPageLayout("admin");
});
const { $globals } = useNuxtApp(); const { $globals } = useNuxtApp();
const i18n = useI18n(); const i18n = useI18n();

6
frontend/pages/shopping-lists/[id].vue
View file

@ -41,7 +41,6 @@
<v-container> <v-container>
<v-row> <v-row>
<v-col <v-col
cols="3"
class="text-left" class="text-left"
> >
<ButtonLink <ButtonLink
@ -51,8 +50,9 @@
/> />
</v-col> </v-col>
<v-col <v-col
v-if="mdAndUp"
cols="6" cols="6"
class="d-none d-lg-flex justify-center" class="d-none d-sm-flex justify-center"
> >
<v-img <v-img
max-height="100" max-height="100"
@ -434,6 +434,7 @@ export default defineNuxtComponent({
}, },
// middleware: "sidebase-auth", // middleware: "sidebase-auth",
setup() { setup() {
const { mdAndUp } = useDisplay();
const i18n = useI18n(); const i18n = useI18n();
const $auth = useMealieAuth(); const $auth = useMealieAuth();
const preferences = useShoppingListPreferences(); const preferences = useShoppingListPreferences();
@ -1251,6 +1252,7 @@ export default defineNuxtComponent({
allFoods, allFoods,
getTextColor, getTextColor,
isOffline, isOffline,
mdAndUp,
}; };
}, },
}); });