mirror of
https://github.com/sergeyyarkov/devthread.ru.git
synced 2026-10-11 02:09:04 +03:00
sticky block
This commit is contained in:
parent
cd900c6aac
commit
97b43f6945
13
package-lock.json
generated
13
package-lock.json
generated
@ -10150,11 +10150,6 @@
|
|||||||
"parse-url": "^5.0.0"
|
"parse-url": "^5.0.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"github-buttons": {
|
|
||||||
"version": "2.11.1",
|
|
||||||
"resolved": "https://registry.npmjs.org/github-buttons/-/github-buttons-2.11.1.tgz",
|
|
||||||
"integrity": "sha512-RMPwA6Zqqxu/P5jXeW02zuuPaChztG4ASHTKrzSlHgWiFg0crQQTp2E1kBRCGV+/9Bo99ziU+ggmVptLhu8k6A=="
|
|
||||||
},
|
|
||||||
"github-from-package": {
|
"github-from-package": {
|
||||||
"version": "0.0.0",
|
"version": "0.0.0",
|
||||||
"resolved": "https://registry.npmjs.org/github-from-package/-/github-from-package-0.0.0.tgz",
|
"resolved": "https://registry.npmjs.org/github-from-package/-/github-from-package-0.0.0.tgz",
|
||||||
@ -17134,14 +17129,6 @@
|
|||||||
"resolved": "https://registry.npmjs.org/react-frame-component/-/react-frame-component-4.1.2.tgz",
|
"resolved": "https://registry.npmjs.org/react-frame-component/-/react-frame-component-4.1.2.tgz",
|
||||||
"integrity": "sha512-gWTtpOoi8Mgxayj0iWLL3SXRu2jW4eW4oim6B/FycaOH9HHIsCTPulC9u7CZ2BwY0CtqA+v8FsINp6qPuaN6qQ=="
|
"integrity": "sha512-gWTtpOoi8Mgxayj0iWLL3SXRu2jW4eW4oim6B/FycaOH9HHIsCTPulC9u7CZ2BwY0CtqA+v8FsINp6qPuaN6qQ=="
|
||||||
},
|
},
|
||||||
"react-github-btn": {
|
|
||||||
"version": "1.2.0",
|
|
||||||
"resolved": "https://registry.npmjs.org/react-github-btn/-/react-github-btn-1.2.0.tgz",
|
|
||||||
"integrity": "sha512-/b2TGTeek5Ky+KtuP5BxOaXgb1FGhbwgZNI6rkwkGk7+xtCtsNMkdchOcCnC3qU1JGTWPKzYZWpPBIouVhXAoQ==",
|
|
||||||
"requires": {
|
|
||||||
"github-buttons": "^2.8.0"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"react-helmet": {
|
"react-helmet": {
|
||||||
"version": "6.1.0",
|
"version": "6.1.0",
|
||||||
"resolved": "https://registry.npmjs.org/react-helmet/-/react-helmet-6.1.0.tgz",
|
"resolved": "https://registry.npmjs.org/react-helmet/-/react-helmet-6.1.0.tgz",
|
||||||
|
|||||||
@ -43,7 +43,6 @@
|
|||||||
"react": "^16.12.0",
|
"react": "^16.12.0",
|
||||||
"react-dom": "^16.12.0",
|
"react-dom": "^16.12.0",
|
||||||
"react-flexbox-grid": "^2.1.2",
|
"react-flexbox-grid": "^2.1.2",
|
||||||
"react-github-btn": "^1.2.0",
|
|
||||||
"react-helmet": "^6.1.0"
|
"react-helmet": "^6.1.0"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
|
|||||||
@ -3,7 +3,6 @@ import { Link } from 'gatsby'
|
|||||||
import PropTypes from 'prop-types'
|
import PropTypes from 'prop-types'
|
||||||
import useSiteMetadataQuery from '../../hooks/useSiteMetadataQuery'
|
import useSiteMetadataQuery from '../../hooks/useSiteMetadataQuery'
|
||||||
|
|
||||||
import GitHubButton from 'react-github-btn'
|
|
||||||
import LogoIcon from '../../images/logo-icon.svg'
|
import LogoIcon from '../../images/logo-icon.svg'
|
||||||
import GatsbyIcon from '../../images/gatsby-icon.svg'
|
import GatsbyIcon from '../../images/gatsby-icon.svg'
|
||||||
import NetlifyIcon from '../../images/netlify-icon.svg'
|
import NetlifyIcon from '../../images/netlify-icon.svg'
|
||||||
@ -43,7 +42,6 @@ const Footer = () => {
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div className="footer-nav__helpers">
|
<div className="footer-nav__helpers">
|
||||||
<GitHubButton href="https://github.com/sergeyyarkov/devthread.ru" data-icon="octicon-star" aria-label="Start devthread.ru">Star</GitHubButton>
|
|
||||||
<div className="helpers-icons">
|
<div className="helpers-icons">
|
||||||
<a href="https://www.gatsbyjs.org/" rel='noreferrer' target="_blank">
|
<a href="https://www.gatsbyjs.org/" rel='noreferrer' target="_blank">
|
||||||
<GatsbyIcon />
|
<GatsbyIcon />
|
||||||
|
|||||||
@ -1,4 +1,5 @@
|
|||||||
import React from 'react';
|
import React from 'react';
|
||||||
|
import { useLocation } from '@reach/router'
|
||||||
import usePopularArticlesQuery from '../../hooks/usePopularArticlesQuery'
|
import usePopularArticlesQuery from '../../hooks/usePopularArticlesQuery'
|
||||||
import useTagsQuery from '../../hooks/useTagsQuery'
|
import useTagsQuery from '../../hooks/useTagsQuery'
|
||||||
import useBooksQuery from '../../hooks/useBooksQuery'
|
import useBooksQuery from '../../hooks/useBooksQuery'
|
||||||
@ -12,12 +13,13 @@ import TagItem from './Tags/TagItem'
|
|||||||
import BookItem from './Books/BookItem'
|
import BookItem from './Books/BookItem'
|
||||||
|
|
||||||
const Offers = () => {
|
const Offers = () => {
|
||||||
|
const { pathname } = useLocation()
|
||||||
const { articles } = usePopularArticlesQuery()
|
const { articles } = usePopularArticlesQuery()
|
||||||
const { tags } = useTagsQuery()
|
const { tags } = useTagsQuery()
|
||||||
const { books } = useBooksQuery()
|
const { books } = useBooksQuery()
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="offers">
|
<div style={{ height: pathname === '/' ? '56%' : '78.5%' }} className="offers">
|
||||||
<Popular>
|
<Popular>
|
||||||
{articles.map(({ node }, i) => <PopularItem key={i} slug={node.frontmatter.slug} title={node.frontmatter.title} />)}
|
{articles.map(({ node }, i) => <PopularItem key={i} slug={node.frontmatter.slug} title={node.frontmatter.title} />)}
|
||||||
</Popular>
|
</Popular>
|
||||||
|
|||||||
@ -1,16 +1,20 @@
|
|||||||
import React from 'react';
|
import React from 'react';
|
||||||
|
import { useLocation } from '@reach/router'
|
||||||
|
|
||||||
const Subscription = () => {
|
const Subscription = () => {
|
||||||
|
const { pathname } = useLocation()
|
||||||
return (
|
return (
|
||||||
<div className="offers-subscription offer-box">
|
<div style={pathname !== '/about' ? { height: '100%' } : null}>
|
||||||
<div className="offers-subscription__heading offer-heading">
|
<div style={pathname !== '/about' ? { position: 'sticky', top: 75 } : null} className="offers-subscription offer-box">
|
||||||
Читайте нас в Telegram
|
<div className="offers-subscription__heading offer-heading">
|
||||||
</div>
|
Читайте нас в Telegram
|
||||||
<div className="offers-subscription__content">
|
</div>
|
||||||
<p>
|
<div className="offers-subscription__content">
|
||||||
В нашем канале telegram вы не пропустите новые статьи, присоединяйтесь к другим разработчикам
|
<p>
|
||||||
</p>
|
В нашем канале telegram вы не пропустите новые статьи, присоединяйтесь к другим разработчикам
|
||||||
<a href="https://t.me/devthread" rel='noreferrer' target="_blank" className="btn-primary">Подписаться</a>
|
</p>
|
||||||
|
<a href="https://t.me/devthread" rel='noreferrer' target="_blank" className="btn-primary">Подписаться</a>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
)
|
)
|
||||||
|
|||||||
@ -160,7 +160,7 @@ html {
|
|||||||
body {
|
body {
|
||||||
font-family: 'Inter', sans-serif;
|
font-family: 'Inter', sans-serif;
|
||||||
margin: 0;
|
margin: 0;
|
||||||
margin-top: 95px;
|
margin-top: 122px;
|
||||||
display: flex;
|
display: flex;
|
||||||
height: 85%;
|
height: 85%;
|
||||||
flex-direction: column;
|
flex-direction: column;
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user