FGFS-4.1/phpvms
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Show awards on user profile #703 (#866)

Browse Source
This commit is contained in:
Nabeel S
2020-10-11 16:06:09 -04:00
committed by GitHub
parent 151f188886
commit 193fbd369d
16 changed files with 172 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
resources/lang/en/profile.php
View File

@@ -4,7 +4,8 @@ return [
'avatarresize' => 'This avatar will be resized to :width x :height pixels',
'newapikey' => 'New API Key',
'yourprofile' => 'Your Profile',
'your-profile' => 'Your Profile',
'your-awards' => 'Your Awards',
'apikey' => 'API Key',
'apikey-show' => 'Show key',
'dontshare' => 'don\'t share this!',

3
resources/lang/es/profile.php
View File

@@ -4,7 +4,8 @@ return [
'avatarresize' => 'Este avatar será redimensionado a :width x :height pixeles',
'newapikey' => 'Nueva clave API',
'yourprofile' => 'Tu perfil',
'your-profile' => 'Tu Perfil',
'your-awards' => 'Tus Premios',
'apikey' => 'Clave API',
'apikey-show' => 'Mostrar clave',
'dontshare' => '¡No compartas esto!',

3
resources/lang/it/profile.php
View File

@@ -3,7 +3,8 @@
return [
'avatarresize' => 'Questo avatar sarà ridimensionato a :width x :height pixels',
'newapikey' => 'Nuova Chiave API',
'yourprofile' => 'Il Tuo Profilo',
'your-profile' => 'Il Tuo Profilo',
'your-awards' => 'I Tuoi Premi',
'apikey' => 'Chiave API',
'apikey-show' => 'Mostra chiave',
'dontshare' => 'non condividerla!',

3
resources/lang/pt-br/profile.php
View File

@@ -4,7 +4,8 @@ return [
'avatarresize' => 'Este avatar será redimensionado para :width x :height pixels',
'newapikey' => 'Nova Chave API',
'yourprofile' => 'Seu Perfil',
'your-profile' => 'Seu Perfil',
'your-awards' => 'Seus Prêmios',
'apikey' => 'Chave API',
'apikey-show' => 'Mostrar chave',
'dontshare' => 'Não compartilhe isso!',

23
resources/views/admin/users/awards.blade.php Normal file
View File

@@ -0,0 +1,23 @@
@if($user->awards->count() > 0)
<table class="table table-hover">
@foreach($user->awards as $award)
<tr>
<td>{{ $award->name }}</td>
<td>{{ $award->description }}</td>
<td>
{{ Form::open(['url' => url('/admin/users/'.$user->id.'/award/'.$award->id),
'method' => 'delete', 'class' => 'pjax_form form-inline']) }}
{{ Form::button('<i class="fa fa-times"></i>', ['type' => 'submit',
'class' => 'btn btn-danger btn-small',
'onclick' => "return confirm('Are you sure?')",
]) }}
{{ Form::close() }}
</td>
</tr>
@endforeach
</table>
@else
<div class="jumbotron">
<p class="text-center">This user has no awards</p>
</div>
@endif

9
resources/views/admin/users/edit.blade.php
View File

@@ -9,6 +9,15 @@
</div>
</div>
<div class="card border-blue-bottom">
<div class="content">
<div class="header">
<h3>Awards</h3>
</div>
@include('admin.users.awards')
</div>
</div>
<div class="card border-blue-bottom">
<div class="content">
<div class="header">

3
resources/views/layouts/default/home.blade.php
View File

@@ -11,9 +11,6 @@
<h2 class="description">@lang('common.newestpilots')</h2>
@foreach($users as $user)
<div class="card card-signup blue-bg">
{{--<div class="card-bg">--}}
{{--<i class="fa fa-user-o" style="opacity: .1;"></i>--}}
{{--</div>--}}
<div class="header header-primary text-center blue-bg">
<h3 class="title title-up text-white">
<a href="{{ route('frontend.profile.show', [$user->id]) }}" class="text-white">{{ $user->name_private }}</a>

61
resources/views/layouts/default/profile/index.blade.php
View File

@@ -14,24 +14,24 @@
<div><br/></div>
<div class="social-description">
<h2>{{ $user->name_private }}</h2>
<p>{{ $user->ident }}</p>
<p>
{{ $user->ident }}
<span class="flag-icon flag-icon-{{ $user->country }}"></span>
</p>
</div>
<p class="description" style="color: #9A9A9A;">
{{ $user->airline->name }}
</p>
<h6><span class="flag-icon flag-icon-{{ $user->country }}"></span></h6>
<p class="description" style="color: #9A9A9A;">
{{ $user->airline->name }}
</p>
<div class="social-description">
@if (!empty($user->rank->image_url))
<img src="{{ $user->rank->image_url }}" style="width: 160px;">
@endif
<h2>{{ $user->rank->name }}</h2>
<p>{{ $user->rank->name }} <br />
@if($user->home_airport)
@lang('airports.home'): {{ $user->home_airport->icao }}
@endif
</p>
</div>
@if($user->home_airport)
<div class="social-description">
<h2>{{ $user->home_airport->icao }}</h2>
<p>@lang('airports.home')</p>
</div>
@endif
</div>
<div class="col-md-8 content-center">
<div class="content">
@@ -88,6 +88,41 @@
</div>
</div>
{{-- Show the user's award if they have any --}}
@if ($user->awards)
<div class="clearfix" style="height: 50px;"></div>
<div class="row">
<div class="col-sm-12">
<h3 class="description">@lang('profile.your-awards')</h3>
@foreach($user->awards->chunk(3) as $awards)
<div class="row">
@foreach($awards as $award)
<div class="card card-signup">
<div class="header header-primary text-center">
<h4 class="title title-up">{{ $award->name }}</h4>
@if ($award->image_url)
<div class="photo-container">
<img src="{{ $award->image_url }}" alt="{{ $award->description }}" style="width: 123px;">
</div>
@endif
</div>
<div class="content content-center">
<div class="social-description text-center">
{{ $award->description }}
</div>
</div>
<div class="footer text-center">
</div>
</div>
@endforeach
</div>
<div class="clearfix" style="height: 20px;"></div>
@endforeach
</div>
</div>
@endif
{{--
show the details/edit fields only for the currently logged in user
--}}
@@ -108,7 +143,7 @@
class="btn btn-primary">@lang('common.edit')</a>
</div>
<h3 class="description">@lang('profile.yourprofile')</h3>
<h3 class="description">@lang('profile.your-profile')</h3>
<table class="table table-full-width">
<tr>
<td>@lang('common.email')</td>