From cc86e6adfc3ac782e0b1555d9d09e1c5f6492de1 Mon Sep 17 00:00:00 2001
From: kevin <kevin@regentmarkets.com>
Date: Wed, 8 Sep 2021 12:46:02 +0800
Subject: [PATCH 1/5] hide eu for recent featured

---
 src/pages/academy/index.js | 70 ++++++++++++++++++++++++++++++++++++--
 1 file changed, 68 insertions(+), 2 deletions(-)

diff --git a/src/pages/academy/index.js b/src/pages/academy/index.js
index 89473263b0c..efbcac6724d 100644
--- a/src/pages/academy/index.js
+++ b/src/pages/academy/index.js
@@ -11,6 +11,7 @@ import Layout from 'components/layout/layout'
 import { Container, SEO, Flex } from 'components/containers'
 import { localize, WithIntl, LocalizedLink } from 'components/localization'
 import { Carousel, QueryImage } from 'components/elements'
+import { DerivStore } from 'store'
 
 const MainWrapper = styled(Flex)`
     background-color: var(--color-white);
@@ -107,6 +108,35 @@ export const query = graphql`
                 blog_description
                 read_time_in_minutes
             }
+            recenteu: blog(
+                filter: { status: { _eq: "published" }, hide_for_eu: { _eq: false } }
+                sort: "-published_date"
+                limit: 6
+            ) {
+                id
+                main_image {
+                    id
+                    description
+                    imageFile {
+                        childImageSharp {
+                            gatsbyImageData
+                        }
+                    }
+                }
+                slug
+                published_date
+                featured
+                hide_for_eu
+                tags {
+                    id
+                    tags_id {
+                        tag_name
+                    }
+                }
+                blog_title
+                blog_description
+                read_time_in_minutes
+            }
             featured: blog(
                 filter: { status: { _eq: "published" }, featured: { _eq: true } }
                 sort: "-published_date"
@@ -135,6 +165,39 @@ export const query = graphql`
                 blog_description
                 read_time_in_minutes
             }
+            featuredeu: blog(
+                filter: {
+                    status: { _eq: "published" }
+                    featured: { _eq: true }
+                    hide_for_eu: { _eq: false }
+                }
+                sort: "-published_date"
+                limit: 6
+            ) {
+                id
+                main_image {
+                    id
+                    description
+                    imageFile {
+                        childImageSharp {
+                            gatsbyImageData
+                        }
+                    }
+                }
+                slug
+                published_date
+                featured
+                hide_for_eu
+                tags {
+                    id
+                    tags_id {
+                        tag_name
+                    }
+                }
+                blog_title
+                blog_description
+                read_time_in_minutes
+            }
         }
     }
 `
@@ -156,11 +219,14 @@ const DerivBlog = ({ data }) => {
             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 recent_data = data.directus.recent
-    const featured_data = data.directus.featured
+    const recent_data = is_eu_country ? data.directus.recenteu : data.directus.recent
+    const featured_data = is_eu_country ? data.directus.featuredeu : data.directus.featured
     const video_list_data = data.directus.videos
 
     return (

From bb72eb29a2fe5c6fb757d8b540d94f1ce9f05e14 Mon Sep 17 00:00:00 2001
From: kevin <kevin@regentmarkets.com>
Date: Wed, 8 Sep 2021 13:50:11 +0800
Subject: [PATCH 2/5] eu feature for others

---
 src/pages/academy/_recent-featured-posts.js | 36 ++++++-----
 src/pages/academy/blog/index.js             | 32 +++++++++-
 src/pages/academy/index.js                  | 68 ++++++++++++++++++---
 3 files changed, 109 insertions(+), 27 deletions(-)

diff --git a/src/pages/academy/_recent-featured-posts.js b/src/pages/academy/_recent-featured-posts.js
index 6757a243f2a..1aae0b7a743 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 }) => {
                                         <TagParentWrapper>
                                             {headline_recent.tags.map((article) => {
                                                 return (
-                                                    <>
-                                                        <TagWrapper key={article.id}>
-                                                            <StyledCategories>
-                                                                {article.tags_id.tag_name}
-                                                            </StyledCategories>
-                                                        </TagWrapper>
-                                                    </>
+                                                    <TagWrapper key={article.id}>
+                                                        <StyledCategories>
+                                                            {article.tags_id.tag_name}
+                                                        </StyledCategories>
+                                                    </TagWrapper>
                                                 )
                                             })}
                                         </TagParentWrapper>
@@ -123,9 +121,10 @@ const RecentFeaturedPosts = ({ recent_data, featured_data }) => {
                                                     <SmallArticleImageWrapper>
                                                         <QueryImage
                                                             className="small-article-bg"
-                                                            data={article.main_image.imageFile}
+                                                            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) => (
                                                                         <SmallArticleCategories
-                                                                            key={tag.id}
+                                                                            key={tag?.id}
                                                                         >
                                                                             {tag?.tags_id?.tag_name}
                                                                         </SmallArticleCategories>
@@ -189,13 +188,11 @@ const RecentFeaturedPosts = ({ recent_data, featured_data }) => {
                                         <TagParentWrapper>
                                             {headline_featured.tags.map((article) => {
                                                 return (
-                                                    <>
-                                                        <TagWrapper key={article.id}>
-                                                            <StyledCategories>
-                                                                {article.tags_id.tag_name}
-                                                            </StyledCategories>
-                                                        </TagWrapper>
-                                                    </>
+                                                    <TagWrapper key={article.id}>
+                                                        <StyledCategories>
+                                                            {article.tags_id.tag_name}
+                                                        </StyledCategories>
+                                                    </TagWrapper>
                                                 )
                                             })}
                                         </TagParentWrapper>
@@ -234,9 +231,10 @@ const RecentFeaturedPosts = ({ recent_data, featured_data }) => {
                                                     <SmallArticleImageWrapper>
                                                         <QueryImage
                                                             className="small-article-bg"
-                                                            data={article.main_image.imageFile}
+                                                            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..02c664932d4 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,8 @@ 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_eu : data.directus.blog
     return (
         <Layout>
             <SEO
@@ -112,6 +114,34 @@ export const query = graphql`
                 read_time_in_minutes
                 published_date
             }
+            blog_eu: blog(
+                filter: { status: { _eq: "published" }, hide_for_eu: { _eq: false } }
+                sort: "-published_date"
+            ) {
+                id
+                main_image {
+                    id
+                    description
+                    imageFile {
+                        childImageSharp {
+                            gatsbyImageData
+                        }
+                    }
+                }
+                slug
+                featured
+                hide_for_eu
+                tags {
+                    id
+                    tags_id {
+                        tag_name
+                    }
+                }
+                blog_title
+                blog_description
+                read_time_in_minutes
+                published_date
+            }
         }
     }
 `
diff --git a/src/pages/academy/index.js b/src/pages/academy/index.js
index efbcac6724d..3d478369b32 100644
--- a/src/pages/academy/index.js
+++ b/src/pages/academy/index.js
@@ -35,7 +35,7 @@ export const query = graphql`
                     id
                 }
             }
-            blog(
+            market_news: blog(
                 filter: {
                     tags: { tags_id: { tag_name: { _contains: "Market News" } } }
                     status: { _eq: "published" }
@@ -61,6 +61,34 @@ export const query = graphql`
                     id
                 }
             }
+            market_news_eu: blog(
+                filter: {
+                    tags: { tags_id: { tag_name: { _contains: "Market News" } } }
+                    status: { _eq: "published" }
+                    hide_for_eu: { _eq: false }
+                }
+                limit: 6
+                sort: "-published_date"
+            ) {
+                id
+                blog_title
+                slug
+                hide_for_eu
+                tags {
+                    tags_id {
+                        tag_name
+                    }
+                }
+                read_time_in_minutes
+                main_image {
+                    imageFile {
+                        childImageSharp {
+                            gatsbyImageData
+                        }
+                    }
+                    id
+                }
+            }
             videos(limit: 6, filter: { status: { _eq: "published" } }, sort: "-published_date") {
                 video_title
                 published_date
@@ -80,6 +108,30 @@ export const query = graphql`
                     }
                 }
             }
+            videos_eu: videos(
+                limit: 6
+                filter: { status: { _eq: "published" }, hide_for_eu: { _eq: false } }
+                sort: "-published_date"
+            ) {
+                video_title
+                published_date
+                video_description
+                video_duration
+                featured
+                hide_for_eu
+                video_thumbnail {
+                    id
+                    title
+                }
+                video_file {
+                    id
+                }
+                tags {
+                    tags_id {
+                        tag_name
+                    }
+                }
+            }
             recent: blog(
                 filter: { status: { _eq: "published" } }
                 sort: "-published_date"
@@ -108,7 +160,7 @@ export const query = graphql`
                 blog_description
                 read_time_in_minutes
             }
-            recenteu: blog(
+            recent_eu: blog(
                 filter: { status: { _eq: "published" }, hide_for_eu: { _eq: false } }
                 sort: "-published_date"
                 limit: 6
@@ -165,7 +217,7 @@ export const query = graphql`
                 blog_description
                 read_time_in_minutes
             }
-            featuredeu: blog(
+            featured_eu: blog(
                 filter: {
                     status: { _eq: "published" }
                     featured: { _eq: true }
@@ -223,11 +275,13 @@ const DerivBlog = ({ data }) => {
     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 = is_eu_country ? data.directus.recenteu : data.directus.recent
-    const featured_data = is_eu_country ? data.directus.featuredeu : data.directus.featured
-    const video_list_data = data.directus.videos
+    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 video_list_data = is_eu_country ? data.directus.videos_eu : data.directus.videos
 
     return (
         <Layout type="academy" is_ppc_redirect={true}>

From 3bff7388b6ea1bfde09f49fba687bbbe27d2ef99 Mon Sep 17 00:00:00 2001
From: kevin <kevin@regentmarkets.com>
Date: Wed, 8 Sep 2021 15:00:43 +0800
Subject: [PATCH 3/5]  hide eu all videos

---
 src/pages/academy/videos/index.js | 34 ++++++++++++++++++++++++++++++-
 1 file changed, 33 insertions(+), 1 deletion(-)

diff --git a/src/pages/academy/videos/index.js b/src/pages/academy/videos/index.js
index ff7c1f5e25d..cc30a9de3dc 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,8 @@ 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.video_eu : data.directus.video
 
     return (
         <Layout>
@@ -115,6 +117,36 @@ export const query = graphql`
                     }
                 }
             }
+            videos_eu: videos(
+                filter: { status: { _eq: "published" }, hide_for_eu: { _eq: false } }
+                sort: "- published_date"
+            ) {
+                video_id
+                video_slug
+                video_title
+                published_date
+                video_description
+                video_duration
+                hide_for_eu
+                tags {
+                    tags_id {
+                        tag_name
+                        id
+                    }
+                }
+                video_file {
+                    id
+                }
+                video_thumbnail {
+                    id
+                    imageFile {
+                        id
+                        childImageSharp {
+                            gatsbyImageData
+                        }
+                    }
+                }
+            }
         }
     }
 `

From 1684bbca4e8fb2eb578d07266e249e235762dac3 Mon Sep 17 00:00:00 2001
From: kevin <kevin@regentmarkets.com>
Date: Wed, 8 Sep 2021 16:20:23 +0800
Subject: [PATCH 4/5]  all video after merge

---
 src/pages/academy/_recent-featured-posts.js |  4 +-
 src/pages/academy/index.js                  | 61 ++++++++++++++++++++-
 2 files changed, 60 insertions(+), 5 deletions(-)

diff --git a/src/pages/academy/_recent-featured-posts.js b/src/pages/academy/_recent-featured-posts.js
index 1aae0b7a743..4f2ce1b5885 100644
--- a/src/pages/academy/_recent-featured-posts.js
+++ b/src/pages/academy/_recent-featured-posts.js
@@ -121,7 +121,7 @@ const RecentFeaturedPosts = ({ recent_data, featured_data }) => {
                                                     <SmallArticleImageWrapper>
                                                         <QueryImage
                                                             className="small-article-bg"
-                                                            data={article?.main_image?.imageFile}
+                                                            data={article.main_image.imageFile}
                                                             alt={
                                                                 article?.main_image?.description ||
                                                                 ''
@@ -231,7 +231,7 @@ const RecentFeaturedPosts = ({ recent_data, featured_data }) => {
                                                     <SmallArticleImageWrapper>
                                                         <QueryImage
                                                             className="small-article-bg"
-                                                            data={article?.main_image?.imageFile}
+                                                            data={article.main_image.imageFile}
                                                             alt={
                                                                 article?.main_image?.description ||
                                                                 ''
diff --git a/src/pages/academy/index.js b/src/pages/academy/index.js
index 1ea03891d9d..c11c8bee649 100644
--- a/src/pages/academy/index.js
+++ b/src/pages/academy/index.js
@@ -108,6 +108,30 @@ export const query = graphql`
                     }
                 }
             }
+            videos_eu: videos(
+                limit: 6
+                filter: { status: { _eq: "published" }, hide_for_eu: { _eq: false } }
+                sort: "-published_date"
+            ) {
+                video_title
+                published_date
+                video_description
+                video_duration
+                featured
+                hide_for_eu
+                video_thumbnail {
+                    id
+                    title
+                }
+                video_file {
+                    id
+                }
+                tags {
+                    tags_id {
+                        tag_name
+                    }
+                }
+            }
             featured_video: videos(
                 filter: { status: { _eq: "published" }, featured: { _eq: true } }
                 sort: "-published_date"
@@ -132,6 +156,34 @@ export const query = graphql`
                     }
                 }
             }
+            featured_video_eu: videos(
+                filter: {
+                    status: { _eq: "published" }
+                    featured: { _eq: true }
+                    hide_for_eu: { _eq: false }
+                }
+                sort: "-published_date"
+                limit: 1
+            ) {
+                video_title
+                published_date
+                video_description
+                video_duration
+                featured
+                hide_for_eu
+                video_thumbnail {
+                    id
+                    title
+                }
+                video_file {
+                    id
+                }
+                tags {
+                    tags_id {
+                        tag_name
+                    }
+                }
+            }
             recent: blog(
                 filter: { status: { _eq: "published" } }
                 sort: "-published_date"
@@ -281,9 +333,12 @@ const DerivBlog = ({ data }) => {
 
     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 video_list_data = is_eu_country ? data.directus.videos_eu : data.directus.videos
-    const non_featured_video_list_data = data.directus.videos
-    const featured_video_list_data = data.directus.featured_video
+    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 (
         <Layout type="academy" is_ppc_redirect={true}>

From bae65550aeba38081db369f1c47250db79396f9a Mon Sep 17 00:00:00 2001
From: kevin <kevin@regentmarkets.com>
Date: Wed, 8 Sep 2021 18:40:44 +0800
Subject: [PATCH 5/5]  use filter

---
 src/pages/academy/blog/index.js   | 32 ++++--------------------------
 src/pages/academy/videos/index.js | 33 +++----------------------------
 2 files changed, 7 insertions(+), 58 deletions(-)

diff --git a/src/pages/academy/blog/index.js b/src/pages/academy/blog/index.js
index 02c664932d4..0b6ff9b9757 100644
--- a/src/pages/academy/blog/index.js
+++ b/src/pages/academy/blog/index.js
@@ -53,7 +53,10 @@ const StyledHeader = styled(Header)`
 
 const ArticlesPage = ({ data }) => {
     const { is_eu_country } = React.useContext(DerivStore)
-    const article_data = is_eu_country ? data.directus.blog_eu : data.directus.blog
+    const article_data = is_eu_country
+        ? data.directus.blog.filter((item) => item.hide_for_eu == false)
+        : data.directus.blog
+
     return (
         <Layout>
             <SEO
@@ -91,33 +94,6 @@ export const query = graphql`
     query AllArticlesQuery {
         directus {
             blog(filter: { status: { _eq: "published" } }, sort: "-published_date") {
-                id
-                main_image {
-                    id
-                    description
-                    imageFile {
-                        childImageSharp {
-                            gatsbyImageData
-                        }
-                    }
-                }
-                slug
-                featured
-                tags {
-                    id
-                    tags_id {
-                        tag_name
-                    }
-                }
-                blog_title
-                blog_description
-                read_time_in_minutes
-                published_date
-            }
-            blog_eu: blog(
-                filter: { status: { _eq: "published" }, hide_for_eu: { _eq: false } }
-                sort: "-published_date"
-            ) {
                 id
                 main_image {
                     id
diff --git a/src/pages/academy/videos/index.js b/src/pages/academy/videos/index.js
index cc30a9de3dc..5c63be00f04 100644
--- a/src/pages/academy/videos/index.js
+++ b/src/pages/academy/videos/index.js
@@ -53,7 +53,9 @@ const StyledHeader = styled(Header)`
 
 const VideosPage = ({ data }) => {
     const { is_eu_country } = React.useContext(DerivStore)
-    const video_data = is_eu_country ? data.directus.video_eu : data.directus.video
+    const video_data = is_eu_country
+        ? data.directus.videos.filter((item) => item.hide_for_eu == false)
+        : data.directus.videos
 
     return (
         <Layout>
@@ -92,35 +94,6 @@ export const query = graphql`
     query AllVideosQuery {
         directus {
             videos(filter: { status: { _eq: "published" } }, sort: "- published_date") {
-                video_id
-                video_slug
-                video_title
-                published_date
-                video_description
-                video_duration
-                tags {
-                    tags_id {
-                        tag_name
-                        id
-                    }
-                }
-                video_file {
-                    id
-                }
-                video_thumbnail {
-                    id
-                    imageFile {
-                        id
-                        childImageSharp {
-                            gatsbyImageData
-                        }
-                    }
-                }
-            }
-            videos_eu: videos(
-                filter: { status: { _eq: "published" }, hide_for_eu: { _eq: false } }
-                sort: "- published_date"
-            ) {
                 video_id
                 video_slug
                 video_title