Fix row spanning end and start of multiple years event

jonaschlegel · Oct 12, 2024 · b8e4e25 · b8e4e25
1 parent 1be61c5
commit b8e4e25
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 8 deletions.
diff --git a/app/cv/page.tsx b/app/cv/page.tsx
@@ -221,10 +221,15 @@ const CvPage = async () => {
           {sortedWorkEntries.map((entry) => {
             const startYear = entry.startDate.getFullYear();
             const endYear = entry.endDate.getFullYear();
-            const rowStart = yearRowStart[endYear];
-            const rowEnd =
+            const rowStart =
               (yearRowStart[startYear] ?? 0) +
-              (totalLayersPerYear[startYear] ?? 0);
+              (workTimeline[startYear]?.find((e) => e.entry.id === entry.id)
+                ?.layer ?? 0) +
+              1;
+            const rowEnd =
+              (yearRowStart[endYear] ?? 0) +
+              (workTimeline[endYear]?.find((e) => e.entry.id === entry.id)
+                ?.layer ?? 0);
 
             return (
               <div
@@ -255,10 +260,14 @@ const CvPage = async () => {
           {sortedEducationEntries.map((entry) => {
             const startYear = entry.startDate.getFullYear();
             const endYear = entry.endDate.getFullYear();
-            const rowStart = yearRowStart[endYear];
-            const rowEnd =
-              (yearRowStart[startYear] ?? 0) +
-              (totalLayersPerYear[startYear] ?? 0);
+            const startLayer =
+              educationTimeline[startYear]?.find((e) => e.entry.id === entry.id)
+                ?.layer ?? 0;
+            const rowStart = (yearRowStart[startYear] ?? 0) + startLayer + 1;
+            const endLayer =
+              educationTimeline[endYear]?.find((e) => e.entry.id === entry.id)
+                ?.layer ?? 0;
+            const rowEnd = (yearRowStart[endYear] ?? 0) + endLayer;
 
             return (
               <div

diff --git a/app/data/content.ts b/app/data/content.ts
@@ -22,7 +22,7 @@ import webDevelopment from '../images/services/web-development.png';
 export const navLinks = [
   { name: 'Featured Projects', href: '/#project' },
   { name: 'Services', href: '/#service' },
-  { name: 'CV', href: '/#cv' },
+  { name: 'CV', href: '/cv' },
 ] as const;
 
 export const heroSectionData = {