From af9b3ea0269edcb57a3093a52bd6b5e74b001bc2 Mon Sep 17 00:00:00 2001
From: Kevin MacMartin <prurigro@gmail.com>
Date: Mon, 14 Oct 2019 21:32:11 -0400
Subject: [PATCH] Sync the traditional-bootstrap with the date picker update,
 and upgrade sortablejs by switching to npm

---
 bower.json                         |  1 -
 gulpfile.js                        |  2 +-
 package-lock.json                  |  5 +++++
 package.json                       |  1 +
 traditional-bootstrap/gulpfile.js  | 16 +++++++---------
 traditional-bootstrap/package.json |  3 ++-
 6 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/bower.json b/bower.json
index 1ffed43..11a4a8e 100644
--- a/bower.json
+++ b/bower.json
@@ -7,7 +7,6 @@
   "description": "The Hypothetical website template",
   "license": "MIT",
   "dependencies": {
-    "Sortable": "~1.9.0",
     "simplemde": "~1.11.2",
     "SpinKit": "~1.2.5",
     "list.js": "^1.5.0"
diff --git a/gulpfile.js b/gulpfile.js
index 08cb255..e781202 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -63,7 +63,7 @@ const jsDashboardLibs = [
     "node_modules/popper.js/dist/umd/popper.js",
     "node_modules/bootstrap/dist/js/bootstrap.js",
     "node_modules/flatpickr/dist/flatpickr.js",
-    "bower_components/Sortable/Sortable.js",
+    "node_modules/sortablejs/Sortable.js",
     "bower_components/list.js/dist/list.js",
     "bower_components/simplemde/dist/simplemde.min.js"
 ];
diff --git a/package-lock.json b/package-lock.json
index 4a8c544..e75e56d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -7876,6 +7876,11 @@
         "is-plain-obj": "^1.0.0"
       }
     },
+    "sortablejs": {
+      "version": "1.10.1",
+      "resolved": "https://registry.npmjs.org/sortablejs/-/sortablejs-1.10.1.tgz",
+      "integrity": "sha512-N6r7GrVmO8RW1rn0cTdvK3JR0BcqecAJ0PmYMCL3ZuqTH3pY+9QyqkmJSkkLyyDvd+AJnwaxTP22Ybr/83V9hQ=="
+    },
     "source-map": {
       "version": "0.5.7",
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
diff --git a/package.json b/package.json
index 99468ec..a8ae792 100644
--- a/package.json
+++ b/package.json
@@ -31,6 +31,7 @@
     "jquery": "^3.4.1",
     "minimist": "^1.2.0",
     "popper.js": "^1.15.0",
+    "sortablejs": "^1.10.1",
     "vinyl-buffer": "^1.0.1",
     "vinyl-source-stream": "^2.0.0",
     "vue": "^2.6.10",
diff --git a/traditional-bootstrap/gulpfile.js b/traditional-bootstrap/gulpfile.js
index 32d76f8..7a50e8d 100644
--- a/traditional-bootstrap/gulpfile.js
+++ b/traditional-bootstrap/gulpfile.js
@@ -60,17 +60,15 @@ const jsDashboardLibs = [
     "node_modules/jquery/dist/jquery.js",
     "node_modules/popper.js/dist/umd/popper.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",
+    "node_modules/flatpickr/dist/flatpickr.js",
+    "node_modules/sortablejs/Sortable.js",
     "bower_components/list.js/dist/list.js",
     "bower_components/simplemde/dist/simplemde.min.js"
 ];
 
 // CSS libraries for the dashboard
 const cssDashboardLibs = [
-    "node_modules/pickadate/lib/themes/default.css",
-    "node_modules/pickadate/lib/themes/default.date.css",
+    "node_modules/flatpickr/dist/flatpickr.css",
     "bower_components/simplemde/dist/simplemde.min.css",
     "bower_components/SpinKit/css/spinners/11-folding-cube.css"
 ];
@@ -104,11 +102,11 @@ function processSass(filename) {
 }
 
 // Process css
-function processCSS(ouputFilename, inputFiles) {
+function processCSS(outputFilename, inputFiles) {
     const css = gulp.src(inputFiles)
         .pipe(plumber(handleError))
         .pipe(postCSS([ autoprefixer(autoprefixerSettings) ]))
-        .pipe(concat(`${ouputFilename}.css`));
+        .pipe(concat(`${outputFilename}.css`));
 
     if (isProduction) {
         css.pipe(cleanCSS());
@@ -118,10 +116,10 @@ function processCSS(ouputFilename, inputFiles) {
 }
 
 // Process javascript
-function processJavaScript(ouputFilename, inputFiles, es6) {
+function processJavaScript(outputFilename, inputFiles, es6) {
     const javascript = gulp.src(inputFiles)
         .pipe(plumber(handleError))
-        .pipe(concat(`${ouputFilename}.js`));
+        .pipe(concat(`${outputFilename}.js`));
 
     if (es6) {
         if (isProduction) {
diff --git a/traditional-bootstrap/package.json b/traditional-bootstrap/package.json
index 6bf3d08..5452994 100644
--- a/traditional-bootstrap/package.json
+++ b/traditional-bootstrap/package.json
@@ -14,6 +14,7 @@
     "babelify": "^10.0.0",
     "bootstrap": "4.3.1",
     "fancy-log": "^1.3.3",
+    "flatpickr": "^4.6.2",
     "gsap": "^2.1.3",
     "gulp": "^4.0.2",
     "gulp-babel": "^8.0.0",
@@ -27,8 +28,8 @@
     "gulp-uglify": "^3.0.2",
     "jquery": "^3.4.1",
     "minimist": "^1.2.0",
-    "pickadate": "^3.6.4",
     "popper.js": "^1.15.0",
+    "sortablejs": "^1.10.1",
     "what-input": "^5.2.3"
   }
 }