Mayuran/changes footer header (#5997)

* 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 <[email protected]> Co-authored-by: DerivFE <[email protected]> * translations: 📚 sync translations with crowdin (#5934) Co-authored-by: DerivFE <[email protected]> * fix: signup provider send null (#5935) * translations: 📚 sync translations with crowdin (#5939) Co-authored-by: DerivFE <[email protected]> * 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 <[email protected]> * 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 <[email protected]> Co-authored-by: mitra-deriv <[email protected]> Co-authored-by: DerivFE <[email protected]> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: NikitK-deriv <[email protected]> Co-authored-by: Habib Deriv <[email protected]>
binary-com · Nov 21, 2023 · 78b6c5a · 78b6c5a
1 parent 83a459b
commit 78b6c5a
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 5 deletions.
diff --git 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
@@ -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
@@ -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 || {}