From 90760e1b89355ac7168496fa5225283a93a23843 Mon Sep 17 00:00:00 2001 From: Michael DeMarco Date: Thu, 15 Aug 2024 10:33:37 -0600 Subject: [PATCH] feat: bio --- src/components/Bio/Bio.tsx | 2 +- src/data/Constants.ts | 2 +- src/pages/about.tsx | 97 ++++++++++++++++---------------------- 3 files changed, 42 insertions(+), 59 deletions(-) diff --git a/src/components/Bio/Bio.tsx b/src/components/Bio/Bio.tsx index e15ba515..6f9806bc 100644 --- a/src/components/Bio/Bio.tsx +++ b/src/components/Bio/Bio.tsx @@ -55,7 +55,7 @@ const Bio = (): ReactElement => { />

Written, designed, and programmed by{" "} - {author.name} {author.summary}⚡🦅 + {author.name} {author.summary}.⚡🦅
{` `} diff --git a/src/data/Constants.ts b/src/data/Constants.ts index dd4fb4ad..8c131898 100644 --- a/src/data/Constants.ts +++ b/src/data/Constants.ts @@ -69,7 +69,7 @@ const universityYearToString = (universityYear: number): string => { case UniversityYear.FIFTH: return "fifth-year"; case UniversityYear.GRADUATED: - return "recently graduated"; + return "graduated"; default: throw new Error( `Cannot convert universityYear ${universityYear} to string!` diff --git a/src/pages/about.tsx b/src/pages/about.tsx index b6d5238e..e6f68707 100644 --- a/src/pages/about.tsx +++ b/src/pages/about.tsx @@ -6,25 +6,18 @@ import Bio from "../components/Bio/Bio"; import Format from "../components/Format/Format"; import SEO from "../components/SEO/SEO"; -import { UNIVERSITY_YEAR_AS_STRING } from "../data/Constants"; - -interface AboutBioProps { - universityYear: string; -} - -const AboutBio = ({ universityYear }: AboutBioProps): ReactElement => { +const AboutBio: React.FC = () => { return ( <>

- Hey there! {`I'm`} Michael, a {universityYear} Honours Computer - Science student from the{" "} + Hey there! {`I'm`} Michael, an Honours Computer Science graduate + from the{" "} University of British Columbia (UBC) {" "} - in Vancouver, Canada. I am originally from Edmonton, Alberta; I - made the leap one province over to pursue my undergraduate - studies in the fall of 2019. Alongside my major, I am working - towards a{" "} + in Vancouver, Canada. {`I'm`} originally from Edmonton, Alberta; + I made the leap one province over to pursue my undergraduate + studies in the fall of 2019. Alongside my major, I completed a{" "} { > minor in Data Science {" "} - and am a participant in the{" "} + and participated in the{" "} { > co-op program - . I also am completing a study abroad at the{" "} + . I also did a study abroad at the{" "} National University of Singapore .

- In the past, {`I've`} worked at{" "} + In college, I interned or worked at{" "} General Genomics @@ -75,7 +68,15 @@ const AboutBio = ({ universityYear }: AboutBioProps): ReactElement => { > Tesla {" "} - in Supercharging, and as an{" "} + in Supercharging,{" "} + + The Canadian Space Agency + {" "} + on {`Canada's`} first-ever lunar rover, and as an{" "} { > Undergraduate Teaching Assistant (UTA) - . To date, {`I've`} taught seven separate courses, including - introductory programming in Python, introductory data science, - computer systems, computer networking, and data structures and - algorithms. + . I taught nine separate courses, including introductory + programming in Python, introductory data science, computer + systems, computer networking, data structures and algorithms, + and parallel computing. +

+

+ Since graduating, {`I've`} moved to San Francisco to complete a + post-graduate internship at Notion.

This blog is my sandbox on the Internet. It has been a passion project for a number of years. It showcases my writing, projects, design, and travel expereinces.

-

- I hope you enjoy your stay. To wrap up, here are some photos I - particularly enjoy. -

+

I hope you enjoy your stay. To wrap up, here are some photos.

); }; @@ -113,19 +115,14 @@ const About = ({ location }: AboutProps): ReactElement => { title } } - leo1: file(relativePath: { eq: "images/leo1.png" }) { + me: file(relativePath: { eq: "images/me.jpg" }) { childImageSharp { - gatsbyImageData(width: 600, layout: CONSTRAINED) + gatsbyImageData(width: 300, layout: CONSTRAINED) } } - collision: file(relativePath: { eq: "images/collision.jpg" }) { + leo: file(relativePath: { eq: "images/leo1.png" }) { childImageSharp { - gatsbyImageData(width: 600, layout: CONSTRAINED) - } - } - amazon3: file(relativePath: { eq: "images/amazon3.jpg" }) { - childImageSharp { - gatsbyImageData(width: 600, layout: CONSTRAINED) + gatsbyImageData(width: 300, layout: CONSTRAINED) } } } @@ -134,15 +131,10 @@ const About = ({ location }: AboutProps): ReactElement => { const { title } = data.site.siteMetadata; - const leoImage = getImage(data.leo1.childImageSharp); - const collisionImage = getImage(data.collision.childImageSharp); - const amazonImage = getImage(data.amazon3.childImageSharp); + const meImage = getImage(data.me.childImageSharp); + const leoImage = getImage(data.leo.childImageSharp); - if ( - leoImage === undefined || - collisionImage === undefined || - amazonImage === undefined - ) { + if (meImage === undefined || leoImage === undefined) { throw new Error("Could not find image for /about page!"); } @@ -151,7 +143,7 @@ const About = ({ location }: AboutProps): ReactElement => {

A little about me...

- +
{ justifyContent: "center", }} > + +

My face! (July 2024)

My pet tortoise Leo! (Jun 2020)

- -

Volunteering at Collision 2022. (June 2022)

- -

Interning in Toronto, Ontario for the summer. (July 2022)

);