Merge pull request #6 from queents/dev

update media collection and media lib type
queents · Oct 27, 2022 · 54b3b9c · 54b3b9c
2 parents 3d92a70 + 870edbc
commit 54b3b9c
Show file tree

Hide file tree

Showing 9 changed files with 138 additions and 35 deletions.
diff --git a/Http/Controllers/DashboardController.php b/Http/Controllers/DashboardController.php
@@ -7,6 +7,7 @@
 use App\Http\Controllers\Controller;
 use Modules\Base\Services\Components\Base\Alert;
 use Modules\Base\Services\Components\Base\Render;
+use Spatie\MediaLibrary\MediaCollections\Models\Media;
 
 class DashboardController extends Controller
 {
@@ -21,6 +22,25 @@ public function logout()
         return redirect()->route('login');
     }
 
+    public function getMedia(){
+        $media = Media::all()->groupBy('model_type');
+        $mediaCollection = [];
+        foreach ($media as $key=>$value){
+            $getKey = collect(explode("\\",$key))->last();
+            $mediaCollection[$getKey] = $value->toArray();
+        }
+
+        return response()->json([
+            "data" =>$mediaCollection
+        ]);
+    }
+
+    public function destroy(Media $media){
+        $media->delete();
+
+        return Alert::make(__('Your Media Item Has Been deleted'))->fire();
+    }
+
     public function select(Request $request){
         $request->validate([
            "model_type" => "required",

diff --git a/Routes/web.php b/Routes/web.php
@@ -70,4 +70,7 @@
     Route::post('/select', [DashboardController::class, 'select'])->name('select');
     Route::post('/create', [DashboardController::class, 'create'])->name('create');
     Route::post('logout', [DashboardController::class, 'logout'])->name('logout');
+    Route::post('media/delete/{media}', [DashboardController::class, 'destroy'])->name('media.destroy');
+    Route::get('media/get-media', [DashboardController::class, 'getMedia'])->name('media.api');
 });
+
diff --git a/Services/Components/Base/Page.php b/Services/Components/Base/Page.php
diff --git a/Services/Concerns/HasCol.php b/Services/Concerns/HasCol.php
@@ -0,0 +1,22 @@
+<?php
+
+namespace Modules\Base\Services\Concerns;
+
+trait HasCol
+{
+    /**
+     * @var int
+     * @example 12
+     */
+    public int $col = 12;
+
+    /**
+     * @param int $col
+     * @return $this
+     */
+    public function col(int $col): static
+    {
+        $this->col = $col;
+        return $this;
+    }
+}
diff --git a/Services/Concerns/HasSection.php b/Services/Concerns/HasSection.php
@@ -0,0 +1,25 @@
+<?php
+
+namespace Modules\Base\Services\Concerns;
+
+trait HasSection
+{
+    /**
+     * @var ?string
+     * @example 'groupId'
+     */
+    public ?string $section = null;
+    public ?string $sectionLabel = null;
+
+    /**
+     * @param string $section
+     * @param ?string $sectionLabel
+     * @return $this
+     */
+    public function section(string $section, ?string $sectionLabel): static
+    {
+        $this->section = $section;
+        $this->sectionLabel = $sectionLabel;
+        return $this;
+    }
+}
diff --git a/Services/Resource/Concerns/Process/Media.php b/Services/Resource/Concerns/Process/Media.php
@@ -12,13 +12,22 @@ public function processMediaOnCreate(Request $request, $record): void
     {
         foreach ($this->rows() as $field) {
             if($field->vue === 'ViltMedia.vue') {
-                if ($request->{$field->name} && is_array($request->{$field->name})) {
-                    foreach ($request->{$field->name} as $item) {
-                        $record->addMedia($item)
+                if($field->type === 'lib' && is_string($request->{$field->name})){
+                    if($request->{$field->name}){
+                       $record->addMediaFromUrl($request->{$field->name})
                             ->preservingOriginal()
                             ->toMediaCollection($field->name);
                     }
                 }
+                else {
+                    if ($request->{$field->name} && is_array($request->{$field->name})) {
+                        foreach ($request->{$field->name} as $item) {
+                            $record->addMedia($item)
+                                ->preservingOriginal()
+                                ->toMediaCollection($field->name);
+                        }
+                    }
+                }
             }
         }
     }
@@ -27,27 +36,40 @@ public function processMediaOnUpdate(Request $request, $record): void
     {
         foreach ($this->rows() as $field) {
             if (($field->vue === 'ViltMedia.vue')) {
-                if ($request->{$field->name} && is_array($request->{$field->name})) {
-                    $record->clearMediaCollection($field->name);
-                    foreach ($request->{$field->name} as $key=>$item) {
-                        if(!is_string($item)){
-                            if($item->getClientOriginalName() === 'blob'){
-                                $record->addMedia($item)
-                                    ->usingFileName(strtolower(Str::random(10).'_'.$key.'.'.$item->extension()))
-                                    ->preservingOriginal()
-                                    ->toMediaCollection($field->name);
-                            }
-                            else {
-                                $record->addMedia($item)
-                                    ->preservingOriginal()
-                                    ->toMediaCollection($field->name);
-                            }
+                if($field->type === 'lib' && is_string($request->{$field->name})){
+                    if($request->{$field->name}){
+                        if(!$record->getMedia($field->name)->first() || $record->getMedia($field->name)->first()->getUrl() !== $request->{$field->name}){
+                            $record->clearMediaCollection($field->name);
+                            $record->addMediaFromUrl($request->{$field->name})
+                                ->preservingOriginal()
+                                ->toMediaCollection($field->name);
                         }
                     }
                 }
-                else if(empty($request->get($field->name))){
-                    $record->clearMediaCollection($field->name);
+                else {
+                    if ($request->{$field->name} && is_array($request->{$field->name})) {
+                        $record->clearMediaCollection($field->name);
+                        foreach ($request->{$field->name} as $key=>$item) {
+                            if(!is_string($item)){
+                                if($item->getClientOriginalName() === 'blob'){
+                                    $record->addMedia($item)
+                                        ->usingFileName(strtolower(Str::random(10).'_'.$key.'.'.$item->extension()))
+                                        ->preservingOriginal()
+                                        ->toMediaCollection($field->name);
+                                }
+                                else {
+                                    $record->addMedia($item)
+                                        ->preservingOriginal()
+                                        ->toMediaCollection($field->name);
+                                }
+                            }
+                        }
+                    }
+                    else if(empty($request->get($field->name))){
+                        $record->clearMediaCollection($field->name);
+                    }
                 }
+
             }
         }
     }

diff --git a/Services/Rows/Abstracts/Base.php b/Services/Rows/Abstracts/Base.php
@@ -4,10 +4,12 @@
 
 use Modules\Base\Services\Concerns\HasAdd;
 use Modules\Base\Services\Concerns\HasApi;
+use Modules\Base\Services\Concerns\HasCol;
 use Modules\Base\Services\Concerns\HasColor;
 use Modules\Base\Services\Concerns\HasDefault;
 use Modules\Base\Services\Concerns\HasDescription;
 use Modules\Base\Services\Concerns\HasHint;
+use Modules\Base\Services\Concerns\HasIcon;
 use Modules\Base\Services\Concerns\HasId;
 use Modules\Base\Services\Concerns\HasLabel;
 use Modules\Base\Services\Concerns\HasMax;
@@ -23,6 +25,7 @@
 use Modules\Base\Services\Concerns\HasRelation;
 use Modules\Base\Services\Concerns\HasRoles;
 use Modules\Base\Services\Concerns\HasRows;
+use Modules\Base\Services\Concerns\HasSection;
 use Modules\Base\Services\Concerns\HasTab;
 use Modules\Base\Services\Concerns\HasTrack;
 use Modules\Base\Services\Concerns\HasType;
@@ -70,6 +73,9 @@ abstract class Base implements Component
     use HasValidation;
     use HasRows;
     use HasAdd;
+    use HasSection;
+    use HasCol;
+    use HasIcon;
     use IsUrl;
     use IsMulti;
     use IsOver;

diff --git a/Services/Rows/Section.php b/Services/Rows/Section.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace Modules\Base\Services\Rows;
+
+use Modules\Base\Services\Rows\Abstracts\Base;
+
+class Section extends Base
+{
+
+    public string $vue = 'ViltSection.vue';
+
+    /**
+     * @param string $name
+     * @return static
+     */
+    public static function make(string $name): self
+    {
+        return (new self)->name($name)->over()->list(false);
+    }
+}
diff --git a/Services/Widget.php b/Services/Widget.php