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/Controllers/Frontend/Auth/ResetPasswordController.php

@@ -63,9 +63,9 @@ class ResetPasswordController extends Controller
     protected function rules()
     {
         return [
-            'token'     => 'required',
-            'email'     => 'required|email',
-            'password'  => 'required|min:8|confirmed|regex:"^(?=.*[a-z])(?=.*[A-Z])(?=.*\d).{8,}$"',
+            'token'    => 'required',
+            'email'    => 'required|email',
+            'password' => 'required|min:8|confirmed|regex:"^(?=.*[a-z])(?=.*[A-Z])(?=.*\d).{8,}$"',
         ];
     }
 

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/Requests/Backend/Access/User/StoreUserRequest.php

@@ -28,14 +28,14 @@ class StoreUserRequest extends Request
     public function rules()
     {
         return [
-            'first_name'    => 'required|max:255',
-            'last_name'     => 'required|max:255',
-            'email'         => ['required', 'email', 'max:255', Rule::unique('users')],
-            'password'      => 'required|min:6|confirmed',
-            'state_id'      => 'required',
-            'city_id'       => 'required',
-            'zip_code'      => 'required|regex:/^[0-9]+$/',
-            'ssn'           => 'required|regex:/^[0-9]+$/|max:9|min:9',
+            'first_name' => 'required|max:255',
+            'last_name'  => 'required|max:255',
+            'email'      => ['required', 'email', 'max:255', Rule::unique('users')],
+            'password'   => 'required|min:6|confirmed',
+            'state_id'   => 'required',
+            'city_id'    => 'required',
+            'zip_code'   => 'required|regex:/^[0-9]+$/',
+            'ssn'        => 'required|regex:/^[0-9]+$/|max:9|min:9',
         ];
     }
 

app/Http/Requests/Backend/Access/User/UpdateUserRequest.php

@@ -27,13 +27,13 @@ class UpdateUserRequest extends Request
     public function rules()
     {
         return [
-            'email'         => 'required|email',
-            'first_name'    => 'required',
-            'last_name'     => 'required',
-            'state_id'      => 'required',
-            'city_id'       => 'required',
-            'zip_code'      => 'required|regex:/^[0-9]+$/',
-            'ssn'           => 'required|regex:/^[0-9]+$/|max:9|min:9',
+            'email'      => 'required|email',
+            'first_name' => 'required',
+            'last_name'  => 'required',
+            'state_id'   => 'required',
+            'city_id'    => 'required',
+            'zip_code'   => 'required|regex:/^[0-9]+$/',
+            'ssn'        => 'required|regex:/^[0-9]+$/|max:9|min:9',
         ];
     }
 

app/Http/Requests/Backend/Faqs/StoreFaqsRequest.php

@@ -24,8 +24,8 @@ class StoreFaqsRequest extends FormRequest
     public function rules()
     {
         return [
-            'question'  => 'required|max:191',
-            'answer'    => 'required',
+            'question' => 'required|max:191',
+            'answer'   => 'required',
         ];
     }
 
@@ -37,9 +37,9 @@ class StoreFaqsRequest extends FormRequest
     public function messages()
     {
         return [
-            'question.required'  => 'Question field is required.',
-            'question.max'       => 'Question may not be grater than 191 character.',
-            'answer.required'    => 'Answer field is required.',
+            'question.required' => 'Question field is required.',
+            'question.max'      => 'Question may not be grater than 191 character.',
+            'answer.required'   => 'Answer field is required.',
         ];
     }
 }

app/Http/Requests/Backend/Faqs/UpdateFaqsRequest.php

@@ -24,8 +24,8 @@ class UpdateFaqsRequest extends FormRequest
     public function rules()
     {
         return [
-            'question'  => 'required|max:191',
-            'answer'    => 'required',
+            'question' => 'required|max:191',
+            'answer'   => 'required',
         ];
     }
 
@@ -37,9 +37,9 @@ class UpdateFaqsRequest extends FormRequest
     public function messages()
     {
         return [
-            'question.required'  => 'Question field is required.',
-            'question.max'       => 'Question may not be grater than 191 character.',
-            'answer.required'    => 'Answer field is required.',
+            'question.required' => 'Question field is required.',
+            'question.max'      => 'Question may not be grater than 191 character.',
+            'answer.required'   => 'Answer field is required.',
         ];
     }
 }

app/Http/Requests/Backend/Modules/StoreModuleRequest.php

@@ -42,11 +42,11 @@ class StoreModuleRequest extends Request
     public function messages()
     {
         return [
-            'name.required'             => 'Module Name field is required to be filled',
-            'name.max'                  => 'Module Name should not exceed 191 characters',
-            'name.unique'               => 'Module Name is already taken',
-            'directory_name.required'   => 'Directory Name field is required to be filled',
-            'model_name.required'       => 'Model Name field is required to be filled',
+            'name.required'           => 'Module Name field is required to be filled',
+            'name.max'                => 'Module Name should not exceed 191 characters',
+            'name.unique'             => 'Module Name is already taken',
+            'directory_name.required' => 'Directory Name field is required to be filled',
+            'model_name.required'     => 'Model Name field is required to be filled',
         ];
     }
 }

app/Http/Requests/Backend/Settings/UpdateSettingsRequest.php

@@ -57,12 +57,12 @@ class UpdateSettingsRequest extends Request
     public function messages()
     {
         return [
-            'logo.dimensions'        => 'Invalid logo - should be minimum 226*48',
-            'favicon.dimensions'     => 'Invalid icon - should be 16*16',
-            'logo.required'          => 'The logo field is required in seo settings.',
-            'favicon.required'       => 'The favicon field is required in seo settings.',
-            'from_name.required'     => 'The from name field is required in mail settings.',
-            'from_email.required'    => 'The from email field is required in mail settings.',
+            'logo.dimensions'     => 'Invalid logo - should be minimum 226*48',
+            'favicon.dimensions'  => 'Invalid icon - should be 16*16',
+            'logo.required'       => 'The logo field is required in seo settings.',
+            'favicon.required'    => 'The favicon field is required in seo settings.',
+            'from_name.required'  => 'The from name field is required in mail settings.',
+            'from_email.required' => 'The from email field is required in mail settings.',
         ];
     }
 }

app/Http/Requests/Frontend/Auth/RegisterRequest.php

@@ -28,16 +28,16 @@ class RegisterRequest extends Request
     public function rules()
     {
         return [
-            'first_name'            => 'required|max:255',
-            'last_name'             => 'required|max:255',
-            'email'                 => ['required', 'email', 'max:255', Rule::unique('users')],
-            'password'              => 'required|min:8|confirmed|regex:"^(?=.*[a-z])(?=.*[A-Z])(?=.*\d).{8,}$"',
-            'state_id'              => 'required',
-            'city_id'               => 'required',
-            'zip_code'              => 'required',
-            'ssn'                   => 'required',
-            'is_term_accept'        => 'required',
-            'g-recaptcha-response'  => 'required_if:captcha_status,true|captcha',
+            'first_name'           => 'required|max:255',
+            'last_name'            => 'required|max:255',
+            'email'                => ['required', 'email', 'max:255', Rule::unique('users')],
+            'password'             => 'required|min:8|confirmed|regex:"^(?=.*[a-z])(?=.*[A-Z])(?=.*\d).{8,}$"',
+            'state_id'             => 'required',
+            'city_id'              => 'required',
+            'zip_code'             => 'required',
+            'ssn'                  => 'required',
+            'is_term_accept'       => 'required',
+            'g-recaptcha-response' => 'required_if:captcha_status,true|captcha',
         ];
     }
 

app/Http/Requests/Frontend/User/UpdateProfileRequest.php

@@ -28,13 +28,13 @@ class UpdateProfileRequest extends Request
     public function rules()
     {
         return [
-            'first_name'            => 'required|max:255',
-            'last_name'             => 'required|max:255',
-            'email'                 => ['sometimes', 'required', 'email', 'max:255', Rule::unique('users')],
-            'state_id'              => 'required',
-            'city_id'               => 'required',
-            'zip_code'              => 'required',
-            'ssn'                   => 'required',
+            'first_name' => 'required|max:255',
+            'last_name'  => 'required|max:255',
+            'email'      => ['sometimes', 'required', 'email', 'max:255', Rule::unique('users')],
+            'state_id'   => 'required',
+            'city_id'    => 'required',
+            'zip_code'   => 'required',
+            'ssn'        => '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
@@ -546,13 +574,13 @@ class Generator
         $this->createDirectory($this->getBasePath($this->table_controller_namespace, true));
         //replacements to be done in table controller stub
         $replacements = [
-            'DummyNamespace'                => ucfirst($this->removeFileNameFromEndOfNamespace($this->table_controller_namespace)),
-            'DummyRepositoryNamespace'      => $this->repo_namespace,
-            'DummyManageRequestNamespace'   => $this->manage_request_namespace,
-            'DummyTableController'          => $this->table_controller,
-            'dummy_repository'              => $this->repository,
-            'dummy_small_repo_name'         => strtolower($this->model),
-            'dummy_manage_request_name'     => $this->manage_request,
+            'DummyNamespace'              => ucfirst($this->removeFileNameFromEndOfNamespace($this->table_controller_namespace)),
+            'DummyRepositoryNamespace'    => $this->repo_namespace,
+            'DummyManageRequestNamespace' => $this->manage_request_namespace,
+            'DummyTableController'        => $this->table_controller,
+            'dummy_repository'            => $this->repository,
+            'dummy_small_repo_name'       => strtolower($this->model),
+            'dummy_manage_request_name'   => $this->manage_request,
         ];
         //generating the file
         $this->generateFile('TableController', $replacements, lcfirst($this->table_controller_namespace));
@@ -633,14 +661,14 @@ class Generator
         $this->createDirectory($path);
         //Labels file
         $labels = [
-            'create'        => "Create $model_singular",
-            'edit'          => "Edit $model_singular",
-            'management'    => "$model_singular Management",
-            'title'         => "$model_plural_capital",
-
-            'table'         => [
-                'id'             => 'Id',
-                'createdat'      => 'Created At',
+            'create'     => "Create $model_singular",
+            'edit'       => "Edit $model_singular",
+            'management' => "$model_singular Management",
+            'title'      => "$model_plural_capital",
+
+            'table' => [
+                'id'        => 'Id',
+                'createdat' => 'Created At',
             ],
         ];
         //Pushing values to labels
@@ -657,11 +685,11 @@ class Generator
         add_key_value_in_file($path.'/menus.php', [$model_plural => $menus], 'backend');
         //Exceptions file
         $exceptions = [
-            'already_exists'    => "That $model_singular already exists. Please choose a different name.",
-            'create_error'      => "There was a problem creating this $model_singular. Please try again.",
-            'delete_error'      => "There was a problem deleting this $model_singular. Please try again.",
-            'not_found'         => "That $model_singular does not exist.",
-            'update_error'      => "There was a problem updating this $model_singular. Please try again.",
+            'already_exists' => "That $model_singular already exists. Please choose a different name.",
+            'create_error'   => "There was a problem creating this $model_singular. Please try again.",
+            'delete_error'   => "There was a problem deleting this $model_singular. Please try again.",
+            'not_found'      => "That $model_singular does not exist.",
+            'update_error'   => "There was a problem updating this $model_singular. Please try again.",
         ];
         //Alerts File
         $alerts = [
@@ -772,8 +800,8 @@ class Generator
         } else {
             //Calling Artisan command to create table
             Artisan::call('make:migration', [
-                'name'      => 'create_'.$table.'_table',
-                '--create'  => $table,
+                'name'     => 'create_'.$table.'_table',
+                '--create' => $table,
             ]);
 
             return Artisan::output();

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');
     }
 
     /**

app/Repositories/Backend/Module/ModuleRepository.php

@@ -66,10 +66,10 @@ class ModuleRepository extends BaseRepository
             }
 
             $mod = [
-                'view_permission_id'    => "view-$model-permission",
-                'name'                  => $input['name'],
-                'url'                   => 'admin.'.str_plural($model).'.index',
-                'created_by'            => access()->user()->id,
+                'view_permission_id' => "view-$model-permission",
+                'name'               => $input['name'],
+                'url'                => 'admin.'.str_plural($model).'.index',
+                'created_by'         => access()->user()->id,
             ];
 
             $create = Module::create($mod);

app/Repositories/Frontend/Access/User/UserRepository.php

@@ -181,8 +181,8 @@ class UserRepository extends BaseRepository
         } else {
             // Update the users information, token and avatar can be updated.
             $user->providers()->update([
-                'token'       => $data->token,
-                'avatar'      => $data->avatar,
+                'token'  => $data->token,
+                'avatar' => $data->avatar,
             ]);
         }
 

config/api_validation.php

@@ -28,14 +28,14 @@ return [
 
     'register' => [
         'rules' => [
-            'first_name'    => 'required|max:255',
-            'last_name'     => 'required|max:255',
-            'email'         => 'required|email|max:255|unique:users',
-            'password'      => 'required|min:6|confirmed',
-            'state_id'      => 'required',
-            'city_id'       => 'required',
-            'zip_code'      => 'required',
-            'ssn'           => 'required',
+            'first_name' => 'required|max:255',
+            'last_name'  => 'required|max:255',
+            'email'      => 'required|email|max:255|unique:users',
+            'password'   => 'required|min:6|confirmed',
+            'state_id'   => 'required',
+            'city_id'    => 'required',
+            'zip_code'   => 'required',
+            'ssn'        => 'required',
         ],
     ],
 

config/datatables.php

@@ -4,17 +4,17 @@ return [
     /*
      * DataTables search options.
      */
-    'search'         => [
+    'search' => [
         /*
          * Smart search will enclose search keyword with wildcard string "%keyword%".
          * SQL: column LIKE "%keyword%"
          */
-        'smart'            => true,
+        'smart' => true,
 
         /*
          * Multi-term search will explode search keyword using spaces resulting into multiple term search.
          */
-        'multi_term'       => true,
+        'multi_term' => true,
 
         /*
          * Case insensitive will search the keyword in lower case format.
@@ -26,19 +26,19 @@ return [
          * Wild card will add "%" in between every characters of the keyword.
          * SQL: column LIKE "%k%e%y%w%o%r%d%"
          */
-        'use_wildcards'    => false,
+        'use_wildcards' => false,
     ],
 
     /*
      * DataTables internal index id response column name.
      */
-    'index_column'   => 'DT_Row_Index',
+    'index_column' => 'DT_Row_Index',
 
     /*
      * List of available builders for DataTables.
      * This is where you can register your custom dataTables builder.
      */
-    'engines'        => [
+    'engines' => [
         'eloquent'   => \Yajra\DataTables\EloquentDataTable::class,
         'query'      => \Yajra\DataTables\QueryDataTable::class,
         'collection' => \Yajra\DataTables\CollectionDataTable::class,
@@ -47,7 +47,7 @@ return [
     /*
      * DataTables accepted builder to engine mapping.
      */
-    'builders'       => [
+    'builders' => [
         Illuminate\Database\Eloquent\Relations\Relation::class => 'eloquent',
         Illuminate\Database\Eloquent\Builder::class            => 'eloquent',
         Illuminate\Database\Query\Builder::class               => 'query',
@@ -67,28 +67,28 @@ return [
      * 'throw'          - Throws a \Yajra\DataTables\Exceptions\Exception. Use your custom error handler if needed.
      * 'custom message' - Any friendly message to be displayed to the user. You can also use translation key.
      */
-    'error'          => env('DATATABLES_ERROR', null),
+    'error' => env('DATATABLES_ERROR', null),
 
     /*
      * Default columns definition of dataTable utility functions.
      */
-    'columns'        => [
+    'columns' => [
         /*
          * List of columns hidden/removed on json response.
          */
-        'excess'    => ['rn', 'row_num'],
+        'excess' => ['rn', 'row_num'],
 
         /*
          * List of columns to be escaped. If set to *, all columns are escape.
          * Note: You can set the value to empty array to disable XSS protection.
          */
-        'escape'    => '*',
+        'escape' => '*',
 
         /*
          * List of columns that are allowed to display html content.
          * Note: Adding columns to list will make us available to XSS attacks.
          */
-        'raw'       => ['action'],
+        'raw' => ['action'],
 
         /*
          * List of columns are are forbidden from being searched/sorted.
@@ -105,7 +105,7 @@ return [
     /*
      * JsonResponse header and options config.
      */
-    'json'           => [
+    'json' => [
         'header'  => [],
         'options' => 0,
     ],

config/gravatar.php

@@ -6,7 +6,7 @@ return [
         // By default, images are presented at 80px by 80px if no size parameter is supplied.
         // You may request a specific image size, which will be dynamically delivered from Gravatar
         // by passing a single pixel dimension (since the images are square):
-        'size'   => 80,
+        'size' => 80,
 
         // the fallback image, can be a string or a url
         // for more info, visit: http://en.gravatar.com/site/implement/images/#default-image

config/log-viewer.php

@@ -7,13 +7,13 @@ return [
      |  Log files storage path
      | ------------------------------------------------------------------------------------------------
      */
-    'storage-path'  => storage_path('logs'),
+    'storage-path' => storage_path('logs'),
 
     /* ------------------------------------------------------------------------------------------------
      |  Log files pattern
      | ------------------------------------------------------------------------------------------------
      */
-    'pattern'       => [
+    'pattern' => [
         'prefix'    => Filesystem::PATTERN_PREFIX,    // 'laravel-'
         'date'      => Filesystem::PATTERN_DATE,      // '[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]'
         'extension' => Filesystem::PATTERN_EXTENSION, // '.log'
@@ -26,17 +26,17 @@ return [
      |    'auto', 'ar', 'de', 'en', 'es', 'fa', 'fr', 'hu', 'hy', 'it', 'ko', 'nl', 'pl', 'pt_BR', 'ro', 'ru',
      |    'sv', 'th', 'tr', 'zh-TW', 'zh'
      */
-    'locale'        => 'auto',
+    'locale' => 'auto',
 
     /* ------------------------------------------------------------------------------------------------
      |  Route settings
      | ------------------------------------------------------------------------------------------------
      */
-    'route'         => [
-        'enabled'    => true,
+    'route' => [
+        'enabled' => true,
 
         'attributes' => [
-            'prefix'     => 'admin/log-viewer',
+            'prefix' => 'admin/log-viewer',
 
             'middleware' => ['web', 'admin'],
         ],
@@ -47,20 +47,20 @@ return [
      | ------------------------------------------------------------------------------------------------
      |  This defines how many log entries are displayed per page.
      */
-    'per-page'      => 30,
+    'per-page' => 30,
 
     /* ------------------------------------------------------------------------------------------------
      |  LogViewer's Facade
      | ------------------------------------------------------------------------------------------------
      */
-    'facade'        => 'LogViewer',
+    'facade' => 'LogViewer',
 
     /* ------------------------------------------------------------------------------------------------
      |  Download settings
      | ------------------------------------------------------------------------------------------------
      */
-    'download'      => [
-        'prefix'    => 'laravel-',
+    'download' => [
+        'prefix' => 'laravel-',
 
         'extension' => 'log',
     ],
@@ -69,8 +69,8 @@ return [
      |  Menu settings
      | ------------------------------------------------------------------------------------------------
      */
-    'menu'  => [
-        'filter-route'  => 'log-viewer::logs.filter',
+    'menu' => [
+        'filter-route' => 'log-viewer::logs.filter',
 
         'icons-enabled' => true,
     ],
@@ -100,7 +100,7 @@ return [
      | ------------------------------------------------------------------------------------------------
      */
     'colors' => [
-        'levels'    => [
+        'levels' => [
             'empty'     => '#D1D1D1',
             'all'       => '#8A8A8A',
             'emergency' => '#B71C1C',

config/no-captcha.php

@@ -13,7 +13,7 @@ return [
      |  Localization
      | ------------------------------------------------------------------------------------------------
      */
-    'lang'    => app()->getLocale(),
+    'lang' => app()->getLocale(),
 
     /* ------------------------------------------------------------------------------------------------
      |  Attributes

database/DisableForeignKeys.php

@@ -13,7 +13,7 @@ trait DisableForeignKeys
      * @var array
      */
     private $commands = [
-        'mysql'  => [
+        'mysql' => [
           'enable'  => 'SET FOREIGN_KEY_CHECKS=1;',
           'disable' => 'SET FOREIGN_KEY_CHECKS=0;',
         ],

database/seeds/EmailTemplatePlaceholderTableSeeder.php

@@ -19,59 +19,59 @@ class EmailTemplatePlaceholderTableSeeder extends Seeder
 
         $data = [
             [
-                'name'              => 'app_name',
-                'created_at'        => Carbon::now(),
-                'updated_at'        => Carbon::now(),
+                'name'       => 'app_name',
+                'created_at' => Carbon::now(),
+                'updated_at' => Carbon::now(),
             ],
             [
-                'name'              => 'name',
-                'created_at'        => Carbon::now(),
-                'updated_at'        => Carbon::now(),
+                'name'       => 'name',
+                'created_at' => Carbon::now(),
+                'updated_at' => Carbon::now(),
             ],
             [
-                'name'              => 'email',
-                'created_at'        => Carbon::now(),
-                'updated_at'        => Carbon::now(),
+                'name'       => 'email',
+                'created_at' => Carbon::now(),
+                'updated_at' => Carbon::now(),
             ],
             [
-                'name'              => 'password',
-                'created_at'        => Carbon::now(),
-                'updated_at'        => Carbon::now(),
+                'name'       => 'password',
+                'created_at' => Carbon::now(),
+                'updated_at' => Carbon::now(),
             ],
             [
-                'name'              => 'contact-details',
-                'created_at'        => Carbon::now(),
-                'updated_at'        => Carbon::now(),
+                'name'       => 'contact-details',
+                'created_at' => Carbon::now(),
+                'updated_at' => Carbon::now(),
             ],
             [
-                'name'              => 'confirmation_link',
-                'created_at'        => Carbon::now(),
-                'updated_at'        => Carbon::now(),
+                'name'       => 'confirmation_link',
+                'created_at' => Carbon::now(),
+                'updated_at' => Carbon::now(),
             ],
             [
-                'name'              => 'password_reset_link',
-                'created_at'        => Carbon::now(),
-                'updated_at'        => Carbon::now(),
+                'name'       => 'password_reset_link',
+                'created_at' => Carbon::now(),
+                'updated_at' => Carbon::now(),
             ],
             [
-                'name'              => 'header_logo',
-                'created_at'        => Carbon::now(),
-                'updated_at'        => Carbon::now(),
+                'name'       => 'header_logo',
+                'created_at' => Carbon::now(),
+                'updated_at' => Carbon::now(),
             ],
             [
-                'name'              => 'footer_logo',
-                'created_at'        => Carbon::now(),
-                'updated_at'        => Carbon::now(),
+                'name'       => 'footer_logo',
+                'created_at' => Carbon::now(),
+                'updated_at' => Carbon::now(),
             ],
             [
-                'name'              => 'unscribe_link',
-                'created_at'        => Carbon::now(),
-                'updated_at'        => Carbon::now(),
+                'name'       => 'unscribe_link',
+                'created_at' => Carbon::now(),
+                'updated_at' => Carbon::now(),
             ],
             [
-                'name'              => 'status',
-                'created_at'        => Carbon::now(),
-                'updated_at'        => Carbon::now(),
+                'name'       => 'status',
+                'created_at' => Carbon::now(),
+                'updated_at' => Carbon::now(),
             ],
         ];
 

database/seeds/EmailTemplateTableSeeder.php

@@ -19,10 +19,10 @@ class EmailTemplateTableSeeder extends Seeder
 
         $data = [
             [
-                'title'             => 'User Registration',
-                'type_id'           => '1',
-                'subject'           => 'You have succesfully registerd',
-                'body'              => '<center>
+                'title'   => 'User Registration',
+                'type_id' => '1',
+                'subject' => 'You have succesfully registerd',
+                'body'    => '<center>
 <table id="bodyTable" border="0" width="100%" cellspacing="0" cellpadding="0" align="center">
 <tbody>
 <tr>
@@ -75,18 +75,18 @@ class EmailTemplateTableSeeder extends Seeder
 </tbody>
 </table>
 </center>',
-                'status'            => '1',
-                'created_by'        => '1',
-                'updated_by'        => null,
-                'created_at'        => Carbon::now(),
-                'updated_at'        => Carbon::now(),
+                'status'     => '1',
+                'created_by' => '1',
+                'updated_by' => null,
+                'created_at' => Carbon::now(),
+                'updated_at' => Carbon::now(),
             ],
 
             [
-                'title'             => 'Create User',
-                'type_id'           => '2',
-                'subject'           => 'Congratulations! your account has been created',
-                'body'              => '<center>
+                'title'   => 'Create User',
+                'type_id' => '2',
+                'subject' => 'Congratulations! your account has been created',
+                'body'    => '<center>
 <table id="bodyTable" border="0" width="100%" cellspacing="0" cellpadding="0" align="center">
 <tbody>
 <tr>
@@ -147,18 +147,18 @@ class EmailTemplateTableSeeder extends Seeder
 </tbody>
 </table>
 </center>',
-                'status'            => '1',
-                'created_by'        => '1',
-                'updated_by'        => null,
-                'created_at'        => Carbon::now(),
-                'updated_at'        => Carbon::now(),
+                'status'     => '1',
+                'created_by' => '1',
+                'updated_by' => null,
+                'created_at' => Carbon::now(),
+                'updated_at' => Carbon::now(),
             ],
 
             [
-                'title'             => 'Activate / Deactivate User',
-                'type_id'           => '3',
-                'subject'           => 'Your account has been [status]',
-                'body'              => '<center>
+                'title'   => 'Activate / Deactivate User',
+                'type_id' => '3',
+                'subject' => 'Your account has been [status]',
+                'body'    => '<center>
 <table id="bodyTable" border="0" width="100%" cellspacing="0" cellpadding="0" align="center">
 <tbody>
 <tr>
@@ -211,18 +211,18 @@ class EmailTemplateTableSeeder extends Seeder
 </tbody>
 </table>
 </center>',
-                'status'            => '1',
-                'created_by'        => '1',
-                'updated_by'        => null,
-                'created_at'        => Carbon::now(),
-                'updated_at'        => Carbon::now(),
+                'status'     => '1',
+                'created_by' => '1',
+                'updated_by' => null,
+                'created_at' => Carbon::now(),
+                'updated_at' => Carbon::now(),
             ],
 
             [
-                'title'             => 'Change Password',
-                'type_id'           => '4',
-                'subject'           => 'Your passwprd has been changed successfully',
-                'body'              => '<center>
+                'title'   => 'Change Password',
+                'type_id' => '4',
+                'subject' => 'Your passwprd has been changed successfully',
+                'body'    => '<center>
 <table id="bodyTable" border="0" width="100%" cellspacing="0" cellpadding="0" align="center">
 <tbody>
 <tr>
@@ -277,11 +277,11 @@ class EmailTemplateTableSeeder extends Seeder
 </tbody>
 </table>
 </center>',
-                'status'            => '1',
-                'created_by'        => '1',
-                'updated_by'        => null,
-                'created_at'        => Carbon::now(),
-                'updated_at'        => Carbon::now(),
+                'status'     => '1',
+                'created_by' => '1',
+                'updated_by' => null,
+                'created_at' => Carbon::now(),
+                'updated_at' => Carbon::now(),
             ],
         ];
 

database/seeds/EmailTemplateTypeTableSeeder.php

@@ -19,27 +19,27 @@ class EmailTemplateTypeTableSeeder extends Seeder
 
         $data = [
             [
-                'name'              => 'Registration',
-                'created_at'        => Carbon::now(),
-                'updated_at'        => Carbon::now(),
+                'name'       => 'Registration',
+                'created_at' => Carbon::now(),
+                'updated_at' => Carbon::now(),
             ],
 
             [
-                'name'              => 'Create User',
-                'created_at'        => Carbon::now(),
-                'updated_at'        => Carbon::now(),
+                'name'       => 'Create User',
+                'created_at' => Carbon::now(),
+                'updated_at' => Carbon::now(),
             ],
 
             [
-                'name'              => 'Acivate / Deactivate User',
-                'created_at'        => Carbon::now(),
-                'updated_at'        => Carbon::now(),
+                'name'       => 'Acivate / Deactivate User',
+                'created_at' => Carbon::now(),
+                'updated_at' => Carbon::now(),
             ],
 
             [
-                'name'              => 'Change Password',
-                'created_at'        => Carbon::now(),
-                'updated_at'        => Carbon::now(),
+                'name'       => 'Change Password',
+                'created_at' => Carbon::now(),
+                'updated_at' => Carbon::now(),
             ],
         ];
 

database/seeds/MenuTableSeeder.php

@@ -15,12 +15,12 @@ class MenuTableSeeder extends Seeder
     {
         DB::table(config('access.menus_table'))->truncate();
         $menu = [
-            'id'                    => 1,
-            'type'                  => 'backend',
-            'name'                  => 'Backend Sidebar Menu',
-            'items'                 => '[{"view_permission_id":"view-access-management","open_in_new_tab":0,"url_type":"route","url":"","name":"Access Management","id":11,"content":"Access Management","children":[{"view_permission_id":"view-user-management","open_in_new_tab":0,"url_type":"route","url":"admin.access.user.index","name":"User Management","id":12,"content":"User Management"},{"view_permission_id":"view-role-management","open_in_new_tab":0,"url_type":"route","url":"admin.access.role.index","name":"Role Management","id":13,"content":"Role Management"},{"view_permission_id":"view-permission-management","open_in_new_tab":0,"url_type":"route","url":"admin.access.permission.index","name":"Permission Management","id":14,"content":"Permission Management"}]},{"id":1,"name":"Module","url":"admin.modules.index","url_type":"route","open_in_new_tab":0,"view_permission_id":"view-module","content":"Module"},{"view_permission_id":"view-menu","open_in_new_tab":0,"url_type":"route","url":"admin.menus.index","name":"Menus","id":3,"content":"Menus"},{"id":2,"name":"CMS Pages","url":"admin.cmspages.index","url_type":"route","open_in_new_tab":0,"view_permission_id":"view-cms-pages","content":"CMS Pages"},{"view_permission_id":"view-email-template","open_in_new_tab":0,"url_type":"route","url":"admin.emailtemplates.index","name":"Email Templates","id":8,"content":"Email Templates"},{"view_permission_id":"edit-settings","open_in_new_tab":0,"url_type":"route","url":"admin.settings.edit?id=1","name":"Settings","id":9,"content":"Settings"},{"view_permission_id":"view-blog","open_in_new_tab":0,"url_type":"route","url":"","name":"Blog Management","id":15,"content":"Blog Management","children":[{"view_permission_id":"view-blog-category","open_in_new_tab":0,"url_type":"route","url":"admin.blogcategories.index","name":"Blog Category Management","id":16,"content":"Blog Category Management"},{"view_permission_id":"view-blog-tag","open_in_new_tab":0,"url_type":"route","url":"admin.blogtags.index","name":"Blog Tag Management","id":17,"content":"Blog Tag Management"},{"view_permission_id":"view-blog","open_in_new_tab":0,"url_type":"route","url":"admin.blogs.index","name":"Blog Management","id":18,"content":"Blog Management"}]},{"view_permission_id":"view-faq","open_in_new_tab":0,"url_type":"route","url":"admin.faqs.index","name":"Faq Management","id":19,"content":"Faq Management"}]',
-            'created_by'            => 1,
-            'created_at'            => Carbon::now(),
+            'id'         => 1,
+            'type'       => 'backend',
+            'name'       => 'Backend Sidebar Menu',
+            'items'      => '[{"view_permission_id":"view-access-management","open_in_new_tab":0,"url_type":"route","url":"","name":"Access Management","id":11,"content":"Access Management","children":[{"view_permission_id":"view-user-management","open_in_new_tab":0,"url_type":"route","url":"admin.access.user.index","name":"User Management","id":12,"content":"User Management"},{"view_permission_id":"view-role-management","open_in_new_tab":0,"url_type":"route","url":"admin.access.role.index","name":"Role Management","id":13,"content":"Role Management"},{"view_permission_id":"view-permission-management","open_in_new_tab":0,"url_type":"route","url":"admin.access.permission.index","name":"Permission Management","id":14,"content":"Permission Management"}]},{"id":1,"name":"Module","url":"admin.modules.index","url_type":"route","open_in_new_tab":0,"view_permission_id":"view-module","content":"Module"},{"view_permission_id":"view-menu","open_in_new_tab":0,"url_type":"route","url":"admin.menus.index","name":"Menus","id":3,"content":"Menus"},{"id":2,"name":"CMS Pages","url":"admin.cmspages.index","url_type":"route","open_in_new_tab":0,"view_permission_id":"view-cms-pages","content":"CMS Pages"},{"view_permission_id":"view-email-template","open_in_new_tab":0,"url_type":"route","url":"admin.emailtemplates.index","name":"Email Templates","id":8,"content":"Email Templates"},{"view_permission_id":"edit-settings","open_in_new_tab":0,"url_type":"route","url":"admin.settings.edit?id=1","name":"Settings","id":9,"content":"Settings"},{"view_permission_id":"view-blog","open_in_new_tab":0,"url_type":"route","url":"","name":"Blog Management","id":15,"content":"Blog Management","children":[{"view_permission_id":"view-blog-category","open_in_new_tab":0,"url_type":"route","url":"admin.blogcategories.index","name":"Blog Category Management","id":16,"content":"Blog Category Management"},{"view_permission_id":"view-blog-tag","open_in_new_tab":0,"url_type":"route","url":"admin.blogtags.index","name":"Blog Tag Management","id":17,"content":"Blog Tag Management"},{"view_permission_id":"view-blog","open_in_new_tab":0,"url_type":"route","url":"admin.blogs.index","name":"Blog Management","id":18,"content":"Blog Management"}]},{"view_permission_id":"view-faq","open_in_new_tab":0,"url_type":"route","url":"admin.faqs.index","name":"Faq Management","id":19,"content":"Faq Management"}]',
+            'created_by' => 1,
+            'created_at' => Carbon::now(),
         ];
 
         DB::table(config('access.menus_table'))->insert($menu);

database/seeds/ModulesTableSeeder.php

@@ -20,102 +20,102 @@ class ModulesTableSeeder extends Seeder
 
         $modules = [
             [
-                'name'                  => trans('menus.backend.access.title'),
-                'url'                   => null,
-                'view_permission_id'    => 'view-access-management',
-                'created_by'            => 1,
-                'created_at'            => Carbon::now(),
+                'name'               => trans('menus.backend.access.title'),
+                'url'                => null,
+                'view_permission_id' => 'view-access-management',
+                'created_by'         => 1,
+                'created_at'         => Carbon::now(),
             ],
             [
-                'name'                  => trans('labels.backend.access.users.management'),
-                'url'                   => 'admin.access.user.index',
-                'view_permission_id'    => 'view-user-management',
-                'created_by'            => 1,
-                'created_at'            => Carbon::now(),
+                'name'               => trans('labels.backend.access.users.management'),
+                'url'                => 'admin.access.user.index',
+                'view_permission_id' => 'view-user-management',
+                'created_by'         => 1,
+                'created_at'         => Carbon::now(),
             ],
             [
-                'name'                  => trans('labels.backend.access.roles.management'),
-                'url'                   => 'admin.access.role.index',
-                'view_permission_id'    => 'view-role-management',
-                'created_by'            => 1,
-                'created_at'            => Carbon::now(),
+                'name'               => trans('labels.backend.access.roles.management'),
+                'url'                => 'admin.access.role.index',
+                'view_permission_id' => 'view-role-management',
+                'created_by'         => 1,
+                'created_at'         => Carbon::now(),
             ],
             [
-                'name'                  => trans('labels.backend.access.permissions.management'),
-                'url'                   => 'admin.access.permission.index',
-                'view_permission_id'    => 'view-permission-management',
-                'created_by'            => 1,
-                'created_at'            => Carbon::now(),
+                'name'               => trans('labels.backend.access.permissions.management'),
+                'url'                => 'admin.access.permission.index',
+                'view_permission_id' => 'view-permission-management',
+                'created_by'         => 1,
+                'created_at'         => Carbon::now(),
             ],
             [
-                'name'                  => trans('labels.backend.menus.title'),
-                'url'                   => 'admin.menus.index',
-                'view_permission_id'    => 'view-menu',
-                'created_by'            => 1,
-                'created_at'            => Carbon::now(),
+                'name'               => trans('labels.backend.menus.title'),
+                'url'                => 'admin.menus.index',
+                'view_permission_id' => 'view-menu',
+                'created_by'         => 1,
+                'created_at'         => Carbon::now(),
             ],
             [
-                'name'                  => trans('labels.backend.modules.title'),
-                'url'                   => 'admin.modules.index',
-                'view_permission_id'    => 'view-module',
-                'created_by'            => 1,
-                'created_at'            => Carbon::now(),
+                'name'               => trans('labels.backend.modules.title'),
+                'url'                => 'admin.modules.index',
+                'view_permission_id' => 'view-module',
+                'created_by'         => 1,
+                'created_at'         => Carbon::now(),
             ],
             [
-                'name'                  => trans('labels.backend.cmspages.title'),
-                'url'                   => 'admin.cmspages.index',
-                'view_permission_id'    => 'view-cms-pages',
-                'created_by'            => 1,
-                'created_at'            => Carbon::now(),
+                'name'               => trans('labels.backend.cmspages.title'),
+                'url'                => 'admin.cmspages.index',
+                'view_permission_id' => 'view-cms-pages',
+                'created_by'         => 1,
+                'created_at'         => Carbon::now(),
             ],
             [
-                'name'                  => trans('labels.backend.emailtemplates.title'),
-                'url'                   => 'admin.emailtemplates.index',
-                'view_permission_id'    => 'view-email-template',
-                'created_by'            => 1,
-                'created_at'            => Carbon::now(),
+                'name'               => trans('labels.backend.emailtemplates.title'),
+                'url'                => 'admin.emailtemplates.index',
+                'view_permission_id' => 'view-email-template',
+                'created_by'         => 1,
+                'created_at'         => Carbon::now(),
             ],
             [
-                'name'                  => trans('labels.backend.settings.title'),
-                'url'                   => 'admin.settings.edit',
-                'view_permission_id'    => 'edit-settings',
-                'created_by'            => 1,
-                'created_at'            => Carbon::now(),
+                'name'               => trans('labels.backend.settings.title'),
+                'url'                => 'admin.settings.edit',
+                'view_permission_id' => 'edit-settings',
+                'created_by'         => 1,
+                'created_at'         => Carbon::now(),
             ],
             [
-                'name'                  => trans('menus.backend.blog.management'),
-                'url'                   => null,
-                'view_permission_id'    => 'view-blog',
-                'created_by'            => 1,
-                'created_at'            => Carbon::now(),
+                'name'               => trans('menus.backend.blog.management'),
+                'url'                => null,
+                'view_permission_id' => 'view-blog',
+                'created_by'         => 1,
+                'created_at'         => Carbon::now(),
             ],
             [
-                'name'                  => trans('menus.backend.blogcategories.management'),
-                'url'                   => 'admin.blogcategories.index',
-                'view_permission_id'    => 'view-blog-category',
-                'created_by'            => 1,
-                'created_at'            => Carbon::now(),
+                'name'               => trans('menus.backend.blogcategories.management'),
+                'url'                => 'admin.blogcategories.index',
+                'view_permission_id' => 'view-blog-category',
+                'created_by'         => 1,
+                'created_at'         => Carbon::now(),
             ],
             [
-                'name'                  => trans('menus.backend.blogtags.management'),
-                'url'                   => 'admin.blogtags.index',
-                'view_permission_id'    => 'view-blog-tag',
-                'created_by'            => 1,
-                'created_at'            => Carbon::now(),
+                'name'               => trans('menus.backend.blogtags.management'),
+                'url'                => 'admin.blogtags.index',
+                'view_permission_id' => 'view-blog-tag',
+                'created_by'         => 1,
+                'created_at'         => Carbon::now(),
             ],
             [
-                'name'                  => trans('menus.backend.blog.management'),
-                'url'                   => 'admin.blogs.index',
-                'view_permission_id'    => 'view-blog',
-                'created_by'            => 1,
-                'created_at'            => Carbon::now(),
+                'name'               => trans('menus.backend.blog.management'),
+                'url'                => 'admin.blogs.index',
+                'view_permission_id' => 'view-blog',
+                'created_by'         => 1,
+                'created_at'         => Carbon::now(),
             ],
             [
-                'name'                  => trans('menus.backend.faqs.management'),
-                'url'                   => 'admin.faqs.index',
-                'view_permission_id'    => 'view-faq',
-                'created_by'            => 1,
-                'created_at'            => Carbon::now(),
+                'name'               => trans('menus.backend.faqs.management'),
+                'url'                => 'admin.faqs.index',
+                'view_permission_id' => 'view-faq',
+                'created_by'         => 1,
+                'created_at'         => Carbon::now(),
             ],
         ];
 

database/seeds/SettingsTableSeeder.php

@@ -19,7 +19,7 @@ class SettingsTableSeeder extends Seeder
         $data = [
 
             [
-                'seo_title'             => env('APP_NAME'),
+                'seo_title' => env('APP_NAME'),
             ],
         ];
 

resources/lang/en/alerts.php

@@ -27,14 +27,14 @@ return [
         ],
 
         'users' => [
-            'confirmation_email'   => 'A new confirmation e-mail has been sent to the address on file.',
-            'created'              => 'The user was successfully created.',
-            'deleted'              => 'The user was successfully deleted.',
-            'deleted_permanently'  => 'The user was deleted permanently.',
-            'restored'             => 'The user was successfully restored.',
-            'session_cleared'      => "The user's session was successfully cleared.",
-            'updated'              => 'The user was successfully updated.',
-            'updated_password'     => "The user's password was successfully updated.",
+            'confirmation_email'  => 'A new confirmation e-mail has been sent to the address on file.',
+            'created'             => 'The user was successfully created.',
+            'deleted'             => 'The user was successfully deleted.',
+            'deleted_permanently' => 'The user was deleted permanently.',
+            'restored'            => 'The user was successfully restored.',
+            'session_cleared'     => "The user's session was successfully cleared.",
+            'updated'             => 'The user was successfully updated.',
+            'updated_password'    => "The user's password was successfully updated.",
         ],
 
         'cmspages' => [

resources/lang/en/buttons.php

@@ -16,14 +16,14 @@ return [
     'backend' => [
         'access' => [
             'users' => [
-                'activate'              => 'Activate',
-                'change_password'       => 'Change Password',
-                'clear_session'         => 'Clear Session',
-                'deactivate'            => 'Deactivate',
-                'delete_permanently'    => 'Delete Permanently',
-                'login_as'              => 'Login As :user',
-                'resend_email'          => 'Resend Confirmation E-mail',
-                'restore_user'          => 'Restore User',
+                'activate'           => 'Activate',
+                'change_password'    => 'Change Password',
+                'clear_session'      => 'Clear Session',
+                'deactivate'         => 'Deactivate',
+                'delete_permanently' => 'Delete Permanently',
+                'login_as'           => 'Login As :user',
+                'resend_email'       => 'Resend Confirmation E-mail',
+                'restore_user'       => 'Restore User',
             ],
         ],
     ],
@@ -41,12 +41,12 @@ return [
         'preview'  => 'Preview',
 
         'crud' => [
-            'create'  => 'Create',
-            'add'     => 'Add',
-            'delete'  => 'Delete',
-            'edit'    => 'Edit',
-            'update'  => 'Update',
-            'view'    => 'View',
+            'create' => 'Create',
+            'add'    => 'Add',
+            'delete' => 'Delete',
+            'edit'   => 'Edit',
+            'update' => 'Update',
+            'view'   => 'View',
         ],
 
         'save' => 'Save',

resources/lang/en/exceptions.php

@@ -27,11 +27,11 @@ return [
             ],
 
             'permissions' => [
-                'already_exists'    => 'That permission already exists. Please choose a different name.',
-                'create_error'      => 'There was a problem creating this permission. Please try again.',
-                'delete_error'      => 'There was a problem deleting this permission. Please try again.',
-                'not_found'         => 'That permission does not exist.',
-                'update_error'      => 'There was a problem updating this permission. Please try again.',
+                'already_exists' => 'That permission already exists. Please choose a different name.',
+                'create_error'   => 'There was a problem creating this permission. Please try again.',
+                'delete_error'   => 'There was a problem deleting this permission. Please try again.',
+                'not_found'      => 'That permission does not exist.',
+                'update_error'   => 'There was a problem updating this permission. Please try again.',
             ],
 
             'users' => [
@@ -57,55 +57,55 @@ return [
             ],
         ],
         'cmspages' => [
-            'already_exists'    => 'That CMS Page already exists. Please choose a different name.',
-            'create_error'      => 'There was a problem creating this CMS Page. Please try again.',
-            'delete_error'      => 'There was a problem deleting this CMS Page. Please try again.',
-            'not_found'         => 'That CMS Page does not exist.',
-            'update_error'      => 'There was a problem updating this CMS Page. Please try again.',
+            'already_exists' => 'That CMS Page already exists. Please choose a different name.',
+            'create_error'   => 'There was a problem creating this CMS Page. Please try again.',
+            'delete_error'   => 'There was a problem deleting this CMS Page. Please try again.',
+            'not_found'      => 'That CMS Page does not exist.',
+            'update_error'   => 'There was a problem updating this CMS Page. Please try again.',
         ],
 
         'blogcategories' => [
-            'already_exists'    => 'That Blog Category already exists. Please choose a different name.',
-            'create_error'      => 'There was a problem creating this Blog Category. Please try again.',
-            'delete_error'      => 'There was a problem deleting this Blog Category. Please try again.',
-            'not_found'         => 'That Blog Category does not exist.',
-            'update_error'      => 'There was a problem updating this Blog Category. Please try again.',
+            'already_exists' => 'That Blog Category already exists. Please choose a different name.',
+            'create_error'   => 'There was a problem creating this Blog Category. Please try again.',
+            'delete_error'   => 'There was a problem deleting this Blog Category. Please try again.',
+            'not_found'      => 'That Blog Category does not exist.',
+            'update_error'   => 'There was a problem updating this Blog Category. Please try again.',
         ],
 
         'blogtags' => [
-            'already_exists'    => 'That Blog Tag already exists. Please choose a different name.',
-            'create_error'      => 'There was a problem creating this Blog Tag. Please try again.',
-            'delete_error'      => 'There was a problem deleting this Blog Tag. Please try again.',
-            'not_found'         => 'That Blog Tag does not exist.',
-            'update_error'      => 'There was a problem updating this Blog Tag. Please try again.',
+            'already_exists' => 'That Blog Tag already exists. Please choose a different name.',
+            'create_error'   => 'There was a problem creating this Blog Tag. Please try again.',
+            'delete_error'   => 'There was a problem deleting this Blog Tag. Please try again.',
+            'not_found'      => 'That Blog Tag does not exist.',
+            'update_error'   => 'There was a problem updating this Blog Tag. Please try again.',
         ],
 
         'emailtemplates' => [
-            'already_exists'    => 'That Email Template already exists. Please choose a different name.',
-            'create_error'      => 'There was a problem creating this Email Template. Please try again.',
-            'delete_error'      => 'There was a problem deleting this Email Template. Please try again.',
-            'not_found'         => 'That Email Template does not exist.',
-            'update_error'      => 'There was a problem updating this Email Template. Please try again.',
+            'already_exists' => 'That Email Template already exists. Please choose a different name.',
+            'create_error'   => 'There was a problem creating this Email Template. Please try again.',
+            'delete_error'   => 'There was a problem deleting this Email Template. Please try again.',
+            'not_found'      => 'That Email Template does not exist.',
+            'update_error'   => 'There was a problem updating this Email Template. Please try again.',
         ],
 
         'settings' => [
-            'update_error'      => 'There was a problem updating this Settings. Please try again.',
+            'update_error' => 'There was a problem updating this Settings. Please try again.',
         ],
 
         'menus' => [
-            'already_exists'    => 'That Menu already exists. Please choose a different name.',
-            'create_error'      => 'There was a problem creating this Menu. Please try again.',
-            'delete_error'      => 'There was a problem deleting this Menu. Please try again.',
-            'not_found'         => 'That Menu does not exist.',
-            'update_error'      => 'There was a problem updating this Menu. Please try again.',
+            'already_exists' => 'That Menu already exists. Please choose a different name.',
+            'create_error'   => 'There was a problem creating this Menu. Please try again.',
+            'delete_error'   => 'There was a problem deleting this Menu. Please try again.',
+            'not_found'      => 'That Menu does not exist.',
+            'update_error'   => 'There was a problem updating this Menu. Please try again.',
         ],
 
         'modules' => [
-            'already_exists'    => 'That Module already exists. Please choose a different name.',
-            'create_error'      => 'There was a problem creating this Module. Please try again.',
-            'delete_error'      => 'There was a problem deleting this Module. Please try again.',
-            'not_found'         => 'That Module does not exist.',
-            'update_error'      => 'There was a problem updating this Module. Please try again.',
+            'already_exists' => 'That Module already exists. Please choose a different name.',
+            'create_error'   => 'There was a problem creating this Module. Please try again.',
+            'delete_error'   => 'There was a problem deleting this Module. Please try again.',
+            'not_found'      => 'That Module does not exist.',
+            'update_error'   => 'There was a problem updating this Module. Please try again.',
         ],
     ],
 

resources/lang/en/labels.php

@@ -54,11 +54,11 @@ return [
                 'management' => 'Permission Management',
 
                 'table' => [
-                    'permission'      => 'Permission',
-                    'display_name'    => 'Display Name',
-                    'sort'            => 'Sort',
-                    'status'          => 'Status',
-                    'total'           => 'role total|roles total',
+                    'permission'   => 'Permission',
+                    'display_name' => 'Display Name',
+                    'sort'         => 'Sort',
+                    'status'       => 'Status',
+                    'total'        => 'role total|roles total',
                 ],
             ],
 
@@ -122,11 +122,11 @@ return [
             'title'      => 'CMS Pages',
 
             'table' => [
-                'title'          => 'Title',
-                'status'         => 'Status',
-                'createdat'      => 'Created At',
-                'updatedat'      => 'Updated At',
-                'all'            => 'All',
+                'title'     => 'Title',
+                'status'    => 'Status',
+                'createdat' => 'Created At',
+                'updatedat' => 'Updated At',
+                'all'       => 'All',
             ],
         ],
 
@@ -137,11 +137,11 @@ return [
             'title'      => 'Blog Category',
 
             'table' => [
-                'title'          => 'Blog Category',
-                'status'         => 'Status',
-                'createdat'      => 'Created At',
-                'createdby'      => 'Created By',
-                'all'            => 'All',
+                'title'     => 'Blog Category',
+                'status'    => 'Status',
+                'createdat' => 'Created At',
+                'createdby' => 'Created By',
+                'all'       => 'All',
             ],
         ],
 
@@ -152,11 +152,11 @@ return [
             'title'      => 'Blog Tags',
 
             'table' => [
-                'title'          => 'Blog Tag',
-                'status'         => 'Status',
-                'createdat'      => 'Created At',
-                'createdby'      => 'Created By',
-                'all'            => 'All',
+                'title'     => 'Blog Tag',
+                'status'    => 'Status',
+                'createdat' => 'Created At',
+                'createdby' => 'Created By',
+                'all'       => 'All',
             ],
         ],
 
@@ -167,12 +167,12 @@ return [
             'title'      => 'Blogs',
 
             'table' => [
-                'title'          => 'Blog',
-                'publish'        => 'PublishDateTime',
-                'status'         => 'Status',
-                'createdat'      => 'Created At',
-                'createdby'      => 'Created By',
-                'all'            => 'All',
+                'title'     => 'Blog',
+                'publish'   => 'PublishDateTime',
+                'status'    => 'Status',
+                'createdat' => 'Created At',
+                'createdby' => 'Created By',
+                'all'       => 'All',
             ],
         ],
 
@@ -183,25 +183,25 @@ return [
             'title'      => 'Email Templates',
 
             'table' => [
-                'title'          => 'Title',
-                'subject'        => 'Subject',
-                'status'         => 'Status',
-                'createdat'      => 'Created At',
-                'updatedat'      => 'Updated At',
-                'all'            => 'All',
+                'title'     => 'Title',
+                'subject'   => 'Subject',
+                'status'    => 'Status',
+                'createdat' => 'Created At',
+                'updatedat' => 'Updated At',
+                'all'       => 'All',
             ],
         ],
 
         'settings' => [
-            'edit'              => 'Edit Settings',
-            'management'        => 'Settings Management',
-            'title'             => 'Settings',
-            'seo'               => 'SEO Settings',
-            'companydetails'    => 'Company Contact Details',
-            'mail'              => 'Mail Settings',
-            'footer'            => 'Footer Settings',
-            'terms'             => 'Terms & Condition Settings',
-            'google'            => 'Google Analytics Track Code',
+            'edit'           => 'Edit Settings',
+            'management'     => 'Settings Management',
+            'title'          => 'Settings',
+            'seo'            => 'SEO Settings',
+            'companydetails' => 'Company Contact Details',
+            'mail'           => 'Mail Settings',
+            'footer'         => 'Footer Settings',
+            'terms'          => 'Terms & Condition Settings',
+            'google'         => 'Google Analytics Track Code',
         ],
 
         'faqs' => [
@@ -211,15 +211,15 @@ return [
             'title'      => 'FAQ',
 
             'table' => [
-                'title'          => 'FAQs',
-                'publish'        => 'PublishDateTime',
-                'status'         => 'Status',
-                'createdat'      => 'Created At',
-                'createdby'      => 'Created By',
-                'answer'         => 'Answer',
-                'question'       => 'Question',
-                'updatedat'      => 'Updated At',
-                'all'            => 'All',
+                'title'     => 'FAQs',
+                'publish'   => 'PublishDateTime',
+                'status'    => 'Status',
+                'createdat' => 'Created At',
+                'createdby' => 'Created By',
+                'answer'    => 'Answer',
+                'question'  => 'Question',
+                'updatedat' => 'Updated At',
+                'all'       => 'All',
             ],
         ],
 
@@ -230,11 +230,11 @@ return [
             'title'      => 'Menus',
 
             'table' => [
-                'name'           => 'Name',
-                'type'           => 'Type',
-                'createdat'      => 'Created At',
-                'createdby'      => 'Created By',
-                'all'            => 'All',
+                'name'      => 'Name',
+                'type'      => 'Type',
+                'createdat' => 'Created At',
+                'createdby' => 'Created By',
+                'all'       => 'All',
             ],
             'field' => [
                 'name'      => 'Name',

resources/lang/en/validation.php

@@ -13,50 +13,50 @@ return [
     |
     */
 
-    'accepted'             => 'The :attribute must be accepted.',
-    'active_url'           => 'The :attribute is not a valid URL.',
-    'after'                => 'The :attribute must be a date after :date.',
-    'after_or_equal'       => 'The :attribute must be a date after or equal to :date.',
-    'alpha'                => 'The :attribute may only contain letters.',
-    'alpha_dash'           => 'The :attribute may only contain letters, numbers, and dashes.',
-    'alpha_num'            => 'The :attribute may only contain letters and numbers.',
-    'array'                => 'The :attribute must be an array.',
-    'before'               => 'The :attribute must be a date before :date.',
-    'before_or_equal'      => 'The :attribute must be a date before or equal to :date.',
-    'between'              => [
+    'accepted'        => 'The :attribute must be accepted.',
+    'active_url'      => 'The :attribute is not a valid URL.',
+    'after'           => 'The :attribute must be a date after :date.',
+    'after_or_equal'  => 'The :attribute must be a date after or equal to :date.',
+    'alpha'           => 'The :attribute may only contain letters.',
+    'alpha_dash'      => 'The :attribute may only contain letters, numbers, and dashes.',
+    'alpha_num'       => 'The :attribute may only contain letters and numbers.',
+    'array'           => 'The :attribute must be an array.',
+    'before'          => 'The :attribute must be a date before :date.',
+    'before_or_equal' => 'The :attribute must be a date before or equal to :date.',
+    'between'         => [
         'numeric' => 'The :attribute must be between :min and :max.',
         'file'    => 'The :attribute must be between :min and :max kilobytes.',
         'string'  => 'The :attribute must be between :min and :max characters.',
         'array'   => 'The :attribute must have between :min and :max items.',
     ],
-    'boolean'              => 'The :attribute field must be true or false.',
-    'confirmed'            => 'The :attribute confirmation does not match.',
-    'date'                 => 'The :attribute is not a valid date.',
-    'date_format'          => 'The :attribute does not match the format :format.',
-    'different'            => 'The :attribute and :other must be different.',
-    'digits'               => 'The :attribute must be :digits digits.',
-    'digits_between'       => 'The :attribute must be between :min and :max digits.',
-    'dimensions'           => 'The :attribute has invalid image dimensions.',
-    'distinct'             => 'The :attribute field has a duplicate value.',
-    'email'                => 'The :attribute must be a valid email address.',
-    'exists'               => 'The selected :attribute is invalid.',
-    'file'                 => 'The :attribute must be a file.',
-    'filled'               => 'The :attribute field must have a value.',
-    'image'                => 'The :attribute must be an image.',
-    'in'                   => 'The selected :attribute is invalid.',
-    'in_array'             => 'The :attribute field does not exist in :other.',
-    'integer'              => 'The :attribute must be an integer.',
-    'ip'                   => 'The :attribute must be a valid IP address.',
-    'json'                 => 'The :attribute must be a valid JSON string.',
-    'max'                  => [
+    'boolean'        => 'The :attribute field must be true or false.',
+    'confirmed'      => 'The :attribute confirmation does not match.',
+    'date'           => 'The :attribute is not a valid date.',
+    'date_format'    => 'The :attribute does not match the format :format.',
+    'different'      => 'The :attribute and :other must be different.',
+    'digits'         => 'The :attribute must be :digits digits.',
+    'digits_between' => 'The :attribute must be between :min and :max digits.',
+    'dimensions'     => 'The :attribute has invalid image dimensions.',
+    'distinct'       => 'The :attribute field has a duplicate value.',
+    'email'          => 'The :attribute must be a valid email address.',
+    'exists'         => 'The selected :attribute is invalid.',
+    'file'           => 'The :attribute must be a file.',
+    'filled'         => 'The :attribute field must have a value.',
+    'image'          => 'The :attribute must be an image.',
+    'in'             => 'The selected :attribute is invalid.',
+    'in_array'       => 'The :attribute field does not exist in :other.',
+    'integer'        => 'The :attribute must be an integer.',
+    'ip'             => 'The :attribute must be a valid IP address.',
+    'json'           => 'The :attribute must be a valid JSON string.',
+    'max'            => [
         'numeric' => 'The :attribute may not be greater than :max.',
         'file'    => 'The :attribute may not be greater than :max kilobytes.',
         'string'  => 'The :attribute may not be greater than :max characters.',
         'array'   => 'The :attribute may not have more than :max items.',
     ],
-    'mimes'                => 'The :attribute must be a file of type: :values.',
-    'mimetypes'            => 'The :attribute must be a file of type: :values.',
-    'min'                  => [
+    'mimes'     => 'The :attribute must be a file of type: :values.',
+    'mimetypes' => 'The :attribute must be a file of type: :values.',
+    'min'       => [
         'numeric' => 'The :attribute must be at least :min.',
         'file'    => 'The :attribute must be at least :min kilobytes.',
         'string'  => 'The :attribute must be at least :min characters.',
@@ -80,11 +80,11 @@ return [
         'string'  => 'The :attribute must be :size characters.',
         'array'   => 'The :attribute must contain :size items.',
     ],
-    'string'               => 'The :attribute must be a string.',
-    'timezone'             => 'The :attribute must be a valid zone.',
-    'unique'               => 'The :attribute has already been taken.',
-    'uploaded'             => 'The :attribute failed to upload.',
-    'url'                  => 'The :attribute format is invalid.',
+    'string'   => 'The :attribute must be a string.',
+    'timezone' => 'The :attribute must be a valid zone.',
+    'unique'   => 'The :attribute has already been taken.',
+    'uploaded' => 'The :attribute failed to upload.',
+    'url'      => 'The :attribute format is invalid.',
 
     /*
     |--------------------------------------------------------------------------
@@ -200,28 +200,28 @@ return [
             ],
 
             'settings' => [
-                'sitelogo'          => 'Site Logo',
-                'favicon'           => 'Fav Icon',
-                'metatitle'         => 'Meta Title',
-                'metakeyword'       => 'Meta Keyawords',
-                'metadescription'   => 'Meta Description',
-                'companydetails'    => [
-                    'address'           => 'Company Address',
-                    'contactnumber'     => 'Contact Number',
+                'sitelogo'        => 'Site Logo',
+                'favicon'         => 'Fav Icon',
+                'metatitle'       => 'Meta Title',
+                'metakeyword'     => 'Meta Keyawords',
+                'metadescription' => 'Meta Description',
+                'companydetails'  => [
+                    'address'       => 'Company Address',
+                    'contactnumber' => 'Contact Number',
                 ],
-                'mail'    => [
-                    'fromname'      => 'From Name',
-                    'fromemail'     => 'From Email',
+                'mail' => [
+                    'fromname'  => 'From Name',
+                    'fromemail' => 'From Email',
                 ],
-                'footer'    => [
+                'footer' => [
                     'text'      => 'Footer Text',
                     'copyright' => 'Copyright Text',
                 ],
-                'termscondition'    => [
+                'termscondition' => [
                     'terms'      => 'Terms & Condition',
                     'disclaimer' => 'Disclaimer',
                 ],
-                'google'    => [
+                'google' => [
                     'analytic' => 'Google Analytics',
                 ],
             ],

routes/Backend/Access.php

@@ -4,9 +4,9 @@
  * All route names are prefixed with 'admin.access'.
  */
 Route::group([
-    'prefix'     => 'access',
-    'as'         => 'access.',
-    'namespace'  => 'Access',
+    'prefix'    => 'access',
+    'as'        => 'access.',
+    'namespace' => 'Access',
 ], function () {
 
     /*

routes/Backend/Search.php

 <?php
 
 Route::group([
-    'prefix'     => 'search',
-    'as'         => 'search.',
-    'namespace'  => 'Search',
+    'prefix'    => 'search',
+    'as'        => 'search.',
+    'namespace' => 'Search',
 ], function () {
 
     /*