diff --git a/public/js/build/app.js b/public/js/build/app.js index ce8a36c152..ab75a0eb0a 100644 Binary files a/public/js/build/app.js and b/public/js/build/app.js differ diff --git a/public/js/build/vendor.js b/public/js/build/vendor.js index b208e62a17..e0c404f6bb 100644 Binary files a/public/js/build/vendor.js and b/public/js/build/vendor.js differ diff --git a/public/js/dist/all.js b/public/js/dist/all.js index 8cacc010a8..11eddf86e7 100644 Binary files a/public/js/dist/all.js and b/public/js/dist/all.js differ diff --git a/public/mix-manifest.json b/public/mix-manifest.json index 6b765636e4..bcf7b0438d 100644 --- a/public/mix-manifest.json +++ b/public/mix-manifest.json @@ -1,5 +1,5 @@ { - "/js/build/app.js": "/js/build/app.js?id=a8ab86a7bec4988cd99d", + "/js/build/app.js": "/js/build/app.js?id=040538f479884513ec7c", "/css/dist/skins/skin-blue.css": "/css/dist/skins/skin-blue.css?id=83e39e254b7f9035eddc", "/css/build/overrides.css": "/css/build/overrides.css?id=b9b59d80509972c3b16a", "/css/build/app.css": "/css/build/app.css?id=1da91ae0ff24d10b7207", @@ -24,9 +24,9 @@ "/css/dist/signature-pad.css": "/css/dist/signature-pad.css?id=6a89d3cd901305e66ced", "/css/dist/signature-pad.min.css": "/css/dist/signature-pad.min.css?id=6a89d3cd901305e66ced", "/css/dist/bootstrap-table.css": "/css/dist/bootstrap-table.css?id=93c24b4c89490bbfd73e", - "/js/build/vendor.js": "/js/build/vendor.js?id=b93877b4a88a76e1b18b", + "/js/build/vendor.js": "/js/build/vendor.js?id=651427cc4b45d8e68d0c", "/js/dist/bootstrap-table.js": "/js/dist/bootstrap-table.js?id=5bbc20d77c1456cfc2ef", - "/js/dist/all.js": "/js/dist/all.js?id=96b6dd9441d8c6c98369", + "/js/dist/all.js": "/js/dist/all.js?id=ae6dedae06d52fe6a798", "/css/dist/skins/skin-green.min.css": "/css/dist/skins/skin-green.min.css?id=efda2335fa5243175850", "/css/dist/skins/skin-green-dark.min.css": "/css/dist/skins/skin-green-dark.min.css?id=76cd718f22d841ba3632", "/css/dist/skins/skin-black.min.css": "/css/dist/skins/skin-black.min.css?id=ec96c42439cdeb022133", diff --git a/resources/assets/js/bootstrap.js b/resources/assets/js/bootstrap.js index 2ace75a6dd..f86b701f10 100755 --- a/resources/assets/js/bootstrap.js +++ b/resources/assets/js/bootstrap.js @@ -6,7 +6,7 @@ window._ = require('lodash'); * for JavaScript based Bootstrap features such as modals and tabs. This * code may be modified to fit the specific needs of your application. */ -window.$ = window.jQuery = require('jquery'); +//window.$ = window.jQuery = require('jquery'); /** * jQuery UI is loaded here and then the tooltip is assigned another funtion name @@ -26,7 +26,7 @@ require('bootstrap-less'); * and simple, leaving you to focus on building your next great project. */ -window.Vue = require('vue'); +window.Vue = require('vue').default; window.eventHub = new Vue(); require('vue-resource'); @@ -42,6 +42,11 @@ Vue.http.interceptors.push(function (request, next) { next(); }); +// require('admin-lte'); + +// require('chart.js'); + +// require('jquery-form-validator'); //says something about dependency /** * Echo exposes an expressive API for subscribing to channels and listening * for events that are broadcast by Laravel. Echo and event broadcasting diff --git a/resources/assets/js/components/select2.vue b/resources/assets/js/components/select2.vue index 16e01ccb0b..7b679800e9 100644 --- a/resources/assets/js/components/select2.vue +++ b/resources/assets/js/components/select2.vue @@ -12,7 +12,7 @@ + @routes('vue_routes') diff --git a/routes/api.php b/routes/api.php index ca663c09b5..6d7083999d 100644 --- a/routes/api.php +++ b/routes/api.php @@ -980,14 +980,14 @@ Route::group(['prefix' => 'v1', 'middleware' => 'api'], function () { ] )->name('api.kits.models.store'); - Route::put('models/{model_id', + Route::put('models/{model_id}', [ Api\PredefinedKitsController::class, 'updateModels' ] )->name('api.kits.models.update'); - Route::delete('models/{model_id', + Route::delete('models/{model_id}', [ Api\PredefinedKitsController::class, 'detachModels' diff --git a/routes/web/hardware.php b/routes/web/hardware.php index 2cc9bde3b3..363f6fcd00 100644 --- a/routes/web/hardware.php +++ b/routes/web/hardware.php @@ -16,172 +16,132 @@ Route::group( ['prefix' => 'hardware', 'middleware' => ['auth'], ], function () { - Route::get('bulkaudit', [ - 'as' => 'assets.bulkaudit', - 'uses' => [Assets\AssetsController::class, 'quickScan'], - ]); + Route::get('bulkaudit', + [Assets\AssetsController::class, 'quickScan'] + )->name('assets.bulkaudit'); // Asset Maintenances Route::resource('maintenances', AssetMaintenancesController::class, [ 'parameters' => ['maintenance' => 'maintenance_id', 'asset' => 'asset_id'], ]); - Route::get('requested', ['as' => 'assets.requested', 'uses' => [Assets\AssetsController::class, 'getRequestedIndex']]); + Route::get('requested', [Assets\AssetsController::class, 'getRequestedIndex'])->name('assets.requested'); - Route::get('scan', [ - 'as' => 'asset.scan', - 'uses' => [Assets\AssetsController::class, 'scan'], - ]); + Route::get('scan', + [Assets\AssetsController::class, 'scan'] + )->name('asset.scan'); - Route::get('audit/due', [ - 'as' => 'assets.audit.due', - 'uses' => [Assets\AssetsController::class, 'dueForAudit'], - ]); + Route::get('audit/due', + [Assets\AssetsController::class, 'dueForAudit'] + )->name('assets.audit.due'); - Route::get('audit/overdue', [ - 'as' => 'assets.audit.overdue', - 'uses' => [Assets\AssetsController::class, 'overdueForAudit'], - ]); + Route::get('audit/overdue', + [Assets\AssetsController::class, 'overdueForAudit'] + )->name('assets.audit.overdue'); - Route::get('audit/due', [ - 'as' => 'assets.audit.due', - 'uses' => [Assets\AssetsController::class, 'dueForAudit'], - ]); + Route::get('audit/due', + [Assets\AssetsController::class, 'dueForAudit'] + )->name('assets.audit.due'); - Route::get('audit/overdue', [ - 'as' => 'assets.audit.overdue', - 'uses' => [Assets\AssetsController::class, 'overdueForAudit'], - ]); + Route::get('audit/overdue', + [Assets\AssetsController::class, 'overdueForAudit'] + )->name('assets.audit.overdue'); - Route::get('audit/due', [ - 'as' => 'assets.audit.due', - 'uses' => [Assets\AssetsController::class, 'dueForAudit'], - ]); + Route::get('audit/due', + [Assets\AssetsController::class, 'dueForAudit'] + )->name('assets.audit.due'); - Route::get('audit/overdue', [ - 'as' => 'assets.audit.overdue', - 'uses' => [Assets\AssetsController::class, 'overdueForAudit'], - ]); + Route::get('audit/overdue', + [Assets\AssetsController::class, 'overdueForAudit'] + )->name('assets.audit.overdue'); - Route::get('audit/{id}', [ - 'as' => 'asset.audit.create', - 'uses' => [Assets\AssetsController::class, 'audit'], - ]); + Route::get('audit/{id}', + [Assets\AssetsController::class, 'audit'] + )->name('asset.audit.create'); - Route::post('audit/{id}', [ - 'as' => 'asset.audit.store', - 'uses' => [Assets\AssetsController::class, 'auditStore'], - ]); + Route::post('audit/{id}', + [Assets\AssetsController::class, 'auditStore'] + )->name('asset.audit.store'); - Route::get('history', [ - 'as' => 'asset.import-history', - 'uses' => [Assets\AssetsController::class, 'getImportHistory'], - ]); + Route::get('history', + [Assets\AssetsController::class, 'getImportHistory'] + )->name('asset.import-history'); - Route::post('history', [ - 'as' => 'asset.process-import-history', - 'uses' => [Assets\AssetsController::class, 'postImportHistory'], - ]); + Route::post('history', + [Assets\AssetsController::class, 'postImportHistory'] + )->name('asset.process-import-history'); Route::get('bytag/{any?}', - [ - 'as' => 'findbytag/hardware', - 'uses' => [Assets\AssetsController::class, 'getAssetByTag'], - ] - )->where('any', '.*'); + [Assets\AssetsController::class, 'getAssetByTag'] + )->where('any', '.*')->name('findbytag/hardware'); Route::get('byserial/{any?}', - [ - 'as' => 'findbyserial/hardware', - 'uses' => [Assets\AssetsController::class, 'getAssetBySerial'], - ] - )->where('any', '.*'); + [Assets\AssetsController::class, 'getAssetBySerial'] + )->where('any', '.*')->name('findbyserial/hardware'); - Route::get('{assetId}/clone', [ - 'as' => 'clone/hardware', - 'uses' => [Assets\AssetsController::class, 'getClone'], - ]); + Route::get('{assetId}/clone', + [Assets\AssetsController::class, 'getClone'] + )->name('clone/hardware'); - Route::get('{assetId}/label', [ - 'as' => 'label/hardware', - 'uses' => [Assets\AssetsController::class, 'getLabel'], - ]); + Route::get('{assetId}/label', + [Assets\AssetsController::class, 'getLabel'] + )->name('label/hardware'); Route::post('{assetId}/clone', [Assets\AssetsController::class, 'postCreate']); - Route::get('{assetId}/checkout', [ - 'as' => 'checkout/hardware', - 'uses' => [Assets\AssetCheckoutController::class, 'create'], - ]); - Route::post('{assetId}/checkout', [ - 'as' => 'checkout/hardware', - 'uses' => [Assets\AssetCheckoutController::class, 'store'], - ]); - Route::get('{assetId}/checkin/{backto?}', [ - 'as' => 'checkin/hardware', - 'uses' => [Assets\AssetCheckinController::class, 'create'], - ]); + Route::get('{assetId}/checkout', + [Assets\AssetCheckoutController::class, 'create'] + )->name('checkout/hardware'); + Route::post('{assetId}/checkout', + [Assets\AssetCheckoutController::class, 'store'] + )->name('checkout/hardware'); + Route::get('{assetId}/checkin/{backto?}', + [Assets\AssetCheckinController::class, 'create'] + )->name('checkin/hardware'); - Route::post('{assetId}/checkin/{backto?}', [ - 'as' => 'checkin/hardware', - 'uses' => [Assets\AssetCheckinController::class, 'store'], - ]); - Route::get('{assetId}/view', [ - 'as' => 'hardware.view', - 'uses' => [Assets\AssetsController::class, 'show'], - ]); - Route::get('{assetId}/qr_code', ['as' => 'qr_code/hardware', 'uses' => [Assets\AssetsController::class, 'getQrCode']]); - Route::get('{assetId}/barcode', ['as' => 'barcode/hardware', 'uses' => [Assets\AssetsController::class, 'getBarCode']]); - Route::get('{assetId}/restore', [ - 'as' => 'restore/hardware', - 'uses' => [Assets\AssetsController::class, 'getRestore'], - ]); - Route::post('{assetId}/upload', [ - 'as' => 'upload/asset', - 'uses' => [Assets\AssetFilesController::class, 'store'], - ]); + Route::post('{assetId}/checkin/{backto?}', + [Assets\AssetCheckinController::class, 'store'] + )->name('checkin/hardware'); + Route::get('{assetId}/view', + [Assets\AssetsController::class, 'show'] + )->name('hardware.view'); + Route::get('{assetId}/qr_code', [Assets\AssetsController::class, 'getQrCode'])->name('qr_code/hardware'); + Route::get('{assetId}/barcode', [Assets\AssetsController::class, 'getBarCode'])->name('barcode/hardware'); + Route::get('{assetId}/restore', + [Assets\AssetsController::class, 'getRestore'] + )->name('restore/hardware'); + Route::post('{assetId}/upload', + [Assets\AssetFilesController::class, 'store'] + )->name('upload/asset'); - Route::get('{assetId}/showfile/{fileId}/{download?}', [ - 'as' => 'show/assetfile', - 'uses' => [Assets\AssetFilesController::class, 'show'], - ]); + Route::get('{assetId}/showfile/{fileId}/{download?}', + [Assets\AssetFilesController::class, 'show'] + )->name('show/assetfile'); - Route::delete('{assetId}/showfile/{fileId}/delete', [ - 'as' => 'delete/assetfile', - 'uses' => [Assets\AssetFilesController::class, 'destroy'], - ]); + Route::delete('{assetId}/showfile/{fileId}/delete', + [Assets\AssetFilesController::class, 'destroy'] + )->name('delete/assetfile'); Route::post( 'bulkedit', - [ - 'as' => 'hardware/bulkedit', - 'uses' => [Assets\BulkAssetsController::class, 'edit'], - ] - ); + [Assets\BulkAssetsController::class, 'edit'] + )->name('hardware/bulkedit'); Route::post( 'bulkdelete', - [ - 'as' => 'hardware/bulkdelete', - 'uses' => [Assets\BulkAssetsController::class, 'destroy'], - ] - ); + [Assets\BulkAssetsController::class, 'destroy'] + )->name('hardware/bulkdelete'); Route::post( 'bulksave', - [ - 'as' => 'hardware/bulksave', - 'uses' => [Assets\BulkAssetsController::class, 'update'], - ] - ); + [Assets\BulkAssetsController::class, 'update'] + )->name('hardware/bulksave'); // Bulk checkout / checkin - Route::get('bulkcheckout', [ - 'as' => 'hardware/bulkcheckout', - 'uses' => [Assets\BulkAssetsController::class, 'showCheckout'], - ]); - Route::post('bulkcheckout', [ - 'as' => 'hardware/bulkcheckout', - 'uses' => [Assets\BulkAssetsController::class, 'storeCheckout'], - ]); + Route::get('bulkcheckout', + [Assets\BulkAssetsController::class, 'showCheckout'] + )->name('hardware/bulkcheckout'); + Route::post('bulkcheckout', + [Assets\BulkAssetsController::class, 'storeCheckout'] + )->name('hardware/bulkcheckout'); }); Route::resource('hardware', Assets\AssetsController::class, [ diff --git a/routes/web/kits.php b/routes/web/kits.php index 53f3d29ae5..6b687f0bff 100644 --- a/routes/web/kits.php +++ b/routes/web/kits.php @@ -12,124 +12,69 @@ Route::resource('kits', Kits\PredefinedKitsController::class, [ Route::group(['prefix' => 'kits/{kit_id}', 'middleware' => ['auth']], function () { // Route::get('licenses', - // [ - // 'as' => 'kits.licenses.index', - // 'uses' => [Kits\PredefinedKitsController::class, 'indexLicenses'], - // ] - // ); + // [Kits\PredefinedKitsController::class, 'indexLicenses'] + // )->name('kits.licenses.index'); Route::post('licenses', - [ - 'as' => 'kits.licenses.store', - 'uses' => [Kits\PredefinedKitsController::class, 'storeLicense'], - ] - ); + [Kits\PredefinedKitsController::class, 'storeLicense'] + )->name('kits.licenses.store'); Route::put('licenses/{license_id}', - [ - 'as' => 'kits.licenses.update', - 'uses' => [Kits\PredefinedKitsController::class, 'updateLicense'], - ] - ); + [Kits\PredefinedKitsController::class, 'updateLicense'] + )->name('kits.licenses.update'); Route::get('licenses/{license_id}/edit', - [ - 'as' => 'kits.licenses.edit', - 'uses' => [Kits\PredefinedKitsController::class, 'editLicense'], - - ] - ); + [Kits\PredefinedKitsController::class, 'editLicense'] + )->name('kits.licenses.edit'); Route::delete('licenses/{license_id}', - [ - 'as' => 'kits.licenses.detach', - 'uses' => [Kits\PredefinedKitsController::class, 'detachLicense'], - ] - ); + [Kits\PredefinedKitsController::class, 'detachLicense'] + )->name('kits.licenses.detach'); // Models Route::put('models/{model_id}', - [ - 'as' => 'kits.models.update', - 'uses' => [Kits\PredefinedKitsController::class, 'updateModel'], - 'parameters' => [2 => 'kit_id', 1 => 'model_id'], - ] - ); + [Kits\PredefinedKitsController::class, 'updateModel'] + )/* ->parameters([2 => 'kit_id', 1 => 'model_id'])*/->name('kits.models.update'); Route::get('models/{model_id}/edit', - [ - 'as' => 'kits.models.edit', - 'uses' => [Kits\PredefinedKitsController::class, 'editModel'], - - ] - ); + [Kits\PredefinedKitsController::class, 'editModel'] + )->name('kits.models.edit'); Route::delete('models/{model_id}', - [ - 'as' => 'kits.models.detach', - 'uses' => [Kits\PredefinedKitsController::class, 'detachModel'], - ] - ); + [Kits\PredefinedKitsController::class, 'detachModel'] + )->name('kits.models.detach'); // Consumables Route::put('consumables/{consumable_id}', - [ - 'as' => 'kits.consumables.update', - 'uses' => [Kits\PredefinedKitsController::class, 'updateConsumable'], - 'parameters' => [2 => 'kit_id', 1 => 'consumable_id'], - ] - ); + [Kits\PredefinedKitsController::class, 'updateConsumable'] + )/*->parameters([2 => 'kit_id', 1 => 'consumable_id'])*/->name('kits.consumables.update'); Route::get('consumables/{consumable_id}/edit', - [ - 'as' => 'kits.consumables.edit', - 'uses' => [Kits\PredefinedKitsController::class, 'editConsumable'], - - ] - ); + [Kits\PredefinedKitsController::class, 'editConsumable'] + )->name('kits.consumables.edit'); Route::delete('consumables/{consumable_id}', - [ - 'as' => 'kits.consumables.detach', - 'uses' => [Kits\PredefinedKitsController::class, 'detachConsumable'], - ] - ); + [Kits\PredefinedKitsController::class, 'detachConsumable'] + )->name('kits.consumables.detach'); // Accessories Route::put('accessories/{accessory_id}', - [ - 'as' => 'kits.accessories.update', - 'uses' => [Kits\PredefinedKitsController::class, 'updateAccessory'], - 'parameters' => [2 => 'kit_id', 1 => 'accessory_id'], - ] - ); + [Kits\PredefinedKitsController::class, 'updateAccessory'] + )/*->parameters([2 => 'kit_id', 1 => 'accessory_id'])*/->name('kits.accessories.update'); Route::get('accessories/{accessory_id}/edit', - [ - 'as' => 'kits.accessories.edit', - 'uses' => [Kits\PredefinedKitsController::class, 'editAccessory'], - - ] - ); + [Kits\PredefinedKitsController::class, 'editAccessory'] + )->name('kits.accessories.edit'); Route::delete('accessories/{accessory_id}', - [ - 'as' => 'kits.accessories.detach', - 'uses' => [Kits\PredefinedKitsController::class, 'detachAccessory'], - ] - ); + [Kits\PredefinedKitsController::class, 'detachAccessory'] + )->name('kits.accessories.detach'); Route::get('checkout', - [ - 'as' => 'kits.checkout.show', - 'uses' => [Kits\CheckoutKitController::class, 'showCheckout'], - ] - ); + [Kits\CheckoutKitController::class, 'showCheckout'] + )->name('kits.checkout.show'); Route::post('checkout', - [ - 'as' => 'kits.checkout.store', - 'uses' => [Kits\CheckoutKitController::class, 'store'], - ] - ); + [Kits\CheckoutKitController::class, 'store'] + )->name('kits.checkout.store'); }); // kits diff --git a/routes/web/licenses.php b/routes/web/licenses.php index a7a03b710f..ebcb5a2b2b 100644 --- a/routes/web/licenses.php +++ b/routes/web/licenses.php @@ -5,42 +5,38 @@ use Illuminate\Support\Facades\Route; // Licenses Route::group(['prefix' => 'licenses', 'middleware' => ['auth']], function () { - Route::get('{licenseId}/clone', ['as' => 'clone/license', 'uses' => [Licenses\LicensesController::class, 'getClone']]); + Route::get('{licenseId}/clone', [Licenses\LicensesController::class, 'getClone'])->name('clone/license'); - Route::get('{licenseId}/freecheckout', [ - 'as' => 'licenses.freecheckout', - 'uses' => [Licenses\LicensesController::class, 'getFreeLicense'], - ]); - Route::get('{licenseId}/checkout/{seatId?}', [ - 'as' => 'licenses.checkout', - 'uses' => [Licenses\LicenseCheckoutController::class, 'create'], - ]); + Route::get('{licenseId}/freecheckout', + [Licenses\LicensesController::class, 'getFreeLicense'] + )->name('licenses.freecheckout'); + Route::get('{licenseId}/checkout/{seatId?}', + [Licenses\LicenseCheckoutController::class, 'create'] + )->name('licenses.checkout'); Route::post( '{licenseId}/checkout/{seatId?}', - ['as' => 'licenses.checkout', 'uses' => [Licenses\LicenseCheckoutController::class, 'store']] - ); - Route::get('{licenseSeatId}/checkin/{backto?}', [ - 'as' => 'licenses.checkin', - 'uses' => [Licenses\LicenseCheckinController::class, 'create'], - ]); + [Licenses\LicenseCheckoutController::class, 'store'] + ); //name() would duplicate here, so we skip it. + Route::get('{licenseSeatId}/checkin/{backto?}', + [Licenses\LicenseCheckinController::class, 'create'] + )->name('licenses.checkin'); - Route::post('{licenseId}/checkin/{backto?}', [ - 'as' => 'licenses.checkin.save', - 'uses' => [Licenses\LicenseCheckinController::class, 'store'], - ]); + Route::post('{licenseId}/checkin/{backto?}', + [Licenses\LicenseCheckinController::class, 'store'] + )->name('licenses.checkin.save'); Route::post( '{licenseId}/upload', - ['as' => 'upload/license', 'uses' => [Licenses\LicenseFilesController::class, 'store']] - ); + [Licenses\LicenseFilesController::class, 'store'] + )->name('upload/license'); Route::delete( '{licenseId}/deletefile/{fileId}', - ['as' => 'delete/licensefile', 'uses' => [Licenses\LicenseFilesController::class, 'destroy']] - ); + [Licenses\LicenseFilesController::class, 'destroy'] + )->name('delete/licensefile'); Route::get( '{licenseId}/showfile/{fileId}/{download?}', - ['as' => 'show.licensefile', 'uses' => [Licenses\LicenseFilesController::class, 'show']] - ); + [Licenses\LicenseFilesController::class, 'show'] + )->name('show.licensefile'); }); Route::resource('licenses', Licenses\LicensesController::class, [ diff --git a/webpack.mix.js b/webpack.mix.js index 04ebfb3ce5..a52acfe70d 100644 --- a/webpack.mix.js +++ b/webpack.mix.js @@ -48,11 +48,11 @@ mix // Combine main SnipeIT JS files mix.js( [ - './resources/assets/js/vue.js', + './resources/assets/js/vue.js', // require()s vue, and require()s bootstrap.js './resources/assets/js/snipeit.js', //this is the actual Snipe-IT JS './resources/assets/js/snipeit_modals.js' ], - './public/js/build/app.js' + './public/js/build/app.js' //because of compiling - this does not work very well :( ).vue(); // Convert the skins to CSS @@ -91,7 +91,9 @@ mix.combine( */ mix .combine( - [ + [ // lots of node_modules here - should this be subsumed by require()? + './node_modules/jquery/dist/jquery.js', + './node_modules/select2/dist/js/select2.full.min.js', './node_modules/admin-lte/dist/js/adminlte.min.js', './node_modules/tether/dist/js/tether.js', './node_modules/jquery-ui-bundle/jquery-ui.js', @@ -101,14 +103,14 @@ mix './node_modules/bootstrap-colorpicker/dist/js/bootstrap-colorpicker.js', './node_modules/bootstrap-datepicker/dist/js/bootstrap-datepicker.js', './node_modules/ekko-lightbox/dist/ekko-lightbox.js', - './node_modules/icheck/icheck.js', + './node_modules/icheck/icheck.js', //definite problem here :( './resources/assets/js/extensions/pGenerator.jquery.js', './node_modules/chart.js/dist/Chart.js', './resources/assets/js/signature_pad.js', - './node_modules/jquery-form-validator/form-validator/jquery.form-validator.js', + './node_modules/jquery-form-validator/form-validator/jquery.form-validator.js', //problem? './node_modules/list.js/dist/list.js' ], - 'public/js/build/vendor.js' + 'public/js/build/vendor.js' // this file seems OK! ); @@ -138,9 +140,8 @@ mix mix.combine( [ - './public/js/build/app.js', - './public/js/build/vendor.js' - + './public/js/build/vendor.js', + './public/js/build/app.js' ], './public/js/dist/all.js' ).version();