Skip to content

Revert "update log system" #39

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 12, 2025
Merged

Revert "update log system" #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions code/Project_2-master/app/Http/Controllers/LogController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,9 +125,6 @@ public function overall(Request $request)
'direction' => $direction
]);
}



public function login(Request $request)
{
$id = auth()->id();
Expand Down
12 changes: 9 additions & 3 deletions code/Project_2-master/resources/views/logs/layout/logs-menu.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>

Expand Down
16 changes: 8 additions & 8 deletions code/Project_2-master/resources/views/logs/logs-login.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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
@endsection
16 changes: 8 additions & 8 deletions code/Project_2-master/resources/views/logs/logs-over-all.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down Expand Up @@ -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>
Expand Down