Merge branch 'main' into jennifer/semantic-html

CivicActions · Jul 15, 2021 · 2864211 · 2864211
2 parents 556011b + 760740c
commit 2864211
Show file tree

Hide file tree

Showing 6 changed files with 269 additions and 245 deletions.
diff --git a/gatsby-config.js b/gatsby-config.js
@@ -11,7 +11,7 @@ module.exports = {
     url: `https://civicactions.com/`,
     siteUrl: `https://civicactions.com/`,
     twitterUsername: '@CivicActions',
-    image: 'ca-extended-logo.svg',
+    image: 'default-og-image.png',
   },
   pathPrefix: `/civicactions-homesite`,
   plugins: [

diff --git a/src/components/seo.js b/src/components/seo.js
@@ -4,24 +4,24 @@ import { Helmet } from 'react-helmet';
 import { useLocation } from '@reach/router';
 import { useStaticQuery, graphql } from 'gatsby';
 
-
 const SEO = ({ title, description, image, article }) => {
   const { pathname } = useLocation();
   const { site } = useStaticQuery(query);
   const {
     defaultTitle,
-    titleTemplate,
     defaultDescription,
     siteUrl,
     defaultImage,
     twitterUsername,
   } = site.siteMetadata;
+
   const seo = {
     title: (`${title || defaultTitle} | CivicActions`),
     description: description || defaultDescription,
-    image: image || `${siteUrl}${defaultImage}`,
-    url: `${siteUrl}${pathname}`,
+    image: `${siteUrl}${(image || defaultImage)}`,
+    url: `${siteUrl}${pathname.slice(1)}`,
   };
+
   return (
     <Helmet
       htmlAttributes={{ lang: 'en' }}
@@ -49,18 +49,21 @@ const SEO = ({ title, description, image, article }) => {
   );
 };
 export default SEO;
+
 SEO.propTypes = {
   title: PropTypes.string,
   description: PropTypes.string,
   image: PropTypes.string,
   article: PropTypes.bool,
 };
+
 SEO.defaultProps = {
   title: null,
   description: null,
   image: null,
   article: false,
 };
+
 const query = graphql`
   query SEO {
     site {

diff --git a/src/pages/team.js b/src/pages/team.js
@@ -1,15 +1,18 @@
-import '../sass/styles.scss';
+import { graphql, useStaticQuery } from 'gatsby';
 import React, { useState } from 'react';
+
 import RedLayout from '../layouts/red';
 import TeaserGrid from '../components/teaser-grid.js';
 import StaffQuote from '../components/staff-quote.js';
 import Hero from '../components/hero.js';
-import { graphql, useStaticQuery } from 'gatsby';
-import alanaCaseyProfilePicture from '../files/images/alanna_casey_profile.jpg';
-import LinkButton from '../components/link-button';
 import SEO from '../components/seo';
 import PrimaryPageCTA from "../components/primary-page-cta";
 
+import alanaCaseyProfilePicture from '../files/images/alanna_casey_profile.jpg';
+import careersOgImage from '../../static/careers-og-image.png'
+
+import '../sass/styles.scss';
+
 const TeamPage = () => {
   const data = useStaticQuery(graphql`
     {
@@ -67,7 +70,11 @@ const TeamPage = () => {
   }
   return (
     <RedLayout>
-      <SEO title='Team' description='Meet the humans of CivicActions.' />
+      <SEO
+        title='Team'
+        description='Meet the humans of CivicActions.'
+        image={careersOgImage}
+      />
 
       <Hero
         title='Meet the humans of CivicActions'