- npm updates

- install vue-loader
- small changes laravel-mix file for vue

.babelrc

@@ -1,6 +1,7 @@
 { 
     "plugins": [
         ["@babel/plugin-proposal-decorators", { "legacy": true }],
+        ["@babel/plugin-proposal-private-methods", { "loose": true }],
         ["@babel/plugin-proposal-class-properties", { "loose": true }]
     ] 
 }

database/migrations/2019_09_02_075831_create_document_files_table.php

@@ -20,7 +20,7 @@ class CreateDocumentFilesTable extends Migration
             $table->foreign('document_id')->references('id')->on('documents')
             ->onUpdate('cascade')->onDelete('cascade');
 
-            $table->string('path_name', 50);
+            $table->string('path_name', 100);
             $table->string('label', 50)->nullable();
             $table->string('comment', 255)->nullable();
             $table->string('mime_type', 255)->nullable();

package.json

@@ -5,28 +5,30 @@
     "dev": "npm run development",
     "development": "cross-env NODE_ENV=development node_modules/webpack/bin/webpack.js --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js",
     "prod": "npm run production",
-    "production": "cross-env NODE_ENV=production node_modules/webpack/bin/webpack.js --no-progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js"
+    "production": "cross-env NODE_ENV=production node_modules/webpack/bin/webpack.js --config=node_modules/laravel-mix/setup/webpack.config.js"
   },
   "devDependencies": {
     "@babel/plugin-proposal-class-properties": "^7.10.4",
     "@babel/plugin-proposal-decorators": "^7.10.5",
     "bootstrap-sass": "^3.4.1",
     "cross-env": "^7.0.2",
-    "laravel-mix": "^5.0.1",
+    "laravel-mix": "^6.0.19",
     "npm-font-open-sans": "^1.1.0",
+    "postcss-loader": "^5.2.0",
     "purecss-sass": "^2.0.3",
-    "resolve-url-loader": "^3.1.0",
+    "resolve-url-loader": "^4.0.0",
     "sass": "^1.26.10",
-    "sass-loader": "^8.0.0",
+    "sass-loader": "^11.1.0",
-    "ts-loader": "^6.2.2",
+    "ts-loader": "^9.1.2",
     "typescript": "^4.0.2",
-    "webpack": "^4.44.1",
+    "vue-loader": "^15.9.5",
-    "webpack-cli": "^3.3.12"
+    "webpack": "^5.37.0",
+    "webpack-cli": "^4.7.0"
   },
   "dependencies": {
     "@ckeditor/ckeditor5-build-classic": "^12.4.0",
     "@fortawesome/fontawesome-free": "^5.14.0",
-    "axios": "^0.20.0",
+    "axios": "^0.21.1",
     "datatables.net": "^1.10.21",
     "datatables.net-buttons": "^1.6.3",
     "easytimer": "^1.1.1",
@@ -41,9 +43,9 @@
     "vue-datetime-picker": "^0.2.1",
     "vue-directive-tooltip": "^1.6.3",
     "vue-events": "^3.1.0",
-    "vue-property-decorator": "^8.5.1",
+    "vue-property-decorator": "^9.1.2",
     "vue-template-compiler": "^2.6.12",
-    "vue-toast-notification": "^0.5.0",
+    "vue-toast-notification": "^0.6.1",
     "vuedraggable": "^2.24.0",
     "vuejs-datetimepicker": "^1.1.12",
     "vuetable-2": "^1.3.1"

public/backend/publish/datasetPublish.js.LICENSE.txt

@@ -53,3 +53,10 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
+
+/**!
+ * Sortable 1.10.2
+ * @author	RubaXa   <trash@rubaxa.org>
+ * @author	owenm    <owen23355@gmail.com>
+ * @license MIT
+ */

public/backend/publish/mainEditDataset.js.LICENSE.txt

@@ -45,3 +45,10 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
+
+/**!
+ * Sortable 1.10.2
+ * @author	RubaXa   <trash@rubaxa.org>
+ * @author	owenm    <owen23355@gmail.com>
+ * @license MIT
+ */

public/fonts/vendor/@fortawesome/fontawesome-free/webfa-brands-400.svg

@@ -2,11 +2,11 @@
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1">
 <metadata>
-Created by FontForge 20200314 at Mon Oct  5 09:50:45 2020
+Created by FontForge 20201107 at Tue Mar 16 10:15:04 2021
  By Robert Madole
 Copyright (c) Font Awesome
 </metadata>
-<!-- Font Awesome Free 5.15.1 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License) --><defs>
+<!-- Font Awesome Free 5.15.3 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License) --><defs>
 <font id="FontAwesome5Brands-Regular" horiz-adv-x="448" >
   <font-face 
     font-family="Font Awesome 5 Brands Regular"

public/fonts/vendor/@fortawesome/fontawesome-free/webfa-regular-400.svg

@@ -2,11 +2,11 @@
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1">
 <metadata>
-Created by FontForge 20200314 at Mon Oct  5 09:50:45 2020
+Created by FontForge 20201107 at Tue Mar 16 10:15:04 2021
  By Robert Madole
 Copyright (c) Font Awesome
 </metadata>
-<!-- Font Awesome Free 5.15.1 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License) --><defs>
+<!-- Font Awesome Free 5.15.3 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License) --><defs>
 <font id="FontAwesome5Free-Regular" horiz-adv-x="512" >
   <font-face 
     font-family="Font Awesome 5 Free Regular"

public/fonts/vendor/@fortawesome/fontawesome-free/webfa-solid-900.svg

@@ -2,11 +2,11 @@
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1">
 <metadata>
-Created by FontForge 20200314 at Mon Oct  5 09:50:45 2020
+Created by FontForge 20201107 at Tue Mar 16 10:15:04 2021
  By Robert Madole
 Copyright (c) Font Awesome
 </metadata>
-<!-- Font Awesome Free 5.15.1 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License) --><defs>
+<!-- Font Awesome Free 5.15.3 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License) --><defs>
 <font id="FontAwesome5Free-Solid" horiz-adv-x="512" >
   <font-face 
     font-family="Font Awesome 5 Free Solid"
@@ -3720,11 +3720,17 @@ c0 53.0195 42.9805 96 96 96c53.0205 0 96 -42.9805 96 -96c0 -11.2803 -2.30957 -21
     <glyph glyph-name="wine-glass-alt" unicode="&#xf5ce;" horiz-adv-x="288" 
 d="M216 -16c22.0898 0 40 -17.9102 40 -40c0 -4.41992 -3.58008 -8 -8 -8h-208c-4.41992 0 -8 3.58008 -8 8c0 22.0898 17.9102 40 40 40h40v117.18c-68.4697 15.8906 -118.05 79.9102 -111.4 154.16l15.96 178.11c0.730469 8.24023 7.55078 14.5498 15.7002 14.5498h223.48
 c8.16016 0 14.9697 -6.30957 15.71 -14.5498l15.9502 -178.101c6.64941 -74.25 -42.9307 -138.27 -111.4 -154.159v-117.19h40zM61.75 400l-7.16992 -80h178.84l-7.16992 80h-164.5z" />
-    <glyph glyph-name="air-freshener" unicode="&#xf5d0;" horiz-adv-x="384" 
+    <glyph glyph-name="air-freshener" unicode="&#xf5d0;" 
-d="M378.94 126.59c11.75 -12.1494 1.71973 -30.5898 -16.6406 -30.5898h-138.3v-32h112c8.83984 0 16 -7.16016 16 -16v-96c0 -8.83984 -7.16016 -16 -16 -16h-288c-8.83984 0 -16 7.16016 -16 16v96c0 8.83984 7.16016 16 16 16h112v32h-138.3
+d="M224 288c53 0 96 -43 96 -96v-224c0 -17.625 -14.375 -32 -32 -32h-256c-17.625 0 -32 14.375 -32 32v224c0 53 43 96 96 96h128zM160 32c44.125 0 80 35.875 80 80s-35.875 80 -80 80s-80 -35.875 -80 -80s35.875 -80 80 -80zM224 416v-96h-128v96
-c-18.3604 0 -28.3906 18.4404 -16.6406 30.5898l94.2402 97.4102h-49.2197c-15.2998 0 -23.6602 16.5996 -13.8604 27.5303l113.33 126.51c-3.42969 6.61035 -5.5498 14 -5.5498 21.96c0 26.5098 21.4902 48 48 48s48 -21.4902 48 -48
+c0 17.625 14.375 32 32 32h64c17.625 0 32 -14.375 32 -32zM381.781 396.422l-29.7812 -12.4219l-12.4385 -29.7812c-0.592773 -1.21875 -2.18652 -2.21875 -3.56152 -2.21875s-2.96875 1 -3.59375 2.21875l-12.4062 29.7812l-29.7812 12.4219
-c0 -7.95996 -2.12012 -15.3496 -5.5498 -21.96l113.33 -126.51c9.7998 -10.9307 1.43945 -27.5303 -13.8604 -27.5303h-49.2197zM192 416.02c-8.84961 0 -16.0195 -7.16992 -16.0195 -16.0195c0 -8.83984 7.16992 -16.0195 16.0195 -16.0195
+c-1.21875 0.609375 -2.21875 2.21875 -2.21875 3.57812c0 1.375 1 2.96875 2.21875 3.57812l29.7812 12.4219l12.4062 29.7812c0.625 1.21875 2.21875 2.21875 3.59375 2.21875s2.96875 -1 3.56152 -2.21875l12.4385 -29.7812l29.7812 -12.4219
-s16.0195 7.17969 16.0195 16.0195c0 8.84961 -7.16992 16.0195 -16.0195 16.0195zM304 16h-224v-32h224v32z" />
+c1.21875 -0.609375 2.21875 -2.20312 2.21875 -3.57812c0 -1.35938 -1 -2.96875 -2.21875 -3.57812zM448 384l-29.7812 12.4219c-1.21875 0.609375 -2.21875 2.21875 -2.21875 3.57812c0 1.375 1 2.96875 2.21875 3.57812l29.7812 12.4219l12.4062 29.7812
+c0.625 1.21875 2.21875 2.21875 3.59375 2.21875s2.96875 -1 3.56152 -2.21875l12.4385 -29.7812l29.7812 -12.4219c1.21875 -0.609375 2.21875 -2.20312 2.21875 -3.57812c0 -1.35938 -1 -2.96875 -2.21875 -3.57812l-29.7812 -12.4219l-12.4385 -29.7812
+c-0.592773 -1.21875 -2.18652 -2.21875 -3.56152 -2.21875s-2.96875 1 -3.59375 2.21875zM480 224l29.7812 -12.4219c1.21875 -0.609375 2.21875 -2.20312 2.21875 -3.57812c0 -1.35938 -1 -2.96875 -2.21875 -3.57812l-29.7812 -12.4219l-12.4385 -29.7812
+c-0.592773 -1.21875 -2.18652 -2.21875 -3.56152 -2.21875s-2.96875 1 -3.59375 2.21875l-12.4062 29.7812l-29.7812 12.4219c-1.21875 0.609375 -2.21875 2.21875 -2.21875 3.57812c0 1.375 1 2.96875 2.21875 3.57812l29.7812 12.4219l12.4062 29.7812
+c0.625 1.21875 2.21875 2.21875 3.59375 2.21875s2.96875 -1 3.56152 -2.21875zM445.781 300.422l-29.7812 -12.4219l-12.4385 -29.7812c-0.592773 -1.21875 -2.18652 -2.21875 -3.56152 -2.21875s-2.96875 1 -3.59375 2.21875l-12.4062 29.7812l-29.7812 12.4219
+c-1.21875 0.609375 -2.21875 2.21875 -2.21875 3.57812c0 1.375 1 2.96875 2.21875 3.57812l29.7812 12.4219l12.4062 29.7812c0.625 1.21875 2.21875 2.21875 3.59375 2.21875s2.96875 -1 3.56152 -2.21875l12.4385 -29.7812l29.7812 -12.4219
+c1.21875 -0.609375 2.21875 -2.20312 2.21875 -3.57812c0 -1.35938 -1 -2.96875 -2.21875 -3.57812z" />
     <glyph glyph-name="apple-alt" unicode="&#xf5d1;" horiz-adv-x="448" 
 d="M350.85 319c25.9707 -4.66992 47.2705 -18.6699 63.9199 -42c14.6504 -20.6699 24.6406 -46.6699 29.9609 -78c4.66992 -28.6699 4.31934 -57.3301 -1 -86c-7.99023 -47.3301 -23.9707 -87 -47.9404 -119c-28.6396 -38.6699 -64.5898 -58 -107.87 -58
 c-10.6602 0 -22.2998 3.33008 -34.96 10c-8.66016 5.33008 -18.3096 8 -28.9697 8s-20.2998 -2.66992 -28.9707 -8c-12.6592 -6.66992 -24.2998 -10 -34.96 -10c-43.2793 0 -79.2295 19.3301 -107.869 58c-23.9707 32 -39.9502 71.6699 -47.9404 119

public/js/app.js.LICENSE.txt

@@ -1,12 +1,12 @@
 /*!
- * Sizzle CSS Selector Engine v2.3.5
+ * Sizzle CSS Selector Engine v2.3.6
  * https://sizzlejs.com/
  *
  * Copyright JS Foundation and other contributors
  * Released under the MIT license
  * https://js.foundation/
  *
- * Date: 2020-03-14
+ * Date: 2021-02-16
  */
 
 /*!
@@ -16,17 +16,17 @@
  */
 
 /*!
- * jQuery JavaScript Library v3.5.1
+ * jQuery JavaScript Library v3.6.0
  * https://jquery.com/
  *
  * Includes Sizzle.js
  * https://sizzlejs.com/
  *
- * Copyright JS Foundation and other contributors
+ * Copyright OpenJS Foundation and other contributors
  * Released under the MIT license
  * https://jquery.org/license
  *
- * Date: 2020-05-04T22:49Z
+ * Date: 2021-03-02T17:08Z
  */
 
 /**

public/js/lib.js.LICENSE.txt

@@ -1,24 +1,24 @@
 /*!
- * Sizzle CSS Selector Engine v2.3.5
+ * Sizzle CSS Selector Engine v2.3.6
  * https://sizzlejs.com/
  *
  * Copyright JS Foundation and other contributors
  * Released under the MIT license
  * https://js.foundation/
  *
- * Date: 2020-03-14
+ * Date: 2021-02-16
  */
 
 /*!
- * jQuery JavaScript Library v3.5.1
+ * jQuery JavaScript Library v3.6.0
  * https://jquery.com/
  *
  * Includes Sizzle.js
  * https://sizzlejs.com/
  *
- * Copyright JS Foundation and other contributors
+ * Copyright OpenJS Foundation and other contributors
  * Released under the MIT license
  * https://jquery.org/license
  *
- * Date: 2020-05-04T22:49Z
+ * Date: 2021-03-02T17:08Z
  */

public/js/scripts.js.LICENSE.txt

@@ -1,24 +1,24 @@
 /*!
- * Sizzle CSS Selector Engine v2.3.5
+ * Sizzle CSS Selector Engine v2.3.6
  * https://sizzlejs.com/
  *
  * Copyright JS Foundation and other contributors
  * Released under the MIT license
  * https://js.foundation/
  *
- * Date: 2020-03-14
+ * Date: 2021-02-16
  */
 
 /*!
- * jQuery JavaScript Library v3.5.1
+ * jQuery JavaScript Library v3.6.0
  * https://jquery.com/
  *
  * Includes Sizzle.js
  * https://sizzlejs.com/
  *
- * Copyright JS Foundation and other contributors
+ * Copyright OpenJS Foundation and other contributors
  * Released under the MIT license
  * https://jquery.org/license
  *
- * Date: 2020-05-04T22:49Z
+ * Date: 2021-03-02T17:08Z
  */

public/mix-manifest.json

@@ -1,15 +1,15 @@
 {
-    "/backend/ckeditor.js": "/backend/ckeditor.js",
-    "/backend/publish/approveDataset.js": "/backend/publish/approveDataset.js",
     "/backend/publish/datasetPublish.js": "/backend/publish/datasetPublish.js",
-    "/css/app1.css": "/css/app1.css",
-    "/css/font-awesome.css": "/css/font-awesome.css",
-    "/backend/publish/mainEditDataset.js": "/backend/publish/mainEditDataset.js",
-    "/backend/publish/releaseDataset.js": "/backend/publish/releaseDataset.js",
-    "/js/app.js": "/js/app.js",
-    "/js/landingpage/main.js": "/js/landingpage/main.js",
-    "/js/lib.js": "/js/lib.js",
-    "/js/scripts.js": "/js/scripts.js",
     "/js/search/main.js": "/js/search/main.js",
+    "/js/landingpage/main.js": "/js/landingpage/main.js",
+    "/js/app.js": "/js/app.js",
+    "/js/lib.js": "/js/lib.js",
+    "/backend/publish/releaseDataset.js": "/backend/publish/releaseDataset.js",
+    "/backend/publish/mainEditDataset.js": "/backend/publish/mainEditDataset.js",
+    "/backend/publish/approveDataset.js": "/backend/publish/approveDataset.js",
+    "/backend/ckeditor.js": "/backend/ckeditor.js",
+    "/js/scripts.js": "/js/scripts.js",
+    "/css/font-awesome.css": "/css/font-awesome.css",
+    "/css/app1.css": "/css/app1.css",
     "/js/dataTable.js": "/js/dataTable.js"
 }

webpack.mix.js

@@ -14,14 +14,14 @@ let mix = require('laravel-mix');
 
 // .sass('resources/assets/sass/app1.scss', 'public/css')
 
-mix.js('resources/js/datasetPublish.js', 'public/backend/publish')
+mix.js('resources/js/datasetPublish.js', 'public/backend/publish').vue()
-    .js('resources/js/search/main.ts', 'public/js/search')
+    .js('resources/js/search/main.ts', 'public/js/search').vue()
-    .js('resources/js/landingpage/main.ts', 'public/js/landingpage')
+    .js('resources/js/landingpage/main.ts', 'public/js/landingpage').vue()
-    .js('resources/js/app.js', 'public/js')
+    .js('resources/js/app.js', 'public/js').vue()
     .js('resources/js/lib.js', 'public/js')
-    .js('resources/js/releaseDataset.js', 'public/backend/publish')
+    .js('resources/js/releaseDataset.js', 'public/backend/publish').vue()
-    .js('resources/js/mainEditDataset.js', 'public/backend/publish')
+    .js('resources/js/mainEditDataset.js', 'public/backend/publish').vue()
-    .js('resources/js/approveDataset.js', 'public/backend/publish')
+    .js('resources/js/approveDataset.js', 'public/backend/publish').vue()
     .js('resources/js/ckeditor.js', 'public/backend/')   
     .sass('resources/sass/app1.scss', 'public/css') //, { implementation: require('node-sass')})
     //.sass('node_modules/purecss/build/pure.css', 'public/css', { implementation: require('node-sass') })