archive/attract
0
0
Fork 0
Code Issues 7 Pull Requests Projects Releases Wiki Activity

Put generated JS into attract/static/assets/js/generated/

Browse Source
This commit is contained in:
Sybren A. Stüvel
2016-09-29 16:44:49 +02:00
parent 2819f86e10
commit 3066b41058
3 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@@ -11,5 +11,4 @@ __pycache__
/node_modules/ /node_modules/
/attract/templates/ /attract/templates/
/attract/static/assets/css/ /attract/static/assets/css/
/attract/static/assets/js/generated/
/attract/static/assets/js/*.min.js

4
gulpfile.js
View File

@@ -60,7 +60,7 @@ gulp.task('scripts', function() {
.pipe(rename({suffix: '.min'})) .pipe(rename({suffix: '.min'}))
.pipe(gulpif(enabled.maps, sourcemaps.write("."))) .pipe(gulpif(enabled.maps, sourcemaps.write(".")))
.pipe(chmod(644)) .pipe(chmod(644))
.pipe(gulp.dest('attract/static/assets/js/')) .pipe(gulp.dest('attract/static/assets/js/generated/'))
.pipe(gulpif(enabled.liveReload, livereload())); .pipe(gulpif(enabled.liveReload, livereload()));
}); });
@@ -75,7 +75,7 @@ gulp.task('scripts_tutti', function() {
.pipe(gulpif(enabled.uglify, uglify())) .pipe(gulpif(enabled.uglify, uglify()))
.pipe(gulpif(enabled.maps, sourcemaps.write("."))) .pipe(gulpif(enabled.maps, sourcemaps.write(".")))
.pipe(chmod(644)) .pipe(chmod(644))
.pipe(gulp.dest('attract/static/assets/js/')) .pipe(gulp.dest('attract/static/assets/js/generated/'))
.pipe(gulpif(enabled.liveReload, livereload())); .pipe(gulpif(enabled.liveReload, livereload()));
}); });

2
src/templates/attract/layout.jade
View File

@@ -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_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_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_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 %} | {% block style %}{% endblock %}