Resolve other divergent diffs

MolarFox · Aug 1, 2023 · 1d9de7a · 1d9de7a
1 parent caaa3b1
commit 1d9de7a
Show file tree

Hide file tree

Showing 9 changed files with 67 additions and 76 deletions.
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# gatsby-casper 
+# gatsby-casper
 
 Demo: https://gatsby-casper.netlify.app
 

diff --git a/gatsby-config.js b/gatsby-config.js
@@ -3,7 +3,7 @@ const path = require('path');
 
 module.exports = {
   siteMetadata: {
-    title: 'Molar\'s Cooking Secrets',
+    title: 'Molar\'s Tech Tips and Fox Care Advice',
     description: 'MolarFox\'s blog - blowing stuff up since 2020',
     siteUrl: 'https://blog.molarfox.io',
   },
@@ -122,20 +122,21 @@ module.exports = {
       },
     },
     {
-      resolve: 'gatsby-plugin-google-gtag',
+      resolve: 'gatsby-plugin-google-analytics',
       options: {
-        trackingIds: [
-          'G-JNV88EBCXC', // Google Analytics / GA
-        ],
-        gtagConfig: {
-          anonymize_ip: true,
-          cookie_expires: 0,
-        },
-        pluginConfig: {
-          head: false,
-          respectDNT: true,
-          exclude: [],
-        },
+        trackingId: 'G-RT1YMC49G4',
+        // Puts tracking script in the head instead of the body
+        head: true,
+        // IP anonymization for GDPR compliance
+        anonymize: true,
+        // Disable analytics for users with `Do Not Track` enabled
+        respectDNT: true,
+        // Avoids sending pageview hits from custom paths
+        exclude: ['/preview/**'],
+        // Specifies what percentage of users should be tracked
+        sampleRate: 100,
+        // Determines how often site speed tracking beacons will be sent
+        siteSpeedSampleRate: 10,
       },
     },
   ],

diff --git a/gatsby-node.js b/gatsby-node.js
@@ -76,7 +76,6 @@ exports.createPages = async ({ graphql, actions }) => {
                 }
               }
               author {
-                id
                 username
                 bio
                 avatar {

diff --git a/src/components/PostCard.tsx b/src/components/PostCard.tsx
@@ -31,7 +31,7 @@ export function PostCard({ post, isLarge = false }: PostCardProps) {
       className={`post-card ${post.frontmatter.image ? '' : 'no-image'} ${
         isLarge ? 'post-card-large' : ''
       }`}
-      css={[ResolveLight, ViceCitySans, PostCardStyles, large && PostCardLarge]}
+      css={[ResolveLight, ViceCitySans, PostCardStyles, isLarge && PostCardLarge]}
     >
       {post.frontmatter.image && (
         <Link className="post-card-image-link" css={PostCardImageLink} to={post.fields.slug}>

diff --git a/src/templates/author.tsx b/src/templates/author.tsx
@@ -182,7 +182,7 @@ function Author({ data, location }: AuthorTemplateProps) {
 }
 
 export const pageQuery = graphql`
-  query authorQuery ($author: String) {
+  query ($author: String) {
     authorYaml(id: { eq: $author }) {
       id
       username
@@ -222,7 +222,6 @@ export const pageQuery = graphql`
             }
             author {
               id
-              username
               bio
               avatar {
                 childImageSharp {

diff --git a/src/templates/index.tsx b/src/templates/index.tsx
@@ -162,7 +162,6 @@ export const pageQuery = graphql`
             }
             author {
               id
-              username
               bio
               avatar {
                 childImageSharp {

diff --git a/src/templates/post.tsx b/src/templates/post.tsx
@@ -456,13 +456,8 @@ const PostFullImage = styled.figure`
 `;
 
 export const query = graphql`
-  query postQuery ($slug: String, $primaryTag: String) {
-    logo: file(relativePath: {eq: "img/molarfox-logo.png"}) {
-      childImageSharp {
-        gatsbyImageData(layout: FIXED)
-      }
-    }
-    markdownRemark(fields: {slug: {eq: $slug}}) {
+  query ($slug: String, $primaryTag: String) {
+    markdownRemark(fields: { slug: { eq: $slug } }) {
       html
       htmlAst
       excerpt
@@ -484,7 +479,6 @@ export const query = graphql`
         }
         author {
           id
-          username
           bio
           avatar {
             childImageSharp {

diff --git a/src/templates/tags.tsx b/src/templates/tags.tsx
@@ -124,59 +124,58 @@ function Tags({ pageContext, data, location }: TagTemplateProps) {
 export default Tags;
 
 export const pageQuery = graphql`
-query ($tag: String) {
-  allTagYaml {
-    edges {
-      node {
-        yamlId
-        description
-        image {
-          childImageSharp {
-            gatsbyImageData(layout: FULL_WIDTH)
-          }
-        }
-      }
-    }
-  }
-  allMarkdownRemark(
-    limit: 2000
-    sort: { frontmatter: { date: ASC } }
-    filter: { frontmatter: { tags: { in: [$tag] }, draft: { ne: true } } }
-  ) {
-    totalCount
-    edges {
-      node {
-        excerpt
-        frontmatter {
-          title
-          excerpt
-          tags
-          date
+  query ($tag: String) {
+    allTagYaml {
+      edges {
+        node {
+          yamlId
+          description
           image {
             childImageSharp {
               gatsbyImageData(layout: FULL_WIDTH)
             }
           }
-          author {
-            id
-            username
-            bio
-            avatar {
+        }
+      }
+    }
+    allMarkdownRemark(
+      limit: 2000
+      sort: { frontmatter: { date: ASC } }
+      filter: { frontmatter: { tags: { in: [$tag] }, draft: { ne: true } } }
+    ) {
+      totalCount
+      edges {
+        node {
+          excerpt
+          frontmatter {
+            title
+            excerpt
+            tags
+            date
+            image {
               childImageSharp {
-                gatsbyImageData(layout: FULL_WIDTH, breakpoints: [40, 80, 120])
+                gatsbyImageData(layout: FULL_WIDTH)
+              }
+            }
+            author {
+              id
+              bio
+              avatar {
+                childImageSharp {
+                  gatsbyImageData(layout: FULL_WIDTH, breakpoints: [40, 80, 120])
+                }
               }
             }
           }
-        }
-        fields {
-          readingTime {
-            text
+          fields {
+            readingTime {
+              text
+            }
+            layout
+            slug
           }
-          layout
-          slug
         }
       }
     }
   }
-}
 `;
diff --git a/src/website-config.ts b/src/website-config.ts
@@ -10,35 +10,35 @@ export type WebsiteConfig = {
    */
   lang: string;
   /**
-   * Blog full path, no ending slash!
+   * blog full path, no ending slash!
    */
   siteUrl: string;
   /**
-   * Full url, no username
+   * full url, no username
    */
   github?: string;
   /**
-   * Full url, no username
+   * full url, no username
    */
   youtube?: string;
   /**
    * Full url, no username
    */
   twitter?: string;
   /**
-   * Hide or show all email subscribe boxes
+   * hide or show all email subscribe boxes
    */
   showSubscribe: boolean;
   /**
-   * Create a list on mailchimp and then create an embeddable signup form. this is the form action
+   * create a list on mailchimp and then create an embeddable signup form. this is the form action
    */
   mailchimpAction?: string;
   /**
-   * This is the hidden input field name
+   * this is the hidden input field name
    */
   mailchimpName?: string;
   /**
-   * Name and id of the mailchimp email field
+   * name and id of the mailchimp email field
    */
   mailchimpEmailFieldName?: string;
   /**