From b7579413dba2a472095b8957b3a3526458167fae Mon Sep 17 00:00:00 2001
From: Roman Timashev <roman@tmshv.ru>
Date: Wed, 23 May 2018 02:51:16 +0300
Subject: [PATCH 1/3] build configs updated

---
 Dockerfile          | 2 +-
 docker-compose.yaml | 2 +-
 gulpfile.js         | 3 +--
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 00674f85..1a7044af 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -7,7 +7,7 @@ RUN npm i
 COPY webpack.config.js gulpfile.js .babelrc ./
 COPY robots.txt ./
 COPY src ./src
-RUN npm run gulp deploy
+RUN npm run gulp
 RUN npm run build-app
 RUN npm run out
 
diff --git a/docker-compose.yaml b/docker-compose.yaml
index 2c489bfc..bbd1ecd4 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -20,7 +20,7 @@ services:
       - mongo
     build:
       context: ./
-      dockerfile: Hudozka.Dockerfile
+      dockerfile: Dockerfile
     links:
       - mongo
     ports:
diff --git a/gulpfile.js b/gulpfile.js
index 45155d61..c1207e27 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -54,6 +54,5 @@ gulp.task('imagemin', () => {
 		.pipe(gulp.dest('./public/graphics'))
 })
 
-gulp.task('default', gulp.series('style'))
 gulp.task('copy', gulp.series('copy views', 'copy fonts', 'copy graphics', 'copy robots.txt'))
-gulp.task('deploy', gulp.series('default', 'copy', 'imagemin'))
+gulp.task('default', gulp.series('style', 'copy', 'imagemin'))
-- 
2.54.0


From f3b6420d02743f6840408293702f814fd15406a9 Mon Sep 17 00:00:00 2001
From: Roman Timashev <roman@tmshv.ru>
Date: Wed, 23 May 2018 02:51:49 +0300
Subject: [PATCH 2/3] Footer updated + added dynamic copyright

---
 src/components/Footer.js | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/components/Footer.js b/src/components/Footer.js
index 68856c99..8c6fd523 100644
--- a/src/components/Footer.js
+++ b/src/components/Footer.js
@@ -1,6 +1,7 @@
 const React = require('react')
 
 const mailto = email => `mailto:${email}`
+const currentYear = () => (new Date()).getFullYear()
 
 const Footer = ({children, address, telephone, email, showAuthor}) => (
 	<footer>
@@ -16,7 +17,10 @@ const Footer = ({children, address, telephone, email, showAuthor}) => (
 		</div>
 
 		<div className="copyright">
-			<span>©&nbsp;2012—2017 Шлиссельбургская детская художественная школа</span>
+            <Copyright
+                yearStart={2012}
+                yearEnd={currentYear()}
+            />
 			{!showAuthor ? null : (
 				<span>Разработка и поддержка сайта —
 					<a href="http://tmshv.ru?utm_source=artshburg&utm_medium=developer&utm_campaign=tmshv_ru">
@@ -28,4 +32,8 @@ const Footer = ({children, address, telephone, email, showAuthor}) => (
 	</footer>
 )
 
+const Copyright = ({yearStart, yearEnd}) => (
+    <span>©&nbsp;{yearStart}—{yearEnd} Шлиссельбургская детская художественная школа</span>
+)
+
 module.exports = Footer
-- 
2.54.0


From 7216312fe2fc0547065caa748a46047bd6e13947 Mon Sep 17 00:00:00 2001
From: Roman Timashev <roman@tmshv.ru>
Date: Wed, 23 May 2018 02:53:42 +0300
Subject: [PATCH 3/3] Footer author updated

---
 src/components/Footer.js | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/components/Footer.js b/src/components/Footer.js
index 8c6fd523..07a7e01a 100644
--- a/src/components/Footer.js
+++ b/src/components/Footer.js
@@ -22,16 +22,21 @@ const Footer = ({children, address, telephone, email, showAuthor}) => (
                 yearEnd={currentYear()}
             />
 			{!showAuthor ? null : (
-				<span>Разработка и поддержка сайта —
-					<a href="http://tmshv.ru?utm_source=artshburg&utm_medium=developer&utm_campaign=tmshv_ru">
-						www.tmshv.ru
-					</a>
-				</span>
+                <Author/>
 			)}
 		</div>
 	</footer>
 )
 
+const Author = () => (
+    <span>
+		Разработка и поддержка сайта —
+		<a href="http://tmshv.ru?utm_source=artshburg&utm_medium=developer&utm_campaign=tmshv_ru">
+			www.tmshv.ru
+		</a>
+	</span>
+)
+
 const Copyright = ({yearStart, yearEnd}) => (
     <span>©&nbsp;{yearStart}—{yearEnd} Шлиссельбургская детская художественная школа</span>
 )
-- 
2.54.0