From 0bc323a777a607090af87636026f668104cf8a0c Mon Sep 17 00:00:00 2001 From: Armand Philippot Date: Wed, 15 Dec 2021 17:16:54 +0100 Subject: fix: change branding title tag on homepage I forgot to pass isHome arg... --- src/components/Branding/Branding.tsx | 22 ++++++++-------------- src/components/Header/Header.tsx | 4 ++-- src/components/Layouts/Layout.tsx | 12 +++++++++--- src/pages/index.tsx | 2 +- 4 files changed, 20 insertions(+), 20 deletions(-) (limited to 'src') diff --git a/src/components/Branding/Branding.tsx b/src/components/Branding/Branding.tsx index a8adf9b..d1f1ad7 100644 --- a/src/components/Branding/Branding.tsx +++ b/src/components/Branding/Branding.tsx @@ -6,9 +6,11 @@ import photo from '@assets/images/armand-philippot.jpg'; import { config } from '@config/website'; import styles from './Branding.module.scss'; -type BrandingReturn = ({ isHome }: { isHome?: boolean }) => ReactElement; +type BrandingReturn = ({ isHome }: { isHome: boolean }) => ReactElement; const Branding: BrandingReturn = ({ isHome = false }) => { + const TitleTag = isHome ? 'h1' : 'p'; + return (
@@ -21,19 +23,11 @@ const Branding: BrandingReturn = ({ isHome = false }) => { layout="intrinsic" />
- {isHome ? ( -

- - {config.name} - -

- ) : ( -

- - {config.name} - -

- )} + + + {config.name} + +

{config.baseline}

); diff --git a/src/components/Header/Header.tsx b/src/components/Header/Header.tsx index 52da2e8..6691eb9 100644 --- a/src/components/Header/Header.tsx +++ b/src/components/Header/Header.tsx @@ -2,11 +2,11 @@ import Branding from '@components/Branding/Branding'; import MainNav from '@components/MainNav/MainNav'; import styles from './Header.module.scss'; -const Header = () => { +const Header = ({ isHome }: { isHome: boolean }) => { return (
- +
diff --git a/src/components/Layouts/Layout.tsx b/src/components/Layouts/Layout.tsx index 4270a17..7f8ab9d 100644 --- a/src/components/Layouts/Layout.tsx +++ b/src/components/Layouts/Layout.tsx @@ -1,12 +1,18 @@ -import { FunctionComponent } from 'react'; +import { ReactNode } from 'react'; import Footer from '@components/Footer/Footer'; import Header from '@components/Header/Header'; import Main from '@components/Main/Main'; -const Layout: FunctionComponent = ({ children }) => { +const Layout = ({ + children, + isHome = false, +}: { + children: ReactNode; + isHome?: boolean; +}) => { return ( <> -
+
{children}