diff --git a/frontend/components/Layout/DefaultLayout.vue b/frontend/components/Layout/DefaultLayout.vue index 883afeb05..0a5052e66 100644 --- a/frontend/components/Layout/DefaultLayout.vue +++ b/frontend/components/Layout/DefaultLayout.vue @@ -135,12 +135,7 @@ export default defineNuxtComponent({ const isAdmin = computed(() => $auth.user.value?.admin); const route = useRoute(); const groupSlug = computed(() => route.params.groupSlug as string || $auth.user.value?.groupSlug || ""); - - const loggedInCookbooks = useCookbooks(); - const publicCookbooks = usePublicCookbooks(groupSlug.value || ""); - const cookbooks = computed(() => - isOwnGroup.value ? loggedInCookbooks.cookbooks.value : publicCookbooks.cookbooks.value, - ); + const { cookbooks } = isOwnGroup.value ? useCookbooks() : usePublicCookbooks(groupSlug.value || ""); const cookbookPreferences = useCookbookPreferences(); const { store: households } = isOwnGroup.value ? useHouseholdStore() : usePublicHouseholdStore(groupSlug.value || ""); diff --git a/frontend/nuxt.config.ts b/frontend/nuxt.config.ts index 3e865bbe5..b53194333 100644 --- a/frontend/nuxt.config.ts +++ b/frontend/nuxt.config.ts @@ -67,7 +67,7 @@ export default defineNuxtConfig({ 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: { sessionPassword: process.env.SESSION_PASSWORD || "password-with-at-least-32-characters", @@ -172,7 +172,7 @@ export default defineNuxtConfig({ googleFonts: { fontsPath: "/assets/fonts", - download: true, + download: false, // Disable automatic downloading families: { Roboto: [100, 300, 400, 500, 700, 900], }, diff --git a/frontend/pages/admin/site-settings.vue b/frontend/pages/admin/site-settings.vue index 67505e42a..1881e975b 100644 --- a/frontend/pages/admin/site-settings.vue +++ b/frontend/pages/admin/site-settings.vue @@ -251,6 +251,12 @@ export default defineNuxtComponent({ 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 i18n = useI18n(); diff --git a/frontend/pages/shopping-lists/[id].vue b/frontend/pages/shopping-lists/[id].vue index e2ba88379..e03d14d03 100644 --- a/frontend/pages/shopping-lists/[id].vue +++ b/frontend/pages/shopping-lists/[id].vue @@ -41,7 +41,9 @@