add some education stuff

aleksik · Jun 25, 2024 · fb0f150 · fb0f150
1 parent 6f82785
commit fb0f150
Show file tree

Hide file tree

Showing 3 changed files with 53 additions and 8 deletions.
diff --git a/app/page.tsx b/app/page.tsx
@@ -3,7 +3,7 @@ import { Keywords } from "@/components/keywords";
 import { Section } from "@/components/section";
 
 import data from "../lib/cv-data";
-import { WorkExperience } from "@/components/work-experience";
+import { Experience } from "@/components/experience";
 
 export default function CV() {
   return (
@@ -17,7 +17,15 @@ export default function CV() {
       <Section title="Work experience">
         <div className="flex flex-col">
           {data.workExperience.map((workExperience) => (
-            <WorkExperience key={workExperience.title} {...workExperience} />
+            <Experience key={workExperience.title} {...workExperience} />
+          ))}
+        </div>
+      </Section>
+
+      <Section title="Education">
+        <div className="flex flex-col">
+          {data.education.map((education) => (
+            <Experience tight key={education.title} {...education} />
           ))}
         </div>
       </Section>

diff --git a/components/work-experience.tsx → components/experience.tsx b/components/work-experience.tsx → components/experience.tsx
@@ -1,14 +1,15 @@
 "use client";
 
-import { type WorkExperience } from "@/lib/cv-data";
+import { type Experience } from "@/lib/cv-data";
 import { BulletPoints } from "./bullet-points";
 import { Keywords } from "./keywords";
 import { Project } from "./project";
 import { useState } from "react";
+import { cn } from "@/lib/utils";
 
-type WorkExperienceProps = WorkExperience;
+type WorkExperienceProps = Experience & { tight?: boolean };
 
-export function WorkExperience({
+export function Experience({
   title,
   years,
   jobTitle,
@@ -18,6 +19,7 @@ export function WorkExperience({
   projects: allProjects,
   numOfProjectsToShow,
   showMoreButtonText,
+  tight = false,
 }: WorkExperienceProps) {
   const [showAllProjects, setShowAllProjects] = useState(
     numOfProjectsToShow === undefined ||
@@ -29,7 +31,12 @@ export function WorkExperience({
     : allProjects.slice(0, numOfProjectsToShow);
 
   return (
-    <div className="flex flex-col gap-2 border-b py-16 first:pt-0 last:border-none">
+    <div
+      className={cn(
+        "flex flex-col gap-2 border-b first:pt-0 last:border-none",
+        tight ? "py-6" : "py-16"
+      )}
+    >
       <div className="flex flex-row justify-between items-center">
         <div className="text-lg font-semibold">{title}</div>
         <div className="text-subtle text-sm">{years}</div>

diff --git a/lib/cv-data.ts b/lib/cv-data.ts
@@ -7,10 +7,11 @@ type CVData = {
     email: string;
   };
   keySkills: string[];
-  workExperience: WorkExperience[];
+  workExperience: Experience[];
+  education: Experience[];
 };
 
-export type WorkExperience = {
+export type Experience = {
   title: string;
   years: string;
   jobTitle: string;
@@ -306,6 +307,35 @@ const cvData: CVData = {
       ],
     },
   ],
+  education: [
+    {
+      title: "TAMK Tampere School of Applied Sciences",
+      jobTitle: "Batchelor of Arts and Media",
+      years: "2009-",
+      description: [],
+      bulletPoints: [],
+      keywords: [],
+      projects: [],
+    },
+    {
+      title: "Finnish Military Service",
+      jobTitle: "",
+      years: "2008",
+      description: [],
+      bulletPoints: [],
+      keywords: [],
+      projects: [],
+    },
+    {
+      title: "Uudenkaupungin lukio",
+      jobTitle: "High school",
+      years: "2004-2007",
+      description: [],
+      bulletPoints: [],
+      keywords: [],
+      projects: [],
+    },
+  ],
 };
 
 export default cvData;