diff options
| -rw-r--r-- | package-lock.json | 50 | ||||
| -rw-r--r-- | package.json | 2 | ||||
| -rw-r--r-- | public/js/app.js | 27 | ||||
| -rw-r--r-- | public/mix-manifest.json | 3 | ||||
| -rw-r--r-- | webpack.mix.js | 5 |
5 files changed, 80 insertions, 7 deletions
diff --git a/package-lock.json b/package-lock.json index 1f8e67a..d4399a2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2389,6 +2389,17 @@ } } }, + "clone-deep": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-4.0.1.tgz", + "integrity": "sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ==", + "dev": true, + "requires": { + "is-plain-object": "^2.0.4", + "kind-of": "^6.0.2", + "shallow-clone": "^3.0.0" + } + }, "coa": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/coa/-/coa-2.0.2.tgz", @@ -7726,6 +7737,36 @@ "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==", "dev": true }, + "sass": { + "version": "1.29.0", + "resolved": "https://registry.npmjs.org/sass/-/sass-1.29.0.tgz", + "integrity": "sha512-ZpwAUFgnvAUCdkjwPREny+17BpUj8nh5Yr6zKPGtLNTLrmtoRYIjm7njP24COhjJldjwW1dcv52Lpf4tNZVVRA==", + "dev": true, + "requires": { + "chokidar": ">=2.0.0 <4.0.0" + } + }, + "sass-loader": { + "version": "8.0.2", + "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-8.0.2.tgz", + "integrity": "sha512-7o4dbSK8/Ol2KflEmSco4jTjQoV988bM82P9CZdmo9hR3RLnvNc0ufMNdMrB0caq38JQ/FgF4/7RcbcfKzxoFQ==", + "dev": true, + "requires": { + "clone-deep": "^4.0.1", + "loader-utils": "^1.2.3", + "neo-async": "^2.6.1", + "schema-utils": "^2.6.1", + "semver": "^6.3.0" + }, + "dependencies": { + "semver": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", + "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "dev": true + } + } + }, "sax": { "version": "1.2.4", "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz", @@ -7938,6 +7979,15 @@ "safe-buffer": "^5.0.1" } }, + "shallow-clone": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-3.0.1.tgz", + "integrity": "sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==", + "dev": true, + "requires": { + "kind-of": "^6.0.2" + } + }, "shebang-command": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", diff --git a/package.json b/package.json index 2219d41..62d9b49 100644 --- a/package.json +++ b/package.json @@ -15,6 +15,8 @@ "laravel-mix": "^5.0.1", "lodash": "^4.17.19", "resolve-url-loader": "^3.1.0", + "sass": "^1.29.0", + "sass-loader": "^8.0.2", "vue-template-compiler": "^2.6.12" } } diff --git a/public/js/app.js b/public/js/app.js index e97cd49..b59d366 100644 --- a/public/js/app.js +++ b/public/js/app.js @@ -19377,14 +19377,35 @@ window.axios.defaults.headers.common['X-Requested-With'] = 'XMLHttpRequest'; /***/ }), +/***/ "./resources/js/reserve.js": +/*!*********************************!*\ + !*** ./resources/js/reserve.js ***! + \*********************************/ +/*! no static exports found */ +/***/ (function(module, exports) { + +jQuery('select#special-call').change(setCallDesc); +jQuery(document).ready(setCallDesc); + +function setCallDesc() { + sign = jQuery('select#special-call').first().val(); + jQuery.get('/special-calls/show/' + sign, function (data, status) { + jQuery('div#call-desc').html(data); + }); +} + +/***/ }), + /***/ 0: -/*!***********************************************************!*\ - !*** multi ./resources/js/app.js ./resources/css/app.css ***! - \***********************************************************/ +/*!*****************************************************************************************************************!*\ + !*** multi ./resources/js/app.js ./resources/js/bootstrap.js ./resources/js/reserve.js ./resources/css/app.css ***! + \*****************************************************************************************************************/ /*! no static exports found */ /***/ (function(module, exports, __webpack_require__) { __webpack_require__(/*! /srv/http/laravel.komp.com/resources/js/app.js */"./resources/js/app.js"); +__webpack_require__(/*! /srv/http/laravel.komp.com/resources/js/bootstrap.js */"./resources/js/bootstrap.js"); +__webpack_require__(/*! /srv/http/laravel.komp.com/resources/js/reserve.js */"./resources/js/reserve.js"); module.exports = __webpack_require__(/*! /srv/http/laravel.komp.com/resources/css/app.css */"./resources/css/app.css"); diff --git a/public/mix-manifest.json b/public/mix-manifest.json index 9c01802..2d60117 100644 --- a/public/mix-manifest.json +++ b/public/mix-manifest.json @@ -1,5 +1,4 @@ { "/js/app.js": "/js/app.js", - "/css/app.css": "/css/app.css", - "/js/reserve.js": "/js/reserve.js" + "/css/app.css": "/css/app.css" } diff --git a/webpack.mix.js b/webpack.mix.js index d789eae..24f767b 100644 --- a/webpack.mix.js +++ b/webpack.mix.js @@ -11,8 +11,9 @@ const mix = require('laravel-mix'); | */ -mix.js('resources/js/app.js', 'public/js') - .js('resources/js/reserve.js', 'public/js') +mix.js('resources/js/*.js', 'public/js') + //.sass('resources/sass/*.sass', 'public/css') + //.sass('resources/sass/*.scss', 'public/css') .postCss('resources/css/app.css', 'public/css', [ // ]); |