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

More fixes for maps; user API key set to design

Browse Source
This commit is contained in:
Nabeel Shahzad
2017-12-19 17:30:30 -06:00
parent f2131093c4
commit ac4958a2be
6 changed files with 139 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
resources/views/admin/app.blade.php
View File

@@ -17,19 +17,17 @@
<link rel="stylesheet" href="{{ public_asset('/assets/admin/css/admin.css') }}">
<style type="text/css">
/*.card {
display: inline-block;
position: relative;
overflow: hidden;
width: 100%;
margin-bottom: 20px;
!*box-shadow: 0px 5px 25px 0px rgba(0, 0, 0, 0.2);*!
}*/
@yield('css')
</style>
<script>
@if (Auth::user())
const PHPVMS_USER_API_KEY = "{!! Auth::user()->api_key !!}";
@else
const PHPVMS_USER_API_KEY = false;
@endif
</script>
</head>
<body>

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

@@ -18,9 +18,12 @@
<link href="{!! public_asset('/assets/frontend/css/bootstrap.min.css') !!}" rel="stylesheet"/>
<link href="{!! public_asset('/assets/vendor/select2/dist/css/select2.min.css') !!}" rel="stylesheet"/>
<link href="{!! public_asset('/assets/frontend/css/now-ui-kit.css') !!}" rel="stylesheet"/>
<link href="{!! public_asset('/assets/admin/vendor/leaflet.css') !!}" rel="stylesheet"/>
<link href="{!! public_asset('/assets/frontend/css/styles.css') !!}" rel="stylesheet"/>
<link rel="stylesheet" href="https://unpkg.com/leaflet@1.2.0/dist/leaflet.css"
integrity="sha512-M2wvCLH6DSRazYeZRIm1JnYyh22purTM+FDB5CsyxtQJYeKq83arPe5wgbNmcFXGqiSH2XR8dT/fJISVA1r/zQ=="
crossorigin=""/>
<style>
.font-large {
font-size: 20px;
@@ -33,6 +36,14 @@
@yield('css')
<script>
@if (Auth::user())
const PHPVMS_USER_API_KEY = "{!! Auth::user()->api_key !!}";
@else
const PHPVMS_USER_API_KEY = false;
@endif
</script>
</head>
<body>
@@ -157,7 +168,10 @@
<script src="{!! public_asset('/assets/frontend/js/plugins/bootstrap-datepicker.js') !!}" type="text/javascript"></script>
<script src="{!! public_asset('/assets/frontend/js/now-ui-kit.js') !!}" type="text/javascript"></script>
<script src="{!! public_asset('/assets/vendor/select2/dist/js/select2.js') !!}"></script>
<script src="https://unpkg.com/leaflet@1.2.0/dist/leaflet.js"></script>
<script src="https://unpkg.com/leaflet@1.2.0/dist/leaflet.js"
integrity="sha512-lInM/apFSqyy1o6s89K4iQUKg6ppXEgsVxT35HbzUupEVRh2Eu9Wdl4tHj7dZO0s1uvplcYGmt3498TtHq+log=="
crossorigin=""></script>
<script src="{!! public_asset('/assets/system/js/system.js') !!}"></script>

19
resources/views/layouts/default/pireps/map.blade.php Normal file
View File

@@ -0,0 +1,19 @@
<div class="row">
<div class="col-md-12">
<h3 class="description">map</h3>
</div>
<div class="col-12">
<div class="box-body">
<div id="map" style="width: 100%; height: 800px"></div>
</div>
</div>
</div>
@section('scripts')
<script type="text/javascript">
phpvms.render_airspace_map({
lat: {!! $pirep->arr_airport->lat !!},
lon: {!! $pirep->arr_airport->lon !!},
});
</script>
@endsection

43
resources/views/layouts/default/pireps/show.blade.php
View File

@@ -3,23 +3,26 @@
@section('title', 'PIREP '.$pirep->getFlightId())
@section('content')
<div class="row">
<div class="col-md-8">
<div class="col-md-12">
<h2 class="description">{!! $pirep->getFlightId() !!}</h2>
</div>
<div class="col-md-4 align-right">
@if($pirep->status == config('enums.pirep_status.PENDING'))
<div class="badge badge-warning "><span class="font-large">Pending</span></div>
@elseif($pirep->status === config('enums.pirep_status.ACCEPTED'))
<div class="badge badge-success">Accepted</div>
@else
<div class="badge badge-danger">Rejected</div>
@endif
</div>
</div>
<div class="row">
<div class="col-md-12">
<table class="table">
<tr>
<td>Status</td>
<td>
@if($pirep->status == config('enums.pirep_status.PENDING'))
<div class="badge badge-warning ">Pending</div>
@elseif($pirep->status === config('enums.pirep_status.ACCEPTED'))
<div class="badge badge-success">Accepted</div>
@else
<div class="badge badge-danger">Rejected</div>
@endif
</td>
</tr>
<tr>
<td>Departure/Arrival</td>
<td>
@@ -76,22 +79,6 @@
</div>
</div>
<div class="row">
<div class="col-md-12">
<h3 class="description">map</h3>
</div>
<div class="col-xs-12">
<div class="box-body">
<div id="map" style="width: 100%; height: 800px"></div>
</div>
</div>
</div>
@endsection
@section('scripts')
<script type="text/javascript">
phpvms_render_airspace_map({
lat: {!! $pirep->arr_airport->lat !!},
lon: {!! $pirep->dpt_airport->lon !!},
});
</script>
@include('layouts.default.pireps.map')
@endsection