diff --git a/package.json b/package.json index 09e45ca..4613ee3 100644 --- a/package.json +++ b/package.json @@ -34,5 +34,6 @@ "typescript": "^5.0.2", "vite": "^4.2.1", "vite-plugin-compression": "^0.5.1" - } + }, + "packageManager": "pnpm@9.10.0+sha512.73a29afa36a0d092ece5271de5177ecbf8318d454ecd701343131b8ebc0c1a91c487da46ab77c8e596d6acf1461e3594ced4becedf8921b074fbd8653ed7051c" } diff --git a/src/components/parts/education/Education.tsx b/src/components/parts/education/Education.tsx index 6358a30..84ab6f1 100644 --- a/src/components/parts/education/Education.tsx +++ b/src/components/parts/education/Education.tsx @@ -11,8 +11,7 @@ const Container = styled.div` display: flex; justify-content: stretch; align-items: center; - padding: 1rem 2rem; - padding-bottom: 2.4rem; + padding: 1rem 2rem 2.4rem; `; export type EducationStatus = "passed" | "active" | "future"; @@ -115,8 +114,11 @@ const Education: FC = () => { name: "Algebra University", location: "Zagreb, Croatia", years: 3, - degree: "Bachelors", - progress: Percent(+(UNI_ECTS / UNI_ECTS_MAX).toFixed(2)), + degree: { + type: "Bachelors", + study: "computer engineering", + }, + progress: Percent(+(UNI_ECTS / UNI_ECTS_MAX)), }} /> diff --git a/src/components/parts/education/EducationPoint.tsx b/src/components/parts/education/EducationPoint.tsx index e858e7f..aa9c893 100644 --- a/src/components/parts/education/EducationPoint.tsx +++ b/src/components/parts/education/EducationPoint.tsx @@ -166,7 +166,10 @@ type EducationDetail = { name: string; location: string; years: number; - degree?: "Bachelors" | "Masters" | "PhD"; + degree?: { + type: "Bachelors" | "Masters" | "PhD"; + study: string; + }; progress: number; }; @@ -175,7 +178,6 @@ type EducationPointProperties = { description: string; detail?: EducationDetail; descriptionAlignment?: Alignment; - uncertaint?: boolean; }; const EducationPoint: FC = ({ @@ -183,7 +185,6 @@ const EducationPoint: FC = ({ description, detail, descriptionAlignment, - uncertaint, }) => { const progressPercent = detail ? detail.progress * 100 : undefined; @@ -192,7 +193,7 @@ const EducationPoint: FC = ({ {status === "active" && } {description} - {!detail || isNullish(progressPercent) || uncertaint ? ( + {!detail || isNullish(progressPercent) ? ( Unknown so far... @@ -200,14 +201,18 @@ const EducationPoint: FC = ({ <> {detail.name} - {detail.degree && {detail.degree}} + {detail.degree && ( + + {detail.degree.type} ({detail.degree.study}) + + )} {detail.location}
{progressPercent !== 100 - ? progressPercent + "% done" + ? progressPercent.toFixed(2) + "% done" : "Completed"}{" "} {detail.years} years