From 8abe383ae3f5152534250b903980179c39efce6c Mon Sep 17 00:00:00 2001 From: Ash Monsh Date: Mon, 19 Feb 2024 19:32:24 +0300 Subject: [PATCH 1/2] add better support for libraries with URL item --- .../themes/zeus/sky/addons/library-item.blade.php | 14 +++++++++----- .../sky/addons/library-types/file-url.blade.php | 3 +++ .../zeus/sky/addons/library-types/file.blade.php | 2 +- .../sky/addons/library-types/image-url.blade.php | 3 +++ .../sky/addons/library-types/video-url.blade.php | 4 ++++ 5 files changed, 20 insertions(+), 6 deletions(-) create mode 100644 resources/views/themes/zeus/sky/addons/library-types/file-url.blade.php create mode 100644 resources/views/themes/zeus/sky/addons/library-types/image-url.blade.php create mode 100644 resources/views/themes/zeus/sky/addons/library-types/video-url.blade.php diff --git a/resources/views/themes/zeus/sky/addons/library-item.blade.php b/resources/views/themes/zeus/sky/addons/library-item.blade.php index 64ff081..cc76e5e 100644 --- a/resources/views/themes/zeus/sky/addons/library-item.blade.php +++ b/resources/views/themes/zeus/sky/addons/library-item.blade.php @@ -27,10 +27,14 @@ {{ $item->created_at->format('Y.m/d') }}-{{ $item->created_at->format('h:i a') }}

-
- @foreach($item->getFiles() as $file) - @include($skyTheme.'.addons.library-types.'.strtolower($item->type)) - @endforeach -
+ @if($item->file_path !== null) + @include($skyTheme.'.addons.library-types.'.strtolower($item->type).'-url') + @else +
+ @foreach($item->getFiles() as $file) + @include($skyTheme.'.addons.library-types.'.strtolower($item->type)) + @endforeach +
+ @endif diff --git a/resources/views/themes/zeus/sky/addons/library-types/file-url.blade.php b/resources/views/themes/zeus/sky/addons/library-types/file-url.blade.php new file mode 100644 index 0000000..0408fb9 --- /dev/null +++ b/resources/views/themes/zeus/sky/addons/library-types/file-url.blade.php @@ -0,0 +1,3 @@ + + {{ __('Show File') }} + \ No newline at end of file diff --git a/resources/views/themes/zeus/sky/addons/library-types/file.blade.php b/resources/views/themes/zeus/sky/addons/library-types/file.blade.php index 2fd8004..8652c95 100644 --- a/resources/views/themes/zeus/sky/addons/library-types/file.blade.php +++ b/resources/views/themes/zeus/sky/addons/library-types/file.blade.php @@ -1,3 +1,3 @@ - {{ __('Show File') }} + {{ $file->getFullUrl() }} {{ __('Show File') }} \ No newline at end of file diff --git a/resources/views/themes/zeus/sky/addons/library-types/image-url.blade.php b/resources/views/themes/zeus/sky/addons/library-types/image-url.blade.php new file mode 100644 index 0000000..55b3265 --- /dev/null +++ b/resources/views/themes/zeus/sky/addons/library-types/image-url.blade.php @@ -0,0 +1,3 @@ + + {{ $item->title }} + \ No newline at end of file diff --git a/resources/views/themes/zeus/sky/addons/library-types/video-url.blade.php b/resources/views/themes/zeus/sky/addons/library-types/video-url.blade.php new file mode 100644 index 0000000..92ad92d --- /dev/null +++ b/resources/views/themes/zeus/sky/addons/library-types/video-url.blade.php @@ -0,0 +1,4 @@ + \ No newline at end of file From b07c46b0e31822665cc8a22930e87fb65105a489 Mon Sep 17 00:00:00 2001 From: Ash Monsh Date: Mon, 19 Feb 2024 19:34:59 +0300 Subject: [PATCH 2/2] Update composer.lock --- composer.lock | 83 +++++++++++++++++++++++++++------------------------ 1 file changed, 44 insertions(+), 39 deletions(-) diff --git a/composer.lock b/composer.lock index e267bc2..9c107a0 100644 --- a/composer.lock +++ b/composer.lock @@ -1054,16 +1054,16 @@ }, { "name": "doctrine/inflector", - "version": "2.0.9", + "version": "2.0.10", "source": { "type": "git", "url": "https://github.com/doctrine/inflector.git", - "reference": "2930cd5ef353871c821d5c43ed030d39ac8cfe65" + "reference": "5817d0659c5b50c9b950feb9af7b9668e2c436bc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/inflector/zipball/2930cd5ef353871c821d5c43ed030d39ac8cfe65", - "reference": "2930cd5ef353871c821d5c43ed030d39ac8cfe65", + "url": "https://api.github.com/repos/doctrine/inflector/zipball/5817d0659c5b50c9b950feb9af7b9668e2c436bc", + "reference": "5817d0659c5b50c9b950feb9af7b9668e2c436bc", "shasum": "" }, "require": { @@ -1125,7 +1125,7 @@ ], "support": { "issues": "https://github.com/doctrine/inflector/issues", - "source": "https://github.com/doctrine/inflector/tree/2.0.9" + "source": "https://github.com/doctrine/inflector/tree/2.0.10" }, "funding": [ { @@ -1141,7 +1141,7 @@ "type": "tidelift" } ], - "time": "2024-01-15T18:05:13+00:00" + "time": "2024-02-18T20:23:39+00:00" }, { "name": "doctrine/lexer", @@ -3513,16 +3513,16 @@ }, { "name": "livewire/livewire", - "version": "v3.4.4", + "version": "v3.4.5", "source": { "type": "git", "url": "https://github.com/livewire/livewire.git", - "reference": "c0489d4a76382f6dcf6e2702112f86aa089d0c8d" + "reference": "266ee3dcaef540f666d4eee19a314025aba5c6e4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/livewire/livewire/zipball/c0489d4a76382f6dcf6e2702112f86aa089d0c8d", - "reference": "c0489d4a76382f6dcf6e2702112f86aa089d0c8d", + "url": "https://api.github.com/repos/livewire/livewire/zipball/266ee3dcaef540f666d4eee19a314025aba5c6e4", + "reference": "266ee3dcaef540f666d4eee19a314025aba5c6e4", "shasum": "" }, "require": { @@ -3576,7 +3576,7 @@ "description": "A front-end framework for Laravel.", "support": { "issues": "https://github.com/livewire/livewire/issues", - "source": "https://github.com/livewire/livewire/tree/v3.4.4" + "source": "https://github.com/livewire/livewire/tree/v3.4.5" }, "funding": [ { @@ -3584,7 +3584,7 @@ "type": "github" } ], - "time": "2024-01-28T19:07:11+00:00" + "time": "2024-02-19T14:52:03+00:00" }, { "name": "maennchen/zipstream-php", @@ -8384,16 +8384,16 @@ "packages-dev": [ { "name": "brianium/paratest", - "version": "v7.4.1", + "version": "v7.4.2", "source": { "type": "git", "url": "https://github.com/paratestphp/paratest.git", - "reference": "b2830e330011d59a799c0002e118f5b4bbdb9604" + "reference": "cf4e141f6e778646384a7044c42ce792f1637e40" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/paratestphp/paratest/zipball/b2830e330011d59a799c0002e118f5b4bbdb9604", - "reference": "b2830e330011d59a799c0002e118f5b4bbdb9604", + "url": "https://api.github.com/repos/paratestphp/paratest/zipball/cf4e141f6e778646384a7044c42ce792f1637e40", + "reference": "cf4e141f6e778646384a7044c42ce792f1637e40", "shasum": "" }, "require": { @@ -8401,13 +8401,13 @@ "ext-pcre": "*", "ext-reflection": "*", "ext-simplexml": "*", - "fidry/cpu-core-counter": "^1.0.0", + "fidry/cpu-core-counter": "^1.1.0", "jean85/pretty-package-versions": "^2.0.5", "php": "~8.2.0 || ~8.3.0", "phpunit/php-code-coverage": "^10.1.11 || ^11.0.0", "phpunit/php-file-iterator": "^4.1.0 || ^5.0.0", "phpunit/php-timer": "^6.0.0 || ^7.0.0", - "phpunit/phpunit": "^10.5.9 || ^11.0.2", + "phpunit/phpunit": "^10.5.9 || ^11.0.3", "sebastian/environment": "^6.0.1 || ^7.0.0", "symfony/console": "^6.4.3 || ^7.0.3", "symfony/process": "^6.4.3 || ^7.0.3" @@ -8416,11 +8416,11 @@ "doctrine/coding-standard": "^12.0.0", "ext-pcov": "*", "ext-posix": "*", - "phpstan/phpstan": "^1.10.57", + "phpstan/phpstan": "^1.10.58", "phpstan/phpstan-deprecation-rules": "^1.1.4", "phpstan/phpstan-phpunit": "^1.3.15", "phpstan/phpstan-strict-rules": "^1.5.2", - "squizlabs/php_codesniffer": "^3.8.1", + "squizlabs/php_codesniffer": "^3.9.0", "symfony/filesystem": "^6.4.3 || ^7.0.3" }, "bin": [ @@ -8462,7 +8462,7 @@ ], "support": { "issues": "https://github.com/paratestphp/paratest/issues", - "source": "https://github.com/paratestphp/paratest/tree/v7.4.1" + "source": "https://github.com/paratestphp/paratest/tree/v7.4.2" }, "funding": [ { @@ -8474,7 +8474,7 @@ "type": "paypal" } ], - "time": "2024-02-06T13:50:28+00:00" + "time": "2024-02-19T15:13:11+00:00" }, { "name": "composer/semver", @@ -9757,16 +9757,16 @@ }, { "name": "pestphp/pest", - "version": "v2.33.6", + "version": "v2.34.0", "source": { "type": "git", "url": "https://github.com/pestphp/pest.git", - "reference": "5b0f88c22716452be59202cfe7c5a24fbb2fb7de" + "reference": "602b696348efdf4da83c9719de3062462cc1d146" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/pestphp/pest/zipball/5b0f88c22716452be59202cfe7c5a24fbb2fb7de", - "reference": "5b0f88c22716452be59202cfe7c5a24fbb2fb7de", + "url": "https://api.github.com/repos/pestphp/pest/zipball/602b696348efdf4da83c9719de3062462cc1d146", + "reference": "602b696348efdf4da83c9719de3062462cc1d146", "shasum": "" }, "require": { @@ -9849,7 +9849,7 @@ ], "support": { "issues": "https://github.com/pestphp/pest/issues", - "source": "https://github.com/pestphp/pest/tree/v2.33.6" + "source": "https://github.com/pestphp/pest/tree/v2.34.0" }, "funding": [ { @@ -9861,7 +9861,7 @@ "type": "github" } ], - "time": "2024-02-12T08:55:32+00:00" + "time": "2024-02-17T10:06:53+00:00" }, { "name": "pestphp/pest-plugin", @@ -10006,27 +10006,27 @@ }, { "name": "pestphp/pest-plugin-laravel", - "version": "v2.2.0", + "version": "v2.3.0", "source": { "type": "git", "url": "https://github.com/pestphp/pest-plugin-laravel.git", - "reference": "77a2838c1d3b09d147211e76a48987ba9a758279" + "reference": "2f6ea6233bb74ec65d969ecdea56bdbd3d1e2f0e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/pestphp/pest-plugin-laravel/zipball/77a2838c1d3b09d147211e76a48987ba9a758279", - "reference": "77a2838c1d3b09d147211e76a48987ba9a758279", + "url": "https://api.github.com/repos/pestphp/pest-plugin-laravel/zipball/2f6ea6233bb74ec65d969ecdea56bdbd3d1e2f0e", + "reference": "2f6ea6233bb74ec65d969ecdea56bdbd3d1e2f0e", "shasum": "" }, "require": { - "laravel/framework": "^10.18.0|^11.0", - "pestphp/pest": "^2.13.0", + "laravel/framework": "^10.44.0|^11.0", + "pestphp/pest": "^2.33.6", "php": "^8.1.0" }, "require-dev": { - "laravel/dusk": "^7.9.3", - "orchestra/testbench": "^8.6.3", - "pestphp/pest-dev-tools": "^2.14.0" + "laravel/dusk": "^7.12.3", + "orchestra/testbench": "^8.21.1|^9.0.0", + "pestphp/pest-dev-tools": "^2.16.0" }, "type": "library", "extra": { @@ -10034,6 +10034,11 @@ "providers": [ "Pest\\Laravel\\PestServiceProvider" ] + }, + "pest": { + "plugins": [ + "Pest\\Laravel\\Plugin" + ] } }, "autoload": { @@ -10059,7 +10064,7 @@ "unit" ], "support": { - "source": "https://github.com/pestphp/pest-plugin-laravel/tree/v2.2.0" + "source": "https://github.com/pestphp/pest-plugin-laravel/tree/v2.3.0" }, "funding": [ { @@ -10071,7 +10076,7 @@ "type": "github" } ], - "time": "2023-08-10T15:37:09+00:00" + "time": "2024-02-17T10:04:08+00:00" }, { "name": "pestphp/pest-plugin-livewire",