diff --git a/client/index.html b/client/dev/index.html similarity index 89% rename from client/index.html rename to client/dev/index.html index 1907f2c..cabd907 100644 --- a/client/index.html +++ b/client/dev/index.html @@ -4,10 +4,10 @@ Reactive Search - - - - + + + + @@ -163,15 +163,15 @@ - - - - - - - - - + + + + + + + + + diff --git a/client/dist/fonts/glyphicons-halflings-regular.eot b/client/dist/fonts/glyphicons-halflings-regular.eot new file mode 100644 index 0000000..4a4ca86 Binary files /dev/null and b/client/dist/fonts/glyphicons-halflings-regular.eot differ diff --git a/client/dist/fonts/glyphicons-halflings-regular.svg b/client/dist/fonts/glyphicons-halflings-regular.svg new file mode 100644 index 0000000..e3e2dc7 --- /dev/null +++ b/client/dist/fonts/glyphicons-halflings-regular.svg @@ -0,0 +1,229 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/client/dist/fonts/glyphicons-halflings-regular.ttf b/client/dist/fonts/glyphicons-halflings-regular.ttf new file mode 100644 index 0000000..67fa00b Binary files /dev/null and b/client/dist/fonts/glyphicons-halflings-regular.ttf differ diff --git a/client/dist/fonts/glyphicons-halflings-regular.woff b/client/dist/fonts/glyphicons-halflings-regular.woff new file mode 100644 index 0000000..8c54182 Binary files /dev/null and b/client/dist/fonts/glyphicons-halflings-regular.woff differ diff --git a/client/dist/index.html b/client/dist/index.html index 1b1ae17..2f66853 100644 --- a/client/dist/index.html +++ b/client/dist/index.html @@ -1,177 +1 @@ - - - - Reactive Search - - - - - - - - - -
- -
-

Reactive Search

-
- - -
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
-
- -
-
-
- - - - - - - - - - - - -
- - - - - - - - - - - - - +Reactive Search

Reactive Search

\ No newline at end of file diff --git a/client/gulpfile.js b/client/gulpfile.js index fd7a1c6..ac3c950 100644 --- a/client/gulpfile.js +++ b/client/gulpfile.js @@ -8,7 +8,7 @@ var sourcemaps = require('gulp-sourcemaps'); var uglify = require('gulp-uglify'); var paths = { - js: [ + scripts: [ './bower_components/underscore/underscore.js', './bower_components/handlebars/handlebars.js', './bower_components/jquery/dist/jquery.js', @@ -18,7 +18,7 @@ var paths = { './bower_components/bootstrap-select/dist/js/bootstrap-select.js', './js/*.js' ], - css: [ + styles: [ './bower_components/bootstrap/dist/css/bootstrap.css', './bower_components/bootstrap/dist/css/bootstrap-theme.css', './bower_components/bootstrap-select/dist/css/bootstrap-select.css', @@ -40,43 +40,43 @@ gulp.task('lint', function() { gulp.task('fonts', function() { return gulp.src(paths.fonts) - .pipe(gulp.dest('./fonts')); + .pipe(gulp.dest('./dist/fonts')); }); -gulp.task('js', function() { - return gulp.src(paths.js) +gulp.task('scripts', function() { + return gulp.src(paths.scripts) .pipe(concat('scripts.js')) .pipe(uglify()) .pipe(gulp.dest('./dist')); }); -gulp.task('css', function() { - return gulp.src(paths.css) +gulp.task('styles', function() { + return gulp.src(paths.styles) .pipe(concat('styles.css')) .pipe(minifyCss()) .pipe(gulp.dest('./dist')); }); gulp.task('html_debug', function() { - var sources = gulp.src(paths.js.concat(paths.css), { read: false }); + var sources = gulp.src(paths.scripts.concat(paths.styles), { read: false }); return gulp.src(paths.html) - .pipe(inject(sources, { addRootSlash: false })) - .pipe(gulp.dest('./')); + .pipe(inject(sources, { addRootSlash: false, addPrefix: '..' })) + .pipe(gulp.dest('./dev')); }); gulp.task('html_release', function() { var sources = gulp.src(['./dist/*.js', './dist/*.css'], { read: false }); return gulp.src(paths.html) - .pipe(inject(sources, { addRootSlash: false })) + .pipe(inject(sources, { addRootSlash: false, ignorePath: 'dist' })) .pipe(minifyHtml()) - .pipe(gulp.dest('./')); + .pipe(gulp.dest('./dist')); }); gulp.task('watch_debug', function() { gulp.watch(paths.html, ['html_debug']); }); -gulp.task('debug', ['lint', 'html_debug']); -gulp.task('release', ['lint', 'fonts', 'js', 'css', 'html_release']); - +gulp.task('debug', ['lint', 'html_debug']); +gulp.task('release', ['lint', 'fonts', 'scripts', 'styles', 'html_release']); +gulp.task('all', ['debug', 'release']); gulp.task('default', ['html_debug', 'watch_debug']);