diff --git a/client/gulp/tasks/browserify.js b/client/gulp/tasks/browserify.js index 51e38361..06b278b2 100644 --- a/client/gulp/tasks/browserify.js +++ b/client/gulp/tasks/browserify.js @@ -30,7 +30,7 @@ function buildScript(file, watch) { }, cache: {}, packageCache: {}, - fullPaths: true + fullPaths: false }); if ( watch ) { diff --git a/client/gulp/tasks/copyFonts.js b/client/gulp/tasks/copyFonts.js index 1ea43d14..02d09f49 100644 --- a/client/gulp/tasks/copyFonts.js +++ b/client/gulp/tasks/copyFonts.js @@ -5,6 +5,6 @@ var config = require('../config'); gulp.task('copyFonts', function() { - gulp.src(config.sourceDir + 'fonts/**/*').pipe(gulp.dest(config.buildDir + 'fonts/')); - + return gulp.src(config.fonts.src) + .pipe(gulp.dest(config.fonts.dest)) }); \ No newline at end of file diff --git a/client/gulp/tasks/development.js b/client/gulp/tasks/development.js index fada97fe..e7dbdcae 100644 --- a/client/gulp/tasks/development.js +++ b/client/gulp/tasks/development.js @@ -10,6 +10,6 @@ gulp.task('dev', ['clean'], function(callback) { global.isProd = false; // Run all tasks once - return runSequence(['sass', 'imagemin', 'browserify', 'copyFonts', 'copyIndex', 'copyIcons', 'config', 'fonts'], 'watch', callback); + return runSequence(['sass', 'imagemin', 'browserify', 'copyFonts', 'copyIndex', 'copyIcons', 'config'], 'watch', callback); }); \ No newline at end of file diff --git a/client/gulp/tasks/fonts.js b/client/gulp/tasks/fonts.js deleted file mode 100644 index 8a6fba43..00000000 --- a/client/gulp/tasks/fonts.js +++ /dev/null @@ -1,10 +0,0 @@ -'use strict'; - -var gulp = require('gulp'); -var config = require('../config'); - -gulp.task('fonts', function() { - - return gulp.src(config.fonts.src) - .pipe(gulp.dest(config.fonts.dest)) -}); \ No newline at end of file diff --git a/client/package.json b/client/package.json index 65857248..95301538 100644 --- a/client/package.json +++ b/client/package.json @@ -38,7 +38,7 @@ "gulp-sass-bulk-import": "^0.3.2", "gulp-sourcemaps": "^1.5.2", "gulp-streamify": "0.0.5", - "gulp-uglify": "^1.2.0", + "gulp-uglify": "^2.1.2", "gulp-util": "^3.0.6", "humps": "^0.6.0", "jquery-mockjax": "^2.1.0", diff --git a/client/src/app/install/install-layout.js b/client/src/app/install/install-layout.js index 1cfd151d..257b4a78 100644 --- a/client/src/app/install/install-layout.js +++ b/client/src/app/install/install-layout.js @@ -21,17 +21,6 @@ const steps = [ class InstallLayout extends React.Component { - componentDidMount() { - API.call({ - path: '/system/installation-done', - data: {} - }).then((result) => { - if(result.data == 1) { - browserHistory.push('/install/step-6'); - } - }); - } - render() { return (