From 560e3e9c7ebb5a237cd8e3be982023c33bd10d9b Mon Sep 17 00:00:00 2001
From: Thomas Bouffard <27200110+tbouffard@users.noreply.github.com>
Date: Wed, 22 Dec 2021 16:24:54 +0100
Subject: [PATCH 1/2] [FEAT] Simplify header in non 'home' pages

In blog and news pages: remove links to posts and news in header
Use header, footer and mail subscription in the 404 page
---
 src/pages/404.tsx                   | 11 +++++++++--
 src/theme/components/PageHeader.tsx | 16 ----------------
 2 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/src/pages/404.tsx b/src/pages/404.tsx
index 65e4cea81..fd025b6d8 100644
--- a/src/pages/404.tsx
+++ b/src/pages/404.tsx
@@ -21,9 +21,13 @@ import Triangle from '../theme/components/Triangle';
 import { Link } from 'gatsby';
 import Img from '../images/404.png';
 import { PAGE } from '../theme/utils/constants';
+import PageHeader from '../theme/components/PageHeader';
+import Footer from '../theme/components/Footer';
+import { MailingListSubscription } from '../theme/components/mailingListSubscription/MailingListSubscription';
 
 const NotFoundPage = (): JSX.Element => (
   <Layout title={PAGE.notFound}>
+    <PageHeader />
     <Section.Container Background={Background}>
       <Box width={[320, 400, 600]} m="auto">
         <Image
@@ -43,13 +47,16 @@ const NotFoundPage = (): JSX.Element => (
         </Text>
       </Box>
     </Section.Container>
+    <Footer />
+    <MailingListSubscription />
   </Layout>
 );
 
 const Background = (): JSX.Element => (
   <>
     <Triangle
-      color="muted"
+      color="secondary"
+      // color="muted"
       height={['35vh', '80vh']}
       width={['95vw', '60vw']}
     />
@@ -62,7 +69,7 @@ const Background = (): JSX.Element => (
     />
 
     <Triangle
-      color="secondary"
+      color="muted"
       height={['10vh', '20vh']}
       width={['50vw', '50vw']}
       position="top-right"
diff --git a/src/theme/components/PageHeader.tsx b/src/theme/components/PageHeader.tsx
index 88effa146..9520ebe92 100644
--- a/src/theme/components/PageHeader.tsx
+++ b/src/theme/components/PageHeader.tsx
@@ -53,22 +53,6 @@ const PageHeader = (): JSX.Element => {
           </Flex>
         </RebassLink>
         <Flex mr={[0, 3, 5]}>
-          {Object.keys(PAGE)
-            .filter(id => id !== 'home' && id !== 'notFound')
-            .map(id => (
-              <Box
-                key={id}
-                ml={[2, 3]}
-                mt="auto"
-                mb="auto"
-                color="background"
-                fontSize={[2, 3]}
-              >
-                <Link href={`/${id}`} tabIndex={0}>
-                  {capitalize(id)}
-                </Link>
-              </Box>
-            ))}
           <Box ml={[2, 3]} fontSize={[2, 3]}>
             <Button
               as={LinkInButton}

From 99aa954d48260d70d735b554ff81d9a610fa9c54 Mon Sep 17 00:00:00 2001
From: Thomas Bouffard <27200110+tbouffard@users.noreply.github.com>
Date: Wed, 22 Dec 2021 16:48:12 +0100
Subject: [PATCH 2/2] Fix lint warnings

---
 src/theme/components/PageHeader.tsx | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/theme/components/PageHeader.tsx b/src/theme/components/PageHeader.tsx
index 9520ebe92..c90ff54e9 100644
--- a/src/theme/components/PageHeader.tsx
+++ b/src/theme/components/PageHeader.tsx
@@ -24,9 +24,7 @@ import {
 } from 'rebass/styled-components';
 import styled from 'styled-components';
 import { header } from '../../content/HeaderContent';
-import { PAGE } from '../utils/constants';
-import { Link, LinkInButton } from './Link';
-import { capitalize } from '../utils/string';
+import { LinkInButton } from './Link';
 import colors from '../colors.json';
 
 const PageHeader = (): JSX.Element => {