diff --git a/app/Http/Controllers/Frontend/DashboardController.php b/app/Http/Controllers/Frontend/DashboardController.php index d2d854ce..3ab59e27 100644 --- a/app/Http/Controllers/Frontend/DashboardController.php +++ b/app/Http/Controllers/Frontend/DashboardController.php @@ -26,9 +26,6 @@ class DashboardController extends AppBaseController */ public function index() { - $users = $this->userRepo->recent(); - $pireps = $this->pirepRepo->recent(); - $last_pirep = null; $user = Auth::user(); @@ -38,8 +35,6 @@ class DashboardController extends AppBaseController return $this->view('dashboard.index', [ 'user' => $user, - 'pireps' => $pireps, - 'users' => $users, 'last_pirep' => $last_pirep, ]); } diff --git a/app/Widgets/BaseWidget.php b/app/Widgets/BaseWidget.php new file mode 100644 index 00000000..f039f748 --- /dev/null +++ b/app/Widgets/BaseWidget.php @@ -0,0 +1,20 @@ + 5, + ]; + + /** + * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View + */ + public function run() + { + $userRepo = app(UserRepository::class); + + return $this->view('widgets.recent_pilots', [ + 'config' => $this->config, + 'users' => $userRepo->recent($this->config['count']), + ]); + } +} diff --git a/app/Widgets/RecentPireps.php b/app/Widgets/RecentPireps.php new file mode 100644 index 00000000..601480c2 --- /dev/null +++ b/app/Widgets/RecentPireps.php @@ -0,0 +1,25 @@ + 5, + ]; + + /** + * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View + */ + public function run() + { + $pirepRepo = app(PirepRepository::class); + + return $this->view('widgets.recent_pireps', [ + 'config' => $this->config, + 'pireps' => $pirepRepo->recent($this->config['count']), + ]); + } +} diff --git a/config/laravel-widgets.php b/config/laravel-widgets.php new file mode 100644 index 00000000..38d0f2ea --- /dev/null +++ b/config/laravel-widgets.php @@ -0,0 +1,22 @@ + 'App\Widgets', + + 'use_jquery_for_ajax_calls' => false, + + /* + * Set Ajax widget middleware + */ + 'route_middleware' => [], + + /* + * Relative path from the base directory to a regular widget stub. + */ + 'widget_stub' => 'vendor/arrilot/laravel-widgets/src/Console/stubs/widget.stub', + + /* + * Relative path from the base directory to a plain widget stub. + */ + 'widget_plain_stub' => 'vendor/arrilot/laravel-widgets/src/Console/stubs/widget_plain.stub', +]; diff --git a/resources/views/layouts/default/dashboard/index.blade.php b/resources/views/layouts/default/dashboard/index.blade.php index e83efc28..9a98ca6f 100644 --- a/resources/views/layouts/default/dashboard/index.blade.php +++ b/resources/views/layouts/default/dashboard/index.blade.php @@ -72,51 +72,10 @@
-
- -
- -
- - @foreach($pireps as $p) - - - - - @endforeach -
- {!! $p->airline->code !!} - - {!! $p->dpt_airport_id !!}- - {!! $p->arr_airport_id !!}  - {!! $p->aircraft->name !!} -
-
-
-
+ {{ Widget::recentPireps() }} + + {{ Widget::recentPilots() }} -
- -
- -
- - @foreach($users as $u) - - - - - @endforeach -
- {!! $u->pilot_id !!} - {!! $u->name !!}
-
-
-
@endsection diff --git a/resources/views/layouts/default/widgets/recent_pilots.blade.php b/resources/views/layouts/default/widgets/recent_pilots.blade.php new file mode 100644 index 00000000..6922b2c7 --- /dev/null +++ b/resources/views/layouts/default/widgets/recent_pilots.blade.php @@ -0,0 +1,20 @@ +
+ +
+ +
+ + @foreach($users as $u) + + + + + @endforeach +
+ {!! $u->pilot_id !!} + {!! $u->name !!}
+
+
+
diff --git a/resources/views/layouts/default/widgets/recent_pireps.blade.php b/resources/views/layouts/default/widgets/recent_pireps.blade.php new file mode 100644 index 00000000..5d1db9aa --- /dev/null +++ b/resources/views/layouts/default/widgets/recent_pireps.blade.php @@ -0,0 +1,24 @@ +
+ +
+ +
+ + @foreach($pireps as $p) + + + + + @endforeach +
+ {!! $p->airline->code !!} + + {!! $p->dpt_airport_id !!}- + {!! $p->arr_airport_id !!}  + {!! $p->aircraft->name !!} +
+
+
+