@@ -7,28 +7,28 @@ |
||
| 7 | 7 | |
| 8 | 8 | class OauthClient extends JsonResource |
| 9 | 9 | { |
| 10 | - /** |
|
| 11 | - * Transform the resource into an array. |
|
| 12 | - * |
|
| 13 | - * @param Request $request |
|
| 14 | - * @return array |
|
| 15 | - */ |
|
| 16 | - public function toArray($request) |
|
| 17 | - { |
|
| 18 | - if (! $this->resource) { |
|
| 19 | - return []; |
|
| 20 | - } |
|
| 10 | + /** |
|
| 11 | + * Transform the resource into an array. |
|
| 12 | + * |
|
| 13 | + * @param Request $request |
|
| 14 | + * @return array |
|
| 15 | + */ |
|
| 16 | + public function toArray($request) |
|
| 17 | + { |
|
| 18 | + if (! $this->resource) { |
|
| 19 | + return []; |
|
| 20 | + } |
|
| 21 | 21 | |
| 22 | - return [ |
|
| 23 | - 'id' => $this->id, |
|
| 24 | - 'name' => $this->name, |
|
| 25 | - 'redirect' => $this->redirect, |
|
| 26 | - 'user' => new UserResource($this->whenLoaded('user')), |
|
| 27 | - 'personalAccessClient' => $this->personal_access_client, |
|
| 28 | - 'passwordClient' => $this->password_client, |
|
| 29 | - 'revoked' => $this->revoked, |
|
| 30 | - 'created_at' => $this->created_at, |
|
| 31 | - 'updated_at' => $this->updated_at, |
|
| 32 | - ]; |
|
| 33 | - } |
|
| 22 | + return [ |
|
| 23 | + 'id' => $this->id, |
|
| 24 | + 'name' => $this->name, |
|
| 25 | + 'redirect' => $this->redirect, |
|
| 26 | + 'user' => new UserResource($this->whenLoaded('user')), |
|
| 27 | + 'personalAccessClient' => $this->personal_access_client, |
|
| 28 | + 'passwordClient' => $this->password_client, |
|
| 29 | + 'revoked' => $this->revoked, |
|
| 30 | + 'created_at' => $this->created_at, |
|
| 31 | + 'updated_at' => $this->updated_at, |
|
| 32 | + ]; |
|
| 33 | + } |
|
| 34 | 34 | } |
@@ -6,28 +6,28 @@ |
||
| 6 | 6 | |
| 7 | 7 | class InsertOauthClient extends FormRequest |
| 8 | 8 | { |
| 9 | - /** |
|
| 10 | - * Determine if the user is authorized to make this request. |
|
| 11 | - * |
|
| 12 | - * @return bool |
|
| 13 | - */ |
|
| 14 | - public function authorize() |
|
| 15 | - { |
|
| 16 | - return true; |
|
| 17 | - } |
|
| 9 | + /** |
|
| 10 | + * Determine if the user is authorized to make this request. |
|
| 11 | + * |
|
| 12 | + * @return bool |
|
| 13 | + */ |
|
| 14 | + public function authorize() |
|
| 15 | + { |
|
| 16 | + return true; |
|
| 17 | + } |
|
| 18 | 18 | |
| 19 | - /** |
|
| 20 | - * Get the validation rules that apply to the request. |
|
| 21 | - * |
|
| 22 | - * @return array |
|
| 23 | - */ |
|
| 24 | - public function rules() |
|
| 25 | - { |
|
| 26 | - return [ |
|
| 27 | - 'name' => 'required|max:255', |
|
| 28 | - 'redirect' => 'required|url', |
|
| 29 | - 'user_id' => 'required|exists:users,id', |
|
| 30 | - 'revoked' => 'boolean' |
|
| 31 | - ]; |
|
| 32 | - } |
|
| 19 | + /** |
|
| 20 | + * Get the validation rules that apply to the request. |
|
| 21 | + * |
|
| 22 | + * @return array |
|
| 23 | + */ |
|
| 24 | + public function rules() |
|
| 25 | + { |
|
| 26 | + return [ |
|
| 27 | + 'name' => 'required|max:255', |
|
| 28 | + 'redirect' => 'required|url', |
|
| 29 | + 'user_id' => 'required|exists:users,id', |
|
| 30 | + 'revoked' => 'boolean' |
|
| 31 | + ]; |
|
| 32 | + } |
|
| 33 | 33 | } |
@@ -6,29 +6,29 @@ |
||
| 6 | 6 | |
| 7 | 7 | class UpdateOauthClient extends FormRequest |
| 8 | 8 | { |
| 9 | - /** |
|
| 10 | - * Determine if the user is authorized to make this request. |
|
| 11 | - * |
|
| 12 | - * @return bool |
|
| 13 | - */ |
|
| 14 | - public function authorize() |
|
| 15 | - { |
|
| 16 | - return true; |
|
| 17 | - } |
|
| 9 | + /** |
|
| 10 | + * Determine if the user is authorized to make this request. |
|
| 11 | + * |
|
| 12 | + * @return bool |
|
| 13 | + */ |
|
| 14 | + public function authorize() |
|
| 15 | + { |
|
| 16 | + return true; |
|
| 17 | + } |
|
| 18 | 18 | |
| 19 | - /** |
|
| 20 | - * Get the validation rules that apply to the request. |
|
| 21 | - * |
|
| 22 | - * @return array |
|
| 23 | - */ |
|
| 24 | - public function rules() |
|
| 25 | - { |
|
| 26 | - return [ |
|
| 27 | - 'id' => 'required|exists:oauth_clients,id', |
|
| 28 | - 'name' => 'required|max:255', |
|
| 29 | - 'redirect' => 'required|url', |
|
| 30 | - 'user_id' => 'required|exists:users,id', |
|
| 31 | - 'revoked' => 'boolean' |
|
| 32 | - ]; |
|
| 33 | - } |
|
| 19 | + /** |
|
| 20 | + * Get the validation rules that apply to the request. |
|
| 21 | + * |
|
| 22 | + * @return array |
|
| 23 | + */ |
|
| 24 | + public function rules() |
|
| 25 | + { |
|
| 26 | + return [ |
|
| 27 | + 'id' => 'required|exists:oauth_clients,id', |
|
| 28 | + 'name' => 'required|max:255', |
|
| 29 | + 'redirect' => 'required|url', |
|
| 30 | + 'user_id' => 'required|exists:users,id', |
|
| 31 | + 'revoked' => 'boolean' |
|
| 32 | + ]; |
|
| 33 | + } |
|
| 34 | 34 | } |
@@ -5,73 +5,73 @@ |
||
| 5 | 5 | |
| 6 | 6 | class NotificationRepository extends BaseRepository |
| 7 | 7 | { |
| 8 | - /** |
|
| 9 | - * Init new object. |
|
| 10 | - * |
|
| 11 | - * @param Notification $model |
|
| 12 | - * @return void |
|
| 13 | - */ |
|
| 14 | - public function __construct(Notification $model) |
|
| 15 | - { |
|
| 16 | - parent::__construct($model); |
|
| 17 | - } |
|
| 8 | + /** |
|
| 9 | + * Init new object. |
|
| 10 | + * |
|
| 11 | + * @param Notification $model |
|
| 12 | + * @return void |
|
| 13 | + */ |
|
| 14 | + public function __construct(Notification $model) |
|
| 15 | + { |
|
| 16 | + parent::__construct($model); |
|
| 17 | + } |
|
| 18 | 18 | |
| 19 | - /** |
|
| 20 | - * Retrieve all notifications of the logged in user. |
|
| 21 | - * |
|
| 22 | - * @param integer $perPage |
|
| 23 | - * @return Collection |
|
| 24 | - */ |
|
| 25 | - public function my($perPage) |
|
| 26 | - { |
|
| 27 | - return \Auth::user()->notifications()->paginate($perPage); |
|
| 28 | - } |
|
| 19 | + /** |
|
| 20 | + * Retrieve all notifications of the logged in user. |
|
| 21 | + * |
|
| 22 | + * @param integer $perPage |
|
| 23 | + * @return Collection |
|
| 24 | + */ |
|
| 25 | + public function my($perPage) |
|
| 26 | + { |
|
| 27 | + return \Auth::user()->notifications()->paginate($perPage); |
|
| 28 | + } |
|
| 29 | 29 | |
| 30 | - /** |
|
| 31 | - * Retrieve unread notifications of the logged in user. |
|
| 32 | - * |
|
| 33 | - * @param integer $perPage |
|
| 34 | - * @return Collection |
|
| 35 | - */ |
|
| 36 | - public function unread($perPage) |
|
| 37 | - { |
|
| 38 | - return \Auth::user()->unreadNotifications()->paginate($perPage); |
|
| 39 | - } |
|
| 30 | + /** |
|
| 31 | + * Retrieve unread notifications of the logged in user. |
|
| 32 | + * |
|
| 33 | + * @param integer $perPage |
|
| 34 | + * @return Collection |
|
| 35 | + */ |
|
| 36 | + public function unread($perPage) |
|
| 37 | + { |
|
| 38 | + return \Auth::user()->unreadNotifications()->paginate($perPage); |
|
| 39 | + } |
|
| 40 | 40 | |
| 41 | - /** |
|
| 42 | - * Mark the notification as read. |
|
| 43 | - * |
|
| 44 | - * @param integer $id |
|
| 45 | - * @return object |
|
| 46 | - */ |
|
| 47 | - public function markAsRead($id) |
|
| 48 | - { |
|
| 49 | - if ($notification = \Auth::user()->unreadNotifications()->where('id', $id)->first()) { |
|
| 50 | - $notification->markAsRead(); |
|
| 51 | - } |
|
| 52 | - } |
|
| 41 | + /** |
|
| 42 | + * Mark the notification as read. |
|
| 43 | + * |
|
| 44 | + * @param integer $id |
|
| 45 | + * @return object |
|
| 46 | + */ |
|
| 47 | + public function markAsRead($id) |
|
| 48 | + { |
|
| 49 | + if ($notification = \Auth::user()->unreadNotifications()->where('id', $id)->first()) { |
|
| 50 | + $notification->markAsRead(); |
|
| 51 | + } |
|
| 52 | + } |
|
| 53 | 53 | |
| 54 | - /** |
|
| 55 | - * Mark all notifications as read. |
|
| 56 | - * |
|
| 57 | - * @return void |
|
| 58 | - */ |
|
| 59 | - public function markAllAsRead() |
|
| 60 | - { |
|
| 61 | - \Auth::user()->unreadNotifications()->update(['read_at' => now()]); |
|
| 62 | - } |
|
| 54 | + /** |
|
| 55 | + * Mark all notifications as read. |
|
| 56 | + * |
|
| 57 | + * @return void |
|
| 58 | + */ |
|
| 59 | + public function markAllAsRead() |
|
| 60 | + { |
|
| 61 | + \Auth::user()->unreadNotifications()->update(['read_at' => now()]); |
|
| 62 | + } |
|
| 63 | 63 | |
| 64 | - /** |
|
| 65 | - * Notify th given user with the given notification. |
|
| 66 | - * |
|
| 67 | - * @param collection $users |
|
| 68 | - * @param string $notification |
|
| 69 | - * @param object $notificationData |
|
| 70 | - * @return void |
|
| 71 | - */ |
|
| 72 | - public function notify($users, $notification, $notificationData = false) |
|
| 73 | - { |
|
| 74 | - $notification = 'App\Modules\Notifications\Notifications\\'.$notification; |
|
| 75 | - \Notification::send($users, new $notification($notificationData)); |
|
| 76 | - } |
|
| 64 | + /** |
|
| 65 | + * Notify th given user with the given notification. |
|
| 66 | + * |
|
| 67 | + * @param collection $users |
|
| 68 | + * @param string $notification |
|
| 69 | + * @param object $notificationData |
|
| 70 | + * @return void |
|
| 71 | + */ |
|
| 72 | + public function notify($users, $notification, $notificationData = false) |
|
| 73 | + { |
|
| 74 | + $notification = 'App\Modules\Notifications\Notifications\\'.$notification; |
|
| 75 | + \Notification::send($users, new $notification($notificationData)); |
|
| 76 | + } |
|
| 77 | 77 | } |
@@ -13,8 +13,8 @@ |
||
| 13 | 13 | |
| 14 | 14 | Route::group(['prefix' => 'notifications'], function () { |
| 15 | 15 | |
| 16 | - Route::get('/', 'NotificationController@index'); |
|
| 17 | - Route::get('unread', 'NotificationController@unread'); |
|
| 18 | - Route::get('read/{id}', 'NotificationController@markAsRead'); |
|
| 19 | - Route::get('read/all', 'NotificationController@markAllAsRead'); |
|
| 16 | + Route::get('/', 'NotificationController@index'); |
|
| 17 | + Route::get('unread', 'NotificationController@unread'); |
|
| 18 | + Route::get('read/{id}', 'NotificationController@markAsRead'); |
|
| 19 | + Route::get('read/all', 'NotificationController@markAllAsRead'); |
|
| 20 | 20 | }); |
@@ -6,27 +6,27 @@ |
||
| 6 | 6 | |
| 7 | 7 | class ModuleServiceProvider extends ServiceProvider |
| 8 | 8 | { |
| 9 | - /** |
|
| 10 | - * Bootstrap the module services. |
|
| 11 | - * |
|
| 12 | - * @return void |
|
| 13 | - */ |
|
| 14 | - public function boot() |
|
| 15 | - { |
|
| 16 | - $this->loadTranslationsFrom(__DIR__.'/../Resources/Lang', 'notifications'); |
|
| 17 | - $this->loadViewsFrom(__DIR__.'/../Resources/Views', 'notifications'); |
|
| 9 | + /** |
|
| 10 | + * Bootstrap the module services. |
|
| 11 | + * |
|
| 12 | + * @return void |
|
| 13 | + */ |
|
| 14 | + public function boot() |
|
| 15 | + { |
|
| 16 | + $this->loadTranslationsFrom(__DIR__.'/../Resources/Lang', 'notifications'); |
|
| 17 | + $this->loadViewsFrom(__DIR__.'/../Resources/Views', 'notifications'); |
|
| 18 | 18 | |
| 19 | - $this->loadMigrationsFrom(module_path('notifications', 'Database/Migrations', 'app')); |
|
| 20 | - $this->loadFactoriesFrom(module_path('notifications', 'Database/Factories', 'app')); |
|
| 21 | - } |
|
| 19 | + $this->loadMigrationsFrom(module_path('notifications', 'Database/Migrations', 'app')); |
|
| 20 | + $this->loadFactoriesFrom(module_path('notifications', 'Database/Factories', 'app')); |
|
| 21 | + } |
|
| 22 | 22 | |
| 23 | - /** |
|
| 24 | - * Register the module services. |
|
| 25 | - * |
|
| 26 | - * @return void |
|
| 27 | - */ |
|
| 28 | - public function register() |
|
| 29 | - { |
|
| 30 | - $this->app->register(RouteServiceProvider::class); |
|
| 31 | - } |
|
| 23 | + /** |
|
| 24 | + * Register the module services. |
|
| 25 | + * |
|
| 26 | + * @return void |
|
| 27 | + */ |
|
| 28 | + public function register() |
|
| 29 | + { |
|
| 30 | + $this->app->register(RouteServiceProvider::class); |
|
| 31 | + } |
|
| 32 | 32 | } |
@@ -6,25 +6,25 @@ |
||
| 6 | 6 | |
| 7 | 7 | class Notification extends JsonResource |
| 8 | 8 | { |
| 9 | - /** |
|
| 10 | - * Transform the resource into an array. |
|
| 11 | - * |
|
| 12 | - * @param Request $request |
|
| 13 | - * @return array |
|
| 14 | - */ |
|
| 15 | - public function toArray($request) |
|
| 16 | - { |
|
| 17 | - if (! $this->resource) { |
|
| 18 | - return []; |
|
| 19 | - } |
|
| 9 | + /** |
|
| 10 | + * Transform the resource into an array. |
|
| 11 | + * |
|
| 12 | + * @param Request $request |
|
| 13 | + * @return array |
|
| 14 | + */ |
|
| 15 | + public function toArray($request) |
|
| 16 | + { |
|
| 17 | + if (! $this->resource) { |
|
| 18 | + return []; |
|
| 19 | + } |
|
| 20 | 20 | |
| 21 | - return [ |
|
| 22 | - 'id' => $this->id, |
|
| 23 | - 'type' => $this->type, |
|
| 24 | - 'data' => $this->data, |
|
| 25 | - 'read_at' => $this->read_at, |
|
| 26 | - 'created_at' => $this->created_at, |
|
| 27 | - 'updated_at' => $this->updated_at, |
|
| 28 | - ]; |
|
| 29 | - } |
|
| 21 | + return [ |
|
| 22 | + 'id' => $this->id, |
|
| 23 | + 'type' => $this->type, |
|
| 24 | + 'data' => $this->data, |
|
| 25 | + 'read_at' => $this->read_at, |
|
| 26 | + 'created_at' => $this->created_at, |
|
| 27 | + 'updated_at' => $this->updated_at, |
|
| 28 | + ]; |
|
| 29 | + } |
|
| 30 | 30 | } |
@@ -4,26 +4,26 @@ |
||
| 4 | 4 | |
| 5 | 5 | class Core implements BaseFactoryInterface |
| 6 | 6 | { |
| 7 | - /** |
|
| 8 | - * Construct the repository class name based on |
|
| 9 | - * the method name called, search in the |
|
| 10 | - * given namespaces for the class and |
|
| 11 | - * return an instance. |
|
| 12 | - * |
|
| 13 | - * @param string $name the called method name |
|
| 14 | - * @param array $arguments the method arguments |
|
| 15 | - * @return object |
|
| 16 | - */ |
|
| 17 | - public function __call($name, $arguments) |
|
| 18 | - { |
|
| 19 | - foreach (\Module::all() as $module) { |
|
| 20 | - $nameSpace = 'App\\Modules\\' . $module['basename'] ; |
|
| 21 | - $model = ucfirst(\Str::singular($name)); |
|
| 22 | - $class = $nameSpace . '\\Repositories\\' . $model . 'Repository'; |
|
| 7 | + /** |
|
| 8 | + * Construct the repository class name based on |
|
| 9 | + * the method name called, search in the |
|
| 10 | + * given namespaces for the class and |
|
| 11 | + * return an instance. |
|
| 12 | + * |
|
| 13 | + * @param string $name the called method name |
|
| 14 | + * @param array $arguments the method arguments |
|
| 15 | + * @return object |
|
| 16 | + */ |
|
| 17 | + public function __call($name, $arguments) |
|
| 18 | + { |
|
| 19 | + foreach (\Module::all() as $module) { |
|
| 20 | + $nameSpace = 'App\\Modules\\' . $module['basename'] ; |
|
| 21 | + $model = ucfirst(\Str::singular($name)); |
|
| 22 | + $class = $nameSpace . '\\Repositories\\' . $model . 'Repository'; |
|
| 23 | 23 | |
| 24 | - if (class_exists($class)) { |
|
| 25 | - return \App::make($class); |
|
| 26 | - } |
|
| 27 | - } |
|
| 28 | - } |
|
| 24 | + if (class_exists($class)) { |
|
| 25 | + return \App::make($class); |
|
| 26 | + } |
|
| 27 | + } |
|
| 28 | + } |
|
| 29 | 29 | } |
@@ -6,53 +6,53 @@ |
||
| 6 | 6 | |
| 7 | 7 | class ModuleServiceProvider extends ServiceProvider |
| 8 | 8 | { |
| 9 | - /** |
|
| 10 | - * Bootstrap the module services. |
|
| 11 | - * |
|
| 12 | - * @return void |
|
| 13 | - */ |
|
| 14 | - public function boot() |
|
| 15 | - { |
|
| 16 | - $this->loadTranslationsFrom(__DIR__.'/../Resources/Lang', 'core'); |
|
| 17 | - $this->loadViewsFrom(__DIR__.'/../Resources/Views', 'core'); |
|
| 18 | - |
|
| 19 | - $this->loadMigrationsFrom(module_path('core', 'Database/Migrations', 'app')); |
|
| 20 | - $this->loadFactoriesFrom(module_path('core', 'Database/Factories', 'app')); |
|
| 21 | - } |
|
| 22 | - |
|
| 23 | - /** |
|
| 24 | - * Register the module services. |
|
| 25 | - * |
|
| 26 | - * @return void |
|
| 27 | - */ |
|
| 28 | - public function register() |
|
| 29 | - { |
|
| 30 | - //Bind Core Facade to the Service Container |
|
| 31 | - $this->app->singleton('Core', function () { |
|
| 32 | - return new \App\Modules\Core\Core; |
|
| 33 | - }); |
|
| 34 | - |
|
| 35 | - //Bind ErrorHandler Facade to the Service Container |
|
| 36 | - $this->app->singleton('ErrorHandler', function () { |
|
| 37 | - return new \App\Modules\Core\Utl\ErrorHandler; |
|
| 38 | - }); |
|
| 39 | - |
|
| 40 | - //Bind CoreConfig Facade to the Service Container |
|
| 41 | - $this->app->singleton('CoreConfig', function () { |
|
| 42 | - return new \App\Modules\Core\Utl\CoreConfig; |
|
| 43 | - }); |
|
| 44 | - |
|
| 45 | - //Bind Media Facade to the Service Container |
|
| 46 | - $this->app->singleton('Media', function () { |
|
| 47 | - return new \App\Modules\Core\Utl\Media; |
|
| 48 | - }); |
|
| 49 | - |
|
| 50 | - //Bind ApiConsumer Facade to the Service Container |
|
| 51 | - $this->app->singleton('ApiConsumer', function () { |
|
| 52 | - $app = app(); |
|
| 53 | - return new \App\Modules\Core\Utl\ApiConsumer($app, $app['request'], $app['router']); |
|
| 54 | - }); |
|
| 9 | + /** |
|
| 10 | + * Bootstrap the module services. |
|
| 11 | + * |
|
| 12 | + * @return void |
|
| 13 | + */ |
|
| 14 | + public function boot() |
|
| 15 | + { |
|
| 16 | + $this->loadTranslationsFrom(__DIR__.'/../Resources/Lang', 'core'); |
|
| 17 | + $this->loadViewsFrom(__DIR__.'/../Resources/Views', 'core'); |
|
| 18 | + |
|
| 19 | + $this->loadMigrationsFrom(module_path('core', 'Database/Migrations', 'app')); |
|
| 20 | + $this->loadFactoriesFrom(module_path('core', 'Database/Factories', 'app')); |
|
| 21 | + } |
|
| 22 | + |
|
| 23 | + /** |
|
| 24 | + * Register the module services. |
|
| 25 | + * |
|
| 26 | + * @return void |
|
| 27 | + */ |
|
| 28 | + public function register() |
|
| 29 | + { |
|
| 30 | + //Bind Core Facade to the Service Container |
|
| 31 | + $this->app->singleton('Core', function () { |
|
| 32 | + return new \App\Modules\Core\Core; |
|
| 33 | + }); |
|
| 34 | + |
|
| 35 | + //Bind ErrorHandler Facade to the Service Container |
|
| 36 | + $this->app->singleton('ErrorHandler', function () { |
|
| 37 | + return new \App\Modules\Core\Utl\ErrorHandler; |
|
| 38 | + }); |
|
| 39 | + |
|
| 40 | + //Bind CoreConfig Facade to the Service Container |
|
| 41 | + $this->app->singleton('CoreConfig', function () { |
|
| 42 | + return new \App\Modules\Core\Utl\CoreConfig; |
|
| 43 | + }); |
|
| 44 | + |
|
| 45 | + //Bind Media Facade to the Service Container |
|
| 46 | + $this->app->singleton('Media', function () { |
|
| 47 | + return new \App\Modules\Core\Utl\Media; |
|
| 48 | + }); |
|
| 49 | + |
|
| 50 | + //Bind ApiConsumer Facade to the Service Container |
|
| 51 | + $this->app->singleton('ApiConsumer', function () { |
|
| 52 | + $app = app(); |
|
| 53 | + return new \App\Modules\Core\Utl\ApiConsumer($app, $app['request'], $app['router']); |
|
| 54 | + }); |
|
| 55 | 55 | |
| 56 | - $this->app->register(RouteServiceProvider::class); |
|
| 57 | - } |
|
| 56 | + $this->app->register(RouteServiceProvider::class); |
|
| 57 | + } |
|
| 58 | 58 | } |