Revert unnec changes

pennlabs · Aug 24, 2023 · 190466a · 190466a
1 parent 35fbac7
commit 190466a
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 15 deletions.
diff --git a/src/components/Blog/Byline.tsx b/src/components/Blog/Byline.tsx
@@ -1,7 +1,7 @@
 import React from 'react'
 import { Link, useStaticQuery, graphql } from 'gatsby'
 import styled from 'styled-components'
-import { FluidObject, GatsbyImageFluidProps, GatsbyImageProps } from 'gatsby-image'
+import { FluidObject, GatsbyImageProps } from 'gatsby-image'
 import BackgroundImage from 'gatsby-background-image'
 
 import { TEAM_MEMBER_ROUTE, HOME_ROUTE } from '../../constants/routes'
@@ -83,7 +83,7 @@ const Byline = ({ authors }: { authors: IMember[] }) => {
     )
   }
 
-  const getMemberImage = (localImage: { childImageSharp: GatsbyImageFluidProps }) =>
+  const getMemberImage = (localImage: { childImageSharp: GatsbyImageProps }) =>
     (localImage &&
       localImage.childImageSharp &&
       localImage.childImageSharp.fluid) ||
@@ -94,7 +94,7 @@ const Byline = ({ authors }: { authors: IMember[] }) => {
       {authors.map(({ pennkey, localImage, name }) => (
         <AuthorLink key={pennkey} to={TEAM_MEMBER_ROUTE(pennkey)}>
           <ThumbnailWrapper>
-            {localImage && <Thumbnail fluid={getMemberImage(localImage)} />}
+            <Thumbnail fluid={getMemberImage(localImage)} />
           </ThumbnailWrapper>
           <span>{name}</span>
         </AuthorLink>

diff --git a/src/components/Blog/MemberBio.tsx b/src/components/Blog/MemberBio.tsx
@@ -17,7 +17,6 @@ import {
   maxWidth,
   M2,
 } from '../../constants/measurements'
-import { FluidObject } from 'gatsby-image'
 
 const markdownProcessor = remark().use(html)
 
@@ -78,13 +77,13 @@ const MemberBio = ({
   const [bioAsHtml, updateBioAsHtml] = useState(bio)
   markdownProcessor
     .process(bio || '')
-    .then(({ contents: b }) => updateBioAsHtml(b as any))
+    .then(({ contents: b }) => updateBioAsHtml(b))
 
   return (
     <Fade distance={M1}>
       <Card shaded>
         <StyledCenteredFlex>
-          <Thumbnail src={(localImage?.childImageSharp.fluid as FluidObject).src} />
+          <Thumbnail src={localImage.childImageSharp.fluid.src} />
           <div>
             <H4 mb2>{name}</H4>
             <Bio dangerouslySetInnerHTML={{ __html: bioAsHtml }} />

diff --git a/src/components/Team/TeamMemberPreview.tsx b/src/components/Team/TeamMemberPreview.tsx
@@ -46,15 +46,14 @@ export const TeamMemberPreview = ({
   name,
   roles,
   pennkey,
-  localImage,
+  localImage: {
+    childImageSharp: { fluid },
+  },
   semester_joined: semesterJoined,
-  alumnus,
 }: IMember) => (
   <Col margin={M2} sm={12} md={6} lg={3} key={pennkey}>
     <StyledLink to={TEAM_MEMBER_ROUTE(pennkey)}>
-      {
-        localImage?.childImageSharp.fluid && <Image fluid={localImage.childImageSharp.fluid} />
-      }
+      {fluid && <Image fluid={fluid} />}
       <P mb1 lg>
         <strong>{name}</strong>
       </P>

diff --git a/src/helpers.ts b/src/helpers.ts
@@ -1,4 +1,4 @@
-import { GatsbyImageFluidProps, GatsbyImageProps } from 'gatsby-image'
+import { GatsbyImageProps } from 'gatsby-image'
 
 /**
  * Given the absolute file path to a markdown file, return the path to the
@@ -17,8 +17,6 @@ const semesterSeason = (season: string): string => {
       return 'Summer'
     case 'C':
       return 'Fall'
-    default:
-      return 'Unknown'
   }
 }
 
@@ -28,7 +26,7 @@ export const semesterToString = (sem: string): string =>
     sem.length - 1,
   )}`
 
-export const getSrc = (photo: { childImageSharp: GatsbyImageFluidProps }) => {
+export const getSrc = (photo: { childImageSharp: GatsbyImageProps }) => {
   if (Array.isArray(photo.childImageSharp.fluid)) {
     return photo.childImageSharp.fluid[0].src
   } else {