Refactor & libs update

stanislawfortonski · May 18, 2021 · e7bf459 · e7bf459
1 parent d822494
commit e7bf459
Show file tree

Hide file tree

Showing 17 changed files with 667 additions and 57,774 deletions.
diff --git a/app/Models/AuthorContent.php b/app/Models/AuthorContent.php
@@ -2,12 +2,13 @@
 
 namespace App\Models;
 
+use App\Traits\HasDescription;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 
 class AuthorContent extends Model
 {
-    use HasFactory;
+    use HasFactory, HasDescription;
 
     public $timestamps = false;
 
@@ -16,13 +17,4 @@ class AuthorContent extends Model
         'lang',
         'content'
     ];
-
-    public function getDescriptionAttribute()
-    {
-        $maxLength = config('blog.description_length');
-        if (strlen($this->content) > $maxLength)
-            $result = substr($this->content, 0, $maxLength);
-        else $result = $this->content;
-        return strip_tags(html_entity_decode($result));
-    }
 }
diff --git a/app/Models/Category.php b/app/Models/Category.php
@@ -3,24 +3,20 @@
 namespace App\Models;
 
 use App\Interfaces\Searchable;
+use App\Traits\HasThumbnail;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 
 class Category extends Model implements Searchable
 {
-    use HasFactory;
+    use HasFactory, HasThumbnail;
 
     public $timestamps = false;
 
     protected $fillable = [
         'thumbnail_path'
     ];
 
-    public function getThumbnailAttribute()
-    {
-        return asset('storage/thumbnails/'.$this->thumbnail_path);
-    }
-
     public function posts()
     {
         return $this->belongsToMany(Post::class, 'posts_of_categories', 'category_id', 'post_id');

diff --git a/app/Models/Content.php b/app/Models/Content.php
@@ -2,26 +2,18 @@
 
 namespace App\Models;
 
+use App\Traits\HasDescription;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 
 class Content extends Model
 {
-    use HasFactory;
+    use HasFactory, HasDescription;
 
     protected $fillable = [
         'lang',
         'title',
         'content',
         'url'
     ];
-
-    public function getDescriptionAttribute()
-    {
-        $maxLength = config('blog.description_length');
-        if (strlen($this->content) > $maxLength)
-            $result = substr($this->content, 0, $maxLength);
-        else $result = $this->content;
-        return strip_tags(html_entity_decode($result));
-    }
 }
diff --git a/app/Models/Post.php b/app/Models/Post.php
@@ -3,14 +3,15 @@
 namespace App\Models;
 
 use App\Interfaces\Searchable;
+use App\Traits\HasThumbnail;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Spatie\Feed\Feedable;
 use Spatie\Feed\FeedItem;
 
 class Post extends Model implements Searchable, Feedable
 {
-    use HasFactory;
+    use HasFactory, HasThumbnail;
 
     public $timestamps = false;
 
@@ -36,11 +37,6 @@ public function relativePosts()
         return collect([]);
     }
 
-    public function getThumbnailAttribute()
-    {
-        return asset('storage/thumbnails/'.$this->thumbnail_path);
-    }
-
     public function isVisible()
     {
         return $this->is_visible && empty($this->publish_at);

diff --git a/app/Models/User.php b/app/Models/User.php
@@ -3,6 +3,7 @@
 namespace App\Models;
 
 use App\Interfaces\Searchable;
+use App\Traits\HasThumbnail;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Foundation\Auth\User as Authenticatable;
 use Illuminate\Notifications\Notifiable;
@@ -13,6 +14,10 @@ class User extends Authenticatable implements Searchable
 {
     use HasFactory, Notifiable, HasRoles, TwoFactorAuthenticatable;
 
+    use HasThumbnail {
+        getThumbnailAttribute as getAvatarAttribute;
+    }
+
     /**
      * The attributes that are mass assignable.
      *
@@ -50,11 +55,6 @@ class User extends Authenticatable implements Searchable
         'email_verified_at' => 'datetime',
     ];
 
-    public function getAvatarAttribute()
-    {
-        return asset('storage/thumbnails/'.$this->thumbnail_path);
-    }
-
     public function getFullNameAttribute()
     {
         return $this->first_name.' '.$this->last_name;

diff --git a/app/Traits/HasDescription.php b/app/Traits/HasDescription.php
@@ -0,0 +1,15 @@
+<?php
+
+namespace App\Traits;
+
+trait HasDescription
+{
+    public function getDescriptionAttribute()
+    {
+        $maxLength = config('blog.description_length');
+        if (strlen($this->content) > $maxLength)
+            $result = substr($this->content, 0, $maxLength);
+        else $result = $this->content;
+        return strip_tags(html_entity_decode($result));
+    }
+}
diff --git a/app/Traits/HasThumbnail.php b/app/Traits/HasThumbnail.php
@@ -0,0 +1,11 @@
+<?php
+
+namespace App\Traits;
+
+trait HasThumbnail
+{
+    public function getThumbnailAttribute()
+    {
+        return asset('storage/thumbnails/'.$this->thumbnail_path);
+    }
+}
diff --git a/composer.json b/composer.json
@@ -23,7 +23,7 @@
         "laravel/framework": "^8.12",
         "laravel/tinker": "^2.5",
         "spatie/laravel-feed": "^2.7",
-        "stanfortonski/laravel-roles": "^2.1"
+        "stanfortonski/laravel-roles": "^3.1"
     },
     "require-dev": {
         "barryvdh/laravel-debugbar": "^3.5",