diff --git a/src/pages/academy/_recent-featured-posts.js b/src/pages/academy/_recent-featured-posts.js index 6757a243f2a..4f2ce1b5885 100644 --- a/src/pages/academy/_recent-featured-posts.js +++ b/src/pages/academy/_recent-featured-posts.js @@ -78,13 +78,11 @@ const RecentFeaturedPosts = ({ recent_data, featured_data }) => { {headline_recent.tags.map((article) => { return ( - <> - - - {article.tags_id.tag_name} - - - + + + {article.tags_id.tag_name} + + ) })} @@ -125,7 +123,8 @@ const RecentFeaturedPosts = ({ recent_data, featured_data }) => { className="small-article-bg" data={article.main_image.imageFile} alt={ - article.main_image.description || '' + article?.main_image?.description || + '' } height="102px" /> @@ -142,7 +141,7 @@ const RecentFeaturedPosts = ({ recent_data, featured_data }) => { .slice(0, 1) .map((tag) => ( {tag?.tags_id?.tag_name} @@ -189,13 +188,11 @@ const RecentFeaturedPosts = ({ recent_data, featured_data }) => { {headline_featured.tags.map((article) => { return ( - <> - - - {article.tags_id.tag_name} - - - + + + {article.tags_id.tag_name} + + ) })} @@ -236,7 +233,8 @@ const RecentFeaturedPosts = ({ recent_data, featured_data }) => { className="small-article-bg" data={article.main_image.imageFile} alt={ - article.main_image.description || '' + article?.main_image?.description || + '' } height="102px" /> diff --git a/src/pages/academy/blog/index.js b/src/pages/academy/blog/index.js index 986880688b9..0b6ff9b9757 100644 --- a/src/pages/academy/blog/index.js +++ b/src/pages/academy/blog/index.js @@ -10,6 +10,7 @@ import { Header } from 'components/elements' import { localize, WithIntl } from 'components/localization' import HeroImage from 'images/common/blog/deriv-blog.png' import device from 'themes/device' +import { DerivStore } from 'store' const SmallContainer = styled(Container)` width: 60%; @@ -51,7 +52,11 @@ const StyledHeader = styled(Header)` ` const ArticlesPage = ({ data }) => { - const article_data = data.directus.blog + const { is_eu_country } = React.useContext(DerivStore) + const article_data = is_eu_country + ? data.directus.blog.filter((item) => item.hide_for_eu == false) + : data.directus.blog + return ( { nav_color: '--color-grey-5', }, } + + const { is_eu_country } = React.useContext(DerivStore) + const homepage_banner_data = data.directus.homepage_banners - const market_news_data = data.directus.blog + const market_news_data = is_eu_country + ? data.directus.market_news_eu + : data.directus.market_news - const recent_data = data.directus.recent - const featured_data = data.directus.featured - const non_featured_video_list_data = data.directus.videos - const featured_video_list_data = data.directus.featured_video + const recent_data = is_eu_country ? data.directus.recent_eu : data.directus.recent + const featured_data = is_eu_country ? data.directus.featured_eu : data.directus.featured + const non_featured_video_list_data = is_eu_country + ? data.directus.videos_eu + : data.directus.videos + const featured_video_list_data = is_eu_country + ? data.directus.featured_video_eu + : data.directus.featured_video return ( diff --git a/src/pages/academy/videos/index.js b/src/pages/academy/videos/index.js index ff7c1f5e25d..5c63be00f04 100644 --- a/src/pages/academy/videos/index.js +++ b/src/pages/academy/videos/index.js @@ -10,6 +10,7 @@ import { Header } from 'components/elements' import { localize, WithIntl } from 'components/localization' import HeroImage from 'images/common/blog/video-tutorials.png' import device from 'themes/device' +import { DerivStore } from 'store' const SmallContainer = styled(Container)` width: 60%; @@ -51,7 +52,10 @@ const StyledHeader = styled(Header)` ` const VideosPage = ({ data }) => { - const video_data = data.directus.videos + const { is_eu_country } = React.useContext(DerivStore) + const video_data = is_eu_country + ? data.directus.videos.filter((item) => item.hide_for_eu == false) + : data.directus.videos return ( @@ -96,6 +100,7 @@ export const query = graphql` published_date video_description video_duration + hide_for_eu tags { tags_id { tag_name