Mirrors/mealie
1
0
Fork 0
mirror of https://github.com/mealie-recipes/mealie.git synced 2025-10-31 10:13:32 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix: Various Nuxt Upgrade Issues (#5545)

Browse Source
This commit is contained in:
Michael Genson
2025-06-20 04:42:12 -05:00
committed by GitHub
parent c24d532608
commit 2673834a9f
4 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
frontend/components/Layout/DefaultLayout.vue
View File

@@ -135,12 +135,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 || "");

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();

10
frontend/pages/shopping-lists/[id].vue
View File

@@ -41,7 +41,9 @@
<v-container> <v-container>
<v-row> <v-row>
<v-col <v-col
cols="3" cols="12"
sm="4"
md="3"
class="text-left" class="text-left"
> >
<ButtonLink <ButtonLink
@@ -51,8 +53,10 @@
/> />
</v-col> </v-col>
<v-col <v-col
cols="6" cols="12"
class="d-none d-lg-flex justify-center" sm="4"
md="6"
class="d-none d-sm-flex justify-center"
> >
<v-img <v-img
max-height="100" max-height="100"