@@ -2,7 +2,7 @@ discard block |
||
| 2 | 2 | |
| 3 | 3 | return [ |
| 4 | 4 | |
| 5 | - /* |
|
| 5 | + /* |
|
| 6 | 6 | |-------------------------------------------------------------------------- |
| 7 | 7 | | Validation Language Lines |
| 8 | 8 | |-------------------------------------------------------------------------- |
@@ -13,74 +13,74 @@ discard block |
||
| 13 | 13 | | |
| 14 | 14 | */ |
| 15 | 15 | |
| 16 | - 'accepted' => 'The :attribute must be accepted.', |
|
| 17 | - 'active_url' => 'The :attribute is not a valid URL.', |
|
| 18 | - 'after' => 'The :attribute must be a date after :date.', |
|
| 19 | - 'alpha' => 'The :attribute may only contain letters.', |
|
| 20 | - 'alpha_dash' => 'The :attribute may only contain letters, numbers, and dashes.', |
|
| 21 | - 'alpha_num' => 'The :attribute may only contain letters and numbers.', |
|
| 22 | - 'array' => 'The :attribute must be an array.', |
|
| 23 | - 'before' => 'The :attribute must be a date before :date.', |
|
| 24 | - 'between' => [ |
|
| 25 | - 'numeric' => 'The :attribute must be between :min and :max.', |
|
| 26 | - 'file' => 'The :attribute must be between :min and :max kilobytes.', |
|
| 27 | - 'string' => 'The :attribute must be between :min and :max characters.', |
|
| 28 | - 'array' => 'The :attribute must have between :min and :max items.', |
|
| 29 | - ], |
|
| 30 | - 'boolean' => 'The :attribute field must be true or false.', |
|
| 31 | - 'confirmed' => 'The :attribute confirmation does not match.', |
|
| 32 | - 'date' => 'The :attribute is not a valid date.', |
|
| 33 | - 'date_format' => 'The :attribute does not match the format :format.', |
|
| 34 | - 'different' => 'The :attribute and :other must be different.', |
|
| 35 | - 'digits' => 'The :attribute must be :digits digits.', |
|
| 36 | - 'digits_between' => 'The :attribute must be between :min and :max digits.', |
|
| 37 | - 'distinct' => 'The :attribute field has a duplicate value.', |
|
| 38 | - 'email' => 'The :attribute must be a valid email address.', |
|
| 39 | - 'exists' => 'The selected :attribute is invalid.', |
|
| 40 | - 'filled' => 'The :attribute field is required.', |
|
| 41 | - 'image' => 'The :attribute must be an image.', |
|
| 42 | - 'in' => 'The selected :attribute is invalid.', |
|
| 43 | - 'in_array' => 'The :attribute field does not exist in :other.', |
|
| 44 | - 'integer' => 'The :attribute must be an integer.', |
|
| 45 | - 'ip' => 'The :attribute must be a valid IP address.', |
|
| 46 | - 'json' => 'The :attribute must be a valid JSON string.', |
|
| 47 | - 'max' => [ |
|
| 48 | - 'numeric' => 'The :attribute may not be greater than :max.', |
|
| 49 | - 'file' => 'The :attribute may not be greater than :max kilobytes.', |
|
| 50 | - 'string' => 'The :attribute may not be greater than :max characters.', |
|
| 51 | - 'array' => 'The :attribute may not have more than :max items.', |
|
| 52 | - ], |
|
| 53 | - 'mimes' => 'The :attribute must be a file of type: :values.', |
|
| 54 | - 'min' => [ |
|
| 55 | - 'numeric' => 'The :attribute must be at least :min.', |
|
| 56 | - 'file' => 'The :attribute must be at least :min kilobytes.', |
|
| 57 | - 'string' => 'The :attribute must be at least :min characters.', |
|
| 58 | - 'array' => 'The :attribute must have at least :min items.', |
|
| 59 | - ], |
|
| 60 | - 'not_in' => 'The selected :attribute is invalid.', |
|
| 61 | - 'numeric' => 'The :attribute must be a number.', |
|
| 62 | - 'present' => 'The :attribute field must be present.', |
|
| 63 | - 'regex' => 'The :attribute format is invalid.', |
|
| 64 | - 'required' => 'The :attribute field is required.', |
|
| 65 | - 'required_if' => 'The :attribute field is required when :other is :value.', |
|
| 66 | - 'required_unless' => 'The :attribute field is required unless :other is in :values.', |
|
| 67 | - 'required_with' => 'The :attribute field is required when :values is present.', |
|
| 68 | - 'required_with_all' => 'The :attribute field is required when :values is present.', |
|
| 69 | - 'required_without' => 'The :attribute field is required when :values is not present.', |
|
| 70 | - 'required_without_all' => 'The :attribute field is required when none of :values are present.', |
|
| 71 | - 'same' => 'The :attribute and :other must match.', |
|
| 72 | - 'size' => [ |
|
| 73 | - 'numeric' => 'The :attribute must be :size.', |
|
| 74 | - 'file' => 'The :attribute must be :size kilobytes.', |
|
| 75 | - 'string' => 'The :attribute must be :size characters.', |
|
| 76 | - 'array' => 'The :attribute must contain :size items.', |
|
| 77 | - ], |
|
| 78 | - 'string' => 'The :attribute must be a string.', |
|
| 79 | - 'timezone' => 'The :attribute must be a valid zone.', |
|
| 80 | - 'unique' => 'The :attribute has already been taken.', |
|
| 81 | - 'url' => 'The :attribute format is invalid.', |
|
| 16 | + 'accepted' => 'The :attribute must be accepted.', |
|
| 17 | + 'active_url' => 'The :attribute is not a valid URL.', |
|
| 18 | + 'after' => 'The :attribute must be a date after :date.', |
|
| 19 | + 'alpha' => 'The :attribute may only contain letters.', |
|
| 20 | + 'alpha_dash' => 'The :attribute may only contain letters, numbers, and dashes.', |
|
| 21 | + 'alpha_num' => 'The :attribute may only contain letters and numbers.', |
|
| 22 | + 'array' => 'The :attribute must be an array.', |
|
| 23 | + 'before' => 'The :attribute must be a date before :date.', |
|
| 24 | + 'between' => [ |
|
| 25 | + 'numeric' => 'The :attribute must be between :min and :max.', |
|
| 26 | + 'file' => 'The :attribute must be between :min and :max kilobytes.', |
|
| 27 | + 'string' => 'The :attribute must be between :min and :max characters.', |
|
| 28 | + 'array' => 'The :attribute must have between :min and :max items.', |
|
| 29 | + ], |
|
| 30 | + 'boolean' => 'The :attribute field must be true or false.', |
|
| 31 | + 'confirmed' => 'The :attribute confirmation does not match.', |
|
| 32 | + 'date' => 'The :attribute is not a valid date.', |
|
| 33 | + 'date_format' => 'The :attribute does not match the format :format.', |
|
| 34 | + 'different' => 'The :attribute and :other must be different.', |
|
| 35 | + 'digits' => 'The :attribute must be :digits digits.', |
|
| 36 | + 'digits_between' => 'The :attribute must be between :min and :max digits.', |
|
| 37 | + 'distinct' => 'The :attribute field has a duplicate value.', |
|
| 38 | + 'email' => 'The :attribute must be a valid email address.', |
|
| 39 | + 'exists' => 'The selected :attribute is invalid.', |
|
| 40 | + 'filled' => 'The :attribute field is required.', |
|
| 41 | + 'image' => 'The :attribute must be an image.', |
|
| 42 | + 'in' => 'The selected :attribute is invalid.', |
|
| 43 | + 'in_array' => 'The :attribute field does not exist in :other.', |
|
| 44 | + 'integer' => 'The :attribute must be an integer.', |
|
| 45 | + 'ip' => 'The :attribute must be a valid IP address.', |
|
| 46 | + 'json' => 'The :attribute must be a valid JSON string.', |
|
| 47 | + 'max' => [ |
|
| 48 | + 'numeric' => 'The :attribute may not be greater than :max.', |
|
| 49 | + 'file' => 'The :attribute may not be greater than :max kilobytes.', |
|
| 50 | + 'string' => 'The :attribute may not be greater than :max characters.', |
|
| 51 | + 'array' => 'The :attribute may not have more than :max items.', |
|
| 52 | + ], |
|
| 53 | + 'mimes' => 'The :attribute must be a file of type: :values.', |
|
| 54 | + 'min' => [ |
|
| 55 | + 'numeric' => 'The :attribute must be at least :min.', |
|
| 56 | + 'file' => 'The :attribute must be at least :min kilobytes.', |
|
| 57 | + 'string' => 'The :attribute must be at least :min characters.', |
|
| 58 | + 'array' => 'The :attribute must have at least :min items.', |
|
| 59 | + ], |
|
| 60 | + 'not_in' => 'The selected :attribute is invalid.', |
|
| 61 | + 'numeric' => 'The :attribute must be a number.', |
|
| 62 | + 'present' => 'The :attribute field must be present.', |
|
| 63 | + 'regex' => 'The :attribute format is invalid.', |
|
| 64 | + 'required' => 'The :attribute field is required.', |
|
| 65 | + 'required_if' => 'The :attribute field is required when :other is :value.', |
|
| 66 | + 'required_unless' => 'The :attribute field is required unless :other is in :values.', |
|
| 67 | + 'required_with' => 'The :attribute field is required when :values is present.', |
|
| 68 | + 'required_with_all' => 'The :attribute field is required when :values is present.', |
|
| 69 | + 'required_without' => 'The :attribute field is required when :values is not present.', |
|
| 70 | + 'required_without_all' => 'The :attribute field is required when none of :values are present.', |
|
| 71 | + 'same' => 'The :attribute and :other must match.', |
|
| 72 | + 'size' => [ |
|
| 73 | + 'numeric' => 'The :attribute must be :size.', |
|
| 74 | + 'file' => 'The :attribute must be :size kilobytes.', |
|
| 75 | + 'string' => 'The :attribute must be :size characters.', |
|
| 76 | + 'array' => 'The :attribute must contain :size items.', |
|
| 77 | + ], |
|
| 78 | + 'string' => 'The :attribute must be a string.', |
|
| 79 | + 'timezone' => 'The :attribute must be a valid zone.', |
|
| 80 | + 'unique' => 'The :attribute has already been taken.', |
|
| 81 | + 'url' => 'The :attribute format is invalid.', |
|
| 82 | 82 | |
| 83 | - /* |
|
| 83 | + /* |
|
| 84 | 84 | |-------------------------------------------------------------------------- |
| 85 | 85 | | Custom Validation Language Lines |
| 86 | 86 | |-------------------------------------------------------------------------- |
@@ -91,13 +91,13 @@ discard block |
||
| 91 | 91 | | |
| 92 | 92 | */ |
| 93 | 93 | |
| 94 | - 'custom' => [ |
|
| 95 | - 'attribute-name' => [ |
|
| 96 | - 'rule-name' => 'custom-message', |
|
| 97 | - ], |
|
| 98 | - ], |
|
| 94 | + 'custom' => [ |
|
| 95 | + 'attribute-name' => [ |
|
| 96 | + 'rule-name' => 'custom-message', |
|
| 97 | + ], |
|
| 98 | + ], |
|
| 99 | 99 | |
| 100 | - /* |
|
| 100 | + /* |
|
| 101 | 101 | |-------------------------------------------------------------------------- |
| 102 | 102 | | Custom Validation Attributes |
| 103 | 103 | |-------------------------------------------------------------------------- |
@@ -108,6 +108,6 @@ discard block |
||
| 108 | 108 | | |
| 109 | 109 | */ |
| 110 | 110 | |
| 111 | - 'attributes' => [], |
|
| 111 | + 'attributes' => [], |
|
| 112 | 112 | |
| 113 | 113 | ]; |
@@ -2,7 +2,7 @@ discard block |
||
| 2 | 2 | |
| 3 | 3 | return [ |
| 4 | 4 | |
| 5 | - /* |
|
| 5 | + /* |
|
| 6 | 6 | |-------------------------------------------------------------------------- |
| 7 | 7 | | Password Reset Language Lines |
| 8 | 8 | |-------------------------------------------------------------------------- |
@@ -13,10 +13,10 @@ discard block |
||
| 13 | 13 | | |
| 14 | 14 | */ |
| 15 | 15 | |
| 16 | - 'password' => 'Passwords must be at least six characters and match the confirmation.', |
|
| 17 | - 'reset' => 'Your password has been reset!', |
|
| 18 | - 'sent' => 'We have e-mailed your password reset link!', |
|
| 19 | - 'token' => 'This password reset token is invalid.', |
|
| 20 | - 'user' => "We can't find a user with that e-mail address.", |
|
| 16 | + 'password' => 'Passwords must be at least six characters and match the confirmation.', |
|
| 17 | + 'reset' => 'Your password has been reset!', |
|
| 18 | + 'sent' => 'We have e-mailed your password reset link!', |
|
| 19 | + 'token' => 'This password reset token is invalid.', |
|
| 20 | + 'user' => "We can't find a user with that e-mail address.", |
|
| 21 | 21 | |
| 22 | 22 | ]; |
@@ -2,7 +2,7 @@ discard block |
||
| 2 | 2 | |
| 3 | 3 | return [ |
| 4 | 4 | |
| 5 | - /* |
|
| 5 | + /* |
|
| 6 | 6 | |-------------------------------------------------------------------------- |
| 7 | 7 | | Pagination Language Lines |
| 8 | 8 | |-------------------------------------------------------------------------- |
@@ -13,7 +13,7 @@ discard block |
||
| 13 | 13 | | |
| 14 | 14 | */ |
| 15 | 15 | |
| 16 | - 'previous' => '« Previous', |
|
| 17 | - 'next' => 'Next »', |
|
| 16 | + 'previous' => '« Previous', |
|
| 17 | + 'next' => 'Next »', |
|
| 18 | 18 | |
| 19 | 19 | ]; |
@@ -5,57 +5,57 @@ |
||
| 5 | 5 | */ |
| 6 | 6 | class AclUserObserver { |
| 7 | 7 | |
| 8 | - public function saving($model) |
|
| 9 | - { |
|
| 10 | - // |
|
| 11 | - } |
|
| 12 | - |
|
| 13 | - public function saved($model) |
|
| 14 | - { |
|
| 15 | - // |
|
| 16 | - } |
|
| 17 | - |
|
| 18 | - public function creating($model) |
|
| 19 | - { |
|
| 20 | - // |
|
| 21 | - } |
|
| 22 | - |
|
| 23 | - public function created($model) |
|
| 24 | - { |
|
| 25 | - // |
|
| 26 | - } |
|
| 27 | - |
|
| 28 | - public function updating($model) |
|
| 29 | - { |
|
| 30 | - if ($model->password) |
|
| 31 | - { |
|
| 32 | - $model->last_change_password = \Carbon\Carbon::now()->toDateTimeString(); |
|
| 33 | - } |
|
| 34 | - } |
|
| 35 | - |
|
| 36 | - public function updated($model) |
|
| 37 | - { |
|
| 38 | - // |
|
| 39 | - } |
|
| 40 | - |
|
| 41 | - /** |
|
| 42 | - * Soft delete user logs. |
|
| 43 | - * |
|
| 44 | - * @param object $model the delted model. |
|
| 45 | - * @return void |
|
| 46 | - */ |
|
| 47 | - public function deleting($model) |
|
| 48 | - { |
|
| 49 | - if ($model->getOriginal('id') == \JWTAuth::parseToken()->authenticate()->id) |
|
| 50 | - { |
|
| 51 | - \ErrorHandler::noPermissions(); |
|
| 52 | - } |
|
| 53 | - $model->logs()->delete(); |
|
| 54 | - } |
|
| 55 | - |
|
| 56 | - public function deleted($model) |
|
| 57 | - { |
|
| 58 | - // |
|
| 59 | - } |
|
| 8 | + public function saving($model) |
|
| 9 | + { |
|
| 10 | + // |
|
| 11 | + } |
|
| 12 | + |
|
| 13 | + public function saved($model) |
|
| 14 | + { |
|
| 15 | + // |
|
| 16 | + } |
|
| 17 | + |
|
| 18 | + public function creating($model) |
|
| 19 | + { |
|
| 20 | + // |
|
| 21 | + } |
|
| 22 | + |
|
| 23 | + public function created($model) |
|
| 24 | + { |
|
| 25 | + // |
|
| 26 | + } |
|
| 27 | + |
|
| 28 | + public function updating($model) |
|
| 29 | + { |
|
| 30 | + if ($model->password) |
|
| 31 | + { |
|
| 32 | + $model->last_change_password = \Carbon\Carbon::now()->toDateTimeString(); |
|
| 33 | + } |
|
| 34 | + } |
|
| 35 | + |
|
| 36 | + public function updated($model) |
|
| 37 | + { |
|
| 38 | + // |
|
| 39 | + } |
|
| 40 | + |
|
| 41 | + /** |
|
| 42 | + * Soft delete user logs. |
|
| 43 | + * |
|
| 44 | + * @param object $model the delted model. |
|
| 45 | + * @return void |
|
| 46 | + */ |
|
| 47 | + public function deleting($model) |
|
| 48 | + { |
|
| 49 | + if ($model->getOriginal('id') == \JWTAuth::parseToken()->authenticate()->id) |
|
| 50 | + { |
|
| 51 | + \ErrorHandler::noPermissions(); |
|
| 52 | + } |
|
| 53 | + $model->logs()->delete(); |
|
| 54 | + } |
|
| 55 | + |
|
| 56 | + public function deleted($model) |
|
| 57 | + { |
|
| 58 | + // |
|
| 59 | + } |
|
| 60 | 60 | |
| 61 | 61 | } |
| 62 | 62 | \ No newline at end of file |
@@ -7,23 +7,23 @@ |
||
| 7 | 7 | class ModuleServiceProvider extends ServiceProvider |
| 8 | 8 | { |
| 9 | 9 | /** |
| 10 | - * Bootstrap the module services. |
|
| 11 | - * |
|
| 12 | - * @return void |
|
| 13 | - */ |
|
| 14 | - public function boot() |
|
| 15 | - { |
|
| 16 | - $this->loadTranslationsFrom(__DIR__.'/../Resources/Lang', 'catalog'); |
|
| 17 | - $this->loadViewsFrom(__DIR__.'/../Resources/Views', 'catalog'); |
|
| 18 | - } |
|
| 10 | + * Bootstrap the module services. |
|
| 11 | + * |
|
| 12 | + * @return void |
|
| 13 | + */ |
|
| 14 | + public function boot() |
|
| 15 | + { |
|
| 16 | + $this->loadTranslationsFrom(__DIR__.'/../Resources/Lang', 'catalog'); |
|
| 17 | + $this->loadViewsFrom(__DIR__.'/../Resources/Views', 'catalog'); |
|
| 18 | + } |
|
| 19 | 19 | |
| 20 | - /** |
|
| 21 | - * Register the module services. |
|
| 22 | - * |
|
| 23 | - * @return void |
|
| 24 | - */ |
|
| 25 | - public function register() |
|
| 26 | - { |
|
| 27 | - $this->app->register(RouteServiceProvider::class); |
|
| 28 | - } |
|
| 20 | + /** |
|
| 21 | + * Register the module services. |
|
| 22 | + * |
|
| 23 | + * @return void |
|
| 24 | + */ |
|
| 25 | + public function register() |
|
| 26 | + { |
|
| 27 | + $this->app->register(RouteServiceProvider::class); |
|
| 28 | + } |
|
| 29 | 29 | } |
@@ -8,72 +8,72 @@ |
||
| 8 | 8 | class RouteServiceProvider extends ServiceProvider |
| 9 | 9 | { |
| 10 | 10 | /** |
| 11 | - * This namespace is applied to your controller routes. |
|
| 12 | - * |
|
| 13 | - * In addition, it is set as the URL generator's root namespace. |
|
| 14 | - * |
|
| 15 | - * @var string |
|
| 16 | - */ |
|
| 17 | - protected $namespace = 'App\Modules\V1\Notifications\Http\Controllers'; |
|
| 11 | + * This namespace is applied to your controller routes. |
|
| 12 | + * |
|
| 13 | + * In addition, it is set as the URL generator's root namespace. |
|
| 14 | + * |
|
| 15 | + * @var string |
|
| 16 | + */ |
|
| 17 | + protected $namespace = 'App\Modules\V1\Notifications\Http\Controllers'; |
|
| 18 | 18 | |
| 19 | - /** |
|
| 20 | - * Define your route model bindings, pattern filters, etc. |
|
| 21 | - * |
|
| 22 | - * @return void |
|
| 23 | - */ |
|
| 24 | - public function boot() |
|
| 25 | - { |
|
| 26 | - // |
|
| 19 | + /** |
|
| 20 | + * Define your route model bindings, pattern filters, etc. |
|
| 21 | + * |
|
| 22 | + * @return void |
|
| 23 | + */ |
|
| 24 | + public function boot() |
|
| 25 | + { |
|
| 26 | + // |
|
| 27 | 27 | |
| 28 | - parent::boot(); |
|
| 29 | - } |
|
| 28 | + parent::boot(); |
|
| 29 | + } |
|
| 30 | 30 | |
| 31 | - /** |
|
| 32 | - * Define the routes for the module. |
|
| 33 | - * |
|
| 34 | - * @return void |
|
| 35 | - */ |
|
| 36 | - public function map() |
|
| 37 | - { |
|
| 38 | - $this->mapWebRoutes(); |
|
| 31 | + /** |
|
| 32 | + * Define the routes for the module. |
|
| 33 | + * |
|
| 34 | + * @return void |
|
| 35 | + */ |
|
| 36 | + public function map() |
|
| 37 | + { |
|
| 38 | + $this->mapWebRoutes(); |
|
| 39 | 39 | |
| 40 | - $this->mapApiRoutes(); |
|
| 40 | + $this->mapApiRoutes(); |
|
| 41 | 41 | |
| 42 | - // |
|
| 43 | - } |
|
| 42 | + // |
|
| 43 | + } |
|
| 44 | 44 | |
| 45 | - /** |
|
| 46 | - * Define the "web" routes for the module. |
|
| 47 | - * |
|
| 48 | - * These routes all receive session state, CSRF protection, etc. |
|
| 49 | - * |
|
| 50 | - * @return void |
|
| 51 | - */ |
|
| 52 | - protected function mapWebRoutes() |
|
| 53 | - { |
|
| 54 | - Route::group([ |
|
| 55 | - 'middleware' => 'web', |
|
| 56 | - 'namespace' => $this->namespace, |
|
| 57 | - ], function ($router) { |
|
| 58 | - require module_path('notifications', 'Routes/web.php'); |
|
| 59 | - }); |
|
| 60 | - } |
|
| 45 | + /** |
|
| 46 | + * Define the "web" routes for the module. |
|
| 47 | + * |
|
| 48 | + * These routes all receive session state, CSRF protection, etc. |
|
| 49 | + * |
|
| 50 | + * @return void |
|
| 51 | + */ |
|
| 52 | + protected function mapWebRoutes() |
|
| 53 | + { |
|
| 54 | + Route::group([ |
|
| 55 | + 'middleware' => 'web', |
|
| 56 | + 'namespace' => $this->namespace, |
|
| 57 | + ], function ($router) { |
|
| 58 | + require module_path('notifications', 'Routes/web.php'); |
|
| 59 | + }); |
|
| 60 | + } |
|
| 61 | 61 | |
| 62 | - /** |
|
| 63 | - * Define the "api" routes for the module. |
|
| 64 | - * |
|
| 65 | - * These routes are typically stateless. |
|
| 66 | - * |
|
| 67 | - * @return void |
|
| 68 | - */ |
|
| 69 | - protected function mapApiRoutes() |
|
| 70 | - { |
|
| 71 | - Route::group([ |
|
| 72 | - 'middleware' => 'api', |
|
| 73 | - 'namespace' => $this->namespace, |
|
| 74 | - 'prefix' => 'api', |
|
| 75 | - ], function ($router) { |
|
| 76 | - require module_path('notifications', 'Routes/api.php'); |
|
| 77 | - }); |
|
| 78 | - } |
|
| 62 | + /** |
|
| 63 | + * Define the "api" routes for the module. |
|
| 64 | + * |
|
| 65 | + * These routes are typically stateless. |
|
| 66 | + * |
|
| 67 | + * @return void |
|
| 68 | + */ |
|
| 69 | + protected function mapApiRoutes() |
|
| 70 | + { |
|
| 71 | + Route::group([ |
|
| 72 | + 'middleware' => 'api', |
|
| 73 | + 'namespace' => $this->namespace, |
|
| 74 | + 'prefix' => 'api', |
|
| 75 | + ], function ($router) { |
|
| 76 | + require module_path('notifications', 'Routes/api.php'); |
|
| 77 | + }); |
|
| 78 | + } |
|
| 79 | 79 | } |
@@ -13,111 +13,111 @@ |
||
| 13 | 13 | public function up() |
| 14 | 14 | { |
| 15 | 15 | /** |
| 16 | - * Insert the permissions related to this module. |
|
| 17 | - */ |
|
| 18 | - DB::table('permissions')->insert( |
|
| 19 | - [ |
|
| 20 | - /** |
|
| 21 | - * Users model permissions. |
|
| 22 | - */ |
|
| 23 | - [ |
|
| 24 | - 'name' => 'save', |
|
| 25 | - 'model' => 'settings', |
|
| 26 | - 'created_at' => \DB::raw('NOW()'), |
|
| 27 | - 'updated_at' => \DB::raw('NOW()') |
|
| 28 | - ], |
|
| 29 | - [ |
|
| 30 | - 'name' => 'find', |
|
| 31 | - 'model' => 'settings', |
|
| 32 | - 'created_at' => \DB::raw('NOW()'), |
|
| 33 | - 'updated_at' => \DB::raw('NOW()') |
|
| 34 | - ], |
|
| 35 | - [ |
|
| 36 | - 'name' => 'search', |
|
| 37 | - 'model' => 'settings', |
|
| 38 | - 'created_at' => \DB::raw('NOW()'), |
|
| 39 | - 'updated_at' => \DB::raw('NOW()') |
|
| 40 | - ], |
|
| 41 | - [ |
|
| 42 | - 'name' => 'list', |
|
| 43 | - 'model' => 'settings', |
|
| 44 | - 'created_at' => \DB::raw('NOW()'), |
|
| 45 | - 'updated_at' => \DB::raw('NOW()') |
|
| 46 | - ], |
|
| 47 | - [ |
|
| 48 | - 'name' => 'findby', |
|
| 49 | - 'model' => 'settings', |
|
| 50 | - 'created_at' => \DB::raw('NOW()'), |
|
| 51 | - 'updated_at' => \DB::raw('NOW()') |
|
| 52 | - ], |
|
| 53 | - [ |
|
| 54 | - 'name' => 'first', |
|
| 55 | - 'model' => 'settings', |
|
| 56 | - 'created_at' => \DB::raw('NOW()'), |
|
| 57 | - 'updated_at' => \DB::raw('NOW()') |
|
| 58 | - ], |
|
| 59 | - [ |
|
| 60 | - 'name' => 'paginate', |
|
| 61 | - 'model' => 'settings', |
|
| 62 | - 'created_at' => \DB::raw('NOW()'), |
|
| 63 | - 'updated_at' => \DB::raw('NOW()') |
|
| 64 | - ], |
|
| 65 | - [ |
|
| 66 | - 'name' => 'paginateby', |
|
| 67 | - 'model' => 'settings', |
|
| 68 | - 'created_at' => \DB::raw('NOW()'), |
|
| 69 | - 'updated_at' => \DB::raw('NOW()') |
|
| 70 | - ], |
|
| 16 | + * Insert the permissions related to this module. |
|
| 17 | + */ |
|
| 18 | + DB::table('permissions')->insert( |
|
| 19 | + [ |
|
| 20 | + /** |
|
| 21 | + * Users model permissions. |
|
| 22 | + */ |
|
| 23 | + [ |
|
| 24 | + 'name' => 'save', |
|
| 25 | + 'model' => 'settings', |
|
| 26 | + 'created_at' => \DB::raw('NOW()'), |
|
| 27 | + 'updated_at' => \DB::raw('NOW()') |
|
| 28 | + ], |
|
| 29 | + [ |
|
| 30 | + 'name' => 'find', |
|
| 31 | + 'model' => 'settings', |
|
| 32 | + 'created_at' => \DB::raw('NOW()'), |
|
| 33 | + 'updated_at' => \DB::raw('NOW()') |
|
| 34 | + ], |
|
| 35 | + [ |
|
| 36 | + 'name' => 'search', |
|
| 37 | + 'model' => 'settings', |
|
| 38 | + 'created_at' => \DB::raw('NOW()'), |
|
| 39 | + 'updated_at' => \DB::raw('NOW()') |
|
| 40 | + ], |
|
| 41 | + [ |
|
| 42 | + 'name' => 'list', |
|
| 43 | + 'model' => 'settings', |
|
| 44 | + 'created_at' => \DB::raw('NOW()'), |
|
| 45 | + 'updated_at' => \DB::raw('NOW()') |
|
| 46 | + ], |
|
| 47 | + [ |
|
| 48 | + 'name' => 'findby', |
|
| 49 | + 'model' => 'settings', |
|
| 50 | + 'created_at' => \DB::raw('NOW()'), |
|
| 51 | + 'updated_at' => \DB::raw('NOW()') |
|
| 52 | + ], |
|
| 53 | + [ |
|
| 54 | + 'name' => 'first', |
|
| 55 | + 'model' => 'settings', |
|
| 56 | + 'created_at' => \DB::raw('NOW()'), |
|
| 57 | + 'updated_at' => \DB::raw('NOW()') |
|
| 58 | + ], |
|
| 59 | + [ |
|
| 60 | + 'name' => 'paginate', |
|
| 61 | + 'model' => 'settings', |
|
| 62 | + 'created_at' => \DB::raw('NOW()'), |
|
| 63 | + 'updated_at' => \DB::raw('NOW()') |
|
| 64 | + ], |
|
| 65 | + [ |
|
| 66 | + 'name' => 'paginateby', |
|
| 67 | + 'model' => 'settings', |
|
| 68 | + 'created_at' => \DB::raw('NOW()'), |
|
| 69 | + 'updated_at' => \DB::raw('NOW()') |
|
| 70 | + ], |
|
| 71 | 71 | |
| 72 | - /** |
|
| 73 | - * Logs model permissions. |
|
| 74 | - */ |
|
| 75 | - [ |
|
| 76 | - 'name' => 'find', |
|
| 77 | - 'model' => 'logs', |
|
| 78 | - 'created_at' => \DB::raw('NOW()'), |
|
| 79 | - 'updated_at' => \DB::raw('NOW()') |
|
| 80 | - ], |
|
| 81 | - [ |
|
| 82 | - 'name' => 'search', |
|
| 83 | - 'model' => 'logs', |
|
| 84 | - 'created_at' => \DB::raw('NOW()'), |
|
| 85 | - 'updated_at' => \DB::raw('NOW()') |
|
| 86 | - ], |
|
| 87 | - [ |
|
| 88 | - 'name' => 'list', |
|
| 89 | - 'model' => 'logs', |
|
| 90 | - 'created_at' => \DB::raw('NOW()'), |
|
| 91 | - 'updated_at' => \DB::raw('NOW()') |
|
| 92 | - ], |
|
| 93 | - [ |
|
| 94 | - 'name' => 'findby', |
|
| 95 | - 'model' => 'logs', |
|
| 96 | - 'created_at' => \DB::raw('NOW()'), |
|
| 97 | - 'updated_at' => \DB::raw('NOW()') |
|
| 98 | - ], |
|
| 99 | - [ |
|
| 100 | - 'name' => 'first', |
|
| 101 | - 'model' => 'logs', |
|
| 102 | - 'created_at' => \DB::raw('NOW()'), |
|
| 103 | - 'updated_at' => \DB::raw('NOW()') |
|
| 104 | - ], |
|
| 105 | - [ |
|
| 106 | - 'name' => 'paginate', |
|
| 107 | - 'model' => 'logs', |
|
| 108 | - 'created_at' => \DB::raw('NOW()'), |
|
| 109 | - 'updated_at' => \DB::raw('NOW()') |
|
| 110 | - ], |
|
| 111 | - [ |
|
| 112 | - 'name' => 'paginateby', |
|
| 113 | - 'model' => 'logs', |
|
| 114 | - 'created_at' => \DB::raw('NOW()'), |
|
| 115 | - 'updated_at' => \DB::raw('NOW()') |
|
| 116 | - ], |
|
| 117 | - ] |
|
| 118 | - ); |
|
| 72 | + /** |
|
| 73 | + * Logs model permissions. |
|
| 74 | + */ |
|
| 75 | + [ |
|
| 76 | + 'name' => 'find', |
|
| 77 | + 'model' => 'logs', |
|
| 78 | + 'created_at' => \DB::raw('NOW()'), |
|
| 79 | + 'updated_at' => \DB::raw('NOW()') |
|
| 80 | + ], |
|
| 81 | + [ |
|
| 82 | + 'name' => 'search', |
|
| 83 | + 'model' => 'logs', |
|
| 84 | + 'created_at' => \DB::raw('NOW()'), |
|
| 85 | + 'updated_at' => \DB::raw('NOW()') |
|
| 86 | + ], |
|
| 87 | + [ |
|
| 88 | + 'name' => 'list', |
|
| 89 | + 'model' => 'logs', |
|
| 90 | + 'created_at' => \DB::raw('NOW()'), |
|
| 91 | + 'updated_at' => \DB::raw('NOW()') |
|
| 92 | + ], |
|
| 93 | + [ |
|
| 94 | + 'name' => 'findby', |
|
| 95 | + 'model' => 'logs', |
|
| 96 | + 'created_at' => \DB::raw('NOW()'), |
|
| 97 | + 'updated_at' => \DB::raw('NOW()') |
|
| 98 | + ], |
|
| 99 | + [ |
|
| 100 | + 'name' => 'first', |
|
| 101 | + 'model' => 'logs', |
|
| 102 | + 'created_at' => \DB::raw('NOW()'), |
|
| 103 | + 'updated_at' => \DB::raw('NOW()') |
|
| 104 | + ], |
|
| 105 | + [ |
|
| 106 | + 'name' => 'paginate', |
|
| 107 | + 'model' => 'logs', |
|
| 108 | + 'created_at' => \DB::raw('NOW()'), |
|
| 109 | + 'updated_at' => \DB::raw('NOW()') |
|
| 110 | + ], |
|
| 111 | + [ |
|
| 112 | + 'name' => 'paginateby', |
|
| 113 | + 'model' => 'logs', |
|
| 114 | + 'created_at' => \DB::raw('NOW()'), |
|
| 115 | + 'updated_at' => \DB::raw('NOW()') |
|
| 116 | + ], |
|
| 117 | + ] |
|
| 118 | + ); |
|
| 119 | 119 | |
| 120 | - /** |
|
| 120 | + /** |
|
| 121 | 121 | * Assign the permissions to the admin group. |
| 122 | 122 | */ |
| 123 | 123 | $permissionIds = DB::table('permissions')->whereIn('model', ['settings', 'logs'])->select('id')->pluck('id'); |
@@ -7,47 +7,47 @@ |
||
| 7 | 7 | class ModuleServiceProvider extends ServiceProvider |
| 8 | 8 | { |
| 9 | 9 | /** |
| 10 | - * Bootstrap the module services. |
|
| 11 | - * |
|
| 12 | - * @return void |
|
| 13 | - */ |
|
| 14 | - public function boot() |
|
| 15 | - { |
|
| 16 | - $this->loadTranslationsFrom(__DIR__.'/../Resources/Lang', 'catalog'); |
|
| 17 | - $this->loadViewsFrom(__DIR__.'/../Resources/Views', 'catalog'); |
|
| 18 | - } |
|
| 10 | + * Bootstrap the module services. |
|
| 11 | + * |
|
| 12 | + * @return void |
|
| 13 | + */ |
|
| 14 | + public function boot() |
|
| 15 | + { |
|
| 16 | + $this->loadTranslationsFrom(__DIR__.'/../Resources/Lang', 'catalog'); |
|
| 17 | + $this->loadViewsFrom(__DIR__.'/../Resources/Views', 'catalog'); |
|
| 18 | + } |
|
| 19 | 19 | |
| 20 | - /** |
|
| 21 | - * Register the module services. |
|
| 22 | - * |
|
| 23 | - * @return void |
|
| 24 | - */ |
|
| 25 | - public function register() |
|
| 26 | - { |
|
| 27 | - //Bind Core Facade to the IoC Container |
|
| 28 | - \App::bind('Core', function() |
|
| 29 | - { |
|
| 30 | - return new \App\Modules\V1\Core\Core; |
|
| 31 | - }); |
|
| 20 | + /** |
|
| 21 | + * Register the module services. |
|
| 22 | + * |
|
| 23 | + * @return void |
|
| 24 | + */ |
|
| 25 | + public function register() |
|
| 26 | + { |
|
| 27 | + //Bind Core Facade to the IoC Container |
|
| 28 | + \App::bind('Core', function() |
|
| 29 | + { |
|
| 30 | + return new \App\Modules\V1\Core\Core; |
|
| 31 | + }); |
|
| 32 | 32 | |
| 33 | - //Bind ErrorHandler Facade to the IoC Container |
|
| 34 | - \App::bind('ErrorHandler', function() |
|
| 35 | - { |
|
| 36 | - return new \App\Modules\V1\Core\Utl\ErrorHandler; |
|
| 37 | - }); |
|
| 33 | + //Bind ErrorHandler Facade to the IoC Container |
|
| 34 | + \App::bind('ErrorHandler', function() |
|
| 35 | + { |
|
| 36 | + return new \App\Modules\V1\Core\Utl\ErrorHandler; |
|
| 37 | + }); |
|
| 38 | 38 | |
| 39 | - //Bind CoreConfig Facade to the IoC Container |
|
| 40 | - \App::bind('CoreConfig', function() |
|
| 41 | - { |
|
| 42 | - return new \App\Modules\V1\Core\Utl\CoreConfig; |
|
| 43 | - }); |
|
| 39 | + //Bind CoreConfig Facade to the IoC Container |
|
| 40 | + \App::bind('CoreConfig', function() |
|
| 41 | + { |
|
| 42 | + return new \App\Modules\V1\Core\Utl\CoreConfig; |
|
| 43 | + }); |
|
| 44 | 44 | |
| 45 | - //Bind Logging Facade to the IoC Container |
|
| 46 | - \App::bind('Logging', function() |
|
| 47 | - { |
|
| 48 | - return new \App\Modules\V1\Core\Utl\Logging; |
|
| 49 | - }); |
|
| 45 | + //Bind Logging Facade to the IoC Container |
|
| 46 | + \App::bind('Logging', function() |
|
| 47 | + { |
|
| 48 | + return new \App\Modules\V1\Core\Utl\Logging; |
|
| 49 | + }); |
|
| 50 | 50 | |
| 51 | - $this->app->register(RouteServiceProvider::class); |
|
| 52 | - } |
|
| 51 | + $this->app->register(RouteServiceProvider::class); |
|
| 52 | + } |
|
| 53 | 53 | } |
@@ -8,72 +8,72 @@ |
||
| 8 | 8 | class RouteServiceProvider extends ServiceProvider |
| 9 | 9 | { |
| 10 | 10 | /** |
| 11 | - * This namespace is applied to your controller routes. |
|
| 12 | - * |
|
| 13 | - * In addition, it is set as the URL generator's root namespace. |
|
| 14 | - * |
|
| 15 | - * @var string |
|
| 16 | - */ |
|
| 17 | - protected $namespace = 'App\Modules\V1\Core\Http\Controllers'; |
|
| 11 | + * This namespace is applied to your controller routes. |
|
| 12 | + * |
|
| 13 | + * In addition, it is set as the URL generator's root namespace. |
|
| 14 | + * |
|
| 15 | + * @var string |
|
| 16 | + */ |
|
| 17 | + protected $namespace = 'App\Modules\V1\Core\Http\Controllers'; |
|
| 18 | 18 | |
| 19 | - /** |
|
| 20 | - * Define your route model bindings, pattern filters, etc. |
|
| 21 | - * |
|
| 22 | - * @return void |
|
| 23 | - */ |
|
| 24 | - public function boot() |
|
| 25 | - { |
|
| 26 | - // |
|
| 19 | + /** |
|
| 20 | + * Define your route model bindings, pattern filters, etc. |
|
| 21 | + * |
|
| 22 | + * @return void |
|
| 23 | + */ |
|
| 24 | + public function boot() |
|
| 25 | + { |
|
| 26 | + // |
|
| 27 | 27 | |
| 28 | - parent::boot(); |
|
| 29 | - } |
|
| 28 | + parent::boot(); |
|
| 29 | + } |
|
| 30 | 30 | |
| 31 | - /** |
|
| 32 | - * Define the routes for the module. |
|
| 33 | - * |
|
| 34 | - * @return void |
|
| 35 | - */ |
|
| 36 | - public function map() |
|
| 37 | - { |
|
| 38 | - $this->mapWebRoutes(); |
|
| 31 | + /** |
|
| 32 | + * Define the routes for the module. |
|
| 33 | + * |
|
| 34 | + * @return void |
|
| 35 | + */ |
|
| 36 | + public function map() |
|
| 37 | + { |
|
| 38 | + $this->mapWebRoutes(); |
|
| 39 | 39 | |
| 40 | - $this->mapApiRoutes(); |
|
| 40 | + $this->mapApiRoutes(); |
|
| 41 | 41 | |
| 42 | - // |
|
| 43 | - } |
|
| 42 | + // |
|
| 43 | + } |
|
| 44 | 44 | |
| 45 | - /** |
|
| 46 | - * Define the "web" routes for the module. |
|
| 47 | - * |
|
| 48 | - * These routes all receive session state, CSRF protection, etc. |
|
| 49 | - * |
|
| 50 | - * @return void |
|
| 51 | - */ |
|
| 52 | - protected function mapWebRoutes() |
|
| 53 | - { |
|
| 54 | - Route::group([ |
|
| 55 | - 'middleware' => 'web', |
|
| 56 | - 'namespace' => $this->namespace, |
|
| 57 | - ], function ($router) { |
|
| 58 | - require module_path('core', 'Routes/web.php'); |
|
| 59 | - }); |
|
| 60 | - } |
|
| 45 | + /** |
|
| 46 | + * Define the "web" routes for the module. |
|
| 47 | + * |
|
| 48 | + * These routes all receive session state, CSRF protection, etc. |
|
| 49 | + * |
|
| 50 | + * @return void |
|
| 51 | + */ |
|
| 52 | + protected function mapWebRoutes() |
|
| 53 | + { |
|
| 54 | + Route::group([ |
|
| 55 | + 'middleware' => 'web', |
|
| 56 | + 'namespace' => $this->namespace, |
|
| 57 | + ], function ($router) { |
|
| 58 | + require module_path('core', 'Routes/web.php'); |
|
| 59 | + }); |
|
| 60 | + } |
|
| 61 | 61 | |
| 62 | - /** |
|
| 63 | - * Define the "api" routes for the module. |
|
| 64 | - * |
|
| 65 | - * These routes are typically stateless. |
|
| 66 | - * |
|
| 67 | - * @return void |
|
| 68 | - */ |
|
| 69 | - protected function mapApiRoutes() |
|
| 70 | - { |
|
| 71 | - Route::group([ |
|
| 72 | - 'middleware' => 'api', |
|
| 73 | - 'namespace' => $this->namespace, |
|
| 74 | - 'prefix' => 'api', |
|
| 75 | - ], function ($router) { |
|
| 76 | - require module_path('core', 'Routes/api.php'); |
|
| 77 | - }); |
|
| 78 | - } |
|
| 62 | + /** |
|
| 63 | + * Define the "api" routes for the module. |
|
| 64 | + * |
|
| 65 | + * These routes are typically stateless. |
|
| 66 | + * |
|
| 67 | + * @return void |
|
| 68 | + */ |
|
| 69 | + protected function mapApiRoutes() |
|
| 70 | + { |
|
| 71 | + Route::group([ |
|
| 72 | + 'middleware' => 'api', |
|
| 73 | + 'namespace' => $this->namespace, |
|
| 74 | + 'prefix' => 'api', |
|
| 75 | + ], function ($router) { |
|
| 76 | + require module_path('core', 'Routes/api.php'); |
|
| 77 | + }); |
|
| 78 | + } |
|
| 79 | 79 | } |