Skip to content

Commit a9f9893

Browse files
Merge pull request #452 from ARCANEDEV/develop
Merge the develop changes into master
2 parents 0bd0b39 + 2c273cc commit a9f9893

11 files changed

Lines changed: 782 additions & 15 deletions

File tree

‎.github/workflows/run-tests.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
strategy:
1010
fail-fast: true
1111
matrix:
12-
php: [8.1, 8.2]
12+
php: [8.2, 8.3]
1313
dependency-version: [prefer-lowest, prefer-stable]
1414

1515
name: PHP ${{ matrix.php }} - ${{ matrix.dependency-version }}

‎README.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@ Feel free to check out the [releases](https://github.com/ARCANEDEV/LogViewer/rel
7373
| `sv` | Swedish |
7474
| `th` | Thai |
7575
| `tr` | Turkish |
76+
| `uz` | Uzbek |
7677
| `uk` | Ukrainian |
7778
| `zh` | Chinese (Simplified) |
7879
| `zh-TW` | Chinese (Traditional) |

‎composer.json‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,16 @@
1414
"type": "library",
1515
"license": "MIT",
1616
"require": {
17-
"php": "^8.1",
17+
"php": "^8.2",
1818
"ext-json": "*",
19-
"arcanedev/support": "^10.0",
19+
"arcanedev/support": "^11.0",
2020
"psr/log": "^1.0|^2.0|^3.0"
2121
},
2222
"require-dev": {
23-
"laravel/framework": "^10.0",
23+
"laravel/framework": "^11.0",
2424
"mockery/mockery": "^1.5.1",
25-
"orchestra/testbench-core": "^8.0",
26-
"phpunit/phpunit": "^10.0"
25+
"orchestra/testbench-core": "^9.0",
26+
"phpunit/phpunit": "^10.1"
2727
},
2828
"autoload": {
2929
"psr-4": {
@@ -39,11 +39,11 @@
3939
"scripts": {
4040
"test": "phpunit --colors=always",
4141
"test:dox": "phpunit --testdox --colors=always",
42-
"test:cov": "phpunit --coverage-html coverage"
42+
"test:cov": "phpunit --coverage-html build/coverage"
4343
},
4444
"extra": {
4545
"branch-alias": {
46-
"dev-develop": "10.x-dev"
46+
"dev-develop": "11.x-dev"
4747
},
4848
"laravel": {
4949
"providers": [

‎config/log-viewer.php‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,14 @@
3636
| Theme
3737
| -----------------------------------------------------------------
3838
| Supported themes :
39-
| 'bootstrap-3', 'bootstrap-4'
40-
| Make your own theme by adding a folder to the views directory and specifying it here.
39+
| 'bootstrap-5'
40+
| 'bootstrap-4'
41+
| 'bootstrap-3'
42+
|
43+
| You can make your own theme by adding a folder to the views directory and specifying it here.
4144
*/
4245

43-
'theme' => 'bootstrap-4',
46+
'theme' => 'bootstrap-5',
4447

4548
/* -----------------------------------------------------------------
4649
| Route settings
@@ -55,6 +58,8 @@
5558

5659
'middleware' => env('ARCANEDEV_LOGVIEWER_MIDDLEWARE') ? explode(',', env('ARCANEDEV_LOGVIEWER_MIDDLEWARE')) : null,
5760
],
61+
62+
'show' => 'log-viewer::logs.show'
5863
],
5964

6065
/* -----------------------------------------------------------------

‎phpunit.xml.dist‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,15 @@
66
>
77
<testsuites>
88
<testsuite name="Package Test Suite">
9-
<directory suffix="Test.php">./testsdirectory>
9+
<directory>./testsdirectory>
1010
testsuite>
1111
testsuites>
12-
<coverage>
12+
<source>
1313
<include>
14-
<directory suffix=".php">./srcdirectory>
14+
<directory>./srcdirectory>
1515
include>
16+
source>
17+
<coverage>
1618
<report>
1719
<clover outputFile="build/coverage/clover.xml"/>
1820
<html outputDirectory="build/coverage/html"/>

‎src/Http/Controllers/LogViewerController.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ public function __construct(LogViewerContract $logViewer)
5252
{
5353
$this->logViewer = $logViewer;
5454
$this->perPage = config('log-viewer.per-page', $this->perPage);
55+
$this->showRoute = config('log-viewer.route.show', $this->showRoute);
5556
}
5657

5758
/* -----------------------------------------------------------------

‎src/LogViewer.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ class LogViewer implements LogViewerContract
2424
/**
2525
* LogViewer Version
2626
*/
27-
const VERSION = '9.0.0';
27+
const VERSION = '10.1.0';
2828

2929
/* -----------------------------------------------------------------
3030
| Properties
Lines changed: 277 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,277 @@
1+
2+
<html lang="{{ app()->getLocale() }}">
3+
<head>
4+
<meta charset="utf-8">
5+
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
6+
<meta name="description" content="LogViewer">
7+
<meta name="author" content="ARCANEDEV">
8+
<title>LogViewer - Created by ARCANEDEVtitle>
9+
{{-- Styles --}}
10+
<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-T3c6CoIi6uLrA9TneNEoa7RxnatzjcDSCmG1MXxSR1GAsXEV/Dwwykc2MPK8M2HN" crossorigin="anonymous">
11+
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.4.0/css/font-awesome.min.css">
12+
<link href='https://fonts.googleapis.com/css?family=Montserrat:400,700|Source+Sans+Pro:400,600' rel='stylesheet' type='text/css'>
13+
<style>
14+
html {
15+
position: relative;
16+
min-height: 100%;
17+
}
18+
19+
body {
20+
font-size: .875rem;
21+
margin-bottom: 60px;
22+
}
23+
24+
.main-footer {
25+
position: absolute;
26+
bottom: 0;
27+
width: 100%;
28+
height: 60px;
29+
line-height: 60px;
30+
background-color: #E8EAF6;
31+
}
32+
33+
.main-footer p {
34+
margin-bottom: 0;
35+
}
36+
37+
.main-footer .fa.fa-heart {
38+
color: #C62828;
39+
}
40+
41+
.page-header {
42+
border-bottom: 1px solid #8a8a8a;
43+
}
44+
45+
/*
46+
* Navbar
47+
*/
48+
49+
.navbar-brand {
50+
padding: .75rem 1rem;
51+
font-size: 1rem;
52+
}
53+
54+
.navbar-nav .nav-link {
55+
padding-right: .5rem;
56+
padding-left: .5rem;
57+
}
58+
59+
/*
60+
* Boxes
61+
*/
62+
63+
.box {
64+
display: block;
65+
padding: 0;
66+
min-height: 70px;
67+
background: #fff;
68+
width: 100%;
69+
box-shadow: 0 1px 1px rgba(0,0,0,0.1);
70+
border-radius: .25rem;
71+
}
72+
73+
.box > .box-icon > i,
74+
.box .box-content .box-text,
75+
.box .box-content .box-number {
76+
color: #FFF;
77+
text-shadow: 0 1px 1px rgba(0, 0, 0, 0.3);
78+
}
79+
80+
.box > .box-icon {
81+
border-radius: 2px 0 0 2px;
82+
display: block;
83+
float: left;
84+
height: 70px; width: 70px;
85+
text-align: center;
86+
font-size: 40px;
87+
line-height: 70px;
88+
background: rgba(0,0,0,0.2);
89+
}
90+
91+
.box .box-content {
92+
padding: 5px 10px;
93+
margin-left: 70px;
94+
}
95+
96+
.box .box-content .box-text {
97+
display: block;
98+
font-size: 1rem;
99+
white-space: nowrap;
100+
overflow: hidden;
101+
text-overflow: ellipsis;
102+
font-weight: 600;
103+
}
104+
105+
.box .box-content .box-number {
106+
display: block;
107+
}
108+
109+
.box .box-content .progress {
110+
background: rgba(0,0,0,0.2);
111+
margin: 5px -10px 5px -10px;
112+
}
113+
114+
.box .box-content .progress .progress-bar {
115+
background-color: #FFF;
116+
}
117+
118+
/*
119+
* Log Menu
120+
*/
121+
122+
.log-menu .list-group-item.disabled {
123+
cursor: not-allowed;
124+
}
125+
126+
.log-menu .list-group-item.disabled .level-name {
127+
color: #D1D1D1;
128+
}
129+
130+
/*
131+
* Log Entry
132+
*/
133+
134+
.stack-content {
135+
color: #AE0E0E;
136+
font-family: consolas, Menlo, Courier, monospace;
137+
white-space: pre-line;
138+
font-size: .8rem;
139+
}
140+
141+
/*
142+
* Colors: Badge & Infobox
143+
*/
144+
145+
.badge.badge-env,
146+
.badge.badge-level-all,
147+
.badge.badge-level-emergency,
148+
.badge.badge-level-alert,
149+
.badge.badge-level-critical,
150+
.badge.badge-level-error,
151+
.badge.badge-level-warning,
152+
.badge.badge-level-notice,
153+
.badge.badge-level-info,
154+
.badge.badge-level-debug,
155+
.badge.empty {
156+
color: #FFF;
157+
text-shadow: 0 1px 1px rgba(0, 0, 0, 0.3);
158+
}
159+
160+
.badge.badge-level-all,
161+
.box.level-all {
162+
background-color: {{ log_styler()->color('all') }};
163+
}
164+
165+
.badge.badge-level-emergency,
166+
.box.level-emergency {
167+
background-color: {{ log_styler()->color('emergency') }};
168+
}
169+
170+
.badge.badge-level-alert,
171+
.box.level-alert {
172+
background-color: {{ log_styler()->color('alert') }};
173+
}
174+
175+
.badge.badge-level-critical,
176+
.box.level-critical {
177+
background-color: {{ log_styler()->color('critical') }};
178+
}
179+
180+
.badge.badge-level-error,
181+
.box.level-error {
182+
background-color: {{ log_styler()->color('error') }};
183+
}
184+
185+
.badge.badge-level-warning,
186+
.box.level-warning {
187+
background-color: {{ log_styler()->color('warning') }};
188+
}
189+
190+
.badge.badge-level-notice,
191+
.box.level-notice {
192+
background-color: {{ log_styler()->color('notice') }};
193+
}
194+
195+
.badge.badge-level-info,
196+
.box.level-info {
197+
background-color: {{ log_styler()->color('info') }};
198+
}
199+
200+
.badge.badge-level-debug,
201+
.box.level-debug {
202+
background-color: {{ log_styler()->color('debug') }};
203+
}
204+
205+
.badge.empty,
206+
.box.empty {
207+
background-color: {{ log_styler()->color('empty') }};
208+
}
209+
210+
.badge.badge-env {
211+
background-color: #6A1B9A;
212+
}
213+
214+
#entries {
215+
overflow-wrap: anywhere;
216+
}
217+
style>
218+
head>
219+
<body>
220+
<nav class="navbar navbar-expand-md navbar-dark sticky-top bg-dark p-0">
221+
<a href="{{ route('log-viewer::dashboard') }}" class="navbar-brand mr-0">
222+
<i class="fa fa-fw fa-book">i> LogViewer
223+
a>
224+
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarNav" aria-controls="navbarNav" aria-expanded="false" aria-label="{{ __('Toggle navigation') }}">
225+
<span class="navbar-toggler-icon">span>
226+
button>
227+
<div class="collapse navbar-collapse" id="navbarNav">
228+
<ul class="navbar-nav mr-auto">
229+
<li class="nav-item {{ Route::is('log-viewer::dashboard') ? 'active' : '' }}">
230+
<a href="{{ route('log-viewer::dashboard') }}" class="nav-link">
231+
<i class="fa fa-dashboard">i> @lang('Dashboard')
232+
a>
233+
li>
234+
<li class="nav-item {{ Route::is('log-viewer::logs.list') ? 'active' : '' }}">
235+
<a href="{{ route('log-viewer::logs.list') }}" class="nav-link">
236+
<i class="fa fa-archive">i> @lang('Logs')
237+
a>
238+
li>
239+
ul>
240+
div>
241+
nav>
242+
243+
<div class="container-fluid">
244+
<main role="main" class="pt-3">
245+
@yield('content')
246+
main>
247+
div>
248+
249+
{{-- Footer --}}
250+
<footer class="main-footer">
251+
<div class="container-fluid">
252+
<p class="text-muted pull-left">
253+
LogViewer - <span class="badge text-bg-info">version {{ log_viewer()->version() }}span>
254+
p>
255+
<p class="text-muted pull-right">
256+
Created with <i class="fa fa-heart">i> by ARCANEDEV <sup>&copy;sup>
257+
p>
258+
div>
259+
footer>
260+
261+
{{-- Scripts --}}
262+
<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/js/bootstrap.min.js" integrity="sha384-BBtl+eGJRgqQAUMxJ7pMwbEyER4l1g+O15P+16Ep7Q9Q+zqX6gSbd85u4mG4QzX+" crossorigin="anonymous">script>
263+
<script src="https://cdnjs.cloudflare.com/ajax/libs/Chart.js/4.4.0/chart.umd.min.js" integrity="sha512-SIMGYRUjwY8+gKg7nn9EItdD8LCADSDfJNutF9TPrvEo86sQmFMh6MyralfIyhADlajSxqc7G0gs7+MwWF/ogQ==" crossorigin="anonymous" referrerpolicy="no-referrer">script>
264+
<script>
265+
function ready(fn) {
266+
if (document.readyState !== 'loading'){
267+
fn();
268+
} else {
269+
document.addEventListener('DOMContentLoaded', fn);
270+
}
271+
}
272+
script>
273+
274+
@yield('modals')
275+
@yield('scripts')
276+
body>
277+
html>

0 commit comments

Comments
 (0)