diff --git a/traditional-bootstrap/gulpfile.js b/traditional-bootstrap/gulpfile.js index 31c653c..93c4ee9 100644 --- a/traditional-bootstrap/gulpfile.js +++ b/traditional-bootstrap/gulpfile.js @@ -56,11 +56,11 @@ const jsDashboard = [ // Javascript libraries for the dashboard const jsDashboardLibs = [ - "bower_components/jquery/dist/jquery.js", - "bower_components/bootstrap-sass/assets/javascripts/bootstrap.js", + "node_modules/jquery/dist/jquery.js", + "node_modules/bootstrap/dist/js/bootstrap.js", + "node_modules/pickadate/lib/picker.js", + "node_modules/pickadate/lib/picker.date.js", "bower_components/Sortable/Sortable.js", - "bower_components/pickadate/lib/picker.js", - "bower_components/pickadate/lib/picker.date.js", "bower_components/list.js/dist/list.js", "bower_components/simplemde/dist/simplemde.min.js" ]; @@ -120,6 +120,11 @@ gulp.task("sass-dashboard", () => { return processSass("dashboard"); }); +// Task for error page styles +gulp.task("sass-error", () => { + return processSass("error"); +}); + // Task for public javascript gulp.task("js-public", () => { return processJavaScript("app", jsPublic, true); @@ -171,13 +176,14 @@ gulp.task("watch", () => { gulp.watch([ "app/**/*.php", "routes/**/*.php", "resources/views/**/*.blade.php" ], gulp.series(browserSyncReload)); gulp.watch(jsPublic, gulp.series("js-public", browserSyncReload)); gulp.watch(jsDashboard, gulp.series("js-dashboard", browserSyncReload)); - gulp.watch("resources/assets/sass/**/*.scss", gulp.parallel("sass-public", "sass-dashboard")); + gulp.watch("resources/assets/sass/**/*.scss", gulp.parallel("sass-public", "sass-dashboard", "sass-error")); }); // Task to run non-development tasks gulp.task("default", gulp.parallel( "sass-public", "sass-dashboard", + "sass-error", "js-public", "js-public-libs", "js-dashboard", diff --git a/traditional-bootstrap/package.json b/traditional-bootstrap/package.json index 75e6701..4b67785 100644 --- a/traditional-bootstrap/package.json +++ b/traditional-bootstrap/package.json @@ -28,6 +28,7 @@ "gulp-uglify": "^3.0.0", "jquery": "^3.3.1", "minimist": "^1.2.0", + "pickadate": "^3.5.6", "popper.js": "^1.14.3", "what-input": "^5.0.5" }