diff --git a/app/Http/Controllers/Api/PirepController.php b/app/Http/Controllers/Api/PirepController.php
index cce3351d..1886c20b 100644
--- a/app/Http/Controllers/Api/PirepController.php
+++ b/app/Http/Controllers/Api/PirepController.php
@@ -182,7 +182,7 @@ class PirepController extends Controller
# See if this user is at the current airport
if (setting('pilots.only_flights_from_current')
- && $user->current_airport_id !== $pirep->dpt_airport_id)
+ && $user->curr_airport_id !== $pirep->dpt_airport_id)
{
throw new UserNotAtAirport();
}
diff --git a/app/Http/Controllers/Frontend/DashboardController.php b/app/Http/Controllers/Frontend/DashboardController.php
index 0da7082a..69ce6fbf 100644
--- a/app/Http/Controllers/Frontend/DashboardController.php
+++ b/app/Http/Controllers/Frontend/DashboardController.php
@@ -18,9 +18,8 @@ class DashboardController extends Controller
* DashboardController constructor.
* @param PirepRepository $pirepRepo
*/
- public function __construct(
- PirepRepository $pirepRepo
- ) {
+ public function __construct(PirepRepository $pirepRepo)
+ {
$this->pirepRepo = $pirepRepo;
}
@@ -37,9 +36,13 @@ class DashboardController extends Controller
} catch (\Exception $e) {
}
+ // Get the current airport for the weather
+ $current_airport = $user->curr_airport_id ?? $user->home_airport_id;
+
return view('dashboard.index', [
- 'user' => $user,
- 'last_pirep' => $last_pirep,
+ 'user' => $user,
+ 'current_airport' => $current_airport,
+ 'last_pirep' => $last_pirep,
]);
}
}
diff --git a/app/Http/Controllers/Frontend/PirepController.php b/app/Http/Controllers/Frontend/PirepController.php
index f3f3885f..d58319e2 100644
--- a/app/Http/Controllers/Frontend/PirepController.php
+++ b/app/Http/Controllers/Frontend/PirepController.php
@@ -244,7 +244,7 @@ class PirepController extends Controller
# Are they allowed at this airport?
if (setting('pilots.only_flights_from_current')
- && Auth::user()->current_airport_id !== $pirep->dpt_airport_id) {
+ && Auth::user()->curr_airport_id !== $pirep->dpt_airport_id) {
return $this->flashError(
'You are currently not at the departure airport!',
'frontend.pireps.create'
diff --git a/app/Widgets/CheckWx.php b/app/Widgets/CheckWx.php
index cdd498d8..c98a160b 100644
--- a/app/Widgets/CheckWx.php
+++ b/app/Widgets/CheckWx.php
@@ -32,7 +32,6 @@ class CheckWx extends Widget
]);
$data = json_decode($data);
- #dd($data);
if($data->results === 1) {
$data = $data->data[0];
@@ -42,9 +41,9 @@ class CheckWx extends Widget
}
return view('widgets.check_wx', [
- 'config' => $this->config,
- 'data' => $data,
- 'unit_alt' => setting('units.altitude'),
+ 'config' => $this->config,
+ 'data' => $data,
+ 'unit_alt' => setting('units.altitude'),
'unit_dist' => setting('units.distance'),
'unit_temp' => setting('units.temperature'),
]);
diff --git a/resources/views/layouts/default/dashboard/index.blade.php b/resources/views/layouts/default/dashboard/index.blade.php
index ed159fa9..172ca2e3 100644
--- a/resources/views/layouts/default/dashboard/index.blade.php
+++ b/resources/views/layouts/default/dashboard/index.blade.php
@@ -58,15 +58,50 @@
Your Last Report
- @include("pireps.pirep_card", ['pirep' => $last_pirep])
+ @include('pireps.pirep_card', ['pirep' => $last_pirep])
@endif
{{ Widget::latestNews(['count' => 1]) }}
+
+ {{-- Sidebar --}}
- {{ Widget::latestPireps(['count' => 5]) }}
- {{ Widget::latestPilots(['count' => 5]) }}
+
+
+ Weather at {{ $current_airport }}
+
+
+
+
+ {{ Widget::checkWx(['icao' => $current_airport]) }}
+
+
+
+
+
+
+ Recent Reports
+
+
+
+
+ {{ Widget::latestPireps(['count' => 5]) }}
+
+
+
+
+
+
+ Newest Pilots
+
+
+
+
+ {{ Widget::latestPilots(['count' => 5]) }}
+
+
+
@endsection
diff --git a/resources/views/layouts/default/widgets/latest_pilots.blade.php b/resources/views/layouts/default/widgets/latest_pilots.blade.php
index e937ec5e..7e25ea9e 100644
--- a/resources/views/layouts/default/widgets/latest_pilots.blade.php
+++ b/resources/views/layouts/default/widgets/latest_pilots.blade.php
@@ -1,20 +1,10 @@
-
-
- Newest Pilots
-
-
-
-
-
- @foreach($users as $u)
-
- |
- {{ $u->pilot_id }}
- |
- {{ $u->name }} |
-
- @endforeach
-
-
-
-
+
+ @foreach($users as $u)
+
+ |
+ {{ $u->pilot_id }}
+ |
+ {{ $u->name }} |
+
+ @endforeach
+
diff --git a/resources/views/layouts/default/widgets/latest_pireps.blade.php b/resources/views/layouts/default/widgets/latest_pireps.blade.php
index 3716bd0b..3d6fe132 100644
--- a/resources/views/layouts/default/widgets/latest_pireps.blade.php
+++ b/resources/views/layouts/default/widgets/latest_pireps.blade.php
@@ -1,24 +1,14 @@
-
-
- Recent Reports
-
-
-
-
-
- @foreach($pireps as $p)
-
- |
- {{ $p->airline->code }}
- |
-
- {{ $p->dpt_airport_id }}-
- {{ $p->arr_airport_id }}
- {{ $p->aircraft->name }}
- |
-
- @endforeach
-
-
-
-
+
+ @foreach($pireps as $p)
+
+ |
+ {{ $p->airline->code }}
+ |
+
+ {{ $p->dpt_airport_id }}-
+ {{ $p->arr_airport_id }}
+ {{ $p->aircraft->name }}
+ |
+
+ @endforeach
+