formatting to js standard
This commit is contained in:
Nabeel Shahzad
parent
57cddee3fd
commit
6975167a77
@ -1,11 +0,0 @@
|
||||
/**
|
||||
* Any functionality required for the admin app
|
||||
*/
|
||||
|
||||
require('./../bootstrap');
|
||||
require('eonasdan-bootstrap-datetimepicker');
|
||||
|
||||
require('./sidebar');
|
||||
|
||||
// Import the mapping function
|
||||
window.phpvms.map = require('../maps/index');
|
||||
@ -1,90 +0,0 @@
|
||||
|
||||
const jquery = require('jquery');
|
||||
|
||||
const getStorage = function (key) {
|
||||
const st = window.localStorage.getItem(key);
|
||||
|
||||
console.log('storage: ', key, st);
|
||||
if (_.isNil(st)) {
|
||||
return {
|
||||
"menu": [],
|
||||
};
|
||||
}
|
||||
|
||||
return JSON.parse(st);
|
||||
};
|
||||
|
||||
const saveStorage = function (key, obj) {
|
||||
console.log('save: ', key, obj);
|
||||
window.localStorage.setItem(key, JSON.stringify(obj));
|
||||
};
|
||||
|
||||
const addItem = function (obj, item) {
|
||||
|
||||
if (_.isNil(obj)) {
|
||||
obj = [];
|
||||
}
|
||||
|
||||
const index = _.indexOf(obj, item);
|
||||
if (index === -1) {
|
||||
obj.push(item);
|
||||
}
|
||||
|
||||
return obj;
|
||||
};
|
||||
|
||||
const removeItem = function (obj, item) {
|
||||
|
||||
if (_.isNil(obj)) {
|
||||
obj = [];
|
||||
}
|
||||
|
||||
const index = _.indexOf(obj, item);
|
||||
if (index !== -1) {
|
||||
console.log("removing", item);
|
||||
obj.splice(index, 1);
|
||||
}
|
||||
|
||||
return obj;
|
||||
};
|
||||
|
||||
jquery(document).ready(function () {
|
||||
|
||||
$(".select2").select2();
|
||||
|
||||
let storage = getStorage("phpvms.admin");
|
||||
|
||||
// see what menu items should be open
|
||||
for (let idx = 0; idx < storage.menu.length; idx++) {
|
||||
const id = storage.menu[idx];
|
||||
const elem = jquery(".collapse#" + id);
|
||||
elem.addClass("in").trigger("show.bs.collapse");
|
||||
|
||||
const caret = jquery("a." + id + " b");
|
||||
caret.addClass("pe-7s-angle-down");
|
||||
caret.removeClass("pe-7s-angle-right");
|
||||
}
|
||||
|
||||
jquery(".collapse").on("hide.bs.collapse", function () {
|
||||
console.log('hiding');
|
||||
const id = jquery(this).attr('id');
|
||||
const elem = jquery("a." + id + " b");
|
||||
elem.removeClass("pe-7s-angle-down");
|
||||
elem.addClass("pe-7s-angle-right");
|
||||
|
||||
removeItem(storage.menu, id);
|
||||
saveStorage("phpvms.admin", storage);
|
||||
});
|
||||
|
||||
jquery(".collapse").on("show.bs.collapse", function () {
|
||||
console.log('showing');
|
||||
const id = jquery(this).attr('id');
|
||||
const caret = jquery("a." + id + " b");
|
||||
caret.addClass("pe-7s-angle-down");
|
||||
caret.removeClass("pe-7s-angle-right");
|
||||
|
||||
addItem(storage.menu, id);
|
||||
saveStorage("phpvms.admin", storage);
|
||||
});
|
||||
|
||||
});
|
||||
36
resources/js/bootstrap.js
vendored
36
resources/js/bootstrap.js
vendored
@ -2,40 +2,38 @@
|
||||
* Bootstrap any Javascript libraries required
|
||||
*/
|
||||
|
||||
window._ = require('lodash');
|
||||
window.Popper = require('popper.js').default;
|
||||
window.$ = window.jquery = require('jquery');
|
||||
window.select2 = require('select2');
|
||||
window.pjax = require('pjax');
|
||||
window.axios = require('axios');
|
||||
window._ = require('lodash')
|
||||
window.Popper = require('popper.js').default
|
||||
window.$ = window.jquery = require('jquery')
|
||||
window.select2 = require('select2')
|
||||
window.pjax = require('pjax')
|
||||
window.axios = require('axios')
|
||||
|
||||
/**
|
||||
* Container for phpVMS specific functions
|
||||
*/
|
||||
window.phpvms = {
|
||||
|
||||
};
|
||||
window.phpvms = {}
|
||||
|
||||
/**
|
||||
* Configure Axios with both the csrf token and the API key
|
||||
*/
|
||||
window.axios.defaults.headers.common['X-Requested-With'] = 'XMLHttpRequest';
|
||||
const token = document.head.querySelector('meta[name="csrf-token"]');
|
||||
window.axios.defaults.headers.common['X-Requested-With'] = 'XMLHttpRequest'
|
||||
const token = document.head.querySelector('meta[name="csrf-token"]')
|
||||
|
||||
if (token) {
|
||||
window.axios.defaults.headers.common['X-CSRF-TOKEN'] = token.content;
|
||||
window.axios.defaults.headers.common['X-CSRF-TOKEN'] = token.content
|
||||
window.jquery.ajaxSetup({
|
||||
'X-CSRF-TOKEN': token.content
|
||||
})
|
||||
} else {
|
||||
console.error('CSRF token not found: https://laravel.com/docs/csrf#csrf-x-csrf-token');
|
||||
console.error('CSRF token not found: https://laravel.com/docs/csrf#csrf-x-csrf-token')
|
||||
}
|
||||
|
||||
const api_key = document.head.querySelector('meta[name="api-key"]');
|
||||
if(api_key) {
|
||||
window.axios.defaults.headers.common['x-api-key'] = api_key.content;
|
||||
window.PHPVMS_USER_API_KEY = api_key.content;
|
||||
const api_key = document.head.querySelector('meta[name="api-key"]')
|
||||
if (api_key) {
|
||||
window.axios.defaults.headers.common['x-api-key'] = api_key.content
|
||||
window.PHPVMS_USER_API_KEY = api_key.content
|
||||
} else {
|
||||
window.PHPVMS_USER_API_KEY = false;
|
||||
console.error('API Key not found!');
|
||||
window.PHPVMS_USER_API_KEY = false
|
||||
console.error('API Key not found!')
|
||||
}
|
||||
|
||||
@ -1,8 +1,7 @@
|
||||
const _ = require('lodash')
|
||||
const leaflet = require('leaflet')
|
||||
|
||||
const _ = require('lodash');
|
||||
const leaflet = require('leaflet');
|
||||
|
||||
import draw_base_map from './base_map';
|
||||
import draw_base_map from './base_map'
|
||||
|
||||
/**
|
||||
* Render a map with the airspace, etc around a given set of coords
|
||||
@ -18,16 +17,16 @@ export default (opts) => {
|
||||
zoom: 12,
|
||||
layers: [],
|
||||
set_marker: false,
|
||||
});
|
||||
})
|
||||
|
||||
let map = draw_base_map(opts);
|
||||
const coords = [opts.lat, opts.lon];
|
||||
console.log('Applying coords', coords);
|
||||
let map = draw_base_map(opts)
|
||||
const coords = [opts.lat, opts.lon]
|
||||
console.log('Applying coords', coords)
|
||||
|
||||
map.setView(coords, opts.zoom);
|
||||
map.setView(coords, opts.zoom)
|
||||
if (opts.set_marker === true) {
|
||||
leaflet.marker(coords).addTo(map);
|
||||
leaflet.marker(coords).addTo(map)
|
||||
}
|
||||
|
||||
return map;
|
||||
return map
|
||||
};
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
const _ = require('lodash');
|
||||
const leaflet = require('leaflet');
|
||||
const _ = require('lodash')
|
||||
const leaflet = require('leaflet')
|
||||
|
||||
export default (opts) => {
|
||||
|
||||
@ -10,9 +10,9 @@ export default (opts) => {
|
||||
maxZoom: 10,
|
||||
layers: [],
|
||||
set_marker: false,
|
||||
});
|
||||
})
|
||||
|
||||
let feature_groups = [];
|
||||
let feature_groups = []
|
||||
/*var openaip_airspace_labels = new leaflet.TileLayer.WMS(
|
||||
"http://{s}.tile.maps.openaip.net/geowebcache/service/wms", {
|
||||
maxZoom: 14,
|
||||
@ -33,9 +33,9 @@ export default (opts) => {
|
||||
minZoom: 4,
|
||||
format: 'image/png',
|
||||
transparent: true
|
||||
});
|
||||
})
|
||||
|
||||
feature_groups.push(opencyclemap_phys_osm);
|
||||
feature_groups.push(opencyclemap_phys_osm)
|
||||
|
||||
/*const openaip_cached_basemap = new leaflet.TileLayer("http://{s}.tile.maps.openaip.net/geowebcache/service/tms/1.0.0/openaip_basemap@EPSG%3A900913@png/{z}/{x}/{y}.png", {
|
||||
maxZoom: 14,
|
||||
@ -50,22 +50,22 @@ export default (opts) => {
|
||||
feature_groups.push(openaip_cached_basemap);
|
||||
*/
|
||||
|
||||
const openaip_basemap_phys_osm = leaflet.featureGroup(feature_groups);
|
||||
const openaip_basemap_phys_osm = leaflet.featureGroup(feature_groups)
|
||||
|
||||
let map = leaflet.map('map', {
|
||||
layers: [openaip_basemap_phys_osm],
|
||||
center: opts.center,
|
||||
zoom: opts.zoom,
|
||||
scrollWheelZoom: false,
|
||||
});
|
||||
})
|
||||
|
||||
const attrib = leaflet.control.attribution({position: 'bottomleft'});
|
||||
attrib.addAttribution("<a href=\"https://www.thunderforest.com\" target=\"_blank\" style=\"\">Thunderforest</a>");
|
||||
attrib.addAttribution("<a href=\"https://www.openaip.net\" target=\"_blank\" style=\"\">openAIP</a>");
|
||||
attrib.addAttribution("<a href=\"https://www.openstreetmap.org/copyright\" target=\"_blank\" style=\"\">OpenStreetMap</a> contributors");
|
||||
attrib.addAttribution("<a href=\"https://www.openweathermap.org\" target=\"_blank\" style=\"\">OpenWeatherMap</a>");
|
||||
const attrib = leaflet.control.attribution({position: 'bottomleft'})
|
||||
attrib.addAttribution('<a href="https://www.thunderforest.com" target="_blank" style="">Thunderforest</a>')
|
||||
attrib.addAttribution('<a href="https://www.openaip.net" target="_blank" style="">openAIP</a>')
|
||||
attrib.addAttribution('<a href="https://www.openstreetmap.org/copyright" target="_blank" style="">OpenStreetMap</a> contributors')
|
||||
attrib.addAttribution('<a href="https://www.openweathermap.org" target="_blank" style="">OpenWeatherMap</a>')
|
||||
|
||||
attrib.addTo(map);
|
||||
attrib.addTo(map)
|
||||
|
||||
return map;
|
||||
return map
|
||||
};
|
||||
|
||||
@ -1,4 +1,3 @@
|
||||
|
||||
export let
|
||||
PLAN_ROUTE_COLOR = '#36b123',
|
||||
ACTUAL_ROUTE_COLOR = '#172aea';
|
||||
ACTUAL_ROUTE_COLOR = '#172aea'
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
* All of the functionality required for maps
|
||||
*/
|
||||
|
||||
window.L = require('leaflet');
|
||||
require('Leaflet.Geodesic');
|
||||
require('leaflet-rotatedmarker');
|
||||
window.L = require('leaflet')
|
||||
require('Leaflet.Geodesic')
|
||||
require('leaflet-rotatedmarker')
|
||||
|
||||
import render_airspace_map from './airspace_map';
|
||||
import render_live_map from './live_map';
|
||||
import render_route_map from './route_map';
|
||||
import render_airspace_map from './airspace_map'
|
||||
import render_live_map from './live_map'
|
||||
import render_route_map from './route_map'
|
||||
|
||||
export {
|
||||
render_airspace_map,
|
||||
render_live_map,
|
||||
render_route_map,
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,9 +1,8 @@
|
||||
const _ = require('lodash')
|
||||
const leaflet = require('leaflet')
|
||||
|
||||
const _ = require('lodash');
|
||||
const leaflet = require('leaflet');
|
||||
|
||||
import draw_base_map from './base_map';
|
||||
import {ACTUAL_ROUTE_COLOR} from './config';
|
||||
import draw_base_map from './base_map'
|
||||
import { ACTUAL_ROUTE_COLOR } from './config'
|
||||
|
||||
/**
|
||||
* Render the live map
|
||||
@ -18,19 +17,19 @@ export default (opts) => {
|
||||
positions: null,
|
||||
render_elem: 'map',
|
||||
aircraft_icon: '/assets/img/acars/aircraft.png',
|
||||
});
|
||||
})
|
||||
|
||||
const map = draw_base_map(opts);
|
||||
const map = draw_base_map(opts)
|
||||
const aircraftIcon = leaflet.icon({
|
||||
iconUrl: opts.aircraft_icon,
|
||||
iconSize: [42, 42],
|
||||
iconAnchor: [21, 21],
|
||||
});
|
||||
})
|
||||
|
||||
let layerFlights = null;
|
||||
let layerSelFlight = null;
|
||||
let layerSelFlightFeature = null;
|
||||
let layerSelFlightLayer = null;
|
||||
let layerFlights = null
|
||||
let layerSelFlight = null
|
||||
let layerSelFlightFeature = null
|
||||
let layerSelFlightLayer = null
|
||||
|
||||
/**
|
||||
* When a flight is clicked on, show the path, etc for that flight
|
||||
@ -39,17 +38,17 @@ export default (opts) => {
|
||||
*/
|
||||
const onFlightClick = (feature, layer) => {
|
||||
|
||||
const uri = opts.pirep_uri.replace('{id}', feature.properties.pirep_id);
|
||||
const uri = opts.pirep_uri.replace('{id}', feature.properties.pirep_id)
|
||||
|
||||
const flight_route = $.ajax({
|
||||
url: uri,
|
||||
dataType: "json",
|
||||
dataType: 'json',
|
||||
error: console.log
|
||||
});
|
||||
})
|
||||
|
||||
$.when(flight_route).done((routeJson) => {
|
||||
if (layerSelFlight !== null) {
|
||||
map.removeLayer(layerSelFlight);
|
||||
map.removeLayer(layerSelFlight)
|
||||
}
|
||||
|
||||
layerSelFlight = leaflet.geodesic([], {
|
||||
@ -57,19 +56,19 @@ export default (opts) => {
|
||||
opacity: 0.9,
|
||||
color: ACTUAL_ROUTE_COLOR,
|
||||
wrap: false,
|
||||
}).addTo(map);
|
||||
}).addTo(map)
|
||||
|
||||
layerSelFlight.geoJson(routeJson.line);
|
||||
layerSelFlight.geoJson(routeJson.line)
|
||||
|
||||
layerSelFlightFeature = feature;
|
||||
layerSelFlightLayer = layer;
|
||||
layerSelFlightFeature = feature
|
||||
layerSelFlightLayer = layer
|
||||
//map.fitBounds(layerSelFlight.getBounds());
|
||||
});
|
||||
};
|
||||
})
|
||||
}
|
||||
|
||||
const updateMap = () => {
|
||||
|
||||
console.log('reloading flights from acars...');
|
||||
console.log('reloading flights from acars...')
|
||||
|
||||
/**
|
||||
* AJAX UPDATE
|
||||
@ -77,14 +76,14 @@ export default (opts) => {
|
||||
|
||||
let flights = $.ajax({
|
||||
url: opts.update_uri,
|
||||
dataType: "json",
|
||||
dataType: 'json',
|
||||
error: console.log
|
||||
});
|
||||
})
|
||||
|
||||
$.when(flights).done(function (flightGeoJson) {
|
||||
|
||||
if (layerFlights !== null) {
|
||||
layerFlights.clearLayers();
|
||||
layerFlights.clearLayers()
|
||||
}
|
||||
|
||||
layerFlights = leaflet.geoJSON(flightGeoJson, {
|
||||
@ -92,33 +91,33 @@ export default (opts) => {
|
||||
|
||||
layer.on({
|
||||
click: (e) => {
|
||||
onFlightClick(feature, layer);
|
||||
onFlightClick(feature, layer)
|
||||
}
|
||||
});
|
||||
})
|
||||
|
||||
let popup_html = "";
|
||||
let popup_html = ''
|
||||
if (feature.properties && feature.properties.popup) {
|
||||
popup_html += feature.properties.popup;
|
||||
popup_html += feature.properties.popup
|
||||
}
|
||||
|
||||
layer.bindPopup(popup_html);
|
||||
layer.bindPopup(popup_html)
|
||||
},
|
||||
pointToLayer: function (feature, latlon) {
|
||||
return leaflet.marker(latlon, {
|
||||
icon: aircraftIcon,
|
||||
rotationAngle: feature.properties.heading
|
||||
});
|
||||
})
|
||||
}
|
||||
});
|
||||
})
|
||||
|
||||
layerFlights.addTo(map);
|
||||
layerFlights.addTo(map)
|
||||
|
||||
if (layerSelFlight !== null) {
|
||||
onFlightClick(layerSelFlightFeature, layerSelFlightLayer);
|
||||
onFlightClick(layerSelFlightFeature, layerSelFlightLayer)
|
||||
}
|
||||
})
|
||||
}
|
||||
});
|
||||
};
|
||||
|
||||
updateMap();
|
||||
setInterval(updateMap, 10000);
|
||||
updateMap()
|
||||
setInterval(updateMap, 10000)
|
||||
};
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
const _ = require('lodash');
|
||||
const leaflet = require('leaflet');
|
||||
const _ = require('lodash')
|
||||
const leaflet = require('leaflet')
|
||||
|
||||
import draw_base_map from './base_map';
|
||||
import {ACTUAL_ROUTE_COLOR, PLAN_ROUTE_COLOR} from './config';
|
||||
import draw_base_map from './base_map'
|
||||
import { ACTUAL_ROUTE_COLOR, PLAN_ROUTE_COLOR } from './config'
|
||||
|
||||
/**
|
||||
* Show some popup text when a feature is clicked on
|
||||
@ -10,13 +10,13 @@ import {ACTUAL_ROUTE_COLOR, PLAN_ROUTE_COLOR} from './config';
|
||||
* @param layer
|
||||
*/
|
||||
export const onFeaturePointClick = (feature, layer) => {
|
||||
let popup_html = "";
|
||||
let popup_html = ''
|
||||
if (feature.properties && feature.properties.popup) {
|
||||
popup_html += feature.properties.popup;
|
||||
popup_html += feature.properties.popup
|
||||
}
|
||||
|
||||
layer.bindPopup(popup_html);
|
||||
};
|
||||
layer.bindPopup(popup_html)
|
||||
}
|
||||
|
||||
/**
|
||||
* Show each point as a marker
|
||||
@ -27,13 +27,13 @@ export const onFeaturePointClick = (feature, layer) => {
|
||||
export const pointToLayer = (feature, latlng) => {
|
||||
return leaflet.circleMarker(latlng, {
|
||||
radius: 12,
|
||||
fillColor: "#ff7800",
|
||||
color: "#000",
|
||||
fillColor: '#ff7800',
|
||||
color: '#000',
|
||||
weight: 1,
|
||||
opacity: 1,
|
||||
fillOpacity: 0.8
|
||||
});
|
||||
};
|
||||
})
|
||||
}
|
||||
|
||||
/**
|
||||
*
|
||||
@ -48,11 +48,11 @@ export default (opts) => {
|
||||
actual_route_points: null,
|
||||
actual_route_line: null,
|
||||
render_elem: 'map',
|
||||
});
|
||||
})
|
||||
|
||||
console.log(opts);
|
||||
console.log(opts)
|
||||
|
||||
let map = draw_base_map(opts);
|
||||
let map = draw_base_map(opts)
|
||||
|
||||
let geodesicLayer = leaflet.geodesic([], {
|
||||
weight: 7,
|
||||
@ -60,14 +60,14 @@ export default (opts) => {
|
||||
color: PLAN_ROUTE_COLOR,
|
||||
steps: 50,
|
||||
wrap: false,
|
||||
}).addTo(map);
|
||||
}).addTo(map)
|
||||
|
||||
geodesicLayer.geoJson(opts.planned_route_line);
|
||||
geodesicLayer.geoJson(opts.planned_route_line)
|
||||
|
||||
try {
|
||||
map.fitBounds(geodesicLayer.getBounds());
|
||||
map.fitBounds(geodesicLayer.getBounds())
|
||||
} catch (e) {
|
||||
console.log(e);
|
||||
console.log(e)
|
||||
}
|
||||
|
||||
// Draw the route points after
|
||||
@ -76,13 +76,13 @@ export default (opts) => {
|
||||
onEachFeature: onFeaturePointClick,
|
||||
pointToLayer: pointToLayer,
|
||||
style: {
|
||||
"color": PLAN_ROUTE_COLOR,
|
||||
"weight": 5,
|
||||
"opacity": 0.65,
|
||||
'color': PLAN_ROUTE_COLOR,
|
||||
'weight': 5,
|
||||
'opacity': 0.65,
|
||||
},
|
||||
});
|
||||
})
|
||||
|
||||
route_points.addTo(map);
|
||||
route_points.addTo(map)
|
||||
}
|
||||
|
||||
/**
|
||||
@ -96,14 +96,14 @@ export default (opts) => {
|
||||
color: ACTUAL_ROUTE_COLOR,
|
||||
steps: 50,
|
||||
wrap: false,
|
||||
}).addTo(map);
|
||||
}).addTo(map)
|
||||
|
||||
geodesicLayer.geoJson(opts.actual_route_line);
|
||||
geodesicLayer.geoJson(opts.actual_route_line)
|
||||
|
||||
try {
|
||||
map.fitBounds(geodesicLayer.getBounds());
|
||||
map.fitBounds(geodesicLayer.getBounds())
|
||||
} catch (e) {
|
||||
console.log(e);
|
||||
console.log(e)
|
||||
}
|
||||
}
|
||||
|
||||
@ -112,12 +112,12 @@ export default (opts) => {
|
||||
onEachFeature: onFeaturePointClick,
|
||||
pointToLayer: pointToLayer,
|
||||
style: {
|
||||
"color": ACTUAL_ROUTE_COLOR,
|
||||
"weight": 5,
|
||||
"opacity": 0.65,
|
||||
'color': ACTUAL_ROUTE_COLOR,
|
||||
'weight': 5,
|
||||
'opacity': 0.65,
|
||||
},
|
||||
});
|
||||
})
|
||||
|
||||
route_points.addTo(map);
|
||||
route_points.addTo(map)
|
||||
}
|
||||
};
|
||||
|
||||
@ -2,29 +2,29 @@
|
||||
*
|
||||
*/
|
||||
|
||||
'use strict';
|
||||
'use strict'
|
||||
|
||||
const mix = require('laravel-mix');
|
||||
const webpack = require('webpack');
|
||||
const mix = require('laravel-mix')
|
||||
const webpack = require('webpack')
|
||||
|
||||
mix.webpackConfig({
|
||||
plugins: [
|
||||
new webpack.ProvidePlugin({
|
||||
$: "jquery",
|
||||
jQuery: "jquery"
|
||||
$: 'jquery',
|
||||
jQuery: 'jquery'
|
||||
})
|
||||
]
|
||||
});
|
||||
})
|
||||
|
||||
/**
|
||||
* GENERAL FILES
|
||||
*/
|
||||
|
||||
mix.copy('node_modules/bootstrap3/fonts/*.woff2', 'public/assets/fonts/');
|
||||
mix.copy('node_modules/bootstrap3/fonts/*.woff2', 'public/assets/admin/fonts/');
|
||||
mix.copy('node_modules/icheck/icheck.js', 'public/assets/admin/js/');
|
||||
mix.copy('node_modules/x-editable/dist/bootstrap3-editable/js/*', 'public/assets/admin/js/');
|
||||
mix.copy('node_modules/x-editable/dist/bootstrap3-editable/img/*', 'public/assets/admin/img/');
|
||||
mix.copy('node_modules/bootstrap3/fonts/*.woff2', 'public/assets/fonts/')
|
||||
mix.copy('node_modules/bootstrap3/fonts/*.woff2', 'public/assets/admin/fonts/')
|
||||
mix.copy('node_modules/icheck/icheck.js', 'public/assets/admin/js/')
|
||||
mix.copy('node_modules/x-editable/dist/bootstrap3-editable/js/*', 'public/assets/admin/js/')
|
||||
mix.copy('node_modules/x-editable/dist/bootstrap3-editable/img/*', 'public/assets/admin/img/')
|
||||
|
||||
/**
|
||||
* ADMIN REQUIRED FILES
|
||||
@ -32,7 +32,7 @@ mix.copy('node_modules/x-editable/dist/bootstrap3-editable/img/*', 'public/asset
|
||||
|
||||
mix.sass('public/assets/admin/vendor/sass/paper-dashboard.scss',
|
||||
'public/assets/admin/vendor/paper-dashboard.css')
|
||||
.sourceMaps();
|
||||
.sourceMaps()
|
||||
|
||||
mix.styles([
|
||||
'node_modules/bootstrap3/dist/css/bootstrap.css',
|
||||
@ -44,7 +44,7 @@ mix.styles([
|
||||
'public/assets/admin/vendor/paper-dashboard.css',
|
||||
'node_modules/eonasdan-bootstrap-datetimepicker/build/css/bootstrap-datetimepicker.css',
|
||||
], 'public/assets/admin/css/vendor.min.css').version()
|
||||
.sourceMaps();
|
||||
.sourceMaps()
|
||||
|
||||
mix.scripts([
|
||||
'node_modules/lodash/lodash.js',
|
||||
@ -61,20 +61,20 @@ mix.scripts([
|
||||
'node_modules/x-editable/dist/bootstrap3-editable/js/bootstrap-editable.js',
|
||||
'node_modules/eonasdan-bootstrap-datetimepicker/src/js/bootstrap-datetimepicker.js',
|
||||
'node_modules/jquery-pjax/jquery.pjax.js',
|
||||
], 'public/assets/admin/js/vendor.js');
|
||||
], 'public/assets/admin/js/vendor.js')
|
||||
|
||||
mix.copy('node_modules/icheck/skins/square/blue*.png', 'public/assets/admin/css');
|
||||
mix.copy('node_modules/icheck/skins/square/blue*.png', 'public/assets/admin/css')
|
||||
|
||||
/**
|
||||
* SYSTEM REQUIRED AND GLOBAL VENDOR FILES
|
||||
*/
|
||||
|
||||
mix.copy('node_modules/jquery/dist/jquery.js', 'public/assets/system/js/');
|
||||
mix.copy('node_modules/flag-icon-css/flags/', 'public/assets/system/flags/');
|
||||
mix.copy('node_modules/jquery/dist/jquery.js', 'public/assets/system/js/')
|
||||
mix.copy('node_modules/flag-icon-css/flags/', 'public/assets/system/flags/')
|
||||
|
||||
mix.autoload({
|
||||
'jquery': ['jQuery', '$'],
|
||||
});
|
||||
})
|
||||
|
||||
mix.scripts([
|
||||
'node_modules/lodash/lodash.js',
|
||||
@ -88,7 +88,7 @@ mix.scripts([
|
||||
'node_modules/pjax/pjax.js',
|
||||
'node_modules/leaflet-rotatedmarker/leaflet.rotatedMarker.js',
|
||||
'node_modules/Leaflet.Geodesic/Leaflet.Geodesic.js',
|
||||
], 'public/assets/system/js/vendor.js');
|
||||
], 'public/assets/system/js/vendor.js')
|
||||
|
||||
mix.styles([
|
||||
'node_modules/select2/dist/css/select2.css',
|
||||
@ -99,8 +99,7 @@ mix.styles([
|
||||
.options({
|
||||
compressed: true
|
||||
})
|
||||
.sourceMaps();
|
||||
|
||||
.sourceMaps()
|
||||
|
||||
/**
|
||||
* INSTALLER VENDOR FILES
|
||||
@ -114,15 +113,14 @@ mix.styles([
|
||||
processCssUrls: false,
|
||||
compressed: true
|
||||
})
|
||||
.sourceMaps();
|
||||
.sourceMaps()
|
||||
|
||||
mix.scripts([
|
||||
'node_modules/lodash/lodash.js',
|
||||
'node_modules/jquery/dist/jquery.js',
|
||||
'node_modules/pjax/pjax.js',
|
||||
'node_modules/select2/dist/js/select2.js',
|
||||
], 'public/assets/system/js/installer-vendor.js');
|
||||
|
||||
], 'public/assets/system/js/installer-vendor.js')
|
||||
|
||||
/**
|
||||
* DEFAULT SKIN FRONTEND FILES
|
||||
@ -134,8 +132,7 @@ mix.sass('public/assets/frontend/sass/now-ui-kit.scss',
|
||||
processCssUrls: false,
|
||||
compressed: true
|
||||
})
|
||||
.sourceMaps();
|
||||
|
||||
.sourceMaps()
|
||||
|
||||
// These should go into the separate vendor.js file
|
||||
const extract = [
|
||||
@ -147,10 +144,9 @@ const extract = [
|
||||
'leaflet',
|
||||
'Leaflet.Geodesic',
|
||||
'leaflet-rotatedmarker'
|
||||
];
|
||||
]
|
||||
|
||||
mix.js('resources/js/frontend/app.js', 'public/js/frontend')
|
||||
.extract(extract);
|
||||
.extract(extract)
|
||||
|
||||
|
||||
mix.js('resources/js/admin/app.js', 'public/js/admin');
|
||||
//mix.js('resources/js/admin/app.js', 'public/js/admin')
|
||||
|
||||
Loading…
Reference in New Issue
Block a user