From 78b6c5ad0b2492d3f6275664594b7dc8ebc38777 Mon Sep 17 00:00:00 2001
From: mayuran-deriv <129507167+mayuran-deriv@users.noreply.github.com>
Date: Tue, 21 Nov 2023 15:58:34 +0400
Subject: [PATCH] Mayuran/changes footer header (#5997)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* updates for payment methods (#5849)

* updates for payment methods

* chore: empty commit

* auto-pull-translation

* translation: 📚 sync translations from crowdin feature branch

* design changed one more time..

* chore: empty commit

* chore: empty commit

* chore: empty commit

* chore: empty commit

* chore: empty commit

* chore: empty commit

* chore: empty commit

---------

Co-authored-by: mitra-deriv <mitra@regentmarkets.com>
Co-authored-by: DerivFE <80095553+DerivFE@users.noreply.github.com>

* translations: 📚 sync translations with crowdin (#5934)

Co-authored-by: DerivFE <80095553+DerivFE@users.noreply.github.com>

* fix: signup provider send null (#5935)

* translations: 📚 sync translations with crowdin (#5939)

Co-authored-by: DerivFE <80095553+DerivFE@users.noreply.github.com>

* fix: all posts initial

* Habib/gtm party town integration (#5943)

* chore: add gtm to partytown url fix

* chore: add partytown proxy to gtm

* chore: remove semicolon

* chore: remove semicolon

* translations: 📚 sync translations with crowdin (#5945)

Co-authored-by: DerivFE <80095553+DerivFE@users.noreply.github.com>

* fix: initial dynamic update

* fix: revert package

* fix: dynamic url

* fix: dynamic urls initial

* fix: added default value

* fix: header footer and url change

* fix: revert package json

---------

Co-authored-by: Eduard Hrachou <107860964+eduard-deriv@users.noreply.github.com>
Co-authored-by: mitra-deriv <mitra@regentmarkets.com>
Co-authored-by: DerivFE <80095553+DerivFE@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: NikitK-deriv <103182473+NikitK-deriv@users.noreply.github.com>
Co-authored-by: Habib Deriv <88178645+habib-deriv@users.noreply.github.com>
---
 src/features/pages/posts/all-posts/index.tsx | 15 +++++++++++++--
 src/features/pages/posts/index.tsx           | 15 +++++++++++++--
 src/pages/blog/single-blog/index.tsx         |  1 -
 3 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/src/features/pages/posts/all-posts/index.tsx b/src/features/pages/posts/all-posts/index.tsx
index 21968705fad..08deda42325 100644
--- a/src/features/pages/posts/all-posts/index.tsx
+++ b/src/features/pages/posts/all-posts/index.tsx
@@ -7,11 +7,15 @@ import { Localize } from 'components/localization'
 import Flex from 'features/components/atoms/flex-box'
 import Link from 'features/components/atoms/link'
 import dclsx from 'features/utils/dclsx'
+import MainNav from 'features/components/templates/navigation/main-nav'
+import Footer from 'features/components/templates/footer'
 
 const AllPostsModule = ({ data }: TBlogPosts) => {
     const posts = data?.allStrapiPost?.nodes || []
     return (
         <Layout>
+            <MainNav />
+
             <Flex.Box margin_block="12x" direction="col" className={styles.posts_wrapper}>
                 <Typography.Heading as="h2" size="small">
                     <Localize
@@ -26,14 +30,20 @@ const AllPostsModule = ({ data }: TBlogPosts) => {
                         const formattedDate = parsedDate?.format('Do [of] MMMM YYYY')
                         return (
                             <Flex.Box direction="col" key={title} className={styles.image_wrapper}>
-                                <Link url={{ type: 'internal', to: '/' }} no_hover>
+                                <Link
+                                    url={{ type: 'internal', to: `/blog/single-blog/${title}` }}
+                                    no_hover
+                                >
                                     <img
                                         src={banner?.localFile?.publicURL}
                                         className={styles.post_image}
                                     />
                                 </Link>
                                 <div className={dclsx('margin-block-10x')}>
-                                    <Link url={{ type: 'internal', to: '/' }} no_hover>
+                                    <Link
+                                        url={{ type: 'internal', to: `/blog/single-blog/${title}` }}
+                                        no_hover
+                                    >
                                         <Typography.Heading as="h3" size="xxs">
                                             <Localize translate_text={`_t_${title}_t_`} />
                                         </Typography.Heading>
@@ -52,6 +62,7 @@ const AllPostsModule = ({ data }: TBlogPosts) => {
                     })}
                 </Flex.Box>
             </Flex.Box>
+            <Footer />
         </Layout>
     )
 }
diff --git a/src/features/pages/posts/index.tsx b/src/features/pages/posts/index.tsx
index f40ecdc2865..68e13a18a9e 100644
--- a/src/features/pages/posts/index.tsx
+++ b/src/features/pages/posts/index.tsx
@@ -7,11 +7,15 @@ import { Localize } from 'components/localization'
 import Flex from 'features/components/atoms/flex-box'
 import Link from 'features/components/atoms/link'
 import dclsx from 'features/utils/dclsx'
+import MainNav from 'features/components/templates/navigation/main-nav'
+import Footer from 'features/components/templates/footer'
 
 const PostsModule = ({ data }: TBlogPosts) => {
     const posts = data?.allStrapiPost?.nodes || []
     return (
         <Layout>
+            <MainNav />
+
             <Flex.Box margin_block="12x" direction="col" className={styles.posts_wrapper}>
                 <Typography.Heading as="h2" size="small">
                     <Localize translate_text={'_t_Recent articles_t_'} />
@@ -24,14 +28,20 @@ const PostsModule = ({ data }: TBlogPosts) => {
                         const formattedDate = parsedDate?.format('Do [of] MMMM YYYY')
                         return (
                             <Flex.Box direction="col" key={title} className={styles.image_wrapper}>
-                                <Link url={{ type: 'internal', to: `/blog/${title}` }} no_hover>
+                                <Link
+                                    url={{ type: 'internal', to: `/blog/single-blog/${title}` }}
+                                    no_hover
+                                >
                                     <img
                                         src={banner?.localFile?.publicURL}
                                         className={styles.post_image}
                                     />
                                 </Link>
                                 <div className={dclsx('margin-block-10x')}>
-                                    <Link url={{ type: 'internal', to: `/blog/${title}` }} no_hover>
+                                    <Link
+                                        url={{ type: 'internal', to: `/blog/single-blog/${title}` }}
+                                        no_hover
+                                    >
                                         <Typography.Heading as="h3" size="xxs">
                                             <Localize translate_text={`_t_${title}_t_`} />
                                         </Typography.Heading>
@@ -50,6 +60,7 @@ const PostsModule = ({ data }: TBlogPosts) => {
                     })}
                 </Flex.Box>
             </Flex.Box>
+            <Footer />
         </Layout>
     )
 }
diff --git a/src/pages/blog/single-blog/index.tsx b/src/pages/blog/single-blog/index.tsx
index 8d2d7bd2033..8fa7c73733a 100644
--- a/src/pages/blog/single-blog/index.tsx
+++ b/src/pages/blog/single-blog/index.tsx
@@ -2,7 +2,6 @@ import React from 'react'
 import { graphql } from 'gatsby'
 
 const BlogTemplate = (data) => {
-    console.log(data, 'www')
     const { strapiPost } = data?.data || {} // Extracting the data object
 
     const { hero } = strapiPost || {}