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')) diff --git a/src/components/Footer.js b/src/components/Footer.js index 68856c99..07a7e01a 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}) => ( ) +const Author = () => ( + + Разработка и поддержка сайта — + + www.tmshv.ru + + +) + +const Copyright = ({yearStart, yearEnd}) => ( + © {yearStart}—{yearEnd} Шлиссельбургская детская художественная школа +) + module.exports = Footer