Fixed remaining bugs

Author: ModestasV

readme.md

@@ -10,9 +10,10 @@ To use Quickadmin with Laravel Laravel 5.1.11 use branch `0.4.x`
 
 1. Install the package via `composer require laraveldaily/quickadmin`.
 2. Add `Laraveldaily\Quickadmin\QuickadminServiceProvider::class,` to your `\config\app.php` providers.
-3. Run `php artisan quickadmin:install` and fill the required information.
-4. Register middleware `'role'       => \Laraveldaily\Quickadmin\Middleware\HasPermissions::class,` in your `App\Http\Kernel.php` at `$routeMiddleware`
-5. Access QuickAdmin panel by visiting `http://yourdomain/admin`.
+3. Configure your .env file with correct database information
+4. Run `php artisan quickadmin:install` and fill the required information.
+5. Register middleware `'role'       => \Laraveldaily\Quickadmin\Middleware\HasPermissions::class,` in your `App\Http\Kernel.php` at `$routeMiddleware`
+6. Access QuickAdmin panel by visiting `http://yourdomain/admin`.
 
 ## More information and detailed description
 [http://laraveldaily.com/packages/quickadmin/](http://laraveldaily.com/packages/quickadmin/)

src/Commands/QuickAdminInstall.php

@@ -45,7 +45,7 @@ public function handle()
         $this->createRole();
         $this->info('3. Create first user');
         $this->createUser();
-        $this->info('4. Copy master template to resource\views');
+        $this->info('4. Copying master template to resource\views....');
         $this->copyMasterTemplate();
         $this->info('Installation was successful. Visit your_domain.com/admin to access admin panel');
     }

src/Controllers/QuickadminMenuController.php

@@ -103,7 +103,7 @@ public function createCrud()
     public function insertCrud(Request $request)
     {
         $validation = Validator::make($request->all(), [
-            'name'  => 'required',
+            'name'  => 'required|unique:menus,name',
             'title' => 'required',
             'soft'  => 'required',
         ]);
@@ -232,6 +232,12 @@ public function createParent()
      */
     public function insertParent(Request $request)
     {
+        $validation = Validator::make($request->all(), [
+            'title' => 'required',
+        ]);
+        if ($validation->fails()) {
+            return redirect()->back()->withInput()->withErrors($validation);
+        }
         $roles       = Role::all();
         $rolesInsert = '';
         $first       = true;
@@ -278,6 +284,13 @@ public function createCustom()
      */
     public function insertCustom(Request $request)
     {
+        $validation = Validator::make($request->all(), [
+            'name'  => 'required|unique:menus,name',
+            'title' => 'required'
+        ]);
+        if ($validation->fails()) {
+            return redirect()->back()->withInput()->withErrors($validation);
+        }
         // Create controller
         $controllerBuilder = new ControllerBuilder();
         $controllerBuilder->buildCustom($request->name);
@@ -304,7 +317,7 @@ public function insertCustom(Request $request)
             'icon'      => $request->icon != '' ? $request->icon : 'fa-database',
             'name'      => $request->name,
             'title'     => $request->title,
-            'parent_id' => $request->parent_id,
+            'parent_id' => $request->parent_id != 0 ? $request->parent_id : null,
             'roles'     => $rolesInsert
         ]);
 

src/Views/admin/partials/sidebar.blade.php

@@ -5,7 +5,7 @@
             data-auto-scroll="true"
             data-slide-speed="200">
             @if(Auth::user()->role_id == config('quickadmin.defaultRole'))
-                <li @if(Request::path() == 'menu') class="active" @endif>
+                <li @if(Request::path() == config('quickadmin.route').'/menu') class="active" @endif>
                     <a href="{{ url(config('quickadmin.route').'/menu') }}">
                         <i class="fa fa-list"></i>
                         <span class="title">Menu</span>
@@ -17,7 +17,7 @@
                         <span class="title">Users</span>
                     </a>
                 </li>
-                <li @if(Request::path() == 'actions') class="active" @endif>
+                <li @if(Request::path() == config('quickadmin.route').'/actions') class="active" @endif>
                     <a href="{{ url(config('quickadmin.route').'/actions') }}">
                         <i class="fa fa-users"></i>
                         <span class="title">User actions</span>