@@ -30,4 +29,9 @@ const Contacts = () => {
)
}
-export default Contacts
\ No newline at end of file
+export default Contacts
+
+Contacts.propTypes = {
+ email: PropTypes.string,
+ telegram: PropTypes.string
+}
\ No newline at end of file
diff --git a/src/pages/404.js b/src/pages/404.js
index cfd15ae..80ef32e 100644
--- a/src/pages/404.js
+++ b/src/pages/404.js
@@ -1,4 +1,5 @@
import React from 'react';
+import { Main } from '../ui/ui'
import { Grid } from 'react-flexbox-grid'
import { Link } from 'gatsby'
import Layout from '../components/Layout/Layout'
@@ -6,7 +7,7 @@ import Layout from '../components/Layout/Layout'
const NotFound = () => {
return (
-
+
#404
@@ -14,7 +15,7 @@ const NotFound = () => {
вернуться на главную
-
+
)
}
diff --git a/src/pages/about.js b/src/pages/about.js
index e657132..a43423c 100644
--- a/src/pages/about.js
+++ b/src/pages/about.js
@@ -1,5 +1,6 @@
import React from 'react';
import { Grid, Row, Col } from 'react-flexbox-grid'
+import { Main } from '../ui/ui'
import useSiteMetadataQuery from '../hooks/useSiteMetadataQuery'
import SEO from '../components/SEO/SEO'
import Layout from '../components/Layout/Layout'
@@ -11,7 +12,7 @@ const AboutPage = () => {
return (
-
+
@@ -22,7 +23,7 @@ const AboutPage = () => {
-
+
)
}
diff --git a/src/pages/articles.js b/src/pages/articles.js
index 1323207..efe2b76 100644
--- a/src/pages/articles.js
+++ b/src/pages/articles.js
@@ -1,4 +1,5 @@
import React from "react"
+import { Main } from '../ui/ui'
import { Grid, Row, Col } from 'react-flexbox-grid'
import { graphql } from 'gatsby'
import useCategoriesQuery from '../hooks/useCategoriesQuery'
@@ -16,7 +17,7 @@ const ArticlesPage = ({ data: { allMarkdownRemark: edges } }) => {
return (
-
+
@@ -41,7 +42,7 @@ const ArticlesPage = ({ data: { allMarkdownRemark: edges } }) => {
-
+
)
}
diff --git a/src/pages/books.js b/src/pages/books.js
index decf65c..fd35214 100644
--- a/src/pages/books.js
+++ b/src/pages/books.js
@@ -1,4 +1,5 @@
import React from "react"
+import { Main } from '../ui/ui'
import { Grid, Row, Col } from 'react-flexbox-grid'
import { graphql } from 'gatsby'
import SEO from '../components/SEO/SEO'
@@ -13,7 +14,7 @@ const BooksPage = ({ data: { allMarkdownRemark: edges } }) => {
return (
-
+
@@ -40,7 +41,7 @@ const BooksPage = ({ data: { allMarkdownRemark: edges } }) => {
-
+
)
}
diff --git a/src/pages/contacts.js b/src/pages/contacts.js
index 3f7ce6d..415f140 100644
--- a/src/pages/contacts.js
+++ b/src/pages/contacts.js
@@ -1,22 +1,25 @@
import React from 'react';
+import { Main } from '../ui/ui'
import { Grid, Row, Col } from 'react-flexbox-grid'
+import useSiteMetadataQuery from '../hooks/useSiteMetadataQuery'
import SEO from '../components/SEO/SEO'
import Layout from '../components/Layout/Layout'
import Contacts from '../components/Contacts/Contacts'
const ContactsPage = () => {
+ const { siteMetadata: { social: { email, telegram } } } = useSiteMetadataQuery()
return (
-
+
-
+
-
+
)
}
diff --git a/src/pages/index.js b/src/pages/index.js
index f3ee4d0..cefb2fc 100644
--- a/src/pages/index.js
+++ b/src/pages/index.js
@@ -1,5 +1,7 @@
import React from "react"
import { Link, graphql } from 'gatsby'
+import { Main } from '../ui/ui'
+import { Grid, Row, Col } from 'react-flexbox-grid'
import SEO from '../components/SEO/SEO'
import Layout from '../components/Layout/Layout'
import Description from '../components/Description/Description'
@@ -9,14 +11,12 @@ import Newsletter from '../components/Newsletter/Newsletter'
import ArrowNext from '../images/arrow-next.svg'
-import { Grid, Row, Col } from 'react-flexbox-grid'
-
const IndexPage = ({ data: { allMarkdownRemark: edges } }) => {
return (
-
+
@@ -38,7 +38,7 @@ const IndexPage = ({ data: { allMarkdownRemark: edges } }) => {
-
+
)
}
diff --git a/src/templates/articleTemplate.js b/src/templates/articleTemplate.js
index 7c08abd..bc4746c 100644
--- a/src/templates/articleTemplate.js
+++ b/src/templates/articleTemplate.js
@@ -1,4 +1,5 @@
import React from 'react'
+import { Main } from '../ui/ui'
import { Grid, Row, Col } from 'react-flexbox-grid'
import Layout from '../components/Layout/Layout'
import Article from '../components/Article/Article'
@@ -7,13 +8,10 @@ import MoreArticles from '../components/Articles/MoreArticles/MoreArticles'
import Newsletter from '../components/Newsletter/Newsletter'
import { graphql } from "gatsby"
-const articleTemplate = ({ data }) => {
- const { markdownRemark } = data
- const { frontmatter, html } = markdownRemark
-
+const articleTemplate = ({ data: { markdownRemark: { frontmatter, html } } }) => {
return (
-
+
@@ -26,7 +24,7 @@ const articleTemplate = ({ data }) => {
-
+
)
}
diff --git a/src/templates/categoryTemplate.js b/src/templates/categoryTemplate.js
index 2bf6a8e..1e01426 100644
--- a/src/templates/categoryTemplate.js
+++ b/src/templates/categoryTemplate.js
@@ -1,4 +1,5 @@
import React from "react"
+import { Main } from '../ui/ui'
import { Grid, Row, Col } from 'react-flexbox-grid'
import { graphql } from 'gatsby'
import useCategoriesQuery from '../hooks/useCategoriesQuery'
@@ -16,7 +17,7 @@ const CategoryPage = ({ data: { allMarkdownRemark: edges }, pageContext: { title
return (
-
+
@@ -44,7 +45,7 @@ const CategoryPage = ({ data: { allMarkdownRemark: edges }, pageContext: { title
-
+
)
}
diff --git a/src/templates/tagTemplate.js b/src/templates/tagTemplate.js
index a32461c..5dc3329 100644
--- a/src/templates/tagTemplate.js
+++ b/src/templates/tagTemplate.js
@@ -1,4 +1,5 @@
import React from "react"
+import { Main } from '../ui/ui'
import { Grid, Row, Col } from 'react-flexbox-grid'
import { graphql } from 'gatsby'
import useCategoriesQuery from '../hooks/useCategoriesQuery'
@@ -16,7 +17,7 @@ const TagPage = ({ data: { allMarkdownRemark: edges }, pageContext: { title } })
return (
-
+
@@ -44,7 +45,7 @@ const TagPage = ({ data: { allMarkdownRemark: edges }, pageContext: { title } })
-
+
)
}
diff --git a/src/ui/ui.js b/src/ui/ui.js
new file mode 100644
index 0000000..c066aef
--- /dev/null
+++ b/src/ui/ui.js
@@ -0,0 +1,12 @@
+import React from 'react';
+
+const Main = ({ children, ...props }) => {
+ return (
+
+ {children}
+
+ )
+}
+
+
+export { Main }
\ No newline at end of file