Thanks to visit codestin.com
Credit goes to github.com

Skip to content
This repository was archived by the owner on May 20, 2025. It is now read-only.

Kevin/combine recent feat post to home #1988

Merged
1 commit merged into from
Aug 9, 2021
Merged

Kevin/combine recent feat post to home #1988

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 4 additions & 7 deletions ...pages/blog/recent-featured-posts/index.js → src/pages/blog/_recent-featured-posts.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React from 'react'
import Clock from './images/clock.svg'
import Dot from './images/dot.svg'
import { recent_article_data, featured_article_data, article_data, article_data_2 } from './_data'
import Clock from './recent-featured-posts/images/clock.svg'
import Dot from './recent-featured-posts/images/dot.svg'
import { recent_article_data, featured_article_data, article_data, article_data_2 } from './recent-featured-posts/_data'
import {
StyledContainer,
StyledTabs,
Expand Down Expand Up @@ -29,8 +29,7 @@ import {
DotIcon,
MobileDotIcon,
MobileHeader,
} from './_style'
import Layout from 'components/layout/layout'
} from './recent-featured-posts/_style'
import { Carousel, Tabs, Header } from 'components/elements'
import { localize, WithIntl } from 'components/localization'

Expand Down Expand Up @@ -58,7 +57,6 @@ const RecentFeaturedPosts = () => {
const articles_2 = article_data_2

return (
<Layout>
<StyledContainer m="20px auto 0" fd="column" ai="center">
<StyledTabs
tab_list={['recent_posts', 'featured_posts']}
Expand Down Expand Up @@ -228,7 +226,6 @@ const RecentFeaturedPosts = () => {
See all blog articles
</AllArticleButton>
</StyledContainer>
</Layout>
)
}

Expand Down
2 changes: 2 additions & 0 deletions src/pages/blog/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import React from 'react'
import { graphql, useStaticQuery } from 'gatsby'
import styled from 'styled-components'
import Subscribe from './components/_subscribe'
import RecentFeaturedPosts from './_recent-featured-posts'
import DVideoBanner from './video-banner'
import Hero from './components/_hero'
import Layout from 'components/layout/layout'
Expand Down Expand Up @@ -74,6 +75,7 @@ const DerivBlog = () => {
/>
</Carousel>
</MainWrapper>
<RecentFeaturedPosts />
<DVideoBanner />
<Container>
<Flex direction="column" ai="flex-start" jc="space-between">
Expand Down
1 change: 0 additions & 1 deletion src/pages/blog/recent-featured-posts/_style.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,6 @@ export const SmallArticleRightContent = styled(Flex)`
`
export const AllArticleButton = styled(LinkButton)`
margin-top: 40px;
margin-bottom: 80px;
width: fit-content;

&:hover {
Expand Down
2 changes: 1 addition & 1 deletion src/pages/blog/template/_side-cta/_data.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import Stocks from './_images/stocks.svg'
import Stocks from './_images/stocks.png'

export const pdf_data = {
image: Stocks,
Expand Down
Binary file added src/pages/blog/template/_side-cta/_images/stocks.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 0 additions & 1 deletion src/pages/blog/template/_side-cta/_images/stocks.svg
View file
Open in desktop

This file was deleted.