Merge pull request #405 from pacoorozco/move-to-spatie-medialibray

Use spatie/medialibrary instead of qcod/imageup

Author: pacoorozco

.gitignore

@@ -4,9 +4,10 @@ npm-debug.log
 yarn-error.log
 package-lock.json
 
-# Laravel 5 & Lumen specific
+# Laravel specific
 /vendor
 /public/storage
+/public/media
 /public/hot
 /storage/*.key
 /storage/debugbar

app/Actions/UpdateUserProfileAction.php

@@ -27,6 +27,7 @@
 
 use Gamify\Events\UserProfileUpdated;
 use Gamify\Models\User;
+use Illuminate\Support\Arr;
 
 final class UpdateUserProfileAction
 {
@@ -39,6 +40,12 @@ public function execute(User $user, array $attributes): User
         $user->profile
             ->update($attributes);
 
+        if (Arr::has($attributes, 'avatar')) {
+            $user->profile
+                ->addMedia($attributes['avatar'])
+                ->toMediaCollection('avatar');
+        }
+
         UserProfileUpdated::dispatchIf(
             $user->wasChanged('name') || $user->profile->wasChanged(),
             $user

app/Http/Controllers/Admin/AdminBadgeController.php

@@ -50,6 +50,11 @@ public function store(BadgeCreateRequest $request): RedirectResponse
 
         $badge->tag($request->tags());
 
+        if ($request->has('image')) {
+            $badge->addMediaFromRequest('image')
+                ->toMediaCollection('image');
+        }
+
         return redirect()->route('admin.badges.index')
             ->with('success', __('admin/badge/messages.create.success'));
     }
@@ -83,6 +88,11 @@ public function update(BadgeUpdateRequest $request, Badge $badge): RedirectRespo
 
         $badge->retag($request->tags());
 
+        if ($request->has('image')) {
+            $badge->addMediaFromRequest('image')
+                ->toMediaCollection('image');
+        }
+
         return redirect()->route('admin.badges.index')
             ->with('success', __('admin/badge/messages.update.success'));
     }

app/Http/Controllers/Admin/AdminBadgeDataTablesController.php

@@ -39,7 +39,6 @@ public function __invoke(Datatables $dataTable): JsonResponse
             'name',
             'required_repetitions',
             'active',
-            'image_url',
             'actuators',
         ])->orderBy('name', 'ASC');
 
@@ -68,7 +67,7 @@ public function __invoke(Datatables $dataTable): JsonResponse
                     ->render();
             })
             ->rawColumns(['name', 'actions', 'image', 'tags'])
-            ->removeColumn('id', 'image_url')
+            ->removeColumn('id')
             ->toJson();
     }
 }

app/Http/Controllers/Admin/AdminLevelController.php

@@ -40,7 +40,12 @@ public function index(): View
 
     public function store(LevelCreateRequest $request): RedirectResponse
     {
-        Level::create($request->validated());
+        $level = Level::create($request->validated());
+
+        if ($request->has('image')) {
+            $level->addMediaFromRequest('image')
+                ->toMediaCollection('image');
+        }
 
         return redirect()->route('admin.levels.index')
             ->with('success', __('admin/level/messages.create.success'));
@@ -65,6 +70,11 @@ public function update(LevelUpdateRequest $request, Level $level): RedirectRespo
     {
         $level->update($request->validated());
 
+        if ($request->has('image')) {
+            $level->addMediaFromRequest('image')
+                ->toMediaCollection('image');
+        }
+
         return redirect()->route('admin.levels.index')
             ->with('success', __('admin/level/messages.update.success'));
     }

app/Http/Requests/BadgeCreateRequest.php

@@ -65,6 +65,9 @@ public function rules(): array
                 'required',
                 'alpha_dash',
             ],
+            'image' => [
+                'image',
+            ],
         ];
     }
 

app/Http/Requests/BadgeUpdateRequest.php

@@ -67,6 +67,9 @@ public function rules(): array
                 'required',
                 'alpha_dash',
             ],
+            'image' => [
+                'image',
+            ],
         ];
     }
 

app/Http/Requests/LevelCreateRequest.php

@@ -46,6 +46,9 @@ public function rules(): array
                 'required',
                 'boolean',
             ],
+            'image' => [
+                'image',
+            ],
         ];
     }
 }

app/Http/Requests/LevelUpdateRequest.php

@@ -50,6 +50,9 @@ public function rules(): array
                 'required',
                 'boolean',
             ],
+            'image' => [
+                'image',
+            ],
         ];
     }
 }

app/Http/Requests/ProfileUpdateRequest.php

@@ -58,6 +58,9 @@ public function rules(): array
                 'nullable',
                 'url',
             ],
+            'avatar' => [
+                'image',
+            ],
         ];
     }
 }