|
@@ -24,25 +24,25 @@ discard block |
|
|
block discarded – undo |
|
24
|
24
|
} |
|
25
|
25
|
|
|
26
|
26
|
if ($this->app->runningInConsole()) { |
|
27
|
|
- $this->commands([\Acacha\AdminLTETemplateLaravel\Console\PublishAdminLTE::class]); |
|
28
|
|
- $this->commands([\Acacha\AdminLTETemplateLaravel\Console\PublishAdminLTEAlt::class]); |
|
29
|
|
- $this->commands([\Acacha\AdminLTETemplateLaravel\Console\PublishAdminLTESidebar::class]); |
|
30
|
|
- $this->commands([\Acacha\AdminLTETemplateLaravel\Console\PublishAdminLTESidebarAlt::class]); |
|
31
|
|
- $this->commands([\Acacha\AdminLTETemplateLaravel\Console\MakeAdminUserSeeder::class]); |
|
32
|
|
- $this->commands([\Acacha\AdminLTETemplateLaravel\Console\AdminLTEAdmin::class]); |
|
33
|
|
- $this->commands([\Acacha\AdminLTETemplateLaravel\Console\AdminLTEAdminAlt::class]); |
|
34
|
|
- $this->commands([\Acacha\AdminLTETemplateLaravel\Console\MakeView::class]); |
|
35
|
|
- $this->commands([\Acacha\AdminLTETemplateLaravel\Console\AdminLTEMenu::class]); |
|
36
|
|
- $this->commands([\Acacha\AdminLTETemplateLaravel\Console\AdminLTEMenuAlt::class]); |
|
37
|
|
- $this->commands([\Acacha\AdminLTETemplateLaravel\Console\MakeRoute::class]); |
|
38
|
|
- $this->commands([\Acacha\AdminLTETemplateLaravel\Console\MakeMenu::class]); |
|
39
|
|
- $this->commands([\Acacha\AdminLTETemplateLaravel\Console\MakeV::class]); |
|
40
|
|
- $this->commands([\Acacha\AdminLTETemplateLaravel\Console\MakeVC::class]); |
|
41
|
|
- $this->commands([\Acacha\AdminLTETemplateLaravel\Console\MakeMVC::class]); |
|
42
|
|
- $this->commands([\Acacha\AdminLTETemplateLaravel\Console\Username::class]); |
|
|
27
|
+ $this->commands([ \Acacha\AdminLTETemplateLaravel\Console\PublishAdminLTE::class ]); |
|
|
28
|
+ $this->commands([ \Acacha\AdminLTETemplateLaravel\Console\PublishAdminLTEAlt::class ]); |
|
|
29
|
+ $this->commands([ \Acacha\AdminLTETemplateLaravel\Console\PublishAdminLTESidebar::class ]); |
|
|
30
|
+ $this->commands([ \Acacha\AdminLTETemplateLaravel\Console\PublishAdminLTESidebarAlt::class ]); |
|
|
31
|
+ $this->commands([ \Acacha\AdminLTETemplateLaravel\Console\MakeAdminUserSeeder::class ]); |
|
|
32
|
+ $this->commands([ \Acacha\AdminLTETemplateLaravel\Console\AdminLTEAdmin::class ]); |
|
|
33
|
+ $this->commands([ \Acacha\AdminLTETemplateLaravel\Console\AdminLTEAdminAlt::class ]); |
|
|
34
|
+ $this->commands([ \Acacha\AdminLTETemplateLaravel\Console\MakeView::class ]); |
|
|
35
|
+ $this->commands([ \Acacha\AdminLTETemplateLaravel\Console\AdminLTEMenu::class ]); |
|
|
36
|
+ $this->commands([ \Acacha\AdminLTETemplateLaravel\Console\AdminLTEMenuAlt::class ]); |
|
|
37
|
+ $this->commands([ \Acacha\AdminLTETemplateLaravel\Console\MakeRoute::class ]); |
|
|
38
|
+ $this->commands([ \Acacha\AdminLTETemplateLaravel\Console\MakeMenu::class ]); |
|
|
39
|
+ $this->commands([ \Acacha\AdminLTETemplateLaravel\Console\MakeV::class ]); |
|
|
40
|
+ $this->commands([ \Acacha\AdminLTETemplateLaravel\Console\MakeVC::class ]); |
|
|
41
|
+ $this->commands([ \Acacha\AdminLTETemplateLaravel\Console\MakeMVC::class ]); |
|
|
42
|
+ $this->commands([ \Acacha\AdminLTETemplateLaravel\Console\Username::class ]); |
|
43
|
43
|
} |
|
44
|
44
|
|
|
45
|
|
- $this->app->bind('AdminLTE', function () { |
|
|
45
|
+ $this->app->bind('AdminLTE', function() { |
|
46
|
46
|
return new \Acacha\AdminLTETemplateLaravel\AdminLTE(); |
|
47
|
47
|
}); |
|
48
|
48
|
|
|
@@ -53,9 +53,9 @@ discard block |
|
|
block discarded – undo |
|
53
|
53
|
if (config('adminlte.guestuser', true)) { |
|
54
|
54
|
$this->registerGuestUserProvider(); |
|
55
|
55
|
} |
|
56
|
|
- if (config('auth.providers.users.field', 'email') === 'username' && |
|
|
56
|
+ if (config('auth.providers.users.field', 'email') === 'username' && |
|
57
|
57
|
config('adminlte.add_nullable_username', true)) { |
|
58
|
|
- $this->loadMigrationsFrom(ADMINLTETEMPLATE_PATH .'/database/migrations/username_login'); |
|
|
58
|
+ $this->loadMigrationsFrom(ADMINLTETEMPLATE_PATH.'/database/migrations/username_login'); |
|
59
|
59
|
} |
|
60
|
60
|
} |
|
61
|
61
|
|
|
@@ -117,7 +117,7 @@ discard block |
|
|
block discarded – undo |
|
117
|
117
|
if (!$this->app->routesAreCached()) { |
|
118
|
118
|
$router = app('router'); |
|
119
|
119
|
|
|
120
|
|
- $router->group(['namespace' => Container::getInstance()->getNamespace().'Http\Controllers'], function () { |
|
|
120
|
+ $router->group([ 'namespace' => Container::getInstance()->getNamespace().'Http\Controllers' ], function() { |
|
121
|
121
|
require __DIR__.'/../Http/routes.php'; |
|
122
|
122
|
}); |
|
123
|
123
|
} |