Fix js deps and airport lookup

This commit is contained in:
Nabeel Shahzad
2018-03-28 23:04:53 -05:00
parent d5452d6517
commit 95fed87ad4
12 changed files with 34202 additions and 43 deletions

View File

@@ -2,11 +2,6 @@
* 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');
/**
@@ -17,6 +12,12 @@ window.phpvms = {};
/**
* Configure Axios with both the csrf token and the API key
*/
const base_url = document.head.querySelector('meta[name="base-url"]');
if(base_url) {
window.axios.default.baseURL = base_url;
}
window.axios.defaults.headers.common['X-Requested-With'] = 'XMLHttpRequest';
const token = document.head.querySelector('meta[name="csrf-token"]');

View File

@@ -1,7 +1,6 @@
@section('scripts')
<script>
function setEditable() {
const csrf_token = $('meta[name="csrf-token"]').attr('content');
const api_key = $('meta[name="api-key"]').attr('content');
@@ -53,19 +52,13 @@ function setEditable() {
}
function phpvms_vacentral_airport_lookup(icao, callback) {
const api_key = $('meta[name="api-key"]').attr('content');
const csrf_token = $('meta[name="csrf-token"]').attr('content');
$.ajax({
url: '{{url('/api/airports')}}/' + icao + '/lookup',
let params = {
method: 'GET',
headers: {
'x-api-key': api_key,
'X-CSRF-TOKEN': csrf_token
}
}).done(function (data, status) {
callback(data.data);
url: '/api/airports/' + icao + '/lookup',
};
axios(params).then(response => {
callback(response.data);
});
}
@@ -106,9 +99,8 @@ $(document).ready(function() {
return;
}
phpvms_vacentral_airport_lookup(icao, function(data) {
console.log('lookup data', data);
_.forEach(data, function(value, key) {
phpvms_vacentral_airport_lookup(icao, function(response) {
_.forEach(response.data, function(value, key) {
if(key === 'city') {
key = 'location';
}

View File

@@ -95,7 +95,7 @@
<script defer src="https://use.fontawesome.com/releases/v5.0.6/js/all.js"></script>
<script defer src="{{ public_asset('/assets/admin/js/vendor.js') }}"></script>
<script defer src="{{ public_asset('/assets/admin/js/admin.js') }}"></script>
<script defer src="{{ public_asset('/assets/admin/js/app.js') }}"></script>
<script>
const getStorage = function(key) {