From d38f76c38f040be7ebc8daf79d6384d5fe25ae18 Mon Sep 17 00:00:00 2001 From: Maximus Date: Fri, 19 Aug 2022 17:08:02 +0300 Subject: [PATCH 1/2] added Footer and Header to base layout --- src/components/BaseLayout.tsx | 43 ++++++++++++++++------------------- 1 file changed, 19 insertions(+), 24 deletions(-) diff --git a/src/components/BaseLayout.tsx b/src/components/BaseLayout.tsx index e5331df..284c8ca 100644 --- a/src/components/BaseLayout.tsx +++ b/src/components/BaseLayout.tsx @@ -1,28 +1,23 @@ import React from "react"; +// import { Footer } from "./parts/Footer"; +import Header from "./parts/Header"; type Props = { - header?: React.ReactElement, - children: React.ReactNode, - footer?: React.ReactElement, - className : string, + header?: React.ReactElement; + children: React.ReactNode; + footer?: React.ReactElement; + className?: string; +}; + +function BaseLayout({ header, footer, children, className }: Props) { + return ( +
+ {/*
*/} + +
{children}
+ + {/*
*/} +
+ ); } -function BaseLayout( { header, footer, children, className }: Props ) { - return ( -
-
- {header} -
- -
- {children} -
- -
- {footer} -
-
- ); - } - - export default BaseLayout; - \ No newline at end of file +export default BaseLayout; From dec8bce3e310652e76a4d2b87cf8e4baf9213837 Mon Sep 17 00:00:00 2001 From: Maximus Date: Fri, 19 Aug 2022 17:17:59 +0300 Subject: [PATCH 2/2] exactly added Footer and Header to base layout --- src/components/BaseLayout.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/BaseLayout.tsx b/src/components/BaseLayout.tsx index 284c8ca..d9fa40f 100644 --- a/src/components/BaseLayout.tsx +++ b/src/components/BaseLayout.tsx @@ -11,11 +11,11 @@ type Props = { function BaseLayout({ header, footer, children, className }: Props) { return (
- {/*
*/} +
{children}
- {/*
); }