Merge pull request #60 from dadoagency/adv3-footer

Advertorial 3 Footer RichText Field
dadoagency · Jan 7, 2021 · e0677be · e0677be
2 parents 3e65be1 + 1ce49c6
commit e0677be
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 5 deletions.
diff --git a/src/__snapshots__/storybook.test.js.snap b/src/__snapshots__/storybook.test.js.snap
@@ -3289,7 +3289,7 @@ exports[`Storyshots AdvertorialType1 Default 1`] = `
       >
         <p>
           Copyright © 
-          2020
+          2021
            
           <a
             href="/"
@@ -4666,7 +4666,7 @@ exports[`Storyshots Footer Default 1`] = `
     >
       <p>
         Copyright © 
-        2020
+        2021
          
         <a
           href="/"
@@ -5127,7 +5127,7 @@ exports[`Storyshots Layout Default 1`] = `
       >
         <p>
           Copyright © 
-          2020
+          2021
            
           <a
             href="/"

diff --git a/src/templates/AdvertorialType3/Footer/Footer.js b/src/templates/AdvertorialType3/Footer/Footer.js
@@ -1,7 +1,9 @@
 import React from "react"
 import * as S from "./Footer.style"
+import renderOptions from "../../utils/richText"
+import { documentToReactComponents } from "@contentful/rich-text-react-renderer"
 
-function Footer({ links, companyDetails }) {
+function DefaultFooter({ links, companyDetails }) {
   const { name, url } = companyDetails
   return (
     <S.Wrapper>
@@ -27,4 +29,15 @@ function Footer({ links, companyDetails }) {
     </S.Wrapper>
   )
 }
+
+function Adv3Footer({footerSection}) {
+  return <S.Wrapper>
+{documentToReactComponents(footerSection,renderOptions)}
+  </S.Wrapper>
+}
+
+function Footer({ links, companyDetails, footerSection }) {
+  return footerSection ? <Adv3Footer footerSection={footerSection} /> : <DefaultFooter links={links} companyDetails={companyDetails} />
+}
+
 export default Footer
diff --git a/src/templates/AdvertorialType3/Layout/Layout.js b/src/templates/AdvertorialType3/Layout/Layout.js
@@ -14,6 +14,7 @@ export default ({
   headerLinks,
   footerLinks,
   companyDetails,
+  footerSection,
   pageTitle,
   ...props
 }) => {
@@ -24,7 +25,7 @@ export default ({
       </Helmet>
       <Header logo={logo} headerContentRight={headerContentRight} />
       {children}
-      <Footer links={footerLinks} companyDetails={companyDetails} />
+      <Footer links={footerLinks} companyDetails={companyDetails} footerSection={footerSection} />
     </div>
   )
 }
diff --git a/src/templates/AdvertorialType3/index.js b/src/templates/AdvertorialType3/index.js
@@ -51,6 +51,9 @@ export const AdvertorialType3Page = graphql`
       body {
         json
       }
+      footer {
+        json
+      }
     }
 `
 
@@ -75,6 +78,7 @@ function AdvertorialType3(props) {
   const heroImg = node.heroImage.image.fluid
   const heroSection = node.heroSection.json
   const mainSection = node.body.json
+  const footerSection = node.footer ? node.footer.json : null
 
   return (
     <>
@@ -84,6 +88,7 @@ function AdvertorialType3(props) {
         logo={logo}
         footerLinks={footerLinks}
         companyDetails={companyDetails}
+        footerSection={footerSection}
         headerContentRight={documentToReactComponents(
           headerContentRight,
           renderOptions