From 48f7e971c90b41d603d9e938317313cf4010bc81 Mon Sep 17 00:00:00 2001
From: Roman Timashev <roman@tmshv.ru>
Date: Tue, 18 Feb 2020 15:36:20 +0300
Subject: [PATCH] footer / block / contacts refactoring

---
 pages/_error.tsx                  | 12 +++++-------
 src/components/App/AppFooter.tsx  | 20 --------------------
 src/components/App/index.tsx      |  4 ++--
 src/components/Block/index.tsx    | 23 +++++++++++++++++++----
 src/components/Contacts/index.tsx | 27 +++++++++++++++++++++++++++
 src/components/Footer/index.tsx   | 25 +++++++------------------
 src/config.ts                     | 30 +++++++++++++++++++++++++++---
 src/style/footer.scss             | 18 ++----------------
 8 files changed, 89 insertions(+), 70 deletions(-)
 delete mode 100644 src/components/App/AppFooter.tsx
 create mode 100644 src/components/Contacts/index.tsx

diff --git a/pages/_error.tsx b/pages/_error.tsx
index 8b4bab7b..f722d751 100644
--- a/pages/_error.tsx
+++ b/pages/_error.tsx
@@ -9,13 +9,11 @@ const Page: NextPage = () => (
     <Wrapper
         header={null}
         footer={(
-            <footer>
-                <Block direction={'horizontal'}>
-                    <Spacer />
-                    <Copyright />
-                    <Spacer />
-                </Block>
-            </footer>
+            <Block as={'footer'} direction={'horizontal'}>
+                <Spacer />
+                <Copyright />
+                <Spacer />
+            </Block>
         )}
     >
         <NotFound />
diff --git a/src/components/App/AppFooter.tsx b/src/components/App/AppFooter.tsx
deleted file mode 100644
index ef9eeeae..00000000
--- a/src/components/App/AppFooter.tsx
+++ /dev/null
@@ -1,20 +0,0 @@
-import { Footer } from '../Footer'
-import { useContext } from 'react'
-import { ConfigContext } from 'src/context/ConfigContext'
-
-export type AppFooterProps = {
-    showAuthor: boolean
-}
-
-export const AppFooter: React.FC<AppFooterProps> = props => {
-    const config = useContext(ConfigContext)
-
-    return (
-        <Footer
-            showAuthor={props.showAuthor}
-            address={config.address}
-            telephone={config.telephone}
-            email={config.email}
-        />
-    )
-}
diff --git a/src/components/App/index.tsx b/src/components/App/index.tsx
index cb4080c9..cac1472e 100644
--- a/src/components/App/index.tsx
+++ b/src/components/App/index.tsx
@@ -6,7 +6,7 @@ import { Wrapper } from '../Wrapper'
 import { Header } from './Header'
 import { ConfigContext } from 'src/context/ConfigContext'
 import config from 'src/config'
-import { AppFooter } from './AppFooter'
+import { Footer } from '../Footer'
 
 const Navigation = dynamic(() => import('../Navigation').then(mod => mod.Navigation), {
     ssr: false,
@@ -33,7 +33,7 @@ export const App: React.FC<IAppProps> = props => {
                     </Header>
                 )}
                 footer={(
-                    <AppFooter
+                    <Footer
                         showAuthor={props.showAuthor}
                     />
                 )}
diff --git a/src/components/Block/index.tsx b/src/components/Block/index.tsx
index 70845130..add00e6b 100644
--- a/src/components/Block/index.tsx
+++ b/src/components/Block/index.tsx
@@ -1,11 +1,16 @@
+import cx from 'classnames'
+import { createElement } from 'react'
+
 export type BlockProps = {
+    as?: keyof HTMLElementTagNameMap
     style?: React.CSSProperties
     direction: 'horizontal' | 'vertical'
 }
 
-export const Block: React.FC<BlockProps> = props => {
-    return (
-        <div style={props.style}>
+export const Block: React.FC<BlockProps> = ({ as = 'div', style, direction, ...props }) => {
+    const newProps = { className: cx(direction), style }
+    const children = (
+        <>
             <style jsx>{`
                 div {
                     display: flex;
@@ -13,9 +18,19 @@ export const Block: React.FC<BlockProps> = props => {
                     align-items: baseline;
                     justify-content: flex-start;
                 }
+
+                .horizontal {
+                    flex-direction: row;
+                }
+
+                .vertical {
+                    flex-direction: column;
+                }
             `}</style>
 
             {props.children}
-        </div>
+        </>
     )
+
+    return createElement(as, newProps, children)
 }
diff --git a/src/components/Contacts/index.tsx b/src/components/Contacts/index.tsx
new file mode 100644
index 00000000..a5759b71
--- /dev/null
+++ b/src/components/Contacts/index.tsx
@@ -0,0 +1,27 @@
+import { useContext } from 'react'
+import { ConfigContext } from 'src/context/ConfigContext'
+
+export const Contacts: React.FC = props => {
+    const { contacts } = useContext(ConfigContext)
+
+    return (
+        <>
+            <style jsx>{`
+                h4 {
+                    margin-bottom: var(--half-margin);
+                }
+
+                p {
+                    margin-left: var(--single-margin);
+                    margin-bottom: var(--half-margin);
+                }
+            `}</style>
+
+            <h4>Контактная информация</h4>
+
+            {contacts.map((x, i) => (
+                <p><a href={x.value}>{x.title}</a></p>
+            ))}
+        </>
+    )
+}
diff --git a/src/components/Footer/index.tsx b/src/components/Footer/index.tsx
index fafcd0c5..6e45b0d6 100644
--- a/src/components/Footer/index.tsx
+++ b/src/components/Footer/index.tsx
@@ -2,32 +2,21 @@ import { Copyright } from '../Copyright'
 import { Author } from './Author'
 import { Block } from '../Block'
 import { Spacer } from '../Spacer'
-
-const mailto = email => `mailto:${email}`
+import { Contacts } from '../Contacts'
 
 export interface IFooterProps {
-    address: string
-    telephone: string
-    email: string
     showAuthor: boolean
 }
 
 export const Footer: React.FC<IFooterProps> = props => (
     <footer>
-        <div className="contacts">
-            <div>
-                <h4>Контактная информация</h4>
-                <p>Адрес: {props.address}</p>
-                <p>Телефон: {props.telephone}</p>
-                <p>Почта: <a href={mailto(props.email)}>{props.email}</a></p>
-                <p>Вконтакте: <a href="https://vk.com/shlisselburghudozka">shlisselburghudozka</a></p>
-                <p>Инстаграм: <a href="https://www.instagram.com/hudozka/">hudozka</a></p>
-            </div>
-        </div>
-
-        <Block direction={'horizontal'} style={{
-            padding: '1.5em 1em 0.25em',
+        <Block direction={'vertical'} style={{
+            marginBottom: 'var(--single-margin)',
         }}>
+            <Contacts />
+        </Block>
+
+        <Block direction={'horizontal'}>
             <Copyright />
 
             {!props.showAuthor ? null : (
diff --git a/src/config.ts b/src/config.ts
index c3b3c1f2..a2c5d6b7 100644
--- a/src/config.ts
+++ b/src/config.ts
@@ -1,9 +1,33 @@
 const currentYear = () => (new Date()).getFullYear()
 
 export default {
-    address: "г. Шлиссельбург ул. 18 января д. 3",
-    telephone: "+7 (81362) 76-312",
-    email: "hudozka@gmail.com",
     yearStart: 2012,
     yearEnd: currentYear(),
+    contacts: [
+        {
+            type: 'link',
+            value: 'https://yandex.ru/maps/-/CKUkAXIb',
+            title: 'г. Шлиссельбург ул. 18 января д. 3',
+        },
+        {
+            type: 'tel',
+            value: 'tel:+78136276312',
+            title: '+7 (81362) 76-312',
+        },
+        {
+            type: 'email',
+            value: 'mailto:hudozka@gmail.com',
+            title: 'hudozka@gmail.com',
+        },
+        {
+            type: 'link',
+            value: 'https://vk.com/shlisselburghudozka',
+            title: 'Вконтакте'
+        },
+        {
+            type: 'link',
+            value: 'https://www.instagram.com/hudozka',
+            title: 'Инстаграм'
+        }
+    ]
 }
diff --git a/src/style/footer.scss b/src/style/footer.scss
index c33dcbbb..483b88b0 100644
--- a/src/style/footer.scss
+++ b/src/style/footer.scss
@@ -1,17 +1,3 @@
 footer {
-  padding: 0 var(--half-margin) var(--half-margin);
-  position: relative;
-
-  .contacts {
-    margin: var(--double-margin) 0 var(--half-margin);
-
-    & > div {
-      padding: 0 var(--single-margin);
-    }
-
-    p {
-      margin: var(--half-margin) var(--single-margin);
-    }
-  }
-
-}
\ No newline at end of file
+    padding: var(--single-margin);
+}