Move minified app to app_client

simonholmes · Aug 11, 2015 · 1b5dfb3 · 1b5dfb3
1 parent 03f1564
commit 1b5dfb3
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 9 deletions.
diff --git a/app.js b/app.js
@@ -27,7 +27,7 @@ app.use(express.static(path.join(__dirname, 'app_client')));
 // app.use('/users', users);
 
 app.use(function(req, res) {
-  res.sendFile(path.join(__dirname, 'public', 'index.html'));
+  res.sendFile(path.join(__dirname, 'app_client', 'index.html'));
 });
 
 

diff --git a/app_client/app.min.js b/app_client/app.min.js
diff --git a/public/app.min.js.map → app_client/app.min.js.map b/public/app.min.js.map → app_client/app.min.js.map
diff --git a/app_client/home/home.controller.js b/app_client/home/home.controller.js
@@ -5,7 +5,7 @@
     .controller('homeCtrl', homeCtrl);
 
     function homeCtrl () {
-      console.log('Home controller running');
+      console.log('Home controller is running');
     }
 
 })();
diff --git a/public/index.html → app_client/index.html b/public/index.html → app_client/index.html
diff --git a/gulpfile.js b/gulpfile.js
@@ -7,17 +7,17 @@ var sourcemaps = require('gulp-sourcemaps');
 var ngHtml2Js = require("gulp-ng-html2js");
 
 gulp.task('scripts', function() {
-  gulp.src(['./app_client/**/*.js', '!./app_client/**/*.test.js'])
+  gulp.src(['./app_client/**/*.js', '!./app_client/**/*.test.js', '!./app_client/app.min.js'])
     .pipe(sourcemaps.init())
       .pipe(concat('./app.min.js'))
       .pipe(uglify({mangle: true}))
-      .pipe(gulp.dest('public'))
+      .pipe(gulp.dest('app_client'))
     .pipe(sourcemaps.write('./'))
-    .pipe(gulp.dest('public'));
+    .pipe(gulp.dest('app_client'));
 });
 
 gulp.task('watch', function() {
-  watch('./app_client/**/*.js', function () {
+  watch(['./app_client/**/*.js', '!./app_client/**/*.test.js', '!./app_client/app.min.js'], function () {
     gulp.start('scripts');
   });
 });

diff --git a/public/app.min.js b/public/app.min.js