diff --git a/.gitignore b/.gitignore index 4b37359..c5ae69f 100644 --- a/.gitignore +++ b/.gitignore @@ -11,5 +11,4 @@ __pycache__ /node_modules/ /attract/templates/ /attract/static/assets/css/ - -/attract/static/assets/js/*.min.js +/attract/static/assets/js/generated/ diff --git a/gulpfile.js b/gulpfile.js index 6b099d5..cba5366 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -60,7 +60,7 @@ gulp.task('scripts', function() { .pipe(rename({suffix: '.min'})) .pipe(gulpif(enabled.maps, sourcemaps.write("."))) .pipe(chmod(644)) - .pipe(gulp.dest('attract/static/assets/js/')) + .pipe(gulp.dest('attract/static/assets/js/generated/')) .pipe(gulpif(enabled.liveReload, livereload())); }); @@ -75,7 +75,7 @@ gulp.task('scripts_tutti', function() { .pipe(gulpif(enabled.uglify, uglify())) .pipe(gulpif(enabled.maps, sourcemaps.write("."))) .pipe(chmod(644)) - .pipe(gulp.dest('attract/static/assets/js/')) + .pipe(gulp.dest('attract/static/assets/js/generated/')) .pipe(gulpif(enabled.liveReload, livereload())); }); diff --git a/src/templates/attract/layout.jade b/src/templates/attract/layout.jade index 9db4c21..4799698 100644 --- a/src/templates/attract/layout.jade +++ b/src/templates/attract/layout.jade @@ -17,7 +17,7 @@ html(lang="en") script(src="{{ url_for('static_pillar', filename='assets/js/vendor/jquery-3.1.0.min.js')}}") script(src="{{ url_for('static_attract', filename='assets/js/vendor/bootstrap.min.js') }}") script(src="{{ url_for('static_pillar', filename='assets/js/tutti.min.js') }}") - script(src="{{ url_for('static_attract', filename='assets/js/tutti.min.js') }}") + script(src="{{ url_for('static_attract', filename='assets/js/generated/tutti.min.js') }}") | {% block style %}{% endblock %}