diff --git a/bun.lock b/bun.lock index 9f5c131..7d3837b 100644 --- a/bun.lock +++ b/bun.lock @@ -15,7 +15,7 @@ "@tailwindcss/vite": "^4.0.6", "@types/alpinejs": "^3.13.11", "alpinejs": "^3.14.8", - "astro": "^5.2.5", + "astro": "^5.2.6", "astro-icon": "^1.1.5", "rehype-external-links": "^3.0.0", "tailwindcss": "^4.0.6", diff --git a/src/components/Education.astro b/src/components/Education.astro deleted file mode 100644 index 7e70807..0000000 --- a/src/components/Education.astro +++ /dev/null @@ -1,30 +0,0 @@ ---- -import { getCollection } from "astro:content"; -import { dateRange } from "@lib/utils"; -import Accordion from "@components/Accordion.astro"; - -const collection = (await getCollection("education")).sort( - (a, b) => - new Date(b.data.dateStart).valueOf() - new Date(a.data.dateStart).valueOf(), -); - -const education = await Promise.all( - collection.map(async (item) => { - const { Content } = await item.render(); - return { ...item, Content }; - }), -); ---- - -
- { - education.map((entry) => ( - - )) - } -
diff --git a/src/components/Skills.astro b/src/components/Skills.astro deleted file mode 100644 index 6f3ed87..0000000 --- a/src/components/Skills.astro +++ /dev/null @@ -1,27 +0,0 @@ ---- -import { getCollection } from "astro:content"; -import { Icon } from "astro-icon/components"; - -const collection = await getCollection("skills"); - -const skills = await Promise.all( - collection.map(async (item) => { - const { Content } = await item.render(); - return { ...item, Content }; - }), -); ---- - - diff --git a/src/components/Work.astro b/src/components/Work.astro deleted file mode 100644 index 306f2c2..0000000 --- a/src/components/Work.astro +++ /dev/null @@ -1,41 +0,0 @@ ---- -import { getCollection } from "astro:content"; -import { dateRange } from "@lib/utils"; -import Button from "./Button.astro"; - -const collection = (await getCollection("work")).sort( - (a, b) => - new Date(b.data.dateStart).valueOf() - new Date(a.data.dateStart).valueOf(), -); - -const work = await Promise.all( - collection.map(async (item) => { - const { Content } = await item.render(); - return { ...item, Content }; - }), -); ---- - - diff --git a/src/content/config.ts b/src/content/config.ts index 25ef88d..d721db0 100644 --- a/src/content/config.ts +++ b/src/content/config.ts @@ -46,36 +46,4 @@ const projects = defineCollection({ .merge(rssSchema), }); -const work = defineCollection({ - type: "content", - schema: z.object({ - company: z.string(), - role: z.string(), - dateStart: z.coerce.date(), - dateEnd: z.union([z.coerce.date(), z.string()]), - article: z.string().optional(), - }), -}); - -const education = defineCollection({ - type: "content", - schema: z.object({ - institution: z.string(), - qualification: z.string(), - grades: z.array(z.string()), - dateStart: z.coerce.date(), - dateEnd: z.union([z.coerce.date(), z.string()]), - isOpen: z.boolean().optional(), - }), -}); - -const skills = defineCollection({ - type: "content", - schema: z.object({ - type: z.string(), - title: z.string(), - icon: z.string(), - }), -}); - -export const collections = { posts, projects, work, education, skills }; +export const collections = { posts, projects }; diff --git a/src/pages/cv.astro b/src/pages/cv.astro index e0f0d02..97ad770 100644 --- a/src/pages/cv.astro +++ b/src/pages/cv.astro @@ -13,250 +13,254 @@ import icon from "public/assets/icon.png";
-
-