Merge branch 'develop'

Author: cklei-carly

config/inspirecms.php

@@ -28,7 +28,17 @@
             'driver' => 'eloquent',
             'model' => \SolutionForest\InspireCms\Models\User::class,
         ],
+        'resetting_password' => [
+            'enabled' => true,
+            'name' => 'inspirecms',
+            'provider' => 'cms_users',
+            'table' => env('AUTH_PASSWORD_RESET_TOKEN_TABLE', 'password_reset_tokens'),
+            'expire' => 60,
+            'throttle' => 60,
+        ],
+
         'failed_login_attempts' => 5,
+
         /**
          * The number of minutes to lock the user out for after the maximum number of failed login attempts is reached.
          */
@@ -40,6 +50,11 @@
          * Allowed values: before, after, none
          */
         'skip_super_admin_check' => 'before',
+
+        /**
+         * Skip account verification for users.
+         */
+        'skip_account_verification' => false,
     ],
 
     'avatar' => [
@@ -121,6 +136,12 @@
 
     'exports' => [
         'disk' => 'local',
+        'exporters' => [
+            \SolutionForest\InspireCms\Exports\Exporters\ImportUsedExporter::class,
+            \SolutionForest\InspireCms\Exports\Exporters\DocumentTypeExporter::class,
+            \SolutionForest\InspireCms\Exports\Exporters\FieldGroupExporter::class,
+            \SolutionForest\InspireCms\Exports\Exporters\TemplateExporter::class,
+        ],
     ],
 
     'models' => [
@@ -165,6 +186,20 @@
         ],
     ],
 
+    'custom_fields' => [
+        'extra_config' => [
+
+            \SolutionForest\InspireCms\Fields\Configs\Repeater::class,
+            \SolutionForest\InspireCms\Fields\Configs\Tags::class,
+
+            \SolutionForest\InspireCms\Fields\Configs\RichEditor::class,
+            \SolutionForest\InspireCms\Fields\Configs\MarkdownEditor::class,
+
+            \SolutionForest\InspireCms\Fields\Configs\ContentPicker::class,
+            \SolutionForest\InspireCms\Fields\Configs\MediaPicker::class,
+        ],
+    ],
+
     'permissions' => [
         'skip_access_right_permission_on_resource' => false,
         'guard_actions' => [

database/seeders/SampleSeeder.php

@@ -53,7 +53,7 @@ public function run()
         $this->importDataService->run();
 
         // handle the content have contentPicker field
-        if ($blog = $this->contentService->findByRealPath('home/blog')) {
+        if ($blog = $this->contentService->findByRealPath('home/blog')->first()) {
             $availableBlogs = $this->contentService->getUnderRealPath('blogs');
             $blog->propertyData = json_encode([
                 'featured_blogs' => [
@@ -83,9 +83,7 @@ public function run()
 
         // temp for update content route
         // todo: move to import data
-
-        $dynamicBlogPage = $this->contentService->findByRealPath('home/dynamic-blog-page');
-        if ($dynamicBlogPage) {
+        if (($dynamicBlogPage = $this->contentService->findByRealPath('home/dynamic-blog-page')->first())) {
             event(
                 new \SolutionForest\InspireCms\Events\Content\UpsertRoute(
                     $dynamicBlogPage->withoutRelations(),
@@ -228,7 +226,7 @@ protected function addSampleFields(): void
         $items[] = new ImportDataEntities\FieldGroup(
             slug: 'featured_blogs',
             fields: [
-                new ImportDataEntities\Field(slug: 'blogs', type: 'contentPicker', config: ['translatable' => false, 'documentType' => ['blog']]),
+                new ImportDataEntities\Field(slug: 'blogs', type: 'contentPicker', config: ['translatable' => false, 'documentType' => 'blog']),
             ],
         );
         foreach ($items as $group) {
@@ -300,19 +298,6 @@ protected function getSampleDocumentTypes()
             defaultTemplate: 'contact',
             icon: 'heroicon-o-question-mark-circle',
         );
-        $items[] = new ImportDataEntities\DocumentType(
-            slug: 'case-studies',
-            showAsTable: true,
-            showAtRoot: true,
-            category: 'web',
-            fieldGroups: [
-                'page_banner',
-            ],
-            templates: ['case-studies'],
-            defaultTemplate: 'case-studies',
-            icon: 'heroicon-o-clipboard-document-list',
-            allowed: ['case-study'],
-        );
         $items[] = new ImportDataEntities\DocumentType(
             slug: 'case-study',
             showAsTable: false,
@@ -326,6 +311,19 @@ protected function getSampleDocumentTypes()
             defaultTemplate: 'case-study',
             icon: 'heroicon-o-clipboard-document-check',
         );
+        $items[] = new ImportDataEntities\DocumentType(
+            slug: 'case-studies',
+            showAsTable: true,
+            showAtRoot: true,
+            category: 'web',
+            fieldGroups: [
+                'page_banner',
+            ],
+            templates: ['case-studies'],
+            defaultTemplate: 'case-studies',
+            icon: 'heroicon-o-clipboard-document-list',
+            allowed: ['case-study'],
+        );
 
         $items[] = new ImportDataEntities\DocumentType(
             slug: 'config',