diff --git a/resources/js/admin/app.js b/resources/js/admin/app.js deleted file mode 100644 index 3273d61d..00000000 --- a/resources/js/admin/app.js +++ /dev/null @@ -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'); diff --git a/resources/js/admin/sidebar.js b/resources/js/admin/sidebar.js deleted file mode 100644 index a918ed87..00000000 --- a/resources/js/admin/sidebar.js +++ /dev/null @@ -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); - }); - -}); diff --git a/resources/js/bootstrap.js b/resources/js/bootstrap.js index ae588c4f..70e9db39 100644 --- a/resources/js/bootstrap.js +++ b/resources/js/bootstrap.js @@ -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.jquery.ajaxSetup({ - '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!') } diff --git a/resources/js/maps/airspace_map.js b/resources/js/maps/airspace_map.js index bf7f8bcc..04d76c26 100644 --- a/resources/js/maps/airspace_map.js +++ b/resources/js/maps/airspace_map.js @@ -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 @@ -10,24 +9,24 @@ import draw_base_map from './base_map'; * @param opts */ export default (opts) => { - opts = _.defaults(opts, { - render_elem: 'map', - overlay_elem: '', - lat: 0, - lon: 0, - zoom: 12, - layers: [], - set_marker: false, - }); + opts = _.defaults(opts, { + render_elem: 'map', + overlay_elem: '', + lat: 0, + lon: 0, + 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); - if (opts.set_marker === true) { - leaflet.marker(coords).addTo(map); - } + map.setView(coords, opts.zoom) + if (opts.set_marker === true) { + leaflet.marker(coords).addTo(map) + } - return map; + return map }; diff --git a/resources/js/maps/base_map.js b/resources/js/maps/base_map.js index 67b0bf40..04744193 100644 --- a/resources/js/maps/base_map.js +++ b/resources/js/maps/base_map.js @@ -1,71 +1,71 @@ -const _ = require('lodash'); -const leaflet = require('leaflet'); +const _ = require('lodash') +const leaflet = require('leaflet') export default (opts) => { - opts = _.defaults(opts, { - render_elem: 'map', - center: [29.98139, -95.33374], - zoom: 5, - maxZoom: 10, - layers: [], - set_marker: false, - }); + opts = _.defaults(opts, { + render_elem: 'map', + center: [29.98139, -95.33374], + zoom: 5, + maxZoom: 10, + layers: [], + set_marker: false, + }) - let feature_groups = []; - /*var openaip_airspace_labels = new leaflet.TileLayer.WMS( - "http://{s}.tile.maps.openaip.net/geowebcache/service/wms", { - maxZoom: 14, - minZoom: 12, - layers: 'openaip_approved_airspaces_labels', - tileSize: 1024, - detectRetina: true, - subdomains: '12', - format: 'image/png', - transparent: true - }); + let feature_groups = [] + /*var openaip_airspace_labels = new leaflet.TileLayer.WMS( + "http://{s}.tile.maps.openaip.net/geowebcache/service/wms", { + maxZoom: 14, + minZoom: 12, + layers: 'openaip_approved_airspaces_labels', + tileSize: 1024, + detectRetina: true, + subdomains: '12', + format: 'image/png', + transparent: true + }); - openaip_airspace_labels.addTo(map);*/ + openaip_airspace_labels.addTo(map);*/ - const opencyclemap_phys_osm = new leaflet.TileLayer( - 'http://{s}.tile.thunderforest.com/landscape/{z}/{x}/{y}.png?apikey=f09a38fa87514de4890fc96e7fe8ecb1', { - maxZoom: 14, - minZoom: 4, - format: 'image/png', - transparent: true - }); + const opencyclemap_phys_osm = new leaflet.TileLayer( + 'http://{s}.tile.thunderforest.com/landscape/{z}/{x}/{y}.png?apikey=f09a38fa87514de4890fc96e7fe8ecb1', { + maxZoom: 14, + 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, - minZoom: 4, - tms: true, - detectRetina: true, - subdomains: '12', - format: 'image/png', - transparent: true - }); + /*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, + minZoom: 4, + tms: true, + detectRetina: true, + subdomains: '12', + format: 'image/png', + transparent: true + }); - feature_groups.push(openaip_cached_basemap); - */ + 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, - }); + 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("Thunderforest"); - attrib.addAttribution("openAIP"); - attrib.addAttribution("OpenStreetMap contributors"); - attrib.addAttribution("OpenWeatherMap"); + const attrib = leaflet.control.attribution({position: 'bottomleft'}) + attrib.addAttribution('Thunderforest') + attrib.addAttribution('openAIP') + attrib.addAttribution('OpenStreetMap contributors') + attrib.addAttribution('OpenWeatherMap') - attrib.addTo(map); + attrib.addTo(map) - return map; + return map }; diff --git a/resources/js/maps/config.js b/resources/js/maps/config.js index 7661fe1f..6c284e41 100644 --- a/resources/js/maps/config.js +++ b/resources/js/maps/config.js @@ -1,4 +1,3 @@ - export let - PLAN_ROUTE_COLOR = '#36b123', - ACTUAL_ROUTE_COLOR = '#172aea'; + PLAN_ROUTE_COLOR = '#36b123', + ACTUAL_ROUTE_COLOR = '#172aea' diff --git a/resources/js/maps/index.js b/resources/js/maps/index.js index 6158f8e5..b0791eb5 100644 --- a/resources/js/maps/index.js +++ b/resources/js/maps/index.js @@ -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, -}; + render_airspace_map, + render_live_map, + render_route_map, +} diff --git a/resources/js/maps/live_map.js b/resources/js/maps/live_map.js index 9bef4f68..78c74561 100644 --- a/resources/js/maps/live_map.js +++ b/resources/js/maps/live_map.js @@ -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 @@ -12,113 +11,113 @@ import {ACTUAL_ROUTE_COLOR} from './config'; */ export default (opts) => { - opts = _.defaults(opts, { - update_uri: '/api/acars', - pirep_uri: '/api/pireps/{id}/acars', - positions: null, - render_elem: 'map', - aircraft_icon: '/assets/img/acars/aircraft.png', - }); + opts = _.defaults(opts, { + update_uri: '/api/acars', + pirep_uri: '/api/pireps/{id}/acars', + positions: null, + render_elem: 'map', + aircraft_icon: '/assets/img/acars/aircraft.png', + }) - const map = draw_base_map(opts); - const aircraftIcon = leaflet.icon({ - iconUrl: opts.aircraft_icon, - iconSize: [42, 42], - iconAnchor: [21, 21], - }); + 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 + * @param feature + * @param layer + */ + const onFlightClick = (feature, layer) => { + + const uri = opts.pirep_uri.replace('{id}', feature.properties.pirep_id) + + const flight_route = $.ajax({ + url: uri, + dataType: 'json', + error: console.log + }) + + $.when(flight_route).done((routeJson) => { + if (layerSelFlight !== null) { + map.removeLayer(layerSelFlight) + } + + layerSelFlight = leaflet.geodesic([], { + weight: 7, + opacity: 0.9, + color: ACTUAL_ROUTE_COLOR, + wrap: false, + }).addTo(map) + + layerSelFlight.geoJson(routeJson.line) + + layerSelFlightFeature = feature + layerSelFlightLayer = layer + //map.fitBounds(layerSelFlight.getBounds()); + }) + } + + const updateMap = () => { + + console.log('reloading flights from acars...') /** - * When a flight is clicked on, show the path, etc for that flight - * @param feature - * @param layer + * AJAX UPDATE */ - const onFlightClick = (feature, layer) => { - const uri = opts.pirep_uri.replace('{id}', feature.properties.pirep_id); + let flights = $.ajax({ + url: opts.update_uri, + dataType: 'json', + error: console.log + }) - const flight_route = $.ajax({ - url: uri, - dataType: "json", - error: console.log - }); + $.when(flights).done(function (flightGeoJson) { - $.when(flight_route).done((routeJson) => { - if (layerSelFlight !== null) { - map.removeLayer(layerSelFlight); + if (layerFlights !== null) { + layerFlights.clearLayers() + } + + layerFlights = leaflet.geoJSON(flightGeoJson, { + onEachFeature: (feature, layer) => { + + layer.on({ + click: (e) => { + onFlightClick(feature, layer) } + }) - layerSelFlight = leaflet.geodesic([], { - weight: 7, - opacity: 0.9, - color: ACTUAL_ROUTE_COLOR, - wrap: false, - }).addTo(map); + let popup_html = '' + if (feature.properties && feature.properties.popup) { + popup_html += feature.properties.popup + } - layerSelFlight.geoJson(routeJson.line); + layer.bindPopup(popup_html) + }, + pointToLayer: function (feature, latlon) { + return leaflet.marker(latlon, { + icon: aircraftIcon, + rotationAngle: feature.properties.heading + }) + } + }) - layerSelFlightFeature = feature; - layerSelFlightLayer = layer; - //map.fitBounds(layerSelFlight.getBounds()); - }); - }; + layerFlights.addTo(map) - const updateMap = () => { + if (layerSelFlight !== null) { + onFlightClick(layerSelFlightFeature, layerSelFlightLayer) + } + }) + } - console.log('reloading flights from acars...'); - - /** - * AJAX UPDATE - */ - - let flights = $.ajax({ - url: opts.update_uri, - dataType: "json", - error: console.log - }); - - $.when(flights).done(function (flightGeoJson) { - - if (layerFlights !== null) { - layerFlights.clearLayers(); - } - - layerFlights = leaflet.geoJSON(flightGeoJson, { - onEachFeature: (feature, layer) => { - - layer.on({ - click: (e) => { - onFlightClick(feature, layer); - } - }); - - let popup_html = ""; - if (feature.properties && feature.properties.popup) { - popup_html += feature.properties.popup; - } - - layer.bindPopup(popup_html); - }, - pointToLayer: function (feature, latlon) { - return leaflet.marker(latlon, { - icon: aircraftIcon, - rotationAngle: feature.properties.heading - }); - } - }); - - layerFlights.addTo(map); - - if (layerSelFlight !== null) { - onFlightClick(layerSelFlightFeature, layerSelFlightLayer); - } - }); - }; - - updateMap(); - setInterval(updateMap, 10000); + updateMap() + setInterval(updateMap, 10000) }; diff --git a/resources/js/maps/route_map.js b/resources/js/maps/route_map.js index 657edcff..a2ccc4e1 100644 --- a/resources/js/maps/route_map.js +++ b/resources/js/maps/route_map.js @@ -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 = ""; - if (feature.properties && feature.properties.popup) { - popup_html += feature.properties.popup; - } + let popup_html = '' + if (feature.properties && feature.properties.popup) { + popup_html += feature.properties.popup + } - layer.bindPopup(popup_html); -}; + layer.bindPopup(popup_html) +} /** * Show each point as a marker @@ -25,15 +25,15 @@ export const onFeaturePointClick = (feature, layer) => { * @returns {*} */ export const pointToLayer = (feature, latlng) => { - return leaflet.circleMarker(latlng, { - radius: 12, - fillColor: "#ff7800", - color: "#000", - weight: 1, - opacity: 1, - fillOpacity: 0.8 - }); -}; + return leaflet.circleMarker(latlng, { + radius: 12, + fillColor: '#ff7800', + color: '#000', + weight: 1, + opacity: 1, + fillOpacity: 0.8 + }) +} /** * @@ -42,82 +42,82 @@ export const pointToLayer = (feature, latlng) => { */ export default (opts) => { - opts = _.defaults(opts, { - route_points: null, - planned_route_line: null, - actual_route_points: null, - actual_route_line: null, - render_elem: 'map', - }); + opts = _.defaults(opts, { + route_points: null, + planned_route_line: null, + 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, + opacity: 0.9, + color: PLAN_ROUTE_COLOR, + steps: 50, + wrap: false, + }).addTo(map) + + geodesicLayer.geoJson(opts.planned_route_line) + + try { + map.fitBounds(geodesicLayer.getBounds()) + } catch (e) { + console.log(e) + } + + // Draw the route points after + if (opts.route_points !== null) { + let route_points = leaflet.geoJSON(opts.route_points, { + onEachFeature: onFeaturePointClick, + pointToLayer: pointToLayer, + style: { + 'color': PLAN_ROUTE_COLOR, + 'weight': 5, + 'opacity': 0.65, + }, + }) + + route_points.addTo(map) + } + + /** + * draw the actual route + */ + + if (opts.actual_route_line !== null && opts.actual_route_line.features.length > 0) { let geodesicLayer = leaflet.geodesic([], { - weight: 7, - opacity: 0.9, - color: PLAN_ROUTE_COLOR, - steps: 50, - wrap: false, - }).addTo(map); + weight: 7, + opacity: 0.9, + color: ACTUAL_ROUTE_COLOR, + steps: 50, + wrap: false, + }).addTo(map) - geodesicLayer.geoJson(opts.planned_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) } + } - // Draw the route points after - if (opts.route_points !== null) { - let route_points = leaflet.geoJSON(opts.route_points, { - onEachFeature: onFeaturePointClick, - pointToLayer: pointToLayer, - style: { - "color": PLAN_ROUTE_COLOR, - "weight": 5, - "opacity": 0.65, - }, - }); + if (opts.actual_route_points !== null && opts.actual_route_points.features.length > 0) { + let route_points = leaflet.geoJSON(opts.actual_route_points, { + onEachFeature: onFeaturePointClick, + pointToLayer: pointToLayer, + style: { + 'color': ACTUAL_ROUTE_COLOR, + 'weight': 5, + 'opacity': 0.65, + }, + }) - route_points.addTo(map); - } - - /** - * draw the actual route - */ - - if (opts.actual_route_line !== null && opts.actual_route_line.features.length > 0) { - let geodesicLayer = leaflet.geodesic([], { - weight: 7, - opacity: 0.9, - color: ACTUAL_ROUTE_COLOR, - steps: 50, - wrap: false, - }).addTo(map); - - geodesicLayer.geoJson(opts.actual_route_line); - - try { - map.fitBounds(geodesicLayer.getBounds()); - } catch (e) { - console.log(e); - } - } - - if (opts.actual_route_points !== null && opts.actual_route_points.features.length > 0) { - let route_points = leaflet.geoJSON(opts.actual_route_points, { - onEachFeature: onFeaturePointClick, - pointToLayer: pointToLayer, - style: { - "color": ACTUAL_ROUTE_COLOR, - "weight": 5, - "opacity": 0.65, - }, - }); - - route_points.addTo(map); - } + route_points.addTo(map) + } }; diff --git a/webpack.mix.js b/webpack.mix.js index 0a7c7fc8..e696dbd6 100644 --- a/webpack.mix.js +++ b/webpack.mix.js @@ -2,155 +2,151 @@ * */ -'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" - }) - ] -}); + plugins: [ + new webpack.ProvidePlugin({ + $: '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 */ mix.sass('public/assets/admin/vendor/sass/paper-dashboard.scss', - 'public/assets/admin/vendor/paper-dashboard.css') - .sourceMaps(); + 'public/assets/admin/vendor/paper-dashboard.css') + .sourceMaps() mix.styles([ - 'node_modules/bootstrap3/dist/css/bootstrap.css', - 'public/assets/admin/vendor/animate.css', - 'node_modules/select2/dist/css/select2.css', - 'node_modules/leaflet/dist/leaflet.css', - 'node_modules/icheck/skins/square/blue.css', - 'node_modules/x-editable/dist/bootstrap3-editable/css/bootstrap-editable.css', - 'public/assets/admin/vendor/paper-dashboard.css', - 'node_modules/eonasdan-bootstrap-datetimepicker/build/css/bootstrap-datetimepicker.css', + 'node_modules/bootstrap3/dist/css/bootstrap.css', + 'public/assets/admin/vendor/animate.css', + 'node_modules/select2/dist/css/select2.css', + 'node_modules/leaflet/dist/leaflet.css', + 'node_modules/icheck/skins/square/blue.css', + 'node_modules/x-editable/dist/bootstrap3-editable/css/bootstrap-editable.css', + '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', - 'node_modules/moment/moment.js', - 'node_modules/axios/dist/axios.js', - 'node_modules/bootstrap3/dist/js/bootstrap.js', - 'node_modules/bootstrap3/js/collapse.js', - 'node_modules/bootstrap3/js/transition.js', - 'node_modules/popper.js/dist/umd/popper.js', - 'node_modules/popper.js/dist/umd/popper-utils.js', - 'node_modules/select2/dist/js/select2.js', - 'node_modules/leaflet/dist/leaflet.js', - 'node_modules/icheck/icheck.js', - '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'); + 'node_modules/lodash/lodash.js', + 'node_modules/moment/moment.js', + 'node_modules/axios/dist/axios.js', + 'node_modules/bootstrap3/dist/js/bootstrap.js', + 'node_modules/bootstrap3/js/collapse.js', + 'node_modules/bootstrap3/js/transition.js', + 'node_modules/popper.js/dist/umd/popper.js', + 'node_modules/popper.js/dist/umd/popper-utils.js', + 'node_modules/select2/dist/js/select2.js', + 'node_modules/leaflet/dist/leaflet.js', + 'node_modules/icheck/icheck.js', + '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') -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', '$'], -}); + 'jquery': ['jQuery', '$'], +}) mix.scripts([ - 'node_modules/lodash/lodash.js', - 'node_modules/axios/dist/axios.js', - 'node_modules/jquery/dist/jquery.js', - 'node_modules/bootstrap3/dist/js/bootstrap.js', - 'node_modules/popper.js/dist/umd/popper.js', - 'node_modules/popper.js/dist/umd/popper-utils.js', - 'node_modules/select2/dist/js/select2.js', - 'node_modules/leaflet/dist/leaflet.js', - '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'); + 'node_modules/lodash/lodash.js', + 'node_modules/axios/dist/axios.js', + 'node_modules/jquery/dist/jquery.js', + 'node_modules/bootstrap3/dist/js/bootstrap.js', + 'node_modules/popper.js/dist/umd/popper.js', + 'node_modules/popper.js/dist/umd/popper-utils.js', + 'node_modules/select2/dist/js/select2.js', + 'node_modules/leaflet/dist/leaflet.js', + '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') mix.styles([ - 'node_modules/select2/dist/css/select2.css', - 'node_modules/leaflet/dist/leaflet.css', - 'node_modules/flag-icon-css/css/flag-icon.css', - 'public/assets/admin/vendor/pe-icon-7-stroke.css', + 'node_modules/select2/dist/css/select2.css', + 'node_modules/leaflet/dist/leaflet.css', + 'node_modules/flag-icon-css/css/flag-icon.css', + 'public/assets/admin/vendor/pe-icon-7-stroke.css', ], 'public/assets/system/css/vendor.min.css') - .options({ - compressed: true - }) - .sourceMaps(); - + .options({ + compressed: true + }) + .sourceMaps() /** * INSTALLER VENDOR FILES */ mix.styles([ - 'node_modules/select2/dist/css/select2.css', - 'node_modules/flag-icon-css/css/flag-icon.css', + 'node_modules/select2/dist/css/select2.css', + 'node_modules/flag-icon-css/css/flag-icon.css', ], 'public/assets/system/css/installer.css') - .options({ - processCssUrls: false, - compressed: true - }) - .sourceMaps(); + .options({ + processCssUrls: false, + compressed: true + }) + .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'); - + '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') /** * DEFAULT SKIN FRONTEND FILES */ mix.sass('public/assets/frontend/sass/now-ui-kit.scss', - 'public/assets/frontend/css/now-ui-kit.css') - .options({ - processCssUrls: false, - compressed: true - }) - .sourceMaps(); - + 'public/assets/frontend/css/now-ui-kit.css') + .options({ + processCssUrls: false, + compressed: true + }) + .sourceMaps() // These should go into the separate vendor.js file const extract = [ - 'lodash', - 'popper.js', - 'jquery', - 'select2', - 'pjax', - 'leaflet', - 'Leaflet.Geodesic', - 'leaflet-rotatedmarker' -]; + 'lodash', + 'popper.js', + 'jquery', + 'select2', + 'pjax', + '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')