From 3856c80021864926a9875e737fd4c16dbc12aa40 Mon Sep 17 00:00:00 2001
From: Roman Timashev <roman@tmshv.ru>
Date: Tue, 18 Feb 2020 12:00:12 +0300
Subject: [PATCH 1/3] merge app with document

---
 pages/_app.tsx      | 56 ++++++++++++++++++++++++++++++++++++++-
 pages/_document.tsx | 64 ---------------------------------------------
 2 files changed, 55 insertions(+), 65 deletions(-)
 delete mode 100644 pages/_document.tsx

diff --git a/pages/_app.tsx b/pages/_app.tsx
index ec8dd195..2ccbe35d 100644
--- a/pages/_app.tsx
+++ b/pages/_app.tsx
@@ -1,12 +1,66 @@
 import 'src/style.css'
+import 'src/style/style.scss'
+
 import App from 'next/app'
+import Head from 'next/head'
+import { YMetrika } from 'src/components/YMetrika'
+import { GAnalytics } from 'src/components/GAnalytics'
 
 export default class MyApp extends App {
     render() {
         const { Component, pageProps } = this.props
 
         return (
-            <Component {...pageProps} />
+            <>
+                <Head>
+                    <meta charSet="utf-8" />
+                    <meta name="viewport" content="width=device-width, maximum-scale=1.0" />
+                    <meta name="referrer" content="unsafe-url" />
+
+                    <meta name="google-site-verification" content="8BxOTw-Q02DS2KAdcGcnIMwiPZ58DVB18XpOfRibCcg" />
+                    <meta name="google-site-verification" content="A-TEemUw4hHpULUDCd6xhxfHnyRbgKtss90JGKXnSpw" />
+                    <meta name='yandex-verification' content='643c7dac144b9dac' />
+                    <meta name="msvalidate.01" content="E878301FE3E3F12D233A6B1156889601" />
+
+                    <link rel="icon" type="image/png" href="/static/graphics/favicon-32.png" />
+                    <link rel="apple-touch-icon" sizes="57x57" href="/static/graphics/favicon-57.png" />
+                    <link rel="apple-touch-icon" sizes="72x72" href="/static/graphics/favicon-72.png" />
+                    <link rel="apple-touch-icon" sizes="114x114" href="/static/graphics/favicon-114.png" />
+                    <link rel="apple-touch-icon" sizes="144x144" href="/static/graphics/favicon-144.png" />
+
+                    <link
+                        rel="alternate"
+                        type="application/rss+xml"
+                        title="Шлиссельбургская Детская Художественная Школа"
+                        href="/feed.xml"
+                    />
+
+                    <link href='/static/shadow-font/style.css' rel='stylesheet' />
+
+                    {/* Fotorama + jQuery*/}
+                    <script src="//ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js" />
+                    <link href="//cdnjs.cloudflare.com/ajax/libs/fotorama/4.6.4/fotorama.css" rel="stylesheet" />
+                    <script src="//cdnjs.cloudflare.com/ajax/libs/fotorama/4.6.4/fotorama.js" />
+
+                    {/* Opa */}
+                    <script src="/static/opa.js" />
+                    <link rel="stylesheet" href="/static/opa.css" />
+
+                    {/* Likely */}
+                    <script src='/static/likely.js' />
+                    <link href='/static/likely.css' rel='stylesheet' />
+
+                    {/* Fonts */}
+                    <link href="https://fonts.googleapis.com/css?family=PT+Sans|PT+Serif" rel="stylesheet" as="font" />
+
+                    {/* Instagram Embed */}
+                    <script async defer src="//platform.instagram.com/en_US/embeds.js" />
+
+                    <YMetrika account={24027460} />
+                    <GAnalytics account={'UA-60209057-1'} />
+                </Head>
+                <Component {...pageProps} />
+            </>
         )
     }
 }
diff --git a/pages/_document.tsx b/pages/_document.tsx
deleted file mode 100644
index 121ffed0..00000000
--- a/pages/_document.tsx
+++ /dev/null
@@ -1,64 +0,0 @@
-import Document, { Html, Head, Main, NextScript } from 'next/document'
-import { YMetrika } from 'src/components/YMetrika'
-import { GAnalytics } from 'src/components/GAnalytics'
-
-export default class MyDocument extends Document {
-    render() {
-        return (
-            <Html>
-                <Head>
-                    <meta charSet="utf-8" />
-                    <meta name="viewport" content="width=device-width, maximum-scale=1.0" />
-                    <meta name="referrer" content="unsafe-url" />
-
-                    <meta name="google-site-verification" content="8BxOTw-Q02DS2KAdcGcnIMwiPZ58DVB18XpOfRibCcg" />
-                    <meta name="google-site-verification" content="A-TEemUw4hHpULUDCd6xhxfHnyRbgKtss90JGKXnSpw" />
-                    <meta name='yandex-verification' content='643c7dac144b9dac' />
-                    <meta name="msvalidate.01" content="E878301FE3E3F12D233A6B1156889601" />
-
-                    <link rel="icon" type="image/png" href="/static/graphics/favicon-32.png" />
-                    <link rel="apple-touch-icon" sizes="57x57" href="/static/graphics/favicon-57.png" />
-                    <link rel="apple-touch-icon" sizes="72x72" href="/static/graphics/favicon-72.png" />
-                    <link rel="apple-touch-icon" sizes="114x114" href="/static/graphics/favicon-114.png" />
-                    <link rel="apple-touch-icon" sizes="144x144" href="/static/graphics/favicon-144.png" />
-
-                    <link
-                        rel="alternate"
-                        type="application/rss+xml"
-                        title="Шлиссельбургская Детская Художественная Школа"
-                        href="/feed.xml"
-                    />
-
-                    <link href='/static/shadow-font/style.css' rel='stylesheet' />
-
-                    {/* Fotorama + jQuery*/}
-                    <script src="//ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js" />
-                    <link href="//cdnjs.cloudflare.com/ajax/libs/fotorama/4.6.4/fotorama.css" rel="stylesheet" />
-                    <script src="//cdnjs.cloudflare.com/ajax/libs/fotorama/4.6.4/fotorama.js" />
-
-                    {/* Opa */}
-                    <script src="/static/opa.js" />
-                    <link rel="stylesheet" href="/static/opa.css" />
-
-                    {/* Likely */}
-                    <script src='/static/likely.js' />
-                    <link href='/static/likely.css' rel='stylesheet' />
-
-                    {/* Fonts */}
-                    <link href="https://fonts.googleapis.com/css?family=PT+Sans|PT+Serif" rel="stylesheet" as="font" />
-
-                    {/* Instagram Embed */}
-                    <script async defer src="//platform.instagram.com/en_US/embeds.js" />
-
-                    <YMetrika account={24027460} />
-                    <GAnalytics account={'UA-60209057-1'} />
-                </Head>
-
-                <body>
-                    <Main />
-                    <NextScript />
-                </body>
-            </Html>
-        )
-    }
-}

From 851d888f89876a5b704c11591b7666181a880997 Mon Sep 17 00:00:00 2001
From: Roman Timashev <roman@tmshv.ru>
Date: Tue, 18 Feb 2020 12:00:24 +0300
Subject: [PATCH 2/3] rm style from App component

---
 src/components/App/index.tsx | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/components/App/index.tsx b/src/components/App/index.tsx
index 6f755e94..3bcf5c8b 100644
--- a/src/components/App/index.tsx
+++ b/src/components/App/index.tsx
@@ -1,5 +1,3 @@
-import 'src/style/style.scss'
-
 import dynamic from 'next/dynamic'
 import cx from 'classnames'
 import { Footer } from '../Footer'

From e05c06589fa6e06e22b92e5570f3b7ced67f0632 Mon Sep 17 00:00:00 2001
From: Roman Timashev <roman@tmshv.ru>
Date: Tue, 18 Feb 2020 12:00:34 +0300
Subject: [PATCH 3/3] rm style from error page

---
 pages/_error.tsx | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pages/_error.tsx b/pages/_error.tsx
index 8702f671..c541d7ca 100644
--- a/pages/_error.tsx
+++ b/pages/_error.tsx
@@ -1,5 +1,3 @@
-import 'src/style/style.scss'
-
 import { NextPage } from 'next'
 import { Wrapper } from 'src/components/Wrapper'
 import { NotFound } from 'src/components/NotFound'