diff --git a/src/components/Articles/Articles.js b/src/components/Articles/Articles.js index 438c875..8991d94 100644 --- a/src/components/Articles/Articles.js +++ b/src/components/Articles/Articles.js @@ -1,14 +1,18 @@ import React from 'react'; import PropTypes from 'prop-types' import ArticleCard from './ArticleCard/ArticleCard' +import Newsletter from '../Newsletter/Newsletter' const Articles = ({ data: { edges } }) => { return ( -
-
- {edges.map(({ node }, e) => )} + <> +
+
+ {edges.map(({ node }, e) => )} +
-
+ + ) } diff --git a/src/pages/articles.js b/src/pages/articles.js index 63bb1a6..61342cd 100644 --- a/src/pages/articles.js +++ b/src/pages/articles.js @@ -13,7 +13,6 @@ import Categories from '../components/Articles/Categories/Categories' import CategoryItem from '../components/Articles/Categories/CategoryItem' import Search from '../components/Articles/Search/Search' import Offers from '../components/Offers/Offers' -import Newsletter from '../components/Newsletter/Newsletter' import SearchIcon from '../images/search-icon.svg' @@ -57,7 +56,7 @@ const ArticlesPage = ({ data: { allMarkdownRemark: edges }, }) => {
- {query ? filtredArticles.length === 0 ?

  Ничего не найдено

: null : null} + {query && query !== '' ? filtredArticles.length === 0 ?

  Ничего не найдено

: null : null}
@@ -68,7 +67,6 @@ const ArticlesPage = ({ data: { allMarkdownRemark: edges }, }) => { ? filtredArticles.length > 0 ? : null : } - diff --git a/src/templates/categoryTemplate.js b/src/templates/categoryTemplate.js index 826590e..ab9a3df 100644 --- a/src/templates/categoryTemplate.js +++ b/src/templates/categoryTemplate.js @@ -10,7 +10,6 @@ import Articles from '../components/Articles/Articles' import Categories from '../components/Articles/Categories/Categories' import CategoryItem from '../components/Articles/Categories/CategoryItem' import Offers from '../components/Offers/Offers' -import Newsletter from '../components/Newsletter/Newsletter' const CategoryPage = ({ data: { allMarkdownRemark: edges }, pageContext: { title } }) => { const { categories } = useCategoriesQuery() @@ -39,7 +38,6 @@ const CategoryPage = ({ data: { allMarkdownRemark: edges }, pageContext: { title - diff --git a/src/templates/tagTemplate.js b/src/templates/tagTemplate.js index fb1af3e..198eeb6 100644 --- a/src/templates/tagTemplate.js +++ b/src/templates/tagTemplate.js @@ -10,7 +10,6 @@ import Articles from '../components/Articles/Articles' import Categories from '../components/Articles/Categories/Categories' import CategoryItem from '../components/Articles/Categories/CategoryItem' import Offers from '../components/Offers/Offers' -import Newsletter from '../components/Newsletter/Newsletter' const TagPage = ({ data: { allMarkdownRemark: edges }, pageContext: { title } }) => { const { categories } = useCategoriesQuery() @@ -39,7 +38,6 @@ const TagPage = ({ data: { allMarkdownRemark: edges }, pageContext: { title } }) -