From 7d15aa76da73f07cdf3ef2f6763700cf25a2a538 Mon Sep 17 00:00:00 2001
From: George John <george@renfos.com>
Date: Wed, 22 Sep 2021 18:16:39 +0400
Subject: [PATCH] Update frontend views.

---
 config/config.php                             | 129 +++----
 .../2021_08_23_100001_create_blogs_table.php  |   6 +-
 database/seeds/BlogTableSeeder.php            | 342 +++++++++---------
 resources/views/public/blog/filter.blade.php  |  26 --
 resources/views/public/blog/index.blade.php   |  69 ++--
 .../views/public/blog/partial/aside.blade.php |  21 +-
 resources/views/public/blog/show.blade.php    |  10 +-
 routes/api.php                                |  26 +-
 routes/web.php                                |  29 +-
 src/Blog.php                                  |  31 +-
 src/Forms/Blog.php                            |  12 +-
 src/Http/Controllers/BlogPublicController.php |  62 ++--
 .../Controllers/BlogResourceController.php    |   1 -
 .../Controllers/CategoryPublicController.php  |  75 ----
 src/Http/Controllers/TagPublicController.php  |  75 ----
 src/Models/Blog.php                           |   2 +-
 src/Repositories/Eloquent/BlogRepository.php  |  17 +-
 .../Eloquent/CategoryRepository.php           |  15 +-
 .../Eloquent/Filters/BlogPublicFilter.php     |  40 +-
 .../Eloquent/Presenters/BlogItemPresenter.php |  11 +-
 .../Eloquent/Presenters/BlogListPresenter.php |  19 +-
 .../Presenters/CategoryListPresenter.php      |   5 +-
 src/Repositories/Eloquent/TagRepository.php   |   7 +-
 23 files changed, 413 insertions(+), 617 deletions(-)
 delete mode 100644 resources/views/public/blog/filter.blade.php
 delete mode 100644 src/Http/Controllers/CategoryPublicController.php
 delete mode 100644 src/Http/Controllers/TagPublicController.php

diff --git a/config/config.php b/config/config.php
index 6a3df7d..ff7aa6b 100644
--- a/config/config.php
+++ b/config/config.php
@@ -5,59 +5,62 @@
     /**
      * Provider.
      */
-    'provider'  => 'litecms',
+    'provider' => 'litecms',
 
     /*
      * Package.
      */
-    'package'   => 'blog',
+    'package' => 'blog',
 
     /*
      * Modules.
      */
-    'modules'   => ['blog', 'category', 'tag'],
+    'modules' => ['blog', 'category', 'tag'],
 
-    'blog'       => [
+    'blog' => [
         'model' => [
             'model' => \Litecms\Blog\Models\Blog::class,
             'repository' => \Litecms\Blog\Repositories\Eloquent\BlogRepository::class,
             'table' => 'blogs',
-            'hidden'=> [],
+            'hidden' => [],
             'visible' => [],
             'guarded' => ['*'],
-            'slugs' => ['slug' => 'name'],
+            'slugs' => ['slug' => 'title'],
             'dates' => ['deleted_at', 'createdat', 'updated_at'],
             'appends' => [],
-            'fillable' => ['id',  'category_id',  'title',  'description',  'images',  'tags',  'viewcount',  'slug',  'published',  'published_at',  'user_id',  'user_type',  'created_at',  'updated_at',  'deleted_at'],
+            'fillable' => [
+                'id', 'category_id', 'title', 'description', 'images', 'tags', 'viewcount',
+                'slug', 'status', 'user_id', 'user_type', 'created_at', 'updated_at', 'deleted_at',
+            ],
             'translatables' => [],
             'upload_folder' => 'blog/blog',
             'uploads' => [
-            /*
-                    'file' => [
-                        'count' => 1,
-                        'type'  => 'file',
-                    ],
-            */
-            'images' => [
+                /*
+                'file' => [
                 'count' => 1,
-                'type'  => 'image',
-            ],
+                'type'  => 'file',
+                ],
+                 */
+                'images' => [
+                    'count' => 1,
+                    'type' => 'image',
+                ],
             ],
 
             'casts' => [
-            /*
-               
+                /*
+
                 'file'      => 'array',
-            */
-            'images'    => 'array',
+                 */
+                'images' => 'array',
             ],
 
             'revision' => [],
             'perPage' => '20',
-            'search'        => [
-                'name'  => 'like',
+            'search' => [
+                'name' => 'like',
                 'status',
-            ]
+            ],
         ],
 
         'controller' => [
@@ -66,46 +69,46 @@
             'module' => 'Blog',
         ],
     ],
-    'category'       => [
+    'category' => [
         'model' => [
             'model' => \Litecms\Blog\Models\Category::class,
             'repository' => \Litecms\Blog\Repositories\Eloquent\CategoryRepository::class,
             'table' => 'blog_categories',
-            'hidden'=> [],
+            'hidden' => [],
             'visible' => [],
             'guarded' => ['*'],
             'slugs' => ['slug' => 'name'],
             'dates' => ['deleted_at', 'createdat', 'updated_at'],
             'appends' => [],
-            'fillable' => ['id',  'name',  'slug',  'status',  'user_id',  'user_type',  'created_at',  'updated_at',  'deleted_at'],
+            'fillable' => ['id', 'name', 'slug', 'status', 'user_id', 'user_type', 'created_at', 'updated_at', 'deleted_at'],
             'translatables' => [],
             'upload_folder' => 'blog/category',
             'uploads' => [
-            /*
-                    'images' => [
-                        'count' => 10,
-                        'type'  => 'image',
-                    ],
-                    'file' => [
-                        'count' => 1,
-                        'type'  => 'file',
-                    ],
-            */
+                /*
+            'images' => [
+            'count' => 10,
+            'type'  => 'image',
+            ],
+            'file' => [
+            'count' => 1,
+            'type'  => 'file',
+            ],
+             */
             ],
 
             'casts' => [
-            /*
-                'images'    => 'array',
-                'file'      => 'array',
-            */
+                /*
+            'images'    => 'array',
+            'file'      => 'array',
+             */
             ],
 
             'revision' => [],
             'perPage' => '20',
-            'search'        => [
-                'name'  => 'like',
+            'search' => [
+                'name' => 'like',
                 'status',
-            ]
+            ],
         ],
 
         'controller' => [
@@ -114,46 +117,46 @@
             'module' => 'Category',
         ],
     ],
-    'tag'       => [
+    'tag' => [
         'model' => [
             'model' => \Litecms\Blog\Models\Tag::class,
             'repository' => \Litecms\Blog\Repositories\Eloquent\TagRepository::class,
             'table' => 'blog_tags',
-            'hidden'=> [],
+            'hidden' => [],
             'visible' => [],
             'guarded' => ['*'],
             'slugs' => ['slug' => 'name'],
             'dates' => ['deleted_at', 'createdat', 'updated_at'],
             'appends' => [],
-            'fillable' => ['id',  'name',  'slug',  'status',  'user_id',  'user_type',  'created_at',  'updated_at',  'deleted_at'],
+            'fillable' => ['id', 'name', 'slug', 'status', 'user_id', 'user_type', 'created_at', 'updated_at', 'deleted_at'],
             'translatables' => [],
             'upload_folder' => 'blog/tag',
             'uploads' => [
-            /*
-                    'images' => [
-                        'count' => 10,
-                        'type'  => 'image',
-                    ],
-                    'file' => [
-                        'count' => 1,
-                        'type'  => 'file',
-                    ],
-            */
+                /*
+            'images' => [
+            'count' => 10,
+            'type'  => 'image',
+            ],
+            'file' => [
+            'count' => 1,
+            'type'  => 'file',
+            ],
+             */
             ],
 
             'casts' => [
-            /*
-                'images'    => 'array',
-                'file'      => 'array',
-            */
+                /*
+            'images'    => 'array',
+            'file'      => 'array',
+             */
             ],
 
             'revision' => [],
             'perPage' => '20',
-            'search'        => [
-                'name'  => 'like',
+            'search' => [
+                'name' => 'like',
                 'status',
-            ]
+            ],
         ],
 
         'controller' => [
diff --git a/database/migrations/2021_08_23_100001_create_blogs_table.php b/database/migrations/2021_08_23_100001_create_blogs_table.php
index 9d5a59c..1ffef98 100644
--- a/database/migrations/2021_08_23_100001_create_blogs_table.php
+++ b/database/migrations/2021_08_23_100001_create_blogs_table.php
@@ -21,13 +21,13 @@ public function up()
             $table->increments('id');
             $table->integer('category_id')->nullable();
             $table->string('title', 255)->nullable();
+            $table->text('summary')->nullable();
             $table->text('description')->nullable();
             $table->text('images')->nullable();
-            $table->text('tags')->nullable();
+            $table->string('tags', 225)->nullable();
             $table->integer('viewcount')->nullable();
             $table->string('slug', 255)->nullable();
-            $table->enum('published', ['yes', 'no'])->nullable();
-            $table->text('published_at')->nullable();
+            $table->enum('status', ['draft', 'completed', 'approved', 'published'])->nullable();
             $table->integer('user_id')->nullable();
             $table->string('user_type', 255)->nullable();
             $table->softDeletes();
diff --git a/database/seeds/BlogTableSeeder.php b/database/seeds/BlogTableSeeder.php
index df3726a..ee3dbf6 100644
--- a/database/seeds/BlogTableSeeder.php
+++ b/database/seeds/BlogTableSeeder.php
@@ -11,250 +11,230 @@ public function run()
     {
         DB::table('blogs')->insert([
             [
-                'id'               => 1,
-                'category_id'      => 1,
-                'title'            => 'Design is thinking made visual',
-                'description'      => '<p style="color: rgb(111, 111, 111); line-height: 24px;">Lorem Ipsum is simply dummy text of the printing and typesetting industry.
+                'id' => 1,
+                'category_id' => 1,
+                'title' => 'Design is thinking made visual',
+                'description' => '<p style="color: rgb(111, 111, 111); line-height: 24px;">Lorem Ipsum is simply dummy text of the printing and typesetting industry.
                 Lorem Ipsum has been the industrys standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries, but also the leap into electronic typesetting, remaining essentially unchanged. It was popularised in the 1960s with the release of Letraset sheets containing Lorem Ipsum passages, and more recently with desktop publishing software like Aldus PageMaker including versions of Lorem Ipsum.</p><h3 style="font-family: Roboto, sans-serif; color: rgb(0, 0, 0);">Microsoft Patch Management For Home Users</h3><p style="color: rgb(111, 111, 111); line-height: 24px;">Last month, my wife, Anne Doe, took me to Las Vegas because she had to go for a business convention. Needless to say, she writes for an guide to casinos and I hate gambling. But then, she likes it and this supports us too, so I went along without any hassle. At first I was depressed, but then as I asked around and looked around, I ended up having more fun in Las Vegas than I would have thought. And no. I did not enter a single casino while I was there.</p><h5 style="font-family: Roboto, sans-serif; color: rgb(0, 0, 0);">Entertainment</h5><p style="color: rgb(111, 111, 111); line-height: 24px;">One of the greatest things about Las Vegas, Reno and Atlantic City (but especially Las Vegas) is the number of shows that are available. You can get to watch top class comedians like Jay Leno, Jerry Seinfeld, Ray Romano, Tim Allen and even the likes of Bill Cosby and Chris Rock. If you are into music you can watch female singers like Celine Dion, Mariah Carey, Britney Spears, Christina Aguilera and Beyonc?, male performers like Phil Collins, Eric Clapton, Snoopy Dog and bands like Oasis and Bon Jovi. I could go on and on but the list is endless. If you are into magic you can watch magicians like David Copperfield do their thing meters from you. Whatever you like, you can find it here from Western music to oldies to Jazz, Rock, Heavy Mettle to Trance. All you have to do is look at the itenary offered during your visit</p>',
-                'images'           => '[{"title":"Blog img37","caption":"Blog img37","url":"Blog img37","desc":null,"folder":"2021\/08\/13\/121214839\/images","time":"2021-08-13 12:17:20","path":"blog\/blog\/2021\/08\/13\/121214839\/images\/blog-img37.jpeg","file":"blog-img37.jpeg"}]',
-                'tags'             => NULL,
-                'viewcount'        => NULL,
-                'slug'             => 'Design is thinking made visual',
-                'published'        => 'yes',
-                'published_at'     => '2021-07-17',
-                'user_id'          => 1,
-                'user_type'        => 'App\Models\User',
-            ],
-            [
-                'id'               => 2,
-                'category_id'      => 1,
-                'title'            => 'Design is thinking made visual-1',
-                'description'      => '<p style="color: rgb(111, 111, 111); line-height: 24px;">Lorem Ipsum is simply dummy text of the printing and typesetting industry.
+                'images' => '[{"title":"Blog img37","caption":"Blog img37","url":"Blog img37","desc":null,"folder":"2021\/08\/13\/121214839\/images","time":"2021-08-13 12:17:20","path":"blog\/blog\/2021\/08\/13\/121214839\/images\/blog-img37.jpeg","file":"blog-img37.jpeg"}]',
+                'tags' => null,
+                'viewcount' => null,
+                'slug' => 'design-is-thinking-made-visual',
+                'status' => 'published',
+                'user_id' => 1,
+                'user_type' => 'App\Models\User',
+            ],
+            [
+                'id' => 2,
+                'category_id' => 1,
+                'title' => 'Design is thinking made visual-1',
+                'description' => '<p style="color: rgb(111, 111, 111); line-height: 24px;">Lorem Ipsum is simply dummy text of the printing and typesetting industry.
                 Lorem Ipsum has been the industrys standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries, but also the leap into electronic typesetting, remaining essentially unchanged. It was popularised in the 1960s with the release of Letraset sheets containing Lorem Ipsum passages, and more recently with desktop publishing software like Aldus PageMaker including versions of Lorem Ipsum.</p><h3 style="font-family: Roboto, sans-serif; color: rgb(0, 0, 0);">Microsoft Patch Management For Home Users</h3><p style="color: rgb(111, 111, 111); line-height: 24px;">Last month, my wife, Anne Doe, took me to Las Vegas because she had to go for a business convention. Needless to say, she writes for an guide to casinos and I hate gambling. But then, she likes it and this supports us too, so I went along without any hassle. At first I was depressed, but then as I asked around and looked around, I ended up having more fun in Las Vegas than I would have thought. And no. I did not enter a single casino while I was there.</p><h5 style="font-family: Roboto, sans-serif; color: rgb(0, 0, 0);">Entertainment</h5><p style="color: rgb(111, 111, 111); line-height: 24px;">One of the greatest things about Las Vegas, Reno and Atlantic City (but especially Las Vegas) is the number of shows that are available. You can get to watch top class comedians like Jay Leno, Jerry Seinfeld, Ray Romano, Tim Allen and even the likes of Bill Cosby and Chris Rock. If you are into music you can watch female singers like Celine Dion, Mariah Carey, Britney Spears, Christina Aguilera and Beyonc?, male performers like Phil Collins, Eric Clapton, Snoopy Dog and bands like Oasis and Bon Jovi. I could go on and on but the list is endless. If you are into magic you can watch magicians like David Copperfield do their thing meters from you. Whatever you like, you can find it here from Western music to oldies to Jazz, Rock, Heavy Mettle to Trance. All you have to do is look at the itenary offered during your visit</p>',
-                'images'           => '[{"title":"Blog img38","caption":"Blog img38","url":"Blog img38","desc":null,"folder":"2021\/08\/13\/121945933\/images","time":"2021-08-13 12:20:19","path":"blog\/blog\/2021\/08\/13\/121945933\/images\/blog-img38.jpeg","file":"blog-img38.jpeg"}]',
-                'tags'             => NULL,
-                'viewcount'        => NULL,
-                'slug'             => 'Design is thinking made visual-1',
-                'published'        => 'yes',
-                'published_at'     => '2021-07-17',
-                'user_id'          => 1,
-                'user_type'        => 'App\Models\User',
-            ],
-            [
-                'id'               => 3,
-                'category_id'      => 4,
-                'title'            => 'Design is thinking made visual-2',
-                'description'      => '<p style="color: rgb(111, 111, 111); line-height: 24px;">Lorem Ipsum is simply dummy text of the printing and typesetting industry.
+                'images' => '[{"title":"Blog img38","caption":"Blog img38","url":"Blog img38","desc":null,"folder":"2021\/08\/13\/121945933\/images","time":"2021-08-13 12:20:19","path":"blog\/blog\/2021\/08\/13\/121945933\/images\/blog-img38.jpeg","file":"blog-img38.jpeg"}]',
+                'tags' => null,
+                'viewcount' => null,
+                'slug' => 'design-is-thinking-made-visual-one',
+                'status' => 'published',
+                'user_id' => 1,
+                'user_type' => 'App\Models\User',
+            ],
+            [
+                'id' => 3,
+                'category_id' => 4,
+                'title' => 'Design is thinking made visual-2',
+                'description' => '<p style="color: rgb(111, 111, 111); line-height: 24px;">Lorem Ipsum is simply dummy text of the printing and typesetting industry.
                 Lorem Ipsum has been the industrys standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries, but also the leap into electronic typesetting, remaining essentially unchanged. It was popularised in the 1960s with the release of Letraset sheets containing Lorem Ipsum passages, and more recently with desktop publishing software like Aldus PageMaker including versions of Lorem Ipsum.</p><h3 style="font-family: Roboto, sans-serif; color: rgb(0, 0, 0);">Microsoft Patch Management For Home Users</h3><p style="color: rgb(111, 111, 111); line-height: 24px;">Last month, my wife, Anne Doe, took me to Las Vegas because she had to go for a business convention. Needless to say, she writes for an guide to casinos and I hate gambling. But then, she likes it and this supports us too, so I went along without any hassle. At first I was depressed, but then as I asked around and looked around, I ended up having more fun in Las Vegas than I would have thought. And no. I did not enter a single casino while I was there.</p><h5 style="font-family: Roboto, sans-serif; color: rgb(0, 0, 0);">Entertainment</h5><p style="color: rgb(111, 111, 111); line-height: 24px;">One of the greatest things about Las Vegas, Reno and Atlantic City (but especially Las Vegas) is the number of shows that are available. You can get to watch top class comedians like Jay Leno, Jerry Seinfeld, Ray Romano, Tim Allen and even the likes of Bill Cosby and Chris Rock. If you are into music you can watch female singers like Celine Dion, Mariah Carey, Britney Spears, Christina Aguilera and Beyonc?, male performers like Phil Collins, Eric Clapton, Snoopy Dog and bands like Oasis and Bon Jovi. I could go on and on but the list is endless. If you are into magic you can watch magicians like David Copperfield do their thing meters from you. Whatever you like, you can find it here from Western music to oldies to Jazz, Rock, Heavy Mettle to Trance. All you have to do is look at the itenary offered during your visit</p>',
-                'images'           => '[{"title":"Blog img39","caption":"Blog img39","url":"Blog img39","desc":null,"folder":"2021\/08\/16\/132431165\/images","time":"2021-08-16 13:24:39","path":"blog\/blog\/2021\/08\/16\/132431165\/images\/blog-img39.jpeg","file":"blog-img39.jpeg"}]',
-                'tags'             => NULL,
-                'viewcount'        => NULL,
-                'slug'             => 'Design is thinking made visual-2',
-                'published'        => 'yes',
-                'published_at'     => '2021-07-17',
-                'user_id'          => 1,
-                'user_type'        => 'App\Models\User',
+                'images' => '[{"title":"Blog img39","caption":"Blog img39","url":"Blog img39","desc":null,"folder":"2021\/08\/16\/132431165\/images","time":"2021-08-16 13:24:39","path":"blog\/blog\/2021\/08\/16\/132431165\/images\/blog-img39.jpeg","file":"blog-img39.jpeg"}]',
+                'tags' => null,
+                'viewcount' => null,
+                'slug' => 'design-is-thinking-made-visual-two',
+                'status' => 'published',
+                'user_id' => 1,
+                'user_type' => 'App\Models\User',
             ],
-            
+
         ]);
 
         DB::table('blog_categories')->insert([
             [
-                'id'               => 1,
-                'name'             => 'Arts and Entertainment',
-                'slug'             => NULL,
-                'status'           => 'show',
-                'user_id'          => 1,
-                'user_type'        => 'App\Models\User',
+                'id' => 1,
+                'name' => 'Arts and Entertainment',
+                'slug' => 'arts-and-entertainment',
+                'status' => 'show',
+                'user_id' => 1,
+                'user_type' => 'App\Models\User',
             ],
             [
-                'id'               => 2,
-                'name'             => 'Branding',
-                'slug'             => NULL,
-                'status'           => 'show',
-                'user_id'          => 1,
-                'user_type'        => 'App\Models\User',
+                'id' => 2,
+                'name' => 'Branding',
+                'slug' => 'branding',
+                'status' => 'show',
+                'user_id' => 1,
+                'user_type' => 'App\Models\User',
             ],
             [
-                'id'               => 3,
-                'name'             => 'Design Tutorials',
-                'slug'             => NULL,
-                'status'           => 'show',
-                'user_id'          => 1,
-                'user_type'        => 'App\Models\User',
+                'id' => 3,
+                'name' => 'Design Tutorials',
+                'slug' => 'design-tutorials',
+                'status' => 'show',
+                'user_id' => 1,
+                'user_type' => 'App\Models\User',
             ],
             [
-                'id'               => 4,
-                'name'             => 'Designing',
-                'slug'             => NULL,
-                'status'           => 'show',
-                'user_id'          => 1,
-                'user_type'        => 'App\Models\User',
+                'id' => 4,
+                'name' => 'Designing',
+                'slug' => 'designing',
+                'status' => 'show',
+                'user_id' => 1,
+                'user_type' => 'App\Models\User',
             ],
             [
-                'id'               => 5,
-                'name'             => 'Feature',
-                'slug'             => NULL,
-                'status'           => 'show',
-                'user_id'          => 1,
-                'user_type'        => 'App\Models\User',
+                'id' => 5,
+                'name' => 'Feature',
+                'slug' => 'feature',
+                'status' => 'show',
+                'user_id' => 1,
+                'user_type' => 'App\Models\User',
             ],
         ]);
-        
+
         DB::table('blog_tags')->insert([
             [
-                'id'               => 1,
-                'name'             => 'Advertisements',
-                'slug'             => NULL,
-                'status'           => 'show',
-                'user_id'          => 1,
-                'user_type'        => 'App\Models\User',
-            ],
-            [
-                'id'               => 2,
-                'name'             => 'Artistry',
-                'slug'             => NULL,
-                'status'           => 'show',
-                'user_id'          => 1,
-                'user_type'        => 'App\Models\User',
+                'id' => 1,
+                'name' => 'Advertisements',
+                'slug' => 'advertisements',
+                'status' => 'show',
+                'user_id' => 1,
+                'user_type' => 'App\Models\User',
             ],
             [
-                'id'               => 3,
-                'name'             => 'Blog',
-                'slug'             => NULL,
-                'status'           => 'show',
-                'user_id'          => 1,
-                'user_type'        => 'App\Models\User',
+                'id' => 2,
+                'name' => 'Artistry',
+                'slug' => 'artistry',
+                'status' => 'show',
+                'user_id' => 1,
+                'user_type' => 'App\Models\User',
             ],
             [
-                'id'               => 4,
-                'name'             => 'Conceptual',
-                'slug'             => NULL,
-                'status'           => 'show',
-                'user_id'          => 1,
-                'user_type'        => 'App\Models\User',
+                'id' => 3,
+                'name' => 'Blog',
+                'slug' => 'blog',
+                'status' => 'show',
+                'user_id' => 1,
+                'user_type' => 'App\Models\User',
             ],
             [
-                'id'               => 5,
-                'name'             => 'Design',
-                'slug'             => NULL,
-                'status'           => 'show',
-                'user_id'          => 1,
-                'user_type'        => 'App\Models\User',
+                'id' => 4,
+                'name' => 'Conceptual',
+                'slug' => 'conceptual',
+                'status' => 'show',
+                'user_id' => 1,
+                'user_type' => 'App\Models\User',
             ],
             [
-                'id'               => 6,
-                'name'             => 'Fashion',
-                'slug'             => NULL,
-                'status'           => 'show',
-                'user_id'          => 1,
-                'user_type'        => 'App\Models\User',
+                'id' => 5,
+                'name' => 'Design',
+                'slug' => 'design',
+                'status' => 'show',
+                'user_id' => 1,
+                'user_type' => 'App\Models\User',
             ],
             [
-                'id'               => 7,
-                'name'             => 'Inscription',
-                'slug'             => NULL,
-                'status'           => 'show',
-                'user_id'          => 1,
-                'user_type'        => 'App\Models\User',
+                'id' => 6,
+                'name' => 'Fashion',
+                'slug' => 'fashion',
+                'status' => 'show',
+                'user_id' => 1,
+                'user_type' => 'App\Models\User',
             ],
             [
-                'id'               => 8,
-                'name'             => 'Smart',
-                'slug'             => NULL,
-                'status'           => 'show',
-                'user_id'          => 1,
-                'user_type'        => 'App\Models\User',
+                'id' => 7,
+                'name' => 'Inscription',
+                'slug' => 'inscription',
+                'status' => 'show',
+                'user_id' => 1,
+                'user_type' => 'App\Models\User',
             ],
             [
-                'id'               => 9,
-                'name'             => 'Quotes',
-                'slug'             => NULL,
-                'status'           => 'show',
-                'user_id'          => 1,
-                'user_type'        => 'App\Models\User',
+                'id' => 8,
+                'name' => 'Unique',
+                'slug' => 'unique',
+                'status' => 'show',
+                'user_id' => 1,
+                'user_type' => 'App\Models\User',
             ],
             [
-                'id'               => 10,
-                'name'             => 'Unique',
-                'slug'             => NULL,
-                'status'           => 'show',
-                'user_id'          => 1,
-                'user_type'        => 'App\Models\User',
-            ],
-            [
-                'id'               => 11,
-                'name'             => 'Concepts',
-                'slug'             => NULL,
-                'status'           => 'show',
-                'user_id'          => 1,
-                'user_type'        => 'App\Models\User',
+                'id' => 9,
+                'name' => 'Concepts',
+                'slug' => 'concepts',
+                'status' => 'show',
+                'user_id' => 1,
+                'user_type' => 'App\Models\User',
             ],
         ]);
 
         DB::table('permissions')->insert([
             [
-                'slug'      => 'blog.blog.view',
-                'name'      => 'View Blog',
+                'slug' => 'blog.blog.view',
+                'name' => 'View Blog',
             ],
             [
-                'slug'      => 'blog.blog.create',
-                'name'      => 'Create Blog',
+                'slug' => 'blog.blog.create',
+                'name' => 'Create Blog',
             ],
             [
-                'slug'      => 'blog.blog.edit',
-                'name'      => 'Update Blog',
+                'slug' => 'blog.blog.edit',
+                'name' => 'Update Blog',
             ],
             [
-                'slug'      => 'blog.blog.delete',
-                'name'      => 'Delete Blog',
+                'slug' => 'blog.blog.delete',
+                'name' => 'Delete Blog',
             ],
-            
-            
+
         ]);
 
         DB::table('menus')->insert([
 
             [
-                'parent_id'   => 1,
-                'key'         => null,
-                'url'         => 'admin/blog/blog',
-                'name'        => 'Blog',
+                'parent_id' => 1,
+                'key' => null,
+                'url' => 'admin/blog/blog',
+                'name' => 'Blog',
                 'description' => null,
-                'icon'        => 'las la-book-open',
-                'target'      => null,
-                'order'       => 190,
-                'status'      => 1,
+                'icon' => 'las la-book-open',
+                'target' => null,
+                'order' => 190,
+                'status' => 1,
             ],
             [
-                'parent_id'   => 4,
-                'key'         => null,
-                'url'         => 'blog',
-                'name'        => 'Blog',
+                'parent_id' => 4,
+                'key' => null,
+                'url' => 'blog',
+                'name' => 'Blogs',
                 'description' => null,
-                'icon'        => null,
-                'target'      => null,
-                'order'       => 190,
-                'status'      => 1,
+                'icon' => null,
+                'target' => null,
+                'order' => 190,
+                'status' => 1,
             ],
 
         ]);
 
         DB::table('settings')->insert([
             // Uncomment  and edit this section for entering value to settings table.
-            /*
-            [
-                'pacakge'   => 'Blog',
-                'module'    => 'Blog',
-                'user_type' => null,
-                'user_id'   => null,
-                'key'       => 'blog.blog.key',
-                'name'      => 'Some name',
-                'value'     => 'Some value',
-                'type'      => 'Default',
-                'control'   => 'text',
-            ],
-            */
+
+            // [
+            //     'pacakge' => 'Blog',
+            //     'module' => 'Blog',
+            //     'user_type' => null,
+            //     'user_id' => null,
+            //     'key' => 'blog.blog.key',
+            //     'name' => 'Some name',
+            //     'value' => 'Some value',
+            //     'type' => 'Default',
+            //     'control' => 'text',
+            // ],
+
         ]);
     }
 }
diff --git a/resources/views/public/blog/filter.blade.php b/resources/views/public/blog/filter.blade.php
deleted file mode 100644
index 5f569bc..0000000
--- a/resources/views/public/blog/filter.blade.php
+++ /dev/null
@@ -1,26 +0,0 @@
-@forelse($data as $blog)
-<div class="listing-single-item d-flex align-items-center flex-wrap">
-    <div class="col-12 col-lg-5 p-0 listing-image">
-        <a href="{{trans_url('blog')}}/{{@$blog['slug']}}">
-            @if($blog['images']!='[]')
-            @foreach($blog['images'] as $image)
-            <img src="{{url('image/original/'.@$image['path'])}}" class="img-fluid" alt="">
-            @endforeach
-            @endif
-        </a>
-    </div>
-    <div class="col-12 col-lg-6 p-0 listing-text">
-        <div class="listing-content">
-            <h3><a href="{{trans_url('blog')}}/{{@$blog['slug']}}">{{@$blog['title']}}</a></h3>
-            <div class="listing-metas">
-                <span>By <a href="{{trans_url('blog')}}/{{@$blog['slug']}}">{{@$blog->users->name}}</a></span>
-                <span>{{date('M d,Y', strtotime(@$blog['published_at']))}}</span>
-                <span><a href="{{trans_url('blog')}}/{{@$blog['slug']}}">{{@$blog->category->name}}</a></span>
-            </div>
-            <p>{!! str_limit(@$blog['description'],300 )!!}</p>
-        </div>
-        <a href="{{trans_url('blog')}}/{{@$blog['slug']}}" class="btn btn-theme">Continue Reading</a>
-    </div>
-</div>
-@empty
-@endif
\ No newline at end of file
diff --git a/resources/views/public/blog/index.blade.php b/resources/views/public/blog/index.blade.php
index 5b8f40c..c89e252 100644
--- a/resources/views/public/blog/index.blade.php
+++ b/resources/views/public/blog/index.blade.php
@@ -1,44 +1,51 @@
-@include('blog::public.blog.partial.header')
+<section class="page-banner">
+    <div class="container">
+        <div class="row justify-content-center text-center">
+            <div class="col-lg-8">
+                <div class="banner-content">
+                    <h2 class="title">Blog list</h2>
+                    <p>Create custom landing pages with Lavalite that converts <br class="d-none d-md-block"> more
+                        visitors than any website. </p>
+                </div>
+            </div>
+        </div>
+    </div>
+</section>
 <section class="listing-page-wrap">
     <div class="container">
         <div class="row">
-            @include('blog::public.blog.partial.aside',['categories' => $categories,'tags' => $tags,'blogs' => $blogs])
+            @include('blog::public.blog.partial.aside')
 
             <div class="col-12 col-lg-9 left-sidebar" id="listing_data">
-            @include('blog::public.blog.filter',['data' => $data])
+                @forelse($data as $blog)
+                <div class="listing-single-item d-flex align-items-center flex-wrap">
+                    <div class="col-12 col-lg-5 p-0 listing-image">
+                        <a href="{{trans_url('blog')}}/{{$blog['slug']}}">
+                        <img src="{{url($blog['image'])}}" class="img-fluid" alt="">
+                        </a>
+                    </div>
+                    <div class="col-12 col-lg-6 p-0 listing-text">
+                        <div class="listing-content">
+                            <h3><a href="{{trans_url('blog')}}/{{$blog['slug']}}">{{$blog['title']}}</a></h3>
+                            <div class="listing-metas">
+                                <span>By <a
+                                        href="{{trans_url('blog')}}/{{$blog['slug']}}">{{$blog['user']}}</a></span>
+                                <span><a
+                                        href="{{trans_url('blog')}}/{{$blog['slug']}}">{{$blog['category']}}</a></span>
+                            </div>
+                            <p>{!! Str::limit($blog['description'],300 )!!}</p>
+                        </div>
+                        <a href="{{trans_url('blog')}}/{{$blog['slug']}}" class="btn btn-theme">Continue Reading</a>
+                    </div>
+                </div>
+                @empty
+                @endif
                 <nav class="pagination-wrap mb-50" aria-label="Page navigation example">
                     <ul class="pagination">
-                        {{$data->links()}}
-
+                        {!!view('paginator', compact('meta'))!!}
                     </ul>
                 </nav>
             </div>
         </div>
     </div>
 </section>
-<script type="text/javascript">
-$(document).ready(function() {
-    $(".category-filter").on('change', function() {
-        $(".data-filter").submit();
-    })
-    $(".data-filter").submit(function(e) {
-        e.preventDefault();
-        formData = $(this).serializeArray();
-        console.log(formData);
-        $.ajax({
-            url: "{{trans_url('blogs')}}",
-            type: 'GET',
-            data: formData,
-            processData: true,
-            contentType: false,
-            success: function(data, textStatus, jqXHR) {
-                $('#listing_data').html(data);
-            },
-            error: function(jqXHR, textStatus, errorThrown) {
-                console.log('jqXHR');
-            }
-        });
-    });
-
-});
-</script>
\ No newline at end of file
diff --git a/resources/views/public/blog/partial/aside.blade.php b/resources/views/public/blog/partial/aside.blade.php
index 8ba1942..2f9ffb0 100644
--- a/resources/views/public/blog/partial/aside.blade.php
+++ b/resources/views/public/blog/partial/aside.blade.php
@@ -1,3 +1,4 @@
+
 <div class="col-12 col-lg-3">
     <div class="search-block">
         <form class="data-filter">
@@ -11,26 +12,26 @@
     <div class="widget">
         <h4>Categories</h4>
         <ul class="list-style">
+
             @foreach($categories as $category)
-            <li><a href="#">{{$category['name']}}</a><span>{{@$category->blogs->count()}}</span></li>
+            <li><a href="{{url('blogs')}}?category={{$category['slug']}}">{{$category['name']}}</a><span>{{@$category['count']}}</span></li>
             @endforeach
         </ul>
     </div>
     <div class="widget">
         <h4>Recently Added</h4>
         <ul class="latest-post position-relative">
-            @foreach($blogs as $recentblog)
+            @foreach($recent as $blg)
             <li class="media">
                 <figure>
-                    @foreach($recentblog['images'] as $image)
-                    <a href="{{trans_url('blog')}}/{{@$recentblog['slug']}}"><img
-                            src="{{url('image/original/'.@$image['path'])}}" class="img-fluid" alt=""></a>
-                    @endforeach 
+                    <a href="{{trans_url('blog')}}/{{@$blg['slug']}}">
+                        <img src="{{url($blg['image'])}}" class="img-fluid" alt="">
+                    </a>
                 </figure>
                 <div class="media-body">
-                    <h5><a href="{{trans_url('blog')}}/{{@$recentblog['slug']}}"
-                            class="text-extra-dark-gray">{{@$recentblog['title']}}</a></h5>
-                    <span class="d-block">{{date('M d,Y', strtotime(@$recentblog['published_at']))}}</span>
+                    <h5><a href="{{trans_url('blog')}}/{{@$blg['slug']}}"
+                            class="text-extra-dark-gray">{{@$blg['title']}}</a></h5>
+                    <span class="d-block">{{date('M d,Y', strtotime(@$blg['published_at']))}}</span>
                 </div>
             </li>
             @endforeach
@@ -40,7 +41,7 @@ class="text-extra-dark-gray">{{@$recentblog['title']}}</a></h5>
         <h4>Tags Cloud</h4>
         <div class="tag-cloud">
             @foreach($tags as $tag)
-            <a href="#">{{$tag['name']}}</a>
+            <a href="{{url('blogs')}}?tag={{$tag['slug']}}">{{$tag['name']}}</a>
             @endforeach
         </div>
     </div>
diff --git a/resources/views/public/blog/show.blade.php b/resources/views/public/blog/show.blade.php
index 3626b29..da67004 100644
--- a/resources/views/public/blog/show.blade.php
+++ b/resources/views/public/blog/show.blade.php
@@ -11,17 +11,19 @@
         </div>
     </div>
 </section>
+
 <section class="listing-page-wrap">
     <div class="container">
         <div class="row">
-            @include('blog::public.blog.partial.aside',['categories' => $categories,'tags' => $tags])
+            @include('blog::public.blog.partial.aside', compact('categories', 'tags'))
+
             <div class="col-12 col-lg-9 left-sidebar" id="listing_data">
                 <div class="listing-single-wrap">
                     <h1 class="single-title">{{$data['title']}}</h1>
                     <div class="single-metas">
-                        <span>By <a href="#">{{@$data['user_id']}}</a></span>
-                        <span>{{date('M d, Y', strtotime(@$data['published_at']))}}</span>
-                        <span><a href="#">Design</a></span>
+                        <span>By <a href="#">{{@$data['author']}}</a></span>
+                        <span>{{$data['created_at']}}</span>
+                        <span><a href="#">{{$data['category']}}</a></span>
                     </div>
                     @foreach($data['images'] as $image)
                     <img src="{{url('image/original/'.@$image['path'])}}" class="img-fluid mb-30" alt="">
diff --git a/routes/api.php b/routes/api.php
index 5d84d69..c1d080f 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -5,22 +5,12 @@
 // Guard routes for blog
 Route::prefix('{guard}/blog')->group(function () {
     Route::resource('blog', 'BlogResourceController');
-});
-
-// Guard routes for category
-Route::prefix('{guard}/blog')->group(function () {
     Route::resource('category', 'CategoryResourceController');
-});
-
-// Guard routes for tag
-Route::prefix('{guard}/blog')->group(function () {
     Route::resource('tag', 'TagResourceController');
 });
 
-
-
 // Public routes for blog
-Route::get('blogs/', 'BlogPublicController@index');
+Route::get('blogs', 'BlogPublicController@index');
 Route::get('blog/{slug?}', 'BlogPublicController@show');
 
 if (Trans::isMultilingual()) {
@@ -33,22 +23,12 @@ function () {
             // Guard routes for blog
             Route::prefix('{guard}/blog')->group(function () {
                 Route::resource('blog', 'BlogResourceController');
-            });
-            
-            // Guard routes for category
-            Route::prefix('{guard}/blog')->group(function () {
-                Route::resource('category', 'CategoryResourceController');
-            });
-            
-            // Guard routes for tag
-            Route::prefix('{guard}/blog')->group(function () {
                 Route::resource('tag', 'TagResourceController');
+                Route::resource('category', 'CategoryResourceController');
             });
-            
-            
 
             // Public routes for blog
-            Route::get('blogs/', 'BlogPublicController@index');
+            Route::get('blogs', 'BlogPublicController@index');
             Route::get('blog/{slug?}', 'BlogPublicController@show');
         }
     );
diff --git a/routes/web.php b/routes/web.php
index 2d4b7dd..f11dd21 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -5,22 +5,12 @@
 // Guard routes for blog
 Route::prefix('{guard}/blog')->group(function () {
     Route::resource('blog', 'BlogResourceController');
-});
-
-// Guard routes for category
-Route::prefix('{guard}/blog')->group(function () {
-    Route::resource('category', 'CategoryResourceController');
-});
-
-// Guard routes for tag
-Route::prefix('{guard}/blog')->group(function () {
     Route::resource('tag', 'TagResourceController');
+    Route::resource('category', 'CategoryResourceController');
 });
 
-
-
 // Public routes for blog
-Route::get('blogs/', 'BlogPublicController@index');
+Route::get('blogs', 'BlogPublicController@index');
 Route::get('blog/{slug?}', 'BlogPublicController@show');
 
 
@@ -34,24 +24,13 @@ function () {
             // Guard routes for blog
             Route::prefix('{guard}/blog')->group(function () {
                 Route::resource('blog', 'BlogResourceController');
-            });
-            
-            // Guard routes for category
-            Route::prefix('{guard}/blog')->group(function () {
-                Route::resource('category', 'CategoryResourceController');
-            });
-            
-            // Guard routes for tag
-            Route::prefix('{guard}/blog')->group(function () {
                 Route::resource('tag', 'TagResourceController');
+                Route::resource('category', 'CategoryResourceController');
             });
-            
-            
 
             // Public routes for blog
-            Route::get('blogs/', 'BlogPublicController@index');
+            Route::get('blogs', 'BlogPublicController@index');
             Route::get('blog/{slug?}', 'BlogPublicController@show');
-
         }
     );
 }
\ No newline at end of file
diff --git a/src/Blog.php b/src/Blog.php
index 096370f..928ea2e 100644
--- a/src/Blog.php
+++ b/src/Blog.php
@@ -31,33 +31,14 @@ public function __construct(
         $this->tag = $tag;
     }
 
-    /**
-     * Returns count of blog.
-     *
-     * @param array $filter
-     *
-     * @return int
-     */
-    public function count()
-    {
-        return 0;
-    }
-
-    /**
-     * Find blog by slug.
-     *
-     * @param array $filter
-     *
-     * @return int
-     */
-    public function blog($slug)
+    // public function category()
+    // {
+    //     return $this->category->options();
+    // }
+    public function recent($count = 5)
     {
         return $this->blog
-            ->findBySlug($slug)
+            ->recent($count)
             ->toArray();
     }
-    public function category()
-    {
-        return $this->category->category();
-    }
 }
diff --git a/src/Forms/Blog.php b/src/Forms/Blog.php
index 59d44a2..9cf456c 100644
--- a/src/Forms/Blog.php
+++ b/src/Forms/Blog.php
@@ -50,7 +50,7 @@ public static function setAttributes()
                 "section" => "first",
                 "col" => "4",
                 "roles" => [],
-            ]
+            ],
         ];
         self::$groups = [
             'main' => trans('blog::blog.groups.main'),
@@ -85,7 +85,7 @@ public static function setAttributes()
             ],
         ];
         self::$fields = [
-                'category_id' => [
+            'category_id' => [
                 "element" => 'select',
                 "type" => 'select',
                 "label" => trans('blog::blog.label.category_id'),
@@ -93,6 +93,12 @@ public static function setAttributes()
                 "rules" => '',
                 "group" => "main",
                 "section" => "first",
+                "options" => function () {
+                    return [
+                        ['text' => 'Name 1', 'value' => '1'],
+                        ['text' => 'Name 2', 'value' => '2'],
+                    ];
+                },
                 "col" => "6",
                 "append" => null,
                 "prepend" => null,
@@ -204,7 +210,7 @@ public static function setAttributes()
                 "type" => 'select',
                 "label" => trans('blog::blog.label.published'),
                 "placeholder" => trans('blog::blog.placeholder.published'),
-                'options'   => trans('blog::blog.options.published'),
+                'options' => trans('blog::blog.options.published'),
                 "rules" => '',
                 "group" => "main",
                 "section" => "first",
diff --git a/src/Http/Controllers/BlogPublicController.php b/src/Http/Controllers/BlogPublicController.php
index 953261f..05bc1f8 100644
--- a/src/Http/Controllers/BlogPublicController.php
+++ b/src/Http/Controllers/BlogPublicController.php
@@ -4,12 +4,12 @@
 
 use App\Http\Controllers\PublicController as BaseController;
 use App\Http\Requests\PublicRequest;
-use Litepie\Repository\Filter\RequestFilter;
-use Litecms\Blog\Repositories\Eloquent\Filters\BlogPublicFilter;
-use Litecms\Blog\Repositories\Eloquent\Presenters\BlogListPresenter;
 use Litecms\Blog\Interfaces\BlogRepositoryInterface;
 use Litecms\Blog\Interfaces\CategoryRepositoryInterface;
 use Litecms\Blog\Interfaces\TagRepositoryInterface;
+use Litecms\Blog\Repositories\Eloquent\Filters\BlogPublicFilter;
+use Litecms\Blog\Repositories\Eloquent\Presenters\BlogListPresenter;
+use Litepie\Repository\Filter\RequestFilter;
 
 class BlogPublicController extends BaseController
 {
@@ -19,13 +19,16 @@ class BlogPublicController extends BaseController
      *
      * @return void
      */
-    public function __construct(BlogRepositoryInterface $blog,CategoryRepositoryInterface $category,TagRepositoryInterface $tag)
-    {
+    public function __construct(
+        BlogRepositoryInterface $blog,
+        CategoryRepositoryInterface $category,
+        TagRepositoryInterface $tag
+    ) {
         parent::__construct();
         $this->modules = $this->modules(config('litecms.blog.modules'), 'blog', guard_url('blog'));
+        $this->repository = $blog;
         $this->category = $category;
         $this->tag = $tag;
-        $this->repository = $blog;
 
     }
 
@@ -37,34 +40,32 @@ public function __construct(BlogRepositoryInterface $blog,CategoryRepositoryInte
     protected function index(PublicRequest $request)
     {
 
-        $search=$request->search;
+        $search = $request->search;
         $pageLimit = $request->input('pageLimit', config('database.pagination.limit'));
-        $data = $this->repository->where('published','yes')
+        $data = $this->repository
             ->pushFilter(RequestFilter::class)
             ->pushFilter(BlogPublicFilter::class)
             ->setPresenter(BlogListPresenter::class)
-            ->Paginate($pageLimit);
-            // ->withQueryString()
-            // ->toArray();
-           
-        // extract($data);
-        $categories = $this->category->categories();
-        $tags = $this->tag->tags();
-        $blogs= $this->repository->recentBlogs();
-        $modules = $this->modules;
+            ->select('blogs.*')
+            ->paginate($pageLimit)
+            ->withQueryString()
+            ->appends([
+                'dd' => 'dd',
+            ])
+            ->toArray();
+
+        extract($data);
 
-        $view = 'index';
-        if ($request->ajax()) {
-            $view = 'filter';
-        }
+        $categories = $this->category->categories()->toArray();
+        $tags = $this->tag->tags()->toArray();
+        $recent = $this->repository->recent(2)->toArray();
 
         return $this->response->setMetaTitle(trans('blog::blog.names'))
-            ->view('blog::public.blog.'.$view)
-            ->data(compact('data', 'modules','categories','tags','blogs'))
+            ->view('blog::public.blog.index')
+            ->data(compact('data', 'meta', 'categories', 'tags', 'recent'))
             ->output();
     }
 
-
     /**
      * Show blog.
      *
@@ -77,17 +78,14 @@ protected function show(PublicRequest $request, $slug)
         $data = $this->repository
             ->findBySlug($slug)
             ->toArray();
-        $modules = $this->modules;
-
-        $categories = $this->category->categories();
-
-        $tags = $this->tag->tags();
-
-        $blogs= $this->repository->recentBlogs();
 
+        $categories = $this->category->categories()->toArray();
+        $tags = $this->tag->tags()->toArray();
+        $recent = $this->repository->recent(2)->toArray();
+    
         return $this->response->setMetaTitle($data['title'] . trans('blog::blog.name'))
             ->view('blog::public.blog.show')
-            ->data(compact('data', 'modules','categories','tags','blogs'))
+            ->data(compact('data', 'categories', 'tags', 'recent'))
             ->output();
     }
 
diff --git a/src/Http/Controllers/BlogResourceController.php b/src/Http/Controllers/BlogResourceController.php
index 4fce165..683c5f5 100644
--- a/src/Http/Controllers/BlogResourceController.php
+++ b/src/Http/Controllers/BlogResourceController.php
@@ -110,7 +110,6 @@ public function store(BlogRequest $request, BlogRepositoryInterface $repository)
             $attributes = $request->all();
             $attributes['user_id'] = user_id();
             $attributes['user_type'] = user_type();
-            $attributes['slug'] = str_slug('title');
             $repository->create($attributes);
             $data = $repository->toArray();
 
diff --git a/src/Http/Controllers/CategoryPublicController.php b/src/Http/Controllers/CategoryPublicController.php
deleted file mode 100644
index 3338b1a..0000000
--- a/src/Http/Controllers/CategoryPublicController.php
+++ /dev/null
@@ -1,75 +0,0 @@
-<?php
-
-namespace Litecms\Blog\Http\Controllers;
-
-use App\Http\Controllers\PublicController as BaseController;
-use App\Http\Requests\PublicRequest;
-use Litepie\Repository\Filter\RequestFilter;
-use Litecms\Blog\Repositories\Eloquent\Filters\CategoryPublicFilter;
-use Litecms\Blog\Repositories\Eloquent\Presenters\CategoryListPresenter;
-use Litecms\Blog\Interfaces\CategoryRepositoryInterface;
-
-class CategoryPublicController extends BaseController
-{
-
-    /**
-     * Constructor.
-     *
-     * @return void
-     */
-    public function __construct(CategoryRepositoryInterface $category)
-    {
-        parent::__construct();
-        $this->modules = $this->modules(config('litecms.blog.modules'), 'blog', guard_url('blog'));
-        $this->repository = $category;
-
-    }
-
-    /**
-     * Show category's list.
-     *
-     * @return response
-     */
-    protected function index(PublicRequest $request)
-    {
-
-        $pageLimit = $request->input('pageLimit', config('database.pagination.limit'));
-        $data = $this->repository
-            ->pushFilter(RequestFilter::class)
-            ->pushFilter(CategoryPublicFilter::class)
-            ->setPresenter(CategoryListPresenter::class)
-            ->simplePaginate($pageLimit)
-            // ->withQueryString()
-            ->toArray();
-
-        extract($data);
-        $modules = $this->modules;
-
-        return $this->response->setMetaTitle(trans('blog::category.names'))
-            ->view('blog::public.category.index')
-            ->data(compact('data', 'meta', 'modules'))
-            ->output();
-    }
-
-
-    /**
-     * Show category.
-     *
-     * @param string $slug
-     *
-     * @return response
-     */
-    protected function show(PublicRequest $request, $slug)
-    {
-        $data = $this->repository
-            ->findBySlug($slug)
-            ->toArray();
-        $modules = $this->modules;
-
-        return $this->response->setMetaTitle($data['name'] . trans('blog::category.name'))
-            ->view('blog::public.category.show')
-            ->data(compact('data', 'modules'))
-            ->output();
-    }
-
-}
diff --git a/src/Http/Controllers/TagPublicController.php b/src/Http/Controllers/TagPublicController.php
deleted file mode 100644
index 8d507f3..0000000
--- a/src/Http/Controllers/TagPublicController.php
+++ /dev/null
@@ -1,75 +0,0 @@
-<?php
-
-namespace Litecms\Blog\Http\Controllers;
-
-use App\Http\Controllers\PublicController as BaseController;
-use App\Http\Requests\PublicRequest;
-use Litepie\Repository\Filter\RequestFilter;
-use Litecms\Blog\Repositories\Eloquent\Filters\TagPublicFilter;
-use Litecms\Blog\Repositories\Eloquent\Presenters\TagListPresenter;
-use Litecms\Blog\Interfaces\TagRepositoryInterface;
-
-class TagPublicController extends BaseController
-{
-
-    /**
-     * Constructor.
-     *
-     * @return void
-     */
-    public function __construct(TagRepositoryInterface $tag)
-    {
-        parent::__construct();
-        $this->modules = $this->modules(config('litecms.blog.modules'), 'blog', guard_url('blog'));
-        $this->repository = $tag;
-
-    }
-
-    /**
-     * Show tag's list.
-     *
-     * @return response
-     */
-    protected function index(PublicRequest $request)
-    {
-
-        $pageLimit = $request->input('pageLimit', config('database.pagination.limit'));
-        $data = $this->repository
-            ->pushFilter(RequestFilter::class)
-            ->pushFilter(TagPublicFilter::class)
-            ->setPresenter(TagListPresenter::class)
-            ->simplePaginate($pageLimit)
-            // ->withQueryString()
-            ->toArray();
-
-        extract($data);
-        $modules = $this->modules;
-
-        return $this->response->setMetaTitle(trans('blog::tag.names'))
-            ->view('blog::public.tag.index')
-            ->data(compact('data', 'meta', 'modules'))
-            ->output();
-    }
-
-
-    /**
-     * Show tag.
-     *
-     * @param string $slug
-     *
-     * @return response
-     */
-    protected function show(PublicRequest $request, $slug)
-    {
-        $data = $this->repository
-            ->findBySlug($slug)
-            ->toArray();
-        $modules = $this->modules;
-
-        return $this->response->setMetaTitle($data['name'] . trans('blog::tag.name'))
-            ->view('blog::public.tag.show')
-            ->data(compact('data', 'modules'))
-            ->output();
-    }
-
-}
diff --git a/src/Models/Blog.php b/src/Models/Blog.php
index fbe3d31..898e8ef 100644
--- a/src/Models/Blog.php
+++ b/src/Models/Blog.php
@@ -26,7 +26,7 @@ class Blog extends Model
      */
      protected $config = 'litecms.blog.blog.model';
 
-     public function users()
+     public function author()
      {
         return $this->belongsTo('App\Models\User', 'user_id');
      }
diff --git a/src/Repositories/Eloquent/BlogRepository.php b/src/Repositories/Eloquent/BlogRepository.php
index 6b3ec97..909879a 100644
--- a/src/Repositories/Eloquent/BlogRepository.php
+++ b/src/Repositories/Eloquent/BlogRepository.php
@@ -3,9 +3,9 @@
 namespace Litecms\Blog\Repositories\Eloquent;
 
 use Litecms\Blog\Interfaces\BlogRepositoryInterface;
-use Litepie\Repository\BaseRepository;
 use Litecms\Blog\Repositories\Eloquent\Presenters\BlogItemPresenter;
-
+use Litecms\Blog\Repositories\Eloquent\Presenters\BlogListPresenter;
+use Litepie\Repository\BaseRepository;
 
 class BlogRepository extends BaseRepository implements BlogRepositoryInterface
 {
@@ -34,12 +34,13 @@ public function presenter()
     {
         return BlogItemPresenter::class;
     }
-    public function blogs()
-    {
-        return $this->model->orderBy('title', 'ASC')->get();
-    }
-    public function recentBlogs()
+
+    public function recent($count = 5)
     {
-        return $this->model->where('published','yes')->orderBy('id', 'DESC')->get()->take(2);
+        return $this
+            ->setPresenter(BlogListPresenter::class)
+            ->orderBy('id', 'DESC')
+            ->get()
+            ->take($count);
     }
 }
diff --git a/src/Repositories/Eloquent/CategoryRepository.php b/src/Repositories/Eloquent/CategoryRepository.php
index 1921f82..b1774a7 100644
--- a/src/Repositories/Eloquent/CategoryRepository.php
+++ b/src/Repositories/Eloquent/CategoryRepository.php
@@ -3,9 +3,9 @@
 namespace Litecms\Blog\Repositories\Eloquent;
 
 use Litecms\Blog\Interfaces\CategoryRepositoryInterface;
-use Litepie\Repository\BaseRepository;
 use Litecms\Blog\Repositories\Eloquent\Presenters\CategoryItemPresenter;
-
+use Litecms\Blog\Repositories\Eloquent\Presenters\CategoryListPresenter;
+use Litepie\Repository\BaseRepository;
 
 class CategoryRepository extends BaseRepository implements CategoryRepositoryInterface
 {
@@ -34,12 +34,13 @@ public function presenter()
     {
         return CategoryItemPresenter::class;
     }
+
     public function categories()
     {
-        return $this->model->orderBy('name', 'ASC')->get();
-    }
-    public function category()
-    {
-        return $this->model->get()->pluck('name','id');
+        return $this
+            ->setPresenter(CategoryListPresenter::class)
+            ->orderBy('name', 'ASC')
+            ->get();
     }
+
 }
diff --git a/src/Repositories/Eloquent/Filters/BlogPublicFilter.php b/src/Repositories/Eloquent/Filters/BlogPublicFilter.php
index 05b732d..8d587d8 100644
--- a/src/Repositories/Eloquent/Filters/BlogPublicFilter.php
+++ b/src/Repositories/Eloquent/Filters/BlogPublicFilter.php
@@ -7,14 +7,44 @@
 
 class BlogPublicFilter implements FilterInterface
 {
-    
+
+    public function apply($model, RepositoryInterface $repository)
+    {
+        $model = $this->matchTag($model);
+        $model = $this->matchCategory($model);
+        return $this->onlyPublished($model);
+    }
+
     public function onlyPublished($model)
     {
-        return $model->where('published','yes');
+        return $model->where('blogs.status', 'Published');
     }
 
-    public function apply($model, RepositoryInterface $repository)
+    public function matchTag($model)
     {
-        return $this->onlyPublished($model);
+        $tag = request()->get('tag', '');
+
+        if (empty($tag)) {
+            return $model;
+        }
+
+        $model = $model->where('blogs.tags', 'LIKE', "%$tag%");
+
+        return $model;
     }
-}
\ No newline at end of file
+
+    public function matchCategory($model)
+    {
+        $category = request()->get('category', '');
+        if (empty($category)) {
+            return $model;
+        }
+
+        $model = $model->leftJoin(config('litecms.blog.category.model.table'), 'blogs.category_id', '=', 'blog_categories.id');
+        $model = $model->where('blog_categories.slug', $category);
+
+        return $model;
+
+    }
+
+}
diff --git a/src/Repositories/Eloquent/Presenters/BlogItemPresenter.php b/src/Repositories/Eloquent/Presenters/BlogItemPresenter.php
index 9b704fe..9dfd6c8 100644
--- a/src/Repositories/Eloquent/Presenters/BlogItemPresenter.php
+++ b/src/Repositories/Eloquent/Presenters/BlogItemPresenter.php
@@ -18,10 +18,6 @@ public function title()
             return $this->title;
         }
 
-        if ($this->name != '') {
-            return $this->name;
-        }
-
         return 'None';
     }
 
@@ -37,10 +33,9 @@ public function toArray()
             'tags' => $this->tags,
             'viewcount' => $this->viewcount,
             'slug' => $this->slug,
-            'published' => $this->published,
-            'published_at' => $this->published_at,
-            'user_id' => @$this->users->name,
-            'user_type' => $this->user_type,
+            'status' => $this->status,
+            'category' => @$this->category->name,
+            'author' => $this->author->name,
             'created_at' => !is_null($this->created_at) ? $this->created_at->format('Y-m-d H:i:s') : null,
             'updated_at' => !is_null($this->updated_at) ? $this->updated_at->format('Y-m-d H:i:s') : null,
             'meta' => [
diff --git a/src/Repositories/Eloquent/Presenters/BlogListPresenter.php b/src/Repositories/Eloquent/Presenters/BlogListPresenter.php
index 056e5f4..fbef19f 100644
--- a/src/Repositories/Eloquent/Presenters/BlogListPresenter.php
+++ b/src/Repositories/Eloquent/Presenters/BlogListPresenter.php
@@ -3,6 +3,7 @@
 namespace Litecms\Blog\Repositories\Eloquent\Presenters;
 
 use Litepie\Repository\Presenter\Presenter;
+use Illuminate\Support\Str;
 
 class BlogListPresenter extends Presenter
 {
@@ -18,20 +19,20 @@ public function title()
             return $this->title;
         }
 
-        if ($this->name != '') {
-            return $this->name;
-        }
-
         return 'None';
-     }
+    }
 
     public function toArray()
     {
         return [
             'id' => $this->getRouteKey(),
             'title' => $this->title(),
-            'description' => $this->description,
+            'description' => $this->formatDescription($this->description),
+            'image' => url($this->defaultImage('images', 'md')),
+            'slug' => $this->slug,
             'status' => $this->status,
+            'category' => @$this->category->name,
+            'user' => @$this->author->name,
             'created_at' => !is_null($this->created_at) ? $this->created_at->format('Y-m-d H:i:s') : null,
             'updated_at' => !is_null($this->updated_at) ? $this->updated_at->format('Y-m-d H:i:s') : null,
             'meta' => [
@@ -41,4 +42,10 @@ public function toArray()
         ];
     }
 
+    public function formatDescription($description)
+    {
+        $description = strip_tags($description);
+        return Str::limit($description, 90);
+    }
+
 }
diff --git a/src/Repositories/Eloquent/Presenters/CategoryListPresenter.php b/src/Repositories/Eloquent/Presenters/CategoryListPresenter.php
index 2b4f4e3..768ab02 100644
--- a/src/Repositories/Eloquent/Presenters/CategoryListPresenter.php
+++ b/src/Repositories/Eloquent/Presenters/CategoryListPresenter.php
@@ -29,9 +29,10 @@ public function toArray()
     {
         return [
             'id' => $this->getRouteKey(),
-            'title' => $this->title(),
-            'description' => $this->description,
+            'name' => $this->title(),
+            'slug' => $this->slug,
             'status' => $this->status,
+            'count' => $this->blogs->count(),
             'created_at' => !is_null($this->created_at) ? $this->created_at->format('Y-m-d H:i:s') : null,
             'updated_at' => !is_null($this->updated_at) ? $this->updated_at->format('Y-m-d H:i:s') : null,
             'meta' => [
diff --git a/src/Repositories/Eloquent/TagRepository.php b/src/Repositories/Eloquent/TagRepository.php
index e0aa96b..23221e1 100644
--- a/src/Repositories/Eloquent/TagRepository.php
+++ b/src/Repositories/Eloquent/TagRepository.php
@@ -3,9 +3,8 @@
 namespace Litecms\Blog\Repositories\Eloquent;
 
 use Litecms\Blog\Interfaces\TagRepositoryInterface;
-use Litepie\Repository\BaseRepository;
 use Litecms\Blog\Repositories\Eloquent\Presenters\TagItemPresenter;
-
+use Litepie\Repository\BaseRepository;
 
 class TagRepository extends BaseRepository implements TagRepositoryInterface
 {
@@ -36,6 +35,8 @@ public function presenter()
     }
     public function tags()
     {
-        return $this->model->orderBy('name', 'ASC')->get();
+        return $this
+            ->orderBy('name', 'ASC')
+            ->get();
     }
 }