diff --git a/mooringlicensing/frontend/mooringlicensing/package-lock.json b/mooringlicensing/frontend/mooringlicensing/package-lock.json index d510cca84..a02634cc1 100644 --- a/mooringlicensing/frontend/mooringlicensing/package-lock.json +++ b/mooringlicensing/frontend/mooringlicensing/package-lock.json @@ -12,11 +12,8 @@ "@vue/cli-service": "^5.0.8", "babel-polyfill": "^6.26.0", "bootstrap": "^3.4.1", - "datatables.net": "^1.12.1", - "datatables.net-bs": "^1.12.1", - "datatables.net-buttons": "^1.5.3", - "datatables.net-responsive": "^2.3.0", - "datatables.net-responsive-bs": "^2.3.0", + "datatables.net-buttons-bs": "^2.4.3", + "datatables.net-responsive-bs": "^2.5.1", "eonasdan-bootstrap-datetimepicker": "^4.17.47", "font-awesome": "^4.7.0", "jquery": "^3.7.1", @@ -4921,99 +4918,63 @@ } }, "node_modules/datatables.net": { - "version": "1.12.1", - "resolved": "https://registry.npmjs.org/datatables.net/-/datatables.net-1.12.1.tgz", - "integrity": "sha512-e6XAMUoV41JdQPS/r9YRfRcmTPcCVvyZbWI+xog1Zg+kjVliMQbEkvWK5XFItmi64Cvwg+IqsZbTUJ1KSY3umA==", + "version": "1.13.11", + "resolved": "https://registry.npmjs.org/datatables.net/-/datatables.net-1.13.11.tgz", + "integrity": "sha512-AE6RkMXziRaqzPcu/pl3SJXeRa6fmXQG/fVjuRESujvkzqDCYEeKTTpPMuVJSGYJpPi32WGSphVNNY1G4nSN/g==", "license": "MIT", "dependencies": { - "jquery": ">=1.7" + "jquery": "1.8 - 4" } }, "node_modules/datatables.net-bs": { - "version": "1.12.1", - "resolved": "https://registry.npmjs.org/datatables.net-bs/-/datatables.net-bs-1.12.1.tgz", - "integrity": "sha512-oaX1mNhjnASo33mwv6QzgGxD3pAz69qAL+8YlCro3e7oMvszE6wJyprEt80vl8E/TiMp/UUvsaqsup1JZFfMBQ==", + "version": "1.13.11", + "resolved": "https://registry.npmjs.org/datatables.net-bs/-/datatables.net-bs-1.13.11.tgz", + "integrity": "sha512-oZeXzC2Z+pZc9Wpil6XuuwMPMfllSd+hWEauhKr8q7bTM5fGuBKzAVzSr7Tuo1OzMBZ6NkAb+HSBGCGUn5Qbhg==", "license": "MIT", "dependencies": { - "datatables.net": ">=1.11.3", - "jquery": ">=1.7" + "datatables.net": "1.13.11", + "jquery": "1.8 - 4" } }, - "node_modules/datatables.net-bs/node_modules/datatables.net": { - "version": "2.1.8", - "resolved": "https://registry.npmjs.org/datatables.net/-/datatables.net-2.1.8.tgz", - "integrity": "sha512-47ULt+U4bcjbuGTpTlT6SnCuSFVRBxxdWa6X3NfvTObBJ2BZU0o+JUIl05wQ6cABNIavjbAV51gpgvFsMHL9zA==", + "node_modules/datatables.net-buttons": { + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/datatables.net-buttons/-/datatables.net-buttons-2.4.3.tgz", + "integrity": "sha512-xoHD6I2kxnU/CEp97Ar0lSnAL1siucQ/5Q/otGWWfWE2VN0o4n5C2h2Ot/ZCS8kxbEHBGd873Bc2xPdJH87yOw==", "license": "MIT", "dependencies": { + "datatables.net": "^1.13.0", "jquery": ">=1.7" } }, - "node_modules/datatables.net-buttons": { - "version": "1.5.3", - "resolved": "https://registry.npmjs.org/datatables.net-buttons/-/datatables.net-buttons-1.5.3.tgz", - "integrity": "sha512-qGdYiquuIvoZSH0jkRTcVnS1LlCuJFOSlIX5wNmK+3267Ryq6r9llKFtgrIORkSlyy+M1TJMViFJxRSX5W62GA==", + "node_modules/datatables.net-buttons-bs": { + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/datatables.net-buttons-bs/-/datatables.net-buttons-bs-2.4.3.tgz", + "integrity": "sha512-dzAiqWn/KDj0J+qzwnuByouBK7zpfp1MFP5Ya6ohpDmeF8KcrYntamTtlFegO0pKIV3+l1/RJuhZs/oWgwCpcw==", "license": "MIT", "dependencies": { - "datatables.net": "^1.10.15", + "datatables.net-bs": "^1.13.0", + "datatables.net-buttons": "2.4.3", "jquery": ">=1.7" } }, "node_modules/datatables.net-responsive": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/datatables.net-responsive/-/datatables.net-responsive-2.3.0.tgz", - "integrity": "sha512-QA5QsD1sJQRQ7/IFi3rSd33O84f/Augz2KnaehjfuEANtK4KeC9Lbkut5tPuuMcK4jOpQPOOPYTbmfrt+tfh9w==", + "version": "2.5.1", + "resolved": "https://registry.npmjs.org/datatables.net-responsive/-/datatables.net-responsive-2.5.1.tgz", + "integrity": "sha512-hyJb2faIzEWUX5Yn4HOSq/6NNB9SXDVbI4OU9ny+XU/2ghZEz4676spOgzpDHTdWvCfM+t1mbUsT70fDiTTr9w==", "license": "MIT", "dependencies": { - "datatables.net": ">=1.11.3", + "datatables.net": "^1.13.0", "jquery": ">=1.7" } }, "node_modules/datatables.net-responsive-bs": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/datatables.net-responsive-bs/-/datatables.net-responsive-bs-2.3.0.tgz", - "integrity": "sha512-YK3in6otAGTP58NqTnvwIAA4jUpy+M8wT0hVXpoCCDKciDP68/5VWhsnjm2XN2w/zU3pnBS0D6uMF7+9gthCrQ==", - "license": "MIT", - "dependencies": { - "datatables.net-bs": ">=1.11.3", - "datatables.net-responsive": ">=2.2.9", - "jquery": ">=1.7" - } - }, - "node_modules/datatables.net-responsive-bs/node_modules/datatables.net": { - "version": "2.1.8", - "resolved": "https://registry.npmjs.org/datatables.net/-/datatables.net-2.1.8.tgz", - "integrity": "sha512-47ULt+U4bcjbuGTpTlT6SnCuSFVRBxxdWa6X3NfvTObBJ2BZU0o+JUIl05wQ6cABNIavjbAV51gpgvFsMHL9zA==", - "license": "MIT", - "dependencies": { - "jquery": ">=1.7" - } - }, - "node_modules/datatables.net-responsive-bs/node_modules/datatables.net-bs": { - "version": "2.1.8", - "resolved": "https://registry.npmjs.org/datatables.net-bs/-/datatables.net-bs-2.1.8.tgz", - "integrity": "sha512-V3AbH2RlH8Y4T5En3RN4Jv/aiVxCeeYfbf841fL6UDzWYfx8AkGXVeJxSSVgaFhXIV7ezPpcSkEzyEq1nAEM3w==", - "license": "MIT", - "dependencies": { - "datatables.net": "2.1.8", - "jquery": ">=1.7" - } - }, - "node_modules/datatables.net-responsive-bs/node_modules/datatables.net-responsive": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/datatables.net-responsive/-/datatables.net-responsive-3.0.3.tgz", - "integrity": "sha512-/VU5U3P+l3GSdo92Mclt5YlrETNkfIZZU1MOk0aHNt0VqQOE0dORhx5Nwa8pYVsBuQBYzzyROZLru6UivEWv3Q==", - "license": "MIT", - "dependencies": { - "datatables.net": "^2", - "jquery": ">=1.7" - } - }, - "node_modules/datatables.net-responsive/node_modules/datatables.net": { - "version": "2.1.8", - "resolved": "https://registry.npmjs.org/datatables.net/-/datatables.net-2.1.8.tgz", - "integrity": "sha512-47ULt+U4bcjbuGTpTlT6SnCuSFVRBxxdWa6X3NfvTObBJ2BZU0o+JUIl05wQ6cABNIavjbAV51gpgvFsMHL9zA==", + "version": "2.5.1", + "resolved": "https://registry.npmjs.org/datatables.net-responsive-bs/-/datatables.net-responsive-bs-2.5.1.tgz", + "integrity": "sha512-54TMkT+C1c1i2GiUGKAUjnh7cuMLH9mkZGk+AuB9oMXeNu+3/5DVx04cZAbdeTSurR5Lgce3ZuYtHtwnAJuvKw==", "license": "MIT", "dependencies": { + "datatables.net-bs": "^1.13.0", + "datatables.net-responsive": "2.5.1", "jquery": ">=1.7" } }, diff --git a/mooringlicensing/frontend/mooringlicensing/package.json b/mooringlicensing/frontend/mooringlicensing/package.json index 35feb5d37..13bad8ffa 100644 --- a/mooringlicensing/frontend/mooringlicensing/package.json +++ b/mooringlicensing/frontend/mooringlicensing/package.json @@ -13,11 +13,8 @@ "@vue/cli-service": "^5.0.8", "babel-polyfill": "^6.26.0", "bootstrap": "^3.4.1", - "datatables.net": "^1.12.1", - "datatables.net-bs": "^1.12.1", - "datatables.net-buttons": "^1.5.3", - "datatables.net-responsive": "^2.3.0", - "datatables.net-responsive-bs": "^2.3.0", + "datatables.net-buttons-bs": "^2.4.3", + "datatables.net-responsive-bs": "^2.5.1", "eonasdan-bootstrap-datetimepicker": "^4.17.47", "font-awesome": "^4.7.0", "jquery": "^3.7.1", diff --git a/mooringlicensing/frontend/mooringlicensing/src/main.js b/mooringlicensing/frontend/mooringlicensing/src/main.js index a6ffdda4d..7ffcb3ed0 100755 --- a/mooringlicensing/frontend/mooringlicensing/src/main.js +++ b/mooringlicensing/frontend/mooringlicensing/src/main.js @@ -6,27 +6,19 @@ import bs from 'bootstrap' import helpers from '@/utils/helpers' import { extendMoment } from 'moment-range'; -import jszip from 'jszip'; -window.JSZip = jszip; -import 'datatables.net'; -import 'datatables.net-bs'; import 'datatables.net-responsive-bs'; -import 'datatables.net-buttons/js/dataTables.buttons.js'; -import 'datatables.net-buttons/js/buttons.html5.js'; +import 'datatables.net-buttons-bs'; -import "datatables.net-bs/css/dataTables.bootstrap.css"; -import "datatables.net-responsive-bs/css/responsive.bootstrap.css"; +import jsZip from 'jszip'; +window.JSZip = jsZip; -//import 'select2'; +import 'select2'; import 'jquery-validation'; -import "sweetalert2/dist/sweetalert2.css"; +import 'sweetalert2/dist/sweetalert2.css'; import 'select2/dist/css/select2.min.css'; -//import 'select2-bootstrap-theme/dist/select2-bootstrap.min.css'; -//import '@/../node_modules/datatables.net-bs/css/dataTables.bootstrap.min.css'; -//import '@/../node_modules/datatables.net-responsive-bs/css/responsive.bootstrap.min.css'; - +import 'select2-bootstrap-theme/dist/select2-bootstrap.min.css'; extendMoment(moment); diff --git a/mooringlicensing/frontend/mooringlicensing/vue.config.js b/mooringlicensing/frontend/mooringlicensing/vue.config.js index c922ea53b..eefe66b5a 100644 --- a/mooringlicensing/frontend/mooringlicensing/vue.config.js +++ b/mooringlicensing/frontend/mooringlicensing/vue.config.js @@ -46,7 +46,6 @@ module.exports = defineConfig({ moment: 'moment', swal: 'sweetalert2', _: 'lodash', - "select2": "../node_modules/select2/dist/js/select2.full.min.js", datetimepicker:"../node_modules/eonasdan-bootstrap-datetimepicker/build/js/bootstrap-datetimepicker.min.js" }), new MomentLocalesPlugin(),