diff --git a/assets/css/app.scss b/assets/css/app.scss index afa216efd3..3c56eefef7 100644 --- a/assets/css/app.scss +++ b/assets/css/app.scss @@ -1,17 +1,7 @@ -/* - Theme Name: Chamilo - URL Project: http://www.chamilo.org - Description: Styles main base of Chamilo LMS appearance, works with Bootstrap 4 - Version: 3.0 - Author: - alex.aragon@beeznest.com - angel.quiroz@beeznest.com - julio.montoya@beeznest.com - yannick.warnier@beeznest.com -*/ -@import "~bootstrap/scss/bootstrap"; -//@import "~@coreui/coreui/scss/coreui"; +@import '~bootstrap/scss/bootstrap'; +@import '~bootstrap-vue/src/index.scss'; + @import "~@fortawesome/fontawesome-free/css/all.css"; @import '~cropper/dist/cropper.css'; @import '~flag-icon-css/sass/flag-icon.scss'; @@ -21,7 +11,7 @@ @import "~bootstrap-select/sass/bootstrap-select"; //@import '~pretty-checkbox/src/pretty-checkbox.scss'; //@import '~jquery-ui/themes/base/all.css'; -@import "scss/index"; +//@import "scss/index"; //@import "~jquery-ui-timepicker-addon/dist/jquery-ui-timepicker-addon.css"; // //@import "~@fancyapps/fancybox/dist/jquery.fancybox.css"; diff --git a/assets/js/vendor.js b/assets/js/vendor.js index 0be0bc1f4b..36b78bae42 100644 --- a/assets/js/vendor.js +++ b/assets/js/vendor.js @@ -1,15 +1,11 @@ -//require('@coreui/coreui/dist/js/coreui.min.js'); -//require('chosen-js'); require('mediaelement'); -// require('pace-js-amd-fix'); require('multiselect-two-sides'); require('@fortawesome/fontawesome-free'); require('qtip2'); require('image-map-resizer/js/imageMapResizer.js'); require('cropper'); require('jquery-ui-timepicker-addon/dist/jquery-ui-timepicker-addon'); -//import('blueimp-file-upload'); import('select2'); require('timeago'); require('sweetalert2'); diff --git a/assets/vue/App.vue b/assets/vue/App.vue index d279edbf2e..ee5621402a 100644 --- a/assets/vue/App.vue +++ b/assets/vue/App.vue @@ -1,335 +1,56 @@ - + #} - - - - + {# Check chamilo_js key in assetic.yml #} {% block javascripts %} diff --git a/src/CoreBundle/Resources/views/Layout/no_layout.html.twig b/src/CoreBundle/Resources/views/Layout/no_layout.html.twig index 79a0e5afc7..0c95fd6362 100644 --- a/src/CoreBundle/Resources/views/Layout/no_layout.html.twig +++ b/src/CoreBundle/Resources/views/Layout/no_layout.html.twig @@ -2,12 +2,9 @@ {# overrides everything inside body no-footer no-header #} {% block chamilo_wrap %} {% autoescape false %} - -
{% block content %} {{ content }} {% endblock %} -
{% endautoescape %} {% endblock %} diff --git a/src/CoreBundle/Resources/views/Layout/no_layout_scorm.html.twig b/src/CoreBundle/Resources/views/Layout/no_layout_scorm.html.twig new file mode 100644 index 0000000000..79a0e5afc7 --- /dev/null +++ b/src/CoreBundle/Resources/views/Layout/no_layout_scorm.html.twig @@ -0,0 +1,15 @@ +{% extends "@ChamiloCore/Layout/base-layout.html.twig" %} +{# overrides everything inside body no-footer no-header #} +{% block chamilo_wrap %} + {% autoescape false %} + +
+ {% block content %} + {{ content }} + {% endblock %} +
+ {% endautoescape %} +{% endblock %} + +{% block chamilo_footer %} +{% endblock %} diff --git a/webpack.config.js b/webpack.config.js index 68ea832585..ce1e8d60b3 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -1,5 +1,4 @@ var Encore = require('@symfony/webpack-encore'); -const prefixer = require('postcss-prefix-selector') const CopyPlugin = require('copy-webpack-plugin'); //const FileManagerPlugin = require('filemanager-webpack-plugin'); //var dotEnv = require('dotenv'); @@ -172,4 +171,14 @@ themes.forEach(function (theme) { // } // })); -module.exports = Encore.getWebpackConfig(); \ No newline at end of file +//module.exports = Encore.getWebpackConfig(); + +const config = Encore.getWebpackConfig(); + +config.resolve.alias = { + // If using the runtime only build + vue$: 'vue/dist/vue.runtime.esm.js' // 'vue/dist/vue.runtime.common.js' for webpack 1 + // Or if using full build of Vue (runtime + compiler) + // vue$: 'vue/dist/vue.esm.js' // 'vue/dist/vue.common.js' for webpack 1 +}; +module.exports = config; \ No newline at end of file diff --git a/yarn.lock b/yarn.lock index 4ff9b2c514..9f233fece2 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1034,21 +1034,6 @@ lodash "^4.17.19" to-fast-properties "^2.0.0" -"@coreui/coreui-plugin-npm-postinstall@^1.0.2": - version "1.0.2" - resolved "https://registry.yarnpkg.com/@coreui/coreui-plugin-npm-postinstall/-/coreui-plugin-npm-postinstall-1.0.2.tgz#6daeb2ec786580d9c0849b05bc3e8d0222d5c463" - integrity sha512-yeeoWp+bNS84nP1977Y8UCiQ9pssO+f4QuVj3i0/gYZFjjvOgxx0dnyWhtowD5sLYnCRMPlPpqyjwXze3SlkYg== - -"@coreui/coreui@^2.1.7": - version "2.1.16" - resolved "https://registry.yarnpkg.com/@coreui/coreui/-/coreui-2.1.16.tgz#93efb7d903bcd53092cc4bcc31ef8703de565457" - integrity sha512-1YOnQAlcX2bIgnaX3k9GKaN4lD+wKam7tdDfFj7/ZQTN1XG3dwDELHp4aagWQs78ix2CCO1LyeLrzGpsMcLW3Q== - dependencies: - "@coreui/coreui-plugin-npm-postinstall" "^1.0.2" - bootstrap "^4.3.1" - core-js "^3.3.4" - regenerator-runtime "^0.13.3" - "@endemolshinegroup/cosmiconfig-typescript-loader@^1.0.0": version "1.0.2" resolved "https://registry.yarnpkg.com/@endemolshinegroup/cosmiconfig-typescript-loader/-/cosmiconfig-typescript-loader-1.0.2.tgz#c1eadbb4c269f7898195ca8f7428bf5f5d1c449a" @@ -1064,11 +1049,34 @@ resolved "https://registry.yarnpkg.com/@fancyapps/fancybox/-/fancybox-3.5.7.tgz#12f8734663ec6eae7f9236b92ca236e6e07fdfd5" integrity sha512-rcEtu8t+WnmqIDV/Wfm1yvy/nDdwc7YV25j9HLxGC2/WOsUhk9rcWg2nB8g1BrjRt9zaoADdjHTU6ILYTJzBBg== +"@fortawesome/fontawesome-common-types@^0.2.30": + version "0.2.30" + resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-0.2.30.tgz#2f1cc5b46bd76723be41d0013a8450c9ba92b777" + integrity sha512-TsRwpTuKwFNiPhk1UfKgw7zNPeV5RhNp2Uw3pws+9gDAkPGKrtjR1y2lI3SYn7+YzyfuNknflpBA1LRKjt7hMg== + "@fortawesome/fontawesome-free@^5.11": version "5.14.0" resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-free/-/fontawesome-free-5.14.0.tgz#a371e91029ebf265015e64f81bfbf7d228c9681f" integrity sha512-OfdMsF+ZQgdKHP9jUbmDcRrP0eX90XXrsXIdyjLbkmSBzmMXPABB8eobUJtivaupucYaByz6WNe1PI1JuYm3qA== +"@fortawesome/fontawesome-svg-core@^1.2.30": + version "1.2.30" + resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-1.2.30.tgz#f56dc6791861fe5d1af04fb8abddb94658c576db" + integrity sha512-E3sAXATKCSVnT17HYmZjjbcmwihrNOCkoU7dVMlasrcwiJAHxSKeZ+4WN5O+ElgO/FaYgJmASl8p9N7/B/RttA== + dependencies: + "@fortawesome/fontawesome-common-types" "^0.2.30" + +"@fortawesome/free-solid-svg-icons@^5.14.0": + version "5.14.0" + resolved "https://registry.yarnpkg.com/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-5.14.0.tgz#970453f5e8c4915ad57856c3a0252ac63f6fec18" + integrity sha512-M933RDM8cecaKMWDSk3FRYdnzWGW7kBBlGNGfvqLVwcwhUPNj9gcw+xZMrqBdRqxnSXdl3zWzTCNNGEtFUq67Q== + dependencies: + "@fortawesome/fontawesome-common-types" "^0.2.30" + +"@fortawesome/vue-fontawesome@fortawesome/vue-fontawesome": + version "0.1.9" + resolved "https://codeload.github.com/fortawesome/vue-fontawesome/tar.gz/2d71c19b0a561e61344f286099b11be254a50c7f" + "@hapi/address@2.x.x": version "2.1.4" resolved "https://registry.yarnpkg.com/@hapi/address/-/address-2.1.4.tgz#5d67ed43f3fd41a69d4b9ff7b56e7c0d1d0a81e5" @@ -1151,6 +1159,15 @@ dependencies: mkdirp "^1.0.4" +"@nuxt/opencollective@^0.3.0": + version "0.3.0" + resolved "https://registry.yarnpkg.com/@nuxt/opencollective/-/opencollective-0.3.0.tgz#11d8944dcf2d526e31660bb69570be03f8fb72b7" + integrity sha512-Vf09BxCdj1iT2IRqVwX5snaY2WCTkvM0O4cWWSO1ThCFuc4if0Q/nNwAgCxRU0FeYHJ7DdyMUNSdswCLKlVqeg== + dependencies: + chalk "^2.4.2" + consola "^2.10.1" + node-fetch "^2.6.0" + "@oclif/color@^0.x": version "0.1.2" resolved "https://registry.yarnpkg.com/@oclif/color/-/color-0.1.2.tgz#28b07e2850d9ce814d0b587ce3403b7ad8f7d987" @@ -2042,36 +2059,36 @@ vue-codemod "^0.0.4" yaml-front-matter "^3.4.1" -"@vue/compiler-core@3.0.0-rc.8": - version "3.0.0-rc.8" - resolved "https://registry.yarnpkg.com/@vue/compiler-core/-/compiler-core-3.0.0-rc.8.tgz#c8a630b440d03a1790d34b3c5a7b3c86caa8a84e" - integrity sha512-67sHKlKhrBhxF72gJc8PkJeAA1iZ4x1krVDuS2yOvS44Gj+fNHu8Y25mThLu+eq2rXCUrrbbmZge9ND6VuyFUA== +"@vue/compiler-core@3.0.0-rc.9": + version "3.0.0-rc.9" + resolved "https://registry.yarnpkg.com/@vue/compiler-core/-/compiler-core-3.0.0-rc.9.tgz#f2baef360dec3630a230a056dde1e76c9c7bb5f5" + integrity sha512-/Ns7KGT5P0wh4JTM91drBmNIiBlKrCFUqIE2vk8dmaVvqEJf1mqympz1CDZpikghCQC6hKu3tYKxA7qtcMRazw== dependencies: "@babel/parser" "^7.10.4" "@babel/types" "^7.10.4" - "@vue/shared" "3.0.0-rc.8" + "@vue/shared" "3.0.0-rc.9" estree-walker "^2.0.1" source-map "^0.6.1" -"@vue/compiler-dom@3.0.0-rc.8": - version "3.0.0-rc.8" - resolved "https://registry.yarnpkg.com/@vue/compiler-dom/-/compiler-dom-3.0.0-rc.8.tgz#a4fd66356e1dbe7bf3f3e41f6034e682b7c22b3d" - integrity sha512-xnYswIMWTu8ck5ZcyXrZBhB/gBXla5JpfdEkoPqjNNSXZn1w6N398KuB6UQtjSDjjIsZ7shs7/x5hgtnqTNBJQ== +"@vue/compiler-dom@3.0.0-rc.9": + version "3.0.0-rc.9" + resolved "https://registry.yarnpkg.com/@vue/compiler-dom/-/compiler-dom-3.0.0-rc.9.tgz#2a122181db498c0605213fe541af24ecb03ef27e" + integrity sha512-0hCnrIxwp0TKVXKnGYFztM4LMUvFpfXW7YoEglvHqIfZsGkyKcnCYDx4FPk1frDM21xnrr5HgcHt42rlz8lDBA== dependencies: - "@vue/compiler-core" "3.0.0-rc.8" - "@vue/shared" "3.0.0-rc.8" + "@vue/compiler-core" "3.0.0-rc.9" + "@vue/shared" "3.0.0-rc.9" "@vue/compiler-sfc@^3.0.0-beta.15": - version "3.0.0-rc.8" - resolved "https://registry.yarnpkg.com/@vue/compiler-sfc/-/compiler-sfc-3.0.0-rc.8.tgz#ca2a90188039def429103732eaefa705743bb406" - integrity sha512-oJXHqMVVXRiI04rV5ncbyv+lwJMSxMFHxZBCt10bUDBBl9E7ze6/01OcSI4/mzB0RRDa1X1byMDMAgLq/07lAw== + version "3.0.0-rc.9" + resolved "https://registry.yarnpkg.com/@vue/compiler-sfc/-/compiler-sfc-3.0.0-rc.9.tgz#8b1af6bf1cb2561b5f92ce11053e5d21b558ca8b" + integrity sha512-kmjGzcyp93Q+ZKfvxC3GtI9bEXCa9TxsuO+Q9WtiyvOWBLxZkklQc1n5DFn6vtAUIjjlIE5GZoKawvn9LfKejA== dependencies: "@babel/parser" "^7.10.4" "@babel/types" "^7.10.4" - "@vue/compiler-core" "3.0.0-rc.8" - "@vue/compiler-dom" "3.0.0-rc.8" - "@vue/compiler-ssr" "3.0.0-rc.8" - "@vue/shared" "3.0.0-rc.8" + "@vue/compiler-core" "3.0.0-rc.9" + "@vue/compiler-dom" "3.0.0-rc.9" + "@vue/compiler-ssr" "3.0.0-rc.9" + "@vue/shared" "3.0.0-rc.9" consolidate "^0.15.1" estree-walker "^2.0.1" hash-sum "^2.0.0" @@ -2083,13 +2100,13 @@ postcss-selector-parser "^6.0.2" source-map "^0.6.1" -"@vue/compiler-ssr@3.0.0-rc.8": - version "3.0.0-rc.8" - resolved "https://registry.yarnpkg.com/@vue/compiler-ssr/-/compiler-ssr-3.0.0-rc.8.tgz#4b6137922ede1c6abca74e15fda8baf7163e14e0" - integrity sha512-0NtZ6e90CpD/MJRDY0AgGNA1t3utjMkg1A/xc2RruUvJgpCsr/9sj6wK0ZoXV/MKKKFzE5DVgPjwVs0o5wxTfg== +"@vue/compiler-ssr@3.0.0-rc.9": + version "3.0.0-rc.9" + resolved "https://registry.yarnpkg.com/@vue/compiler-ssr/-/compiler-ssr-3.0.0-rc.9.tgz#52e4523b54d993ca0ad137813c5b1212988e62af" + integrity sha512-lpbnkJrhkI5QgprLPXcB1Uq402QiibPFKRUQZ5vu3zeAvUeMYuQUtZS/Dslurcvqd1dbBC/HM0gCpLtjEQ+2qA== dependencies: - "@vue/compiler-dom" "3.0.0-rc.8" - "@vue/shared" "3.0.0-rc.8" + "@vue/compiler-dom" "3.0.0-rc.9" + "@vue/shared" "3.0.0-rc.9" "@vue/component-compiler-utils@^3.0.2", "@vue/component-compiler-utils@^3.1.0": version "3.2.0" @@ -2112,34 +2129,34 @@ resolved "https://registry.yarnpkg.com/@vue/preload-webpack-plugin/-/preload-webpack-plugin-1.1.2.tgz#ceb924b4ecb3b9c43871c7a429a02f8423e621ab" integrity sha512-LIZMuJk38pk9U9Ur4YzHjlIyMuxPlACdBIHH9/nGYVTsaGKOSnSuELiE8vS9wa+dJpIYspYUOqk+L1Q4pgHQHQ== -"@vue/reactivity@3.0.0-rc.8": - version "3.0.0-rc.8" - resolved "https://registry.yarnpkg.com/@vue/reactivity/-/reactivity-3.0.0-rc.8.tgz#329a00e63781663516e5b356ab17e4782bafa7d6" - integrity sha512-/NjP+CI3ggeRXaIlJCI/zJBuClOhwy+SPvt8mcIQEMeewn67bh1Qzl5iqD+yFFzaS3MR3ofdkcCiq1UQ/k2Omg== +"@vue/reactivity@3.0.0-rc.9": + version "3.0.0-rc.9" + resolved "https://registry.yarnpkg.com/@vue/reactivity/-/reactivity-3.0.0-rc.9.tgz#d6a3f40bb9c2e3b0f6f20b4693efc2f91d0c220b" + integrity sha512-1fJSt4zZ/icZUNsN3Te5BeVChmQ7Ner2xUYy9ALtShLSj2RwxRVhtysjXxLE16TbwLkHjsOHjA8tQWrdBfQG0A== dependencies: - "@vue/shared" "3.0.0-rc.8" + "@vue/shared" "3.0.0-rc.9" -"@vue/runtime-core@3.0.0-rc.8": - version "3.0.0-rc.8" - resolved "https://registry.yarnpkg.com/@vue/runtime-core/-/runtime-core-3.0.0-rc.8.tgz#3672094478c7dcf84e6906ac6f0c20fe386fcf9c" - integrity sha512-VZpfCqsjz9rixDWCrEB4aI2qjlTslxAlK+5lVK+4jq7Tz2ZLQa93/Zg9p5DRzdI5GCd3nkOxo9hFXkPu+B2pIw== +"@vue/runtime-core@3.0.0-rc.9": + version "3.0.0-rc.9" + resolved "https://registry.yarnpkg.com/@vue/runtime-core/-/runtime-core-3.0.0-rc.9.tgz#5b4872363c69df6db4e937678ebdc68a141960bb" + integrity sha512-5tViEzPl8K1moMjCQJXqvTa/RjR/h8cZ9dUDgKfKWvZhxAmXHtmYlBWrvEeFTGWiEuZj0XlZkNxMNjuHLVF0Vg== dependencies: - "@vue/reactivity" "3.0.0-rc.8" - "@vue/shared" "3.0.0-rc.8" + "@vue/reactivity" "3.0.0-rc.9" + "@vue/shared" "3.0.0-rc.9" -"@vue/runtime-dom@3.0.0-rc.8": - version "3.0.0-rc.8" - resolved "https://registry.yarnpkg.com/@vue/runtime-dom/-/runtime-dom-3.0.0-rc.8.tgz#96bde809e1d49ff0655bc63e7852cdaa25b23a8e" - integrity sha512-Da1wMDU1bh1c5WLSc3E78ns3XphZG4WHl6v0elhFkwpnSF5qB14ZYnuuqXVZ4N8Afe6ZjvtM4GSWOZlD4TkYng== +"@vue/runtime-dom@3.0.0-rc.9": + version "3.0.0-rc.9" + resolved "https://registry.yarnpkg.com/@vue/runtime-dom/-/runtime-dom-3.0.0-rc.9.tgz#6673901830c78cbe0b7c7c3f656db6ba49783dd1" + integrity sha512-OUKFLOaoshmQPaW7iaYuxl9ip3v08g8cXYr0bu68/0r94PF2/xO/b0GhoUoyeqp/pu1VzZ1TxulJ94JOXsuYjg== dependencies: - "@vue/runtime-core" "3.0.0-rc.8" - "@vue/shared" "3.0.0-rc.8" + "@vue/runtime-core" "3.0.0-rc.9" + "@vue/shared" "3.0.0-rc.9" csstype "^2.6.8" -"@vue/shared@3.0.0-rc.8": - version "3.0.0-rc.8" - resolved "https://registry.yarnpkg.com/@vue/shared/-/shared-3.0.0-rc.8.tgz#d6b80e14c202c37d9f1953965a1517eab46c1d3b" - integrity sha512-GSvG6mbDcOQtLKfeNe77ds0oo5PRfTDhsPlqx1fwvpyROS/BAOo1YK17CXwmI+Vsf+51L/l42tTneBTdhQotmg== +"@vue/shared@3.0.0-rc.9": + version "3.0.0-rc.9" + resolved "https://registry.yarnpkg.com/@vue/shared/-/shared-3.0.0-rc.9.tgz#81e71c2c40dbbfc4f05b3b4a3f92cb2842864aa3" + integrity sha512-SHD7qwziiG6208nKrs0qqbWbYckvBiCBCLwlRjUb6NEDUMN0TOVyzyaTvdnHND9ion/ZMdwEKMtWWtgJJkHDdw== "@vue/web-component-wrapper@^1.2.0": version "1.2.0" @@ -4015,20 +4032,26 @@ bootstrap-select@^1.13.17: resolved "https://registry.yarnpkg.com/bootstrap-select/-/bootstrap-select-1.13.18.tgz#4557119d58dc1159189977161c803962220e4dda" integrity sha512-V1IzK4rxBq5FrJtkzSH6RmFLFBsjx50byFbfAf8jYyXROWs7ZpprGjdHeoyq2HSsHyjJhMMwjsQhRoYAfxCGow== -bootstrap@^3.3: - version "3.4.1" - resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-3.4.1.tgz#c3a347d419e289ad11f4033e3c4132b87c081d72" - integrity sha512-yN5oZVmRCwe5aKwzRj6736nSmKDX7pLYwsXiCj/EYmo16hODaBiT4En5btW/jhBF/seV+XMx3aYwukYC3A49DA== +bootstrap-vue@^2.16.0: + version "2.16.0" + resolved "https://registry.yarnpkg.com/bootstrap-vue/-/bootstrap-vue-2.16.0.tgz#07e7032ec9ffdd576470dc437da54f398ec16ba5" + integrity sha512-gLETwPmeRHCe5WHmhGxzb5PtTEuKqQPGl0TFvZ2Odbkg/7UuIHdqIexrJRerpnomP4ZzDQ+qYGL91Ls9lcQsJQ== + dependencies: + "@nuxt/opencollective" "^0.3.0" + bootstrap ">=4.5.0 <5.0.0" + popper.js "^1.16.1" + portal-vue "^2.1.7" + vue-functional-data-merge "^3.1.0" -bootstrap@^4.3.1: +"bootstrap@>=4.5.0 <5.0.0", bootstrap@^4.5.2: version "4.5.2" resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.5.2.tgz#a85c4eda59155f0d71186b6e6ad9b875813779ab" integrity sha512-vlGn0bcySYl/iV+BGA544JkkZP5LB3jsmkeKLFQakCOwCM3AOk7VkldBz4jrzSe+Z0Ezn99NVXa1o45cQY4R6A== -bootstrap@^5.0.0-alpha1: - version "5.0.0-alpha1" - resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-5.0.0-alpha1.tgz#cd35be4282bc930322bcbf1db23a8729c60a31cb" - integrity sha512-iwKneP2pLXl8lN0YpnOuOARiNPTzmh/4cw+Un86u4OqrMLuQpyMC7nO07hvivvcg0B/ektJPjuPnS1s+YmRK9A== +bootstrap@^3.3: + version "3.4.1" + resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-3.4.1.tgz#c3a347d419e289ad11f4033e3c4132b87c081d72" + integrity sha512-yN5oZVmRCwe5aKwzRj6736nSmKDX7pLYwsXiCj/EYmo16hODaBiT4En5btW/jhBF/seV+XMx3aYwukYC3A49DA== boxen@^1.2.1: version "1.3.0" @@ -5139,6 +5162,11 @@ connect-history-api-fallback@^1.6.0: resolved "https://registry.yarnpkg.com/connect-history-api-fallback/-/connect-history-api-fallback-1.6.0.tgz#8b32089359308d111115d81cad3fceab888f97bc" integrity sha512-e54B99q/OUoH64zYYRf3HBP5z24G38h5D3qXu23JGRoigpX5Ss4r9ZnDk3g0Z8uQC2x2lPaJ+UlWBc1ZWBWdLg== +consola@^2.10.1: + version "2.15.0" + resolved "https://registry.yarnpkg.com/consola/-/consola-2.15.0.tgz#40fc4eefa4d2f8ef2e2806147f056ea207fcc0e9" + integrity sha512-vlcSGgdYS26mPf7qNi+dCisbhiyDnrN1zaRbw3CSuc2wGOMEGGPsp46PdRG5gqXwgtJfjxDkxRNAgRPr1B77vQ== + console-browserify@^1.1.0: version "1.2.0" resolved "https://registry.yarnpkg.com/console-browserify/-/console-browserify-1.2.0.tgz#67063cef57ceb6cf4993a2ab3a55840ae8c49336" @@ -5269,7 +5297,7 @@ core-js@^2.4.0, core-js@^2.5.0: resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.11.tgz#38831469f9922bded8ee21c9dc46985e0399308c" integrity sha512-5wjnpaT/3dV+XB4borEsnAYQchn00XSgTAWKDkEqv+K8KevjbzmofK6hfJ9TZIlpj2N0xQpazy7PiRQiWHqzWg== -core-js@^3.0, core-js@^3.0.1, core-js@^3.3.4, core-js@^3.4.0, core-js@^3.6.5: +core-js@^3.0.1, core-js@^3.4.0, core-js@^3.6.5: version "3.6.5" resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.6.5.tgz#7395dc273af37fb2e50e9bd3d9fe841285231d1a" integrity sha512-vZVEEwZoIsI+vPEuoF9Iqf5H7/M3eeQqWlQnYa8FSKKePuYTf5MWnxb5SDAzCa60b3JBRS5g9b+Dq7b1y/RCrA== @@ -6182,9 +6210,9 @@ ejs@^2.6.1, ejs@^2.7.1: integrity sha512-7vmuyh5+kuUyJKePhQfRQBhXV5Ce+RnaeeQArKu1EAMpL3WbgMt5WG6uQZpEVvYSSsxMXRKOewtDk9RaTKXRlA== electron-to-chromium@^1.3.47, electron-to-chromium@^1.3.523: - version "1.3.549" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.549.tgz#bf500c8eb75a7286a895e34f41aa144384ac613b" - integrity sha512-q09qZdginlqDH3+Y1P6ch5UDTW8nZ1ijwMkxFs15J/DAWOwqolIx8HZH1UP0vReByBigk/dPlU22xS1MaZ+kpQ== + version "1.3.550" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.550.tgz#bf9bbb78182aac0fe2d23d3bd1483dde4483f512" + integrity sha512-MWDHoJsSieBaJ6mObvi3V0eKZufR1iMJl56VIGdXCgFHyCUbVDGm2IMXUNjDxgbGbKa3tA5+zJmHuBQqRxGiLA== elegant-spinner@^1.0.1: version "1.0.1" @@ -8937,6 +8965,11 @@ is-wsl@^2.1.1, is-wsl@^2.2.0: dependencies: is-docker "^2.0.0" +isarray@0.0.1: + version "0.0.1" + resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf" + integrity sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8= + isarray@1.0.0, isarray@^1.0.0, isarray@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11" @@ -9595,9 +9628,9 @@ log-update@^2.3.0: wrap-ansi "^3.0.1" loglevel@^1.6.7, loglevel@^1.6.8: - version "1.6.8" - resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.6.8.tgz#8a25fb75d092230ecd4457270d80b54e28011171" - integrity sha512-bsU7+gc9AJ2SqpzxwU3+1fedl8zAntbtC5XYlt3s2j1hJcn2PsXSmgN8TaLG/J1/2mod4+cE/3vNL70/c1RNCA== + version "1.7.0" + resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.7.0.tgz#728166855a740d59d38db01cf46f042caa041bb0" + integrity sha512-i2sY04nal5jDcagM3FMfG++T69GEEM8CYuOfeOIvmXzOIcwE9a/CJPR0MFM97pYMj/u10lzz7/zd7+qwhrBTqQ== long@^4.0.0: version "4.0.0" @@ -11090,6 +11123,13 @@ path-to-regexp@0.1.7: resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c" integrity sha1-32BBeABfUi8V60SQ5yR6G/qmf4w= +path-to-regexp@^1.7.0: + version "1.8.0" + resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-1.8.0.tgz#887b3ba9d84393e87a0a0b9f4cb756198b53548a" + integrity sha512-n43JRhlUKUAlibEJhPeir1ncUID16QnEjNpwzNdO3Lm4ywrBpBZ5oLD0I6br9evr1Y9JTqwRtAh7JLoOzAQdVA== + dependencies: + isarray "0.0.1" + path-type@^1.0.0: version "1.1.0" resolved "https://registry.yarnpkg.com/path-type/-/path-type-1.1.0.tgz#59c44f7ee491da704da415da5a4070ba4f8fe441" @@ -11223,7 +11263,7 @@ pnp-webpack-plugin@^1.6.4: dependencies: ts-pnp "^1.1.6" -popper.js@^1.14.7: +popper.js@^1.14.7, popper.js@^1.16.1: version "1.16.1" resolved "https://registry.yarnpkg.com/popper.js/-/popper.js-1.16.1.tgz#2a223cb3dc7b6213d740e40372be40de43e65b1b" integrity sha512-Wb4p1J4zyFTbM+u6WuO4XstYx4Ky9Cewe4DWrel7B0w6VVICvPwdOpotjzcf6eD8TsckVnIMNONQyPIUFOUbCQ== @@ -11552,13 +11592,6 @@ postcss-ordered-values@^4.1.2: postcss "^7.0.0" postcss-value-parser "^3.0.0" -postcss-prefix-selector@^1.7.2: - version "1.7.2" - resolved "https://registry.yarnpkg.com/postcss-prefix-selector/-/postcss-prefix-selector-1.7.2.tgz#3adeed903985734298f19d8f5e0b657f9d90d43c" - integrity sha512-ddmzjWNmGs7E/nyolJ021/Gk6oBLRQLyyXKGV4Mu+Y0gquo+XlXSDP0/Y2J8C/cad/GLyftf2H0XtuDFQZxN3w== - dependencies: - postcss "^7.0.0" - postcss-reduce-initial@^4.0.3: version "4.0.3" resolved "https://registry.yarnpkg.com/postcss-reduce-initial/-/postcss-reduce-initial-4.0.3.tgz#7fd42ebea5e9c814609639e2c2e84ae270ba48df" @@ -12088,7 +12121,7 @@ regenerator-runtime@^0.11.0: resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz#be05ad7f9bf7d22e056f9726cee5017fbf19e2e9" integrity sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg== -regenerator-runtime@^0.13.3, regenerator-runtime@^0.13.4: +regenerator-runtime@^0.13.4: version "0.13.7" resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.7.tgz#cac2dacc8a1ea675feaabaeb8ae833898ae46f55" integrity sha512-a54FxoJDIr27pgf7IgeQGxmqUNYrcV338lf/6gH456HZ/PhX+5BcwHXG9ajESmwe6WRO0tAzRUrRmNONWgkrew== @@ -14391,6 +14424,11 @@ vue-eslint-parser@^7.0.0: esquery "^1.0.1" lodash "^4.17.15" +vue-functional-data-merge@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/vue-functional-data-merge/-/vue-functional-data-merge-3.1.0.tgz#08a7797583b7f35680587f8a1d51d729aa1dc657" + integrity sha512-leT4kdJVQyeZNY1kmnS1xiUlQ9z1B/kdBFCILIjYYQDqZgLqCLa0UhjSSeRX6c3mUe6U5qYeM8LrEqkHJ1B4LA== + vue-hot-reload-api@^2.3.0: version "2.3.4" resolved "https://registry.yarnpkg.com/vue-hot-reload-api/-/vue-hot-reload-api-2.3.4.tgz#532955cc1eb208a3d990b3a9f9a70574657e08f2" @@ -14419,11 +14457,24 @@ vue-moment@^4.1.0: dependencies: moment "^2.19.2" +vue-perfect-scrollbar@^0.2.1: + version "0.2.1" + resolved "https://registry.yarnpkg.com/vue-perfect-scrollbar/-/vue-perfect-scrollbar-0.2.1.tgz#2fecab975512f7c8c37e1610dee48faf46d649f3" + integrity sha512-45rOonNrZaKX0mu0N9v422+c3Ngm8iTnVAP0N2iUwPfWZJds4S6eRGdmiNbrVFqmUc8IfRNI0Dpa3Zk8ntjaZQ== + vue-router@^3.1.6: version "3.4.3" resolved "https://registry.yarnpkg.com/vue-router/-/vue-router-3.4.3.tgz#fa93768616ee338aa174f160ac965167fa572ffa" integrity sha512-BADg1mjGWX18Dpmy6bOGzGNnk7B/ZA0RxuA6qedY/YJwirMfKXIDzcccmHbQI0A6k5PzMdMloc0ElHfyOoX35A== +vue-sidebar-menu@^4.7.1: + version "4.7.1" + resolved "https://registry.yarnpkg.com/vue-sidebar-menu/-/vue-sidebar-menu-4.7.1.tgz#e8458ff59279043333e22bf52bfd032e792e08ef" + integrity sha512-KiEw3FLkQSnSdhN5gmlUVViqaDD5hHZWp6CFUCefEOgxdmw1S4fn2PuXA8VZ0b3HQYSRoT5wSWJ6meRBvtEXOQ== + dependencies: + path-to-regexp "^1.7.0" + vue "^2.5.21" + vue-style-loader@^4.1.0, vue-style-loader@^4.1.2: version "4.1.2" resolved "https://registry.yarnpkg.com/vue-style-loader/-/vue-style-loader-4.1.2.tgz#dedf349806f25ceb4e64f3ad7c0a44fba735fcf8" @@ -14445,19 +14496,19 @@ vue-template-es2015-compiler@^1.9.0: resolved "https://registry.yarnpkg.com/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.9.1.tgz#1ee3bc9a16ecbf5118be334bb15f9c46f82f5825" integrity sha512-4gDntzrifFnCEvyoO8PqyJDmguXgVPxKiIxrBKjIowvL9l+N66196+72XVYR8BBf1Uv1Fgt3bGevJ+sEmxfZzw== -vue@^2.6, vue@^2.6.11: +vue@^2.5.21, vue@^2.6.11, vue@^2.6.12: version "2.6.12" resolved "https://registry.yarnpkg.com/vue/-/vue-2.6.12.tgz#f5ebd4fa6bd2869403e29a896aed4904456c9123" integrity sha512-uhmLFETqPPNyuLLbsKz6ioJ4q7AZHzD8ZVFNATNyICSZouqP2Sz0rotWQC8UNBF6VGSCs5abnKJoStA6JbCbfg== vue@^3.0.0-beta.15: - version "3.0.0-rc.8" - resolved "https://registry.yarnpkg.com/vue/-/vue-3.0.0-rc.8.tgz#001b9d7a4033d6ff4b601c6457fc080e192fead9" - integrity sha512-2TPckyMoOjEawJBsjb+02GusPBBTwgCqGSjQYsJnToCPDR7PnVCkA4dbGJYlw1w9heXfwgyI+9qmZT0vMVLGmg== + version "3.0.0-rc.9" + resolved "https://registry.yarnpkg.com/vue/-/vue-3.0.0-rc.9.tgz#8c54e6168625e3533f1f764ad3fa89235b01afb3" + integrity sha512-bimvpl5q/sKy1dAOE+KNX9T3p6Qq8kuNRmOYwaxtacI91ksjS7nVGse1FANhTL+XTQgl8+ySrd3f67xWi26nxw== dependencies: - "@vue/compiler-dom" "3.0.0-rc.8" - "@vue/runtime-dom" "3.0.0-rc.8" - "@vue/shared" "3.0.0-rc.8" + "@vue/compiler-dom" "3.0.0-rc.9" + "@vue/runtime-dom" "3.0.0-rc.9" + "@vue/shared" "3.0.0-rc.9" vuelidate@^0.7.5: version "0.7.5"