Merge pull request #238 from bvipul/develop

Solved Issues

app/Http/Breadcrumbs/Backend/Blog_Category.php

 <?php
 
-Breadcrumbs::register('admin.blogcategories.index', function ($breadcrumbs) {
+Breadcrumbs::register('admin.blogCategories.index', function ($breadcrumbs) {
     $breadcrumbs->parent('admin.dashboard');
-    $breadcrumbs->push(trans('menus.backend.blogcategories.management'), route('admin.blogcategories.index'));
+    $breadcrumbs->push(trans('menus.backend.blogcategories.management'), route('admin.blogCategories.index'));
 });
 
-Breadcrumbs::register('admin.blogcategories.create', function ($breadcrumbs) {
-    $breadcrumbs->parent('admin.blogcategories.index');
-    $breadcrumbs->push(trans('menus.backend.blogcategories.create'), route('admin.blogcategories.create'));
+Breadcrumbs::register('admin.blogCategories.create', function ($breadcrumbs) {
+    $breadcrumbs->parent('admin.blogCategories.index');
+    $breadcrumbs->push(trans('menus.backend.blogcategories.create'), route('admin.blogCategories.create'));
 });
 
-Breadcrumbs::register('admin.blogcategories.edit', function ($breadcrumbs, $id) {
-    $breadcrumbs->parent('admin.blogcategories.index');
-    $breadcrumbs->push(trans('menus.backend.blogcategories.edit'), route('admin.blogcategories.edit', $id));
+Breadcrumbs::register('admin.blogCategories.edit', function ($breadcrumbs, $id) {
+    $breadcrumbs->parent('admin.blogCategories.index');
+    $breadcrumbs->push(trans('menus.backend.blogcategories.edit'), route('admin.blogCategories.edit', $id));
 });

app/Http/Breadcrumbs/Backend/Blog_Tag.php

 <?php
 
-Breadcrumbs::register('admin.blogtags.index', function ($breadcrumbs) {
+Breadcrumbs::register('admin.blogTags.index', function ($breadcrumbs) {
     $breadcrumbs->parent('admin.dashboard');
-    $breadcrumbs->push(trans('menus.backend.blogtags.management'), route('admin.blogtags.index'));
+    $breadcrumbs->push(trans('menus.backend.blogtags.management'), route('admin.blogTags.index'));
 });
 
-Breadcrumbs::register('admin.blogtags.create', function ($breadcrumbs) {
-    $breadcrumbs->parent('admin.blogtags.index');
-    $breadcrumbs->push(trans('menus.backend.blogtags.create'), route('admin.blogtags.create'));
+Breadcrumbs::register('admin.blogTags.create', function ($breadcrumbs) {
+    $breadcrumbs->parent('admin.blogTags.index');
+    $breadcrumbs->push(trans('menus.backend.blogtags.create'), route('admin.blogTags.create'));
 });
 
-Breadcrumbs::register('admin.blogtags.edit', function ($breadcrumbs, $id) {
-    $breadcrumbs->parent('admin.blogtags.index');
-    $breadcrumbs->push(trans('menus.backend.blogtags.edit'), route('admin.blogtags.edit', $id));
+Breadcrumbs::register('admin.blogTags.edit', function ($breadcrumbs, $id) {
+    $breadcrumbs->parent('admin.blogTags.index');
+    $breadcrumbs->push(trans('menus.backend.blogtags.edit'), route('admin.blogTags.edit', $id));
 });

app/Http/Controllers/Backend/BlogCategories/BlogCategoriesController.php

@@ -3,16 +3,17 @@
 namespace App\Http\Controllers\Backend\BlogCategories;
 
 use App\Http\Controllers\Controller;
+use App\Http\Responses\ViewResponse;
+use App\Http\Responses\RedirectResponse;
+use App\Models\BlogCategories\BlogCategory;
+use App\Http\Responses\Backend\BlogCategory\EditResponse;
+use App\Repositories\Backend\BlogCategories\BlogCategoriesRepository;
+use App\Http\Requests\Backend\BlogCategories\EditBlogCategoriesRequest;
+use App\Http\Requests\Backend\BlogCategories\StoreBlogCategoriesRequest;
 use App\Http\Requests\Backend\BlogCategories\CreateBlogCategoriesRequest;
 use App\Http\Requests\Backend\BlogCategories\DeleteBlogCategoriesRequest;
-use App\Http\Requests\Backend\BlogCategories\EditBlogCategoriesRequest;
 use App\Http\Requests\Backend\BlogCategories\ManageBlogCategoriesRequest;
-use App\Http\Requests\Backend\BlogCategories\StoreBlogCategoriesRequest;
 use App\Http\Requests\Backend\BlogCategories\UpdateBlogCategoriesRequest;
-use App\Http\Responses\RedirectResponse;
-use App\Http\Responses\ViewResponse;
-use App\Models\BlogCategories\BlogCategory;
-use App\Repositories\Backend\BlogCategories\BlogCategoriesRepository;
 
 /**
  * Class BlogCategoriesController.
@@ -65,7 +66,7 @@ class BlogCategoriesController extends Controller
      * @param \App\Models\BlogCategories\BlogCategory                             $blogCategory
      * @param \App\Http\Requests\Backend\BlogCategories\EditBlogCategoriesRequest $request
      *
-     * @return mixed
+     * @return \App\Http\Responses\Backend\BlogCategory\EditResponse
      */
     public function edit(BlogCategory $blogCategory, EditBlogCategoriesRequest $request)
     {

app/Http/Requests/Backend/BlogCategories/UpdateBlogCategoriesRequest.php

@@ -27,7 +27,7 @@ class UpdateBlogCategoriesRequest extends Request
     public function rules()
     {
         return [
-            'name' => 'required|max:191',
+            'name' => 'required|max:191|unique:blog_categories,name,' . $this->segment(3)
         ];
     }
 
@@ -39,6 +39,7 @@ class UpdateBlogCategoriesRequest extends Request
     public function messages()
     {
         return [
+            'name.unique'   => 'Blog category name already exists, please enter a different name.',
             'name.required' => 'Blog category name must required',
             'name.max'      => 'Blog category may not be greater than 191 characters.',
         ];

app/Http/Requests/Backend/BlogTags/UpdateBlogTagsRequest.php

@@ -27,7 +27,7 @@ class UpdateBlogTagsRequest extends Request
     public function rules()
     {
         return [
-            'name' => 'required|max:191',
+            'name' => 'required|max:191|unique:blog_tags,name,' . $this->segment(3)
         ];
     }
 
@@ -39,6 +39,7 @@ class UpdateBlogTagsRequest extends Request
     public function messages()
     {
         return [
+            'name.unique'   => 'Blog Tag name already exists, please enter a different name.',
             'name.required' => 'Blog Tag name is a required field.',
             'name.max'      => 'Blog Tag may not be greater than 191 characters.',
         ];

app/Http/Requests/Backend/Blogs/UpdateBlogsRequest.php

@@ -27,7 +27,7 @@ class UpdateBlogsRequest extends Request
     public function rules()
     {
         return [
-            'name'       => 'required|max:191',
+            'name'       => 'required|max:191|unique:blogs,name,' . $this->segment(3),
             'content'    => 'required',
             'categories' => 'required',
             'tags'       => 'required',
@@ -42,6 +42,7 @@ class UpdateBlogsRequest extends Request
     public function messages()
     {
         return [
+            'name.unique'   => 'Blog name already exists, please enter a different name.',
             'name.required' => 'Please insert Blog Title',
             'name.max'      => 'Blog Title may not be greater than 191 characters.',
         ];

app/Http/Responses/Backend/BlogCategory/EditResponse.php

 <?php
 
-namespace App\Http\Responses\Backend\Menu;
+namespace App\Http\Responses\Backend\BlogCategory;
 
 use Illuminate\Contracts\Support\Responsable;
 
@@ -14,7 +14,7 @@ class EditResponse implements Responsable
     /**
      * @param \App\Models\BlogCategories\BlogCategory $blogCategory
      */
-    public function __construct($blogCategory, $types, $modules)
+    public function __construct($blogCategory)
     {
         $this->blogCategory = $blogCategory;
     }

composer.json

@@ -31,7 +31,7 @@
     "require-dev": {
         "barryvdh/laravel-debugbar": "^3.0",
         "codedungeon/phpunit-result-printer": "^0.6.0",
-        "bvipul/generator": "dev-master",
+        "bvipul/generator": "^5.6",
         "filp/whoops": "~2.0",
         "fzaninotto/faker": "~1.4",
         "laravel/browser-kit-testing": "^4.0.0",

resources/assets/js/backend/app.js

@@ -743,7 +743,7 @@ function _init() {
  * or customize the JavaScript scaffolding to fit your unique needs.
  */
 
-Vue.component('flash', require('../components/backend/Flash.vue'));
+Vue.component('flash', require('../components/Flash.vue'));
 Vue.component('export-component', require('../components/backend/Export.vue'));
 
 const app = new Vue({

resources/assets/js/components/backend/Flash.vue → resources/assets/js/components/Flash.vue

@@ -29,11 +29,16 @@ export default {
 
   methods: {
     flash(message, type) {
-      this.body = message;
-      this.typeClass = "alert alert-" + type;
-      this.show = true;
+        
+        if (! type) {
+            type = "info";
+        }
 
-      this.hide();
+        this.body = message;
+        this.typeClass = "alert alert-" + type;
+        this.show = true;
+
+        this.hide();
     },
 
     hide() {

resources/assets/js/frontend/app.js

@@ -13,6 +13,7 @@ require('../bootstrap');
  * or customize the JavaScript scaffolding to fit your unique needs.
  */
 
+Vue.component('flash', require('../components/Flash.vue'));
 Vue.component('example', require('../components/frontend/Example.vue'));
 
 const app = new Vue({

resources/views/backend/layouts/app.blade.php

@@ -36,9 +36,7 @@
 
         <!-- Scripts -->
         <script>
-            window.Laravel = <?php echo json_encode([
-                'csrfToken' => csrf_token(),
-            ]); ?>
+            window.Laravel = {!! json_encode([ 'csrfToken' => csrf_token() ]) !!};
         </script>
     </head>
     <body class="skin-{{ config('backend.theme') }} {{ config('backend.layout') }}">

tests/Feature/Backend/ManageBlogCategoriesTest.php

@@ -76,4 +76,17 @@ class ManageBlogCategoriesTest extends TestCase
 
         $this->assertDatabaseMissing(config('module.blog_categories.table'), ['name' => $category->name, 'id' => $category->id, 'deleted_at' => null]);
     }
+
+    /** @test */
+    public function a_user_can_not_update_a_blog_category_with_same_name()
+    {
+        $this->actingAs($this->admin)->withExceptionHandling();
+
+        $catCategory = create(BlogCategory::class, ['name' => 'Cat']);
+        $dogCategory = create(BlogCategory::class, ['name' => 'Dog']);
+
+        $this->patch(route('admin.blogCategories.update', $dogCategory), 
+            ['name' => 'Cat']
+        )->assertSessionHasErrors('name');        ;
+    }
 }

tests/Feature/Backend/ManageBlogTagsTest.php

@@ -76,4 +76,17 @@ class ManageBlogTagsTest extends TestCase
 
         $this->assertDatabaseMissing(config('module.blog_tags.table'), ['name' => $tag->name, 'id' => $tag->id, 'deleted_at' => null]);
     }
+    
+    /** @test */
+    public function a_user_can_not_update_a_blog_tag_with_same_name()
+    {
+        $this->actingAs($this->admin)->withExceptionHandling();
+
+        $catTag = create(BlogTag::class, ['name' => 'Cat']);
+        $dogTag = create(BlogTag::class, ['name' => 'Dog']);
+        
+        $this->patch(route('admin.blogTags.update', $dogTag), 
+            ['name' => 'Cat']
+        )->assertSessionHasErrors('name');
+    }
 }

tests/Feature/Backend/ManageBlogsTest.php

@@ -196,4 +196,17 @@ class ManageBlogsTest extends TestCase
 
         $this->assertDatabaseMissing(config('module.blogs.table'), ['id' => $this->blog->id, 'deleted_at' => null]);
     }
+
+    /** @test */
+    public function a_user_can_not_update_a_blog_with_same_name()
+    {
+        $this->actingAs($this->admin)->withExceptionHandling();
+
+        $catCategory = create(Blog::class, ['name' => 'Cat']);
+        $dogCategory = create(Blog::class, ['name' => 'Dog']);
+
+        $this->patch(route('admin.blogs.update', $dogCategory), 
+            ['name' => 'Cat']
+        )->assertSessionHasErrors('name');        ;
+    }
 }