From: Vincent Vanwaelscappel Date: Thu, 2 Sep 2021 10:05:06 +0000 (+0200) Subject: wip #4662 @2 X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=e171e566d742696ca4a1b9f48faf602bb1ca72e9;p=cubist_cms-back.git wip #4662 @2 --- diff --git a/src/app/Console/Commands/GenerateCommand.php b/src/app/Console/Commands/GenerateCommand.php index 59b1260..7e43895 100644 --- a/src/app/Console/Commands/GenerateCommand.php +++ b/src/app/Console/Commands/GenerateCommand.php @@ -63,8 +63,10 @@ class GenerateCommand extends CubistMagicCommand $model->generateCode(); $route = $model->getOption('route', $model->getOption('name')); + if(null===$route || !$route){ + return; + } $controller = $model->getControllerClass(); - $this->_routes[] = ' Route::crud(\'' . $route . '\', \'' . $controller . '\');'; } } diff --git a/src/app/Providers/AppServiceProvider.php b/src/app/Providers/AppServiceProvider.php new file mode 100644 index 0000000..f77f047 --- /dev/null +++ b/src/app/Providers/AppServiceProvider.php @@ -0,0 +1,28 @@ + 'App\Policies\ModelPolicy', + ]; + + /** + * Register any authentication / authorization services. + * + * @return void + */ + public function boot() + { + $this->registerPolicies(); + Gate::before(function ($user, $ability) { + return $user->hasRole('superadmin') ? true : null; + }); + +// Gate::before(function ($user, $ability) { +// //debug($user); +// return $user->hasPermissionTo($ability) ? true : null; +// }); + } +} diff --git a/src/app/Providers/BroadcastServiceProvider.php b/src/app/Providers/BroadcastServiceProvider.php new file mode 100644 index 0000000..cb70a77 --- /dev/null +++ b/src/app/Providers/BroadcastServiceProvider.php @@ -0,0 +1,21 @@ + [ + SendEmailVerificationNotification::class, + ], + ]; + + /** + * Register any events for your application. + * + * @return void + */ + public function boot() + { + parent::boot(); + + // + } +} diff --git a/src/app/Providers/RouteServiceProvider.php b/src/app/Providers/RouteServiceProvider.php new file mode 100644 index 0000000..78359f9 --- /dev/null +++ b/src/app/Providers/RouteServiceProvider.php @@ -0,0 +1,80 @@ +mapApiRoutes(); + + $this->mapWebRoutes(); + + // + } + + /** + * Define the "web" routes for the application. + * + * These routes all receive session state, CSRF protection, etc. + * + * @return void + */ + protected function mapWebRoutes() + { + Route::middleware('web') + ->namespace($this->namespace) + ->group(base_path('routes/web.php')); + } + + /** + * Define the "api" routes for the application. + * + * These routes are typically stateless. + * + * @return void + */ + protected function mapApiRoutes() + { + Route::prefix('api') + ->middleware('api') + ->namespace($this->namespace) + ->group(base_path('routes/api.php')); + } +} diff --git a/src/resources/install/config/app.php b/src/resources/install/config/app.php index a3498e1..14ec35c 100644 --- a/src/resources/install/config/app.php +++ b/src/resources/install/config/app.php @@ -200,11 +200,11 @@ return [ /* * Application Service Providers... */ - App\Providers\AppServiceProvider::class, - App\Providers\AuthServiceProvider::class, + Cubist\Backpack\Providers\AppServiceProvider::class, + Cubist\Backpack\Providers\AuthServiceProvider::class, // App\Providers\BroadcastServiceProvider::class, - App\Providers\EventServiceProvider::class, - App\Providers\RouteServiceProvider::class, + Cubist\Backpack\Providers\EventServiceProvider::class, + Cubist\Backpack\Providers\RouteServiceProvider::class, ], /*