Merge pull request #46 from mostafaznv/dev

Dev
mostafaznv · May 5, 2023 · 3b02bd4 · 3b02bd4
2 parents 1ac986c + b1de589
commit 3b02bd4
Show file tree

Hide file tree

Showing 8 changed files with 70 additions and 13 deletions.
diff --git a/composer.json b/composer.json
@@ -17,7 +17,7 @@
     "require": {
         "php": "^8.0.2",
         "intervention/image": "^2.5",
-        "mostafaznv/nova-video": "^3.0|^4.0",
+        "mostafaznv/nova-video": "^3.0|^4.0|^5.0",
         "laravel/framework": "^8.40.0|^9.0|^10.0",
         "laravel/nova": "^4.13",
         "nova-kit/nova-packages-tool": "^1.2",

diff --git a/dist/css/field.css b/dist/css/field.css
diff --git a/dist/js/field.js b/dist/js/field.js
diff --git a/dist/js/field.js.LICENSE.txt b/dist/js/field.js.LICENSE.txt
@@ -1,5 +1,3 @@
-/*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */
-
 /**
  * @license Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
  * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license

diff --git a/resources/js/ckeditor/config/image.js b/resources/js/ckeditor/config/image.js
@@ -8,11 +8,19 @@ export default {
         },
         toolbar: [
             'imageBrowser',
+            '|',
             'imageStyle:full',
             'imageStyle:alignLeft',
             'imageStyle:alignCenter',
             'imageStyle:alignRight',
+            '|',
             'imageTextAlternative',
+            'toggleImageCaption',
+            '|',
+            'imageStyle:block',
+            'imageStyle:side',
+            '|',
+            'linkImage'
         ],
         styles: [
             'full',

diff --git a/src/FieldServiceProvider.php b/src/FieldServiceProvider.php
@@ -2,6 +2,7 @@
 
 namespace Mostafaznv\NovaCkEditor;
 
+use Composer\InstalledVersions;
 use Laravel\Nova\Nova;
 use Illuminate\Support\Facades\App;
 use Laravel\Nova\Events\ServingNova;
@@ -44,6 +45,8 @@ public function boot(): void
 
     protected function publish(): void
     {
+        $videoStub = $this->isLegacy() ? 'Video.legacy.stub' : 'Video.stub';
+
         $this->publishes([
             __DIR__ . '/../config/nova-ckeditor.php' => config_path('nova-ckeditor.php')
         ], 'nova-ckeditor-config');
@@ -58,11 +61,18 @@ protected function publish(): void
 
             # models
             __DIR__ . '/../stubs/models/Image.stub' => app_path('Models/Image.php'),
-            __DIR__ . '/../stubs/models/Video.stub' => app_path('Models/Video.php'),
+            __DIR__ . "/../stubs/models/$videoStub" => app_path('Models/Video.php'),
 
             # resources
             __DIR__ . '/../stubs/resources/Image.stub' => app_path('Nova/Resources/Image.php'),
             __DIR__ . '/../stubs/resources/Video.stub' => app_path('Nova/Resources/Video.php')
         ], 'nova-ckeditor-stubs');
     }
+
+    private function isLegacy(): bool
+    {
+        $larupload = InstalledVersions::getVersion('mostafaznv/larupload');
+
+        return version_compare($larupload, '1.0.0', '<');
+    }
 }
diff --git a/stubs/models/Video.legacy.stub b/stubs/models/Video.legacy.stub
@@ -0,0 +1,44 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Model;
+use Mostafaznv\Larupload\LaruploadEnum;
+use Mostafaznv\Larupload\Storage\Attachment;
+use Mostafaznv\Larupload\Traits\Larupload;
+use Exception;
+
+class Video extends Model
+{
+    use Larupload;
+
+    protected $fillable = ['name', 'file', 'disk'];
+
+    protected static function boot()
+    {
+        parent::boot();
+
+        self::saving(function($model) {
+            $hasLaruploadTrait = method_exists(self::class, 'bootLarupload');
+
+            if (!$model->name) {
+                $name = $hasLaruploadTrait ? $model->file->meta('name') : $model->file;
+
+                $model->name = pathinfo($name, PATHINFO_FILENAME);
+            }
+        });
+    }
+
+    /**
+     * @throws Exception
+     */
+    public function attachments(): array
+    {
+        return [
+            Attachment::make('file')
+                ->disk('video')
+                ->namingMethod(LaruploadEnum::HASH_FILE_NAMING_METHOD)
+                ->coverStyle(852, 480, LaruploadEnum::AUTO_STYLE_MODE),
+        ];
+    }
+}
diff --git a/stubs/models/Video.stub b/stubs/models/Video.stub
@@ -3,10 +3,10 @@
 namespace App\Models;
 
 use Illuminate\Database\Eloquent\Model;
-use Mostafaznv\Larupload\LaruploadEnum;
+use Mostafaznv\Larupload\Enums\LaruploadMediaStyle;
+use Mostafaznv\Larupload\Enums\LaruploadNamingMethod;
 use Mostafaznv\Larupload\Storage\Attachment;
 use Mostafaznv\Larupload\Traits\Larupload;
-use Exception;
 
 class Video extends Model
 {
@@ -29,16 +29,13 @@ class Video extends Model
         });
     }
 
-    /**
-     * @throws Exception
-     */
     public function attachments(): array
     {
         return [
             Attachment::make('file')
                 ->disk('video')
-                ->namingMethod(LaruploadEnum::HASH_FILE_NAMING_METHOD)
-                ->coverStyle(852, 480, LaruploadEnum::AUTO_STYLE_MODE),
+                ->namingMethod(LaruploadNamingMethod::HASH_FILE)
+                ->coverStyle('cover', 852, 480, LaruploadMediaStyle::CROP),
         ];
     }
 }