diff --git a/astro.config.mjs b/astro.config.mjs index 6bc8c0f9..27c72312 100644 --- a/astro.config.mjs +++ b/astro.config.mjs @@ -22,14 +22,14 @@ export default defineConfig({ icon({ // TODO: Streamline to only include needed include: { - tabler: ['*'], - 'simple-line-icons': ['*'], - fa: ['*'], - carbon: ['*'], - fluent: ['*'], - ri: ['*'], - ph: ['*'], - 'simple-icons': ['*'] + tabler: ['brand-youtube', 'brand-medium', 'brand-patreon', 'brand-github', 'brand-linkedin', 'mail', 'brand-bluesky', 'brand-tiktok', 'brand-twitter', 'brand-threads', 'brand-mastodon','menu','chevron-down','rss','brand-discord','download','brand-facebook'], + 'simple-line-icons': ['social-spotify'], + fa: ['podcast'], + carbon: ['calendar-heat-map'], + fluent: ['people-audience-20-filled'], + ri: ['money-euro-circle-fill'], + ph: ['pencil-circle-bold'], + 'simple-icons': ['applepodcasts', 'amazonmusic','pocketcasts'] } }), tailwind({ diff --git a/src/content/config.ts b/content.config.ts similarity index 75% rename from src/content/config.ts rename to content.config.ts index ccea252e..f1bcd4bf 100644 --- a/src/content/config.ts +++ b/content.config.ts @@ -1,12 +1,14 @@ import { z, defineCollection } from 'astro:content'; +import { glob } from 'astro/loaders'; +import defaultBlogImage from '~/src/assets/images/defaults/blog-chinchilla.jpg' const posts = defineCollection({ - type: 'content', // v2.5.0 and later + // type: 'content', // v2.5.0 and later + loader: glob({ pattern: '**/[^_]*.md', base: "./src/content/posts" }), schema: ({ image }) => z.object({ title: z.string(), // description: z.string().optional(), - // TODO: Rollout - image: image().optional().default('../../../assets/images/defaults/blog-chinchilla.jpg'), + image: image().optional().default(defaultBlogImage), publication_url: z.string().url().optional(), // canonical: z.string().url().optional(), @@ -22,7 +24,8 @@ const posts = defineCollection({ }); const games = defineCollection({ - type: 'content', // v2.5.0 and later + // type: 'content', // v2.5.0 and later + loader: glob({ pattern: '**/[^_]*.md', base: "./src/content/games" }), schema: ({ image }) => z.object({ title: z.string(), image: z.union([z.string().url(), image()]), @@ -34,7 +37,8 @@ const games = defineCollection({ }); const events = defineCollection({ - type: 'content', // v2.5.0 and later + // type: 'content', // v2.5.0 and later + loader: glob({ pattern: '**/[^_]*.md', base: "./src/content/events" }), schema: ({ image }) => z.object({ title: z.string().optional(), action: z.string().optional(), @@ -48,7 +52,8 @@ const events = defineCollection({ }); const clients = defineCollection({ - type: 'content', // v2.5.0 and later + // type: 'content', // v2.5.0 and later + loader: glob({ pattern: '**/[^_]*.md', base: "./src/content/clients" }), schema: ({ image }) => z.object({ type: z.string(), title: z.string(), @@ -70,7 +75,8 @@ const clients = defineCollection({ }); const books = defineCollection({ - type: 'content', // v2.5.0 and later + // type: 'content', // v2.5.0 and later + loader: glob({ pattern: '**/[^_]*.md', base: "./src/content/books" }), schema: ({ image }) => z.object({ title: z.string(), // description: z.string(), @@ -84,7 +90,8 @@ const books = defineCollection({ }); const av = defineCollection({ - type: 'content', // v2.5.0 and later + // type: 'content', // v2.5.0 and later + loader: glob({ pattern: '**/[^_]*.md', base: "./src/content/av" }), schema: ({ image }) => z.object({ title: z.string(), // description: z.string(), @@ -97,7 +104,8 @@ const av = defineCollection({ }); const podcasts = defineCollection({ - type: 'content', // v2.5.0 and later + // type: 'content', // v2.5.0 and later + loader: glob({ pattern: '**/[^_]*.md', base: "./src/content/podcasts" }), schema: z.object({ title: z.string().optional( ), description: z.string().optional(), diff --git a/package.json b/package.json index 32101aac..2efe7129 100644 --- a/package.json +++ b/package.json @@ -28,10 +28,10 @@ }, "devDependencies": { "@astro-community/astro-embed-youtube": "^0.5.6", + "@astrojs/markdown-component": "1.0.5", "@astrojs/mdx": "^4.0.1", "@astrojs/partytown": "^2.1.2", "@astrojs/rss": "^4.0.10", - "@astrojs/markdown-component": "1.0.5", "@astrojs/sitemap": "^3.2.1", "@astrojs/tailwind": "^5.1.3", "@astrolib/analytics": "^0.6.1", @@ -41,16 +41,16 @@ "@iconify-json/carbon": "^1.2.4", "@iconify-json/fa": "^1.2.0", "@iconify-json/fluent": "^1.2.8", - "@iconify-json/simple-line-icons": "^1.2.0", "@iconify-json/ph": "^1.2.1", "@iconify-json/ri": "^1.2.3", "@iconify-json/simple-icons": "^1.2.14", + "@iconify-json/simple-line-icons": "^1.2.0", "@iconify-json/tabler": "^1.2.10", "@tailwindcss/typography": "^0.5.15", - "@typescript-eslint/eslint-plugin": "^8.14.0", - "@typescript-eslint/parser": "^8.14.0", + "@typescript-eslint/eslint-plugin": "^8.17.0", + "@typescript-eslint/parser": "^8.17.0", "accessible-astro-components": "^2.4.0", - "astro": "^4.16.13", + "astro": "^5.0.3", "astro-icon": "^1.1.4", "eslint": "^9.16.0", "eslint-plugin-astro": "^1.3.1", @@ -60,8 +60,8 @@ "prettier-plugin-astro": "^0.14.1", "reading-time": "^1.5.0", "svgo": "^3.3.2", - "tailwindcss": "^3.4.15", + "tailwindcss": "^3.4.16", "truncate-html": "^1.1.2", - "typescript": "^5.6.3" + "typescript": "^5.7.2" } } diff --git a/src/components/Book.astro b/src/components/Book.astro index 31696d27..d02bf4ee 100644 --- a/src/components/Book.astro +++ b/src/components/Book.astro @@ -64,17 +64,6 @@ var idOfTitle = slugify(book.data.title);