simple-content-site 1.0.4 → 1.0.6

package/app/composables/useSiteFooter.ts

@@ -1,16 +1,16 @@
 import type { Collections, FooterCollectionItem } from '@nuxt/content'
+import { useSiteI18n } from './useSiteI18n'
 
 export const useSiteFooter = () => {
-  const { locale, isEnabled } = useSiteI18n()
-  const defaultLocale = useRuntimeConfig().public.i18n.defaultLocale!
+  const { locale, isEnabled, defaultLocale } = useSiteI18n()
   const collectionName = computed(() => isEnabled.value ? `footer_${locale.value}` : 'footer')
 
   return useAsyncData(collectionName, async () => {
     const customFooter = await queryCollection(collectionName.value as keyof Collections).first()
     if (!customFooter) {
       // attempt to find for the default language
-      if (isEnabled.value) {
-        const fallbackFooter = await queryCollection(`footer_${defaultLocale}` as keyof Collections).first()
+      if (isEnabled.value && defaultLocale.value) {
+        const fallbackFooter = await queryCollection(`footer_${defaultLocale.value}` as keyof Collections).first()
         if (fallbackFooter) {
           return fallbackFooter as FooterCollectionItem
         }

package/app/composables/useSiteHeader.ts

@@ -1,16 +1,16 @@
 import type { Collections, HeaderCollectionItem } from '@nuxt/content'
+import { useSiteI18n } from './useSiteI18n'
 
 export const useSiteHeader = () => {
   const config = useAppConfig()
-  const { locale, isEnabled } = useSiteI18n()
-  const defaultLocale = useRuntimeConfig().public.i18n.defaultLocale!
+  const { locale, isEnabled, defaultLocale } = useSiteI18n()
   const collectionName = computed(() => isEnabled.value ? `header_${locale.value}` : 'header')
 
   return useAsyncData(collectionName, async () => {
     const customHeader = await queryCollection(collectionName.value as keyof Collections).first()
     if (!customHeader) {
-      if (isEnabled.value) {
-        const fallbackHeader = await queryCollection(`header_${defaultLocale}` as keyof Collections).first()
+      if (isEnabled.value && defaultLocale.value) {
+        const fallbackHeader = await queryCollection(`header_${defaultLocale.value}` as keyof Collections).first()
         if (fallbackHeader) {
           return fallbackHeader as HeaderCollectionItem
         }

package/app/composables/useSiteI18n.ts

@@ -3,12 +3,13 @@ import en from '../../i18n/locales/en.json'
 
 export const useSiteI18n = () => {
   const config = useRuntimeConfig().public
-  const isEnabled = ref(!!config.i18n)
+  const isEnabled = ref(!!config.i18n && config.i18n.locales?.length > 0)
 
   if (!isEnabled.value) {
     return {
       isEnabled,
       locale: ref('en'),
+      defaultLocale: ref('en'),
       locales: [],
       localePath: (path: string) => path,
       switchLocalePath: () => {},
@@ -25,6 +26,7 @@ export const useSiteI18n = () => {
   return {
     isEnabled,
     locale,
+    defaultLocale: ref(config.i18n.defaultLocale || 'en'),
     locales: filteredLocales,
     t,
     localePath: useLocalePath(),

package/app/pages/[[lang]]/[...slug].vue

@@ -9,10 +9,18 @@ definePageMeta({
 })
 
 const route = useRoute()
-const { locale, isEnabled } = useSiteI18n()
+const { locale, isEnabled, defaultLocale } = useSiteI18n()
 const navigation = inject<Ref<ContentNavigationItem[]>>('navigation')
 
-const collectionName = computed(() => isEnabled.value ? `pages_${locale.value}` : 'pages')
+const collectionName = computed(() => {
+  console.log('isEnabled', isEnabled.value)
+  console.log('defaultLocale', defaultLocale.value)
+  console.log('locale', locale.value)
+  if (!isEnabled.value || !defaultLocale.value) {
+    return 'pages'
+  }
+  return `pages_${locale.value}`
+})
 
 const [{ data: page }] = await Promise.all([
   useAsyncData(kebabCase(route.path), () => queryCollection(collectionName.value as keyof Collections).path(route.path).first() as Promise<PagesCollectionItem>),

package/app/plugins/i18n.ts

@@ -2,7 +2,8 @@ export default defineNuxtPlugin(() => {
   const nuxtApp = useNuxtApp()
 
   const i18nConfig = nuxtApp.$config.public.i18n
-  if (!i18nConfig) {
+  console.log({ i18nConfig })
+  if (!i18nConfig || i18nConfig.locales.length === 0) {
     return
   }
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "simple-content-site",
   "description": "Nuxt layer for simple website with basic functions.",
-  "version": "1.0.4",
+  "version": "1.0.6",
   "type": "module",
   "main": "./nuxt.config.ts",
   "repository": {