chore: query from content types with prefix

Cezar Sampaio · Cezar Sampaio · commit a37cd46f852f · 2020-05-22T10:56:05.000+02:00
diff --git a/gatsby-config.js b/gatsby-config.js
@@ -5,10 +5,11 @@ require('dotenv').config({
 module.exports = {
   plugins: [
     {
-      resolve: `gatsby-source-contentful`,
+      resolve: 'gatsby-source-contentful',
       options: {
         spaceId: process.env.CONTENTFUL_SPACE_ID,
         accessToken: process.env.CONTENTFUL_API_TOKEN,
+        useNameForId: false,
       },
     },
     'gatsby-plugin-react-helmet',
@@ -20,12 +21,12 @@ module.exports = {
         engineOptions: 'speed',
         query: `
             {
-              articles: allContentfulArticle {
+              articles: allContentfulKbAppArticle {
                 nodes {
                   contentful_id
                   title
                   slug
-                  category {
+                  category: kbAppCategory {
                     slug
                   }
                 }
diff --git a/gatsby-node.js b/gatsby-node.js
@@ -5,23 +5,23 @@ const articleTemplate = path.resolve('src/templates/article.js');
 exports.createPages = async ({ graphql, actions: { createPage } }) => {
   const result = await graphql(`
     {
-      categories: allContentfulCategory {
+      categories: allContentfulKbAppCategory {
         nodes {
           id
           slug
           name
-          articles: article {
+          articles: kbapparticle {
             id
           }
         }
       }
 
-      articles: allContentfulArticle {
+      articles: allContentfulKbAppArticle {
         nodes {
           id
           slug
           title
-          category {
+          category: kbAppCategory {
             slug
           }
         }
diff --git a/src/components/seo.js b/src/components/seo.js
@@ -6,7 +6,8 @@ import useSiteSettings from '../hooks/useSiteSettings';
 export default function SEO(props) {
   const settings = useSiteSettings();
   const { title, description, siteName, lang } = props;
-  const name = siteName ?? settings.siteName;
+  const headerName = siteName ?? settings.siteName;
+  const headerDescription = description ?? settings.description.siteDescription;
 
   return (
     <Helmet
@@ -17,27 +18,27 @@ export default function SEO(props) {
       meta={[
         {
           name: 'description',
-          content: description,
+          content: headerDescription,
         },
         {
           property: `og:title`,
           content: title,
         },
         {
           property: `og:description`,
-          content: description,
+          content: headerDescription,
         },
         {
           name: `twitter:title`,
           content: title,
         },
         {
           name: `twitter:description`,
-          content: description,
+          content: headerDescription,
         },
       ]}
-      titleTemplate={`%s | ${name}`}
-      defaultTitle={name}
+      titleTemplate={`%s | ${headerName}`}
+      defaultTitle={headerName}
     ></Helmet>
   );
 }
diff --git a/src/hooks/useSiteSettings.js b/src/hooks/useSiteSettings.js
@@ -3,7 +3,7 @@ import { useStaticQuery, graphql } from 'gatsby';
 export default function useSiteSettings() {
   const data = useStaticQuery(graphql`
     query Settings {
-      settings: allContentfulSiteSettings {
+      settings: allContentfulKbAppSiteSettings {
         nodes {
           headerLinks {
             text
@@ -12,12 +12,16 @@ export default function useSiteSettings() {
           heading
           subheading
           siteName
+          description: siteDescription {
+            siteDescription
+          }
           logo {
             title
             fixed(width: 160) {
               src
             }
           }
+          googleAnalyticsId
         }
       }
     }
diff --git a/src/pages/index.js b/src/pages/index.js
@@ -51,7 +51,10 @@ export default function Home(props) {
 
   return (
     <Layout>
-      <SEO title={settings.heading} description={settings.subheading} />
+      <SEO
+        title={settings.heading}
+        description={settings.description?.siteDescription}
+      />
 
       <Container>
         <Hgroup>
@@ -79,14 +82,14 @@ export default function Home(props) {
 
 export const query = graphql`
   query {
-    categories: allContentfulCategory {
+    categories: allContentfulKbAppCategory {
       nodes {
         name
         description {
           description
         }
         slug
-        articles: article {
+        articles: kbapparticle {
           id
         }
       }
diff --git a/src/templates/article.js b/src/templates/article.js
@@ -139,7 +139,7 @@ export default function Article(props) {
 
 export const query = graphql`
   query Article($id: String) {
-    article: contentfulArticle(id: { eq: $id }) {
+    article: contentfulKbAppArticle(id: { eq: $id }) {
       title
       slug
       description {
@@ -148,7 +148,7 @@ export const query = graphql`
       body {
         json
       }
-      category {
+      category: kbAppCategory {
         slug
         name
       }
diff --git a/src/templates/section.js b/src/templates/section.js
@@ -101,23 +101,23 @@ export default function Section(props) {
 
 export const query = graphql`
   query PageData($id: String) {
-    categories: allContentfulCategory {
+    categories: allContentfulKbAppCategory {
       nodes {
         name
         slug
-        articles: article {
+        articles: kbapparticle {
           id
         }
       }
     }
 
-    category: contentfulCategory(id: { eq: $id }) {
+    category: contentfulKbAppCategory(id: { eq: $id }) {
       name
       description {
         description
       }
       slug
-      articles: article {
+      articles: kbapparticle {
         title
         slug
       }

Original file line number	Diff line number	Diff line change
`@@ -5,23 +5,23 @@ const articleTemplate = path.resolve('src/templates/article.js');`
`5`	`5`	`exports.createPages = async ({ graphql, actions: { createPage } }) => {`
`6`	`6`	const result = await graphql(`
`7`	`7`	`{`
`8`		`- categories: allContentfulCategory {`
	`8`	`+ categories: allContentfulKbAppCategory {`
`9`	`9`	`nodes {`
`10`	`10`	`id`
`11`	`11`	`slug`
`12`	`12`	`name`
`13`		`- articles: article {`
	`13`	`+ articles: kbapparticle {`
`14`	`14`	`id`
`15`	`15`	`}`
`16`	`16`	`}`
`17`	`17`	`}`
`18`	`18`
`19`		`- articles: allContentfulArticle {`
	`19`	`+ articles: allContentfulKbAppArticle {`
`20`	`20`	`nodes {`
`21`	`21`	`id`
`22`	`22`	`slug`
`23`	`23`	`title`
`24`		`- category {`
	`24`	`+ category: kbAppCategory {`
`25`	`25`	`slug`
`26`	`26`	`}`
`27`	`27`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ import { useStaticQuery, graphql } from 'gatsby';`
`3`	`3`	`export default function useSiteSettings() {`
`4`	`4`	const data = useStaticQuery(graphql`
`5`	`5`	`query Settings {`
`6`		`- settings: allContentfulSiteSettings {`
	`6`	`+ settings: allContentfulKbAppSiteSettings {`
`7`	`7`	`nodes {`
`8`	`8`	`headerLinks {`
`9`	`9`	`text`
`@@ -12,12 +12,16 @@ export default function useSiteSettings() {`
`12`	`12`	`heading`
`13`	`13`	`subheading`
`14`	`14`	`siteName`
	`15`	`+ description: siteDescription {`
	`16`	`+ siteDescription`
	`17`	`+ }`
`15`	`18`	`logo {`
`16`	`19`	`title`
`17`	`20`	`fixed(width: 160) {`
`18`	`21`	`src`
`19`	`22`	`}`
`20`	`23`	`}`
	`24`	`+ googleAnalyticsId`
`21`	`25`	`}`
`22`	`26`	`}`
`23`	`27`	`}`
Original file line number	Diff line number	Diff line change
`@@ -101,23 +101,23 @@ export default function Section(props) {`
`101`	`101`
`102`	`102`	export const query = graphql`
`103`	`103`	`query PageData($id: String) {`
`104`		`- categories: allContentfulCategory {`
	`104`	`+ categories: allContentfulKbAppCategory {`
`105`	`105`	`nodes {`
`106`	`106`	`name`
`107`	`107`	`slug`
`108`		`- articles: article {`
	`108`	`+ articles: kbapparticle {`
`109`	`109`	`id`
`110`	`110`	`}`
`111`	`111`	`}`
`112`	`112`	`}`
`113`	`113`
`114`		`- category: contentfulCategory(id: { eq: $id }) {`
	`114`	`+ category: contentfulKbAppCategory(id: { eq: $id }) {`
`115`	`115`	`name`
`116`	`116`	`description {`
`117`	`117`	`description`
`118`	`118`	`}`
`119`	`119`	`slug`
`120`		`- articles: article {`
	`120`	`+ articles: kbapparticle {`
`121`	`121`	`title`
`122`	`122`	`slug`
`123`	`123`	`}`