From 31981a3945a8ee4cca19d2a11911d8d8ee4f4d16 Mon Sep 17 00:00:00 2001
From: warinee341-6 <warinee.a@kkumail.com>
Date: Wed, 12 Feb 2025 18:57:29 +0700
Subject: [PATCH] Revert "update log system"

---
 .../app/Http/Controllers/LogController.php       |  3 ---
 .../views/logs/layout/logs-menu.blade.php        | 12 +++++++++---
 .../resources/views/logs/logs-login.blade.php    | 16 ++++++++--------
 .../resources/views/logs/logs-over-all.blade.php | 16 ++++++++--------
 4 files changed, 25 insertions(+), 22 deletions(-)

diff --git a/code/Project_2-master/app/Http/Controllers/LogController.php b/code/Project_2-master/app/Http/Controllers/LogController.php
index 1f26db1..2adb90f 100644
--- a/code/Project_2-master/app/Http/Controllers/LogController.php
+++ b/code/Project_2-master/app/Http/Controllers/LogController.php
@@ -125,9 +125,6 @@ public function overall(Request $request)
             'direction' => $direction
         ]);
     }
-
-
-    
     public function login(Request $request)
     {
         $id = auth()->id();
diff --git a/code/Project_2-master/resources/views/logs/layout/logs-menu.blade.php b/code/Project_2-master/resources/views/logs/layout/logs-menu.blade.php
index f5e2fbd..830cfec 100644
--- a/code/Project_2-master/resources/views/logs/layout/logs-menu.blade.php
+++ b/code/Project_2-master/resources/views/logs/layout/logs-menu.blade.php
@@ -51,7 +51,6 @@
     -->
         <nav class=" navbar default-layout col-lg-12 col-12 p-0 fixed-top d-flex align-items-top flex-row">
             <div class="text-center navbar-brand-wrapper d-flex align-items-center justify-content-start">
-                
                 <div class="me-3">
                     <button class="navbar-toggler navbar-toggler align-self-center" type="button"
                         data-bs-toggle="minimize">
@@ -118,9 +117,7 @@ class="dropdown-item-icon mdi mdi-help-circle-outline text-primary me-2"></i>
                                 FAQ</a>
                             <a class="dropdown-item"><i
                                     class="dropdown-item-icon mdi mdi-power text-primary me-2"></i>Sign Out</a> -->  --}}
-                                    <h2 class="ps-3">Logs System</h2>
                                     <li class="nav-item d-none d-sm-inline-block ms-auto">
-                                        
                                         <a class="nav-link text-dark" href="{{ route('logout') }}" onclick="event.preventDefault();
                                         document.getElementById('logout-form').submit();">
                                             {{ __('Logout') }} <i class="mdi mdi-logout"></i>
@@ -164,6 +161,15 @@ class="dropdown-item-icon mdi mdi-power text-primary me-2"></i>Sign Out</a> -->
                         </a>
                     </li>
                     @endcan
+                    @can('expertises-list')
+                    <li class="nav-item">
+                        <a class="nav-link" href="{{ route('logs.error')}}">
+                            <i class="menu-icon mdi mdi-file-excel"></i>
+                            <span class="menu-title">Log Error</span>
+
+                        </a>
+                    </li>
+                    @endcan
                 </ul>
             </nav>
 
diff --git a/code/Project_2-master/resources/views/logs/logs-login.blade.php b/code/Project_2-master/resources/views/logs/logs-login.blade.php
index d5d5930..ae6e103 100644
--- a/code/Project_2-master/resources/views/logs/logs-login.blade.php
+++ b/code/Project_2-master/resources/views/logs/logs-login.blade.php
@@ -3,7 +3,7 @@
 
 @section('content')
 <div class="container">
-    <h3 class="mb-4">User Login Logs</h3>
+    <h2 class="mb-4">User Login Logs</h2>
 
     <div class="mb-6">
         <form action="{{ route('logs.login') }}" method="GET" class="space-y-4">
@@ -57,32 +57,32 @@ class="mb-2 border rounded w-full py-2 px-3 text-gray-700 leading-tight focus:ou
             <thead style="background-color: black;" class="bg-black text-white">
                 <tr>
                     <th class=" px-4 py-2">
-                        <a style="color:white; text-decoration:none;" href="{{ route('logs.login', array_merge(request()->query(), ['sort_column' => 'id', 'sort_direction' => (request('sort_column') == 'id' && request('sort_direction') == 'asc') ? 'desc' : 'asc'])) }}" class="text-white">
+                        <a href="{{ route('logs.login', array_merge(request()->query(), ['sort_column' => 'id', 'sort_direction' => (request('sort_column') == 'id' && request('sort_direction') == 'asc') ? 'desc' : 'asc'])) }}" class="text-white">
                             No
                         </a>
                     </th>
                     <th class=" px-4 py-2">
-                        <a style="color:white; text-decoration:none;" href="{{ route('logs.login', array_merge(request()->query(), ['sort_column' => 'user_id', 'sort_direction' => (request('sort_column') == 'user_id' && request('sort_direction') == 'asc') ? 'desc' : 'asc'])) }}" class="text-white">
+                        <a href="{{ route('logs.login', array_merge(request()->query(), ['sort_column' => 'user_id', 'sort_direction' => (request('sort_column') == 'user_id' && request('sort_direction') == 'asc') ? 'desc' : 'asc'])) }}" class="text-white">
                             User
                         </a>
                     </th>
                     <th class=" px-4 py-2">
-                        <a style="color:white; text-decoration:none;" href="{{ route('logs.login', array_merge(request()->query(), ['sort_column' => 'action', 'sort_direction' => (request('sort_column') == 'action' && request('sort_direction') == 'asc') ? 'desc' : 'asc'])) }}" class="text-white">
+                        <a href="{{ route('logs.login', array_merge(request()->query(), ['sort_column' => 'action', 'sort_direction' => (request('sort_column') == 'action' && request('sort_direction') == 'asc') ? 'desc' : 'asc'])) }}" class="text-white">
                             Action
                         </a>
                     </th>
                     <th class=" px-4 py-2">
-                        <a style="color:white; text-decoration:none;" href="{{ route('logs.login', array_merge(request()->query(), ['sort_column' => 'description', 'sort_direction' => (request('sort_column') == 'description' && request('sort_direction') == 'asc') ? 'desc' : 'asc'])) }}" class="text-white">
+                        <a href="{{ route('logs.login', array_merge(request()->query(), ['sort_column' => 'description', 'sort_direction' => (request('sort_column') == 'description' && request('sort_direction') == 'asc') ? 'desc' : 'asc'])) }}" class="text-white">
                             Description
                         </a>
                     </th>
                     <th class=" px-4 py-2">
-                        <a style="color:white; text-decoration:none;" href="{{ route('logs.login', array_merge(request()->query(), ['sort_column' => 'ip_address', 'sort_direction' => (request('sort_column') == 'ip_address' && request('sort_direction') == 'asc') ? 'desc' : 'asc'])) }}" class="text-white">
+                        <a href="{{ route('logs.login', array_merge(request()->query(), ['sort_column' => 'ip_address', 'sort_direction' => (request('sort_column') == 'ip_address' && request('sort_direction') == 'asc') ? 'desc' : 'asc'])) }}" class="text-white">
                             IP Address
                         </a>
                     </th>
                     <th class=" px-4 py-2">
-                        <a style="color:white; text-decoration:none;" href="{{ route('logs.login', array_merge(request()->query(), ['sort_column' => 'created_at', 'sort_direction' => (request('sort_column') == 'created_at' && request('sort_direction') == 'asc') ? 'desc' : 'asc'])) }}" class="text-white">
+                        <a href="{{ route('logs.login', array_merge(request()->query(), ['sort_column' => 'created_at', 'sort_direction' => (request('sort_column') == 'created_at' && request('sort_direction') == 'asc') ? 'desc' : 'asc'])) }}" class="text-white">
                             Date
                         </a>
                     </th>
@@ -110,4 +110,4 @@ class="mb-2 border rounded w-full py-2 px-3 text-gray-700 leading-tight focus:ou
     <p class="text-center">No logs found.</p>
     @endif
 </div>
-@endsection
\ No newline at end of file
+@endsection
diff --git a/code/Project_2-master/resources/views/logs/logs-over-all.blade.php b/code/Project_2-master/resources/views/logs/logs-over-all.blade.php
index aa3cd50..6ebea96 100644
--- a/code/Project_2-master/resources/views/logs/logs-over-all.blade.php
+++ b/code/Project_2-master/resources/views/logs/logs-over-all.blade.php
@@ -3,7 +3,7 @@
 
 @section('content')
 <div class="container mx-auto px-4">
-    <h3 class="mb-3 font-semibold">Over all</h3>
+    <h3 class="mt-3 font-semibold">Overall</h3>
 
     <!-- Chart Section -->
     <div class="mb-5 bg-white p-4 rounded-lg shadow">
@@ -71,42 +71,42 @@ class="mb-2 border rounded w-full py-2 px-3 text-gray-700 leading-tight focus:ou
             <tr>
                 <th class="px-4 py-2 w-1/2">
                     <a style="color:white; text-decoration:none;" href="{{ route('logs.overall', ['sort' => 'id', 'direction' => request('direction') === 'asc' ? 'desc' : 'asc'] + request()->query()) }}" class="hover:underline">
-                        No @if(request('sort') === 'id') @endif
+                        No @if(request('sort') === 'id') {{ request('direction') === 'asc' ? '🔼' : '🔽' }} @endif
                     </a>
                 </th>
 
                 <th class="px-4 py-2">
                     <a style="color:white; text-decoration:none;" href="{{ route('logs.overall', ['sort' => 'user', 'direction' => request('direction') === 'asc' ? 'desc' : 'asc'] + request()->query()) }}" class="hover:underline">
                         User
-                        <span>{{ request('sort') === 'user' ? '' : '' }}</span>
-
+                        <span>{{ request('sort') === 'user' ? (request('direction') === 'asc' ? '🔼' : '🔽') : '🔼' }}</span>
                     </a>
                 </th>
 
                 <th class="px-4 py-2">
                     <a style="color:white; text-decoration:none;" href="{{ route('logs.overall', ['sort' => 'action', 'direction' => request('direction') === 'asc' ? 'desc' : 'asc'] + request()->query()) }}" class="hover:underline">
                         Action
-                        <span>{{ request('sort') === 'action' ? '' : ''}}</span>
+                        <span>{{ request('sort') === 'action' ? (request('direction') === 'asc' ? '🔼' : '🔽') : '🔼' }}</span>
                     </a>
                 </th>
 
                 <th class="px-4 py-2">
                     <a style="color:white; text-decoration:none;" href="{{ route('logs.overall', ['sort' => 'description', 'direction' => request('direction') === 'asc' ? 'desc' : 'asc'] + request()->query()) }}" class="hover:underline">
                         Description
-                        <span>{{ request('sort') === 'description' ? '' : '' }}</span>
+                        <span>{{ request('sort') === 'description' ? (request('direction') === 'asc' ? '🔼' : '🔽') : '🔼' }}</span>
                     </a>
                 </th>
 
                 <th class="px-4 py-2">
                     <a style="color:white; text-decoration:none;" href="{{ route('logs.overall', ['sort' => 'ip_address', 'direction' => request('direction') === 'asc' ? 'desc' : 'asc'] + request()->query()) }}" class="hover:underline">
                         IP Address
-                        <span>{{ request('sort') === 'ip_address' ? '' : ''}}</span>
+                        <span>{{ request('sort') === 'ip_address' ? (request('direction') === 'asc' ? '🔼' : '🔽') : '🔼' }}</span>
                     </a>
                 </th>
 
                 <th class="px-4 py-2">
                     <a style="color:white; text-decoration:none;" href="{{ route('logs.overall', ['sort' => 'created_at', 'direction' => request('direction') === 'asc' ? 'desc' : 'asc'] + request()->query()) }}" class="hover:underline">
-                        Date <span>{{ request('sort') === 'created_at' ? '' : ''}}</span>
+                        Created At
+                        <span>{{ request('sort') === 'created_at' ? (request('direction') === 'asc' ? '🔼' : '🔽') : '🔼' }}</span>
                     </a>
                 </th>
             </tr>