FGFS-4.1/phpvms
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

split out some more vendor files

Browse Source
This commit is contained in:
Nabeel Shahzad
2018-03-28 15:51:44 -05:00
parent e366ca9375
commit d5452d6517
8 changed files with 43577 additions and 11421 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/assets/admin/css/vendor.css
+17071
View File
File diff suppressed because it is too large Load Diff
public/assets/admin/css/vendor.min.css
Vendored
-11394
View File
File diff suppressed because it is too large Load Diff
public/assets/admin/js/vendor.js
+10365
View File
File diff suppressed because it is too large Load Diff
public/assets/global/css/vendor.min.css → public/assets/global/css/vendor.css
View File
public/assets/global/js/vendor.js
+16111
View File
File diff suppressed because it is too large Load Diff
public/mix-manifest.json
+5 -3
View File
@@ -1,7 +1,7 @@
{ {
"/assets/frontend/js/app.js": "/assets/frontend/js/app.js?id=c68b32cdf6937b6d6a09", "/assets/frontend/js/app.js": "/assets/frontend/js/app.js?id=c68b32cdf6937b6d6a09",
"/assets/frontend/css/now-ui-kit.css": "/assets/frontend/css/now-ui-kit.css?id=9923ce002ceafb1d740a", "/assets/frontend/css/now-ui-kit.css": "/assets/frontend/css/now-ui-kit.css?id=9923ce002ceafb1d740a",
"/assets/admin/css/vendor.min.css": "/assets/admin/css/vendor.min.css?id=ac649243125fb9e514d8", "/assets/admin/css/vendor.min.css": "/assets/admin/css/vendor.min.css?id=a11d81c6bf8d7a548c86",
"/assets/admin/js/app.js": "/assets/admin/js/app.js?id=f0006478ac51c2e18b2d", "/assets/admin/js/app.js": "/assets/admin/js/app.js?id=f0006478ac51c2e18b2d",
"/assets/installer/js/app.js": "/assets/installer/js/app.js?id=c5ba68cfc5d16171a9b5", "/assets/installer/js/app.js": "/assets/installer/js/app.js?id=c5ba68cfc5d16171a9b5",
"/assets/fonts/glyphicons-halflings-regular.woff2": "/assets/fonts/glyphicons-halflings-regular.woff2?id=b5b5055c6d812c0f9f0d", "/assets/fonts/glyphicons-halflings-regular.woff2": "/assets/fonts/glyphicons-halflings-regular.woff2?id=b5b5055c6d812c0f9f0d",
@@ -9,10 +9,12 @@
"/assets/admin/img/clear.png": "/assets/admin/img/clear.png?id=0e92f4c3efc6988a3c96", "/assets/admin/img/clear.png": "/assets/admin/img/clear.png?id=0e92f4c3efc6988a3c96",
"/assets/admin/img/loading.gif": "/assets/admin/img/loading.gif?id=90a4b76b4f11558691f6", "/assets/admin/img/loading.gif": "/assets/admin/img/loading.gif?id=90a4b76b4f11558691f6",
"/assets/global/js/jquery.js": "/assets/global/js/jquery.js?id=6a07da9fae934baf3f74", "/assets/global/js/jquery.js": "/assets/global/js/jquery.js?id=6a07da9fae934baf3f74",
"/assets/admin/js/vendor.js": "/assets/admin/js/vendor.js?id=46e5883accdb659b3d32", "/assets/admin/css/vendor.css": "/assets/admin/css/vendor.css?id=d996fcb13fe42a360434",
"/assets/admin/js/vendor.js": "/assets/admin/js/vendor.js?id=c3426988a89019ef700b",
"/assets/admin/css/blue.png": "/assets/admin/css/blue.png?id=753a3c0dec86d3a38d9c", "/assets/admin/css/blue.png": "/assets/admin/css/blue.png?id=753a3c0dec86d3a38d9c",
"/assets/admin/css/blue@2x.png": "/assets/admin/css/blue@2x.png?id=97da23d47b838cbd4bef", "/assets/admin/css/blue@2x.png": "/assets/admin/css/blue@2x.png?id=97da23d47b838cbd4bef",
"/assets/global/css/vendor.min.css": "/assets/global/css/vendor.min.css?id=1ee66446a64974269b33", "/assets/global/js/vendor.js": "/assets/global/js/vendor.js?id=01249af00bd2c1267e15",
"/assets/global/css/vendor.css": "/assets/global/css/vendor.css?id=1ee66446a64974269b33",
"/assets/installer/css/vendor.css": "/assets/installer/css/vendor.css?id=81f225b61b069fa804fa", "/assets/installer/css/vendor.css": "/assets/installer/css/vendor.css?id=81f225b61b069fa804fa",
"/assets/installer/js/vendor.js": "/assets/installer/js/vendor.js?id=01249af00bd2c1267e15" "/assets/installer/js/vendor.js": "/assets/installer/js/vendor.js?id=01249af00bd2c1267e15"
} }
resources/views/admin/app.blade.php
+10 -11
View File
@@ -22,7 +22,7 @@
<link href="http://fonts.googleapis.com/css?family=Roboto:400,700,300" rel="stylesheet" type="text/css"> <link href="http://fonts.googleapis.com/css?family=Roboto:400,700,300" rel="stylesheet" type="text/css">
{{--<link rel="stylesheet" href="{{ public_asset('/assets/system/css/vendor.min.css') }}"/>--}} {{--<link rel="stylesheet" href="{{ public_asset('/assets/system/css/vendor.min.css') }}"/>--}}
<link rel="stylesheet" href="{{ public_asset('/assets/admin/css/vendor.min.css') }}"> <link rel="stylesheet" href="{{ public_asset('/assets/admin/css/vendor.css') }}">
<link rel="stylesheet" href="{{ public_asset('/assets/admin/css/admin.css') }}"> <link rel="stylesheet" href="{{ public_asset('/assets/admin/css/admin.css') }}">
<style type="text/css"> <style type="text/css">
@@ -94,13 +94,13 @@
</body> </body>
<script defer src="https://use.fontawesome.com/releases/v5.0.6/js/all.js"></script> <script defer src="https://use.fontawesome.com/releases/v5.0.6/js/all.js"></script>
<script src="{{ public_asset('/assets/admin/js/vendor.js') }}"></script> <script defer src="{{ public_asset('/assets/admin/js/vendor.js') }}"></script>
<script src="{{ public_asset('/assets/admin/js/admin.js') }}"></script> <script defer src="{{ public_asset('/assets/admin/js/admin.js') }}"></script>
<script> <script>
const getStorage = function(key) { const getStorage = function(key) {
const st = window.localStorage.getItem(key); const st = window.localStorage.getItem(key);
console.log('storage: ', key, st); // console.log('storage: ', key, st);
if(!st) { if(!st) {
return { return {
"menu": [], "menu": [],
@@ -111,7 +111,7 @@ const getStorage = function(key) {
}; };
const saveStorage = function(key, obj) { const saveStorage = function(key, obj) {
console.log('save: ', key, obj); // console.log('save: ', key, obj);
window.localStorage.setItem(key, JSON.stringify(obj)); window.localStorage.setItem(key, JSON.stringify(obj));
}; };
@@ -129,7 +129,6 @@ const removeItem = function (obj, item) {
if (!obj) { obj = []; } if (!obj) { obj = []; }
const index = obj.indexOf(item); const index = obj.indexOf(item);
if (index !== -1) { if (index !== -1) {
console.log("removing", item);
obj.splice(index, 1); obj.splice(index, 1);
} }
@@ -138,14 +137,14 @@ const removeItem = function (obj, item) {
$(document).ready(function () { $(document).ready(function () {
$(".select2").select2(); $('.select2').select2();
$('input').iCheck({ $('input').iCheck({
checkboxClass: 'icheckbox_square-blue', checkboxClass: 'icheckbox_square-blue',
radioClass: 'icheckbox_square-blue' radioClass: 'icheckbox_square-blue'
}); });
let storage = getStorage("phpvms.admin"); let storage = getStorage('phpvms.admin');
// see what menu items should be open // see what menu items should be open
for(let idx = 0; idx < storage.menu.length; idx++) { for(let idx = 0; idx < storage.menu.length; idx++) {
@@ -159,7 +158,7 @@ $(document).ready(function () {
} }
$(".collapse").on("hide.bs.collapse", function () { $(".collapse").on("hide.bs.collapse", function () {
console.log('hiding'); // console.log('hiding');
const id = $(this).attr('id'); const id = $(this).attr('id');
const elem = $("a." + id + " b"); const elem = $("a." + id + " b");
elem.removeClass("pe-7s-angle-down"); elem.removeClass("pe-7s-angle-down");
@@ -170,7 +169,7 @@ $(document).ready(function () {
}); });
$(".collapse").on("show.bs.collapse", function () { $(".collapse").on("show.bs.collapse", function () {
console.log('showing'); // console.log('showing');
const id = $(this).attr('id'); const id = $(this).attr('id');
const caret = $("a." + id + " b"); const caret = $("a." + id + " b");
caret.addClass("pe-7s-angle-down"); caret.addClass("pe-7s-angle-down");
@@ -179,9 +178,9 @@ $(document).ready(function () {
addItem(storage.menu, id); addItem(storage.menu, id);
saveStorage("phpvms.admin", storage); saveStorage("phpvms.admin", storage);
}); });
}); });
</script> </script>
@yield('scripts') @yield('scripts')
</html> </html>
webpack.mix.js
+15 -13
View File
@@ -34,10 +34,11 @@ mix.sass('resources/sass/admin/paper-dashboard.scss',
'node_modules/bootstrap3/dist/css/bootstrap.css', 'node_modules/bootstrap3/dist/css/bootstrap.css',
'node_modules/animate.css/animate.css', 'node_modules/animate.css/animate.css',
'node_modules/icheck/skins/square/blue.css', 'node_modules/icheck/skins/square/blue.css',
'node_modules/select2/dist/css/select2.css',
'node_modules/x-editable/dist/bootstrap3-editable/css/bootstrap-editable.css', 'node_modules/x-editable/dist/bootstrap3-editable/css/bootstrap-editable.css',
'node_modules/eonasdan-bootstrap-datetimepicker/build/css/bootstrap-datetimepicker.css', 'node_modules/eonasdan-bootstrap-datetimepicker/build/css/bootstrap-datetimepicker.css',
'public/assets/admin/css/vendor.min.css', 'public/assets/admin/css/vendor.min.css',
], 'public/assets/admin/css/vendor.min.css').version() ], 'public/assets/admin/css/vendor.css').version()
.options({ .options({
compressed: true compressed: true
}) })
@@ -45,6 +46,7 @@ mix.sass('resources/sass/admin/paper-dashboard.scss',
mix.scripts([ mix.scripts([
//'node_modules/lodash/lodash.js', //'node_modules/lodash/lodash.js',
'node_modules/jquery/dist/jquery.js',
'node_modules/moment/moment.js', 'node_modules/moment/moment.js',
//'node_modules/axios/dist/axios.js', //'node_modules/axios/dist/axios.js',
'node_modules/bootstrap3/dist/js/bootstrap.js', 'node_modules/bootstrap3/dist/js/bootstrap.js',
@@ -67,25 +69,25 @@ mix.copy('node_modules/icheck/skins/square/blue*.png', 'public/assets/admin/css'
* SYSTEM REQUIRED AND GLOBAL VENDOR FILES * SYSTEM REQUIRED AND GLOBAL VENDOR FILES
*/ */
/*mix.scripts([ mix.scripts([
'node_modules/lodash/lodash.js', //'node_modules/lodash/lodash.js',
'node_modules/axios/dist/axios.js', //'node_modules/axios/dist/axios.js',
'node_modules/jquery/dist/jquery.js', 'node_modules/jquery/dist/jquery.js',
'node_modules/bootstrap3/dist/js/bootstrap.js', //'node_modules/bootstrap3/dist/js/bootstrap.js',
'node_modules/popper.js/dist/umd/popper.js', //'node_modules/popper.js/dist/umd/popper.js',
'node_modules/popper.js/dist/umd/popper-utils.js', //'node_modules/popper.js/dist/umd/popper-utils.js',
'node_modules/select2/dist/js/select2.js', 'node_modules/select2/dist/js/select2.js',
'node_modules/leaflet/dist/leaflet.js', //'node_modules/leaflet/dist/leaflet.js',
'node_modules/pjax/pjax.js', //'node_modules/pjax/pjax.js',
'node_modules/leaflet-rotatedmarker/leaflet.rotatedMarker.js', //'node_modules/leaflet-rotatedmarker/leaflet.rotatedMarker.js',
'node_modules/Leaflet.Geodesic/Leaflet.Geodesic.js', //'node_modules/Leaflet.Geodesic/Leaflet.Geodesic.js',
], 'public/assets/global/js/vendor.js');*/ ], 'public/assets/global/js/vendor.js');
mix.styles([ mix.styles([
//'node_modules/select2/dist/css/select2.css', //'node_modules/select2/dist/css/select2.css',
'node_modules/leaflet/dist/leaflet.css', 'node_modules/leaflet/dist/leaflet.css',
'node_modules/flag-icon-css/css/flag-icon.css', 'node_modules/flag-icon-css/css/flag-icon.css',
], 'public/assets/global/css/vendor.min.css') ], 'public/assets/global/css/vendor.css')
.options({ .options({
compressed: true compressed: true
}) })