diff --git a/src/components/BannerHead/BannerHead.js b/src/components/BannerHead/BannerHead.js new file mode 100644 index 00000000..910766b9 --- /dev/null +++ b/src/components/BannerHead/BannerHead.js @@ -0,0 +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 checkImage = () => { + + if (data?.image?.url) { + return {data?.image?.name} + } else { + const image = getImage(data?.image?.localFile) + return + } + } + + return ( + + ) +} + +export default BannerHead diff --git a/src/components/BannerHead/BannerHead.scss b/src/components/BannerHead/BannerHead.scss new file mode 100644 index 00000000..91fce2c8 --- /dev/null +++ b/src/components/BannerHead/BannerHead.scss @@ -0,0 +1,50 @@ +@import "../../styles/global.scss"; +//Pase todos los estilos de PageJobs, cuando este definido el estilo de la pag join-us lo cambiamos + +.banner { + width: 100%; + min-height: 300px; + align-items: center; + + h3 { + color: $primary; + text-align: center; + + span { + background-color: $primary; + display: inline-block; + -webkit-transform: skew(-15deg); + transform: skew(-15deg); + + h3 { + padding: 5px 20px; + -webkit-transform: skew(15deg); + transform: skew(15deg); + color: $white !important; + margin: 0; + } + } + } + h6 { + color: $primary; + //border-bottom: 4px solid $blue; + //padding: 7px; + text-align: center; + //padding: 0px 15px; + } +} + +.cats-mobile { + &-column-name { + font-size: $small; + } +} + +@media (min-width: $breakpoint-md) { + .banner { + h6 { + border-bottom: 4px solid $primary !important; + padding: 7px; + } + } +} diff --git a/src/components/BlogPage/BlogContainer.js b/src/components/BlogPage/BlogContainer.js index b24c4f05..ec0310c2 100644 --- a/src/components/BlogPage/BlogContainer.js +++ b/src/components/BlogPage/BlogContainer.js @@ -3,7 +3,7 @@ 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 "./BlogContainer.scss" @@ -13,11 +13,10 @@ 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 const filterArticle = data.map(category => dataArticles.filter(article => category.name === article.blog_category.name)) + console.log(bannerHead) const { pageTitle, pageDescription, @@ -35,12 +34,9 @@ const Blog = () => { )} {data.length > 0 && (
- {title && ( -
-

-

- )} - + + {bannerHead && } + {filterArticle?.map((category, idx) => ( {category.map((item, idx) => ( @@ -57,8 +53,6 @@ const Blog = () => { ))}
)} - - {bannerActionCall && } ) } diff --git a/src/components/Catsone/catsone.js b/src/components/Catsone/catsone.js new file mode 100644 index 00000000..b70ecb49 --- /dev/null +++ b/src/components/Catsone/catsone.js @@ -0,0 +1,23 @@ +import React from "react" +import Helmet from "react-helmet" +import "./catsone.scss" + +const Catsone = () => { + return ( + <> +
+ + + + + + ) +} + +export default Catsone diff --git a/src/components/JobsPage/JobsPage.scss b/src/components/Catsone/catsone.scss similarity index 96% rename from src/components/JobsPage/JobsPage.scss rename to src/components/Catsone/catsone.scss index 0e98a897..2e58041a 100644 --- a/src/components/JobsPage/JobsPage.scss +++ b/src/components/Catsone/catsone.scss @@ -1,5 +1,5 @@ @import "../../styles/global.scss"; - +//Pase todos los estilos de PageJobs, cuando este definido el estilo de la pag join us lo cambiamos .cats-multiselect { &-label { color: $primary !important; diff --git a/src/components/JobsPage/JobsPage.js b/src/components/JobsPage/JobsPage.js deleted file mode 100644 index 643257fd..00000000 --- a/src/components/JobsPage/JobsPage.js +++ /dev/null @@ -1,37 +0,0 @@ -import React from "react" -import Layout from "../layout" -import Helmet from "react-helmet" -import { Seo } from "../index" -import "./JobsPage.scss" - -const JobsPage = () => { - return ( - - - -
- - - - -
- ) -} - -export default JobsPage diff --git a/src/components/NavBar/AnimatedNavBar/AnimatedNavbar.js b/src/components/NavBar/AnimatedNavBar/AnimatedNavbar.js index 1bb69f7a..8fc6cdd6 100644 --- a/src/components/NavBar/AnimatedNavBar/AnimatedNavbar.js +++ b/src/components/NavBar/AnimatedNavBar/AnimatedNavbar.js @@ -24,11 +24,7 @@ const getComponentTitle = component => { ) } -const AnimatedNavbar = ({ - landingComponents, - navbarItems = [], - duration, -}) => { +const AnimatedNavbar = ({ landingComponents, navbarItems = [], duration }) => { const navbarConfig = [ ...navbarItems.map(navItem => { if (navItem.landing) { @@ -56,11 +52,6 @@ const AnimatedNavbar = ({ } } }), - { - title: "Join Us", - slug: "jobs", - dropdown: () => , - }, { title: "Blog", slug: "blog", diff --git a/src/components/NavBar/AnimatedNavBar/DropdownContainer/dropdown.scss b/src/components/NavBar/AnimatedNavBar/DropdownContainer/dropdown.scss index 8194ea43..d65f2558 100644 --- a/src/components/NavBar/AnimatedNavBar/DropdownContainer/dropdown.scss +++ b/src/components/NavBar/AnimatedNavBar/DropdownContainer/dropdown.scss @@ -4,7 +4,6 @@ &-section { padding: 28px; position: relative; - z-index: 10; } &-link { font-size: 18px; diff --git a/src/components/NavBar/NavBar.scss b/src/components/NavBar/NavBar.scss index b606dfb4..746f257f 100644 --- a/src/components/NavBar/NavBar.scss +++ b/src/components/NavBar/NavBar.scss @@ -2,6 +2,7 @@ .NavBar { background-color: white; + z-index: 10; } .NavBar__Logo { margin: 16px 28px; @@ -49,6 +50,7 @@ align-items: center; justify-content: space-around; &-contact { + white-space: nowrap; box-shadow: 0px 2px 10px #3f6be880; padding: .6em; background-color: #3F6BE8; @@ -71,7 +73,7 @@ display: flex; flex-direction: row; & > a { - flex-basis: 30%; + flex-basis: 20%; } } .NavBar__Logo { @@ -89,6 +91,7 @@ .NavBar__Item { margin-right: 2.5rem; margin-top: .5em; + white-space: nowrap; } .NavBar_Side{ justify-content: unset; diff --git a/src/components/index.js b/src/components/index.js index f92f9fcc..f77a2465 100644 --- a/src/components/index.js +++ b/src/components/index.js @@ -5,13 +5,12 @@ 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" -import JobsPage from "./JobsPage/JobsPage" + export { - JobsPage, Cards, CasesList, CasesSection, @@ -21,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 - } - } - } - } + } } } } diff --git a/src/pages/jobs.js b/src/pages/jobs.js deleted file mode 100644 index 54baac6b..00000000 --- a/src/pages/jobs.js +++ /dev/null @@ -1,6 +0,0 @@ -import React from "react" -import {JobsPage} from "../components" - -const Jobs = () => - -export default Jobs \ No newline at end of file diff --git a/src/schema/blogSchema.js b/src/schema/blogSchema.js index d8fb52f9..08209392 100644 --- a/src/schema/blogSchema.js +++ b/src/schema/blogSchema.js @@ -442,23 +442,96 @@ type StrapiBlogCategory implements Node { pageMetadata: StrapiBlogPagePageMetadata strapiId: Int title: String - actionCallBanner: StrapiBlogPageActionCallBanner + bannerHead: StrapiBlogPageBannerHead } - - type StrapiBlogPageActionCallBanner { + + type StrapiBlogPageBannerHead { id: Int title: String - link: StrapiBlogPageActionCallBannerLink image: LocalFile - imageDarkMode: LocalFile } - type StrapiBlogPageActionCallBannerLink { + type StrapiBlogPageBannerHeadImage { id: Int name: String - pathTo: String + alternativeText: String + caption: String + width: Int + height: Int + formats: StrapiBlogPageBannerHeadImageFormats + hash: String + ext: String + mime: String + size: Float + url: String + provider: String + created_at( + formatString: String + fromNow: Boolean + difference: String + locale: String + ): Date + updated_at( + formatString: String + fromNow: Boolean + difference: String + locale: String + ): Date + localFile: File + } + + type StrapiBlogPageBannerHeadImageFormats { + large: StrapiBlogPageBannerHeadImageFormatsLarge + small: StrapiBlogPageBannerHeadImageFormatsSmall + medium: StrapiBlogPageBannerHeadImageFormatsMedium + thumbnail: StrapiBlogPageBannerHeadImageFormatsThumbnail } + type StrapiBlogPageBannerHeadImageFormatsLarge { + ext: String + url: String + hash: String + mime: String + name: String + size: Float + width: Int + height: Int + } + + type StrapiBlogPageBannerHeadImageFormatsSmall { + ext: String + url: String + hash: String + mime: String + name: String + size: Float + width: Int + height: Int + } + + type StrapiBlogPageBannerHeadImageFormatsMedium { + ext: String + url: String + hash: String + mime: String + name: String + size: Float + width: Int + height: Int + } + + type StrapiBlogPageBannerHeadImageFormatsThumbnail { + ext: String + url: String + hash: String + mime: String + name: String + size: Float + width: Int + height: Int + } + + type StrapiBlogPagePageMetadata { id: Int pageTitle: String diff --git a/src/schema/schema.js b/src/schema/schema.js index 7527055e..54f98638 100644 --- a/src/schema/schema.js +++ b/src/schema/schema.js @@ -1198,41 +1198,6 @@ type StrapiGlobalConfigScript { src: String } -type StrapiJobsPage implements Node { - id: ID! - parent: Node - children: [Node!]! - internal: Internal! - title: String - published_at( - formatString: String - fromNow: Boolean - difference: String - locale: String - ): Date - created_at( - formatString: String - fromNow: Boolean - difference: String - locale: String - ): Date - updated_at( - formatString: String - fromNow: Boolean - difference: String - locale: String - ): Date - strapiId: Int - pageMetadata: StrapiJobsPagePageMetadata -} - -type StrapiJobsPagePageMetadata { - id: Int - pageTitle: String - pageDescription: String - pageKeywords: String -} - type StrapiLayoutFooter { id: Int subscription: StrapiLayoutFooterSubscription diff --git a/src/templates/LandingPage.js b/src/templates/LandingPage.js index 54e73fbb..239dedad 100644 --- a/src/templates/LandingPage.js +++ b/src/templates/LandingPage.js @@ -5,43 +5,55 @@ import { Seo, CasesSection, CasesList } from "../components/index.js" // componentes del body import Hero from "../components/Hero/Hero" -import BannerList from '../components/BannerList/BannerLis'; +import BannerList from "../components/BannerList/BannerLis" import ExpandGrid from "../components/expandGrid/ExpandGrid" +import Catsone from "../components/Catsone/catsone" +import BannerHead from '../components/BannerHead/BannerHead'; const LandingPage = ({ data, location }) => { const pageData = data?.allStrapiLandingPage?.nodes[0] const content = pageData.body.map((component, idx) => { - - const hero = component.strapi_component === "home.hero" ? + console.log(component) + const hero = component.strapi_component === "home.hero" ? : null - const bannerList = component.strapi_component === "components.banner-list" ? + const bannerList = component.strapi_component === "components.banner-list" ? : null - const expandGrid = component.strapi_component === "components.selected-grid" ? + const expandGrid = component.strapi_component === "components.selected-grid" ? : null - const casesSection = (component.strapi_component === "components.cases-section" && !component.allCases) ? + const casesSection = (component.strapi_component === "components.cases-section" && !component.allCases) ? : null - const casesList = (component.strapi_component === "components.cases-section" && component.allCases) ? + const casesList = (component.strapi_component === "components.cases-section" && component.allCases) ? : null + const catsone = component.strapi_component === "scripts.catsone" ? + : + null + + const bannerHead = component.strapi_component === "banners.banner-head" ? + : + null + return (
- <> - {component.strapi_component === "home.hero" && hero} - {component.strapi_component === "components.banner-list" && bannerList} - {component.strapi_component === "components.selected-grid" && expandGrid} - {(component.strapi_component === "components.cases-section" && !component.allCases) && casesSection} - {(component.strapi_component === "components.cases-section" && component.allCases) && casesList} - -
+ <> + {hero} + {bannerList} + {expandGrid} + {casesSection} + {casesList} + {catsone} + {bannerHead} + + ) })