update electron window

gulp-electron.js

@@ -1,61 +1,63 @@
-var sass = require('gulp-sass')
+require('dotenv').load()
+var env = process.env
+
+var styl = require('gulp-stylus')
 var autoprefixer = require('gulp-autoprefixer')
 var templateCache = require('gulp-angular-templatecache')
 var globby = require('globby')
 var template = require('gulp-template')
-var concat = require('gulp-concat')
 var del = require('del')
 var runSequence = require('run-sequence')
-var merge = require('merge-stream')
-
+var plumber = require('gulp-plumber')
+var notify = require('gulp-notify')
 var changed = require('gulp-changed')
-var cached = require('gulp-cached')
-var remember = require('gulp-remember')
 var livereload = require('gulp-livereload')
-var childProcess = require('child_process')
+var merge = require('merge-stream')
 
 var config = require('./build.config.js')
 
-// for Dist
-var rev = require('gulp-rev')
-var ngAnnotate = require('gulp-ng-annotate')
-var uglify = require('gulp-uglify')
-var minifyCss = require('gulp-minify-css')
-
 module.exports = function (gulp) {
 
+  gulp.task('elec-env', function () {
+    return gulp.src('tpls/env.js')
+      .pipe(template({
+        apiUrl: env.BUILD_API_URL
+      }))
+      .pipe(gulp.dest('electron_build/config'))
+  })
 
-  /*
-  * Electron build
-  */
-  gulp.task('elec-js', function(){
-    var src = gulp.src(['src/**/*.js'])
+  gulp.task('elec-js', function () {
+    var main = gulp.src('src/**/*.js')
       .pipe(changed('electron_build'))
       .pipe(gulp.dest('electron_build'))
-    var elecSrc = gulp.src(['electron_src/**/*.js'])
-      .pipe(changed('electron_build/electron'))
-      .pipe(gulp.dest('electron_build/electron'))
-    var elecHtml = gulp.src(['electron_src/**/*.html'])
+
+    var electron = gulp.src('electron_src/**/*.js')
       .pipe(changed('electron_build/electron'))
       .pipe(gulp.dest('electron_build/electron'))
 
-    return merge(src, elecSrc, elecHtml)
+    return merge(main, electron)
   })
 
-  gulp.task('elec-sass', function () {
-    return gulp.src(['src/**/*.scss', 'electron_src/**/*.scss'])
-      .pipe(cached('styles'))
-      .pipe(sass().on('error', sass.logError))
+  gulp.task('elec-styl', function () {
+    return gulp.src('electron_src/styles/main.styl')
+      .pipe(plumber({errorHandler: notify.onError('Error: <%= error.message %>')}))
+      .pipe(styl())
       .pipe(autoprefixer())
-      .pipe(remember('styles'))
-      .pipe(concat('all.css'))
       .pipe(gulp.dest('electron_build'))
+      .pipe(notify('Stylus!!'))
+      .pipe(livereload())
   })
 
-  gulp.task('elec-tpls', function(){
-    return gulp.src('src/**/*.tpl.html')
+  gulp.task('elec-tpls', function () {
+    var main = gulp.src('src/**/*.tpl.html')
       .pipe(templateCache())
       .pipe(gulp.dest('electron_build'))
+
+    var electron = gulp.src('electron_src/**/*.tpl.html')
+      .pipe(templateCache())
+      .pipe(gulp.dest('electron_build/electron'))
+
+    return merge(main, electron)
   })
 
   gulp.task('elec-index', function () {
@@ -72,13 +74,19 @@ module.exports = function (gulp) {
     var scripts = filter(files, 'js')
     var styles = filter(files, 'css')
 
-    return gulp.src('src/index.html')
+    var main = gulp.src('src/index.html')
       .pipe(template({
         scripts: scripts,
         styles: styles,
-        env: 'build'
+        env: env
       }))
       .pipe(gulp.dest('electron_build'))
+      .pipe(livereload())
+
+    var electron = gulp.src('electron_src/**/index.html')
+      .pipe(gulp.dest('electron_build/electron'))
+
+    return merge(main, electron)
   })
 
   gulp.task('elec-vendor', function () {
@@ -88,6 +96,10 @@ module.exports = function (gulp) {
       return vendor.src
     })
 
+    vendorFiles.push('node_modules/font-awesome/**/font-awesome.css')
+    vendorFiles.push('node_modules/font-awesome/**/fontawesome-webfont.*')
+    vendorFiles.push('node_modules/font-awesome/**/FontAwesome.*')
+
     return gulp.src(vendorFiles)
       .pipe(gulp.dest('electron_build/vendor'))
   })
@@ -99,17 +111,19 @@ module.exports = function (gulp) {
   })
 
   gulp.task('elec-build', function (cb) {
-    runSequence(['elec-js', 'elec-sass', 'elec-tpls', 'elec-vendor', 'elec-resources'], 'elec-index', cb)
+    runSequence(['elec-env', 'elec-js', 'elec-styl', 'elec-tpls', 'elec-vendor', 'elec-resources'], 'elec-index', cb)
   })
 
   gulp.task('elec-watch', function (cb) {
-    gulp.watch(['src/**/*.js', 'electron_src/**/*.js', 'electron_src/**/*.html'], ['elec-js'])
+    gulp.watch(['.env', 'tpls/env.js'], ['elec-env'])
 
-    gulp.watch(['src/**/*.scss', 'electron_src/**/*.scss'], ['elec-sass'])
+    gulp.watch(['src/**/*.js', 'electron_src/**/*.js'], ['elec-js'])
+
+    gulp.watch(['src/styles/**/*.styl', 'electron_src/styles/**/*.styl'], ['elec-styl'])
 
     gulp.watch('src/**/*.tpl.html', ['elec-tpls'])
 
-    gulp.watch(['electron_build/**/*', '!electron_build/vendor/**/*', '!electron_build/electron/**/*'], ['elec-index'])
+    gulp.watch(['electron_build/**/*.js', 'src/index.html', 'src/index.html', 'electron_src/**/index.html'], ['elec-index'])
 
     livereload.listen()
   })