From 7ea3d60788cf57698651ffd1dd6142d2741bfc1c Mon Sep 17 00:00:00 2001 From: HolgerHatGarKeineNode Date: Sun, 26 Mar 2023 16:24:30 +0200 Subject: [PATCH] if image --- composer.lock | 130 +++++++++--------- resources/lang/de/validation.php | 2 +- .../form/bitcoin-event-form.blade.php | 2 +- .../book-case/form/orange-pill-form.blade.php | 2 +- .../form/content-creator-form.blade.php | 2 +- .../library/form/library-item-form.blade.php | 2 +- .../meetup/form/meetup-form.blade.php | 2 +- .../news/form/news-article-form.blade.php | 2 +- .../form/project-proposal-form.blade.php | 2 +- .../school/form/course-form.blade.php | 2 +- .../livewire/venue/form/venue-form.blade.php | 2 +- 11 files changed, 74 insertions(+), 76 deletions(-) diff --git a/composer.lock b/composer.lock index 904a3f9c..3e23f7a0 100644 --- a/composer.lock +++ b/composer.lock @@ -2589,16 +2589,16 @@ }, { "name": "jaybizzle/crawler-detect", - "version": "v1.2.113", + "version": "v1.2.114", "source": { "type": "git", "url": "https://github.com/JayBizzle/Crawler-Detect.git", - "reference": "6710b75871da2b718550c2bc33388315a3b20151" + "reference": "62d0e6b38f6715c673e156ffb0fc894791de3452" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/JayBizzle/Crawler-Detect/zipball/6710b75871da2b718550c2bc33388315a3b20151", - "reference": "6710b75871da2b718550c2bc33388315a3b20151", + "url": "https://api.github.com/repos/JayBizzle/Crawler-Detect/zipball/62d0e6b38f6715c673e156ffb0fc894791de3452", + "reference": "62d0e6b38f6715c673e156ffb0fc894791de3452", "shasum": "" }, "require": { @@ -2635,9 +2635,9 @@ ], "support": { "issues": "https://github.com/JayBizzle/Crawler-Detect/issues", - "source": "https://github.com/JayBizzle/Crawler-Detect/tree/v1.2.113" + "source": "https://github.com/JayBizzle/Crawler-Detect/tree/v1.2.114" }, - "time": "2023-02-02T21:01:40+00:00" + "time": "2023-03-21T21:54:27+00:00" }, { "name": "jean85/pretty-package-versions", @@ -2956,16 +2956,16 @@ }, { "name": "laravel/framework", - "version": "v10.3.3", + "version": "v10.4.1", "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "90f24d9e2860ecf6b5492e966956270ceb98c03d" + "reference": "7d15f7eef442633cff108f83d9fe43d8c3b8b76f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/90f24d9e2860ecf6b5492e966956270ceb98c03d", - "reference": "90f24d9e2860ecf6b5492e966956270ceb98c03d", + "url": "https://api.github.com/repos/laravel/framework/zipball/7d15f7eef442633cff108f83d9fe43d8c3b8b76f", + "reference": "7d15f7eef442633cff108f83d9fe43d8c3b8b76f", "shasum": "" }, "require": { @@ -3064,7 +3064,7 @@ "league/flysystem-read-only": "^3.3", "league/flysystem-sftp-v3": "^3.0", "mockery/mockery": "^1.5.1", - "orchestra/testbench-core": "^8.0", + "orchestra/testbench-core": "^8.1", "pda/pheanstalk": "^4.0", "phpstan/phpdoc-parser": "^1.15", "phpstan/phpstan": "^1.4.7", @@ -3152,7 +3152,7 @@ "issues": "https://github.com/laravel/framework/issues", "source": "https://github.com/laravel/framework" }, - "time": "2023-03-09T14:00:53+00:00" + "time": "2023-03-18T11:34:02+00:00" }, { "name": "laravel/horizon", @@ -3793,16 +3793,16 @@ }, { "name": "league/commonmark", - "version": "2.3.9", + "version": "2.4.0", "source": { "type": "git", "url": "https://github.com/thephpleague/commonmark.git", - "reference": "c1e114f74e518daca2729ea8c4bf1167038fa4b5" + "reference": "d44a24690f16b8c1808bf13b1bd54ae4c63ea048" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/c1e114f74e518daca2729ea8c4bf1167038fa4b5", - "reference": "c1e114f74e518daca2729ea8c4bf1167038fa4b5", + "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/d44a24690f16b8c1808bf13b1bd54ae4c63ea048", + "reference": "d44a24690f16b8c1808bf13b1bd54ae4c63ea048", "shasum": "" }, "require": { @@ -3838,7 +3838,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "2.4-dev" + "dev-main": "2.5-dev" } }, "autoload": { @@ -3895,7 +3895,7 @@ "type": "tidelift" } ], - "time": "2023-02-15T14:07:24+00:00" + "time": "2023-03-24T15:16:10+00:00" }, { "name": "league/config", @@ -7330,16 +7330,16 @@ }, { "name": "psy/psysh", - "version": "v0.11.12", + "version": "v0.11.13", "source": { "type": "git", "url": "https://github.com/bobthecow/psysh.git", - "reference": "52cb7c47d403c31c0adc9bf7710fc355f93c20f7" + "reference": "722317c9f5627e588788e340f29b923e58f92f54" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/bobthecow/psysh/zipball/52cb7c47d403c31c0adc9bf7710fc355f93c20f7", - "reference": "52cb7c47d403c31c0adc9bf7710fc355f93c20f7", + "url": "https://api.github.com/repos/bobthecow/psysh/zipball/722317c9f5627e588788e340f29b923e58f92f54", + "reference": "722317c9f5627e588788e340f29b923e58f92f54", "shasum": "" }, "require": { @@ -7400,9 +7400,9 @@ ], "support": { "issues": "https://github.com/bobthecow/psysh/issues", - "source": "https://github.com/bobthecow/psysh/tree/v0.11.12" + "source": "https://github.com/bobthecow/psysh/tree/v0.11.13" }, - "time": "2023-01-29T21:24:40+00:00" + "time": "2023-03-21T14:22:44+00:00" }, { "name": "pusher/pusher-php-server", @@ -8293,16 +8293,16 @@ }, { "name": "sentry/sentry-laravel", - "version": "3.3.0", + "version": "3.3.2", "source": { "type": "git", "url": "https://github.com/getsentry/sentry-laravel.git", - "reference": "e9c87d6580fc56147f580e1d714d8eb4e06d2752" + "reference": "c502e8b9005990d03f5ec5cc852e98a27c26056d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/getsentry/sentry-laravel/zipball/e9c87d6580fc56147f580e1d714d8eb4e06d2752", - "reference": "e9c87d6580fc56147f580e1d714d8eb4e06d2752", + "url": "https://api.github.com/repos/getsentry/sentry-laravel/zipball/c502e8b9005990d03f5ec5cc852e98a27c26056d", + "reference": "c502e8b9005990d03f5ec5cc852e98a27c26056d", "shasum": "" }, "require": { @@ -8370,7 +8370,7 @@ ], "support": { "issues": "https://github.com/getsentry/sentry-laravel/issues", - "source": "https://github.com/getsentry/sentry-laravel/tree/3.3.0" + "source": "https://github.com/getsentry/sentry-laravel/tree/3.3.2" }, "funding": [ { @@ -8382,7 +8382,7 @@ "type": "custom" } ], - "time": "2023-03-16T12:25:43+00:00" + "time": "2023-03-22T10:51:03+00:00" }, { "name": "simplesoftwareio/simple-qrcode", @@ -8873,16 +8873,16 @@ }, { "name": "spatie/icalendar-generator", - "version": "2.5.5", + "version": "2.5.6", "source": { "type": "git", "url": "https://github.com/spatie/icalendar-generator.git", - "reference": "3e207f2184332a63ec593dda7e8d7e4112351007" + "reference": "8af1ebe392d04369f647574d0053a00da4cff311" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spatie/icalendar-generator/zipball/3e207f2184332a63ec593dda7e8d7e4112351007", - "reference": "3e207f2184332a63ec593dda7e8d7e4112351007", + "url": "https://api.github.com/repos/spatie/icalendar-generator/zipball/8af1ebe392d04369f647574d0053a00da4cff311", + "reference": "8af1ebe392d04369f647574d0053a00da4cff311", "shasum": "" }, "require": { @@ -8895,9 +8895,7 @@ "ext-json": "*", "larapack/dd": "^1.1", "pestphp/pest": "^1.22", - "phpunit/phpunit": "^9.5", "spatie/pest-plugin-snapshots": "^1.1", - "spatie/phpunit-snapshot-assertions": "^4.2", "vimeo/psalm": "^4.13" }, "type": "library", @@ -8928,9 +8926,9 @@ "spatie" ], "support": { - "source": "https://github.com/spatie/icalendar-generator/tree/2.5.5" + "source": "https://github.com/spatie/icalendar-generator/tree/2.5.6" }, - "time": "2023-03-10T09:08:41+00:00" + "time": "2023-03-24T10:38:32+00:00" }, { "name": "spatie/image", @@ -9885,16 +9883,16 @@ }, { "name": "spatie/laravel-permission", - "version": "5.9.1", + "version": "5.10.0", "source": { "type": "git", "url": "https://github.com/spatie/laravel-permission.git", - "reference": "a88ed98c8937442737e0c50163682e832d608f13" + "reference": "5d0a703ece4636e6bde98eb85ac72b40aa6e42bc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spatie/laravel-permission/zipball/a88ed98c8937442737e0c50163682e832d608f13", - "reference": "a88ed98c8937442737e0c50163682e832d608f13", + "url": "https://api.github.com/repos/spatie/laravel-permission/zipball/5d0a703ece4636e6bde98eb85ac72b40aa6e42bc", + "reference": "5d0a703ece4636e6bde98eb85ac72b40aa6e42bc", "shasum": "" }, "require": { @@ -9955,7 +9953,7 @@ ], "support": { "issues": "https://github.com/spatie/laravel-permission/issues", - "source": "https://github.com/spatie/laravel-permission/tree/5.9.1" + "source": "https://github.com/spatie/laravel-permission/tree/5.10.0" }, "funding": [ { @@ -9963,20 +9961,20 @@ "type": "github" } ], - "time": "2023-02-06T21:37:02+00:00" + "time": "2023-03-22T02:57:36+00:00" }, { "name": "spatie/laravel-ray", - "version": "1.32.3", + "version": "1.32.4", "source": { "type": "git", "url": "https://github.com/spatie/laravel-ray.git", - "reference": "8c7ea86c8092bcfe7a046f640b6ac9e5d7ec98cd" + "reference": "2274653f0a90dd87fbb887437be1c1ea1388a47c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spatie/laravel-ray/zipball/8c7ea86c8092bcfe7a046f640b6ac9e5d7ec98cd", - "reference": "8c7ea86c8092bcfe7a046f640b6ac9e5d7ec98cd", + "url": "https://api.github.com/repos/spatie/laravel-ray/zipball/2274653f0a90dd87fbb887437be1c1ea1388a47c", + "reference": "2274653f0a90dd87fbb887437be1c1ea1388a47c", "shasum": "" }, "require": { @@ -10036,7 +10034,7 @@ ], "support": { "issues": "https://github.com/spatie/laravel-ray/issues", - "source": "https://github.com/spatie/laravel-ray/tree/1.32.3" + "source": "https://github.com/spatie/laravel-ray/tree/1.32.4" }, "funding": [ { @@ -10048,7 +10046,7 @@ "type": "other" } ], - "time": "2023-03-03T13:37:21+00:00" + "time": "2023-03-23T08:04:54+00:00" }, { "name": "spatie/laravel-sluggable", @@ -10181,16 +10179,16 @@ }, { "name": "spatie/laravel-translatable", - "version": "6.3.0", + "version": "6.4.0", "source": { "type": "git", "url": "https://github.com/spatie/laravel-translatable.git", - "reference": "b3f6fa43ce05d7640ca9eacf4fee9c0037fc84d2" + "reference": "f472fbaec8a3d44096d3c6ed029484d0bf9116a7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spatie/laravel-translatable/zipball/b3f6fa43ce05d7640ca9eacf4fee9c0037fc84d2", - "reference": "b3f6fa43ce05d7640ca9eacf4fee9c0037fc84d2", + "url": "https://api.github.com/repos/spatie/laravel-translatable/zipball/f472fbaec8a3d44096d3c6ed029484d0bf9116a7", + "reference": "f472fbaec8a3d44096d3c6ed029484d0bf9116a7", "shasum": "" }, "require": { @@ -10250,7 +10248,7 @@ "translate" ], "support": { - "source": "https://github.com/spatie/laravel-translatable/tree/6.3.0" + "source": "https://github.com/spatie/laravel-translatable/tree/6.4.0" }, "funding": [ { @@ -10258,7 +10256,7 @@ "type": "github" } ], - "time": "2023-01-14T20:57:45+00:00" + "time": "2023-03-19T17:50:34+00:00" }, { "name": "spatie/macroable", @@ -15109,16 +15107,16 @@ }, { "name": "laravel-lang/lang", - "version": "12.18.6", + "version": "12.19.0", "source": { "type": "git", "url": "https://github.com/Laravel-Lang/lang.git", - "reference": "4ac8e147c620c8ca721b24307ff8ba3637a6ebf6" + "reference": "70d5cf93f5ae7ee5ab6dd0128e5f51eb3b31a5e0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Laravel-Lang/lang/zipball/4ac8e147c620c8ca721b24307ff8ba3637a6ebf6", - "reference": "4ac8e147c620c8ca721b24307ff8ba3637a6ebf6", + "url": "https://api.github.com/repos/Laravel-Lang/lang/zipball/70d5cf93f5ae7ee5ab6dd0128e5f51eb3b31a5e0", + "reference": "70d5cf93f5ae7ee5ab6dd0128e5f51eb3b31a5e0", "shasum": "" }, "require": { @@ -15171,7 +15169,7 @@ "type": "open_collective" } ], - "time": "2023-03-16T12:49:54+00:00" + "time": "2023-03-21T08:45:35+00:00" }, { "name": "laravel-lang/publisher", @@ -15382,16 +15380,16 @@ }, { "name": "laravel/pint", - "version": "v1.6.0", + "version": "v1.7.0", "source": { "type": "git", "url": "https://github.com/laravel/pint.git", - "reference": "e48e3fadd7863d6b7d03464f5c4f211a828b890f" + "reference": "d55381c73b7308e1b8a124084e804193a179092e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/pint/zipball/e48e3fadd7863d6b7d03464f5c4f211a828b890f", - "reference": "e48e3fadd7863d6b7d03464f5c4f211a828b890f", + "url": "https://api.github.com/repos/laravel/pint/zipball/d55381c73b7308e1b8a124084e804193a179092e", + "reference": "d55381c73b7308e1b8a124084e804193a179092e", "shasum": "" }, "require": { @@ -15444,7 +15442,7 @@ "issues": "https://github.com/laravel/pint/issues", "source": "https://github.com/laravel/pint" }, - "time": "2023-02-21T15:44:57+00:00" + "time": "2023-03-21T10:55:35+00:00" }, { "name": "laravel/sail", diff --git a/resources/lang/de/validation.php b/resources/lang/de/validation.php index 89566806..96d4e921 100644 --- a/resources/lang/de/validation.php +++ b/resources/lang/de/validation.php @@ -125,7 +125,7 @@ return [ 'numeric' => ':Attribute muss größer oder gleich :value sein.', 'string' => ':Attribute muss mindestens :value Zeichen lang sein.', ], - 'image' => ':Attribute muss ein Bild sein.', + 'image' => ':Attribute muss ein Bild sein. (jpg, png, gif, svg oder webp)', 'in' => 'Der gewählte Wert für :attribute ist ungültig.', 'in_array' => 'Der gewählte Wert für :attribute kommt nicht in :other vor.', 'integer' => ':Attribute muss eine ganze Zahl sein.', diff --git a/resources/views/livewire/bitcoin-event/form/bitcoin-event-form.blade.php b/resources/views/livewire/bitcoin-event/form/bitcoin-event-form.blade.php index 1498841d..8160c39a 100644 --- a/resources/views/livewire/bitcoin-event/form/bitcoin-event-form.blade.php +++ b/resources/views/livewire/bitcoin-event/form/bitcoin-event-form.blade.php @@ -40,7 +40,7 @@
- @if ($image) + @if ($image && str($image->getMimeType())->contains(['image/jpeg','image/jpg', 'image/png', 'image/gif', 'image/svg+xml', 'image/webp']))
{{ __('Preview') }}:
@endif diff --git a/resources/views/livewire/book-case/form/orange-pill-form.blade.php b/resources/views/livewire/book-case/form/orange-pill-form.blade.php index 990c7311..b3c107c9 100644 --- a/resources/views/livewire/book-case/form/orange-pill-form.blade.php +++ b/resources/views/livewire/book-case/form/orange-pill-form.blade.php @@ -30,7 +30,7 @@
- @if ($image) + @if ($image && str($image->getMimeType())->contains(['image/jpeg','image/jpg', 'image/png', 'image/gif', 'image/svg+xml', 'image/webp']))
{{ __('Preview') }}:
@endif diff --git a/resources/views/livewire/content-creator/form/content-creator-form.blade.php b/resources/views/livewire/content-creator/form/content-creator-form.blade.php index 4cfc510e..ca451a1d 100644 --- a/resources/views/livewire/content-creator/form/content-creator-form.blade.php +++ b/resources/views/livewire/content-creator/form/content-creator-form.blade.php @@ -22,7 +22,7 @@
- @if ($image) + @if ($image && str($image->getMimeType())->contains(['image/jpeg','image/jpg', 'image/png', 'image/gif', 'image/svg+xml', 'image/webp']))
{{ __('Preview') }}:
@endif diff --git a/resources/views/livewire/library/form/library-item-form.blade.php b/resources/views/livewire/library/form/library-item-form.blade.php index 520dfe65..fc889578 100644 --- a/resources/views/livewire/library/form/library-item-form.blade.php +++ b/resources/views/livewire/library/form/library-item-form.blade.php @@ -120,7 +120,7 @@ @if($libraryItem->lecturer_id && $libraryItem->type && $library && count($selectedTags) > 0)
- @if ($image) + @if ($image && str($image->getMimeType())->contains(['image/jpeg','image/jpg', 'image/png', 'image/gif', 'image/svg+xml', 'image/webp']))
{{ __('Preview') }}:
@endif diff --git a/resources/views/livewire/meetup/form/meetup-form.blade.php b/resources/views/livewire/meetup/form/meetup-form.blade.php index 5d9685b4..ca07320a 100644 --- a/resources/views/livewire/meetup/form/meetup-form.blade.php +++ b/resources/views/livewire/meetup/form/meetup-form.blade.php @@ -23,7 +23,7 @@
- @if ($image) + @if ($image && str($image->getMimeType())->contains(['image/jpeg','image/jpg', 'image/png', 'image/gif', 'image/svg+xml', 'image/webp']))
{{ __('Preview') }}:
@endif diff --git a/resources/views/livewire/news/form/news-article-form.blade.php b/resources/views/livewire/news/form/news-article-form.blade.php index 4bb3ce57..8556328e 100644 --- a/resources/views/livewire/news/form/news-article-form.blade.php +++ b/resources/views/livewire/news/form/news-article-form.blade.php @@ -130,7 +130,7 @@ @if($libraryItem->lecturer_id)
- @if ($image) + @if ($image && str($image->getMimeType())->contains(['image/jpeg','image/jpg', 'image/png', 'image/gif', 'image/svg+xml', 'image/webp']))
{{ __('Preview') }}:
@endif diff --git a/resources/views/livewire/project-proposal/form/project-proposal-form.blade.php b/resources/views/livewire/project-proposal/form/project-proposal-form.blade.php index 9d232e01..35ea0e3b 100644 --- a/resources/views/livewire/project-proposal/form/project-proposal-form.blade.php +++ b/resources/views/livewire/project-proposal/form/project-proposal-form.blade.php @@ -22,7 +22,7 @@
- @if ($image) + @if ($image && str($image->getMimeType())->contains(['image/jpeg','image/jpg', 'image/png', 'image/gif', 'image/svg+xml', 'image/webp']))
{{ __('Preview') }}:
@endif diff --git a/resources/views/livewire/school/form/course-form.blade.php b/resources/views/livewire/school/form/course-form.blade.php index 68933ed9..3a385541 100644 --- a/resources/views/livewire/school/form/course-form.blade.php +++ b/resources/views/livewire/school/form/course-form.blade.php @@ -23,7 +23,7 @@
- @if ($image) + @if ($image && str($image->getMimeType())->contains(['image/jpeg','image/jpg', 'image/png', 'image/gif', 'image/svg+xml', 'image/webp']))
{{ __('Preview') }}:
@endif diff --git a/resources/views/livewire/venue/form/venue-form.blade.php b/resources/views/livewire/venue/form/venue-form.blade.php index b67d7e1b..2b0c7feb 100644 --- a/resources/views/livewire/venue/form/venue-form.blade.php +++ b/resources/views/livewire/venue/form/venue-form.blade.php @@ -29,7 +29,7 @@
- @if ($images) + @if ($images && str($image->getMimeType())->contains(['image/jpeg','image/jpg', 'image/png', 'image/gif', 'image/svg+xml', 'image/webp']))
@foreach($images as $image)