Merge branch 'master' into master

app/Console/Commands/Stubs/Attribute.stub

@@ -17,8 +17,9 @@ trait AttributeClass
      */
     public function getActionButtonsAttribute()
     {
-        return '<div class="btn-group action-btn">'.
-                //call your attribute functions here
-                '</div>';
+        return '<div class="btn-group action-btn">
+                '.$this->getEditButtonAttribute(editPermission, editRoute).'
+                '.$this->getDeleteButtonAttribute(deletePermission, deleteRoute).'
+                </div>';
     }
 }

app/Console/Commands/Stubs/Model.stub

@@ -2,14 +2,18 @@
 
 namespace DummyNamespace;
 
+use App\Models\ModelTrait;
 use Illuminate\Database\Eloquent\Model;
 use DummyAttribute;
 use DummyRelationship;
 
 class DummyModel extends Model
 {
-    use AttributeName,
-    	RelationshipName;
+    use ModelTrait,
+        AttributeName,
+    	RelationshipName {
+            // AttributeName::getEditButtonAttribute insteadof ModelTrait;
+        }
 
     /**
      * NOTE : If you want to implement Soft Deletes in this model,

app/Console/Commands/Stubs/Repository.stub

@@ -45,6 +45,7 @@ class DummyRepoName extends BaseRepository
     public function create(array $input)
     {
         $dummy_small_model_name = self::MODEL;
+        $dummy_small_model_name = new $dummy_small_model_name();
         if ($dummy_small_model_name->save($input)) {
             return true;
         }

app/Http/Controllers/Backend/Blogs/BlogsController.php

@@ -155,7 +155,7 @@ class BlogsController extends Controller
             if (is_numeric($tag)) {
                 $tags_array[] = $tag;
             } else {
-                $newTag = BlogTag::create(['name'=>$tag, 'status'=>1, 'created_by'=>1]);
+                $newTag = BlogTag::create(['name' => $tag, 'status' => 1, 'created_by' => 1]);
                 $tags_array[] = $newTag->id;
             }
         }

app/Http/Middleware/VerifyJWTToken.php

@@ -26,7 +26,7 @@ class VerifyJWTToken
             } elseif ($e instanceof \Tymon\JWTAuth\Exceptions\TokenInvalidException) {
                 return response()->json(['token_invalid'], $e->getStatusCode());
             } else {
-                return response()->json(['error'=>'Token is required']);
+                return response()->json(['error' => 'Token is required']);
             }
         }
 

app/Http/Utilities/Generator.php

@@ -106,6 +106,22 @@ class Generator
     protected $update_permission;
     protected $delete_permission;
 
+    /**
+     * Routes
+     * 1. Edit Route
+     * 2. Store Route
+     * 3. Manage Route
+     * 4. Create Route
+     * 5. Update Route
+     * 6. Delete Route.
+     */
+    protected $edit_route;
+    protected $store_route;
+    protected $index_route;
+    protected $create_route;
+    protected $update_route;
+    protected $delete_route;
+
     /**
      * Repository
      * 1. Repository Name
@@ -206,6 +222,14 @@ class Generator
         $this->update_permission = 'update-'.strtolower(str_singular($this->model));
         $this->delete_permission = 'delete-'.strtolower(str_singular($this->model));
 
+        //Routes
+        $this->index_route = 'admin.'.strtolower(str_plural($this->model)).'.index';
+        $this->create_route = 'admin.'.strtolower(str_plural($this->model)).'.create';
+        $this->store_route = 'admin.'.strtolower(str_plural($this->model)).'.store';
+        $this->edit_route = 'admin.'.strtolower(str_plural($this->model)).'.edit';
+        $this->update_route = 'admin.'.strtolower(str_plural($this->model)).'.update';
+        $this->delete_route = 'admin.'.strtolower(str_plural($this->model)).'.destroy';
+
         //Events
         $this->events = array_filter($input['event']);
 
@@ -342,11 +366,15 @@ class Generator
      */
     public function createModel()
     {
-        $this->createDirectory($this->getBasePath($this->attribute_namespace));
+        $this->createDirectory($this->getBasePath($this->removeFileNameFromEndOfNamespace($this->attribute_namespace)));
         //Generate Attribute File
         $this->generateFile('Attribute', [
             'AttributeNamespace' => ucfirst($this->removeFileNameFromEndOfNamespace($this->attribute_namespace)),
             'AttributeClass'     => $this->attribute,
+            'editPermission'     => $this->edit_permission,
+            'editRoute'          => $this->edit_route,
+            'deletePermission'   => $this->delete_permission,
+            'deleteRoute'        => $this->delete_route,
         ], lcfirst($this->attribute_namespace));
 
         //Generate Relationship File

app/Http/Utilities/Notification.php

@@ -101,7 +101,7 @@ abstract class Notification
     */
     public function setOptions(array $options)
     {
-        foreach ($options as $optionKey=>$option) {
+        foreach ($options as $optionKey => $option) {
             $methodName = 'set'.ucfirst($optionKey);
             $propertyName = '_'.$optionKey;
             if (method_exists($methodName, $this)) {

app/Http/Utilities/SendEmail.php

@@ -91,7 +91,7 @@ class SendEmail
               break;
           }
             // Send email code
-            $message = ['data'=>$content];
+            $message = ['data' => $content];
 
             return Mail::send(['html' => 'emails.template'], $message, function ($message) use ($data) {
                 $message->to($data['to']);

app/Models/Access/Permission/Permission.php

@@ -4,6 +4,7 @@ namespace App\Models\Access\Permission;
 
 use App\Models\Access\Permission\Traits\Attribute\PermissionAttribute;
 use App\Models\Access\Permission\Traits\Relationship\PermissionRelationship;
+use App\Models\ModelTrait;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\SoftDeletes;
 
@@ -12,7 +13,12 @@ use Illuminate\Database\Eloquent\SoftDeletes;
  */
 class Permission extends Model
 {
-    use PermissionRelationship, PermissionAttribute, SoftDeletes;
+    use ModelTrait,
+        SoftDeletes,
+        PermissionAttribute,
+        PermissionRelationship {
+            // PermissionAttribute::getEditButtonAttribute insteadof ModelTrait;
+        }
 
     /**
      * The database table used by the model.

app/Models/Access/Permission/Traits/Attribute/PermissionAttribute.php

@@ -7,42 +7,14 @@ namespace App\Models\Access\Permission\Traits\Attribute;
  */
 trait PermissionAttribute
 {
-    /**
-     * @return string
-     */
-    public function getEditButtonAttribute()
-    {
-        if (access()->allow('edit-permission')) {
-            return '<a class="btn btn-flat btn-default" href="'.route('admin.access.permission.edit', $this).'">
-                        <i data-toggle="tooltip" data-placement="top" title="Edit" class="fa fa-pencil"></i>
-                    </a>';
-        }
-    }
-
-    /**
-     * @return string
-     */
-    public function getDeleteButtonAttribute()
-    {
-        if (access()->allow('delete-permission')) {
-            return '<a class="btn btn-flat btn-default" href="'.route('admin.access.permission.destroy', $this).'" data-method="delete"
-                    data-trans-button-cancel="'.trans('buttons.general.cancel').'"
-                    data-trans-button-confirm="'.trans('buttons.general.crud.delete').'"
-                    data-trans-title="'.trans('strings.backend.general.are_you_sure').'">
-                        <i data-toggle="tooltip" data-placement="top" title="Delete" class="fa fa-trash"></i>
-                </a>';
-        }
-    }
-
     /**
      * @return string
      */
     public function getActionButtonsAttribute()
     {
         return '<div class="btn-group action-btn">
-                    '.$this->getEditButtonAttribute().'
-                    '.$this->getDeleteButtonAttribute().'
-                    
+                    '.$this->getEditButtonAttribute('edit-permission', 'admin.access.permission.edit').'
+                    '.$this->getDeleteButtonAttribute('delete-permission', 'admin.access.permission.destroy').'
                 </div>';
     }
 }

app/Models/Access/Role/Role.php

@@ -6,6 +6,7 @@ use App\Models\Access\Role\Traits\Attribute\RoleAttribute;
 use App\Models\Access\Role\Traits\Relationship\RoleRelationship;
 use App\Models\Access\Role\Traits\RoleAccess;
 use App\Models\Access\Role\Traits\Scope\RoleScope;
+use App\Models\ModelTrait;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\SoftDeletes;
 
@@ -15,10 +16,14 @@ use Illuminate\Database\Eloquent\SoftDeletes;
 class Role extends Model
 {
     use RoleScope,
+        ModelTrait,
         RoleAccess,
         RoleAttribute,
         RoleRelationship,
-        SoftDeletes;
+        SoftDeletes {
+            RoleAttribute::getEditButtonAttribute insteadof ModelTrait;
+            RoleAttribute::getDeleteButtonAttribute insteadof ModelTrait;
+        }
 
     /**
      * The database table used by the model.

app/Models/Access/Role/Traits/Attribute/RoleAttribute.php

@@ -43,7 +43,7 @@ trait RoleAttribute
     public function getActionButtonsAttribute()
     {
         return '<div class="btn-group action-btn">
-                    '.$this->getEditButtonAttribute().'
+                    '.$this->getEditButtonAttribute('edit-role', 'admin.access.role.edit').'
                     '.$this->getDeleteButtonAttribute().'
                 </div>';
     }

app/Models/BlogCategories/BlogCategory.php

@@ -4,14 +4,18 @@ namespace App\Models\BlogCategories;
 
 use App\Models\BlogCategories\Traits\Attribute\BlogCategoryAttribute;
 use App\Models\BlogCategories\Traits\Relationship\BlogCategoryRelationship;
+use App\Models\ModelTrait;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\SoftDeletes;
 
 class BlogCategory extends Model
 {
-    use BlogCategoryAttribute,
+    use ModelTrait,
         SoftDeletes,
-        BlogCategoryRelationship;
+        BlogCategoryAttribute,
+        BlogCategoryRelationship {
+            // BlogCategoryAttribute::getEditButtonAttribute insteadof ModelTrait;
+        }
 
     /**
      * The database table used by the model.

app/Models/BlogCategories/Traits/Attribute/BlogCategoryAttribute.php

@@ -7,41 +7,14 @@ namespace App\Models\BlogCategories\Traits\Attribute;
  */
 trait BlogCategoryAttribute
 {
-    /**
-     * @return string
-     */
-    public function getEditButtonAttribute()
-    {
-        if (access()->allow('edit-blog-category')) {
-            return '<a class="btn btn-flat btn-default" href="'.route('admin.blogcategories.edit', $this).'">
-                    <i data-toggle="tooltip" data-placement="top" title="'.trans('buttons.general.crud.edit').'" class="fa fa-pencil"></i>
-                </a>';
-        }
-    }
-
-    /**
-     * @return string
-     */
-    public function getDeleteButtonAttribute()
-    {
-        if (access()->allow('delete-blog-category')) {
-            return '<a class="btn btn-flat btn-default" href="'.route('admin.blogcategories.destroy', $this).'" data-method="delete"
-                    data-trans-button-cancel="'.trans('buttons.general.cancel').'"
-                    data-trans-button-confirm="'.trans('buttons.general.crud.delete').'"
-                    data-trans-title="'.trans('strings.backend.general.are_you_sure').'">
-                        <i data-toggle="tooltip" data-placement="top" title="Delete" class="fa fa-trash"></i>
-                </a>';
-        }
-    }
-
     /**
      * @return string
      */
     public function getActionButtonsAttribute()
     {
         return '<div class="btn-group action-btn">
-                    '.$this->getEditButtonAttribute().'
-                    '.$this->getDeleteButtonAttribute().'
+                    '.$this->getEditButtonAttribute('edit-blog-category', 'admin.blogcategories.edit').'
+                    '.$this->getDeleteButtonAttribute('delete-blog-category', 'admin.blogcategories.destroy').'
                 </div>';
     }
 }

app/Models/BlogTags/BlogTag.php

@@ -4,14 +4,18 @@ namespace App\Models\BlogTags;
 
 use App\Models\BlogTags\Traits\Attribute\BlogTagAttribute;
 use App\Models\BlogTags\Traits\Relationship\BlogTagRelationship;
+use App\Models\ModelTrait;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\SoftDeletes;
 
 class BlogTag extends Model
 {
-    use BlogTagAttribute,
+    use ModelTrait,
         SoftDeletes,
-        BlogTagRelationship;
+        BlogTagAttribute,
+        BlogTagRelationship{
+            // BlogTagAttribute::getEditButtonAttribute insteadof ModelTrait;
+        }
 
     /**
      * The database table used by the model.

app/Models/BlogTags/Traits/Attribute/BlogTagAttribute.php

@@ -7,41 +7,14 @@ namespace App\Models\BlogTags\Traits\Attribute;
  */
 trait BlogTagAttribute
 {
-    /**
-     * @return string
-     */
-    public function getEditButtonAttribute()
-    {
-        if (access()->allow('edit-blog-tag')) {
-            return '<a class="btn btn-flat btn-default" href="'.route('admin.blogtags.edit', $this).'">
-                    <i data-toggle="tooltip" data-placement="top" title="'.trans('buttons.general.crud.edit').'" class="fa fa-pencil"></i>
-                </a>';
-        }
-    }
-
-    /**
-     * @return string
-     */
-    public function getDeleteButtonAttribute()
-    {
-        if (access()->allow('delete-blog-tag')) {
-            return '<a class="btn btn-flat btn-default" href="'.route('admin.blogtags.destroy', $this).'" data-method="delete"
-                    data-trans-button-cancel="'.trans('buttons.general.cancel').'"
-                    data-trans-button-confirm="'.trans('buttons.general.crud.delete').'"
-                    data-trans-title="'.trans('strings.backend.general.are_you_sure').'">
-                        <i data-toggle="tooltip" data-placement="top" title="'.trans('buttons.general.crud.delete').'" class="fa fa-trash"></i>
-                </a>';
-        }
-    }
-
     /**
      * @return string
      */
     public function getActionButtonsAttribute()
     {
         return '<div class="btn-group action-btn">
-                    '.$this->getEditButtonAttribute().'
-                    '.$this->getDeleteButtonAttribute().'
+                    '.$this->getEditButtonAttribute('edit-blog-tag', 'admin.blogtags.edit').'
+                    '.$this->getDeleteButtonAttribute('delete-blog-tag', 'admin.blogtags.destroy').'
                 </div>';
     }
 }

app/Models/Blogs/Blog.php

@@ -4,14 +4,18 @@ namespace App\Models\Blogs;
 
 use App\Models\Blogs\Traits\Attribute\BlogAttribute;
 use App\Models\Blogs\Traits\Relationship\BlogRelationship;
+use App\Models\ModelTrait;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\SoftDeletes;
 
 class Blog extends Model
 {
-    use BlogAttribute,
-        BlogRelationship,
-        SoftDeletes;
+    use ModelTrait,
+        SoftDeletes,
+        BlogAttribute,
+        BlogRelationship {
+            // BlogAttribute::getEditButtonAttribute insteadof ModelTrait;
+        }
 
     /**
      * The database table used by the model.

app/Models/Blogs/Traits/Attribute/BlogAttribute.php

@@ -7,42 +7,14 @@ namespace App\Models\Blogs\Traits\Attribute;
  */
 trait BlogAttribute
 {
-    /**
-     * @return string
-     */
-    public function getEditButtonAttribute()
-    {
-        if (access()->allow('edit-blog')) {
-            return '<a href="'.route('admin.blogs.edit', $this).'" class="btn btn-flat btn-default">
-                    <i data-toggle="tooltip" data-placement="top" title="Edit" class="fa fa-pencil"></i>
-                </a>';
-        }
-    }
-
-    /**
-     * @return string
-     */
-    public function getDeleteButtonAttribute()
-    {
-        if (access()->allow('delete-blog')) {
-            return '<a href="'.route('admin.blogs.destroy', $this).'" 
-                    class="btn btn-flat btn-default" data-method="delete"
-                    data-trans-button-cancel="'.trans('buttons.general.cancel').'"
-                    data-trans-button-confirm="'.trans('buttons.general.crud.delete').'"
-                    data-trans-title="'.trans('strings.backend.general.are_you_sure').'">
-                        <i data-toggle="tooltip" data-placement="top" title="Delete" class="fa fa-trash"></i>
-                </a>';
-        }
-    }
-
     /**
      * @return string
      */
     public function getActionButtonsAttribute()
     {
         return '<div class="btn-group action-btn">'.
-                $this->getEditButtonAttribute().
-                $this->getDeleteButtonAttribute().
+                $this->getEditButtonAttribute('edit-blog', 'admin.blogs.edit').
+                $this->getDeleteButtonAttribute('delete-blog', 'admin.blogs.destroy').
                 '</div>';
     }
 }

app/Models/CMSPages/CMSPage.php

@@ -3,13 +3,17 @@
 namespace App\Models\CMSPages;
 
 use App\Models\CMSPages\Traits\Attribute\CMSPageAttribute;
+use App\Models\ModelTrait;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\SoftDeletes;
 
 class CMSPage extends Model
 {
-    use CMSPageAttribute,
-        SoftDeletes;
+    use ModelTrait,
+        SoftDeletes,
+        CMSPageAttribute {
+            // CMSPageAttribute::getEditButtonAttribute insteadof ModelTrait;
+        }
 
     /**
      * The database table used by the model.

app/Models/CMSPages/Traits/Attribute/CMSPageAttribute.php

@@ -7,41 +7,14 @@ namespace App\Models\CMSPages\Traits\Attribute;
  */
 trait CMSPageAttribute
 {
-    /**
-     * @return string
-     */
-    public function getEditButtonAttribute()
-    {
-        if (access()->allow('edit-cms-pages')) {
-            return '<a class="btn btn-flat btn-default" href="'.route('admin.cmspages.edit', $this).'">
-                    <i data-toggle="tooltip" data-placement="top" title="'.trans('buttons.general.crud.edit').'" class="fa fa-pencil"></i>
-                </a>';
-        }
-    }
-
-    /**
-     * @return string
-     */
-    public function getDeleteButtonAttribute()
-    {
-        if (access()->allow('delete-cms-pages')) {
-            return '<a class="btn btn-flat btn-default" href="'.route('admin.cmspages.destroy', $this).'" data-method="delete"
-                    data-trans-button-cancel="'.trans('buttons.general.cancel').'"
-                    data-trans-button-confirm="'.trans('buttons.general.crud.delete').'"
-                    data-trans-title="'.trans('strings.backend.general.are_you_sure').'">
-                        <i data-toggle="tooltip" data-placement="top" title="Delete" class="fa fa-trash"></i>
-                </a>';
-        }
-    }
-
     /**
      * @return string
      */
     public function getActionButtonsAttribute()
     {
         return '<div class="btn-group action-btn">
-                    '.$this->getEditButtonAttribute().'
-                    '.$this->getDeleteButtonAttribute().'
+                    '.$this->getEditButtonAttribute('edit-cms-pages', 'admin.cmspages.edit').'
+                    '.$this->getDeleteButtonAttribute('delete-cms-pages', 'admin.cmspages.destroy').'
                 </div>';
     }
 }

app/Models/EmailTemplates/EmailTemplate.php

@@ -3,13 +3,17 @@
 namespace App\Models\EmailTemplates;
 
 use App\Models\EmailTemplates\Traits\Attribute\EmailTemplateAttribute;
+use App\Models\ModelTrait;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\SoftDeletes;
 
 class EmailTemplate extends Model
 {
-    use EmailTemplateAttribute,
-        SoftDeletes;
+    use ModelTrait,
+        SoftDeletes,
+        EmailTemplateAttribute {
+            // EmailTemplateAttribute::getEditButtonAttribute insteadof ModelTrait;
+        }
 
     /**
      * The database table used by the model.

app/Models/EmailTemplates/Traits/Attribute/EmailTemplateAttribute.php

@@ -7,36 +7,11 @@ namespace App\Models\EmailTemplates\Traits\Attribute;
  */
 trait EmailTemplateAttribute
 {
-    /**
-     * @return string
-     */
-    public function getEditButtonAttribute()
-    {
-        if (access()->allow('edit-email-template')) {
-            return '<a class="btn btn-flat btn-default" href="'.route('admin.emailtemplates.edit', $this).'" class="btn btn-xs btn-primary"><i class="fa fa-pencil" data-toggle="tooltip" data-placement="top" title="'.trans('buttons.general.crud.edit').'"></i></a> ';
-        }
-    }
-
-    /**
-     * @return string
-     */
-    public function getDeleteButtonAttribute()
-    {
-        if (access()->allow('delete-email-template')) {
-            return '<a href="'.route('admin.emailtemplates.destroy', $this).'"
-                data-method="delete"
-                data-trans-button-cancel="'.trans('buttons.general.cancel').'"
-                data-trans-button-confirm="'.trans('buttons.general.crud.delete').'"
-                data-trans-title="'.trans('strings.backend.general.are_you_sure').'"
-                class="btn btn-xs btn-danger"><i class="fa fa-times" data-toggle="tooltip" data-placement="top" title="'.trans('buttons.general.crud.delete').'"></i></a>';
-        }
-    }
-
     /**
      * @return string
      */
     public function getActionButtonsAttribute()
     {
-        return '<div class="btn-group action-btn">'.$this->getEditButtonAttribute().'</div>';
+        return '<div class="btn-group action-btn">'.$this->getEditButtonAttribute('edit-email-template', 'admin.emailtemplates.edit').'</div>';
     }
 }

app/Models/Faqs/Faq.php

@@ -3,12 +3,17 @@
 namespace App\Models\Faqs;
 
 use App\Models\Faqs\Traits\Attribute\FaqAttribute;
+use App\Models\ModelTrait;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\SoftDeletes;
 
 class Faq extends Model
 {
-    use FaqAttribute, SoftDeletes;
+    use ModelTrait,
+        SoftDeletes,
+        FaqAttribute {
+            // FaqAttribute::getEditButtonAttribute insteadof ModelTrait;
+        }
 
     /**
      * The database table used by the model.

app/Models/Faqs/Traits/Attribute/FaqAttribute.php

@@ -7,34 +7,6 @@ namespace App\Models\Faqs\Traits\Attribute;
  */
 trait FaqAttribute
 {
-    /**
-     * @return string
-     */
-    public function getEditButtonAttribute()
-    {
-        if (access()->allow('edit-faq')) {
-            return '<a href="'.route('admin.faqs.edit', $this).'" class="btn btn-flat btn-default">
-                    <i data-toggle="tooltip" data-placement="top" title="Edit" class="fa fa-pencil"></i>
-                </a>';
-        }
-    }
-
-    /**
-     * @return string
-     */
-    public function getDeleteButtonAttribute()
-    {
-        if (access()->allow('delete-faq')) {
-            return '<a href="'.route('admin.faqs.destroy', $this).'" 
-                    class="btn btn-flat btn-default" data-method="delete"
-                    data-trans-button-cancel="'.trans('buttons.general.cancel').'"
-                    data-trans-button-confirm="'.trans('buttons.general.crud.delete').'"
-                    data-trans-title="'.trans('strings.backend.general.are_you_sure').'">
-                        <i data-toggle="tooltip" data-placement="top" title="Delete" class="fa fa-trash"></i>
-                </a>';
-        }
-    }
-
     /**
      * @return string
      */
@@ -83,8 +55,8 @@ trait FaqAttribute
     public function getActionButtonsAttribute()
     {
         return '<div class="btn-group action-btn">'.
-                $this->getEditButtonAttribute().
-                $this->getDeleteButtonAttribute().
+                $this->getEditButtonAttribute('edit-faq', 'admin.faqs.edit').
+                $this->getDeleteButtonAttribute('delete-faq', 'admin.faqs.destroy').
                 $this->getStatusButtonAttribute().
                 '</div>';
     }

app/Models/Menu/Menu.php

@@ -3,13 +3,17 @@
 namespace App\Models\Menu;
 
 use App\Models\Menu\Traits\Attribute\MenuAttribute;
+use App\Models\ModelTrait;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\SoftDeletes;
 
 class Menu extends Model
 {
-    use MenuAttribute,
-        SoftDeletes;
+    use ModelTrait,
+        SoftDeletes,
+        MenuAttribute {
+            // MenuAttribute::getEditButtonAttribute insteadof ModelTrait;
+        }
 
     /**
      * The database table used by the model.

app/Models/Menu/Traits/Attribute/MenuAttribute.php

@@ -7,41 +7,14 @@ namespace App\Models\Menu\Traits\Attribute;
  */
 trait MenuAttribute
 {
-    /**
-     * @return string
-     */
-    public function getEditButtonAttribute()
-    {
-        if (access()->allow('edit-menu')) {
-            return '<a class="btn btn-flat btn-default" href="'.route('admin.menus.edit', $this).'">
-                    <i data-toggle="tooltip" data-placement="top" title="'.trans('buttons.general.crud.edit').'" class="fa fa-pencil"></i>
-                </a>';
-        }
-    }
-
-    /**
-     * @return string
-     */
-    public function getDeleteButtonAttribute()
-    {
-        if (access()->allow('delete-menu')) {
-            return '<a class="btn btn-flat btn-default" href="'.route('admin.menus.destroy', $this).'" data-method="delete"
-                    data-trans-button-cancel="'.trans('buttons.general.cancel').'"
-                    data-trans-button-confirm="'.trans('buttons.general.crud.delete').'"
-                    data-trans-title="'.trans('strings.backend.general.are_you_sure').'">
-                        <i data-toggle="tooltip" data-placement="top" title="Delete" class="fa fa-trash"></i>
-                </a>';
-        }
-    }
-
     /**
      * @return string
      */
     public function getActionButtonsAttribute()
     {
         return '<div class="btn-group action-btn">
-                    '.$this->getEditButtonAttribute().'
-                    '.$this->getDeleteButtonAttribute().'
+                    '.$this->getEditButtonAttribute('edit-menu', 'admin.menus.edit').'
+                    '.$this->getDeleteButtonAttribute('delete-menu', 'admin.menus.destroy').'
                 </div>';
     }
 }

app/Models/ModelTrait.php

+<?php
+
+namespace App\Models;
+
+trait ModelTrait
+{
+    /**
+     * @return string
+     */
+    public function getEditButtonAttribute($permission, $route)
+    {
+        if (access()->allow($permission)) {
+            return '<a href="'.route($route, $this).'" class="btn btn-flat btn-default">
+                    <i data-toggle="tooltip" data-placement="top" title="Edit" class="fa fa-pencil"></i>
+                </a>';
+        }
+    }
+
+    /**
+     * @return string
+     */
+    public function getDeleteButtonAttribute($permission, $route)
+    {
+        if (access()->allow($permission)) {
+            return '<a href="'.route($route, $this).'" 
+                    class="btn btn-flat btn-default" data-method="delete"
+                    data-trans-button-cancel="'.trans('buttons.general.cancel').'"
+                    data-trans-button-confirm="'.trans('buttons.general.crud.delete').'"
+                    data-trans-title="'.trans('strings.backend.general.are_you_sure').'">
+                        <i data-toggle="tooltip" data-placement="top" title="Delete" class="fa fa-trash"></i>
+                </a>';
+        }
+    }
+}

app/Repositories/Api/User/PasswordResetRepository.php

@@ -53,7 +53,7 @@ class PasswordResetRepository extends BaseRepository
      */
     public function update($attributes)
     {
-        $token = ['token'=>$attributes['token']];
+        $token = ['token' => $attributes['token']];
 
         return $this->query()->where('email', $attributes['email'])->update($attributes);
     }

app/Repositories/Api/User/UserRepository.php

@@ -57,7 +57,7 @@ class UserRepository extends BaseRepository
      */
     public function resetpassword($data)
     {
-        $pass = ['password'=>bcrypt($data['password'])];
+        $pass = ['password' => bcrypt($data['password'])];
 
         return $this->query()->where('email', $data['email'])->update($pass);
     }
@@ -72,13 +72,13 @@ class UserRepository extends BaseRepository
         return $this->query()
                     ->select('first_name', 'last_name', 'email', 'address', 'country_id', 'state_id', 'city_id', 'zip_code', 'ssn', 'status', 'created_at', 'updated_at')
                     ->where('id', $id)
-                    ->with(['country'=> function ($query) {
+                    ->with(['country' => function ($query) {
                         $query->select('id', 'country');
                     }])
-                    ->with(['state'=> function ($query) {
+                    ->with(['state' => function ($query) {
                         $query->select('id', 'state');
                     }])
-                    ->with(['city'=> function ($query) {
+                    ->with(['city' => function ($query) {
                         $query->select('id', 'city');
                     }])
                     ->get()
@@ -150,7 +150,7 @@ class UserRepository extends BaseRepository
      **/
     public function confirmUser($email)
     {
-        $confirmed = ['confirmed'=>'1'];
+        $confirmed = ['confirmed' => '1'];
 
         return $this->query()->where('email', $email)->update($confirmed);
     }

app/Repositories/Backend/Access/Role/RoleRepository.php

@@ -53,7 +53,7 @@ class RoleRepository extends BaseRepository
                 DB::raw("GROUP_CONCAT( DISTINCT permissions.display_name SEPARATOR '<br/>') as permission_name"),
                 DB::raw('(SELECT COUNT(role_user.id) FROM role_user LEFT JOIN users ON role_user.user_id = users.id WHERE role_user.role_id = roles.id AND users.deleted_at IS NULL) AS userCount'),
             ])
-            ->groupBy('roles.id');
+            ->groupBy(config('access.roles_table').'.id', config('access.roles_table').'.name', config('access.roles_table').'.all', config('access.roles_table').'.sort');
     }
 
     /**

package-lock.json

@@ -171,7 +171,7 @@
     "anymatch": {
       "version": "1.3.2",
       "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-1.3.2.tgz",
-      "integrity": "sha512-0XNayC8lTHQ2OI8aljNCN3sSx6hsr/1+rlcDAotXJR7C1oZZHCNsfpbKwMjRA3Uqb5tF1Rae2oloTr4xpq+WjA==",
+      "integrity": "sha1-VT3Lj5HjyImEXf26NMd3IbkLnXo=",
       "dev": true,
       "requires": {
         "micromatch": "2.3.11",
@@ -232,7 +232,7 @@
     "arr-flatten": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz",
-      "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==",
+      "integrity": "sha1-NgSLv/TntH4TZkQxbJlmnqWukfE=",
       "dev": true
     },
     "array-differ": {
@@ -1030,7 +1030,7 @@
     "babylon": {
       "version": "6.18.0",
       "resolved": "https://registry.npmjs.org/babylon/-/babylon-6.18.0.tgz",
-      "integrity": "sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ==",
+      "integrity": "sha1-ry87iPpvXB5MY00aD46sT1WzleM=",
       "dev": true
     },
     "backo2": {
@@ -1054,7 +1054,7 @@
     "base64-js": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.2.1.tgz",
-      "integrity": "sha512-dwVUVIXsBZXwTuwnXI9RK8sBmgq09NDHzyR9SAph9eqk76gKK2JSQmZARC2zRC81JC2QTtxD0ARU5qTS25gIGw==",
+      "integrity": "sha1-qRlH2h9KUW6jjltOwOw3c2deCIY=",
       "dev": true
     },
     "base64id": {
@@ -1230,7 +1230,7 @@
     "bn.js": {
       "version": "4.11.8",
       "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.8.tgz",
-      "integrity": "sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA==",
+      "integrity": "sha1-LN4J617jQfSEdGuwMJsyU7GxRC8=",
       "dev": true
     },
     "bonjour": {
@@ -1320,7 +1320,7 @@
     "browser-sync": {
       "version": "2.18.13",
       "resolved": "https://registry.npmjs.org/browser-sync/-/browser-sync-2.18.13.tgz",
-      "integrity": "sha512-qhdrmgshVGwweogT/bdOKkZDxVxqiF4+9mibaDeAxvDBeoUtdgABk5x7YQ1KCcLRchAfv8AVtp9NuITl5CTNqg==",
+      "integrity": "sha1-wo3D6zvmfJepBwgrdyo3+RXBTX0=",
       "dev": true,
       "requires": {
         "browser-sync-client": "2.5.1",
@@ -1425,7 +1425,7 @@
     "browser-sync-webpack-plugin": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/browser-sync-webpack-plugin/-/browser-sync-webpack-plugin-1.2.0.tgz",
-      "integrity": "sha512-kPM7BjcZHRa5UjBIdyQbC4HoGprHoZpzlsPDb2P+UaCSmnjonLC3Z9vQBtSmJDghU0KuijkHZ/eLvKF1AyO7zg==",
+      "integrity": "sha1-MzWN3jUSHxLL2rRtRFPme4NXcmo=",
       "dev": true,
       "requires": {
         "lodash": "4.17.4"
@@ -1536,7 +1536,7 @@
     "buffer-indexof": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/buffer-indexof/-/buffer-indexof-1.1.1.tgz",
-      "integrity": "sha512-4/rOEg86jivtPTeOUUT61jJO1Ya1TrR/OkqCSZDyq84WJh3LuuiphBYJN+fm5xufIk4XAFcEwte/8WzC8If/1g==",
+      "integrity": "sha1-Uvq8xqYG0aADAoAmSO9o9jnaJow=",
       "dev": true
     },
     "buffer-to-vinyl": {
@@ -1765,7 +1765,7 @@
     "cipher-base": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz",
-      "integrity": "sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==",
+      "integrity": "sha1-h2Dk7MJy9MNjUy+SbYdKriwTl94=",
       "dev": true,
       "requires": {
         "inherits": "2.0.3",
@@ -1948,7 +1948,7 @@
     "commander": {
       "version": "2.11.0",
       "resolved": "https://registry.npmjs.org/commander/-/commander-2.11.0.tgz",
-      "integrity": "sha512-b0553uYA5YAEGgyYIGYROzKQ7X5RAqedkfjiZxwi0kL1g3bOaBNNZfYkzt/CL0umgD5wc9Jec2FbB98CjkMRvQ==",
+      "integrity": "sha1-FXFS/R56bI2YpbcVzzdt+SgARWM=",
       "dev": true
     },
     "commondir": {
@@ -2151,7 +2151,7 @@
     "cosmiconfig": {
       "version": "2.2.2",
       "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-2.2.2.tgz",
-      "integrity": "sha512-GiNXLwAFPYHy25XmTPpafYvn3CLAkJ8FLsscq78MQd1Kh0OU6Yzhn4eV2MVF4G9WEQZoWEGltatdR+ntGPMl5A==",
+      "integrity": "sha1-YXPOvVb6wELB9DkO33r2wHx8uJI=",
       "dev": true,
       "requires": {
         "is-directory": "0.3.1",
@@ -2255,7 +2255,7 @@
     "crypto-browserify": {
       "version": "3.11.1",
       "resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.11.1.tgz",
-      "integrity": "sha512-Na7ZlwCOqoaW5RwUK1WpXws2kv8mNhWdTlzob0UXulk6G9BDbyiJaGTYBIX61Ozn9l1EPPJpICZb4DaOpT9NlQ==",
+      "integrity": "sha1-lIlF78Z1ekANbl5a9HGU0QBkJ58=",
       "dev": true,
       "requires": {
         "browserify-cipher": "1.0.0",
@@ -2741,7 +2741,7 @@
     "dns-packet": {
       "version": "1.2.2",
       "resolved": "https://registry.npmjs.org/dns-packet/-/dns-packet-1.2.2.tgz",
-      "integrity": "sha512-kN+DjfGF7dJGUL7nWRktL9Z18t1rWP3aQlyZdY8XlpvU3Nc6GeFTQApftcjtWKxAZfiggZSGrCEoszNgvnpwDg==",
+      "integrity": "sha1-qKJr7HZGQ4lj/Ibgb4+LFtbIv3o=",
       "dev": true,
       "requires": {
         "ip": "1.1.5",
@@ -2804,7 +2804,7 @@
     "duplexify": {
       "version": "3.5.1",
       "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.5.1.tgz",
-      "integrity": "sha512-j5goxHTwVED1Fpe5hh3q9R93Kip0Bg2KVAt4f8CEYM3UEwYcPSvWbXaUQOzdX/HtiNomipv+gU7ASQPDbV7pGQ==",
+      "integrity": "sha1-ThUWvmiDi8kKSZlPCzmm5ZYL780=",
       "dev": true,
       "requires": {
         "end-of-stream": "1.4.0",
@@ -2862,7 +2862,7 @@
     "editorconfig": {
       "version": "0.13.3",
       "resolved": "https://registry.npmjs.org/editorconfig/-/editorconfig-0.13.3.tgz",
-      "integrity": "sha512-WkjsUNVCu+ITKDj73QDvi0trvpdDWdkDyHybDGSXPfekLCqwmpD7CP7iPbvBgosNuLcI96XTDwNa75JyFl7tEQ==",
+      "integrity": "sha1-5SGeWHlR1glY/ZTqmpoAjN7/GzQ=",
       "dev": true,
       "requires": {
         "bluebird": "3.5.0",
@@ -3165,7 +3165,7 @@
     "exec-buffer": {
       "version": "3.2.0",
       "resolved": "https://registry.npmjs.org/exec-buffer/-/exec-buffer-3.2.0.tgz",
-      "integrity": "sha512-wsiD+2Tp6BWHoVv3B+5Dcx6E7u5zky+hUwOHjuH2hKSLR3dvRmX8fk8UD8uqQixHs4Wk6eDmiegVrMPjKj7wpA==",
+      "integrity": "sha1-sWhtvZBMfPmC5lLB9aebHlVzCCs=",
       "dev": true,
       "requires": {
         "execa": "0.7.0",
@@ -3319,7 +3319,7 @@
         "async": {
           "version": "2.5.0",
           "resolved": "https://registry.npmjs.org/async/-/async-2.5.0.tgz",
-          "integrity": "sha512-e+lJAJeNWuPCNyxZKOBdaJGyLGHugXVQtrAwtuAe2vhxTYxFTKE73p8JuTmdH0qdQZtDvI4dhJwjZc5zsfIsYw==",
+          "integrity": "sha1-hDGQ/WtzV6C54clW7d3V7IRitU0=",
           "dev": true,
           "requires": {
             "lodash": "4.17.4"
@@ -3675,7 +3675,7 @@
     "function-bind": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
-      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
+      "integrity": "sha1-pWiZ0+o8m6uHS7l3O3xe3pL0iV0=",
       "dev": true
     },
     "gauge": {
@@ -3761,7 +3761,7 @@
     "glob": {
       "version": "7.1.2",
       "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
-      "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
+      "integrity": "sha1-wZyd+aAocC1nhhI4SmVSQExjbRU=",
       "dev": true,
       "requires": {
         "fs.realpath": "1.0.0",
@@ -3850,7 +3850,7 @@
     "globals": {
       "version": "9.18.0",
       "resolved": "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz",
-      "integrity": "sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ==",
+      "integrity": "sha1-qjiWs+abSH8X4x7SFD1pqOMMLYo=",
       "dev": true
     },
     "globby": {
@@ -4157,7 +4157,7 @@
     "hash.js": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.3.tgz",
-      "integrity": "sha512-/UETyP0W22QILqS+6HowevwhEFJ3MBJnwTf75Qob9Wz9t0DPuisL8kW8YZMK62dHAKE1c1p+gY1TtOLY+USEHA==",
+      "integrity": "sha1-NA3tvmKQGHFRweodd3o0SJNd+EY=",
       "dev": true,
       "requires": {
         "inherits": "2.0.3",
@@ -4212,7 +4212,7 @@
     "hosted-git-info": {
       "version": "2.5.0",
       "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.5.0.tgz",
-      "integrity": "sha512-pNgbURSuab90KbTqvRPsseaTxOJCZBD0a7t+haSN33piP9cCM4l0CqdzAif2hUqm716UovKB2ROmiabGAKVXyg==",
+      "integrity": "sha1-bWDjSzq7yDEwYsO3mO+NkBoHrzw=",
       "dev": true
     },
     "hpack.js": {
@@ -4735,7 +4735,7 @@
     "is-number-like": {
       "version": "1.0.8",
       "resolved": "https://registry.npmjs.org/is-number-like/-/is-number-like-1.0.8.tgz",
-      "integrity": "sha512-6rZi3ezCyFcn5L71ywzz2bS5b2Igl1En3eTlZlvKjpz1n3IZLAYMbKYAIQgFmEu0GENg92ziU/faEOA/aixjbA==",
+      "integrity": "sha1-LhKWILUIkQQuROm7uzBZPnXPu+M=",
       "dev": true,
       "requires": {
         "lodash.isfinite": "3.3.2"
@@ -4780,7 +4780,7 @@
     "is-plain-object": {
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
-      "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
+      "integrity": "sha1-LBY7P6+xtgbZ0Xko8FwqHDjgdnc=",
       "dev": true,
       "requires": {
         "isobject": "3.0.1"
@@ -4982,7 +4982,7 @@
     "json-loader": {
       "version": "0.5.7",
       "resolved": "https://registry.npmjs.org/json-loader/-/json-loader-0.5.7.tgz",
-      "integrity": "sha512-QLPs8Dj7lnf3e3QYS1zkCo+4ZwqOiF9d/nZnYozTISxXWCfNs9yuky5rJw4/W34s7POaNlbZmQGaB5NiXCbP4w==",
+      "integrity": "sha1-3KFKcCNf+C8KyaOr62DTN6NlGF0=",
       "dev": true
     },
     "json-schema": {
@@ -5184,7 +5184,7 @@
     "limiter": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/limiter/-/limiter-1.1.2.tgz",
-      "integrity": "sha512-JIKZ0xb6fZZYa3deZ0BgXCgX6HgV8Nx3mFGeFHmFWW8Fb2c08e0CyE+G3nalpD0xGvGssjGb1UdFr+PprxZEbw==",
+      "integrity": "sha1-Ip2AVYkcixGvng7lIA6OCbs9y+s=",
       "dev": true
     },
     "load-json-file": {
@@ -5564,7 +5564,7 @@
     "lru-cache": {
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.1.tgz",
-      "integrity": "sha512-q4spe4KTfsAS1SUHLO0wz8Qiyf1+vMIAgpRYioFYDMNqKfHQbg+AVDH3i4fvpl71/P1L0dBl+fQi+P37UYf0ew==",
+      "integrity": "sha1-Yi4y6CSItJJ5EUpPns9F581rulU=",
       "dev": true,
       "requires": {
         "pseudomap": "1.0.2",
@@ -5780,7 +5780,7 @@
     "minimatch": {
       "version": "3.0.4",
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+      "integrity": "sha1-UWbihkV/AzBgZL5Ul+jbsMPTIIM=",
       "dev": true,
       "requires": {
         "brace-expansion": "1.1.8"
@@ -5957,7 +5957,7 @@
     "node-emoji": {
       "version": "1.8.1",
       "resolved": "https://registry.npmjs.org/node-emoji/-/node-emoji-1.8.1.tgz",
-      "integrity": "sha512-+ktMAh1Jwas+TnGodfCfjUbJKoANqPaJFN0z0iqh41eqD8dvguNzcitVSBSVK1pidz0AqGbLKcoVuVLRVZ/aVg==",
+      "integrity": "sha1-buxr+wdCHiFIx1xrunJCH4UwqCY=",
       "dev": true,
       "requires": {
         "lodash.toarray": "4.4.0"
@@ -6126,7 +6126,7 @@
     "normalize-package-data": {
       "version": "2.4.0",
       "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.0.tgz",
-      "integrity": "sha512-9jjUFbTPfEy3R/ad/2oNbKtW9Hgovl5O1FvFWKkKblNXoN/Oou6+9+KKohPK13Yc3/TyunyWhJp6gvRNR/PPAw==",
+      "integrity": "sha1-EvlaMH1YNSB1oEkHuErIvpisAS8=",
       "dev": true,
       "requires": {
         "hosted-git-info": "2.5.0",
@@ -6174,7 +6174,7 @@
     "npmlog": {
       "version": "4.1.2",
       "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz",
-      "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==",
+      "integrity": "sha1-CKfyqL9zRgR3mp76StXMcXq7lUs=",
       "dev": true,
       "requires": {
         "are-we-there-yet": "1.1.4",
@@ -6602,7 +6602,7 @@
     "pluralize": {
       "version": "7.0.0",
       "resolved": "https://registry.npmjs.org/pluralize/-/pluralize-7.0.0.tgz",
-      "integrity": "sha512-ARhBOdzS3e41FbkW/XWrTEtukqqLoK5+Z/4UeDaLuSW+39JPeFgs4gCGqsrJHVZX0fUrx//4OF0K1CUGwlIFow=="
+      "integrity": "sha1-KYuJ34uTsCIdv0Ia0rGx6iP8Z3c="
     },
     "pngquant-bin": {
       "version": "3.1.1",
@@ -7022,7 +7022,7 @@
     "promise": {
       "version": "7.3.1",
       "resolved": "https://registry.npmjs.org/promise/-/promise-7.3.1.tgz",
-      "integrity": "sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg==",
+      "integrity": "sha1-BktyYCsY+Q8pGSuLG8QY/9Hr078=",
       "dev": true,
       "optional": true,
       "requires": {
@@ -7119,7 +7119,7 @@
     "randomatic": {
       "version": "1.1.7",
       "resolved": "https://registry.npmjs.org/randomatic/-/randomatic-1.1.7.tgz",
-      "integrity": "sha512-D5JUjPyJbaJDkuAazpVnSfVkLlpeO3wDlPROTMLGKG1zMFNFRgrciKo1ltz/AzNTkqE0HzDx655QOL51N06how==",
+      "integrity": "sha1-x6vpzIuHwLqodrGf3oP9RkeX44w=",
       "dev": true,
       "requires": {
         "is-number": "3.0.0",
@@ -7160,7 +7160,7 @@
     "randombytes": {
       "version": "2.0.5",
       "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.0.5.tgz",
-      "integrity": "sha512-8T7Zn1AhMsQ/HI1SjcCfT/t4ii3eAqco3yOcSzS4mozsOz69lHLsoMXmF9nZgnFanYscnSlUSgs8uZyKzpE6kg==",
+      "integrity": "sha1-3ACaJGuNCaF3tLegrne8Vw9LG3k=",
       "dev": true,
       "requires": {
         "safe-buffer": "5.1.1"
@@ -7226,7 +7226,7 @@
     "readable-stream": {
       "version": "2.3.3",
       "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz",
-      "integrity": "sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ==",
+      "integrity": "sha1-No8lEtefnUb9/HE0mueHi7weuVw=",
       "dev": true,
       "requires": {
         "core-util-is": "1.0.2",
@@ -7334,13 +7334,13 @@
     "regenerator-runtime": {
       "version": "0.11.0",
       "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.0.tgz",
-      "integrity": "sha512-/aA0kLeRb5N9K0d4fw7ooEbI+xDe+DKD499EQqygGqeS8N3xto15p09uY2xj7ixP81sNPXvRLnAQIqdVStgb1A==",
+      "integrity": "sha1-flT+W1zNXWYk6mJVw0c74JC4AuE=",
       "dev": true
     },
     "regenerator-transform": {
       "version": "0.10.1",
       "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.10.1.tgz",
-      "integrity": "sha512-PJepbvDbuK1xgIgnau7Y90cwaAmO/LCLMI2mPvaXq2heGMR3aWW5/BQvYrhJ8jgmQjXewXvBjzfqKcVOmhjZ6Q==",
+      "integrity": "sha1-HkmWg3Ix2ot/PPQRTXG1aRoGgN0=",
       "dev": true,
       "requires": {
         "babel-runtime": "6.26.0",
@@ -7619,7 +7619,7 @@
         "ansi-styles": {
           "version": "3.2.0",
           "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.0.tgz",
-          "integrity": "sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug==",
+          "integrity": "sha1-wVm41b4PnlpvNG2rlPFs4CIWG4g=",
           "dev": true,
           "requires": {
             "color-convert": "1.9.0"
@@ -7675,7 +7675,7 @@
     "safe-buffer": {
       "version": "5.1.1",
       "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
-      "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==",
+      "integrity": "sha1-iTMSr2myEj3vcfV4iQAWce6yyFM=",
       "dev": true
     },
     "sass-graph": {
@@ -7693,7 +7693,7 @@
     "sass-loader": {
       "version": "6.0.6",
       "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-6.0.6.tgz",
-      "integrity": "sha512-c3/Zc+iW+qqDip6kXPYLEgsAu2lf4xz0EZDplB7EmSUMda12U1sGJPetH55B/j9eu0bTtKzKlNPWWyYC7wFNyQ==",
+      "integrity": "sha1-6dXmwfFV+qMqSybXqbcQfCJeQPk=",
       "dev": true,
       "requires": {
         "async": "2.5.0",
@@ -7706,7 +7706,7 @@
         "async": {
           "version": "2.5.0",
           "resolved": "https://registry.npmjs.org/async/-/async-2.5.0.tgz",
-          "integrity": "sha512-e+lJAJeNWuPCNyxZKOBdaJGyLGHugXVQtrAwtuAe2vhxTYxFTKE73p8JuTmdH0qdQZtDvI4dhJwjZc5zsfIsYw==",
+          "integrity": "sha1-hDGQ/WtzV6C54clW7d3V7IRitU0=",
           "dev": true,
           "requires": {
             "lodash": "4.17.4"
@@ -7734,7 +7734,7 @@
     "sax": {
       "version": "1.2.4",
       "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
-      "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==",
+      "integrity": "sha1-KBYjTiN4vdxOU1T6tcqold9xANk=",
       "dev": true
     },
     "schema-utils": {
@@ -7828,7 +7828,7 @@
     "semver": {
       "version": "5.4.1",
       "resolved": "https://registry.npmjs.org/semver/-/semver-5.4.1.tgz",
-      "integrity": "sha512-WfG/X9+oATh81XtllIo/I8gOiY9EXRdv1cQdyykeXK17YcUW3EXUAi2To4pcH6nZtJPr7ZOpM5OMyWJZm+8Rsg==",
+      "integrity": "sha1-4FnAnYVx8FQII3M0M1BdOi8AsY4=",
       "dev": true
     },
     "semver-regex": {
@@ -8046,7 +8046,7 @@
     "shellwords": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/shellwords/-/shellwords-0.1.1.tgz",
-      "integrity": "sha512-vFwSUfQvqybiICwZY5+DAWIPLKsWO31Q91JSKl3UYv+K5c2QRPzn0qzec6QPu1Qc9eHYItiP3NdJqNVqetYAww==",
+      "integrity": "sha1-1rkYHBpI05cyTISHHvvPxz/AZUs=",
       "dev": true
     },
     "sigmund": {
@@ -8409,7 +8409,7 @@
     "stackframe": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/stackframe/-/stackframe-1.0.4.tgz",
-      "integrity": "sha512-to7oADIniaYwS3MhtCa/sQhrxidCCQiF/qp4/m5iN3ipf0Y7Xlri0f6eG29r08aL7JYl8n32AF3Q5GYBZ7K8vw==",
+      "integrity": "sha1-NXskqZL5Qny6a1RdlqFO0svKGHs=",
       "dev": true
     },
     "stat-mode": {
@@ -8456,7 +8456,7 @@
     "stream-http": {
       "version": "2.7.2",
       "resolved": "https://registry.npmjs.org/stream-http/-/stream-http-2.7.2.tgz",
-      "integrity": "sha512-c0yTD2rbQzXtSsFSVhtpvY/vS6u066PcXOX9kBB3mSO76RiUQzL340uJkGBWnlBg4/HZzqiUXtaVA7wcRcJgEw==",
+      "integrity": "sha1-QKBQ7I3DtTsz2ZCUFcAsC/Gr+60=",
       "dev": true,
       "requires": {
         "builtin-status-codes": "3.0.0",
@@ -8798,7 +8798,7 @@
     "timers-browserify": {
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.4.tgz",
-      "integrity": "sha512-uZYhyU3EX8O7HQP+J9fTVYwsq90Vr68xPEFo7yrVImIxYvHgukBEgOB/SgGoorWVTzGM/3Z+wUNnboA4M8jWrg==",
+      "integrity": "sha1-lspT9LeUpefA4b18yIo3Ipj6AeY=",
       "dev": true,
       "requires": {
         "setimmediate": "1.0.5"
@@ -9118,7 +9118,7 @@
     "uuid": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.1.0.tgz",
-      "integrity": "sha512-DIWtzUkw04M4k3bf1IcpS2tngXEL26YUD2M0tMDUpnUrz2hgzUBlD55a4FjdLGPvfHxS6uluGWvaVEqgBcVa+g==",
+      "integrity": "sha1-PdPT55Crwk17DToDT/q6vijrvAQ=",
       "dev": true
     },
     "vali-date": {
@@ -9350,7 +9350,7 @@
         "async": {
           "version": "2.5.0",
           "resolved": "https://registry.npmjs.org/async/-/async-2.5.0.tgz",
-          "integrity": "sha512-e+lJAJeNWuPCNyxZKOBdaJGyLGHugXVQtrAwtuAe2vhxTYxFTKE73p8JuTmdH0qdQZtDvI4dhJwjZc5zsfIsYw==",
+          "integrity": "sha1-hDGQ/WtzV6C54clW7d3V7IRitU0=",
           "dev": true,
           "requires": {
             "lodash": "4.17.4"
@@ -9398,7 +9398,7 @@
         "async": {
           "version": "2.5.0",
           "resolved": "https://registry.npmjs.org/async/-/async-2.5.0.tgz",
-          "integrity": "sha512-e+lJAJeNWuPCNyxZKOBdaJGyLGHugXVQtrAwtuAe2vhxTYxFTKE73p8JuTmdH0qdQZtDvI4dhJwjZc5zsfIsYw==",
+          "integrity": "sha1-hDGQ/WtzV6C54clW7d3V7IRitU0=",
           "dev": true,
           "requires": {
             "lodash": "4.17.4"
@@ -9705,7 +9705,7 @@
         "async": {
           "version": "2.5.0",
           "resolved": "https://registry.npmjs.org/async/-/async-2.5.0.tgz",
-          "integrity": "sha512-e+lJAJeNWuPCNyxZKOBdaJGyLGHugXVQtrAwtuAe2vhxTYxFTKE73p8JuTmdH0qdQZtDvI4dhJwjZc5zsfIsYw==",
+          "integrity": "sha1-hDGQ/WtzV6C54clW7d3V7IRitU0=",
           "dev": true,
           "requires": {
             "lodash": "4.17.4"
@@ -9726,7 +9726,7 @@
     "webpack-sources": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.0.1.tgz",
-      "integrity": "sha512-05tMxipUCwHqYaVS8xc7sYPTly8PzXayRCB4dTxLhWTqlKUiwH6ezmEe0OSreL1c30LAuA3Zqmc+uEBUGFJDjw==",
+      "integrity": "sha1-xzVkNqTRMSO+LiQmoF0drZy+Zc8=",
       "dev": true,
       "requires": {
         "source-list-map": "2.0.0",
@@ -9736,7 +9736,7 @@
         "source-list-map": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.0.tgz",
-          "integrity": "sha512-I2UmuJSRr/T8jisiROLU3A3ltr+swpniSmNPI4Ml3ZCX6tVnDsuZzK7F2hl5jTqbZBWCEKlj5HRQiPExXLgE8A==",
+          "integrity": "sha1-qqR0A/eyRakvvJfqCPJQ1gh+0IU=",
           "dev": true
         }
       }
@@ -9782,7 +9782,7 @@
     "which": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/which/-/which-1.3.0.tgz",
-      "integrity": "sha512-xcJpopdamTuY5duC/KnTTNBraPK54YwpenP4lzxU8H91GudWpFv38u0CKjclE1Wi2EH2EDz5LRcHcKbCIzqGyg==",
+      "integrity": "sha1-/wS9/AEO5UfXgL7DjhrBwnd9JTo=",
       "dev": true,
       "requires": {
         "isexe": "2.0.0"
@@ -9797,7 +9797,7 @@
     "wide-align": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.2.tgz",
-      "integrity": "sha512-ijDLlyQ7s6x1JgCLur53osjm/UXUYD9+0PbYKrBsYisYXzCxN+HC3mYDNy/dWdmf3AwqwU3CXwDCvsNgGK1S0w==",
+      "integrity": "sha1-Vx4PGwYEY268DfwhsDObvjE0FxA=",
       "dev": true,
       "requires": {
         "string-width": "1.0.2"