Skip to content

Commit

Permalink
Period refactor + new headerbar
Browse files Browse the repository at this point in the history
  • Loading branch information
Markionium committed Apr 6, 2017
1 parent 93ea006 commit 2f2e7b5
Show file tree
Hide file tree
Showing 20 changed files with 1,313 additions and 1,250 deletions.
10 changes: 9 additions & 1 deletion gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -299,13 +299,21 @@ gulp.task('clean-rev', function(cb){
});

gulp.task('build', function (cb) {
runSequence('clean', 'js', 'sass', 'html', 'dependencies', 'font-awesome', 'i18n', 'images', 'manifest', cb);
runSequence('clean', 'js', 'header-bar-dependency', 'sass', 'html', 'dependencies', 'font-awesome', 'i18n', 'images', 'manifest', cb);
});

gulp.task('build-prod', function (cb) {
runSequence('clean-rev', 'build', 'do-rev-on-build', 'package', cb);
});

gulp.task('header-bar-dependency', function () {
return gulp.src([
'node_modules/d2-ui/dist/header-bar.js',
'src/header-bar/**/*.js',
])
.pipe(gulp.dest('build'));
});

gulp.task('deploy', function () {
return gulp.src(['build-with-rev/**/*'])
.pipe(gulp.dest(dhis_directory));
Expand Down
11 changes: 3 additions & 8 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,13 @@
"description": "Approvals app for the pepfar project",
"README": "readme.md",
"scripts": {
"build": "gulp build-prod",
"test": "gulp test",
"validate": "gulp git:pre-commit",
"deploy": "gulp build-prod && ./install.sh"
"validate": "gulp git:pre-commit"
},
"dependencies": {
"coveralls": "^2.11.2",
"d2-ui": "26",
"gulp-if": "^1.2.5",
"gulp-jscs": "^1.6.0",
"gulp-minify-html": "^1.0.2",
Expand Down Expand Up @@ -55,12 +56,6 @@
"sinon": "^1.14.1",
"sinon-chai": "^2.8.0"
},
"scripts": {
"build": "gulp build-prod",
"test": "gulp test",
"validate": "gulp git:pre-commit",
"build": "gulp build-prod"
},
"pre-commit": [
"validate"
]
Expand Down
2 changes: 2 additions & 0 deletions src/header-bar/lodash-functional.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 2f2e7b5

Please sign in to comment.