Skip to content

Commit

Permalink
Got the app working
Browse files Browse the repository at this point in the history
  • Loading branch information
Ishmeet Bindra committed Jan 18, 2017
1 parent 49f544e commit e8824db
Show file tree
Hide file tree
Showing 8 changed files with 50,460 additions and 8 deletions.
6 changes: 3 additions & 3 deletions client/app/stylesheets/main.less
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@import '../../bower_components/bootstrap/less/bootstrap';
@import '../../bower_components/toastr/toastr';
@import (less) '../../bower_components/magnific-popup/dist/magnific-popup.css';
@import '../../../bower_components/bootstrap/less/bootstrap';
@import '../../../bower_components/toastr/toastr';
@import (less) '../../../bower_components/magnific-popup/dist/magnific-popup.css';

/*
* Bootstrap overrides.
Expand Down
8 changes: 4 additions & 4 deletions gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ gulp.task('browserify-vendor', function() {
|--------------------------------------------------------------------------
*/
gulp.task('browserify', ['browserify-vendor'], function() {
return browserify({ entries: 'app/main.js', debug: true })
return browserify({ entries: 'client/app/main.js', debug: true })
.external(dependencies)
.transform(babelify, { presets: ['es2015', 'react'] })
.bundle()
Expand All @@ -79,7 +79,7 @@ gulp.task('browserify', ['browserify-vendor'], function() {
|--------------------------------------------------------------------------
*/
gulp.task('browserify-watch', ['browserify-vendor'], function() {
var bundler = watchify(browserify({ entries: 'app/main.js', debug: true }, watchify.args));
var bundler = watchify(browserify({ entries: 'client/app/main.js', debug: true }, watchify.args));
bundler.external(dependencies);
bundler.transform(babelify, { presets: ['es2015', 'react'] });
bundler.on('update', rebundle);
Expand Down Expand Up @@ -108,7 +108,7 @@ gulp.task('browserify-watch', ['browserify-vendor'], function() {
|--------------------------------------------------------------------------
*/
gulp.task('styles', function() {
return gulp.src('app/stylesheets/main.less')
return gulp.src('client/app/stylesheets/main.less')
.pipe(plumber())
.pipe(less())
.pipe(autoprefixer())
Expand All @@ -118,7 +118,7 @@ gulp.task('styles', function() {


gulp.task('watch', function() {
gulp.watch('app/stylesheets/**/*.less', ['styles']);
gulp.watch('client/app/stylesheets/**/*.less', ['styles']);
});

gulp.task('default', ['styles', 'vendor', 'browserify-watch', 'watch']);
Expand Down
Loading

0 comments on commit e8824db

Please sign in to comment.