Skip to content

Commit 1747e4c

Browse files
jeremykenedyjeremykenedy
committed
extend custom user id field to blade files
1 parent e5d9bac commit 1747e4c

File tree

3 files changed

+141
-169
lines changed

3 files changed

+141
-169
lines changed

‎src/resources/views/logger/activity-log-item.blade.php‎

Lines changed: 8 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
@php
2+
$userIdField = config('LaravelLogger.defaultUserIDField')
3+
@endphp
4+
15
@extends(config('LaravelLogger.loggerBladeExtended'))
26

37
@if(config('LaravelLogger.bladePlacement') == 'yield')
@@ -6,7 +10,7 @@
610
@push(config('LaravelLogger.bladePlacementCss'))
711
@endif
812

9-
@include('LaravelLogger::partials.styles')
13+
@include('LaravelLogger::partials.styles')
1014

1115
@if(config('LaravelLogger.bladePlacement') == 'yield')
1216
@endsection
@@ -20,7 +24,7 @@
2024
@push(config('LaravelLogger.bladePlacementJs'))
2125
@endif
2226

23-
@include('LaravelLogger::partials.scripts', ['activities' => $userActivities])
27+
@include('LaravelLogger::partials.scripts', ['activities' => $userActivities])
2428

2529
@if(config('LaravelLogger.bladePlacement') == 'yield')
2630
@endsection
@@ -172,7 +176,6 @@
172176
<div class="row">
173177
<div class="col-xs-12 col-12">
174178
<div class="row">
175-
176179
<div class="col-md-6 col-lg-4">
177180
<ul class="list-group">
178181
<li class="list-group-item @if($isClearedEntry) list-group-item-danger @else active @endif">
@@ -182,17 +185,14 @@
182185
<dl class="dl-horizontal">
183186
<dt>{!! trans('LaravelLogger::laravel-logger.drilldown.list-group.labels.id') !!}</dt>
184187
<dd>{{$activity->id}}</dd>
185-
186188
<dt>{!! trans('LaravelLogger::laravel-logger.drilldown.list-group.labels.description') !!}</dt>
187189
<dd>{{$activity->description}}</dd>
188-
189190
<dt>{!! trans('LaravelLogger::laravel-logger.drilldown.list-group.labels.route') !!}</dt>
190191
<dd>
191192
<a href="@if($activity->route != '/')/@endif{{$activity->route}}">
192193
{{$activity->route}}
193194
</a>
194195
</dd>
195-
196196
<dt>{!! trans('LaravelLogger::laravel-logger.drilldown.list-group.labels.agent') !!}</dt>
197197
<dd>
198198
<i class="fa {{ $platformIcon }} fa-fw" aria-hidden="true">
@@ -211,32 +211,26 @@
211211
</small>
212212
</sup>
213213
</dd>
214-
215214
<dt>{!! trans('LaravelLogger::laravel-logger.drilldown.list-group.labels.locale') !!}</dt>
216215
<dd>
217216
{{ $langDetails }}
218217
</dd>
219-
220218
<dt>{!! trans('LaravelLogger::laravel-logger.drilldown.list-group.labels.referer') !!}</dt>
221219
<dd>
222220
<a href="{{ $activity->referer }}">
223221
{{ $activity->referer }}
224222
</a>
225223
</dd>
226-
227224
<dt>{!! trans('LaravelLogger::laravel-logger.drilldown.list-group.labels.methodType') !!}</dt>
228225
<dd>
229226
<span class="badge badge-{{$methodClass}}">
230227
{{ $activity->methodType }}
231228
</span>
232229
</dd>
233-
234230
<dt>{!! trans('LaravelLogger::laravel-logger.drilldown.list-group.labels.timePassed') !!}</dt>
235231
<dd>{{$timePassed}}</dd>
236-
237232
<dt>{!! trans('LaravelLogger::laravel-logger.drilldown.list-group.labels.createdAt') !!}</dt>
238233
<dd>{{$activity->created_at}}</dd>
239-
240234
</dl>
241235
</li>
242236
</ul>
@@ -266,10 +260,8 @@
266260
</dl>
267261
</li>
268262
</ul>
269-
270263
<br />
271264
</div>
272-
273265
<div class="col-md-12 col-lg-4">
274266
<ul class="list-group">
275267
<li class="list-group-item @if($isClearedEntry) list-group-item-danger @else active @endif">
@@ -283,78 +275,54 @@
283275
{{$activity->userType}}
284276
</span>
285277
</dd>
286-
287278
@if($userDetails)
288-
289279
<dt>{!! trans('LaravelLogger::laravel-logger.drilldown.list-group.labels.userId') !!}</dt>
290-
<dd>{{$userDetails->id}}</dd>
291-
280+
<dd>{{ $userDetails->$userIdField }}</dd>
292281
@if(config('LaravelLogger.rolesEnabled'))
293-
294282
<dt>{!! trans('LaravelLogger::laravel-logger.drilldown.labels.userRoles') !!}</dt>
295-
296283
@foreach ($userDetails->roles as $user_role)
297-
298284
@if ($user_role->name == 'User')
299285
@php $labelClass = 'primary' @endphp
300-
301286
@elseif ($user_role->name == 'Admin')
302287
@php $labelClass = 'warning' @endphp
303-
304288
@elseif ($user_role->name == 'Unverified')
305289
@php $labelClass = 'danger' @endphp
306-
307290
@else
308291
@php $labelClass = 'default' @endphp
309-
310292
@endif
311-
312293
<dd>
313294
<span class="badge badge-{{$labelClass}}">
314295
{{ $user_role->name }} - {!! trans('LaravelLogger::laravel-logger.drilldown.labels.userLevel') !!} {{ $user_role->level }}
315296
</span>
316297
</dd>
317-
318298
@endforeach
319-
320299
@endif
321-
322-
323300
<dt>{!! trans('LaravelLogger::laravel-logger.drilldown.list-group.labels.userName') !!}</dt>
324301
<dd>{{$userDetails->name}}</dd>
325-
326302
<dt>{!! trans('LaravelLogger::laravel-logger.drilldown.list-group.labels.userEmail') !!}</dt>
327303
<dd>
328304
<a href="mailto:{{$userDetails->email}}">
329305
{{$userDetails->email}}
330306
</a>
331307
</dd>
332-
333308
@if($userDetails->last_name || $userDetails->first_name)
334309
<dt>{!! trans('LaravelLogger::laravel-logger.drilldown.list-group.labels.userFulltName') !!}</dt>
335310
<dd>{{$userDetails->last_name}}, {{$userDetails->first_name}}</dd>
336311
@endif
337-
338312
@if($userDetails->signup_ip_address)
339313
<dt>{!! trans('LaravelLogger::laravel-logger.drilldown.list-group.labels.userSignupIp') !!}</dt>
340314
<dd>{{$userDetails->signup_ip_address}}</dd>
341315
@endif
342-
343316
<dt>{!! trans('LaravelLogger::laravel-logger.drilldown.list-group.labels.userCreatedAt') !!}</dt>
344317
<dd>{{$userDetails->created_at}}</dd>
345-
346318
<dt>{!! trans('LaravelLogger::laravel-logger.drilldown.list-group.labels.userUpdatedAt') !!}</dt>
347319
<dd>{{$userDetails->updated_at}}</dd>
348-
349320
@endif
350-
351321
</dl>
352322
</li>
353323
</ul>
354-
355324
<br />
356325
</div>
357-
358326
</div>
359327
</div>
360328
</div>
@@ -381,4 +349,4 @@
381349
</div>
382350
</div>
383351
</div>
384-
@endsection
352+
@endsection

‎src/resources/views/logger/activity-log.blade.php‎

Lines changed: 81 additions & 81 deletions
Original file line numberDiff line numberDiff line change
@@ -35,101 +35,101 @@
3535
@endif
3636

3737
@section('template_title')
38-
{{ trans('LaravelLogger::laravel-logger.dashboard.title') }}
38+
{{ trans('LaravelLogger::laravel-logger.dashboard.title') }}
3939
@endsection
4040

4141
@php
42-
switch (config('LaravelLogger.bootstapVersion')) {
43-
case '4':
44-
$containerClass = 'card';
45-
$containerHeaderClass = 'card-header';
46-
$containerBodyClass = 'card-body';
47-
break;
48-
case '3':
49-
default:
50-
$containerClass = 'panel panel-default';
51-
$containerHeaderClass = 'panel-heading';
52-
$containerBodyClass = 'panel-body';
53-
}
54-
$bootstrapCardClasses = (is_null(config('LaravelLogger.bootstrapCardClasses')) ? '' : config('LaravelLogger.bootstrapCardClasses'));
42+
switch (config('LaravelLogger.bootstapVersion')) {
43+
case '4':
44+
$containerClass = 'card';
45+
$containerHeaderClass = 'card-header';
46+
$containerBodyClass = 'card-body';
47+
break;
48+
case '3':
49+
default:
50+
$containerClass = 'panel panel-default';
51+
$containerHeaderClass = 'panel-heading';
52+
$containerBodyClass = 'panel-body';
53+
}
54+
$bootstrapCardClasses = (is_null(config('LaravelLogger.bootstrapCardClasses')) ? '' : config('LaravelLogger.bootstrapCardClasses'));
5555
@endphp
5656

5757
@section('content')
5858

59-
<div class="container-fluid">
60-
@if(config('LaravelLogger.enableSearch'))
61-
@include('LaravelLogger::partials.form-search')
62-
@endif
63-
@if(config('LaravelLogger.enablePackageFlashMessageBlade'))
64-
@include('LaravelLogger::partials.form-status')
65-
@endif
66-
67-
<div class="row">
68-
<div class="col-sm-12">
69-
<div class="{{ $containerClass }} {{ $bootstrapCardClasses }}">
70-
<div class="{{ $containerHeaderClass }}">
71-
<div style="display: flex; justify-content: space-between; align-items: center;">
72-
73-
@if(config('LaravelLogger.enableSubMenu'))
74-
75-
<span>
76-
{!! trans('LaravelLogger::laravel-logger.dashboard.title') !!}
77-
<small>
78-
<sup class="label label-default">
79-
{{ $totalActivities }} {!! trans('LaravelLogger::laravel-logger.dashboard.subtitle') !!}
80-
</sup>
81-
</small>
82-
</span>
83-
84-
<div class="btn-group pull-right btn-group-xs">
85-
<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
86-
<i class="fa fa-ellipsis-v fa-fw" aria-hidden="true"></i>
87-
<span class="sr-only">
88-
{!! trans('LaravelLogger::laravel-logger.dashboard.menu.alt') !!}
59+
<div class="container-fluid">
60+
@if(config('LaravelLogger.enableSearch'))
61+
@include('LaravelLogger::partials.form-search')
62+
@endif
63+
@if(config('LaravelLogger.enablePackageFlashMessageBlade'))
64+
@include('LaravelLogger::partials.form-status')
65+
@endif
66+
67+
<div class="row">
68+
<div class="col-sm-12">
69+
<div class="{{ $containerClass }} {{ $bootstrapCardClasses }}">
70+
<div class="{{ $containerHeaderClass }}">
71+
<div style="display: flex; justify-content: space-between; align-items: center;">
72+
73+
@if(config('LaravelLogger.enableSubMenu'))
74+
75+
<span>
76+
{!! trans('LaravelLogger::laravel-logger.dashboard.title') !!}
77+
<small>
78+
<sup class="label label-default">
79+
{{ $totalActivities }} {!! trans('LaravelLogger::laravel-logger.dashboard.subtitle') !!}
80+
</sup>
81+
</small>
8982
</span>
90-
</button>
91-
@if(config('LaravelLogger.bootstapVersion') == '4')
92-
<div class="dropdown-menu dropdown-menu-right">
93-
@include('LaravelLogger::forms.clear-activity-log')
94-
<a href="{{route('cleared')}}" class="dropdown-item">
95-
<i class="fa fa-fw fa-history" aria-hidden="true"></i>
96-
{!! trans('LaravelLogger::laravel-logger.dashboard.menu.show') !!}
97-
</a>
98-
</div>
99-
@else
100-
<ul class="dropdown-menu dropdown-menu-right">
101-
<li class="dropdown-item">
102-
@include('LaravelLogger::forms.clear-activity-log')
103-
</li>
104-
<li class="dropdown-item">
105-
<a href="{{route('cleared')}}">
106-
<i class="fa fa-fw fa-history" aria-hidden="true"></i>
107-
{!! trans('LaravelLogger::laravel-logger.dashboard.menu.show') !!}
108-
</a>
109-
</li>
110-
</ul>
111-
@endif
112-
</div>
11383

114-
@else
115-
{!! trans('LaravelLogger::laravel-logger.dashboard.title') !!}
116-
<span class="pull-right label label-default">
117-
{{ $totalActivities }}
118-
<span class="hidden-sms">
119-
{!! trans('LaravelLogger::laravel-logger.dashboard.subtitle') !!}
120-
</span>
121-
</span>
122-
@endif
84+
<div class="btn-group pull-right btn-group-xs">
85+
<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
86+
<i class="fa fa-ellipsis-v fa-fw" aria-hidden="true"></i>
87+
<span class="sr-only">
88+
{!! trans('LaravelLogger::laravel-logger.dashboard.menu.alt') !!}
89+
</span>
90+
</button>
91+
@if(config('LaravelLogger.bootstapVersion') == '4')
92+
<div class="dropdown-menu dropdown-menu-right">
93+
@include('LaravelLogger::forms.clear-activity-log')
94+
<a href="{{route('cleared')}}" class="dropdown-item">
95+
<i class="fa fa-fw fa-history" aria-hidden="true"></i>
96+
{!! trans('LaravelLogger::laravel-logger.dashboard.menu.show') !!}
97+
</a>
98+
</div>
99+
@else
100+
<ul class="dropdown-menu dropdown-menu-right">
101+
<li class="dropdown-item">
102+
@include('LaravelLogger::forms.clear-activity-log')
103+
</li>
104+
<li class="dropdown-item">
105+
<a href="{{route('cleared')}}">
106+
<i class="fa fa-fw fa-history" aria-hidden="true"></i>
107+
{!! trans('LaravelLogger::laravel-logger.dashboard.menu.show') !!}
108+
</a>
109+
</li>
110+
</ul>
111+
@endif
112+
</div>
113+
114+
@else
115+
{!! trans('LaravelLogger::laravel-logger.dashboard.title') !!}
116+
<span class="pull-right label label-default">
117+
{{ $totalActivities }}
118+
<span class="hidden-sms">
119+
{!! trans('LaravelLogger::laravel-logger.dashboard.subtitle') !!}
120+
</span>
121+
</span>
122+
@endif
123123

124+
</div>
125+
</div>
126+
<div class="{{ $containerBodyClass }}">
127+
@include('LaravelLogger::logger.partials.activity-table', ['activities' => $activities, 'hoverable' => true])
128+
</div>
124129
</div>
125130
</div>
126-
<div class="{{ $containerBodyClass }}">
127-
@include('LaravelLogger::logger.partials.activity-table', ['activities' => $activities, 'hoverable' => true])
128-
</div>
129131
</div>
130132
</div>
131-
</div>
132-
</div>
133133

134134
@include('LaravelLogger::modals.confirm-modal', ['formTrigger' => 'confirmDelete', 'modalClass' => 'danger', 'actionBtnIcon' => 'fa-trash-o'])
135135

0 commit comments

Comments
 (0)