From f66af7662a1c0d6422186ec08ed54ba278559c10 Mon Sep 17 00:00:00 2001 From: Victor Benavente Date: Tue, 21 Jun 2016 21:24:19 -0700 Subject: [PATCH 01/15] setup foder structure, package.json, and eslintrc --- vic-bunny/.eslintignore | 8 ++++ vic-bunny/.eslintrc | 42 +++++++++++++++++++ vic-bunny/.gitignore | 4 ++ vic-bunny/app/index.html | 0 .../js/bunny/controllers/bunny-controller.js | 0 vic-bunny/app/js/bunny/controllers/index.js | 0 .../js/bunny/directives/bunny-directive.js | 0 vic-bunny/app/js/bunny/directives/index.js | 0 vic-bunny/app/js/bunny/index.js | 0 vic-bunny/app/js/client.js | 0 .../app/templates/bunny/bunny-directive.html | 0 vic-bunny/gulpfile.js | 0 vic-bunny/package.json | 25 +++++++++++ vic-bunny/server.js | 0 14 files changed, 79 insertions(+) create mode 100644 vic-bunny/.eslintignore create mode 100644 vic-bunny/.eslintrc create mode 100644 vic-bunny/.gitignore create mode 100644 vic-bunny/app/index.html create mode 100644 vic-bunny/app/js/bunny/controllers/bunny-controller.js create mode 100644 vic-bunny/app/js/bunny/controllers/index.js create mode 100644 vic-bunny/app/js/bunny/directives/bunny-directive.js create mode 100644 vic-bunny/app/js/bunny/directives/index.js create mode 100644 vic-bunny/app/js/bunny/index.js create mode 100644 vic-bunny/app/js/client.js create mode 100644 vic-bunny/app/templates/bunny/bunny-directive.html create mode 100644 vic-bunny/gulpfile.js create mode 100644 vic-bunny/package.json create mode 100644 vic-bunny/server.js diff --git a/vic-bunny/.eslintignore b/vic-bunny/.eslintignore new file mode 100644 index 0000000..5348393 --- /dev/null +++ b/vic-bunny/.eslintignore @@ -0,0 +1,8 @@ +**/node_modules/* +**/vendor/* +**/build/* +**/*.min.js +*.md +package.json +Procfile +npm-debug.log diff --git a/vic-bunny/.eslintrc b/vic-bunny/.eslintrc new file mode 100644 index 0000000..4d749b1 --- /dev/null +++ b/vic-bunny/.eslintrc @@ -0,0 +1,42 @@ +{ +"rules": { +"no-console": 0, +"indent": [ +2, +2 +], +"quotes": [ +2, +"single" +], +"linebreak-style": [ +2, +"unix" +], +"semi": [ +2, +"always" +] +}, +"env": { +"es6": true, +"node": true, +"browser": true, +"mocha": true, +"jasmine": true +}, +"globals": { +"describe": false, +"it": false, +"beforeEach": false, +"afterEach": false, +"before": false, +"after": false +}, +"ecmaFeatures": { +"modules": true, +"experimentalObjectRestSpread": true, +"impliedStrict": true +}, +"extends": "eslint:recommended" +} diff --git a/vic-bunny/.gitignore b/vic-bunny/.gitignore new file mode 100644 index 0000000..88202b0 --- /dev/null +++ b/vic-bunny/.gitignore @@ -0,0 +1,4 @@ +node_modules +build +db +*_bundle.js diff --git a/vic-bunny/app/index.html b/vic-bunny/app/index.html new file mode 100644 index 0000000..e69de29 diff --git a/vic-bunny/app/js/bunny/controllers/bunny-controller.js b/vic-bunny/app/js/bunny/controllers/bunny-controller.js new file mode 100644 index 0000000..e69de29 diff --git a/vic-bunny/app/js/bunny/controllers/index.js b/vic-bunny/app/js/bunny/controllers/index.js new file mode 100644 index 0000000..e69de29 diff --git a/vic-bunny/app/js/bunny/directives/bunny-directive.js b/vic-bunny/app/js/bunny/directives/bunny-directive.js new file mode 100644 index 0000000..e69de29 diff --git a/vic-bunny/app/js/bunny/directives/index.js b/vic-bunny/app/js/bunny/directives/index.js new file mode 100644 index 0000000..e69de29 diff --git a/vic-bunny/app/js/bunny/index.js b/vic-bunny/app/js/bunny/index.js new file mode 100644 index 0000000..e69de29 diff --git a/vic-bunny/app/js/client.js b/vic-bunny/app/js/client.js new file mode 100644 index 0000000..e69de29 diff --git a/vic-bunny/app/templates/bunny/bunny-directive.html b/vic-bunny/app/templates/bunny/bunny-directive.html new file mode 100644 index 0000000..e69de29 diff --git a/vic-bunny/gulpfile.js b/vic-bunny/gulpfile.js new file mode 100644 index 0000000..e69de29 diff --git a/vic-bunny/package.json b/vic-bunny/package.json new file mode 100644 index 0000000..3fbc649 --- /dev/null +++ b/vic-bunny/package.json @@ -0,0 +1,25 @@ +{ + "name": "vic-bunny", + "version": "1.0.0", + "description": "", + "main": "gulpfile.js", + "directories": { + "test": "test" + }, + "scripts": { + "test": "echo \"Error: no test specified\" && exit 1", + "start": "node server.js" + }, + "keywords": [], + "author": "", + "license": "ISC", + "devDependencies": { + "angular": "^1.5.7", + "gulp": "^3.9.1", + "gulp-eslint": "^2.0.0", + "webpack-stream": "^3.2.0" + }, + "dependencies": { + "express": "^4.14.0" + } +} diff --git a/vic-bunny/server.js b/vic-bunny/server.js new file mode 100644 index 0000000..e69de29 From 297d18203a0dc23641fa34ed400757cb9329530b Mon Sep 17 00:00:00 2001 From: Victor Benavente Date: Tue, 21 Jun 2016 21:31:46 -0700 Subject: [PATCH 02/15] init commit with .gitignore file --- vic-bunny/.gitignore | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 vic-bunny/.gitignore diff --git a/vic-bunny/.gitignore b/vic-bunny/.gitignore new file mode 100644 index 0000000..88202b0 --- /dev/null +++ b/vic-bunny/.gitignore @@ -0,0 +1,4 @@ +node_modules +build +db +*_bundle.js From 1a8dfb4a5a2162ea2df221864cb19abce684d0ec Mon Sep 17 00:00:00 2001 From: Victor Benavente Date: Tue, 21 Jun 2016 21:36:03 -0700 Subject: [PATCH 03/15] added karma.conf.js, changed single run to true --- vic-bunny/karma.conf.js | 69 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 69 insertions(+) create mode 100644 vic-bunny/karma.conf.js diff --git a/vic-bunny/karma.conf.js b/vic-bunny/karma.conf.js new file mode 100644 index 0000000..01f2aca --- /dev/null +++ b/vic-bunny/karma.conf.js @@ -0,0 +1,69 @@ +// Karma configuration +// Generated on Tue Jun 21 2016 21:34:56 GMT-0700 (PDT) + +module.exports = function(config) { + config.set({ + + // base path that will be used to resolve all patterns (eg. files, exclude) + basePath: '', + + + // frameworks to use + // available frameworks: https://npmjs.org/browse/keyword/karma-adapter + frameworks: ['jasmine'], + + + // list of files / patterns to load in the browser + files: [ + 'test/test_bundle.js' + ], + + + // list of files to exclude + exclude: [ + ], + + + // preprocess matching files before serving them to the browser + // available preprocessors: https://npmjs.org/browse/keyword/karma-preprocessor + preprocessors: { + }, + + + // test results reporter to use + // possible values: 'dots', 'progress' + // available reporters: https://npmjs.org/browse/keyword/karma-reporter + reporters: ['progress'], + + + // web server port + port: 9876, + + + // enable / disable colors in the output (reporters and logs) + colors: true, + + + // level of logging + // possible values: config.LOG_DISABLE || config.LOG_ERROR || config.LOG_WARN || config.LOG_INFO || config.LOG_DEBUG + logLevel: config.LOG_INFO, + + + // enable / disable watching file and executing tests whenever any file changes + autoWatch: false, + + + // start these browsers + // available browser launchers: https://npmjs.org/browse/keyword/karma-launcher + browsers: ['Chrome'], + + + // Continuous Integration mode + // if true, Karma captures browsers, runs the tests and exits + singleRun: true, + + // Concurrency level + // how many browser should be started simultaneous + concurrency: Infinity + }); +}; From 26c3484faf1fc16a3ad99d9fc5a7d0a10e52b623 Mon Sep 17 00:00:00 2001 From: Victor Benavente Date: Tue, 21 Jun 2016 21:40:22 -0700 Subject: [PATCH 04/15] added server using express --- vic-bunny/server.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/vic-bunny/server.js b/vic-bunny/server.js index e69de29..dc5d4dc 100644 --- a/vic-bunny/server.js +++ b/vic-bunny/server.js @@ -0,0 +1,6 @@ +'use strict'; + +const express = require('express'); + +express().use(express.static(__dirname + '/build')) +.listen(8080, () => console.log('listening on 8080')); From 58cd64d9f2051772e09366c829227b7fc44f557f Mon Sep 17 00:00:00 2001 From: Victor Benavente Date: Tue, 21 Jun 2016 21:45:17 -0700 Subject: [PATCH 05/15] updated server with const app to call express --- vic-bunny/server.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/vic-bunny/server.js b/vic-bunny/server.js index dc5d4dc..d216dc9 100644 --- a/vic-bunny/server.js +++ b/vic-bunny/server.js @@ -1,6 +1,7 @@ 'use strict'; const express = require('express'); +const app = express(); -express().use(express.static(__dirname + '/build')) -.listen(8080, () => console.log('listening on 8080')); +app.use(express.static(__dirname + '/build')); +app.listen(3002, () => console.log('listening on 3002')); From a56efd5fd8c9af59c50bb55a8b8ddf00614094c9 Mon Sep 17 00:00:00 2001 From: Victor Benavente Date: Tue, 21 Jun 2016 22:01:22 -0700 Subject: [PATCH 06/15] added basic gulpfile --- vic-bunny/gulpfile.js | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/vic-bunny/gulpfile.js b/vic-bunny/gulpfile.js index e69de29..76b328c 100644 --- a/vic-bunny/gulpfile.js +++ b/vic-bunny/gulpfile.js @@ -0,0 +1,40 @@ +'use strict'; + +const gulp = require('gulp'); +const eslint = require('gulp-eslint'); +const webpack = require('webpack-stream'); + +var files = ['*.js', './app/*.js', './app/js/*.js', './app/js/bunny/*.js', './app/js/bunny/controllers/*.js', './app/js/bunny/directives/*.js']; + +const paths = { + js:__dirname + '/app/js/**/**/*.js', + html:__dirname + '/app/index.html' +}; + +gulp.task('lint', () => { + return gulp.src(files) + .pipe(eslint()) + .pipe(eslint.format()); +}); + +gulp.task('copy', () => { + return gulp.src(paths.html) + .pipe(gulp.dest(__dirname + '/build')); +}); + +gulp.task('bundle', () => { + return gulp.src('./app/js/client.js') + .pipe(webpack({ + output: { + filename: 'bundle.js' + } + })) + .pipe(gulp.dest('./build')); +}); + +gulp.task('default', ['bundle', 'copy']); + +gulp.task('watch', () => { + gulp.watch(paths.js, ['lint', 'bundle']); + gulp.watch(paths.html, ['copy']); +}); From b406d39c97e752b42eafff43dd7af28525a32475 Mon Sep 17 00:00:00 2001 From: Victor Benavente Date: Tue, 21 Jun 2016 22:20:53 -0700 Subject: [PATCH 07/15] client.js setup requiring angular and bunny folder --- vic-bunny/app/js/client.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/vic-bunny/app/js/client.js b/vic-bunny/app/js/client.js index e69de29..5f8c0cf 100644 --- a/vic-bunny/app/js/client.js +++ b/vic-bunny/app/js/client.js @@ -0,0 +1,4 @@ +const angular = require('angular'); +const app = angular.module('BunnyApp', []); + +require('./bunny')(app); From 79cd3425aa48bcf3bdcda6dcfd823e9226044e05 Mon Sep 17 00:00:00 2001 From: Victor Benavente Date: Tue, 21 Jun 2016 22:44:16 -0700 Subject: [PATCH 08/15] bunny controller has needed properties --- .../app/js/bunny/controllers/bunny-controller.js | 11 +++++++++++ vic-bunny/app/js/bunny/controllers/index.js | 3 +++ vic-bunny/app/js/bunny/directives/index.js | 5 +++++ .../{bunny-directive.js => nobunny-directive.js} | 0 .../app/js/bunny/directives/thumbbunny-directive.js | 0 .../app/js/bunny/directives/vicbunny-directive.js | 0 vic-bunny/app/js/bunny/index.js | 4 ++++ 7 files changed, 23 insertions(+) rename vic-bunny/app/js/bunny/directives/{bunny-directive.js => nobunny-directive.js} (100%) create mode 100644 vic-bunny/app/js/bunny/directives/thumbbunny-directive.js create mode 100644 vic-bunny/app/js/bunny/directives/vicbunny-directive.js diff --git a/vic-bunny/app/js/bunny/controllers/bunny-controller.js b/vic-bunny/app/js/bunny/controllers/bunny-controller.js index e69de29..dda07be 100644 --- a/vic-bunny/app/js/bunny/controllers/bunny-controller.js +++ b/vic-bunny/app/js/bunny/controllers/bunny-controller.js @@ -0,0 +1,11 @@ +'use strict'; + +module.exports = function(app) { + app.controller('BunnyController', ['$scope', function() { + this.title = 'Vicious Bunny'; + this.height = 400; + this.width = 400; + this.description = 'Don\'t get too close or this vicious little monster will attack! This particular species can devour the average man in 13.7 seconds.'; + this.link = 'http://f.cl.ly/items/3g3J1G0w122M360w380O/3726490195_f7cc75d377_o.jpg'; + }]); +}; diff --git a/vic-bunny/app/js/bunny/controllers/index.js b/vic-bunny/app/js/bunny/controllers/index.js index e69de29..ba2eb02 100644 --- a/vic-bunny/app/js/bunny/controllers/index.js +++ b/vic-bunny/app/js/bunny/controllers/index.js @@ -0,0 +1,3 @@ +module.exports = function(app) { + require('./bunny-controller')(app); +}; diff --git a/vic-bunny/app/js/bunny/directives/index.js b/vic-bunny/app/js/bunny/directives/index.js index e69de29..1b8165e 100644 --- a/vic-bunny/app/js/bunny/directives/index.js +++ b/vic-bunny/app/js/bunny/directives/index.js @@ -0,0 +1,5 @@ +module.exports = function(app) { + require('./nobunny-directive')(app); + require('./thumbbunny-directive')(app); + require('./vicbunny-directive')(app); +}; diff --git a/vic-bunny/app/js/bunny/directives/bunny-directive.js b/vic-bunny/app/js/bunny/directives/nobunny-directive.js similarity index 100% rename from vic-bunny/app/js/bunny/directives/bunny-directive.js rename to vic-bunny/app/js/bunny/directives/nobunny-directive.js diff --git a/vic-bunny/app/js/bunny/directives/thumbbunny-directive.js b/vic-bunny/app/js/bunny/directives/thumbbunny-directive.js new file mode 100644 index 0000000..e69de29 diff --git a/vic-bunny/app/js/bunny/directives/vicbunny-directive.js b/vic-bunny/app/js/bunny/directives/vicbunny-directive.js new file mode 100644 index 0000000..e69de29 diff --git a/vic-bunny/app/js/bunny/index.js b/vic-bunny/app/js/bunny/index.js index e69de29..e7d6cfa 100644 --- a/vic-bunny/app/js/bunny/index.js +++ b/vic-bunny/app/js/bunny/index.js @@ -0,0 +1,4 @@ +module.exports = function(app) { + require('./controllers')(app); + require('./directives')(app); +}; From 190344008e9f987d2746c0f9555e68ef80c8edb5 Mon Sep 17 00:00:00 2001 From: Victor Benavente Date: Tue, 21 Jun 2016 23:01:08 -0700 Subject: [PATCH 09/15] noBunny directive added to include only title link and description --- .../app/js/bunny/directives/nobunny-directive.js | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/vic-bunny/app/js/bunny/directives/nobunny-directive.js b/vic-bunny/app/js/bunny/directives/nobunny-directive.js index e69de29..2710bf3 100644 --- a/vic-bunny/app/js/bunny/directives/nobunny-directive.js +++ b/vic-bunny/app/js/bunny/directives/nobunny-directive.js @@ -0,0 +1,14 @@ +module.exports = function(app) { + app.directive('noBunny', function() { + return { + templateUrl: + './templates/bunny/bunny-directive.html', + restrict: 'E', + scope: { + title: '@', + link: '@', + description: '@' + } + }; + }); +}; From 7ce41a7fc774dd895ac55aa59520d1869ee5edbb Mon Sep 17 00:00:00 2001 From: Victor Benavente Date: Tue, 21 Jun 2016 23:11:13 -0700 Subject: [PATCH 10/15] created template html files for each directive, thumbbunny directive has appropriate scope --- .../app/js/bunny/directives/nobunny-directive.js | 2 +- .../js/bunny/directives/thumbbunny-directive.js | 16 ++++++++++++++++ ...nny-directive.html => nobunny-directive.html} | 0 .../templates/bunny/thumbbunny-directive.html | 0 .../app/templates/bunny/vicbunny-directive.html | 0 5 files changed, 17 insertions(+), 1 deletion(-) rename vic-bunny/app/templates/bunny/{bunny-directive.html => nobunny-directive.html} (100%) create mode 100644 vic-bunny/app/templates/bunny/thumbbunny-directive.html create mode 100644 vic-bunny/app/templates/bunny/vicbunny-directive.html diff --git a/vic-bunny/app/js/bunny/directives/nobunny-directive.js b/vic-bunny/app/js/bunny/directives/nobunny-directive.js index 2710bf3..d11d39a 100644 --- a/vic-bunny/app/js/bunny/directives/nobunny-directive.js +++ b/vic-bunny/app/js/bunny/directives/nobunny-directive.js @@ -2,7 +2,7 @@ module.exports = function(app) { app.directive('noBunny', function() { return { templateUrl: - './templates/bunny/bunny-directive.html', + './templates/bunny/nobunny-directive.html', restrict: 'E', scope: { title: '@', diff --git a/vic-bunny/app/js/bunny/directives/thumbbunny-directive.js b/vic-bunny/app/js/bunny/directives/thumbbunny-directive.js index e69de29..5b64fa2 100644 --- a/vic-bunny/app/js/bunny/directives/thumbbunny-directive.js +++ b/vic-bunny/app/js/bunny/directives/thumbbunny-directive.js @@ -0,0 +1,16 @@ +module.exports = function(app) { + app.directive('thumbBunny', function() { + return { + templateUrl: + './templates/bunny/thumbbunny-directive.html', + restrict: 'E', + scope: { + title: '@', + link: '@', + height: '@100', + width: '@100', + description: '@' + } + }; + }); +}; diff --git a/vic-bunny/app/templates/bunny/bunny-directive.html b/vic-bunny/app/templates/bunny/nobunny-directive.html similarity index 100% rename from vic-bunny/app/templates/bunny/bunny-directive.html rename to vic-bunny/app/templates/bunny/nobunny-directive.html diff --git a/vic-bunny/app/templates/bunny/thumbbunny-directive.html b/vic-bunny/app/templates/bunny/thumbbunny-directive.html new file mode 100644 index 0000000..e69de29 diff --git a/vic-bunny/app/templates/bunny/vicbunny-directive.html b/vic-bunny/app/templates/bunny/vicbunny-directive.html new file mode 100644 index 0000000..e69de29 From ac8921235678143ff9fd510fa922ee864f3b89ef Mon Sep 17 00:00:00 2001 From: Victor Benavente Date: Tue, 21 Jun 2016 23:16:35 -0700 Subject: [PATCH 11/15] vicbunny directive complete with full size image --- .../js/bunny/directives/vicbunny-directive.js | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/vic-bunny/app/js/bunny/directives/vicbunny-directive.js b/vic-bunny/app/js/bunny/directives/vicbunny-directive.js index e69de29..1fdf676 100644 --- a/vic-bunny/app/js/bunny/directives/vicbunny-directive.js +++ b/vic-bunny/app/js/bunny/directives/vicbunny-directive.js @@ -0,0 +1,16 @@ +module.exports = function(app) { + app.directive('vicBunny', function() { + return { + templateUrl: + './templates/bunny/vicbunny-directive.html', + restrict: 'E', + scope: { + title: '@', + link: '@', + height: '@', + width: '@', + description: '@' + } + }; + }); +}; From e50a1d9d3ea034c4f2d7f87596fa2c2b19bb6c7c Mon Sep 17 00:00:00 2001 From: Victor Benavente Date: Tue, 21 Jun 2016 23:28:00 -0700 Subject: [PATCH 12/15] nobunny directive html template created --- vic-bunny/app/templates/bunny/nobunny-directive.html | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/vic-bunny/app/templates/bunny/nobunny-directive.html b/vic-bunny/app/templates/bunny/nobunny-directive.html index e69de29..61174fa 100644 --- a/vic-bunny/app/templates/bunny/nobunny-directive.html +++ b/vic-bunny/app/templates/bunny/nobunny-directive.html @@ -0,0 +1,5 @@ +
+

{{title}}

+ BEWARE VIC BUNNY! +

{{description}}

+
From 47a6ef2028a858ac2a2eec230496018bcb23a9b4 Mon Sep 17 00:00:00 2001 From: Victor Benavente Date: Tue, 21 Jun 2016 23:34:05 -0700 Subject: [PATCH 13/15] finished directive html templates --- vic-bunny/app/templates/bunny/thumbbunny-directive.html | 3 +++ vic-bunny/app/templates/bunny/vicbunny-directive.html | 5 +++++ 2 files changed, 8 insertions(+) diff --git a/vic-bunny/app/templates/bunny/thumbbunny-directive.html b/vic-bunny/app/templates/bunny/thumbbunny-directive.html index e69de29..752be82 100644 --- a/vic-bunny/app/templates/bunny/thumbbunny-directive.html +++ b/vic-bunny/app/templates/bunny/thumbbunny-directive.html @@ -0,0 +1,3 @@ +
+ {{title}} +
diff --git a/vic-bunny/app/templates/bunny/vicbunny-directive.html b/vic-bunny/app/templates/bunny/vicbunny-directive.html index e69de29..8ad1caf 100644 --- a/vic-bunny/app/templates/bunny/vicbunny-directive.html +++ b/vic-bunny/app/templates/bunny/vicbunny-directive.html @@ -0,0 +1,5 @@ +
+

{{title}}

+ {{title}} +

{{description}}

+
From 87329548d0b80261094df4fd9ff2bf57b87cd6ba Mon Sep 17 00:00:00 2001 From: Victor Benavente Date: Tue, 21 Jun 2016 23:50:00 -0700 Subject: [PATCH 14/15] index.html complete! --- vic-bunny/app/index.html | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/vic-bunny/app/index.html b/vic-bunny/app/index.html index e69de29..3493dc1 100644 --- a/vic-bunny/app/index.html +++ b/vic-bunny/app/index.html @@ -0,0 +1,18 @@ + + + + + + + Bunny App + + + +
+ + + +
+ + + From 81e5912c961465c89be9d2f459ff72786212eed2 Mon Sep 17 00:00:00 2001 From: Victor Benavente Date: Wed, 22 Jun 2016 00:10:09 -0700 Subject: [PATCH 15/15] now bundling all html files! --- vic-bunny/app/index.html | 2 +- vic-bunny/gulpfile.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/vic-bunny/app/index.html b/vic-bunny/app/index.html index 3493dc1..2e44b72 100644 --- a/vic-bunny/app/index.html +++ b/vic-bunny/app/index.html @@ -5,7 +5,7 @@ Bunny App - +
diff --git a/vic-bunny/gulpfile.js b/vic-bunny/gulpfile.js index 76b328c..bc498a0 100644 --- a/vic-bunny/gulpfile.js +++ b/vic-bunny/gulpfile.js @@ -8,7 +8,7 @@ var files = ['*.js', './app/*.js', './app/js/*.js', './app/js/bunny/*.js', './ap const paths = { js:__dirname + '/app/js/**/**/*.js', - html:__dirname + '/app/index.html' + html:__dirname + '/app/**/*.html' }; gulp.task('lint', () => { @@ -23,7 +23,7 @@ gulp.task('copy', () => { }); gulp.task('bundle', () => { - return gulp.src('./app/js/client.js') + return gulp.src(paths.js) .pipe(webpack({ output: { filename: 'bundle.js'