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

strip unnecessary imports from js app files

Browse Source
This commit is contained in:
Nabeel Shahzad
2018-03-27 18:18:25 -05:00
parent 1518b8d4f7
commit a1a8c6f141
18 changed files with 1508 additions and 299 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
resources/js/bootstrap.js vendored
View File

@@ -2,38 +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({
/*window.jquery.ajaxSetup({
'X-CSRF-TOKEN': token.content
})
})*/
} else {
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"]')
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.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
window.PHPVMS_USER_API_KEY = false;
console.error('API Key not found!')
}

10
resources/js/maps/airspace_map.js
View File

@@ -1,5 +1,5 @@
const _ = require('lodash')
const leaflet = require('leaflet')
const leaflet = require('leaflet');
import draw_base_map from './base_map'
@@ -9,15 +9,15 @@ import draw_base_map from './base_map'
* @param opts
*/
export default (opts) => {
opts = _.defaults(opts, {
opts = Object.assign({
render_elem: 'map',
overlay_elem: '',
lat: 0,
lon: 0,
zoom: 12,
layers: [],
set_marker: false,
})
set_marker: true,
}, opts);
let map = draw_base_map(opts)
const coords = [opts.lat, opts.lon]

10
resources/js/maps/base_map.js
View File

@@ -1,18 +1,18 @@
const _ = require('lodash')
const leaflet = require('leaflet')
const leaflet = require('leaflet');
export default (opts) => {
opts = _.defaults(opts, {
opts = Object.assign({
render_elem: 'map',
center: [29.98139, -95.33374],
zoom: 5,
maxZoom: 10,
layers: [],
set_marker: false,
})
}, opts);
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,

6
resources/js/maps/index.js
View File

@@ -2,9 +2,9 @@
* 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'

10
resources/js/maps/live_map.js
View File

@@ -1,5 +1,5 @@
const _ = require('lodash')
const leaflet = require('leaflet')
const leaflet = require('leaflet');
import draw_base_map from './base_map'
import { ACTUAL_ROUTE_COLOR } from './config'
@@ -11,15 +11,15 @@ import { ACTUAL_ROUTE_COLOR } from './config'
*/
export default (opts) => {
opts = _.defaults(opts, {
opts = Object.assign({
update_uri: '/api/acars',
pirep_uri: '/api/pireps/{id}/acars',
positions: null,
render_elem: 'map',
aircraft_icon: '/assets/img/acars/aircraft.png',
})
}, opts);
const map = draw_base_map(opts)
const map = draw_base_map(opts);
const aircraftIcon = leaflet.icon({
iconUrl: opts.aircraft_icon,
iconSize: [42, 42],

12
resources/js/maps/route_map.js
View File

@@ -1,5 +1,5 @@
const _ = require('lodash')
const leaflet = require('leaflet')
const leaflet = require('leaflet');
import draw_base_map from './base_map'
import { ACTUAL_ROUTE_COLOR, PLAN_ROUTE_COLOR } from './config'
@@ -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
}
layer.bindPopup(popup_html)
}
};
/**
* Show each point as a marker
@@ -42,13 +42,13 @@ export const pointToLayer = (feature, latlng) => {
*/
export default (opts) => {
opts = _.defaults(opts, {
opts = Object.assign({
route_points: null,
planned_route_line: null,
actual_route_points: null,
actual_route_line: null,
render_elem: 'map',
})
}, opts);
console.log(opts)

1
resources/views/layouts/default/app.blade.php
View File

@@ -80,6 +80,7 @@
{{-- Start of the required tags block. Don't remove these or things will break!! --}}
{{--<script src="{{ public_asset('/assets/frontend/js/manifest.js') }}"></script>
<script src="{{ public_asset('/assets/frontend/js/vendor.js') }}"></script>--}}
<script src="{{ public_asset('/assets/system/js/vendor.js') }}"></script>
<script src="{{ public_asset('/assets/frontend/js/app.js') }}"></script>
@yield('scripts')