From 188edc999c8420d8db0086ef498657f0c60b12e7 Mon Sep 17 00:00:00 2001
From: Aaron Yarborough <3855819+AaronJY@users.noreply.github.com>
Date: Sun, 22 Jun 2025 16:55:34 +0100
Subject: [PATCH] feat: improve cv layout

---
 .vscode/settings.json                   |   1 +
 package.json                            |   2 +-
 src/components/Footer/Footer.jsx        |   2 +-
 src/components/Header/Header.jsx        |   2 +-
 src/components/Resume/Resume.jsx        | 174 +++++++++++++++---------
 src/components/Resume/Resume.module.css |  61 +++++++++
 src/pages/cv/cv.module.css              |   0
 src/pages/cv/index.js                   |  27 +++-
 src/styles/globals.css                  |  28 ++++
 9 files changed, 224 insertions(+), 73 deletions(-)
 create mode 100644 src/pages/cv/cv.module.css

diff --git a/.vscode/settings.json b/.vscode/settings.json
index d37afc6..96dea3c 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -23,6 +23,7 @@
     "Sitecore",
     "sportank",
     "Umbraco",
+    "Yarborough",
     "Yarbz"
   ],
   "files.autoSave": "off",
diff --git a/package.json b/package.json
index 73d574d..6c6c6ba 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "www-aaronjy-me",
-  "version": "2.3.0",
+  "version": "2.4.0",
   "private": true,
   "type": "module",
   "lint-staged": {
diff --git a/src/components/Footer/Footer.jsx b/src/components/Footer/Footer.jsx
index 6df3200..ea4a3fe 100644
--- a/src/components/Footer/Footer.jsx
+++ b/src/components/Footer/Footer.jsx
@@ -7,7 +7,7 @@ import pck from "../../../package.json";
 
 function Footer() {
   return (
-    <footer className={style.footer} data-testid="footer">
+    <footer className={`${style.footer} hide-print`} data-testid="footer">
       <hr />
       <nav>
         <div>
diff --git a/src/components/Header/Header.jsx b/src/components/Header/Header.jsx
index 816d486..ad3d26b 100644
--- a/src/components/Header/Header.jsx
+++ b/src/components/Header/Header.jsx
@@ -5,7 +5,7 @@ import styles from "./Header.module.css";
 
 function Header() {
   return (
-    <header className={styles.header} data-testid="header">
+    <header className={`${styles.header} hide-print`} data-testid="header">
       <nav>
         <Link href="/">Home</Link>
         {", "}
diff --git a/src/components/Resume/Resume.jsx b/src/components/Resume/Resume.jsx
index 7e5dfc6..40f509e 100644
--- a/src/components/Resume/Resume.jsx
+++ b/src/components/Resume/Resume.jsx
@@ -2,8 +2,11 @@ import React from "react";
 
 import style from "./Resume.module.css";
 import { markdownToHtml } from "@/services/content-service";
+import { MDXClient } from "next-mdx-remote-client/csr";
+import Link from "next/link";
 
 function Resume({
+  introMdxSource,
   competencies,
   education,
   certifications,
@@ -12,7 +15,7 @@ function Resume({
 }) {
   return (
     <div className={style.cv}>
-      <ol>
+      <ol className="hide-print">
         <li>
           <a href="#experience">Professional experience</a>
         </li>
@@ -30,57 +33,73 @@ function Resume({
         </li>
       </ol>
       <div>
-        <h2 id="experience">Professional experience</h2>
-
-        {experience?.map((exp, i) => (
-          <div key={i}>
-            <WorkExperience
-              employer={exp.employer}
-              position={exp.position}
-              start={exp.start}
-              end={exp.end}
-            >
-              {markdownToHtml(exp.description)}
-            </WorkExperience>
-            {!!exp.skills?.length && (
-              <details>
-                <summary>Competencies</summary>
-                <>{exp.skills.sort().join(", ")}</>
-              </details>
-            )}
-          </div>
-        ))}
+        <div className={style.about}>
+          <MDXClient {...introMdxSource} />
+          <span className="print-only">
+            See more at <a href="https://aaronjy.me/cv">aaronjy.me/cv</a>
+          </span>
+        </div>
       </div>
-      <div className="sidebar">
-        <h2 id="competencies">Competencies</h2>
-        <ul>
-          {competencies
-            ?.sort((a, b) => a.name > b.name)
-            .map((c, i) => (
-              <li key={i}>{c.name}</li>
-            ))}
-        </ul>
+      <div className={style.cvContent}>
+        <div className={style.experience}>
+          <h2 id="experience">Professional experience</h2>
 
-        <h2 id="certifications">Certifications</h2>
-        <ul>
-          {certifications
-            ?.sort((a, b) => a.name > b.name)
-            .map((c, i) => (
-              <li key={i}>{c.name}</li>
-            ))}
-        </ul>
-
-        <h2 className="languages">Languages</h2>
-        <ul>
-          {languages?.sort().map((c, i) => (
-            <li key={i}>
-              {c.name} - {c.proficiency}
-            </li>
+          {experience?.map((exp, i) => (
+            <div key={i}>
+              <WorkExperience
+                employer={exp.employer}
+                position={exp.position}
+                start={exp.start}
+                end={exp.end}
+              >
+                {markdownToHtml(exp.description)}
+              </WorkExperience>
+              {!!exp.skills?.length && (
+                <details className="hide-print">
+                  <summary>Competencies</summary>
+                  <>{exp.skills.sort().join(", ")}</>
+                </details>
+              )}
+            </div>
           ))}
-        </ul>
+        </div>
+        <div className={style.sidebar}>
+          <h2 id="competencies">Competencies</h2>
+          <ul>
+            {competencies
+              ?.sort((a, b) => a.name - b.name)
+              .map((c, i) => (
+                <li key={i}>{c.name}</li>
+              ))}
+          </ul>
 
-        <h2 className="education">Education</h2>
-        <p>{education.name}</p>
+          <h2 id="certifications">Certifications</h2>
+          <ul>
+            {certifications
+              ?.sort((a, b) => a.name > b.name)
+              .map((c, i) => (
+                <li key={i}>{c.name}</li>
+              ))}
+          </ul>
+
+          <h2 className="languages">Languages</h2>
+          <ul>
+            {languages?.sort().map((c, i) => (
+              <li key={i}>
+                <strong>{c.name}</strong> - {c.proficiency}
+              </li>
+            ))}
+          </ul>
+
+          <h2 className="education">Education</h2>
+          <ul>
+            {education
+              ?.sort((a, b) => a.name - b.name)
+              .map((c, i) => (
+                <li key={i}>{c.name}</li>
+              ))}
+          </ul>
+        </div>
       </div>
     </div>
   );
@@ -90,21 +109,48 @@ export default Resume;
 
 function WorkExperience({ position, employer, start, end, children }) {
   return (
-    <div className={style["work-experience"]}>
-      <div>
-        <h3 id={position}>
-          {position}
-          <br />
-          <small>{employer}</small>
-        </h3>
-        <small>
-          <time>{start}</time> - <time>{end}</time>
-        </small>
-      </div>
-      <div
-        data-test="children"
-        dangerouslySetInnerHTML={{ __html: children }}
-      />
-    </div>
+    // <div className={style["work-experience"]}>
+    //   <div>
+    //     <h3 id={position}>
+    //       {position}
+    //       <br />
+    //       <small>{employer}</small>
+    //     </h3>
+    //     <small>
+    //       <time>{start}</time> - <time>{end}</time>
+    //     </small>
+    //   </div>
+    //   <div
+    //     data-test="children"
+    //     dangerouslySetInnerHTML={{ __html: children }}
+    //   />
+    // </div>
+
+    <table className={style.experienceTable}>
+      <tbody>
+        <tr>
+          <td>
+            <span id={position} className={style.position}>
+              {position}
+            </span>
+            <br />
+            <span className={style.employer}>{employer}</span>
+          </td>
+          <td className="text-right">
+            {/* <small> */}
+            <time>{start}</time> - <time>{end}</time>
+            {/* </small> */}
+          </td>
+        </tr>
+        <tr>
+          <td colSpan={2}>
+            <div
+              data-test="children"
+              dangerouslySetInnerHTML={{ __html: children }}
+            />
+          </td>
+        </tr>
+      </tbody>
+    </table>
   );
 }
diff --git a/src/components/Resume/Resume.module.css b/src/components/Resume/Resume.module.css
index e69de29..d3ab528 100644
--- a/src/components/Resume/Resume.module.css
+++ b/src/components/Resume/Resume.module.css
@@ -0,0 +1,61 @@
+.experienceTable {
+  width: 100%;
+}
+
+.position {
+  font-weight: 700;
+}
+
+.cvContent {
+  display: flex;
+  flex-direction: row-reverse;
+  gap: 3rem;
+  position: relative;
+}
+
+.cvContent .experience {
+  flex-basis: 66.66%;
+}
+
+.cvContent .sidebar {
+  flex-basis: 33.33%;
+  position: sticky;
+  top: 10px;
+  left: 0px;
+  height: 1px;
+  /* Needed to make sticky work */
+}
+
+.about {
+  margin-bottom: 0;
+}
+
+.cv ol,
+.cv ul {
+  padding: 0 1rem;
+}
+
+@media screen and (max-width: 768px) {
+  .cvContent {
+    display: block;
+  }
+
+  .cvContent .sidebar {
+    height: auto;
+    position: relative;
+  }
+}
+
+@media print {
+  .cvContent {
+    gap: 1rem;
+  }
+
+  .cvContent .experience {
+    flex-basis: 80%;
+  }
+
+  .cvContent .sidebar {
+    flex-basis: 20%;
+  }
+}
diff --git a/src/pages/cv/cv.module.css b/src/pages/cv/cv.module.css
new file mode 100644
index 0000000..e69de29
diff --git a/src/pages/cv/index.js b/src/pages/cv/index.js
index 88e992d..f788af7 100644
--- a/src/pages/cv/index.js
+++ b/src/pages/cv/index.js
@@ -1,9 +1,11 @@
-import DefaultLayout from "@/layouts/DefaultLayout/DefaultLayout";
-import React from "react";
-import { NextSeo } from "next-seo";
 import Resume from "@/components/Resume/Resume";
-import { fetchCV } from "@/services/content-service";
 import { FailedFetchCVError } from "@/errors";
+import DefaultLayout from "@/layouts/DefaultLayout/DefaultLayout";
+import { fetchCV } from "@/services/content-service";
+import { NextSeo } from "next-seo";
+
+import style from "./cv.module.css";
+import { serialize } from "next-mdx-remote-client/serialize";
 
 export const Title = "CV";
 
@@ -22,10 +24,20 @@ export async function getStaticProps() {
     };
   }
 
-  const { competencies, education, languages, certifications, experience } = cv;
+  const {
+    intro,
+    competencies,
+    education,
+    languages,
+    certifications,
+    experience,
+  } = cv;
+
+  const introMdxSource = await serialize({ source: intro });
 
   return {
     props: {
+      introMdxSource,
       competencies,
       education,
       languages,
@@ -37,6 +49,7 @@ export async function getStaticProps() {
 }
 
 export default function ResumePage({
+  introMdxSource,
   competencies,
   education,
   certifications,
@@ -51,9 +64,11 @@ export default function ResumePage({
           title: Title,
         }}
       />
-      <h1>{Title}</h1>
+      <h1 className="hide-print">{Title}</h1>
+      <h1 className={`${style.printHeading} print-only`}>Aaron Yarborough</h1>
       <section>
         <Resume
+          introMdxSource={introMdxSource}
           competencies={competencies}
           education={education}
           certifications={certifications}
diff --git a/src/styles/globals.css b/src/styles/globals.css
index 4647f96..9ba65c1 100644
--- a/src/styles/globals.css
+++ b/src/styles/globals.css
@@ -22,3 +22,31 @@ td:first-child {
 .bold {
   font-weight: 700;
 }
+
+.text-right {
+  text-align: right;
+}
+
+.print-only {
+  display: none;
+}
+
+@media print {
+  html {
+    padding-top: 1rem;
+  }
+
+  body {
+    font-size: 12px;
+    line-height: 1.3;
+    padding: 0;
+  }
+
+  .hide-print {
+    display: none;
+  }
+
+  .print-only {
+    display: initial;
+  }
+}