From 6e3f293fcb6296355923025cdfbe25a26a353e94 Mon Sep 17 00:00:00 2001 From: Nabeel Shahzad Date: Fri, 4 Aug 2017 20:17:04 -0500 Subject: [PATCH] style and updates to the dashboard --- .../Frontend/DashboardController.php | 9 +- .../2017_06_28_195426_create_pireps_table.php | 2 +- database/seeds/dev.yml | 14 +- .../layouts/default/dashboard/index.blade.php | 132 +++++++++++++++--- 4 files changed, 132 insertions(+), 25 deletions(-) diff --git a/app/Http/Controllers/Frontend/DashboardController.php b/app/Http/Controllers/Frontend/DashboardController.php index 32eab10c..a44865c4 100644 --- a/app/Http/Controllers/Frontend/DashboardController.php +++ b/app/Http/Controllers/Frontend/DashboardController.php @@ -5,6 +5,9 @@ namespace App\Http\Controllers\Frontend; use Illuminate\Support\Facades\Auth; use App\Http\Controllers\AppBaseController; +use App\Models\Pirep; +use App\Models\User; + class DashboardController extends AppBaseController { @@ -15,9 +18,13 @@ class DashboardController extends AppBaseController */ public function index() { - \Event::fire('test.event'); + $pireps = Pirep::orderBy('created_at', 'desc')->take(5)->get(); + $users = User::orderBy('created_at', 'desc')->take(5)->get(); + return $this->view('dashboard.index', [ 'user' => Auth::user(), + 'pireps' => $pireps, + 'users' => $users, ]); } } diff --git a/database/migrations/2017_06_28_195426_create_pireps_table.php b/database/migrations/2017_06_28_195426_create_pireps_table.php index 2c1fb79b..3acd629f 100644 --- a/database/migrations/2017_06_28_195426_create_pireps_table.php +++ b/database/migrations/2017_06_28_195426_create_pireps_table.php @@ -16,7 +16,7 @@ class CreatePirepsTable extends Migration Schema::create('pireps', function (Blueprint $table) { $table->uuid('id'); $table->integer('user_id')->unsigned(); - $table->integer('airline_id')->unsigned()->nullable(); + $table->integer('airline_id')->unsigned(); $table->uuid('flight_id')->nullable(); $table->integer('aircraft_id')->nullable(); $table->string('route_code', 5)->nullable(); diff --git a/database/seeds/dev.yml b/database/seeds/dev.yml index 3a7bfede..47492d63 100644 --- a/database/seeds/dev.yml +++ b/database/seeds/dev.yml @@ -17,7 +17,7 @@ users: home_airport_id: 1 curr_airport_id: 2 flights: 1 - flight_time: 21600 + flight_time: 43200 created_at: now updated_at: now @@ -198,6 +198,7 @@ user_flights: pireps: - id: pirepid_1 user_id: 1 + airline_id: 1 flight_id: flightid_1 aircraft_id: 1 dpt_airport_id: 1 @@ -206,6 +207,17 @@ pireps: level: 320 status: -1 notes: just a pilot report + - id: pirepid_2 + user_id: 1 + airline_id: 1 + flight_id: flightid_2 + aircraft_id: 1 + dpt_airport_id: 2 + arr_airport_id: 1 + flight_time: 21600 # 6 hours + level: 320 + status: -1 + notes: just a pilot report pirep_fields: - id: 1 diff --git a/resources/views/layouts/default/dashboard/index.blade.php b/resources/views/layouts/default/dashboard/index.blade.php index de4ca60a..028290aa 100644 --- a/resources/views/layouts/default/dashboard/index.blade.php +++ b/resources/views/layouts/default/dashboard/index.blade.php @@ -1,40 +1,94 @@ @extends('layouts.default.app') @section('content') + +{{--

welcome back, {!! $user->name !!}

--}}
-
-
-
-
+
+
+
+
+
+

{!! $user->flights !!}

+
{{ str_plural('flight', $user->flights) }}
+
+
+
+
+
+
+

{!! \App\Facades\Utils::secondsToTime($user->flight_time, false)!!}

+
total hours
+
+
+
+ +
+
+
+

{!! $user->current_airport->icao !!}

+
current airport
+
+
+
+
+
+
+ News +
-

News

News goes here! @@ -42,15 +96,49 @@
-
-

- New Report - -

+
-

- My Reports -

+
+
+ Recent Reports +
+
+ +
+ + @foreach($pireps as $p) + + + + + @endforeach +
{!! $p->airline->code !!}{!! $p->flight->flight_number !!} + {!! $p->dpt_airport->icao !!}- + {!! $p->arr_airport->icao !!}  + {!! $p->aircraft->name !!} +
+
+
+
+ +
+
+ Newest Pilots +
+
+ +
+ + @foreach($users as $u) + + + + + @endforeach +
{!! $u->pilot_id() !!}{!! $u->name !!}
+
+
+
@endsection