Merge branch 'master' of github.com:gdarko/laravel-vue-starter

Author: gdarko

README.md

@@ -18,6 +18,8 @@ The project is built with the following components:
 - Laravel Fortify
 - Tailwind
 - ForkAwesome
+- Media Library (by Spatie)
+- Bouncer (by JosephSilber)
 
 ## ⚡️ How to install
 

app/Models/User.php

@@ -6,20 +6,28 @@
 use App\Traits\Searchable;
 use Illuminate\Contracts\Auth\MustVerifyEmail;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Relations\MorphMany;
 use Illuminate\Foundation\Auth\User as Authenticatable;
+use Illuminate\Foundation\Testing\Concerns\InteractsWithAuthentication;
 use Illuminate\Notifications\Notifiable;
 use Illuminate\Support\Facades\Log;
 use Laravel\Sanctum\HasApiTokens;
 use Silber\Bouncer\Database\HasRolesAndAbilities;
+use Spatie\Image\Manipulations;
+use Spatie\MediaLibrary\HasMedia;
+use Spatie\MediaLibrary\InteractsWithMedia;
+use Spatie\MediaLibrary\MediaCollections\Models\Media;
 
-class User extends Authenticatable implements MustVerifyEmail
+class User extends Authenticatable implements MustVerifyEmail, HasMedia
 {
     use HasApiTokens, HasFactory, Notifiable;
 
     use HasRolesAndAbilities;
 
     use Searchable, Filterable;
 
+    use InteractsWithMedia;
+
     /**
      * ALlowed search fields
      * @var string[]
@@ -59,6 +67,7 @@ class User extends Authenticatable implements MustVerifyEmail
      */
     protected $appends = [
         'avatar_url',
+        'avatar_thumb_url',
         'full_name',
     ];
 
@@ -70,48 +79,41 @@ class User extends Authenticatable implements MustVerifyEmail
     public static function boot()
     {
         parent::boot();
-
-        static::deleting(function (self $record) {
-            Log::info('Deleting user...');
-            Log::info(json_encode($record->mediaFiles));
-            Log::info(json_encode($record->mediaFiles()->get()));
-            foreach ($record->mediaFiles()->get() as $entry) {
-                $entry->delete();
-            }
-        });
     }
 
     /**
-     * Returns the user avatar
-     * @return \Illuminate\Database\Eloquent\Relations\HasOne|MediaFile
+     * @return \Closure|mixed|null|Media
      */
     public function avatar()
     {
-        return $this->hasOne(MediaFile::class, 'id', 'avatar_id');
+        return $this->getMedia('avatars')->first();
     }
 
     /**
-     * Returns the user files
-     * @return \Illuminate\Database\Eloquent\Relations\HasMany
+     * Returns the avatar url attribute
+     * @return string|null
      */
-    public function mediaFiles()
+    public function getAvatarUrlAttribute()
     {
-        return $this->hasMany(MediaFile::class, 'user_id', 'id');
+        $avatar = $this->avatar();
+        if ($avatar) {
+            return $avatar->getFullUrl();
+        }
+
+        return null;
     }
 
     /**
      * Returns the avatar url attribute
      * @return string|null
      */
-    public function getAvatarUrlAttribute()
+    public function getAvatarThumbUrlAttribute()
     {
-        $src = $this->getAttribute('avatar_id');
-        if (is_null($src)) {
-            return null;
-        }
-        if (!empty($this->avatar)) {
-            return asset('storage/'.$this->avatar->path);
+        $avatar = $this->avatar();
+        if ($avatar) {
+            return $avatar->getAvailableFullUrl(['small_thumb']);
         }
+
         return null;
     }
 
@@ -124,10 +126,11 @@ public function getFullNameAttribute()
         $names = [];
         foreach (['first_name', 'middle_name', 'last_name'] as $key) {
             $value = $this->getAttribute($key);
-            if (!empty($value)) {
+            if ( ! empty($value)) {
                 $names[] = $value;
             }
         }
+
         return implode(' ', $names);
     }
 
@@ -139,4 +142,25 @@ public function getIsAdminAttribute()
     {
         return $this->isAn('admin');
     }
+
+    /**
+     * Register the conversions
+     *
+     * @param  Media|null  $media
+     *
+     * @return void
+     * @throws \Spatie\Image\Exceptions\InvalidManipulation
+     */
+    public function registerMediaConversions(Media $media = null): void
+    {
+        $this->addMediaConversion('small_thumb')
+             ->fit(Manipulations::FIT_CROP, 300, 300)
+             ->nonQueued();
+        $this->addMediaConversion('medium_thumb')
+             ->fit(Manipulations::FIT_CROP, 600, 600)
+             ->nonQueued();
+        $this->addMediaConversion('large_thumb')
+             ->fit(Manipulations::FIT_CROP, 1200, 1200)
+             ->nonQueued();
+    }
 }

app/Services/Media/MediaService.php

@@ -4,78 +4,51 @@
 
 use App\Models\MediaFile;
 use App\Models\User;
+use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Http\UploadedFile;
 use Illuminate\Support\Facades\Storage;
+use Spatie\MediaLibrary\MediaCollections\Exceptions\FileDoesNotExist;
+use Spatie\MediaLibrary\MediaCollections\Exceptions\FileIsTooBig;
+use Spatie\MediaLibrary\MediaCollections\Models\Media;
 
 class MediaService
 {
     /**
      * Handles a file upload to the storage
+     *
      * @param  UploadedFile  $file
-     * @param  User|Model  $user
-     * @return MediaFile|null|\Illuminate\Database\Eloquent\Builder|\Illuminate\Database\Eloquent\Model
-     */
-    public function storeAvatar(UploadedFile $file, User $user)
-    {
-        return $this->store($file, $user, 'public', 'avatars');
-    }
-
-    /**
-     * Deletes a file
-     * @param  MediaFile  $entry
-     * @return bool
+     * @param  User  $user
+     * @param $collection
+     *
+     * @return Media
+     * @throws FileDoesNotExist
+     * @throws FileIsTooBig
      */
-    public function deleteMedia(MediaFile $entry)
+    public function replace(UploadedFile $file, User $user, $collection)
     {
-        $disk = Storage::disk($entry->disk);
-        if ($disk->exists($entry->path) && $disk->delete($entry->path)) {
-            return $entry->delete();
+        $media = $user->getMedia($collection);
+        foreach ($media as $media_item) {
+            $media_item->delete();
         }
-        return false;
-    }
 
-    /**
-     * Handles a file upload to the storage
-     * @param  UploadedFile  $file
-     * @param  User  $user
-     * @return \Illuminate\Database\Eloquent\Builder|\Illuminate\Database\Eloquent\Model|null
-     */
-    public function storeMedia(UploadedFile $file, User $user)
-    {
-        return $this->store($file, $user, 'local', 'media');
+        return $this->store($file, $user, $collection);
     }
 
     /**
      * Handles a file upload to the storage
+     *
      * @param  UploadedFile  $file
      * @param  User  $user
-     * @param $disk
-     * @param $subdir
-     * @return \Illuminate\Database\Eloquent\Builder|Model|null
+     * @param $collection
+     *
+     * @return Media
+     * @throws FileDoesNotExist
+     * @throws FileIsTooBig
      */
-    public function store(UploadedFile $file, User $user, $disk, $subdir)
+    public function store(UploadedFile $file, User $user, $collection)
     {
-        $name = $file->hashName();
-        $dir = "{$subdir}/{$user->id}";
-        $key = "{$dir}/{$name}";
-        $path = $file->storeAs($dir, $name, ['disk' => $disk]);
-        if (!$path) {
-            return null;
-        }
-        return MediaFile::query()->create(
-            attributes: [
-                'name' => "{$name}",
-                'file_name' => $file->getClientOriginalName(),
-                'mime_type' => $file->getClientMimeType(),
-                'path' => $key,
-                'disk' => $disk,
-                'file_hash' => $file->hashName(),
-                'collection' => null,
-                'user_id' => $user->id,
-                'size' => $file->getSize(),
-            ],
-        );
+        return $user->addMedia($file)->toMediaCollection($collection);
     }
 
 }