Merge branch 'main' into deploy

davwheat · Nov 24, 2023 · a5c457a · a5c457a
2 parents 4bf39c7 + 59c478a
commit a5c457a
Show file tree

Hide file tree

Showing 8 changed files with 637 additions and 432 deletions.
diff --git a/package.json b/package.json
@@ -16,29 +16,29 @@
     "@ssfbank/gatsby-plugin-search-fusejs": "^1.0.6",
     "case-sensitive-paths-webpack-plugin": "^2.4.0",
     "clsx": "^1.2.1",
-    "dayjs": "^1.11.8",
+    "dayjs": "^1.11.10",
     "fuse.js": "^6.6.2",
-    "gatsby": "^5.11.0",
+    "gatsby": "^5.12.11",
     "gatsby-image": "^3.11.0",
-    "gatsby-plugin-canonical-urls": "^5.11.0",
+    "gatsby-plugin-canonical-urls": "^5.12.0",
     "gatsby-plugin-cloudflare-pages": "^1.0.0-alpha.2",
-    "gatsby-plugin-image": "^3.11.0",
-    "gatsby-plugin-less": "^7.11.0",
-    "gatsby-plugin-manifest": "^5.11.0",
+    "gatsby-plugin-image": "^3.12.3",
+    "gatsby-plugin-less": "^7.12.0",
+    "gatsby-plugin-manifest": "^5.12.3",
     "gatsby-plugin-material-ui": "^3.0.1",
     "gatsby-plugin-meta-redirect": "^1.1.1",
     "gatsby-plugin-react-head": "https://github.com/davwheat/gatsby-plugin-react-head",
     "gatsby-plugin-react-svg": "^3.3.0",
     "gatsby-plugin-remove-console": "^0.0.2",
-    "gatsby-plugin-sharp": "^5.11.0",
-    "gatsby-plugin-sitemap": "^6.11.0",
+    "gatsby-plugin-sharp": "^5.12.3",
+    "gatsby-plugin-sitemap": "^6.12.3",
     "gatsby-plugin-webpack-size": "^2.0.1",
-    "gatsby-react-router-scroll": "^6.11.0",
-    "gatsby-source-filesystem": "^5.11.0",
+    "gatsby-react-router-scroll": "^6.12.0",
+    "gatsby-source-filesystem": "^5.12.1",
     "gatsby-source-local-git": "^1.3.0",
-    "gatsby-transformer-sharp": "^5.11.0",
+    "gatsby-transformer-sharp": "^5.12.3",
     "get-best-contrast-color": "^0.3.1",
-    "mdi-react": "^9.2.0",
+    "mdi-react": "^9.3.0",
     "nanoid": "^4.0.2",
     "prop-types": "^15.8.1",
     "react": "^18.2.0",
@@ -49,15 +49,15 @@
     "twemoji": "^14.0.2"
   },
   "devDependencies": {
-    "@types/color": "^3.0.3",
-    "@types/material-ui": "^0.21.12",
-    "@types/mdx-js__react": "^1.5.5",
-    "@types/react": "^18.2.14",
+    "@types/color": "^3.0.6",
+    "@types/material-ui": "^0.21.14",
+    "@types/mdx-js__react": "^1.5.8",
+    "@types/react": "^18.2.38",
     "babel-plugin-transform-remove-console": "^6.9.4",
     "cross-env": "^7.0.3",
-    "gatsby-plugin-webpack-bundle-analyser-v2": "^1.1.31",
-    "prettier": "^2.8.8",
-    "typescript": "^5.1.3"
+    "gatsby-plugin-webpack-bundle-analyser-v2": "^1.1.32",
+    "prettier": "^3.1.0",
+    "typescript": "^5.3.2"
   },
   "keywords": [
     "gatsby"
@@ -73,5 +73,5 @@
     "serve": "gatsby serve",
     "clean": "gatsby clean"
   },
-  "packageManager": "yarn@3.6.0"
+  "packageManager": "yarn@4.0.2"
 }
diff --git a/src/components/Experience/Experience.tsx b/src/components/Experience/Experience.tsx
@@ -5,15 +5,16 @@ import Breakpoints from '../../data/breakpoints'
 
 const ExperienceData: ReadonlyArray<ExperienceDataEntry> = [
   {
-    organisation: 'Raileasy',
-    organisationSite: 'https://www.raileasy.co.uk/',
+    organisation: 'Raileasy (TrainSplit)',
+    organisationSite: 'https://trainsplit.com/',
     description: 'Public Transport Ticketing',
     role: 'an Android app developer',
     startDate: 'Jul 2023',
     projects: [
       'Used Kotlin and Jetpack Compose for our app',
       'Started working towards feature parity with existing iOS app',
       'Performed regular tests across many real devices to ensure compatibility',
+      'Used industry knowledge to answer complex customer support queries',
       'Continued my apprenticeship with the Univerity of Warwick',
     ],
   },

diff --git a/src/components/PageComponents/Footer.tsx b/src/components/PageComponents/Footer.tsx
@@ -82,18 +82,16 @@ export default function Footer() {
        */
       hash: string
     }
-  } = useStaticQuery(
-    graphql`
-      {
-        siteBuildMetadata {
-          buildTime(formatString: "YYYY-MM-DD HH:mm z")
-        }
-        gitCommit(latest: { eq: true }) {
-          hash
-        }
+  } = useStaticQuery(graphql`
+    {
+      siteBuildMetadata {
+        buildTime(formatString: "YYYY-MM-DD HH:mm z")
       }
-    `,
-  )
+      gitCommit(latest: { eq: true }) {
+        hash
+      }
+    }
+  `)
 
   return (
     <footer className={classes.container}>

diff --git a/src/components/SEO.tsx b/src/components/SEO.tsx
@@ -15,19 +15,17 @@ interface Props {
 }
 
 const SEO: React.FC<Props> = ({ description, meta, title }) => {
-  const { site } = useStaticQuery(
-    graphql`
-      query {
-        site {
-          siteMetadata {
-            title
-            description
-            author
-          }
+  const { site } = useStaticQuery(graphql`
+    query {
+      site {
+        siteMetadata {
+          title
+          description
+          author
         }
       }
-    `,
-  )
+    }
+  `)
 
   const metaDescription = description || site.siteMetadata.description
 

diff --git a/src/pages/index.tsx b/src/pages/index.tsx
@@ -119,10 +119,10 @@ const IndexPage = ({ location }) => {
         <h2 className="text-louder">Qualifications</h2>
 
         <p className="text-speak">
-          I am currently on a Level 6 Degree Apprenticeship in Software Engineering for Thales UK Underwater Systems, working towards a BSc
-          Digital Technology Solutions.
+          I am currently on a level 6 degree apprenticeship with Raileasy and the University of Warwick, working towards a BSc Digital Technology
+          Solutions (Software Engineering).
         </p>
-        <p className="text-speak">I was awarded my UK A-levels results between 2021 and 2022, with GCSEs being issued in 2020.</p>
+        <p className="text-speak">I was awarded my UK A-levels and BTEC qualifications (above) in 2021 and 2022.</p>
 
         <QualificationsTable className={classes.eduTable} />
       </Section>

diff --git a/src/styles/baseline.less b/src/styles/baseline.less
@@ -115,7 +115,17 @@ body {
   line-height: 24px;
   font-weight: 400;
 
-  font-family: 'Jost', -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell, 'Open Sans', 'Helvetica Neue',
+  font-family:
+    'Jost',
+    -apple-system,
+    BlinkMacSystemFont,
+    'Segoe UI',
+    Roboto,
+    Oxygen,
+    Ubuntu,
+    Cantarell,
+    'Open Sans',
+    'Helvetica Neue',
     sans-serif;
   color: #000;
 }

diff --git a/src/styles/tooltips.less b/src/styles/tooltips.less
@@ -147,7 +147,9 @@
     pointer-events: none;
     opacity: 0;
 
-    transition: opacity 0.18s ease-out 0.18s, transform 0.18s ease-out 0.18s;
+    transition:
+      opacity 0.18s ease-out 0.18s,
+      transform 0.18s ease-out 0.18s;
 
     font-weight: normal;
   }