Skip to content
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.

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

update NPM dependencies, fix keyboard shortcut overlay dark mode, ignore package-lock.json in git export #392

Merged
merged 2 commits into from
Aug 23, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,6 @@
/psalm.xml.dist export-ignore
/testbench.yaml export-ignore
/UPGRADING.md export-ignore
/package-lock.json export-ignore
/phpstan.neon.dist export-ignore
/phpstan-baseline.neon export-ignore
2,830 changes: 1,531 additions & 1,299 deletions package-lock.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion public/app.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion public/app.js

Large diffs are not rendered by default.

12 changes: 12 additions & 0 deletions public/app.js.LICENSE.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,12 @@
* @license MIT
*/

/*!
* pinia v2.2.2
* (c) 2024 Eduardo San Martin Morote
* @license MIT
*/

/*! #__NO_SIDE_EFFECTS__ */

/*! ieee754. BSD-3-Clause License. Feross Aboukhadijeh <https://feross.org/opensource> */
Expand All @@ -19,3 +25,9 @@
* Based on Underscore.js 1.8.3 <http://underscorejs.org/LICENSE>
* Copyright Jeremy Ashkenas, DocumentCloud and Investigative Reporters & Editors
*/

/**
* @vue/shared v3.4.38
* (c) 2018-present Yuxi (Evan) You and Vue contributors
* @license MIT
**/
4 changes: 2 additions & 2 deletions public/mix-manifest.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"/app.js": "/app.js?id=0148b95eba6dc928019bb19168dd0247",
"/app.css": "/app.css?id=12c5e78a91987c11d8a0cc04436541e9",
"/app.js": "/app.js?id=6c51578cafcbf2f5e90fbf568a61ab8f",
"/app.css": "/app.css?id=5593a0331dd40729ff41e32a6035d872",
"/img/log-viewer-128.png": "/img/log-viewer-128.png?id=d576c6d2e16074d3f064e60fe4f35166",
"/img/log-viewer-32.png": "/img/log-viewer-32.png?id=f8ec67d10f996aa8baf00df3b61eea6d",
"/img/log-viewer-64.png": "/img/log-viewer-64.png?id=8902d596fc883ca9eb8105bb683568c6"
Expand Down
12 changes: 8 additions & 4 deletions resources/css/app.scss
Original file line number Diff line number Diff line change
Expand Up @@ -522,7 +522,9 @@ html.dark {
@apply outline-none ring-1 ring-brand-500 ring-opacity-50 dark:ring-brand-700 dark:ring-opacity-50;
}

transform-origin: top right !important;
& {
transform-origin: top right !important;
}

&.up {
transform-origin: bottom right !important;
Expand All @@ -534,7 +536,9 @@ html.dark {

&.left {
@apply left-1 right-auto;
transform-origin: top left !important;
& {
transform-origin: top left !important;
}

&.up {
transform-origin: bottom left !important;
Expand Down Expand Up @@ -684,9 +688,9 @@ button.button:hover, a.button:hover {
}

.keyboard-shortcut {
@apply text-sm flex items-center justify-start mb-3 w-full text-gray-600 dark:text-gray-400;
@apply text-sm flex items-center justify-start mb-3 w-full text-gray-600 dark:text-gray-300;

.shortcut {
@apply font-mono text-base inline-flex w-6 h-6 mr-2 items-center justify-center rounded border border-gray-400 dark:border-gray-600 ring-1 ring-gray-100 dark:ring-gray-900;
@apply font-mono text-base dark:text-gray-300 inline-flex w-6 h-6 mr-2 items-center justify-center rounded border border-gray-400 dark:border-gray-500 ring-1 ring-gray-100 dark:ring-gray-900;
}
}
4 changes: 2 additions & 2 deletions resources/js/components/KeyboardShortcutsOverlay.vue
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@
<div class="flex h-full flex-col overflow-y-scroll bg-white py-6 shadow-xl dark:bg-gray-700">
<div class="px-4 sm:px-6">
<div class="flex items-start justify-between">
<DialogTitle class="text-base font-semibold leading-6 text-gray-900">Keyboard Shortcuts</DialogTitle>
<DialogTitle class="text-base font-semibold leading-6 text-gray-900 dark:text-gray-100">Keyboard Shortcuts</DialogTitle>
<div class="ml-3 flex h-7 items-center">
<button type="button" class="rounded-md bg-white text-gray-400 hover:text-gray-500 focus:outline-none focus:ring-2 focus:ring-brand-500 focus:ring-offset-2" @click="logViewerStore.helpSlideOverOpen = false">
<button type="button" class="rounded-md bg-white dark:bg-gray-700 text-gray-400 hover:text-gray-500 dark:text-gray-400 dark:hover:text-gray-300 focus:outline-none focus:ring-2 focus:ring-brand-500 dark:focus:ring-brand-300 focus:ring-offset-2" @click="logViewerStore.helpSlideOverOpen = false">
<span class="sr-only">Close panel</span>
<XMarkIcon class="h-6 w-6" aria-hidden="true" />
</button>
Expand Down
3 changes: 1 addition & 2 deletions src/Events/LogFileDeleted.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,5 @@ class LogFileDeleted

public function __construct(
public LogFile $file
) {
}
) {}
}
4 changes: 1 addition & 3 deletions src/Exceptions/CannotCloseFileException.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,4 @@

use Exception;

class CannotCloseFileException extends Exception
{
}
class CannotCloseFileException extends Exception {}
4 changes: 1 addition & 3 deletions src/Exceptions/CannotOpenFileException.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,4 @@

use Exception;

class CannotOpenFileException extends Exception
{
}
class CannotOpenFileException extends Exception {}
4 changes: 1 addition & 3 deletions src/Exceptions/InvalidChunkSizeException.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,4 @@

use Exception;

class InvalidChunkSizeException extends Exception
{
}
class InvalidChunkSizeException extends Exception {}
4 changes: 1 addition & 3 deletions src/Exceptions/InvalidRegularExpression.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,4 @@

use Exception;

class InvalidRegularExpression extends Exception
{
}
class InvalidRegularExpression extends Exception {}
4 changes: 1 addition & 3 deletions src/Exceptions/SkipLineException.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,4 @@

namespace Opcodes\LogViewer\Exceptions;

class SkipLineException extends \Exception
{
}
class SkipLineException extends \Exception {}
3 changes: 1 addition & 2 deletions src/LevelCount.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,5 @@ public function __construct(
public LevelInterface $level,
public int $count = 0,
public bool $selected = false,
) {
}
) {}
}
2 changes: 1 addition & 1 deletion src/LogFolder.php
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ public function download(): BinaryFileResponse
// just in case we have created it before.
@unlink($zipPath);

$zip = new \ZipArchive();
$zip = new \ZipArchive;

if ($zip->open($zipPath, \ZipArchive::CREATE) !== true) {
throw new \Exception('Could not open '.$zipPath.' for writing.');
Expand Down
3 changes: 1 addition & 2 deletions src/LogIndexChunk.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,7 @@ public function __construct(
public array $data,
public int $index,
public int $size,
) {
}
) {}

public static function fromDefinitionArray(array $definition): LogIndexChunk
{
Expand Down
3 changes: 1 addition & 2 deletions src/LogLevels/HttpStatusCodeLevel.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,7 @@ class HttpStatusCodeLevel implements LevelInterface
{
public function __construct(
public string $value,
) {
}
) {}

public static function from(?string $value = null): LevelInterface
{
Expand Down
3 changes: 1 addition & 2 deletions src/LogLevels/LevelClass.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,7 @@ class LevelClass

public function __construct(
public string $value,
) {
}
) {}

public static function from(?string $value = null): LevelClass
{
Expand Down
2 changes: 1 addition & 1 deletion src/LogViewerServiceProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ public function register()

if (! $this->app->bound(LogTypeRegistrar::class)) {
$this->app->singleton(LogTypeRegistrar::class, function () {
return new LogTypeRegistrar();
return new LogTypeRegistrar;
});
}
}
Expand Down
2 changes: 1 addition & 1 deletion tests/Feature/RoutesTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
function reloadRoutes(): void
{
// unset any routes that were set previously
app('router')->setRoutes(new \Illuminate\Routing\RouteCollection());
app('router')->setRoutes(new \Illuminate\Routing\RouteCollection);

// boot the service provider to register the routes again
(new \Opcodes\LogViewer\LogViewerServiceProvider(app()))->boot();
Expand Down
4 changes: 1 addition & 3 deletions tests/Unit/CustomLogs/CustomAccessLog.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,4 @@

use Opcodes\LogViewer\Logs\Log;

class CustomAccessLog extends Log
{
}
class CustomAccessLog extends Log {}
4 changes: 1 addition & 3 deletions tests/Unit/CustomLogs/CustomHttpAccessLog.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,4 @@

use Opcodes\LogViewer\Logs\HttpAccessLog;

class CustomHttpAccessLog extends HttpAccessLog
{
}
class CustomHttpAccessLog extends HttpAccessLog {}
3 changes: 3 additions & 0 deletions webpack.mix.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,9 @@ mix.options({
'@': path.resolve(__dirname, 'resources/js/'),
},
},
// stats: {
// children: true,
// }
});

mix.disableSuccessNotifications();