Skip to content

Commit 4383268

Browse files
committed
fix: refactor media and translation handling to use the packages instead of local files
1 parent 33117ba commit 4383268

30 files changed

Lines changed: 727 additions & 1933 deletions

resources/views/admin/media/_filter.blade.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@php use Javaabu\Cms\Media\AllowedMimeTypes; @endphp
1+
@php use Javaabu\Helpers\Media\AllowedMimeTypes; @endphp
22
<x-forms::filter>
33
<div class="row">
44
<div class="col-md-6">
@@ -34,4 +34,3 @@
3434
<x-forms::hidden name="view" :value="$view"/>
3535
</x-forms::filter>
3636

37-

resources/views/admin/media/create.blade.php

Lines changed: 0 additions & 9 deletions
This file was deleted.

resources/views/admin/media/form/_uploader.blade.php

Lines changed: 0 additions & 253 deletions
This file was deleted.

resources/views/admin/media/picker/show.blade.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
@can('create', \Javaabu\Cms\Media\Media::class)
1414
<div id="new-media" class="{{ add_tab_class(false) }}">
15-
@include('cms::admin.media.form._uploader', ['view' => 'grid'])
15+
@include('mediapicker::material-admin-26.media.form._uploader', ['view' => 'grid'])
1616
</div>
1717
@endcan
1818
</div>

src/CmsServiceProvider.php

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@
2222
use Javaabu\Mediapicker\Models\Media as MediapickerMedia;
2323
use ReflectionClass;
2424
use Spatie\MediaLibrary\MediaCollections\Models\Media as SpatieMedia;
25+
use Javaabu\Cms\Media\AllowedMimeTypes;
26+
use Spatie\MediaLibrary\Support\FileNamer\DefaultFileNamer;
2527

2628
class CmsServiceProvider extends ServiceProvider
2729
{
@@ -117,6 +119,7 @@ public function register()
117119
$this->mergeConfigFrom(__DIR__ . '/../config/cms.php', 'cms');
118120
$this->app->register(MediapickerServiceProvider::class);
119121
$this->configureMediapickerDefaults();
122+
$this->registerCmsMediaMimeTypes();
120123

121124
if ($this->app->runningInConsole()) {
122125
// Register commands
@@ -134,6 +137,7 @@ protected function configureMediapickerDefaults(): void
134137
$this->setConfigDefault('mediapicker.media_model', CmsMedia::class, MediapickerMedia::class);
135138
$this->setConfigDefault('mediapicker.media_controller', MediaController::class, MediapickerMediaController::class);
136139
$this->setConfigDefault('media-library.media_model', CmsMedia::class, SpatieMedia::class);
140+
$this->setConfigDefault('media-library.file_namer', DefaultFileNamer::class);
137141
}
138142

139143
protected function setConfigDefault(string $key, mixed $value, mixed $packageDefault = null): void
@@ -145,6 +149,11 @@ protected function setConfigDefault(string $key, mixed $value, mixed $packageDef
145149
}
146150
}
147151

152+
protected function registerCmsMediaMimeTypes(): void
153+
{
154+
AllowedMimeTypes::registerCmsMimeTypes();
155+
}
156+
148157
protected function loadMediapickerMigrations(): void
149158
{
150159
$provider = new ReflectionClass(MediapickerServiceProvider::class);

0 commit comments

Comments
 (0)