Merge branch 'V5_cleanup_js' of https://github.com/jwhulette/snipe-it into jwhulette-V5_cleanup_js

# Conflicts:
#	public/mix-manifest.json
This commit is contained in:
snipe 2018-10-03 00:56:09 -07:00
commit 90b8acdd3b
924 changed files with 1034 additions and 107092 deletions

58
npm-shrinkwrap.json generated
View file

@ -167,6 +167,13 @@
"raphael": "^2.2.7", "raphael": "^2.2.7",
"select2": "^4.0.3", "select2": "^4.0.3",
"slimscroll": "^0.9.1" "slimscroll": "^0.9.1"
},
"dependencies": {
"chart.js": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/chart.js/-/chart.js-1.0.2.tgz",
"integrity": "sha1-rVfSIpz9jM9ZVRR+gSG0kR5p3+c="
}
} }
}, },
"ajv": { "ajv": {
@ -1967,9 +1974,37 @@
"integrity": "sha1-BsIe7RobBq62dVPNxT4jJ0usIpY=" "integrity": "sha1-BsIe7RobBq62dVPNxT4jJ0usIpY="
}, },
"chart.js": { "chart.js": {
"version": "1.0.2", "version": "2.7.2",
"resolved": "https://registry.npmjs.org/chart.js/-/chart.js-1.0.2.tgz", "resolved": "https://registry.npmjs.org/chart.js/-/chart.js-2.7.2.tgz",
"integrity": "sha1-rVfSIpz9jM9ZVRR+gSG0kR5p3+c=" "integrity": "sha512-90wl3V9xRZ8tnMvMlpcW+0Yg13BelsGS9P9t0ClaDxv/hdypHDr/YAGf+728m11P5ljwyB0ZHfPKCapZFqSqYA==",
"requires": {
"chartjs-color": "^2.1.0",
"moment": "^2.10.2"
}
},
"chartjs-color": {
"version": "2.2.0",
"resolved": "https://registry.npmjs.org/chartjs-color/-/chartjs-color-2.2.0.tgz",
"integrity": "sha1-hKL7dVeH7YXDndbdjHsdiEKbrq4=",
"requires": {
"chartjs-color-string": "^0.5.0",
"color-convert": "^0.5.3"
},
"dependencies": {
"color-convert": {
"version": "0.5.3",
"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-0.5.3.tgz",
"integrity": "sha1-vbbGnOZg+t/+CwAHzER+G59ygr0="
}
}
},
"chartjs-color-string": {
"version": "0.5.0",
"resolved": "https://registry.npmjs.org/chartjs-color-string/-/chartjs-color-string-0.5.0.tgz",
"integrity": "sha512-amWNvCOXlOUYxZVDSa0YOab5K/lmEhbFNKI55PWc4mlv28BDzA7zaoQTGxSBgJMHIW+hGX8YUrvw/FH4LyhwSQ==",
"requires": {
"color-name": "^1.0.0"
}
}, },
"chokidar": { "chokidar": {
"version": "2.0.4", "version": "2.0.4",
@ -2201,8 +2236,7 @@
"color-name": { "color-name": {
"version": "1.1.3", "version": "1.1.3",
"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
"integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=", "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU="
"dev": true
}, },
"color-string": { "color-string": {
"version": "0.3.0", "version": "0.3.0",
@ -5778,10 +5812,10 @@
"resolved": "https://registry.npmjs.org/jquery-ui/-/jquery-ui-1.12.1.tgz", "resolved": "https://registry.npmjs.org/jquery-ui/-/jquery-ui-1.12.1.tgz",
"integrity": "sha1-vLQEXI3QU5wTS8FIjN0+dop6nlE=" "integrity": "sha1-vLQEXI3QU5wTS8FIjN0+dop6nlE="
}, },
"jquery-ui-bundle": { "jquery-ui-dist": {
"version": "1.12.1", "version": "1.12.1",
"resolved": "https://registry.npmjs.org/jquery-ui-bundle/-/jquery-ui-bundle-1.12.1.tgz", "resolved": "https://registry.npmjs.org/jquery-ui-dist/-/jquery-ui-dist-1.12.1.tgz",
"integrity": "sha1-1r4uTDd0lOI3ixyuKSCpHRGC2MQ=" "integrity": "sha1-XAgV08xvkP9fqvWyaKbiO0ypBPo="
}, },
"jquery.iframe-transport": { "jquery.iframe-transport": {
"version": "1.0.0", "version": "1.0.0",
@ -10455,18 +10489,16 @@
"resolved": "https://registry.npmjs.org/jspdf/-/jspdf-1.3.4.tgz", "resolved": "https://registry.npmjs.org/jspdf/-/jspdf-1.3.4.tgz",
"integrity": "sha1-j0uu3Rj1wkYPAQdijHiYxgarKW8=", "integrity": "sha1-j0uu3Rj1wkYPAQdijHiYxgarKW8=",
"requires": { "requires": {
"adler32cs": "github:chick307/adler32cs.js#7fd00ffa24bf173a1eeb987ce7a21ae214eff658", "cf-blob.js": "0.0.1"
"cf-blob.js": "0.0.1",
"filesaver.js": "github:andyinabox/FileSaver.js#973b433b8fbaee9a11d53b9ae423b046742cfe32"
}, },
"dependencies": { "dependencies": {
"adler32cs": { "adler32cs": {
"version": "github:chick307/adler32cs.js#7fd00ffa24bf173a1eeb987ce7a21ae214eff658", "version": "github:chick307/adler32cs.js#7fd00ffa24bf173a1eeb987ce7a21ae214eff658",
"from": "github:chick307/adler32cs.js" "from": "github:chick307/adler32cs.js#7fd00ffa24bf173a1eeb987ce7a21ae214eff658"
}, },
"filesaver.js": { "filesaver.js": {
"version": "github:andyinabox/FileSaver.js#973b433b8fbaee9a11d53b9ae423b046742cfe32", "version": "github:andyinabox/FileSaver.js#973b433b8fbaee9a11d53b9ae423b046742cfe32",
"from": "github:andyinabox/FileSaver.js" "from": "github:andyinabox/FileSaver.js#973b433b8fbaee9a11d53b9ae423b046742cfe32"
} }
} }
}, },

View file

@ -30,13 +30,14 @@
"bootstrap-datepicker": "^1.6.4", "bootstrap-datepicker": "^1.6.4",
"bootstrap-less": "^3.3.8", "bootstrap-less": "^3.3.8",
"bootstrap-table": "^1.12.1", "bootstrap-table": "^1.12.1",
"chart.js": "^2.7.2",
"ekko-lightbox": "^5.1.1", "ekko-lightbox": "^5.1.1",
"font-awesome": "^4.7.0", "font-awesome": "^4.7.0",
"icheck": "^1.0.2", "icheck": "^1.0.2",
"imagemin": "^5.3.1", "imagemin": "^5.3.1",
"jquery-slimscroll": "^1.3.8", "jquery-slimscroll": "^1.3.8",
"jquery-ui": "^1.12.1", "jquery-ui": "^1.12.1",
"jquery-ui-bundle": "^1.12.1", "jquery-ui-dist": "^1.12.1",
"jquery.iframe-transport": "^1.0.0", "jquery.iframe-transport": "^1.0.0",
"less": "less/less.js#efa6eb5306f28a7ef7e235d79ce854b780345591", "less": "less/less.js#efa6eb5306f28a7ef7e235d79ce854b780345591",
"less-loader": "^4.1.0", "less-loader": "^4.1.0",

BIN
public/css/AdminLTE.css Executable file

Binary file not shown.

Binary file not shown.

Binary file not shown.

BIN
public/css/build/all.css Normal file

Binary file not shown.

Binary file not shown.

BIN
public/css/dist/all.css vendored Normal file

Binary file not shown.

BIN
public/css/overrides.css Normal file

Binary file not shown.

BIN
public/js/app.js Executable file → Normal file

Binary file not shown.

BIN
public/js/app.min.js vendored

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Before

Width:  |  Height:  |  Size: 106 KiB

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

BIN
public/js/jquery.js vendored

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.6 KiB

Some files were not shown because too many files have changed in this diff Show more