diff --git a/.gitignore b/.gitignore index 16d54bb..371b357 100644 --- a/.gitignore +++ b/.gitignore @@ -14,8 +14,7 @@ pnpm-debug.log* # environment variables -.env -.env.production +.env.keys # macOS-specific files .DS_Store diff --git a/src/components/section/CarouselSection.astro b/src/components/section/CarouselSection.astro index 1c3c786..7b9471b 100644 --- a/src/components/section/CarouselSection.astro +++ b/src/components/section/CarouselSection.astro @@ -1,5 +1,5 @@ --- -import { Image } from "astro:assets" +import { Image } from "astro:assets"; import "swiper/css"; import "swiper/css/navigation"; import "swiper/css/pagination"; @@ -20,7 +20,11 @@ const { images, class: className } = Astro.props; {image.text} )} - {image.text} + {image.text} )) @@ -43,26 +47,35 @@ const { images, class: className } = Astro.props; diff --git a/src/components/section/FooterSection.astro b/src/components/section/FooterSection.astro index 89a76bd..495a252 100644 --- a/src/components/section/FooterSection.astro +++ b/src/components/section/FooterSection.astro @@ -1,7 +1,7 @@ --- import { Icon } from "astro-icon/components"; import { Image } from "astro:assets"; -import jbp from "../../assets/DRJBP-1.webp"; +import jbp from "@assets/DRJBP-1.webp"; import { createTranslator, t } from '../../i18n'; const tl = createTranslator(Astro.currentLocale); diff --git a/src/content.config.js b/src/content.config.js index ce0327e..77f8ee1 100644 --- a/src/content.config.js +++ b/src/content.config.js @@ -4,18 +4,19 @@ import { z } from 'astro/zod'; const news = defineCollection({ loader: glob({ pattern: "**/*.md", base: "./src/content/news" }), - schema: z.object({ - locale: z.string(), + schema: ({ image }) => z.object({ + locale: z.string().describe("News main language"), title: z.string(), date: z.date(), + draft: z.boolean().optional(), place: z.string().optional(), city: z.string().optional(), state: z.string().optional(), country: z.string().optional(), - thumbnail: z.string().optional(), + thumbnail: image().optional().describe("Main news thumbnail image"), youtube: z.string().optional(), gallery: z.array(z.object({ - image: z.string().optional(), + image: image().optional(), text: z.string().optional() })).optional().nullable() }), diff --git a/tsconfig.json b/tsconfig.json index 8bf91d3..22f9e08 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,5 +1,14 @@ { "extends": "astro/tsconfigs/strict", "include": [".astro/types.d.ts", "**/*"], - "exclude": ["dist"] + "exclude": ["dist"], + "compilerOptions": { + "baseUrl": ".", + "paths": { + "@/*": ["src/*"], + "@assets/*": ["src/assets/*"], + "@components/*": ["src/components/*"], + "@layouts/*": ["src/layouts/*"] + } + } }