merge dev to main

src/components/Banners/BannerActionCall.js

@@ -1,11 +1,10 @@
 import React from "react"
 import { Link } from "gatsby"
-
 import { getImage, GatsbyImage } from "gatsby-plugin-image"
 import "./BannerActionCall.scss"
 
 const BannerActionCall = ({ banner }) => {
-  const icon = getImage(banner?.logo?.localFile)
+  const icon = getImage(banner?.image?.localFile)
 
   return (
     <div className="bannerActCall">

src/components/Banners/BannerActionCall.scss

@@ -18,7 +18,7 @@
     max-width: 195px;
   }
   &__logo {
-    flex-basis: 80px;
+    flex-basis: 60px;
     padding-bottom: 30px;
   }
   &__title {
@@ -67,7 +67,7 @@
       margin-top: 7rem;
     }
     &__logo {
-      flex-basis: 135px;
+      flex-basis: 110px;
       padding-bottom: 65px;
       //   transform: translateY(-10%);
     }

src/components/Banners/BannerBgImage.js

@@ -2,22 +2,18 @@ import React from "react"
 import { Link } from "gatsby"
 import { getImage } from "gatsby-plugin-image"
 import { BgImage } from "gbimage-bridge"
-import { useBanner } from "../../hooks/index"
 import showdown from "showdown"
 import "./BannerBgImage.scss"
 
 import { useTheme } from "../../context/themeContext"
 
 const BannerBgImage = ({ banner }) => {
-  const dataBanner = useBanner()
+
   const { theme } = useTheme()
 
-  const bannerSelected = dataBanner?.allStrapiBanners?.nodes.find(
-    ban => ban.strapiId === banner.id
-  )
-  const { image, imageDarkMode, link, summary } = bannerSelected
+  const { bgImage, bgImageDarkMode, link, title } = banner
 
-  const titles = summary
+  const titles = title
   let converter = new showdown.Converter()
   let post = titles
   let html = converter.makeHtml(post)
@@ -26,12 +22,12 @@ const BannerBgImage = ({ banner }) => {
     return { __html: html }
   }
 
-  const imagen = getImage(image?.localFile)
-  const imagenDM = getImage(imageDarkMode?.localFile)
+  const imagen = getImage(bgImage?.localFile)
+  const imagenDM = getImage(bgImageDarkMode?.localFile)
 
   return (
     <div className="bannerBgImage">
-      {bannerSelected.type === "bgImage" ? (
+      {banner.bgImage ? (
         <BgImage
           image={theme === "dark" && imagenDM ? imagenDM : imagen}
           className="bannerBgImage__bgImage"

src/components/Banners/BannerISO.js

@@ -1,18 +1,13 @@
 import React from "react"
 import { getImage, GatsbyImage } from "gatsby-plugin-image"
-import { useBanner } from "../../hooks/index"
 import showdown from "showdown"
 import "./BannerISO.scss"
 
-const BannerISO = ({ banner, title }) => {
-  const dataBanner = useBanner()
+const BannerISO = ({ banner }) => {
 
-  const bannerSelected = dataBanner?.allStrapiBanners?.nodes.find(
-    ban => ban.strapiId === banner.id
-  )
-  const { logo, summary } = bannerSelected
+  const { title, subtitle, image, imageDarkMode } = banner
 
-  const titles = summary
+  const titles = subtitle
   let converter = new showdown.Converter()
   let post = titles
   let html = converter.makeHtml(post)
@@ -31,7 +26,7 @@ const BannerISO = ({ banner, title }) => {
           ></div>
         </div>
         <div className="bannerISO__image ">
-          <GatsbyImage image={getImage(logo?.localFile)} alt={`img-${title}`} />
+          <GatsbyImage image={getImage(image?.localFile)} alt={`img-${title}`} />
         </div>
       </div>
     </div>

src/components/Banners/BannerLogo.js

@@ -7,21 +7,15 @@ import { useTheme } from "../../context/themeContext"
 
 import "./BannerLogo.scss"
 
-const BannerLogo = ({ banner, title }) => {
+const BannerLogo = ({ banner }) => {
   const { theme } = useTheme()
+  const { bgImage, bgImageDarkMode, image, imageDarkMode, title } = banner
 
-  const dataBanner = useBanner()
-
-  const bannerSelected = dataBanner?.allStrapiBanners?.nodes.find(
-    ban => ban.strapiId === banner.id
-  )
-  const { image, imageDarkMode, logo, logoDarkMode, summary } = bannerSelected
-
-  const imagen = getImage(image?.localFile)
-  const logoImage = getImage(logo?.localFile)
+  const imagen = getImage(bgImage?.localFile)
+  const logoImage = getImage(image?.localFile)
   // Version Dark Mode
-  const imagenDM = getImage(imageDarkMode?.localFile)
-  const logoDM = getImage(logoDarkMode?.localFile)
+  const imagenDM = getImage(bgImageDarkMode?.localFile)
+  const logoDM = getImage(imageDarkMode?.localFile)
 
   return (
     <>
@@ -40,14 +34,14 @@ const BannerLogo = ({ banner, title }) => {
           <h1 className="BannerLogo__Title">{title}</h1>
         </BgImage>
       )}
-
-      {summary ? (
+{/* 
+      {title ? (
         <div className="BannerLogo__summary">
           <div className="container ">
-            <p className="BannerLogo__summary__txt">{summary}</p>
+            <p className="BannerLogo__summary__txt">{title}</p>
           </div>
         </div>
-      ) : null}
+      ) : null} */}
     </>
   )
 }

src/components/Banners/BannerTop.js

@@ -6,11 +6,11 @@ import "./BannerTop.scss"
 import { useTheme } from "../../context/themeContext"
 
 const BannerTop = ({ banner }) => {
-  const { image, imageDarkMode, title, summary } = banner
+  const { bgImage, bgImageDarkMode, title, summary } = banner
   const { theme } = useTheme()
 
-  const imageBanner = getImage(image?.localFile)
-  const imageDM = getImage(imageDarkMode?.localFile)
+  const imageBanner = getImage(bgImage?.localFile)
+  const imageDM = getImage(bgImageDarkMode?.localFile)
 
   return (
     <div className="banner">

src/components/Banners/BannerTop.scss

@@ -25,13 +25,14 @@
 
     &__txt {
       color: $white;
-      font-size: 15px;
+      font-size: $medium;
       padding: 23px 16px;
       font-weight: $normal;
-      line-height: 18px;
+      line-height: 25px;
       letter-spacing: 0em;
       text-align: center;
       margin: 20px 0 20px;
+      font-weight: bold;
     }
   }
 }

src/components/BitwayPage/BitwayContainer.js

@@ -7,21 +7,15 @@ import Gallery from "./Gallery/Gallery"
 import Paragraph from "./Paragraph/Paragraph"
 import "./BitwayContainer.scss"
 import BannerActionCall from "../Banners/BannerActionCall"
-import { useBanner } from "../../hooks"
+
 
 const BitwayPage = () => {
   const {
     allStrapiBitwayPage: { nodes },
   } = useBitwayPage()
 
   const sections = nodes[0]?.sections
-
-  const bannerData = useBanner()
-
-  const bannerActionCall = bannerData?.allStrapiBanners?.nodes.find(
-    banner => banner.page === "bitway" && banner.type === "actionCall"
-  )
-
+  const bannerActionCall  = nodes[0]?.actionCallBanner
   const { pageTitle, pageDescription, pageKeywords } = nodes[0]?.SEO
 
   // vista desktop

src/components/BitwayPage/Gallery/Gallery.scss

@@ -20,7 +20,7 @@
 .bitway-gallery {
   display: grid;
   grid-template-rows: 400px;
-  gap: 20px;
+  gap: 10px;
   overflow: hidden;
 }
 
@@ -44,7 +44,7 @@
   background: #1ECAD380;
   color: white;
   font-family: Roboto;
-  font-size: 45px;
+  font-size: 35px;
   font-style: normal;
   font-weight: 700;
   line-height: 51px;
@@ -59,7 +59,7 @@
   }
 
   .bitway-gallery-item-inner {
-    font-size: 25px;
+    font-size: 20px;
   }
 
 

src/components/BitwayPage/Paragraph/Paragraph.scss

@@ -9,7 +9,7 @@
     font-weight: 400;
     line-height: 30px;
     letter-spacing: 0em;
-    text-align: left;
+    text-align: justify;
   }
   & > div > p {
     font-family: $primary-font;
@@ -18,7 +18,7 @@
     font-weight: 400;
     line-height: 30px;
     letter-spacing: 0em;
-    text-align: left;
+    text-align: justify;
     // padding: 0 80px 20px;
     & * {
       font-size: 20px;
@@ -39,10 +39,10 @@
     font-size: $large;
     font-style: normal;
     font-weight: 700;
-    line-height: 51px;
+    line-height: 40px;
     letter-spacing: 0em;
     text-align: center;
-    margin: 80px 0 45px;
+    margin: 40px 0 45px;
     & span {
       font-size: $large;
       background-color: $blue;
@@ -71,7 +71,7 @@
       font-weight: 400;
       line-height: 26px;
       letter-spacing: 0em;
-      text-align: left;
+      text-align: justify;
     }
     & > div > p {
       font-family: $primary-font;
@@ -80,7 +80,7 @@
       font-weight: 400;
       line-height: 26px;
       letter-spacing: 0em;
-      text-align: left;
+      text-align: justify;
       // padding: 0 20px 0px 0px;
       & * {
         font-size: 15px;

src/components/BlogPage/BlogContainer.js

@@ -1,27 +1,20 @@
 import React from "react"
-import { useBanner, useBlog } from "../../hooks"
-
+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 "./BlogContainer.scss"
 
 const Blog = () => {
-  const bannerData = useBanner()
+
   const blogData = useBlog()
+
   const data = blogData?.allStrapiBlogCategory?.nodes
   const dataArticles = blogData?.allStrapiArticle?.nodes
-
-  const bannerBlog = bannerData?.allStrapiBanners?.nodes.find(
-    banner => banner.page === "blog" && banner.type === "bgColor"
-  )
-
-  const bannerActionCall = bannerData?.allStrapiBanners?.nodes.find(
-    banner => banner.page === "blog" && banner.type === "actionCall"
-  )
+  const bannerActionCall = blogData?.allStrapiBlogPage?.nodes[0]?.actionCallBanner
+  const title = blogData?.allStrapiBlogPage?.nodes[0]?.title
 
   const filterArticle = data.map(category => dataArticles.filter(article => category.name === article.blog_category.name))
 
@@ -42,9 +35,9 @@ const Blog = () => {
       )}
       {data.length > 0 && (
         <div className="blog__container">
-          {bannerBlog && (
+          {title && (
             <div className="banner__container">
-              <h3 dangerouslySetInnerHTML={{ __html: bannerBlog.summary }} />
+              <h3 dangerouslySetInnerHTML={{ __html: title }} />
             </div>
           )}
 

src/components/BlogPage/BlogContainer.scss

@@ -29,8 +29,10 @@
             background-color: $blue;
             overflow: hidden;
             transform: skew(-20deg);
+            margin-left: 10px;
 
             p {
+                font-size: $medium;
                 padding: 10px;
                 margin-bottom: 0;
                 color: $white;
@@ -55,6 +57,10 @@
             span {
                 margin-top: 0;
                 margin-left: 15px;
+
+                p{
+                    font-size: $large;
+                }
             }
         }
     }

src/components/Cards/Cards.scss

@@ -8,14 +8,16 @@
   &__title {
     color: $primary;
     font-weight: $max-bold;
-    font-size: $medium;
     line-height: $large;
     text-align: center;
     padding: 90px 5px 19px;
     display: flex;
     flex-direction: column;
     align-items: center;
     gap: 20px;
+    h3{
+      font-size: $medium;
+    }
     &-logo {
       margin: 0 0;
     }
@@ -42,13 +44,14 @@
       font-weight: $normal;
       font-size: 15px;
       line-height: 20px;
+      text-align: justify;
     }
   }
   &__submodules {
     background-color: none;
     color: $primary;
     position: relative;
-    padding: 0 45px;
+    padding: 0 10px;
 
     &__title {
       margin: 2em 0 30px 0;
@@ -96,10 +99,12 @@
       transform: translate(60%, 60%);
     }
     &__title {
-      font-size: $large;
       text-align: start;
       flex-direction: row;
       align-items: flex-end;
+      h3{
+        font-size: $large;
+      }
       &-logo {
         width: 115px;
         display: flex;