diff --git a/src/components/BannerList/BannerList.js b/src/components/BannerList/BannerList.js index 27f3a3ce..ae176460 100644 --- a/src/components/BannerList/BannerList.js +++ b/src/components/BannerList/BannerList.js @@ -32,7 +32,7 @@ export default function BannerList({ data }) { }) return ( -
+

{title} @@ -43,14 +43,14 @@ export default function BannerList({ data }) { )}

{cards} - +
{data.contactForm && ( - - )} - + + )} +
) diff --git a/src/components/BlogPage/BlogArticle/BlogArticle.js b/src/components/BlogPage/BlogArticle/BlogArticle.js index d0e27644..ed5ade0c 100644 --- a/src/components/BlogPage/BlogArticle/BlogArticle.js +++ b/src/components/BlogPage/BlogArticle/BlogArticle.js @@ -25,7 +25,7 @@ const BlogArticle = ({ title, summary, image, slug, text }) => {
- + {text}
diff --git a/src/components/BlogPage/BlogArticle/BlogArticle.scss b/src/components/BlogPage/BlogArticle/BlogArticle.scss index 22da4ecc..e676ae7e 100644 --- a/src/components/BlogPage/BlogArticle/BlogArticle.scss +++ b/src/components/BlogPage/BlogArticle/BlogArticle.scss @@ -9,14 +9,12 @@ padding: 0.5em; color: $primary; } - &__image { width: 100%; height: 170px; transition: opacity 3s ease-in; border-radius: 8px; } - &__description { // display: flex; // flex-direction: column; @@ -38,9 +36,8 @@ display: -webkit-box; -webkit-box-orient: vertical; -webkit-line-clamp: 3; - overflow: hidden; + overflow: hidden; } - p { margin-bottom: 15px; line-height: 24px; @@ -50,21 +47,19 @@ overflow: hidden; } } - &__link { position: absolute; - bottom: 0; + bottom: 15px; a { margin-right: 0; font-weight: $max_bold; cursor: pointer; - button { - @include primaryBtn; - } + text-decoration-line: underline; + color: $link-blog; + font-size: $small; } } } - @media (min-width: $breakpoint-md) { .article { &__description { @@ -73,15 +68,16 @@ line-height: 1.3rem; } } + &__link { + bottom: 0; + } } } - @media (min-width: $breakpoint-lg) { .article { &__container { flex-direction: column; padding: 1rem; - } &__image { diff --git a/src/components/BlogPage/BlogContainer.js b/src/components/BlogPage/BlogContainer.js index 410704e5..f133b9e8 100644 --- a/src/components/BlogPage/BlogContainer.js +++ b/src/components/BlogPage/BlogContainer.js @@ -1,41 +1,22 @@ import React from "react" import { useBlog } from "../../hooks" -import Layout from "../../components/layout" import BlogGrid from "./BlogGrid/BlogGrid" import BlogArticle from "./BlogArticle/BlogArticle" -import { Seo, Banner} from "../index" import "./BlogContainer.scss" const Blog = () => { const blogData = useBlog() - const data = blogData?.allStrapiBlogCategory?.nodes const dataArticles = blogData?.allStrapiArticle?.nodes - const banner = blogData?.allStrapiBlogPage?.nodes[0]?.banner - const filterArticle = data.map(category => dataArticles.filter(article => category.name === article.blog_category.name)) - - const { - pageTitle, - pageDescription, - pageKeywords, - } = blogData?.allStrapiBlogPage?.nodes[0]?.seo + const defaultCategory = data[0]?.name + const filterArticle = data.map(category => dataArticles.filter(article => category.name === article?.blog_category?.name || defaultCategory)) return ( - - {blogData?.allStrapiBlogPage?.nodes[0]?.seo && ( - - )} + <> {data.length > 0 && (
- - {banner && } - {filterArticle?.map((category, idx) => ( {category.map((item, idx) => ( @@ -52,7 +33,7 @@ const Blog = () => { ))}
)} -
+ ) } diff --git a/src/components/BlogPage/BlogGrid/BlogGrid.js b/src/components/BlogPage/BlogGrid/BlogGrid.js index 047c1b99..470ba478 100644 --- a/src/components/BlogPage/BlogGrid/BlogGrid.js +++ b/src/components/BlogPage/BlogGrid/BlogGrid.js @@ -5,7 +5,7 @@ import Pagination from '../../Pagination/Pagination' const BlogGrid = ({ title, children }) => { return (
-
{title}
+

{title}

{/*
{children}
*/}
diff --git a/src/components/BlogPage/BlogGrid/BlogGrid.scss b/src/components/BlogPage/BlogGrid/BlogGrid.scss index d23011d8..0e89a897 100644 --- a/src/components/BlogPage/BlogGrid/BlogGrid.scss +++ b/src/components/BlogPage/BlogGrid/BlogGrid.scss @@ -5,12 +5,11 @@ flex-direction: column; justify-content: center; padding: 40px 0; - border-bottom: 4px solid $alt; + border-bottom: 4px solid #dedede; - h3 { - padding-left: 5px; - font-size: $medium; - color: $blackBit; + h4 { + padding-left: 0.5rem; + color: $primary; } } } @@ -18,9 +17,8 @@ @media (min-width: $breakpoint-lg) { .grid { &__container { - h3 { - padding-left: 35px; - font-size: $large; + h4 { + padding-left: 1rem; } } diff --git a/src/components/Pagination/Pagination.scss b/src/components/Pagination/Pagination.scss index 2140b7b6..15704170 100644 --- a/src/components/Pagination/Pagination.scss +++ b/src/components/Pagination/Pagination.scss @@ -18,12 +18,12 @@ } &__link { font-weight: $bold; - color: $primary; + color: $link-blog; padding: 0.2rem; &:hover { text-decoration: none; - color: $blue; + color: $link-blog; } } } diff --git a/src/components/expandGrid/ExpandGrid.js b/src/components/expandGrid/ExpandGrid.js index 02a05db5..67ab2b8f 100644 --- a/src/components/expandGrid/ExpandGrid.js +++ b/src/components/expandGrid/ExpandGrid.js @@ -15,15 +15,14 @@ const ExpandGrid = ({ data }) => {
diff --git a/src/components/videoBackground/VideoBackground.js b/src/components/videoBackground/VideoBackground.js index 75aa9a03..a97c2534 100644 --- a/src/components/videoBackground/VideoBackground.js +++ b/src/components/videoBackground/VideoBackground.js @@ -43,7 +43,7 @@ const VideoBackground = ({ return (
{ const casesSection = component.strapi_component === "components.cases-section" && - !component.allCases ? ( + !component.allCases ? ( ) : null const casesList = component.strapi_component === "components.cases-section" && - component.allCases ? ( + component.allCases ? ( ) : null @@ -58,14 +59,17 @@ const LandingPage = ({ data, location }) => { component.strapi_component === "components.text" ? ( ) : null + const logosSection = component.strapi_component === "components.logos-section" ? ( ) : null + const form = component.strapi_component === "components.form" ? (
) : null + const banner = component.strapi_component === "components.banner" ? ( @@ -94,16 +98,23 @@ const LandingPage = ({ data, location }) => { ) : null - const professionals = + const professionals = component.strapi_component === "components.professionals-section" ? ( - ) : null - - const featuredBlogs = - component.strapi_component === "components.featured-blogs" ? ( + ) : null + + const featuredBlogs = + component.strapi_component === "components.featured-blogs" && !component.allBlog ? ( ) : null + const blogContainer = + component.strapi_component === "components.featured-blogs" && + component.allBlog ? ( + + ) : null + + return (
<> @@ -122,6 +133,7 @@ const LandingPage = ({ data, location }) => { {animatedTransition} {professionals} {featuredBlogs} + {blogContainer}
)