archive/blender-cloud
0
1
Fork 1
Code Issues 24 Pull Requests Projects Releases Wiki Activity

Fix gulpfile.js destinations.

Browse Source
This commit is contained in:
Sam Lu
2018-07-17 10:17:28 -05:00
parent 3dcf8ba93a
commit 1342ed2601
2 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
gulpfile.js
View File

@@ -19,6 +19,11 @@ let enabled = {
uglify: argv.production uglify: argv.production
}; };
var destination = {
css: 'cloud/static/assets/css',
pug: 'cloud/templates',
js: 'cloud/static/assets/js',
}
/* CSS */ /* CSS */
gulp.task('styles', function(done) { gulp.task('styles', function(done) {
@@ -29,7 +34,7 @@ gulp.task('styles', function(done) {
.pipe(sass({outputStyle: 'compressed'})) .pipe(sass({outputStyle: 'compressed'}))
.pipe(autoprefixer("last 3 versions")) .pipe(autoprefixer("last 3 versions"))
//.pipe(gulpif(enabled.maps, sourcemaps.write("."))) //.pipe(gulpif(enabled.maps, sourcemaps.write(".")))
.pipe(gulp.dest('dillo/static/css')) .pipe(gulp.dest(destination.css))
.pipe(gulpif(argv.livereload, livereload())); .pipe(gulpif(argv.livereload, livereload()));
done(); done();
}); });
@@ -43,7 +48,7 @@ gulp.task('templates', function(done) {
.pipe(pug({ .pipe(pug({
pretty: enabled.prettyPug pretty: enabled.prettyPug
})) }))
.pipe(gulp.dest('dillo/templates/')) .pipe(gulp.dest(destination.pug))
.pipe(gulpif(argv.livereload, livereload())); .pipe(gulpif(argv.livereload, livereload()));
done(); done();
}); });
@@ -58,7 +63,7 @@ gulp.task('scripts', function(done) {
.pipe(gulpif(enabled.uglify, uglify())) .pipe(gulpif(enabled.uglify, uglify()))
.pipe(rename({suffix: '.min'})) .pipe(rename({suffix: '.min'}))
//.pipe(gulpif(enabled.maps, sourcemaps.write("."))) //.pipe(gulpif(enabled.maps, sourcemaps.write(".")))
.pipe(gulp.dest('dillo/static/js/generated/')) .pipe(gulp.dest(destination.js))
.pipe(gulpif(argv.livereload, livereload())); .pipe(gulpif(argv.livereload, livereload()));
done(); done();
}); });
@@ -73,7 +78,7 @@ gulp.task('scripts_tutti', function(done) {
.pipe(concat("tutti.min.js")) .pipe(concat("tutti.min.js"))
.pipe(gulpif(enabled.uglify, uglify())) .pipe(gulpif(enabled.uglify, uglify()))
//.pipe(gulpif(enabled.maps, sourcemaps.write("."))) //.pipe(gulpif(enabled.maps, sourcemaps.write(".")))
.pipe(gulp.dest('dillo/static/js/generated/')) .pipe(gulp.dest(destination.js))
.pipe(gulpif(argv.livereload, livereload())); .pipe(gulpif(argv.livereload, livereload()));
done(); done();
}); });

9
src/templates/layout.pug
View File

@@ -114,8 +114,8 @@ html(lang="en")
li.nav-item li.nav-item
a.nav-link(href="{{ url_for('cloud.services') }}", a.nav-link(href="{{ url_for('cloud.services') }}",
class="{% if category == 'services' %}active{% endif %}") Services class="{% if category == 'services' %}active{% endif %}") Services
//- li.nav-item li.nav-item
//- i.search-icon.pi-search i.search-icon.pi-search
| {% endblock navigation_sections %} | {% endblock navigation_sections %}
| {% if current_user.is_anonymous %} | {% if current_user.is_anonymous %}
@@ -126,9 +126,8 @@ html(lang="en")
| {% endif %} | {% endif %}
| {% block navigation_user %} | {% block navigation_user %}
//- comment out notification and user to make sure navigation links pefect | {% include 'menus/notifications.html' %}
//- | {% include 'menus/notifications.html' %} | {% include 'menus/user.html' %}
//- | {% include 'menus/user.html' %}
| {% endblock navigation_user %} | {% endblock navigation_user %}