mirror of
https://github.com/snipe/snipe-it.git
synced 2024-12-25 13:44:06 -08:00
f16ce09a7a
* If a user id is provided in the name column of an import, we should assume that it is a user id and check out to it. * Fix build of vue files. The location is public/js/build, not public/build * Ensure a status type is set before allowing submission of an import. Also expand the status text label to change color based on success/failure. Fixes #4658 * Use right key to lookup emails when importing users. Fixes 4619. * Import serial for components, and make unique matches based on the serial as well as the name. Fixes #4569 * Set the location_id when importing an item properly. This moves as well to using the Asset::checkout() method, which should consolidate the logic into a useful spot. Fixes #4563 (I think) * Production assets. * Case insensitive field map guessing and repopulate when changingin import type.
56 lines
2.1 KiB
JavaScript
56 lines
2.1 KiB
JavaScript
|
|
const { mix } = require('laravel-mix');
|
|
|
|
|
|
// This generates a file called app.css, which we use
|
|
// later on to build all.css
|
|
mix
|
|
.options(
|
|
{
|
|
processCssUrls: false,
|
|
processFontUrls: true,
|
|
clearConsole: false
|
|
})
|
|
.less('resources/assets/less/AdminLTE.less', 'css')
|
|
.less('resources/assets/less/app.less', 'css')
|
|
.less('resources/assets/less/overrides.less', 'css')
|
|
.styles([
|
|
'./resources/assets/css/app.css',
|
|
'public/css/AdminLTE.css',
|
|
'resources/assets/css/font-awesome/font-awesome.min.css',
|
|
'./node_modules/icheck/skins/minimal/minimal.css',
|
|
'./node_modules/bootstrap-datepicker/dist/css/bootstrap-datepicker.standalone.css',
|
|
'public/css/bootstrap-tables-sticky-header.css',
|
|
'public/css/overrides.css'
|
|
],
|
|
'./public/css/dist/all.css')
|
|
|
|
// jQuery is loaded from vue.js webpack process
|
|
// This compiles the vue.js file in the build directory
|
|
// for later concatenation in the scripts() section below.
|
|
.js(
|
|
|
|
'resources/assets/js/vue.js', // Snipe-IT's initializer for Vue.js
|
|
'./public/js/build'
|
|
).sourceMaps()
|
|
.scripts([
|
|
'./node_modules/jquery-ui/jquery-ui.js',
|
|
'./public/js/build/vue.js', //this is the modularized nifty Vue.js thing we just built, above!
|
|
'./node_modules/tether/dist/js/tether.min.js',
|
|
'./node_modules/jquery-slimscroll/jquery.slimscroll.js',
|
|
'./node_modules/jquery.iframe-transport/jquery.iframe-transport.js',
|
|
'./node_modules/blueimp-file-upload/js/jquery.fileupload.js',
|
|
'./node_modules/bootstrap-colorpicker/dist/js/bootstrap-colorpicker.js',
|
|
'./node_modules/bootstrap-datepicker/dist/js/bootstrap-datepicker.js',
|
|
'./node_modules/icheck/icheck.js',
|
|
'./node_modules/ekko-lightbox/dist/ekko-lightbox.js',
|
|
'./resources/assets/js/app.js', //this is part of AdminLTE
|
|
'./resources/assets/js/snipeit.js', //this is the actual Snipe-IT JS
|
|
'./resources/assets/js/snipeit_modals.js'
|
|
],
|
|
'./public/js/dist/all.js');
|
|
|
|
mix.copy('./public/css/dist/all.css', './public/css/build/all.css').copy('./public/js/dist/all.js', './public/js/build/all.js');
|
|
|
|
mix.version();
|