@@ -14,7 +14,7 @@ |
||
| 14 | 14 | public function boot() |
| 15 | 15 | { |
| 16 | 16 | $this->app['view']->addNamespace('CbAuth', __DIR__.'/views'); |
| 17 | - $this->loadRoutesFrom( __DIR__.'/auth_routes.php'); |
|
| 17 | + $this->loadRoutesFrom(__DIR__.'/auth_routes.php'); |
|
| 18 | 18 | $this->loadMigrationsFrom(__DIR__.'/migrations'); |
| 19 | 19 | } |
| 20 | 20 | |
@@ -53,13 +53,13 @@ discard block |
||
| 53 | 53 | __DIR__.'/CBCoreModule/publieshed_files/readme.txt' => resource_path('views/vendor/crudbooster/type_components/readme.txt'), |
| 54 | 54 | ], 'cb_type_components'); |
| 55 | 55 | |
| 56 | - if (! file_exists(app_path('Http/Controllers/AdminUsersController.php'))) { |
|
| 56 | + if (!file_exists(app_path('Http/Controllers/AdminUsersController.php'))) { |
|
| 57 | 57 | $this->publishes([__DIR__.'/CBCoreModule/publieshed_files/AdminUsersController.php' => app_path('Http/Controllers/AdminUsersController.php')], 'cb_user_controller'); |
| 58 | 58 | } |
| 59 | 59 | |
| 60 | 60 | |
| 61 | 61 | $this->defineValidationRules(); |
| 62 | - $this->loadRoutesFrom( __DIR__.'/routes.php'); |
|
| 62 | + $this->loadRoutesFrom(__DIR__.'/routes.php'); |
|
| 63 | 63 | } |
| 64 | 64 | |
| 65 | 65 | /** |
@@ -71,7 +71,7 @@ discard block |
||
| 71 | 71 | { |
| 72 | 72 | $this->mergeConfigFrom(__DIR__.'/configs/crudbooster.php', 'crudbooster'); |
| 73 | 73 | |
| 74 | - $this->app->singleton('crudbooster', function () { |
|
| 74 | + $this->app->singleton('crudbooster', function() { |
|
| 75 | 75 | return true; |
| 76 | 76 | }); |
| 77 | 77 | |
@@ -104,7 +104,7 @@ discard block |
||
| 104 | 104 | |
| 105 | 105 | private function defineValidationRules() |
| 106 | 106 | { |
| 107 | - \Validator::extend('alpha_spaces', function ($attribute, $value) { |
|
| 107 | + \Validator::extend('alpha_spaces', function($attribute, $value) { |
|
| 108 | 108 | // This will only accept alpha and spaces. |
| 109 | 109 | // If you want to accept hyphens use: /^[\pL\s-]+$/u. |
| 110 | 110 | return preg_match('/^[\pL\s]+$/u', $value); |
@@ -113,7 +113,7 @@ discard block |
||
| 113 | 113 | |
| 114 | 114 | private function defineAuthGuard() |
| 115 | 115 | { |
| 116 | - config()->offsetSet('auth.providers.cb_users', ['driver' => 'eloquent', 'model' => CbUser::class,]); |
|
| 116 | + config()->offsetSet('auth.providers.cb_users', ['driver' => 'eloquent', 'model' => CbUser::class, ]); |
|
| 117 | 117 | config()->offsetSet('auth.guards.cbAdmin', ['driver' => 'session', 'provider' => 'cb_users']); |
| 118 | 118 | } |
| 119 | 119 | |
@@ -38,7 +38,7 @@ |
||
| 38 | 38 | * @param $name |
| 39 | 39 | * @param $ctrl |
| 40 | 40 | */ |
| 41 | - private function createAddLinkSubmenu($arr , $name, $ctrl) |
|
| 41 | + private function createAddLinkSubmenu($arr, $name, $ctrl) |
|
| 42 | 42 | { |
| 43 | 43 | $this->table()->insert([ |
| 44 | 44 | 'name' => cbTrans('text_default_add_new_module', ['module' => $name]), |
@@ -5,34 +5,34 @@ |
||
| 5 | 5 | |
| 6 | 6 | class CreateCmsLogsTable extends Migration { |
| 7 | 7 | |
| 8 | - /** |
|
| 9 | - * Run the migrations. |
|
| 10 | - * |
|
| 11 | - * @return void |
|
| 12 | - */ |
|
| 13 | - public function up() |
|
| 14 | - { |
|
| 15 | - Schema::create('cms_logs', function(Blueprint $table) |
|
| 16 | - { |
|
| 17 | - $table->increments('id'); |
|
| 18 | - $table->string('ipaddress', 50)->nullable(); |
|
| 19 | - $table->string('useragent')->nullable(); |
|
| 20 | - $table->string('url')->nullable(); |
|
| 21 | - $table->string('description')->nullable(); |
|
| 22 | - $table->integer('cms_users_id')->nullable(); |
|
| 23 | - $table->timestamps(); |
|
| 24 | - }); |
|
| 25 | - } |
|
| 8 | + /** |
|
| 9 | + * Run the migrations. |
|
| 10 | + * |
|
| 11 | + * @return void |
|
| 12 | + */ |
|
| 13 | + public function up() |
|
| 14 | + { |
|
| 15 | + Schema::create('cms_logs', function(Blueprint $table) |
|
| 16 | + { |
|
| 17 | + $table->increments('id'); |
|
| 18 | + $table->string('ipaddress', 50)->nullable(); |
|
| 19 | + $table->string('useragent')->nullable(); |
|
| 20 | + $table->string('url')->nullable(); |
|
| 21 | + $table->string('description')->nullable(); |
|
| 22 | + $table->integer('cms_users_id')->nullable(); |
|
| 23 | + $table->timestamps(); |
|
| 24 | + }); |
|
| 25 | + } |
|
| 26 | 26 | |
| 27 | 27 | |
| 28 | - /** |
|
| 29 | - * Reverse the migrations. |
|
| 30 | - * |
|
| 31 | - * @return void |
|
| 32 | - */ |
|
| 33 | - public function down() |
|
| 34 | - { |
|
| 35 | - Schema::drop('cms_logs'); |
|
| 36 | - } |
|
| 28 | + /** |
|
| 29 | + * Reverse the migrations. |
|
| 30 | + * |
|
| 31 | + * @return void |
|
| 32 | + */ |
|
| 33 | + public function down() |
|
| 34 | + { |
|
| 35 | + Schema::drop('cms_logs'); |
|
| 36 | + } |
|
| 37 | 37 | |
| 38 | 38 | } |
@@ -5,34 +5,34 @@ |
||
| 5 | 5 | |
| 6 | 6 | class CreateCmsNotificationsTable extends Migration { |
| 7 | 7 | |
| 8 | - /** |
|
| 9 | - * Run the migrations. |
|
| 10 | - * |
|
| 11 | - * @return void |
|
| 12 | - */ |
|
| 13 | - public function up() |
|
| 14 | - { |
|
| 15 | - Schema::create('cms_notifications', function(Blueprint $table) |
|
| 16 | - { |
|
| 17 | - $table->increments('id'); |
|
| 18 | - $table->integer('cms_users_id')->nullable(); |
|
| 19 | - $table->string('content')->nullable(); |
|
| 20 | - $table->string('url')->nullable(); |
|
| 21 | - $table->boolean('can_read')->nullable(); |
|
| 22 | - $table->timestamps(); |
|
| 23 | - $table->softDeletes(); |
|
| 24 | - }); |
|
| 25 | - } |
|
| 8 | + /** |
|
| 9 | + * Run the migrations. |
|
| 10 | + * |
|
| 11 | + * @return void |
|
| 12 | + */ |
|
| 13 | + public function up() |
|
| 14 | + { |
|
| 15 | + Schema::create('cms_notifications', function(Blueprint $table) |
|
| 16 | + { |
|
| 17 | + $table->increments('id'); |
|
| 18 | + $table->integer('cms_users_id')->nullable(); |
|
| 19 | + $table->string('content')->nullable(); |
|
| 20 | + $table->string('url')->nullable(); |
|
| 21 | + $table->boolean('can_read')->nullable(); |
|
| 22 | + $table->timestamps(); |
|
| 23 | + $table->softDeletes(); |
|
| 24 | + }); |
|
| 25 | + } |
|
| 26 | 26 | |
| 27 | 27 | |
| 28 | - /** |
|
| 29 | - * Reverse the migrations. |
|
| 30 | - * |
|
| 31 | - * @return void |
|
| 32 | - */ |
|
| 33 | - public function down() |
|
| 34 | - { |
|
| 35 | - Schema::drop('cms_notifications'); |
|
| 36 | - } |
|
| 28 | + /** |
|
| 29 | + * Reverse the migrations. |
|
| 30 | + * |
|
| 31 | + * @return void |
|
| 32 | + */ |
|
| 33 | + public function down() |
|
| 34 | + { |
|
| 35 | + Schema::drop('cms_notifications'); |
|
| 36 | + } |
|
| 37 | 37 | |
| 38 | 38 | } |
@@ -5,35 +5,35 @@ |
||
| 5 | 5 | |
| 6 | 6 | class CreateCmsUsersTable extends Migration { |
| 7 | 7 | |
| 8 | - /** |
|
| 9 | - * Run the migrations. |
|
| 10 | - * |
|
| 11 | - * @return void |
|
| 12 | - */ |
|
| 13 | - public function up() |
|
| 14 | - { |
|
| 15 | - Schema::create('cms_users', function(Blueprint $table) |
|
| 16 | - { |
|
| 17 | - $table->increments('id'); |
|
| 18 | - $table->string('name', 50)->nullable(); |
|
| 19 | - $table->string('photo')->nullable(); |
|
| 20 | - $table->string('email', 50)->nullable(); |
|
| 21 | - $table->string('password')->nullable(); |
|
| 22 | - $table->integer('cms_roles_id')->nullable(); |
|
| 23 | - $table->timestamps(); |
|
| 24 | - $table->string('status', 50)->nullable(); |
|
| 25 | - }); |
|
| 26 | - } |
|
| 8 | + /** |
|
| 9 | + * Run the migrations. |
|
| 10 | + * |
|
| 11 | + * @return void |
|
| 12 | + */ |
|
| 13 | + public function up() |
|
| 14 | + { |
|
| 15 | + Schema::create('cms_users', function(Blueprint $table) |
|
| 16 | + { |
|
| 17 | + $table->increments('id'); |
|
| 18 | + $table->string('name', 50)->nullable(); |
|
| 19 | + $table->string('photo')->nullable(); |
|
| 20 | + $table->string('email', 50)->nullable(); |
|
| 21 | + $table->string('password')->nullable(); |
|
| 22 | + $table->integer('cms_roles_id')->nullable(); |
|
| 23 | + $table->timestamps(); |
|
| 24 | + $table->string('status', 50)->nullable(); |
|
| 25 | + }); |
|
| 26 | + } |
|
| 27 | 27 | |
| 28 | 28 | |
| 29 | - /** |
|
| 30 | - * Reverse the migrations. |
|
| 31 | - * |
|
| 32 | - * @return void |
|
| 33 | - */ |
|
| 34 | - public function down() |
|
| 35 | - { |
|
| 36 | - Schema::drop('cms_users'); |
|
| 37 | - } |
|
| 29 | + /** |
|
| 30 | + * Reverse the migrations. |
|
| 31 | + * |
|
| 32 | + * @return void |
|
| 33 | + */ |
|
| 34 | + public function down() |
|
| 35 | + { |
|
| 36 | + Schema::drop('cms_users'); |
|
| 37 | + } |
|
| 38 | 38 | |
| 39 | 39 | } |
@@ -5,39 +5,39 @@ |
||
| 5 | 5 | |
| 6 | 6 | class CreateCmsMenusTable extends Migration { |
| 7 | 7 | |
| 8 | - /** |
|
| 9 | - * Run the migrations. |
|
| 10 | - * |
|
| 11 | - * @return void |
|
| 12 | - */ |
|
| 13 | - public function up() |
|
| 14 | - { |
|
| 15 | - Schema::create('cms_menus', function(Blueprint $table) |
|
| 16 | - { |
|
| 17 | - $table->increments('id'); |
|
| 18 | - $table->string('name', 30)->nullable(); |
|
| 19 | - $table->string('type', 30)->default('url'); |
|
| 20 | - $table->string('path', 50)->nullable(); |
|
| 21 | - $table->string('color', 30)->nullable(); |
|
| 22 | - $table->string('icon', 30)->nullable(); |
|
| 23 | - $table->integer('parent_id')->nullable(); |
|
| 24 | - $table->boolean('is_active')->default(1); |
|
| 25 | - $table->boolean('is_dashboard')->default(0); |
|
| 26 | - $table->integer('sorting')->nullable(); |
|
| 27 | - $table->timestamps(); |
|
| 28 | - $table->text('cms_roles', 65535)->nullable(); |
|
| 29 | - }); |
|
| 30 | - } |
|
| 8 | + /** |
|
| 9 | + * Run the migrations. |
|
| 10 | + * |
|
| 11 | + * @return void |
|
| 12 | + */ |
|
| 13 | + public function up() |
|
| 14 | + { |
|
| 15 | + Schema::create('cms_menus', function(Blueprint $table) |
|
| 16 | + { |
|
| 17 | + $table->increments('id'); |
|
| 18 | + $table->string('name', 30)->nullable(); |
|
| 19 | + $table->string('type', 30)->default('url'); |
|
| 20 | + $table->string('path', 50)->nullable(); |
|
| 21 | + $table->string('color', 30)->nullable(); |
|
| 22 | + $table->string('icon', 30)->nullable(); |
|
| 23 | + $table->integer('parent_id')->nullable(); |
|
| 24 | + $table->boolean('is_active')->default(1); |
|
| 25 | + $table->boolean('is_dashboard')->default(0); |
|
| 26 | + $table->integer('sorting')->nullable(); |
|
| 27 | + $table->timestamps(); |
|
| 28 | + $table->text('cms_roles', 65535)->nullable(); |
|
| 29 | + }); |
|
| 30 | + } |
|
| 31 | 31 | |
| 32 | 32 | |
| 33 | - /** |
|
| 34 | - * Reverse the migrations. |
|
| 35 | - * |
|
| 36 | - * @return void |
|
| 37 | - */ |
|
| 38 | - public function down() |
|
| 39 | - { |
|
| 40 | - Schema::drop('cms_menus'); |
|
| 41 | - } |
|
| 33 | + /** |
|
| 34 | + * Reverse the migrations. |
|
| 35 | + * |
|
| 36 | + * @return void |
|
| 37 | + */ |
|
| 38 | + public function down() |
|
| 39 | + { |
|
| 40 | + Schema::drop('cms_menus'); |
|
| 41 | + } |
|
| 42 | 42 | |
| 43 | 43 | } |
@@ -9,7 +9,7 @@ |
||
| 9 | 9 | { |
| 10 | 10 | public static function sidebarMenu() |
| 11 | 11 | { |
| 12 | - $conditions = [ |
|
| 12 | + $conditions = [ |
|
| 13 | 13 | 'cms_roles' => cbUser()->cms_roles_id, |
| 14 | 14 | 'parent_id' => 0, |
| 15 | 15 | 'is_active' => 1, |
@@ -97,7 +97,7 @@ discard block |
||
| 97 | 97 | |
| 98 | 98 | $this->findRow($id)->update($this->arr); |
| 99 | 99 | foreach (request('privileges', []) as $moduleId => $data) { |
| 100 | - $arrs = array_get_keys($data, ['can_see_module', 'can_create', 'can_read', 'can_edit', 'can_delete',], 0); |
|
| 100 | + $arrs = array_get_keys($data, ['can_see_module', 'can_create', 'can_read', 'can_edit', 'can_delete', ], 0); |
|
| 101 | 101 | $this->savePermissions($id, $moduleId, $arrs); |
| 102 | 102 | } |
| 103 | 103 | |
@@ -170,7 +170,7 @@ discard block |
||
| 170 | 170 | [ |
| 171 | 171 | 'label' => 'Superadmin', |
| 172 | 172 | 'name' => 'is_superadmin', |
| 173 | - 'callback' => function ($row) { |
|
| 173 | + 'callback' => function($row) { |
|
| 174 | 174 | return ($row->is_superadmin) ? "<span class='label label-success'>Superadmin</span>" : "<span class='label label-default'>Standard</span>"; |
| 175 | 175 | }, |
| 176 | 176 | ], |