update config setting

Author: cklei-carly

config/inspirecms.php

@@ -57,9 +57,24 @@
         'skip_account_verification' => false,
     ],
 
-    'avatar' => [
-        'driver' => 'public',
-        'directory' => 'avatars',
+    'media' => [
+        'user_avatar' => [
+            'disk' => 'public',
+            'directory' => 'avatars',
+        ],
+
+        'media_library' => [
+            'disk' => 'public',
+            'directory' => '',
+            'thumbnail' => [
+                'width' => 300,
+                'height' => 300,
+            ],
+            'should_map_video_properties_with_ffmpeg' => false,
+            'middlewares' => [
+                'cache.headers:public;max_age=2628000;etag',
+            ],
+        ],
     ],
 
     'cache' => [
@@ -115,19 +130,6 @@
         ],
     ],
 
-    'media_library' => [
-        'disk' => 'public',
-        'directory' => '',
-        'thumbnail' => [
-            'width' => 300,
-            'height' => 300,
-        ],
-        'should_map_video_properties_with_ffmpeg' => false,
-        'middlewares' => [
-            'cache.headers:public;max_age=2628000;etag',
-        ],
-    ],
-
     'imports' => [
         'disk' => 'local',
         'temp_disk' => 'local',
@@ -222,7 +224,7 @@
         'published_content' => \SolutionForest\InspireCms\Resolvers\PublishedContentResolver::class,
     ],
 
-    'content' => [
+    'frontend' => [
         'routes' => [
             'middleware' => [],
         ],

src/Base/Filament/Pages/Concerns/ProfilePageTrait.php

@@ -144,8 +144,8 @@ protected function getAvatarFormComponent()
         return Forms\Components\FileUpload::make('avatar')
             ->label(__('inspirecms::resources/user.avatar.label'))
             ->validationAttribute(__('inspirecms::resources/user.avatar.validation_attribute'))
-            ->disk(InspireCmsConfig::get('avatar.driver'))
-            ->directory(InspireCmsConfig::get('avatar.directory'))
+            ->disk(InspireCmsConfig::get('media.user_avatar.driver', 'public'))
+            ->directory(InspireCmsConfig::get('media.user_avatar.directory', 'avatars'))
             ->image();
     }
 

src/Factories/ContentSegmentFactory.php

@@ -2,14 +2,15 @@
 
 namespace SolutionForest\InspireCms\Factories;
 
+use SolutionForest\InspireCms\Content\DefaultSegmentProvider;
 use SolutionForest\InspireCms\Content\SegmentProviderInterface;
 use SolutionForest\InspireCms\InspireCmsConfig;
 
 class ContentSegmentFactory
 {
     public static function create(): SegmentProviderInterface
     {
-        $class = InspireCmsConfig::get('content.segment_provider');
+        $class = InspireCmsConfig::get('frontend.segment_provider', DefaultSegmentProvider::class);
 
         static::guardAgainstInvalidContentUrlSegmentGenerator($class);
 

src/InspireCms.php

@@ -133,13 +133,15 @@ public function routes(): void
     {
         Route::name('inspirecms.asset')
             ->get('assets/{key}', AssetController::class)
-            ->middleware(InspireCmsConfig::get('media_library.middlewares'));
+            ->middleware(InspireCmsConfig::get('media.media_library.middlewares', [
+                'cache.headers:public;max_age=2628000;etag',
+            ]));
 
         Route::name('inspirecms.sitemap')
             ->get('sitemap.xml', SitemapController::class);
 
         Route::name('inspirecms.frontend.')
-            ->middleware(InspireCmsConfig::get('content.routes.middlewares', []))
+            ->middleware(InspireCmsConfig::get('frontend.routes.middlewares', []))
             ->group(function () {
 
                 $factory = ContentSegmentFactory::create();

src/InspireCmsServiceProvider.php

@@ -457,10 +457,10 @@ protected function registerSupport(): void
 
         // Media Library
 
-        Support\Facades\MediaLibraryRegistry::setDisk(InspireCmsConfig::get('media_library.disk'));
-        Support\Facades\MediaLibraryRegistry::setDirectory(InspireCmsConfig::get('media_library.directory'));
-        Support\Facades\MediaLibraryRegistry::setThumbnailCrop(InspireCmsConfig::get('media_library.thumbnail.width'), InspireCmsConfig::get('media_library.thumbnail.height'));
-        Support\Facades\MediaLibraryRegistry::setShouldMapVideoPropertiesWithFfmpeg(boolval(InspireCmsConfig::get('media_library.should_map_video_properties_with_ffmpeg', false)));
+        Support\Facades\MediaLibraryRegistry::setDisk(InspireCmsConfig::get('media.media_library.disk', 'public'));
+        Support\Facades\MediaLibraryRegistry::setDirectory(InspireCmsConfig::get('media.media_library.directory', ''));
+        Support\Facades\MediaLibraryRegistry::setThumbnailCrop(InspireCmsConfig::get('media.media_library.thumbnail.width', 300), InspireCmsConfig::get('media.media_library.thumbnail.height', 300));
+        Support\Facades\MediaLibraryRegistry::setShouldMapVideoPropertiesWithFfmpeg(boolval(InspireCmsConfig::get('media.media_library.should_map_video_properties_with_ffmpeg', false)));
 
         // auth guard
         Support\Facades\AuthenticationManager::setAuthGuard(InspireCmsConfig::get('auth.guard.name'));