Add BASE_URL constant to page and have AJAX calls use it

This commit is contained in:
Nabeel Shahzad 2018-01-02 10:59:44 -06:00
parent 2325573c50
commit cb772a3c62
5 changed files with 18 additions and 14 deletions

View File

@ -41,8 +41,12 @@ if(!function_exists('show_datetime')) {
* @param \Carbon\Carbon $date * @param \Carbon\Carbon $date
* @return string * @return string
*/ */
function show_datetime(\Carbon\Carbon $date) function show_datetime(\Carbon\Carbon $date=null)
{ {
if(empty($date)) {
return '-';
}
$timezone = 'UTC'; $timezone = 'UTC';
if (Auth::check()) { if (Auth::check()) {
$timezone = Auth::user()->timezone ?: $timezone; $timezone = Auth::user()->timezone ?: $timezone;

View File

@ -2,15 +2,3 @@
* admin functions, mostly map/mapping related * admin functions, mostly map/mapping related
*/ */
function phpvms_vacentral_airport_lookup(icao, callback) {
$.ajax({
url: '/api/airports/' + icao + '/lookup',
method: 'GET',
headers: {
'x-api-key': PHPVMS_USER_API_KEY
}
}).done(function (data, status) {
callback(data.data);
});
}

View File

@ -1,5 +1,16 @@
@section('scripts') @section('scripts')
<script> <script>
function phpvms_vacentral_airport_lookup(icao, callback) {
$.ajax({
url: BASE_URL + '/api/airports/'+ icao + '/lookup',
method: 'GET',
headers: {
'x-api-key': PHPVMS_USER_API_KEY
}
}).done(function (data, status) {
callback(data.data);
});
}
$(document).ready(function() { $(document).ready(function() {

View File

@ -23,6 +23,7 @@
</style> </style>
<script> <script>
const BASE_URL ='{!! url('/') !!}';
@if (Auth::user()) @if (Auth::user())
const PHPVMS_USER_API_KEY = "{!! Auth::user()->api_key !!}"; const PHPVMS_USER_API_KEY = "{!! Auth::user()->api_key !!}";
@else @else

View File

@ -3,7 +3,7 @@
function changeStatus(values) { function changeStatus(values) {
var destContainer = '#pirep_' + values.pirep_id + '_container'; var destContainer = '#pirep_' + values.pirep_id + '_container';
$.ajax({ $.ajax({
url: '/admin/pireps/' + values.pirep_id + '/status', url: BASE_URL + '/admin/pireps/' + values.pirep_id + '/status',
data: values, data: values,
type: 'POST', type: 'POST',
headers: { headers: {