diff --git a/composer.lock b/composer.lock index 7b06076347..5cc694920d 100644 --- a/composer.lock +++ b/composer.lock @@ -1414,16 +1414,16 @@ }, { "name": "laravel/framework", - "version": "v7.14.1", + "version": "v7.15.0", "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "469b7719a8dca40841a74f59f2e9f30f01d3a106" + "reference": "739c44a3f7041430a3fb357f2dcfdb78f55005d7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/469b7719a8dca40841a74f59f2e9f30f01d3a106", - "reference": "469b7719a8dca40841a74f59f2e9f30f01d3a106", + "url": "https://api.github.com/repos/laravel/framework/zipball/739c44a3f7041430a3fb357f2dcfdb78f55005d7", + "reference": "739c44a3f7041430a3fb357f2dcfdb78f55005d7", "shasum": "" }, "require": { @@ -1566,7 +1566,7 @@ "framework", "laravel" ], - "time": "2020-06-02T22:34:18+00:00" + "time": "2020-06-09T14:00:25+00:00" }, { "name": "laravel/passport", @@ -3775,16 +3775,16 @@ }, { "name": "symfony/console", - "version": "v5.1.0", + "version": "v5.1.1", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "00bed125812716d09b163f0727ef33bb49bf3448" + "reference": "0f0a271bc9b7d02a053d36fcdcb12662e2a8096e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/00bed125812716d09b163f0727ef33bb49bf3448", - "reference": "00bed125812716d09b163f0727ef33bb49bf3448", + "url": "https://api.github.com/repos/symfony/console/zipball/0f0a271bc9b7d02a053d36fcdcb12662e2a8096e", + "reference": "0f0a271bc9b7d02a053d36fcdcb12662e2a8096e", "shasum": "" }, "require": { @@ -3864,11 +3864,11 @@ "type": "tidelift" } ], - "time": "2020-05-30T20:35:19+00:00" + "time": "2020-06-07T19:47:44+00:00" }, { "name": "symfony/css-selector", - "version": "v5.1.0", + "version": "v5.1.1", "source": { "type": "git", "url": "https://github.com/symfony/css-selector.git", @@ -3995,7 +3995,7 @@ }, { "name": "symfony/error-handler", - "version": "v5.1.0", + "version": "v5.1.1", "source": { "type": "git", "url": "https://github.com/symfony/error-handler.git", @@ -4066,7 +4066,7 @@ }, { "name": "symfony/event-dispatcher", - "version": "v5.1.0", + "version": "v5.1.1", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher.git", @@ -4224,7 +4224,7 @@ }, { "name": "symfony/finder", - "version": "v5.1.0", + "version": "v5.1.1", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", @@ -4287,7 +4287,7 @@ }, { "name": "symfony/http-foundation", - "version": "v5.1.0", + "version": "v5.1.1", "source": { "type": "git", "url": "https://github.com/symfony/http-foundation.git", @@ -4362,16 +4362,16 @@ }, { "name": "symfony/http-kernel", - "version": "v5.1.0", + "version": "v5.1.1", "source": { "type": "git", "url": "https://github.com/symfony/http-kernel.git", - "reference": "75ff5327a7d6ede3ccc2fac3ebca9ed776b3e85c" + "reference": "1151e5d51a680b22e758d05c6647dd9857503ec8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-kernel/zipball/75ff5327a7d6ede3ccc2fac3ebca9ed776b3e85c", - "reference": "75ff5327a7d6ede3ccc2fac3ebca9ed776b3e85c", + "url": "https://api.github.com/repos/symfony/http-kernel/zipball/1151e5d51a680b22e758d05c6647dd9857503ec8", + "reference": "1151e5d51a680b22e758d05c6647dd9857503ec8", "shasum": "" }, "require": { @@ -4471,20 +4471,20 @@ "type": "tidelift" } ], - "time": "2020-05-31T06:14:18+00:00" + "time": "2020-06-12T11:25:56+00:00" }, { "name": "symfony/mime", - "version": "v5.1.0", + "version": "v5.1.1", "source": { "type": "git", "url": "https://github.com/symfony/mime.git", - "reference": "56261f89385f9d13cf843a5101ac72131190bc91" + "reference": "c0c418f05e727606e85b482a8591519c4712cf45" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/mime/zipball/56261f89385f9d13cf843a5101ac72131190bc91", - "reference": "56261f89385f9d13cf843a5101ac72131190bc91", + "url": "https://api.github.com/repos/symfony/mime/zipball/c0c418f05e727606e85b482a8591519c4712cf45", + "reference": "c0c418f05e727606e85b482a8591519c4712cf45", "shasum": "" }, "require": { @@ -4548,7 +4548,7 @@ "type": "tidelift" } ], - "time": "2020-05-25T12:33:44+00:00" + "time": "2020-06-09T15:07:35+00:00" }, { "name": "symfony/polyfill-ctype", @@ -5350,7 +5350,7 @@ }, { "name": "symfony/process", - "version": "v5.1.0", + "version": "v5.1.1", "source": { "type": "git", "url": "https://github.com/symfony/process.git", @@ -5478,16 +5478,16 @@ }, { "name": "symfony/routing", - "version": "v5.1.0", + "version": "v5.1.1", "source": { "type": "git", "url": "https://github.com/symfony/routing.git", - "reference": "95cf30145b26c758d6d832aa2d0de3128978d556" + "reference": "bbd0ba121d623f66d165a55a108008968911f3eb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/routing/zipball/95cf30145b26c758d6d832aa2d0de3128978d556", - "reference": "95cf30145b26c758d6d832aa2d0de3128978d556", + "url": "https://api.github.com/repos/symfony/routing/zipball/bbd0ba121d623f66d165a55a108008968911f3eb", + "reference": "bbd0ba121d623f66d165a55a108008968911f3eb", "shasum": "" }, "require": { @@ -5566,7 +5566,7 @@ "type": "tidelift" } ], - "time": "2020-05-30T20:35:19+00:00" + "time": "2020-06-10T11:49:58+00:00" }, { "name": "symfony/service-contracts", @@ -5642,16 +5642,16 @@ }, { "name": "symfony/string", - "version": "v5.1.0", + "version": "v5.1.1", "source": { "type": "git", "url": "https://github.com/symfony/string.git", - "reference": "90c2a5103f07feb19069379f3abdcdbacc7753a9" + "reference": "ac70459db781108db7c6d8981dd31ce0e29e3298" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/string/zipball/90c2a5103f07feb19069379f3abdcdbacc7753a9", - "reference": "90c2a5103f07feb19069379f3abdcdbacc7753a9", + "url": "https://api.github.com/repos/symfony/string/zipball/ac70459db781108db7c6d8981dd31ce0e29e3298", + "reference": "ac70459db781108db7c6d8981dd31ce0e29e3298", "shasum": "" }, "require": { @@ -5723,11 +5723,11 @@ "type": "tidelift" } ], - "time": "2020-05-20T17:43:50+00:00" + "time": "2020-06-11T12:16:36+00:00" }, { "name": "symfony/translation", - "version": "v5.1.0", + "version": "v5.1.1", "source": { "type": "git", "url": "https://github.com/symfony/translation.git", @@ -5890,7 +5890,7 @@ }, { "name": "symfony/var-dumper", - "version": "v5.1.0", + "version": "v5.1.1", "source": { "type": "git", "url": "https://github.com/symfony/var-dumper.git", @@ -8506,12 +8506,12 @@ "source": { "type": "git", "url": "https://github.com/Roave/SecurityAdvisories.git", - "reference": "de6fda3af9b36c77fdeb62b968157032f7111b09" + "reference": "59f3050bcd5dab238c9ac3eada55269cc2fcfaa8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/de6fda3af9b36c77fdeb62b968157032f7111b09", - "reference": "de6fda3af9b36c77fdeb62b968157032f7111b09", + "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/59f3050bcd5dab238c9ac3eada55269cc2fcfaa8", + "reference": "59f3050bcd5dab238c9ac3eada55269cc2fcfaa8", "shasum": "" }, "conflict": { @@ -8526,7 +8526,7 @@ "bagisto/bagisto": "<0.1.5", "barrelstrength/sprout-base-email": "<1.2.7", "barrelstrength/sprout-forms": "<3.9", - "bolt/bolt": "<3.6.10", + "bolt/bolt": "<3.7.1", "brightlocal/phpwhois": "<=4.2.5", "buddypress/buddypress": "<5.1.2", "bugsnag/bugsnag-laravel": ">=2,<2.0.2", @@ -8618,6 +8618,7 @@ "pear/archive_tar": "<1.4.4", "phpfastcache/phpfastcache": ">=5,<5.0.13", "phpmailer/phpmailer": "<6.1.6", + "phpmussel/phpmussel": ">=1,<1.6", "phpmyadmin/phpmyadmin": "<4.9.2", "phpoffice/phpexcel": "<1.8.2", "phpoffice/phpspreadsheet": "<1.8", @@ -8781,7 +8782,7 @@ "type": "tidelift" } ], - "time": "2020-06-04T00:00:55+00:00" + "time": "2020-06-11T00:01:52+00:00" }, { "name": "sebastian/code-unit-reverse-lookup", @@ -9503,7 +9504,7 @@ }, { "name": "symfony/filesystem", - "version": "v5.1.0", + "version": "v5.1.1", "source": { "type": "git", "url": "https://github.com/symfony/filesystem.git", diff --git a/frontend/src/bootstrap-basic.js b/frontend/src/bootstrap-basic.js new file mode 100644 index 0000000000..929718daca --- /dev/null +++ b/frontend/src/bootstrap-basic.js @@ -0,0 +1,7 @@ + +// export jquery for others scripts to use +window.$ = window.jQuery = require('jquery'); + +// admin stuff +require('bootstrap'); + diff --git a/frontend/src/bootstrap.js b/frontend/src/bootstrap.js index 8588cb2142..1ca359f398 100644 --- a/frontend/src/bootstrap.js +++ b/frontend/src/bootstrap.js @@ -1,8 +1,34 @@ // imports +import Vue from 'vue'; +import VueI18n from 'vue-i18n' +import * as uiv from 'uiv'; // export jquery for others scripts to use window.$ = window.jQuery = require('jquery'); +// axios +window.axios = require('axios'); +window.axios.defaults.headers.common['X-Requested-With'] = 'XMLHttpRequest'; + +// CSRF +let token = document.head.querySelector('meta[name="csrf-token"]'); + +if (token) { + window.axios.defaults.headers.common['X-CSRF-TOKEN'] = token.content; +} else { + console.error('CSRF token not found: https://laravel.com/docs/csrf#csrf-x-csrf-token'); +} + // admin stuff +require('jquery-ui'); require('bootstrap'); +require('./dist/js/adminlte'); +require('overlayscrollbars'); + +// vue +window.vuei18n = VueI18n; +window.uiv =uiv; +Vue.use(vuei18n); +Vue.use(uiv); +window.Vue = Vue;