@@ -13,7 +13,7 @@ discard block |
||
| 13 | 13 | */ |
| 14 | 14 | public function up() |
| 15 | 15 | { |
| 16 | - Schema::table('repeaters', function (Blueprint $table) { |
|
| 16 | + Schema::table('repeaters', function(Blueprint $table) { |
|
| 17 | 17 | $table->softDeletes(); |
| 18 | 18 | }); |
| 19 | 19 | } |
@@ -25,7 +25,7 @@ discard block |
||
| 25 | 25 | */ |
| 26 | 26 | public function down() |
| 27 | 27 | { |
| 28 | - Schema::table('repeaters', function (Blueprint $table) { |
|
| 28 | + Schema::table('repeaters', function(Blueprint $table) { |
|
| 29 | 29 | $table->dropSoftDeletes(); |
| 30 | 30 | }); |
| 31 | 31 | } |
@@ -14,13 +14,13 @@ discard block |
||
| 14 | 14 | public function up() |
| 15 | 15 | { |
| 16 | 16 | if (!Schema::hasColumn('users', 'token')) { |
| 17 | - Schema::table('users', function (Blueprint $table) { |
|
| 17 | + Schema::table('users', function(Blueprint $table) { |
|
| 18 | 18 | $table->string('token', 24)->unique()->after('remember_token'); |
| 19 | 19 | }); |
| 20 | 20 | } |
| 21 | 21 | |
| 22 | 22 | if (!Schema::hasColumn('users', 'active')) { |
| 23 | - Schema::table('users', function (Blueprint $table) { |
|
| 23 | + Schema::table('users', function(Blueprint $table) { |
|
| 24 | 24 | $table->tinyInteger('active')->default(0)->after('token'); |
| 25 | 25 | }); |
| 26 | 26 | } |
@@ -34,13 +34,13 @@ discard block |
||
| 34 | 34 | public function down() |
| 35 | 35 | { |
| 36 | 36 | if (Schema::hasColumn('users', 'token')) { |
| 37 | - Schema::table('users', function (Blueprint $table) { |
|
| 37 | + Schema::table('users', function(Blueprint $table) { |
|
| 38 | 38 | $table->dropColumn('token'); |
| 39 | 39 | }); |
| 40 | 40 | } |
| 41 | 41 | |
| 42 | 42 | if (Schema::hasColumn('users', 'active')) { |
| 43 | - Schema::table('users', function (Blueprint $table) { |
|
| 43 | + Schema::table('users', function(Blueprint $table) { |
|
| 44 | 44 | $table->dropColumn('active'); |
| 45 | 45 | }); |
| 46 | 46 | } |
@@ -13,7 +13,7 @@ discard block |
||
| 13 | 13 | */ |
| 14 | 14 | public function up() |
| 15 | 15 | { |
| 16 | - Schema::create(config('menu.table_prefix').config('menu.table_name_menus'), function (Blueprint $table) { |
|
| 16 | + Schema::create(config('menu.table_prefix') . config('menu.table_name_menus'), function(Blueprint $table) { |
|
| 17 | 17 | $table->increments('id'); |
| 18 | 18 | $table->string('name'); |
| 19 | 19 | $table->timestamps(); |
@@ -27,6 +27,6 @@ discard block |
||
| 27 | 27 | */ |
| 28 | 28 | public function down() |
| 29 | 29 | { |
| 30 | - Schema::dropIfExists(config('menu.table_prefix').config('menu.table_name_menus')); |
|
| 30 | + Schema::dropIfExists(config('menu.table_prefix') . config('menu.table_name_menus')); |
|
| 31 | 31 | } |
| 32 | 32 | } |
@@ -13,7 +13,7 @@ discard block |
||
| 13 | 13 | */ |
| 14 | 14 | public function up() |
| 15 | 15 | { |
| 16 | - Schema::table('pages', function (Blueprint $table) { |
|
| 16 | + Schema::table('pages', function(Blueprint $table) { |
|
| 17 | 17 | $table->string('roles')->nullable()->default(null)->after('active'); |
| 18 | 18 | }); |
| 19 | 19 | } |
@@ -25,7 +25,7 @@ discard block |
||
| 25 | 25 | */ |
| 26 | 26 | public function down() |
| 27 | 27 | { |
| 28 | - Schema::table('pages', function (Blueprint $table) { |
|
| 28 | + Schema::table('pages', function(Blueprint $table) { |
|
| 29 | 29 | $table->dropColumn('roles'); |
| 30 | 30 | }); |
| 31 | 31 | } |
@@ -13,7 +13,7 @@ discard block |
||
| 13 | 13 | */ |
| 14 | 14 | public function up() |
| 15 | 15 | { |
| 16 | - Schema::table('page_blocks', function (Blueprint $table) { |
|
| 16 | + Schema::table('page_blocks', function(Blueprint $table) { |
|
| 17 | 17 | $table->string('lang')->nullable()->default(null)->after('order'); |
| 18 | 18 | }); |
| 19 | 19 | } |
@@ -25,7 +25,7 @@ discard block |
||
| 25 | 25 | */ |
| 26 | 26 | public function down() |
| 27 | 27 | { |
| 28 | - Schema::table('page_blocks', function (Blueprint $table) { |
|
| 28 | + Schema::table('page_blocks', function(Blueprint $table) { |
|
| 29 | 29 | $table->dropColumn('lang'); |
| 30 | 30 | }); |
| 31 | 31 | } |
@@ -38,7 +38,7 @@ |
||
| 38 | 38 | |
| 39 | 39 | protected function redirectTo() |
| 40 | 40 | { |
| 41 | - return '/'.Auth::user()->roles()->first()->redirect; |
|
| 41 | + return '/' . Auth::user()->roles()->first()->redirect; |
|
| 42 | 42 | } |
| 43 | 43 | |
| 44 | 44 | /** |
@@ -17,17 +17,17 @@ discard block |
||
| 17 | 17 | */ |
| 18 | 18 | public function boot() |
| 19 | 19 | { |
| 20 | - $this->loadMigrationsFrom(__DIR__.'/../database/migrations'); |
|
| 20 | + $this->loadMigrationsFrom(__DIR__ . '/../database/migrations'); |
|
| 21 | 21 | |
| 22 | 22 | $this->publishes([ |
| 23 | - __DIR__.'/resources' => public_path('chuckbe/chuckcms'), |
|
| 23 | + __DIR__ . '/resources' => public_path('chuckbe/chuckcms'), |
|
| 24 | 24 | ], 'chuckcms-public'); |
| 25 | 25 | |
| 26 | 26 | $this->publishes([ |
| 27 | - __DIR__.'/../config/chuckcms.php' => config_path('chuckcms.php'), |
|
| 28 | - __DIR__.'/../config/menu.php' => config_path('menu.php'), |
|
| 29 | - __DIR__.'/../config/lfm.php' => config_path('lfm.php'), |
|
| 30 | - __DIR__.'/../config/lang.php' => config_path('lang.php'), |
|
| 27 | + __DIR__ . '/../config/chuckcms.php' => config_path('chuckcms.php'), |
|
| 28 | + __DIR__ . '/../config/menu.php' => config_path('menu.php'), |
|
| 29 | + __DIR__ . '/../config/lfm.php' => config_path('lfm.php'), |
|
| 30 | + __DIR__ . '/../config/lang.php' => config_path('lang.php'), |
|
| 31 | 31 | ], 'chuckcms-config'); |
| 32 | 32 | |
| 33 | 33 | if ($this->app->runningInConsole()) { |
@@ -55,26 +55,26 @@ discard block |
||
| 55 | 55 | $this->app->make('Chuckbe\Chuckcms\Controllers\Auth\RegisterController'); |
| 56 | 56 | $this->app->make('Chuckbe\Chuckcms\Controllers\Auth\ResetPasswordController'); |
| 57 | 57 | |
| 58 | - $this->loadViewsFrom(__DIR__.'/views', 'chuckcms'); |
|
| 58 | + $this->loadViewsFrom(__DIR__ . '/views', 'chuckcms'); |
|
| 59 | 59 | // publish error views + publish updated lfm views |
| 60 | 60 | |
| 61 | 61 | $this->mergeConfigFrom( |
| 62 | - __DIR__.'/../config/chuckcms.php', |
|
| 62 | + __DIR__ . '/../config/chuckcms.php', |
|
| 63 | 63 | 'chuckcms' |
| 64 | 64 | ); |
| 65 | 65 | |
| 66 | 66 | $this->mergeConfigFrom( |
| 67 | - __DIR__.'/../config/menu.php', |
|
| 67 | + __DIR__ . '/../config/menu.php', |
|
| 68 | 68 | 'menu' |
| 69 | 69 | ); |
| 70 | 70 | |
| 71 | 71 | $this->mergeConfigFrom( |
| 72 | - __DIR__.'/../config/lfm.php', |
|
| 72 | + __DIR__ . '/../config/lfm.php', |
|
| 73 | 73 | 'lfm' |
| 74 | 74 | ); |
| 75 | 75 | |
| 76 | 76 | $this->mergeConfigFrom( |
| 77 | - __DIR__.'/../config/lang.php', |
|
| 77 | + __DIR__ . '/../config/lang.php', |
|
| 78 | 78 | 'lang' |
| 79 | 79 | ); |
| 80 | 80 | |
@@ -23,7 +23,7 @@ |
||
| 23 | 23 | */ |
| 24 | 24 | public function register() |
| 25 | 25 | { |
| 26 | - $this->app->bind('Chuck', function () { |
|
| 26 | + $this->app->bind('Chuck', function() { |
|
| 27 | 27 | return new \Chuckbe\Chuckcms\Chuck\Accessors\Chuck(); |
| 28 | 28 | }); |
| 29 | 29 | } |
@@ -15,21 +15,21 @@ discard block |
||
| 15 | 15 | { |
| 16 | 16 | $tableNames = config('permission.table_names'); |
| 17 | 17 | |
| 18 | - Schema::create($tableNames['permissions'], function (Blueprint $table) { |
|
| 18 | + Schema::create($tableNames['permissions'], function(Blueprint $table) { |
|
| 19 | 19 | $table->increments('id'); |
| 20 | 20 | $table->string('name'); |
| 21 | 21 | $table->string('guard_name'); |
| 22 | 22 | $table->timestamps(); |
| 23 | 23 | }); |
| 24 | 24 | |
| 25 | - Schema::create($tableNames['roles'], function (Blueprint $table) { |
|
| 25 | + Schema::create($tableNames['roles'], function(Blueprint $table) { |
|
| 26 | 26 | $table->increments('id'); |
| 27 | 27 | $table->string('name'); |
| 28 | 28 | $table->string('guard_name'); |
| 29 | 29 | $table->timestamps(); |
| 30 | 30 | }); |
| 31 | 31 | |
| 32 | - Schema::create($tableNames['model_has_permissions'], function (Blueprint $table) use ($tableNames) { |
|
| 32 | + Schema::create($tableNames['model_has_permissions'], function(Blueprint $table) use ($tableNames) { |
|
| 33 | 33 | $table->increments('id'); |
| 34 | 34 | $table->unsignedInteger('permission_id'); |
| 35 | 35 | $table->morphs('model'); |
@@ -42,7 +42,7 @@ discard block |
||
| 42 | 42 | $table->primary(['permission_id', 'model_id', 'model_type']); |
| 43 | 43 | }); |
| 44 | 44 | |
| 45 | - Schema::create($tableNames['model_has_roles'], function (Blueprint $table) use ($tableNames) { |
|
| 45 | + Schema::create($tableNames['model_has_roles'], function(Blueprint $table) use ($tableNames) { |
|
| 46 | 46 | $table->increments('id'); |
| 47 | 47 | $table->unsignedInteger('role_id'); |
| 48 | 48 | $table->morphs('model'); |
@@ -55,7 +55,7 @@ discard block |
||
| 55 | 55 | $table->primary(['role_id', 'model_id', 'model_type']); |
| 56 | 56 | }); |
| 57 | 57 | |
| 58 | - Schema::create($tableNames['role_has_permissions'], function (Blueprint $table) use ($tableNames) { |
|
| 58 | + Schema::create($tableNames['role_has_permissions'], function(Blueprint $table) use ($tableNames) { |
|
| 59 | 59 | $table->increments('id'); |
| 60 | 60 | $table->unsignedInteger('permission_id'); |
| 61 | 61 | $table->unsignedInteger('role_id'); |