From 3a02a77eba5b3674d88d834cf50f36244e4df590 Mon Sep 17 00:00:00 2001 From: Nabeel Shahzad Date: Fri, 19 Jan 2018 17:07:31 -0500 Subject: [PATCH] Add pilots list page; fix gravatar display and pilot profile #82 --- app/Database/seeds/sample.yml | 4 +- .../Controllers/Frontend/UserController.php | 30 ++++++ app/Models/User.php | 15 ++- app/Routes/web.php | 3 + config/gravatar.php | 3 +- resources/views/admin/pireps/fields.blade.php | 2 +- resources/views/admin/users/table.blade.php | 2 +- resources/views/layouts/default/app.blade.php | 90 +---------------- .../views/layouts/default/home.blade.php | 2 +- resources/views/layouts/default/nav.blade.php | 96 +++++++++++++++++++ .../layouts/default/profile/index.blade.php | 4 +- .../layouts/default/users/index.blade.php | 17 ++++ .../layouts/default/users/table.blade.php | 38 ++++++++ 13 files changed, 204 insertions(+), 102 deletions(-) create mode 100644 app/Http/Controllers/Frontend/UserController.php create mode 100644 resources/views/layouts/default/nav.blade.php create mode 100644 resources/views/layouts/default/users/index.blade.php create mode 100644 resources/views/layouts/default/users/table.blade.php diff --git a/app/Database/seeds/sample.yml b/app/Database/seeds/sample.yml index 3759d5f3..792204b6 100644 --- a/app/Database/seeds/sample.yml +++ b/app/Database/seeds/sample.yml @@ -36,7 +36,7 @@ users: home_airport_id: KJFK curr_airport_id: KJFK flights: 1 - flight_time: 43200 + flight_time: 4320 created_at: now updated_at: now state: 0 @@ -50,7 +50,7 @@ users: home_airport_id: KJFK curr_airport_id: KAUS flights: 1 - flight_time: 43200 + flight_time: 4320 created_at: now updated_at: now state: 1 diff --git a/app/Http/Controllers/Frontend/UserController.php b/app/Http/Controllers/Frontend/UserController.php new file mode 100644 index 00000000..c7e1f45f --- /dev/null +++ b/app/Http/Controllers/Frontend/UserController.php @@ -0,0 +1,30 @@ +userRepo = $userRepo; + } + + /** + * + */ + public function index(Request $request) + { + return $this->view('users.index',[ + 'country' => new \League\ISO3166\ISO3166(), + 'users' => $this->userRepo->orderBy('name', 'desc')->paginate(25), + ]); + } +} diff --git a/app/Models/User.php b/app/Models/User.php index a4f46c1b..068d64b8 100755 --- a/app/Models/User.php +++ b/app/Models/User.php @@ -88,14 +88,21 @@ class User extends Authenticatable } /** + * @param mixed $size Size of the gravatar, in pixels * @return string */ - public function getGravatarAttribute() + public function gravatar($size=null) { - $size = config('gravatar.size'); $default = config('gravatar.default'); - return config('gravatar.url') . - md5(strtolower(trim($this->email))) . '?d=' . urlencode($default ) . '&s=' . $size; + + $uri = config('gravatar.url') + . md5(strtolower(trim($this->email))).'?d='.urlencode($default); + + if($size !== null) { + $uri .= '&s='.$size; + } + + return $uri; } /** diff --git a/app/Routes/web.php b/app/Routes/web.php index 6c0ecaa9..0de76cbb 100755 --- a/app/Routes/web.php +++ b/app/Routes/web.php @@ -11,6 +11,9 @@ Route::group([ Route::get('r/{id}', 'PirepController@show')->name('pirep.show.public'); Route::get('p/{id}', 'ProfileController@show')->name('profile.show.public'); + Route::get('users', 'UserController@index')->name('users.show'); + Route::get('pilots', 'UserController@index')->name('users.show'); + Route::get('livemap', 'AcarsController@index')->name('livemap.public'); }); diff --git a/config/gravatar.php b/config/gravatar.php index b54e356f..2b3c1090 100644 --- a/config/gravatar.php +++ b/config/gravatar.php @@ -5,6 +5,5 @@ return [ 'url' => 'https://www.gravatar.com/avatar/', - 'default' => 'https://en.gravatar.com/userimage/12856995/7c7c1da6387853fea65ff74983055386.png', - 'size' => 80, + 'default' => 'https://en.gravatar.com/userimage/12856995/aa6c0527a723abfd5fb9e246f0ff8af4.png', ]; diff --git a/resources/views/admin/pireps/fields.blade.php b/resources/views/admin/pireps/fields.blade.php index 83bb3f06..70489d50 100644 --- a/resources/views/admin/pireps/fields.blade.php +++ b/resources/views/admin/pireps/fields.blade.php @@ -1,7 +1,7 @@
{{--
- +
--}} Filed By: {!! $pirep->pilot->pilot_id !!} {!! $pirep->pilot->name !!} diff --git a/resources/views/admin/users/table.blade.php b/resources/views/admin/users/table.blade.php index 06d7d8d3..a78ddaa3 100644 --- a/resources/views/admin/users/table.blade.php +++ b/resources/views/admin/users/table.blade.php @@ -1,4 +1,4 @@ - +
diff --git a/resources/views/layouts/default/app.blade.php b/resources/views/layouts/default/app.blade.php index 989734bf..bba9c86a 100644 --- a/resources/views/layouts/default/app.blade.php +++ b/resources/views/layouts/default/app.blade.php @@ -48,95 +48,7 @@

- + @include('layouts.default.nav')
diff --git a/resources/views/layouts/default/home.blade.php b/resources/views/layouts/default/home.blade.php index f4ae856e..190b7b05 100644 --- a/resources/views/layouts/default/home.blade.php +++ b/resources/views/layouts/default/home.blade.php @@ -21,7 +21,7 @@
+ src="{!! $user->gravatar(123) !!}">
diff --git a/resources/views/layouts/default/nav.blade.php b/resources/views/layouts/default/nav.blade.php new file mode 100644 index 00000000..3bc36b5e --- /dev/null +++ b/resources/views/layouts/default/nav.blade.php @@ -0,0 +1,96 @@ + diff --git a/resources/views/layouts/default/profile/index.blade.php b/resources/views/layouts/default/profile/index.blade.php index fa14dbd7..f98a7644 100644 --- a/resources/views/layouts/default/profile/index.blade.php +++ b/resources/views/layouts/default/profile/index.blade.php @@ -4,7 +4,7 @@
- +

{!! $user->name !!}

@@ -22,7 +22,7 @@
diff --git a/resources/views/layouts/default/users/index.blade.php b/resources/views/layouts/default/users/index.blade.php new file mode 100644 index 00000000..ef4860d3 --- /dev/null +++ b/resources/views/layouts/default/users/index.blade.php @@ -0,0 +1,17 @@ +@extends('layouts.default.app') +@section('title', 'Pilots') + +@section('content') +
+
+

pilots

+ @include('layouts.default.users.table') +
+
+
+
+ {{ $users->links('layouts.default.pagination.default') }} +
+
+@endsection + diff --git a/resources/views/layouts/default/users/table.blade.php b/resources/views/layouts/default/users/table.blade.php new file mode 100644 index 00000000..244f0ac8 --- /dev/null +++ b/resources/views/layouts/default/users/table.blade.php @@ -0,0 +1,38 @@ +
Name Email
+ + + + + + + + + + + @foreach($users as $user) + + + + + + + + + + @endforeach + +
NameAirlineLocationFlightsHours
+
+ +
+ 		+ + {!! $user->name !!} + + + @if(filled($user->country)) + + @endif + {!! $user->airline->icao !!}{!! $user->curr_airport_id !!}{!! $user->flights !!}{!! \App\Facades\Utils::minutesToTimeString($user->flight_time) !!}