style and updates to the dashboard

This commit is contained in:
Nabeel Shahzad
2017-08-04 20:17:04 -05:00
parent 021083f58e
commit 6e3f293fcb
4 changed files with 132 additions and 25 deletions
@@ -5,6 +5,9 @@ namespace App\Http\Controllers\Frontend;
use Illuminate\Support\Facades\Auth; use Illuminate\Support\Facades\Auth;
use App\Http\Controllers\AppBaseController; use App\Http\Controllers\AppBaseController;
use App\Models\Pirep;
use App\Models\User;
class DashboardController extends AppBaseController class DashboardController extends AppBaseController
{ {
@@ -15,9 +18,13 @@ class DashboardController extends AppBaseController
*/ */
public function index() 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', [ return $this->view('dashboard.index', [
'user' => Auth::user(), 'user' => Auth::user(),
'pireps' => $pireps,
'users' => $users,
]); ]);
} }
} }
@@ -16,7 +16,7 @@ class CreatePirepsTable extends Migration
Schema::create('pireps', function (Blueprint $table) { Schema::create('pireps', function (Blueprint $table) {
$table->uuid('id'); $table->uuid('id');
$table->integer('user_id')->unsigned(); $table->integer('user_id')->unsigned();
$table->integer('airline_id')->unsigned()->nullable(); $table->integer('airline_id')->unsigned();
$table->uuid('flight_id')->nullable(); $table->uuid('flight_id')->nullable();
$table->integer('aircraft_id')->nullable(); $table->integer('aircraft_id')->nullable();
$table->string('route_code', 5)->nullable(); $table->string('route_code', 5)->nullable();
+13 -1
View File
@@ -17,7 +17,7 @@ users:
home_airport_id: 1 home_airport_id: 1
curr_airport_id: 2 curr_airport_id: 2
flights: 1 flights: 1
flight_time: 21600 flight_time: 43200
created_at: now created_at: now
updated_at: now updated_at: now
@@ -198,6 +198,7 @@ user_flights:
pireps: pireps:
- id: pirepid_1 - id: pirepid_1
user_id: 1 user_id: 1
airline_id: 1
flight_id: flightid_1 flight_id: flightid_1
aircraft_id: 1 aircraft_id: 1
dpt_airport_id: 1 dpt_airport_id: 1
@@ -206,6 +207,17 @@ pireps:
level: 320 level: 320
status: -1 status: -1
notes: just a pilot report 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: pirep_fields:
- id: 1 - id: 1
@@ -1,40 +1,94 @@
@extends('layouts.default.app') @extends('layouts.default.app')
@section('content') @section('content')
<!--
<div class="row"> <div class="row">
<div class="col-md-4"> <div class="col-sm-2">
<div class="card card-primary text-white"> <div class="card card-primary text-white">
<div class="card-block text-center"> <div class="card-block text-center">
<h1 class="">{!! $user->flights !!}</h1> <h4 class="">{!! $user->flights !!}</h4>
<h2 class="description" style="color: white;">flights</h2> <h5 class="description" style="color: white;">flights</h5>
</div> </div>
</div> </div>
</div> </div>
<div class="col-md-4"> <div class="col-sm-2">
<div class="card card-primary text-white"> <div class="card card-primary text-white">
<div class="card-block text-center"> <div class="card-block text-center">
<h1 class="">{!! \App\Facades\Utils::secondsToTime($user->flight_time, false)!!}</h1> <h4 class="">{!! \App\Facades\Utils::secondsToTime($user->flight_time, false)!!}</h4>
<h2 class="description" style="color: white;">hours</h2> <h5 class="description" style="color: white;">hours</h5>
</div> </div>
</div> </div>
</div> </div>
<div class="col-md-4"> <div class="col-sm-2">
<div class="card card-primary text-white"> <div class="card card-primary text-white">
<div class="card-block text-center"> <div class="card-block text-center">
<h1 class="">{!! $user->current_airport->icao !!}</h1> <h4 class="">{!! $user->current_airport->icao !!}</h4>
<h2 class="description" style="color: white;">current airport</h2> <h5 class="description" style="color: white;">current airport</h5>
</div>
</div>
</div>
<div class="col-sm-2">
<div class="card card-primary text-white">
<div class="card-block text-center">
<h4 class="">{!! $user->current_airport->icao !!}</h4>
<h5 class="description" style="color: white;">current airport</h5>
</div>
</div>
</div>
<div class="col-sm-2">
<div class="card card-primary text-white">
<div class="card-block text-center">
<h4 class="">{!! $user->current_airport->icao !!}</h4>
<h5 class="description" style="color: white;">current airport</h5>
</div>
</div>
</div>
<div class="col-sm-2">
<div class="card card-primary text-white">
<div class="card-block text-center">
<h4 class="">{!! $user->current_airport->icao !!}</h4>
<h5 class="description" style="color: white;">current airport</h5>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
-->
{{--<h3 class="description">welcome back, {!! $user->name !!}</h3>--}}
<div class="row"> <div class="row">
<div class="separator separator-info"></div> <div class="col-sm-8">
</div> <div class="row">
<div class="row"> <div class="col-sm-4">
<div class="col-sm-10"> <div class="card card-primary text-white" style="background: #067ec1; color: #FFF;">
<div class="card-block text-center">
<h4 class="">{!! $user->flights !!}</h4>
<h5 class="description" style="color: white;">{{ str_plural('flight', $user->flights) }}</h5>
</div>
</div>
</div>
<div class="col-sm-4">
<div class="card card-primary text-white" style="background: #067ec1; color: #FFF;">
<div class="card-block text-center">
<h4 class="">{!! \App\Facades\Utils::secondsToTime($user->flight_time, false)!!}</h4>
<h5 class="description" style="color: white;">total hours</h5>
</div>
</div>
</div>
<div class="col-sm-4">
<div class="card card-primary text-white" style="background: #067ec1; color: #FFF;">
<div class="card-block text-center">
<h4 class="">{!! $user->current_airport->icao !!}</h4>
<h5 class="description" style="color: white;">current airport</h5>
</div>
</div>
</div>
</div>
<div class="card"> <div class="card">
<div class="nav nav-tabs" role="tablist" style="background: #067ec1; color: #FFF;">
News
</div>
<div class="card-block"> <div class="card-block">
<p class="category">News</p>
<!-- Tab panes --> <!-- Tab panes -->
<div class="tab-content"> <div class="tab-content">
News goes here! News goes here!
@@ -42,15 +96,49 @@
</div> </div>
</div> </div>
</div> </div>
<div class="col-sm-2 text-center"> <div class="col-sm-4">
<p><a href="#" class="btn btn-info btn-round">
<i class="now-ui-icons ui-2_favourite-28"></i> New Report
</a>
</p>
<p><a href="#" class="btn btn-info btn-round"> <div class="card">
<i class="now-ui-icons ui-2_favourite-28"></i> My Reports <div class="nav nav-tabs" role="tablist" style="background: #067ec1; color: #FFF;">
</a></p> Recent Reports
</div>
<div class="card-block">
<!-- Tab panes -->
<div class="tab-content">
<table>
@foreach($pireps as $p)
<tr>
<td style="padding-right: 10px;">{!! $p->airline->code !!}{!! $p->flight->flight_number !!}</td>
<td>
<span class="description">{!! $p->dpt_airport->icao !!}</span>-
<span class="description">{!! $p->arr_airport->icao !!}</span>&nbsp;
<span class="description">{!! $p->aircraft->name !!}</span>
</td>
</tr>
@endforeach
</table>
</div>
</div>
</div>
<div class="card">
<div class="nav nav-tabs" role="tablist" style="background: #067ec1; color: #FFF;">
Newest Pilots
</div>
<div class="card-block">
<!-- Tab panes -->
<div class="tab-content">
<table>
@foreach($users as $u)
<tr>
<td style="padding-right: 10px;">{!! $u->pilot_id() !!}</td>
<td><span class="description">{!! $u->name !!}</span></td>
</tr>
@endforeach
</table>
</div>
</div>
</div>
</div> </div>
</div> </div>
@endsection @endsection