From 7ccddc2e9cb598d044f7f750e5ee69a336fa3d71 Mon Sep 17 00:00:00 2001 From: Drina_Rincon Date: Wed, 30 Mar 2022 17:53:52 -0300 Subject: [PATCH 1/4] Modificar bannerHead para Blog y join-us --- src/components/BannerHead/BannerHead.js | 32 +++++++++++++----------- src/components/BlogPage/BlogContainer.js | 21 +++++++--------- src/components/index.js | 4 +-- src/hooks/useBlog.js | 16 ++---------- 4 files changed, 31 insertions(+), 42 deletions(-) diff --git a/src/components/BannerHead/BannerHead.js b/src/components/BannerHead/BannerHead.js index 8e85fd33..128fbb64 100644 --- a/src/components/BannerHead/BannerHead.js +++ b/src/components/BannerHead/BannerHead.js @@ -1,28 +1,32 @@ import React from "react" import "./BannerHead.scss" import MarkdownView from "react-showdown" +import { getImage, GatsbyImage } from "gatsby-plugin-image" const BannerHead = ({ data }) => { const title = data?.title; - const image = data?.image; - console.log(image) + console.log(title, "banner") + + const checkImage = (data) => { + + if (data.image[0].url) { + return {data?.image[0]?.name} + } else { + const image = getImage(data?.image[0]?.localFile) + return + } + } + return ( ) } diff --git a/src/components/BlogPage/BlogContainer.js b/src/components/BlogPage/BlogContainer.js index b24c4f05..3a7ce0cd 100644 --- a/src/components/BlogPage/BlogContainer.js +++ b/src/components/BlogPage/BlogContainer.js @@ -3,7 +3,8 @@ import { useBlog } from "../../hooks" import Layout from "../../components/layout" import BlogGrid from "./BlogGrid/BlogGrid" import BlogArticle from "./BlogArticle/BlogArticle" -import { Seo, BannerActionCall } from "../index" +import { Seo, BannerHead } from "../index" +import { getImage, GatsbyImage } from "gatsby-plugin-image" import "./BlogContainer.scss" @@ -13,11 +14,12 @@ const Blog = () => { const data = blogData?.allStrapiBlogCategory?.nodes const dataArticles = blogData?.allStrapiArticle?.nodes - const bannerActionCall = blogData?.allStrapiBlogPage?.nodes[0]?.actionCallBanner - const title = blogData?.allStrapiBlogPage?.nodes[0]?.title - + const bannerHead = blogData?.allStrapiBlogPage?.nodes[0]?.bannerHead[0] + const title = bannerHead.title + const image = getImage(bannerHead.image[0]?.localFile) const filterArticle = data.map(category => dataArticles.filter(article => category.name === article.blog_category.name)) + console.log(bannerHead) const { pageTitle, pageDescription, @@ -35,12 +37,9 @@ const Blog = () => { )} {data.length > 0 && (
- {title && ( -
-

-

- )} - + + {bannerHead && } + {filterArticle?.map((category, idx) => ( {category.map((item, idx) => ( @@ -57,8 +56,6 @@ const Blog = () => { ))}
)} - - {bannerActionCall && } ) } diff --git a/src/components/index.js b/src/components/index.js index f5d40eca..f77a2465 100644 --- a/src/components/index.js +++ b/src/components/index.js @@ -5,7 +5,7 @@ import BannerLogo from "./Banners/BannerLogo" import BannerISO from "./Banners/BannerISO" import BannerClientes from "./Banners/BannerClientes" import BannerTop from "./Banners/BannerTop" -import BannerActionCall from "./Banners/BannerActionCall" +import BannerHead from "./BannerHead/BannerHead" import CasesSection from "./CasesSection/CasesSection" import CasesList from "./CasesSection/CasesList" @@ -20,5 +20,5 @@ export { BannerISO, BannerClientes, BannerTop, - BannerActionCall, + BannerHead } diff --git a/src/hooks/useBlog.js b/src/hooks/useBlog.js index 7cbe94dc..69c029d3 100644 --- a/src/hooks/useBlog.js +++ b/src/hooks/useBlog.js @@ -27,18 +27,13 @@ const useBlog = () => { } allStrapiBlogPage { nodes { - title seo: pageMetadata { pageTitle pageKeywords pageDescription } - actionCallBanner { + bannerHead { title - link { - name - pathTo - } image { localFile { childImageSharp { @@ -46,14 +41,7 @@ const useBlog = () => { } } } - imageDarkMode { - localFile { - childImageSharp { - gatsbyImageData - } - } - } - } + } } } } From 6d3f56c1b3e96888a05c9a405898ca4762246cd8 Mon Sep 17 00:00:00 2001 From: Drina_Rincon Date: Wed, 30 Mar 2022 18:03:53 -0300 Subject: [PATCH 2/4] arreglar detalles --- src/components/BannerHead/BannerHead.js | 1 - src/components/BlogPage/BlogContainer.js | 3 --- 2 files changed, 4 deletions(-) diff --git a/src/components/BannerHead/BannerHead.js b/src/components/BannerHead/BannerHead.js index 128fbb64..f1bf2e69 100644 --- a/src/components/BannerHead/BannerHead.js +++ b/src/components/BannerHead/BannerHead.js @@ -6,7 +6,6 @@ import { getImage, GatsbyImage } from "gatsby-plugin-image" const BannerHead = ({ data }) => { const title = data?.title; - console.log(title, "banner") const checkImage = (data) => { diff --git a/src/components/BlogPage/BlogContainer.js b/src/components/BlogPage/BlogContainer.js index 3a7ce0cd..08940bde 100644 --- a/src/components/BlogPage/BlogContainer.js +++ b/src/components/BlogPage/BlogContainer.js @@ -4,7 +4,6 @@ import Layout from "../../components/layout" import BlogGrid from "./BlogGrid/BlogGrid" import BlogArticle from "./BlogArticle/BlogArticle" import { Seo, BannerHead } from "../index" -import { getImage, GatsbyImage } from "gatsby-plugin-image" import "./BlogContainer.scss" @@ -15,8 +14,6 @@ const Blog = () => { const data = blogData?.allStrapiBlogCategory?.nodes const dataArticles = blogData?.allStrapiArticle?.nodes const bannerHead = blogData?.allStrapiBlogPage?.nodes[0]?.bannerHead[0] - const title = bannerHead.title - const image = getImage(bannerHead.image[0]?.localFile) const filterArticle = data.map(category => dataArticles.filter(article => category.name === article.blog_category.name)) console.log(bannerHead) From cf6b5c8ea1964c1be9ae1fd5ce797737551f5b7c Mon Sep 17 00:00:00 2001 From: Drina_Rincon Date: Wed, 30 Mar 2022 18:07:33 -0300 Subject: [PATCH 3/4] sacar data de checkImage --- src/components/BannerHead/BannerHead.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/BannerHead/BannerHead.js b/src/components/BannerHead/BannerHead.js index f1bf2e69..dd80fa46 100644 --- a/src/components/BannerHead/BannerHead.js +++ b/src/components/BannerHead/BannerHead.js @@ -7,7 +7,7 @@ const BannerHead = ({ data }) => { const title = data?.title; - const checkImage = (data) => { + const checkImage = () => { if (data.image[0].url) { return {data?.image[0]?.name} From 490f6cd42ff532ef9def45424e8151ba411173d0 Mon Sep 17 00:00:00 2001 From: Drina_Rincon Date: Wed, 30 Mar 2022 18:10:22 -0300 Subject: [PATCH 4/4] . --- src/components/BannerHead/BannerHead.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/BannerHead/BannerHead.js b/src/components/BannerHead/BannerHead.js index dd80fa46..c86e1877 100644 --- a/src/components/BannerHead/BannerHead.js +++ b/src/components/BannerHead/BannerHead.js @@ -9,7 +9,7 @@ const BannerHead = ({ data }) => { const checkImage = () => { - if (data.image[0].url) { + if (data?.image[0]?.url) { return {data?.image[0]?.name} } else { const image = getImage(data?.image[0]?.localFile) @@ -20,7 +20,7 @@ const BannerHead = ({ data }) => { return (