diff --git a/app/Resources/assets/js/slider.js b/app/Resources/assets/js/slider.js index 3a389d6..5bfb958 100644 --- a/app/Resources/assets/js/slider.js +++ b/app/Resources/assets/js/slider.js @@ -17,7 +17,7 @@ $(document).ready(function() { $("#" + id + "_value").text(ui.values[0] + " - " + ui.values[1]); } - }).slider("pips", {}); + }).slider("pips", {}).draggable(); $("#" + id + "_value").text($slider.slider("values", 0) + ' - ' + $slider.slider("values", 1)) }); diff --git a/bower.json b/bower.json index 9df2241..77249e7 100644 --- a/bower.json +++ b/bower.json @@ -18,7 +18,8 @@ "dependencies": { "jQuery-ui-Slider-Pips": "jquery-ui-slider-pips#^1.11.4", "jquery-ui": "^1.12.1", - "SVG-Loaders": "svg-loaders#^1.0.2", - "select2": "^4.0.3" + "select2": "^4.0.3", + "three.js": "threejs#*", + "jqueryui-touch-punch": "*" } } diff --git a/gulpfile.js b/gulpfile.js index 87a3cb4..c485384 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -17,16 +17,16 @@ gulp.task('css', function() { gulp.task('three', function() { gulp.src([ - 'node_modules/three/build/three.js', - 'node_modules/three/examples/js/libs/stats.min.js', - 'node_modules/three/examples/js/loaders/STLLoader.js', - 'node_modules/three/examples/js/Detector.js', + 'bower_components/three/build/three.js', + 'bower_components/three/examples/js/libs/stats.min.js', + 'bower_components/three/examples/js/loaders/STLLoader.js', + 'bower_components/three/examples/js/Detector.js', ]) .pipe(plugins.concat('three.js')) .pipe(gulp.dest('web/resources/js')); gulp.src([ - 'node_modules/three/examples/js/controls/OrbitControls.js', + 'bower_components/three/examples/js/controls/OrbitControls.js', ]) .pipe(plugins.concat('OrbitControls.js')) .pipe(gulp.dest('web/resources/js')); @@ -37,11 +37,11 @@ gulp.task('js', function() { 'bower_components/jquery/dist/jquery.js', 'bower_components/jquery-ui/jquery-ui.js', 'bower_components/jQuery-ui-Slider-Pips/dist/jquery-ui-slider-pips.js', + 'bower_components/jqueryui-touch-punch/jquery.ui.touch-punch.js', 'bower_components/select2/dist/js/select2.full.js', 'node_modules/semantic-ui/dist/semantic.js', 'node_modules/lightbox2/dist/js/lightbox.js', 'app/Resources/assets/js/**.js', - 'node_modules/three/examples/js/libs/stats.min.js' ]) .pipe(plugins.concat('main.js')) .pipe(gulp.dest('web/resources/js')); @@ -62,7 +62,6 @@ gulp.task('files:images', function () { .pipe(gulp.dest('web/resources/images')); }); - gulp.task('watch', ['js', 'css', 'three'], function () { gulp.watch('app/Resources/assets/js/**.js' , ['js']); gulp.watch('app/Resources/assets/style/**/*.scss' , ['css']); diff --git a/package.json b/package.json index 54b9670..7687e43 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "printabrick", "version": "1.0.0", - "description": "Website for printable building kits", + "description": "Web catalogue of LEGO® parts for 3D printing", "main": "web/app.php", "dependencies": { "gulp": "^3.9.1", @@ -12,8 +12,7 @@ "gulp-watch": "^4.3.11", "jquery": "^3.2.1", "lightbox2": "^2.9.0", - "semantic-ui": "^2.2.9", - "three": "^0.84.0" + "semantic-ui": "^2.2.9" }, "devDependencies": {}, "scripts": {