Footer updated #2

Merged
tmshv merged 4 commits from dev into master 2018-05-22 23:56:21 +00:00
4 changed files with 22 additions and 10 deletions

No files matched your search

+1 -1
View File
@@ -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
+1 -1
View File
@@ -20,7 +20,7 @@ services:
- mongo
build:
context: ./
dockerfile: Hudozka.Dockerfile
dockerfile: Dockerfile
links:
- mongo
ports:
+1 -2
View File
@@ -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'))
+19 -6
View File
@@ -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,16 +17,28 @@ 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">
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>
)
module.exports = Footer