Merge branch 'develop'

Odirlei · Odirlei · commit e5728b915d7a · 2018-02-15T14:09:11.000-02:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,8 @@
 
 ## Change log
 
+* v.1.0.3
+    * Add module log viewer
 * v.1.0.0
     * Upgrade Laravel 5.5
 
diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 	<img src="http://i.imgur.com/ogUP6GJ.png" alt="Borgert CMS">
     <p>
         A simple CMS to start projects in Laravel containing some modules.<br>
-        Blog, Pages, Products, Mailbox, Image Gallery and Users.
+        Blog, Pages, Products, Mailbox, Image Gallery, Log Viewer and Users.
     </p>
     <br>
 </div>
diff --git a/composer.json b/composer.json
@@ -16,7 +16,8 @@
         "doctrine/dbal": "^2.5",
         "thomaswelton/laravel-gravatar": "^1.1",
         "kyslik/column-sortable": "5.5.*",
-        "laravel/passport": "^2.0"
+        "laravel/passport": "^2.0",
+        "rap2hpoutre/laravel-log-viewer": "^0.11.0"
     },
     "require-dev": {
         "fzaninotto/faker": "~1.4",
diff --git a/config/app.php b/config/app.php
@@ -108,7 +108,7 @@
     |
     */
 
-    'log' => env('APP_LOG', 'single'),
+    'log' => env('APP_LOG', 'daily'),
 
     /*
     |--------------------------------------------------------------------------
@@ -160,6 +160,7 @@
         Thomaswelton\LaravelGravatar\LaravelGravatarServiceProvider::class,
         Kyslik\ColumnSortable\ColumnSortableServiceProvider::class,
         Laravel\Passport\PassportServiceProvider::class,
+        Rap2hpoutre\LaravelLogViewer\LaravelLogViewerServiceProvider::class,
 
     ],
 
diff --git a/docs/en/modules.md b/docs/en/modules.md
@@ -16,6 +16,7 @@
 	* Archive
 	* Trash
 5. Users
+6. Log Viewer
 
 
 ------------------------------
diff --git a/docs/pt-br/modules.md b/docs/pt-br/modules.md
@@ -16,6 +16,7 @@
 	* Arquivados
 	* Lixeira
 5. Usuários
+6. Log Viewer
 
 
 ------------------------
diff --git a/resources/lang/en/admin/logs.php b/resources/lang/en/admin/logs.php
@@ -0,0 +1,28 @@
+<?php
+
+return [
+
+    'module' => 'Log Viewer',
+
+    'filter' => [
+        'load' => 'Load',
+    ],
+
+    'table' => [
+        'header' => [
+            'level' => 'Level',
+            'context' => 'Context',
+            'date' => 'Date',
+            'content' => 'Content',
+        ]
+    ],
+
+    'file' => [
+        'download' => 'Download file',
+        'delete' => 'Delete file',
+        'delete_all' => 'Delete all',
+        'confirm' => 'Are you sure?',
+        'ultra' => 'Log file >50M, please download it',
+    ],
+
+];
diff --git a/resources/lang/es/admin/logs.php b/resources/lang/es/admin/logs.php
@@ -0,0 +1,28 @@
+<?php
+
+return [
+
+    'module' => 'Log Viewer',
+
+    'filter' => [
+        'load' => 'Carga',
+    ],
+
+    'table' => [
+        'header' => [
+            'level' => 'Nivel',
+            'context' => 'Contexto',
+            'date' => 'Fecha',
+            'content' => 'Contenido',
+        ]
+    ],
+
+    'file' => [
+        'download' => 'Descargar archivo',
+        'delete' => 'Borrar archivo',
+        'delete_all' => 'Borrar todos los archivos',
+        'confirm' => 'Estás seguro?',
+        'ultra' => 'Archivo de registro >50M, por favor descárgalo',
+    ],
+
+];
diff --git a/resources/lang/pt/admin/logs.php b/resources/lang/pt/admin/logs.php
@@ -0,0 +1,28 @@
+<?php
+
+return [
+
+    'module' => 'Log Viewer',
+
+    'filter' => [
+        'load' => 'Carregar',
+    ],
+
+    'table' => [
+        'header' => [
+            'level' => 'Nível',
+            'context' => 'Contexto',
+            'date' => 'Data',
+            'content' => 'Conteúdo',
+        ]
+    ],
+
+    'file' => [
+        'download' => 'Download arquivo',
+        'delete' => 'Apagar arquivo',
+        'delete_all' => 'Apagar todos arquivos',
+        'confirm' => 'Você tem certeza?',
+        'ultra' => 'Arquivo de Log >50M, faça o download',
+    ],
+
+];
diff --git a/resources/views/admin/base.blade.php b/resources/views/admin/base.blade.php
@@ -85,6 +85,7 @@
                         <li><a href="{{ route('admin.gallerys.index') }}"><i class="fa fa-photo"></i> <span class="nav-label">@lang('admin/gallerys.module')</span></a></li>
                         <li><a href="{{ route('admin.mailbox.inbox') }}"><i class="fa fa-envelope"></i> <span class="nav-label">@lang('admin/mailbox.module')</span></a></li>
                         <li><a href="{{ route('admin.users.index') }}"><i class="fa fa-users"></i> <span class="nav-label">@lang('admin/users.module')</span></a></li>
+                        <li><a href="{{ route('admin.logs.index') }}"><i class="fa fa-history"></i> <span class="nav-label">@lang('admin/logs.module')</span></a></li>
                     </ul>
                 </div>
             </nav>
diff --git a/resources/views/vendor/laravel-log-viewer/.gitkeep b/resources/views/vendor/laravel-log-viewer/.gitkeep
diff --git a/resources/views/vendor/laravel-log-viewer/log.blade.php b/resources/views/vendor/laravel-log-viewer/log.blade.php
@@ -0,0 +1,126 @@
+@extends('admin.blog.base')
+
+@section('title', trans('admin/logs.module'), @parent)
+
+@section('stylesheet')
+
+    @parent() 
+
+    <!-- Bootstrap datatables -->
+    <link rel="stylesheet" href="https://cdn.datatables.net/plug-ins/9dcbecd42ad/integration/bootstrap/3/dataTables.bootstrap.css">
+
+@endsection
+
+@section('content')
+
+    <h2>{{ trans('admin/logs.module') }}</h2>
+
+    <div class="ibox">
+        <form action="" class="ibox-content form-horizontal" method="GET">
+            <div class="form-group" style="margin:0;">
+                <div class="col-sm-4">
+                    <select name="l" class="form-control">
+                        @foreach($files as $file)
+                            <option value="{{ base64_encode($file) }}">{{ $file }}</option>
+                        @endforeach
+                    </select>
+                </div>
+                <div class="col-sm-8">
+                    <button type="submit" class="btn btn-primary"> <i class="fa fa-history"></i> {{ trans('admin/logs.filter.load') }}</button>
+                </div>
+            </div>
+        </form>
+    </div>
+
+    <div class="ibox">
+        
+        <div class="ibox-content table-container">
+
+            @if ($logs === null)
+                <div>
+                    {{ trans('admin/logs.file.ultra') }}
+                </div>
+            @else
+                <table id="table-log" class="table table-striped">
+                    <thead>
+                        <tr>
+                            <th>{{ trans('admin/logs.table.header.level') }}</th>
+                            <th>{{ trans('admin/logs.table.header.context') }}</th>
+                            <th>{{ trans('admin/logs.table.header.date') }}</th>
+                            <th>{{ trans('admin/logs.table.header.content') }}</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                        @foreach($logs as $key => $log)
+                            <tr data-display="stack{{{$key}}}">
+                                <td class="text-center text-{{{$log['level_class']}}}"><span class="glyphicon glyphicon-{{{$log['level_img']}}}-sign" aria-hidden="true"></span> &nbsp;{{$log['level']}}</td>
+                                <td class="text">{{$log['context']}}</td>
+                                <td class="date">{{{$log['date']}}}</td>
+                                <td class="text">
+                                    @if ($log['stack'])
+                                        <a class="pull-right expand btn btn-default btn-xs" data-display="stack{{{$key}}}"><span class="glyphicon glyphicon-search"></span></a>
+                                    @endif
+                                    
+                                    {{{$log['text']}}}
+                                    
+                                    @if (isset($log['in_file']))
+                                        <br/>{{{$log['in_file']}}}
+                                    @endif
+                                
+                                    @if ($log['stack'])
+                                        <div class="stack" id="stack{{{$key}}}" style="display: none; white-space: pre-wrap;">{{{ trim($log['stack']) }}}</div>
+                                    @endif
+                                </td>
+                            </tr>
+                        @endforeach
+                    </tbody>
+                </table>
+            @endif
+
+        </div>
+    
+    </div>
+
+    <div>
+        @if($current_file)
+            <a href="?dl={{ base64_encode($current_file) }}" class="btn btn-primary"><i class="fa fa-download"></i> {{ trans('admin/logs.file.download') }}</a>
+            <a id="delete-log" href="?del={{ base64_encode($current_file) }}" class="btn btn-danger"><i class="fa fa-trash"></i> {{ trans('admin/logs.file.delete') }}</a>
+            @if(count($files) > 1)
+                <a id="delete-all-log" href="?delall=true" class="btn btn-danger"><i class="fa fa-trash"></i> {{ trans('admin/logs.file.download_all') }}</a>
+            @endif
+        @endif
+    </div>
+
+@endsection
+
+@section('javascript')
+
+    @parent()
+
+    <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
+    <script src="https://cdn.datatables.net/1.10.4/js/jquery.dataTables.min.js"></script>
+    <script src="https://cdn.datatables.net/plug-ins/9dcbecd42ad/integration/bootstrap/3/dataTables.bootstrap.js"></script>
+    <script>
+        $(document).ready(function () {
+            $('.table-container tr').on('click', function () {
+                $('#' + $(this).data('display')).toggle();
+            });
+            $('#table-log').DataTable({
+                "order": [1, 'desc'],
+                "stateSave": true,
+                "stateSaveCallback": function (settings, data) {
+                    window.localStorage.setItem("datatable", JSON.stringify(data));
+                },
+                "stateLoadCallback": function (settings) {
+                    var data = JSON.parse(window.localStorage.getItem("datatable"));
+                    if (data) data.start = 0;
+                    return data;
+                }
+            });
+            $('#delete-log, #delete-all-log').click(function () {
+                return confirm("{{ trans('admin/logs.file.confirm') }}");
+            });
+        });
+    </script>
+
+@endsection
diff --git a/routes/web.php b/routes/web.php
@@ -46,6 +46,8 @@
     // Dashboard
     Route::get('/', ['as' => 'index', 'uses' => 'Admin\DashboardController@index']);
 
+    Route::get('logs', '\Rap2hpoutre\LaravelLogViewer\LogViewerController@index')->name('logs.index');
+
     // ---------------------------------------------------------------------------------------------
 
     // Mobule: BLOG
