bubble/devthread.ru
1
0
Fork 0
mirror of https://github.com/sergeyyarkov/devthread.ru.git synced 2026-10-11 10:19:13 +03:00
Code Issues Packages Projects Releases Wiki Activity

origin master

Browse Source
This commit is contained in:
Sergey Yarkov 2020-07-14 18:06:47 +03:00
parent df95dbd6cb
commit ac1b840749
4 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/components/Articles/Articles.js
View File

@ -1,14 +1,18 @@
import React from 'react'; import React from 'react';
import PropTypes from 'prop-types' import PropTypes from 'prop-types'
import ArticleCard from './ArticleCard/ArticleCard' import ArticleCard from './ArticleCard/ArticleCard'
import Newsletter from '../Newsletter/Newsletter'
const Articles = ({ data: { edges } }) => { const Articles = ({ data: { edges } }) => {
return ( return (
<>
<div className="articles"> <div className="articles">
<div className="articles-content"> <div className="articles-content">
{edges.map(({ node }, e) => <ArticleCard key={e} data={node.frontmatter} />)} {edges.map(({ node }, e) => <ArticleCard key={e} data={node.frontmatter} />)}
</div> </div>
</div> </div>
<Newsletter />
</>
) )
} }

4
src/pages/articles.js
View File

@ -13,7 +13,6 @@ import Categories from '../components/Articles/Categories/Categories'
import CategoryItem from '../components/Articles/Categories/CategoryItem' import CategoryItem from '../components/Articles/Categories/CategoryItem'
import Search from '../components/Articles/Search/Search' import Search from '../components/Articles/Search/Search'
import Offers from '../components/Offers/Offers' import Offers from '../components/Offers/Offers'
import Newsletter from '../components/Newsletter/Newsletter'
import SearchIcon from '../images/search-icon.svg' import SearchIcon from '../images/search-icon.svg'
@ -57,7 +56,7 @@ const ArticlesPage = ({ data: { allMarkdownRemark: edges }, }) => {
</Categories> </Categories>
<Search allArticles={allArticles.edges} filterArticles={filterArticles} articlesLength={edges.edges.length} resultsLength={filtredArticles.length} query={query} setQuery={setQuery} setFiltredArticles={setFiltredArticles} /> <Search allArticles={allArticles.edges} filterArticles={filterArticles} articlesLength={edges.edges.length} resultsLength={filtredArticles.length} query={query} setQuery={setQuery} setFiltredArticles={setFiltredArticles} />
<div className="articles-info"> <div className="articles-info">
{query ? filtredArticles.length === 0 ? <p><SearchIcon />&nbsp;&nbsp;Ничего не найдено</p> : null : null} {query && query !== '' ? filtredArticles.length === 0 ? <p><SearchIcon />&nbsp;&nbsp;Ничего не найдено</p> : null : null}
</div> </div>
</div> </div>
</Col> </Col>
@ -68,7 +67,6 @@ const ArticlesPage = ({ data: { allMarkdownRemark: edges }, }) => {
? filtredArticles.length > 0 ? <Articles data={{edges: filtredArticles}} /> : null ? filtredArticles.length > 0 ? <Articles data={{edges: filtredArticles}} /> : null
: <Articles data={edges} /> : <Articles data={edges} />
} }
<Newsletter />
</Col > </Col >
<Col lg={3} xs={12}> <Col lg={3} xs={12}>
<Offers /> <Offers />

2
src/templates/categoryTemplate.js
View File

@ -10,7 +10,6 @@ import Articles from '../components/Articles/Articles'
import Categories from '../components/Articles/Categories/Categories' import Categories from '../components/Articles/Categories/Categories'
import CategoryItem from '../components/Articles/Categories/CategoryItem' import CategoryItem from '../components/Articles/Categories/CategoryItem'
import Offers from '../components/Offers/Offers' import Offers from '../components/Offers/Offers'
import Newsletter from '../components/Newsletter/Newsletter'
const CategoryPage = ({ data: { allMarkdownRemark: edges }, pageContext: { title } }) => { const CategoryPage = ({ data: { allMarkdownRemark: edges }, pageContext: { title } }) => {
const { categories } = useCategoriesQuery() const { categories } = useCategoriesQuery()
@ -39,7 +38,6 @@ const CategoryPage = ({ data: { allMarkdownRemark: edges }, pageContext: { title
<Row> <Row>
<Col lg={9} xs={12}> <Col lg={9} xs={12}>
<Articles data={edges} /> <Articles data={edges} />
<Newsletter />
</Col> </Col>
<Col lg={3} xs={12}> <Col lg={3} xs={12}>
<Offers /> <Offers />

2
src/templates/tagTemplate.js
View File

@ -10,7 +10,6 @@ import Articles from '../components/Articles/Articles'
import Categories from '../components/Articles/Categories/Categories' import Categories from '../components/Articles/Categories/Categories'
import CategoryItem from '../components/Articles/Categories/CategoryItem' import CategoryItem from '../components/Articles/Categories/CategoryItem'
import Offers from '../components/Offers/Offers' import Offers from '../components/Offers/Offers'
import Newsletter from '../components/Newsletter/Newsletter'
const TagPage = ({ data: { allMarkdownRemark: edges }, pageContext: { title } }) => { const TagPage = ({ data: { allMarkdownRemark: edges }, pageContext: { title } }) => {
const { categories } = useCategoriesQuery() const { categories } = useCategoriesQuery()
@ -39,7 +38,6 @@ const TagPage = ({ data: { allMarkdownRemark: edges }, pageContext: { title } })
<Row> <Row>
<Col lg={9} xs={12}> <Col lg={9} xs={12}>
<Articles data={edges} /> <Articles data={edges} />
<Newsletter />
</Col> </Col>
<Col lg={3} xs={12}> <Col lg={3} xs={12}>
<Offers /> <Offers />