diff --git a/composer.json b/composer.json index 70add68..db1ed0b 100644 --- a/composer.json +++ b/composer.json @@ -12,7 +12,7 @@ "fruitcake/laravel-cors": "^2.0", "guzzlehttp/guzzle": "^7.0.1", "htmlmin/htmlmin": "^8.0", - "kwaadpepper/crud-policies": "^0.1.6", + "kwaadpepper/crud-policies": "^0.1.11", "kwaadpepper/enum": "^0.1.4", "kwaadpepper/image-resizer": "^0.0.3", "laravel/framework": "^8.12", diff --git a/composer.lock b/composer.lock index 1b4f55a..d0fb8ed 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "737a588eba109189b5c2c8054afad5c2", + "content-hash": "0d531da6fe3833506261931b0328f7ea", "packages": [ { "name": "asm89/stack-cors", @@ -1683,16 +1683,16 @@ }, { "name": "kwaadpepper/crud-policies", - "version": "0.1.6", + "version": "0.1.11", "source": { "type": "git", "url": "https://github.com/Kwaadpepper/crud-policies.git", - "reference": "ab9b92e71f3529a767562f1d13046bbf1308a9a4" + "reference": "828b7fc321d8906a4fdb76a7a3697023218f09dd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Kwaadpepper/crud-policies/zipball/ab9b92e71f3529a767562f1d13046bbf1308a9a4", - "reference": "ab9b92e71f3529a767562f1d13046bbf1308a9a4", + "url": "https://api.github.com/repos/Kwaadpepper/crud-policies/zipball/828b7fc321d8906a4fdb76a7a3697023218f09dd", + "reference": "828b7fc321d8906a4fdb76a7a3697023218f09dd", "shasum": "" }, "require": { @@ -1740,9 +1740,9 @@ ], "support": { "issues": "https://github.com/Kwaadpepper/crud-policies/issues", - "source": "https://github.com/Kwaadpepper/crud-policies/tree/0.1.6" + "source": "https://github.com/Kwaadpepper/crud-policies/tree/0.1.11" }, - "time": "2021-07-22T09:25:02+00:00" + "time": "2021-08-11T09:15:40+00:00" }, { "name": "kwaadpepper/enum", diff --git a/package-lock.json b/package-lock.json index 92771c8..9e8c9c1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -17,7 +17,6 @@ "swiper": "^6.6.1", "vue": "^2.6.12", "vue-loader": "^15.9.6", - "vue-select": "^3.11.2", "vue-template-compiler": "^2.6.12" } }, @@ -14883,15 +14882,6 @@ } } }, - "node_modules/vue-select": { - "version": "3.11.2", - "resolved": "https://registry.npmjs.org/vue-select/-/vue-select-3.11.2.tgz", - "integrity": "sha512-pIOcY8ajWNSwg8Ns4eHVr5ZWwqKCSZeQRymTnlUI8i+3QiQXF6JIM4lylK6mVfbccs4S6vOyxB7zmJBpp7tDUg==", - "dev": true, - "peerDependencies": { - "vue": "2.x" - } - }, "node_modules/vue-style-loader": { "version": "4.1.3", "resolved": "https://registry.npmjs.org/vue-style-loader/-/vue-style-loader-4.1.3.tgz", @@ -27425,13 +27415,6 @@ "vue-style-loader": "^4.1.0" } }, - "vue-select": { - "version": "3.11.2", - "resolved": "https://registry.npmjs.org/vue-select/-/vue-select-3.11.2.tgz", - "integrity": "sha512-pIOcY8ajWNSwg8Ns4eHVr5ZWwqKCSZeQRymTnlUI8i+3QiQXF6JIM4lylK6mVfbccs4S6vOyxB7zmJBpp7tDUg==", - "dev": true, - "requires": {} - }, "vue-style-loader": { "version": "4.1.3", "resolved": "https://registry.npmjs.org/vue-style-loader/-/vue-style-loader-4.1.3.tgz", diff --git a/package.json b/package.json index 13ef467..9b78881 100644 --- a/package.json +++ b/package.json @@ -22,7 +22,6 @@ "swiper": "^6.6.1", "vue": "^2.6.12", "vue-loader": "^15.9.6", - "vue-select": "^3.11.2", "vue-template-compiler": "^2.6.12" } } diff --git a/resources/js/back.js b/resources/js/back.js index 40c55f6..a2cf959 100644 --- a/resources/js/back.js +++ b/resources/js/back.js @@ -1 +1,2 @@ require('./bootstrap'); +require('./vuejs'); diff --git a/resources/js/vuejs.js b/resources/js/vuejs.js index ae67af5..0eb6945 100644 --- a/resources/js/vuejs.js +++ b/resources/js/vuejs.js @@ -1,19 +1,13 @@ -window.Vue = require('vue').default; -import vSelect from "vue-select" -Vue.component('v-select', vSelect) - -let vueOptions = { - el: "#app" -}; +window.__PORTSALARIEVue = require('vue').default; // register modules const modules = require.context("./modules", true, /\.js$/i); -modules.keys().map(key => Vue.mixin(modules(key).default)); +modules.keys().map(key => __PORTSALARIEVue.mixin(modules(key).default)); // Register components const vues = require.context("./components/backend", true, /\.vue$/i); vues.keys().map(key => - Vue.component( + __PORTSALARIEVue.component( key .split("/") .pop() @@ -26,14 +20,10 @@ vues.keys().map(key => vues(key).default ) ); +const vuejsModules = []; -const app = new Vue(vueOptions); - -Vue.filter('str_limit', function (value, size) { - if (!value) return ''; - value = value.toString(); - if (value.length <= size) { - return value; - } - return value.substr(0, size) + '...'; +document.getElementsByClassName('portsalaries-vuejs').forEach(element => { + vuejsModules.push(new __PORTSALARIEVue({ + el: element + })); }); diff --git a/resources/views/crudOverLoad/sondages/edit.blade.php b/resources/views/crudOverLoad/sondages/edit.blade.php index a204b7e..a5fb0fe 100644 --- a/resources/views/crudOverLoad/sondages/edit.blade.php +++ b/resources/views/crudOverLoad/sondages/edit.blade.php @@ -40,7 +40,7 @@ @endforeach {{__('Réponses') }} - + @@ -52,3 +52,14 @@ @include('crud-policies::crud.modules.scriptConstants') @endsection + +@push('scriptsConstants') + +@endpush diff --git a/resources/views/layouts/backend.blade.php b/resources/views/layouts/backend.blade.php index b86dac8..8995c4e 100644 --- a/resources/views/layouts/backend.blade.php +++ b/resources/views/layouts/backend.blade.php @@ -25,6 +25,7 @@ @stack('scriptsConstants') + @include('crud-policies::crud.modules.scriptConstants')