From 3718c1e0aacf8091a3470448072216e49f3845b6 Mon Sep 17 00:00:00 2001
From: Aldarien <aldarien85@gmail.com>
Date: Tue, 14 Feb 2023 22:50:35 -0300
Subject: [PATCH] Improve looks

---
 app/common/Controller/Base.php          |  6 +-
 app/common/Service/Logs.php             |  8 ++-
 app/resources/views/home.blade.php      |  2 +-
 app/resources/views/logs/base.blade.php |  2 +-
 app/resources/views/logs/show.blade.php | 79 +++++++++++++------------
 app/src/Log.php                         |  6 +-
 app/src/Log/File.php                    | 12 +++-
 7 files changed, 70 insertions(+), 45 deletions(-)

diff --git a/app/common/Controller/Base.php b/app/common/Controller/Base.php
index 1f9e35c..a5b3693 100644
--- a/app/common/Controller/Base.php
+++ b/app/common/Controller/Base.php
@@ -1,16 +1,20 @@
 <?php
 namespace ProVM\Common\Controller;
 
-use ProVM\Common\Service\Logs;
+use SplFileInfo;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use Slim\Views\Blade as View;
+use ProVM\Common\Service\Logs;
 
 class Base
 {
     public function __invoke(ServerRequestInterface $request, ResponseInterface $response, View $view, Logs $service): ResponseInterface
     {
         $files = $service->getFiles();
+        usort($files, function(SplFileInfo $a, SplFileInfo $b) {
+            return $b->getCTime() - $a->getCTime();
+        });
         return $view->render($response, 'home', compact('files'));
     }
 }
diff --git a/app/common/Service/Logs.php b/app/common/Service/Logs.php
index 24d65f4..d389197 100644
--- a/app/common/Service/Logs.php
+++ b/app/common/Service/Logs.php
@@ -1,6 +1,8 @@
 <?php
 namespace ProVM\Common\Service;
 
+use DateTimeImmutable;
+use SplFileInfo;
 use ProVM\Logview\Log\File;
 
 class Logs
@@ -38,7 +40,9 @@ class Logs
     }
     public function get(string $log_file): File
     {
-        $content = \Safe\file_get_contents(implode(DIRECTORY_SEPARATOR, [$this->getFolder(), $log_file]));
-        return (new File())->setFilename($log_file)->setContent($content);
+        $filename = implode(DIRECTORY_SEPARATOR, [$this->getFolder(), $log_file]);
+        $file_info = new SplFileInfo($filename);
+        $content = \Safe\file_get_contents($filename);
+        return (new File())->setFilename($log_file)->setDate((new DateTimeImmutable())->setTimestamp($file_info->getCTime()))->setContent($content);
     }
 }
diff --git a/app/resources/views/home.blade.php b/app/resources/views/home.blade.php
index fe56fd2..fde4321 100644
--- a/app/resources/views/home.blade.php
+++ b/app/resources/views/home.blade.php
@@ -4,7 +4,7 @@
     <div class="ui container">
         <div class="ui list">
             @foreach ($files as $file)
-                <a class="item" href="{{$urls->base}}/log/{{urlencode($file->getBasename())}}">{{$file->getBasename()}}</a>
+                <a class="item" href="{{$urls->base}}/log/{{urlencode($file->getBasename())}}">[{{(new DateTimeImmutable)->setTimestamp($file->getCTime())->format('Y-m-d H:i:s')}}] {{$file->getBasename()}}</a>
             @endforeach
         </div>
     </div>
diff --git a/app/resources/views/logs/base.blade.php b/app/resources/views/logs/base.blade.php
index 532a8bb..6993900 100644
--- a/app/resources/views/logs/base.blade.php
+++ b/app/resources/views/logs/base.blade.php
@@ -1,5 +1,5 @@
 @extends('layout.base')
 
 @section('page_title')
-    File {{$log->getFilename()}}
+    Log File
 @endsection
diff --git a/app/resources/views/logs/show.blade.php b/app/resources/views/logs/show.blade.php
index cd1183d..15daf0e 100644
--- a/app/resources/views/logs/show.blade.php
+++ b/app/resources/views/logs/show.blade.php
@@ -2,54 +2,58 @@
 
 @section('page_content')
     <div class="ui container">
-        <h3 class="ui header">Logs</h3>
-    </div>
-    <div class="ui accordion">
-        @foreach($log->getLogs() as $line)
-            <div class="title {{strtolower($line->getSeverity())}}">
-                <i class="dropdown icon"></i>
-                {{$line->getDate()->format('Y-m-d H:i:s.u')}} - {{$line->getSeverity()}}
-            </div>
-            <div class="content">
-                <div class="ui fluid card">
-                    <div class="content">
-                        <div class="header">
-                            <span class="{{strtolower($line->getSeverity())}}" style="padding: 1ex 1em;">
-                                <i class="bug icon"></i>
-                                {{$line->getChannel()}}.{{$line->getSeverity()}}
-                            </span>
+        <h3 class="ui header">Log File: {{$log->getFilename()}}</h3>
+        <h5 class="ui header">{{$log->getDate()->format('Y-m-d H:i:s')}}</h5>
+        <div class="ui accordion">
+            @foreach($log->getLogs() as $line)
+                <div class="title">
+                    <i class="dropdown icon"></i>
+                    <span class="{{strtolower($line->getSeverity())}}" style="padding-left: 1ex;padding-right: 1ex;">
+                        {{$line->getDate()->format('Y-m-d H:i:s.u')}} - {{$line->getSeverity()}}
+                    </span>
+                </div>
+                <div class="content">
+                    <div class="ui fluid basic card">
+                        <div class="content">
+                            <div class="header">
+                                <span class="{{strtolower($line->getSeverity())}}" style="padding: 1ex 1em;">
+                                    <i class="bug icon"></i>
+                                    {{$line->getChannel()}}.{{$line->getSeverity()}}
+                                </span>
+                            </div>
                         </div>
-                    </div>
-                    <div class="content">
-                        <div class="description">
-                            {{$line->getMessage()}}
-                        </div>
-                        @if ($line->hasStack())
-                            <div class="ui small feed">
-                                @foreach ($line->getStack() as $stack)
-                                    <div class="event">
-                                        <div class="content">
-                                            {{$stack}}
+                        <div class="content">
+                            <div class="description">
+                                {{$line->getMessage()}}
+                            </div>
+                            @if ($line->hasStack())
+                                <div class="ui small feed">
+                                    @foreach ($line->getStack() as $stack)
+                                        <div class="event">
+                                            <div class="content">
+                                                {{$stack}}
+                                            </div>
                                         </div>
-                                    </div>
-                                @endforeach
+                                    @endforeach
+                                </div>
+                            @endif
+                        </div>
+                        @if ($line->hasContext())
+                            <div class="extra content">
+                                {{$line->getContext()}}
+                                <div class="meta">{{$line->getExtra()}}</div>
                             </div>
                         @endif
                     </div>
-                    @if ($line->hasContext())
-                        <div class="extra content">
-                            {{$line->getContext()}}
-                            <div class="meta">{{$line->getExtra()}}</div>
-                        </div>
-                    @endif
                 </div>
-            </div>
-        @endforeach
+            @endforeach
+        </div>
     </div>
 @endsection
 
 @push('page_styles')
     <style>
+        body {overflow-y:scroll;}
         @foreach ($levels as $level => $colors)
             .{{$level}} {background-color: {{$colors->background}}; color: {{$colors->text}};}
         @endforeach
@@ -58,6 +62,7 @@
 
 @push('page_scripts')
     <script type="text/javascript">
+
         $('.accordion').accordion()
     </script>
 @endpush
diff --git a/app/src/Log.php b/app/src/Log.php
index c2f129f..13b31ff 100644
--- a/app/src/Log.php
+++ b/app/src/Log.php
@@ -16,7 +16,7 @@ class Log
 
     public function getDate(): DateTimeInterface
     {
-        return $this->dateTime;
+        return $this->dateTime ?? new DateTimeImmutable();
     }
     public function getChannel(): string
     {
@@ -103,7 +103,9 @@ class Log
 
         $regex = "/\[(?P<date>.*)\]\s(?<channel>\w*)\.(?<severity>\w*):\s(?<message>.*)\s[\[|\{](?<context>.*)[\]|\}]\s\[(?<extra>.*)\]/";
         preg_match($regex, $content, $matches);
-        $log->setDate(DateTimeImmutable::createFromFormat('Y-m-d\TH:i:s.uP', $matches['date']));
+        if (isset($matches['date'])) {
+            $log->setDate(DateTimeImmutable::createFromFormat('Y-m-d\TH:i:s.uP', $matches['date']));
+        }
         $log->setChannel($matches['channel']);
         $log->setSeverity($matches['severity']);
         $message = $matches['message'];
diff --git a/app/src/Log/File.php b/app/src/Log/File.php
index 07d0778..aab13b5 100644
--- a/app/src/Log/File.php
+++ b/app/src/Log/File.php
@@ -1,18 +1,23 @@
 <?php
 namespace ProVM\Logview\Log;
 
-use Generator;
+use DateTimeInterface;
 use ProVM\Logview\Log;
 
 class File
 {
     protected string $filename;
+    protected DateTimeInterface $dateTime;
     protected string $content;
 
     public function getFilename(): string
     {
         return $this->filename;
     }
+    public function getDate(): DateTimeInterface
+    {
+        return $this->dateTime;
+    }
     public function getContent(): string
     {
         return $this->content;
@@ -23,6 +28,11 @@ class File
         $this->filename = $filename;
         return $this;
     }
+    public function setDate(DateTimeInterface $dateTime): File
+    {
+        $this->dateTime = $dateTime;
+        return $this;
+    }
     public function setContent(string $content): File
     {
         $this->content = $content;