diff --git a/assets/images/photo1.svg b/assets/images/photo1.svg index 5471348..03767e4 100644 --- a/assets/images/photo1.svg +++ b/assets/images/photo1.svg @@ -1,15 +1 @@ - - - - - - - - - - - - - - - + \ No newline at end of file diff --git a/assets/images/photo2.svg b/assets/images/photo2.svg index 97fc8ac..7240344 100644 --- a/assets/images/photo2.svg +++ b/assets/images/photo2.svg @@ -1,26 +1 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - + \ No newline at end of file diff --git a/assets/images/photo3.svg b/assets/images/photo3.svg index 09bd768..36baed4 100644 --- a/assets/images/photo3.svg +++ b/assets/images/photo3.svg @@ -1,18 +1 @@ - - - - - - - - - - - - - - - - - - + \ No newline at end of file diff --git a/gulpfile.js b/gulpfile.js index 2451bc9..7404b86 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -7,7 +7,7 @@ const uglify = require('gulp-uglify-es').default; function cssTask(cb) { return src("./src/*.css") .pipe(postcss()) - .pipe(dest("./assets/css")) + .pipe(dest("./dist/css")) .pipe(browserSync.stream()); cb(); } @@ -24,7 +24,13 @@ function scriptsTask(cb) { function imageminTask(cb) { return src("./assets/images/*") .pipe(imagemin()) - .pipe(dest("./assets/images")); + .pipe(dest("./dist/assets/images")); + cb(); +} + +function htmlBuild(cb) { + return src("./*.html") + .pipe(dest("./dist")) cb(); } @@ -46,9 +52,10 @@ function browsersyncReload(cb) { function watchTask() { watch("./**/*.html", browsersyncReload); watch(["./src/*.css"], series(cssTask, browsersyncReload)); + watch(["./src/*.js"], series(scriptsTask, browsersyncReload)); } -// Default Gulp Task -exports.default = series(cssTask, scriptsTask, browsersyncServe, watchTask); +exports.build = series(cssTask, scriptsTask, imageminTask, htmlBuild); +exports.default = series(cssTask, scriptsTask, htmlBuild, browsersyncServe, watchTask); exports.css = cssTask; exports.images = imageminTask; diff --git a/package.json b/package.json index 4ef17b4..349cd1c 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,7 @@ "main": "index.html", "scripts": { "dev": "gulp", - "build": "NODE_ENV=production gulp css", + "build": "NODE_ENV=production gulp build", "build-images": "gulp images" }, "keywords": [ diff --git a/src/main.js b/src/main.js index 1087402..427bc27 100644 --- a/src/main.js +++ b/src/main.js @@ -33,7 +33,6 @@ function writeCode () { loopTimer = setTimeout('writeCode()',40); } - function isInViewport(element) { const rect = element.getBoundingClientRect(); return (