@@ -2,7 +2,7 @@ discard block |
||
| 2 | 2 | |
| 3 | 3 | return [ |
| 4 | 4 | |
| 5 | - /* |
|
| 5 | + /* |
|
| 6 | 6 | |-------------------------------------------------------------------------- |
| 7 | 7 | | Authentication Defaults |
| 8 | 8 | |-------------------------------------------------------------------------- |
@@ -13,12 +13,12 @@ discard block |
||
| 13 | 13 | | |
| 14 | 14 | */ |
| 15 | 15 | |
| 16 | - 'defaults' => [ |
|
| 17 | - 'guard' => 'web', |
|
| 18 | - 'passwords' => 'users', |
|
| 19 | - ], |
|
| 16 | + 'defaults' => [ |
|
| 17 | + 'guard' => 'web', |
|
| 18 | + 'passwords' => 'users', |
|
| 19 | + ], |
|
| 20 | 20 | |
| 21 | - /* |
|
| 21 | + /* |
|
| 22 | 22 | |-------------------------------------------------------------------------- |
| 23 | 23 | | Authentication Guards |
| 24 | 24 | |-------------------------------------------------------------------------- |
@@ -35,19 +35,19 @@ discard block |
||
| 35 | 35 | | |
| 36 | 36 | */ |
| 37 | 37 | |
| 38 | - 'guards' => [ |
|
| 39 | - 'web' => [ |
|
| 40 | - 'driver' => 'session', |
|
| 41 | - 'provider' => 'users', |
|
| 42 | - ], |
|
| 38 | + 'guards' => [ |
|
| 39 | + 'web' => [ |
|
| 40 | + 'driver' => 'session', |
|
| 41 | + 'provider' => 'users', |
|
| 42 | + ], |
|
| 43 | 43 | |
| 44 | - 'api' => [ |
|
| 45 | - 'driver' => 'passport', |
|
| 46 | - 'provider' => 'users', |
|
| 47 | - ], |
|
| 48 | - ], |
|
| 44 | + 'api' => [ |
|
| 45 | + 'driver' => 'passport', |
|
| 46 | + 'provider' => 'users', |
|
| 47 | + ], |
|
| 48 | + ], |
|
| 49 | 49 | |
| 50 | - /* |
|
| 50 | + /* |
|
| 51 | 51 | |-------------------------------------------------------------------------- |
| 52 | 52 | | User Providers |
| 53 | 53 | |-------------------------------------------------------------------------- |
@@ -64,19 +64,19 @@ discard block |
||
| 64 | 64 | | |
| 65 | 65 | */ |
| 66 | 66 | |
| 67 | - 'providers' => [ |
|
| 68 | - 'users' => [ |
|
| 69 | - 'driver' => 'eloquent', |
|
| 70 | - 'model' => App\Modules\Users\AclUser::class, |
|
| 71 | - ], |
|
| 67 | + 'providers' => [ |
|
| 68 | + 'users' => [ |
|
| 69 | + 'driver' => 'eloquent', |
|
| 70 | + 'model' => App\Modules\Users\AclUser::class, |
|
| 71 | + ], |
|
| 72 | 72 | |
| 73 | - // 'users' => [ |
|
| 74 | - // 'driver' => 'database', |
|
| 75 | - // 'table' => 'users', |
|
| 76 | - // ], |
|
| 77 | - ], |
|
| 73 | + // 'users' => [ |
|
| 74 | + // 'driver' => 'database', |
|
| 75 | + // 'table' => 'users', |
|
| 76 | + // ], |
|
| 77 | + ], |
|
| 78 | 78 | |
| 79 | - /* |
|
| 79 | + /* |
|
| 80 | 80 | |-------------------------------------------------------------------------- |
| 81 | 81 | | Resetting Passwords |
| 82 | 82 | |-------------------------------------------------------------------------- |
@@ -91,12 +91,12 @@ discard block |
||
| 91 | 91 | | |
| 92 | 92 | */ |
| 93 | 93 | |
| 94 | - 'passwords' => [ |
|
| 95 | - 'users' => [ |
|
| 96 | - 'provider' => 'users', |
|
| 97 | - 'table' => 'password_resets', |
|
| 98 | - 'expire' => 60, |
|
| 99 | - ], |
|
| 100 | - ], |
|
| 94 | + 'passwords' => [ |
|
| 95 | + 'users' => [ |
|
| 96 | + 'provider' => 'users', |
|
| 97 | + 'table' => 'password_resets', |
|
| 98 | + 'expire' => 60, |
|
| 99 | + ], |
|
| 100 | + ], |
|
| 101 | 101 | |
| 102 | 102 | ]; |
@@ -2,7 +2,7 @@ discard block |
||
| 2 | 2 | |
| 3 | 3 | return [ |
| 4 | 4 | |
| 5 | - /* |
|
| 5 | + /* |
|
| 6 | 6 | |-------------------------------------------------------------------------- |
| 7 | 7 | | Disable Confirm Email |
| 8 | 8 | |-------------------------------------------------------------------------- |
@@ -11,9 +11,9 @@ discard block |
||
| 11 | 11 | | |
| 12 | 12 | */ |
| 13 | 13 | |
| 14 | - 'disable_confirm_email' => env('DISABLE_CONFIRM_EMAIL', false), |
|
| 14 | + 'disable_confirm_email' => env('DISABLE_CONFIRM_EMAIL', false), |
|
| 15 | 15 | |
| 16 | - /* |
|
| 16 | + /* |
|
| 17 | 17 | |-------------------------------------------------------------------------- |
| 18 | 18 | | Confirm Email URL |
| 19 | 19 | |-------------------------------------------------------------------------- |
@@ -22,9 +22,9 @@ discard block |
||
| 22 | 22 | | |
| 23 | 23 | */ |
| 24 | 24 | |
| 25 | - 'confrim_email_url' => env('CONFIRM_EMAIL_URL'), |
|
| 25 | + 'confrim_email_url' => env('CONFIRM_EMAIL_URL'), |
|
| 26 | 26 | |
| 27 | - /* |
|
| 27 | + /* |
|
| 28 | 28 | |-------------------------------------------------------------------------- |
| 29 | 29 | | Reset Password URL |
| 30 | 30 | |-------------------------------------------------------------------------- |
@@ -33,9 +33,9 @@ discard block |
||
| 33 | 33 | | |
| 34 | 34 | */ |
| 35 | 35 | |
| 36 | - 'reset_password_url' => env('RESET_PASSWORD_URL'), |
|
| 36 | + 'reset_password_url' => env('RESET_PASSWORD_URL'), |
|
| 37 | 37 | |
| 38 | - /* |
|
| 38 | + /* |
|
| 39 | 39 | |-------------------------------------------------------------------------- |
| 40 | 40 | | Passport Client Id |
| 41 | 41 | |-------------------------------------------------------------------------- |
@@ -44,9 +44,9 @@ discard block |
||
| 44 | 44 | | |
| 45 | 45 | */ |
| 46 | 46 | |
| 47 | - 'passport_client_id' => env('PASSWORD_CLIENT_ID'), |
|
| 47 | + 'passport_client_id' => env('PASSWORD_CLIENT_ID'), |
|
| 48 | 48 | |
| 49 | - /* |
|
| 49 | + /* |
|
| 50 | 50 | |-------------------------------------------------------------------------- |
| 51 | 51 | | Passport Client Secret |
| 52 | 52 | |-------------------------------------------------------------------------- |
@@ -55,9 +55,9 @@ discard block |
||
| 55 | 55 | | |
| 56 | 56 | */ |
| 57 | 57 | |
| 58 | - 'passport_client_secret' => env('PASSWORD_CLIENT_SECRET'), |
|
| 58 | + 'passport_client_secret' => env('PASSWORD_CLIENT_SECRET'), |
|
| 59 | 59 | |
| 60 | - /* |
|
| 60 | + /* |
|
| 61 | 61 | |-------------------------------------------------------------------------- |
| 62 | 62 | | Social Pass |
| 63 | 63 | |-------------------------------------------------------------------------- |
@@ -66,9 +66,9 @@ discard block |
||
| 66 | 66 | | |
| 67 | 67 | */ |
| 68 | 68 | |
| 69 | - 'social_pass' => env('SOCIAL_PASS', false), |
|
| 69 | + 'social_pass' => env('SOCIAL_PASS', false), |
|
| 70 | 70 | |
| 71 | - /* |
|
| 71 | + /* |
|
| 72 | 72 | |-------------------------------------------------------------------------- |
| 73 | 73 | | Relations Between Models |
| 74 | 74 | |-------------------------------------------------------------------------- |
@@ -77,88 +77,88 @@ discard block |
||
| 77 | 77 | | |
| 78 | 78 | */ |
| 79 | 79 | |
| 80 | - 'relations' => [ |
|
| 81 | - 'user' => [ |
|
| 82 | - 'list' => [], |
|
| 83 | - 'find' => [], |
|
| 84 | - 'findby' => [], |
|
| 85 | - 'paginate' => [], |
|
| 86 | - 'paginateby' => [], |
|
| 87 | - 'first' => [], |
|
| 88 | - 'search' => [], |
|
| 89 | - 'account' => [], |
|
| 90 | - 'group' => [], |
|
| 91 | - 'deleted' => [], |
|
| 92 | - ], |
|
| 93 | - 'permission' => [ |
|
| 94 | - 'list' => [], |
|
| 95 | - 'find' => [], |
|
| 96 | - 'findby' => [], |
|
| 97 | - 'paginate' => [], |
|
| 98 | - 'paginateby' => [], |
|
| 99 | - 'first' => [], |
|
| 100 | - 'search' => [], |
|
| 101 | - 'deleted' => [], |
|
| 102 | - ], |
|
| 103 | - 'group' => [ |
|
| 104 | - 'list' => [], |
|
| 105 | - 'find' => [], |
|
| 106 | - 'findby' => [], |
|
| 107 | - 'paginate' => [], |
|
| 108 | - 'paginateby' => [], |
|
| 109 | - 'first' => [], |
|
| 110 | - 'search' => [], |
|
| 111 | - 'deleted' => [], |
|
| 112 | - ], |
|
| 113 | - 'oauthClient' => [ |
|
| 114 | - 'list' => [], |
|
| 115 | - 'find' => [], |
|
| 116 | - 'findby' => [], |
|
| 117 | - 'paginate' => [], |
|
| 118 | - 'paginateby' => [], |
|
| 119 | - 'first' => [], |
|
| 120 | - 'search' => [], |
|
| 121 | - 'account' => [], |
|
| 122 | - 'group' => [], |
|
| 123 | - 'deleted' => [], |
|
| 124 | - ], |
|
| 125 | - 'notification' => [ |
|
| 126 | - 'list' => [], |
|
| 127 | - 'unread' => [], |
|
| 128 | - ], |
|
| 129 | - 'pushNotificationDevice' => [ |
|
| 130 | - 'list' => [], |
|
| 131 | - 'find' => [], |
|
| 132 | - 'findby' => [], |
|
| 133 | - 'paginate' => [], |
|
| 134 | - 'paginateby' => [], |
|
| 135 | - 'first' => [], |
|
| 136 | - 'search' => [], |
|
| 137 | - 'deleted' => [], |
|
| 138 | - ], |
|
| 139 | - 'report' => [ |
|
| 140 | - 'list' => [], |
|
| 141 | - 'find' => [], |
|
| 142 | - 'findby' => [], |
|
| 143 | - 'paginate' => [], |
|
| 144 | - 'paginateby' => [], |
|
| 145 | - 'first' => [], |
|
| 146 | - 'search' => [], |
|
| 147 | - 'deleted' => [], |
|
| 148 | - ], |
|
| 149 | - 'setting' => [ |
|
| 150 | - 'list' => [], |
|
| 151 | - 'find' => [], |
|
| 152 | - 'findby' => [], |
|
| 153 | - 'paginate' => [], |
|
| 154 | - 'paginateby' => [], |
|
| 155 | - 'first' => [], |
|
| 156 | - 'search' => [], |
|
| 157 | - 'deleted' => [], |
|
| 158 | - ] |
|
| 159 | - ], |
|
| 80 | + 'relations' => [ |
|
| 81 | + 'user' => [ |
|
| 82 | + 'list' => [], |
|
| 83 | + 'find' => [], |
|
| 84 | + 'findby' => [], |
|
| 85 | + 'paginate' => [], |
|
| 86 | + 'paginateby' => [], |
|
| 87 | + 'first' => [], |
|
| 88 | + 'search' => [], |
|
| 89 | + 'account' => [], |
|
| 90 | + 'group' => [], |
|
| 91 | + 'deleted' => [], |
|
| 92 | + ], |
|
| 93 | + 'permission' => [ |
|
| 94 | + 'list' => [], |
|
| 95 | + 'find' => [], |
|
| 96 | + 'findby' => [], |
|
| 97 | + 'paginate' => [], |
|
| 98 | + 'paginateby' => [], |
|
| 99 | + 'first' => [], |
|
| 100 | + 'search' => [], |
|
| 101 | + 'deleted' => [], |
|
| 102 | + ], |
|
| 103 | + 'group' => [ |
|
| 104 | + 'list' => [], |
|
| 105 | + 'find' => [], |
|
| 106 | + 'findby' => [], |
|
| 107 | + 'paginate' => [], |
|
| 108 | + 'paginateby' => [], |
|
| 109 | + 'first' => [], |
|
| 110 | + 'search' => [], |
|
| 111 | + 'deleted' => [], |
|
| 112 | + ], |
|
| 113 | + 'oauthClient' => [ |
|
| 114 | + 'list' => [], |
|
| 115 | + 'find' => [], |
|
| 116 | + 'findby' => [], |
|
| 117 | + 'paginate' => [], |
|
| 118 | + 'paginateby' => [], |
|
| 119 | + 'first' => [], |
|
| 120 | + 'search' => [], |
|
| 121 | + 'account' => [], |
|
| 122 | + 'group' => [], |
|
| 123 | + 'deleted' => [], |
|
| 124 | + ], |
|
| 125 | + 'notification' => [ |
|
| 126 | + 'list' => [], |
|
| 127 | + 'unread' => [], |
|
| 128 | + ], |
|
| 129 | + 'pushNotificationDevice' => [ |
|
| 130 | + 'list' => [], |
|
| 131 | + 'find' => [], |
|
| 132 | + 'findby' => [], |
|
| 133 | + 'paginate' => [], |
|
| 134 | + 'paginateby' => [], |
|
| 135 | + 'first' => [], |
|
| 136 | + 'search' => [], |
|
| 137 | + 'deleted' => [], |
|
| 138 | + ], |
|
| 139 | + 'report' => [ |
|
| 140 | + 'list' => [], |
|
| 141 | + 'find' => [], |
|
| 142 | + 'findby' => [], |
|
| 143 | + 'paginate' => [], |
|
| 144 | + 'paginateby' => [], |
|
| 145 | + 'first' => [], |
|
| 146 | + 'search' => [], |
|
| 147 | + 'deleted' => [], |
|
| 148 | + ], |
|
| 149 | + 'setting' => [ |
|
| 150 | + 'list' => [], |
|
| 151 | + 'find' => [], |
|
| 152 | + 'findby' => [], |
|
| 153 | + 'paginate' => [], |
|
| 154 | + 'paginateby' => [], |
|
| 155 | + 'first' => [], |
|
| 156 | + 'search' => [], |
|
| 157 | + 'deleted' => [], |
|
| 158 | + ] |
|
| 159 | + ], |
|
| 160 | 160 | |
| 161 | - /* |
|
| 161 | + /* |
|
| 162 | 162 | |-------------------------------------------------------------------------- |
| 163 | 163 | | Cache Configurations |
| 164 | 164 | |-------------------------------------------------------------------------- |
@@ -167,46 +167,46 @@ discard block |
||
| 167 | 167 | | |
| 168 | 168 | */ |
| 169 | 169 | |
| 170 | - 'cache_config' => [ |
|
| 171 | - 'oauthClient' => [ |
|
| 172 | - 'cache' => [ |
|
| 173 | - 'all', |
|
| 174 | - 'find', |
|
| 175 | - 'findBy', |
|
| 176 | - 'paginate', |
|
| 177 | - 'paginateBy', |
|
| 178 | - 'first', |
|
| 179 | - 'search', |
|
| 180 | - 'deleted' |
|
| 181 | - ], |
|
| 182 | - 'clear' => [ |
|
| 183 | - 'update' => ['oauthClients', 'users', 'groups'], |
|
| 184 | - 'save' => ['oauthClients', 'users', 'groups'], |
|
| 185 | - 'delete' => ['oauthClients', 'users', 'groups'], |
|
| 186 | - 'restore' => ['oauthClients', 'users', 'groups'], |
|
| 187 | - 'revoke' => ['oauthClients', 'users', 'groups'], |
|
| 188 | - 'ubRevoke' => ['oauthClients', 'users', 'groups'], |
|
| 189 | - 'regenerateSecret' => ['oauthClients', 'users', 'groups'], |
|
| 190 | - ], |
|
| 191 | - ], |
|
| 192 | - 'setting' => [ |
|
| 193 | - 'cache' => [ |
|
| 194 | - 'all', |
|
| 195 | - 'find', |
|
| 196 | - 'findBy', |
|
| 197 | - 'paginate', |
|
| 198 | - 'paginateBy', |
|
| 199 | - 'first', |
|
| 200 | - 'search', |
|
| 201 | - 'deleted' |
|
| 202 | - ], |
|
| 203 | - 'clear' => [ |
|
| 204 | - 'update' => ['settings'], |
|
| 205 | - 'save' => ['settings'], |
|
| 206 | - 'delete' => ['settings'], |
|
| 207 | - 'restore' => ['settings'], |
|
| 208 | - 'saveMany' => ['settings'], |
|
| 209 | - ] |
|
| 210 | - ] |
|
| 211 | - ] |
|
| 170 | + 'cache_config' => [ |
|
| 171 | + 'oauthClient' => [ |
|
| 172 | + 'cache' => [ |
|
| 173 | + 'all', |
|
| 174 | + 'find', |
|
| 175 | + 'findBy', |
|
| 176 | + 'paginate', |
|
| 177 | + 'paginateBy', |
|
| 178 | + 'first', |
|
| 179 | + 'search', |
|
| 180 | + 'deleted' |
|
| 181 | + ], |
|
| 182 | + 'clear' => [ |
|
| 183 | + 'update' => ['oauthClients', 'users', 'groups'], |
|
| 184 | + 'save' => ['oauthClients', 'users', 'groups'], |
|
| 185 | + 'delete' => ['oauthClients', 'users', 'groups'], |
|
| 186 | + 'restore' => ['oauthClients', 'users', 'groups'], |
|
| 187 | + 'revoke' => ['oauthClients', 'users', 'groups'], |
|
| 188 | + 'ubRevoke' => ['oauthClients', 'users', 'groups'], |
|
| 189 | + 'regenerateSecret' => ['oauthClients', 'users', 'groups'], |
|
| 190 | + ], |
|
| 191 | + ], |
|
| 192 | + 'setting' => [ |
|
| 193 | + 'cache' => [ |
|
| 194 | + 'all', |
|
| 195 | + 'find', |
|
| 196 | + 'findBy', |
|
| 197 | + 'paginate', |
|
| 198 | + 'paginateBy', |
|
| 199 | + 'first', |
|
| 200 | + 'search', |
|
| 201 | + 'deleted' |
|
| 202 | + ], |
|
| 203 | + 'clear' => [ |
|
| 204 | + 'update' => ['settings'], |
|
| 205 | + 'save' => ['settings'], |
|
| 206 | + 'delete' => ['settings'], |
|
| 207 | + 'restore' => ['settings'], |
|
| 208 | + 'saveMany' => ['settings'], |
|
| 209 | + ] |
|
| 210 | + ] |
|
| 211 | + ] |
|
| 212 | 212 | ]; |
@@ -6,41 +6,41 @@ |
||
| 6 | 6 | |
| 7 | 7 | class ApiSkeletonServiceProvider extends ServiceProvider |
| 8 | 8 | { |
| 9 | - /** |
|
| 10 | - * Perform post-registration booting of services. |
|
| 11 | - * |
|
| 12 | - * @return void |
|
| 13 | - */ |
|
| 14 | - public function boot() |
|
| 15 | - { |
|
| 16 | - $this->publishes([ |
|
| 17 | - __DIR__.'/Modules' => app_path('Modules'), |
|
| 18 | - __DIR__.'/Modules/Core/Resources/Assets' => base_path('public/doc/assets'), |
|
| 19 | - __DIR__.'/../lang' => base_path('resources/lang'), |
|
| 20 | - __DIR__.'/../files/Handler.php' => app_path('Exceptions/Handler.php'), |
|
| 21 | - __DIR__.'/../files/AuthServiceProvider.php' => app_path('Providers/AuthServiceProvider.php'), |
|
| 22 | - __DIR__.'/../files/BroadcastServiceProvider.php' => app_path('Providers/BroadcastServiceProvider.php'), |
|
| 23 | - __DIR__.'/../files/Kernel.php' => app_path('Console/Kernel.php'), |
|
| 24 | - __DIR__.'/../files/channels.php' => base_path('routes/channels.php'), |
|
| 25 | - __DIR__.'/../phpcs.xml' => base_path('/phpcs.xml'), |
|
| 26 | - ]); |
|
| 9 | + /** |
|
| 10 | + * Perform post-registration booting of services. |
|
| 11 | + * |
|
| 12 | + * @return void |
|
| 13 | + */ |
|
| 14 | + public function boot() |
|
| 15 | + { |
|
| 16 | + $this->publishes([ |
|
| 17 | + __DIR__.'/Modules' => app_path('Modules'), |
|
| 18 | + __DIR__.'/Modules/Core/Resources/Assets' => base_path('public/doc/assets'), |
|
| 19 | + __DIR__.'/../lang' => base_path('resources/lang'), |
|
| 20 | + __DIR__.'/../files/Handler.php' => app_path('Exceptions/Handler.php'), |
|
| 21 | + __DIR__.'/../files/AuthServiceProvider.php' => app_path('Providers/AuthServiceProvider.php'), |
|
| 22 | + __DIR__.'/../files/BroadcastServiceProvider.php' => app_path('Providers/BroadcastServiceProvider.php'), |
|
| 23 | + __DIR__.'/../files/Kernel.php' => app_path('Console/Kernel.php'), |
|
| 24 | + __DIR__.'/../files/channels.php' => base_path('routes/channels.php'), |
|
| 25 | + __DIR__.'/../phpcs.xml' => base_path('/phpcs.xml'), |
|
| 26 | + ]); |
|
| 27 | 27 | |
| 28 | - $this->publishes([ |
|
| 29 | - __DIR__.'/../config/skeleton.php' => config_path('skeleton.php'), |
|
| 30 | - __DIR__.'/../files/auth.php' => config_path('auth.php'), |
|
| 31 | - ], 'config'); |
|
| 32 | - } |
|
| 28 | + $this->publishes([ |
|
| 29 | + __DIR__.'/../config/skeleton.php' => config_path('skeleton.php'), |
|
| 30 | + __DIR__.'/../files/auth.php' => config_path('auth.php'), |
|
| 31 | + ], 'config'); |
|
| 32 | + } |
|
| 33 | 33 | |
| 34 | - /** |
|
| 35 | - * Register any package services. |
|
| 36 | - * |
|
| 37 | - * @return void |
|
| 38 | - */ |
|
| 39 | - public function register() |
|
| 40 | - { |
|
| 41 | - $this->mergeConfigFrom( |
|
| 42 | - __DIR__.'/../config/skeleton.php', |
|
| 43 | - 'skeleton' |
|
| 44 | - ); |
|
| 45 | - } |
|
| 34 | + /** |
|
| 35 | + * Register any package services. |
|
| 36 | + * |
|
| 37 | + * @return void |
|
| 38 | + */ |
|
| 39 | + public function register() |
|
| 40 | + { |
|
| 41 | + $this->mergeConfigFrom( |
|
| 42 | + __DIR__.'/../config/skeleton.php', |
|
| 43 | + 'skeleton' |
|
| 44 | + ); |
|
| 45 | + } |
|
| 46 | 46 | } |
@@ -15,31 +15,31 @@ |
||
| 15 | 15 | |
| 16 | 16 | Route::group(['prefix' => 'users'], function () { |
| 17 | 17 | |
| 18 | - Route::get('/', 'UserController@index'); |
|
| 19 | - Route::get('/{id}', 'UserController@find'); |
|
| 20 | - Route::post('/', 'UserController@insert'); |
|
| 21 | - Route::put('/', 'UserController@update'); |
|
| 22 | - Route::delete('/{id}', 'UserController@delete'); |
|
| 23 | - Route::get('list/deleted', 'UserController@deleted'); |
|
| 24 | - Route::patch('restore/{id}', 'UserController@restore'); |
|
| 25 | - Route::get('block/{id}', 'UserController@block'); |
|
| 26 | - Route::get('unblock/{id}', 'UserController@unblock'); |
|
| 27 | - Route::post('assign/groups', 'UserController@assignGroups'); |
|
| 28 | - Route::post('group/{groupName}', 'UserController@group'); |
|
| 18 | + Route::get('/', 'UserController@index'); |
|
| 19 | + Route::get('/{id}', 'UserController@find'); |
|
| 20 | + Route::post('/', 'UserController@insert'); |
|
| 21 | + Route::put('/', 'UserController@update'); |
|
| 22 | + Route::delete('/{id}', 'UserController@delete'); |
|
| 23 | + Route::get('list/deleted', 'UserController@deleted'); |
|
| 24 | + Route::patch('restore/{id}', 'UserController@restore'); |
|
| 25 | + Route::get('block/{id}', 'UserController@block'); |
|
| 26 | + Route::get('unblock/{id}', 'UserController@unblock'); |
|
| 27 | + Route::post('assign/groups', 'UserController@assignGroups'); |
|
| 28 | + Route::post('group/{groupName}', 'UserController@group'); |
|
| 29 | 29 | |
| 30 | - Route::group(['prefix' => 'account'], function () { |
|
| 30 | + Route::group(['prefix' => 'account'], function () { |
|
| 31 | 31 | |
| 32 | - Route::get('my', 'UserController@account'); |
|
| 33 | - Route::get('logout', 'UserController@logout'); |
|
| 34 | - Route::post('refresh/token', 'UserController@refreshToken'); |
|
| 35 | - Route::post('save', 'UserController@saveProfile'); |
|
| 36 | - Route::post('register', 'UserController@register'); |
|
| 37 | - Route::post('login', 'UserController@login'); |
|
| 38 | - Route::post('login/social', 'UserController@loginSocial'); |
|
| 39 | - Route::post('send/reset', 'UserController@sendReset'); |
|
| 40 | - Route::post('reset/password', 'UserController@resetPassword'); |
|
| 41 | - Route::post('change/password', 'UserController@changePassword'); |
|
| 42 | - Route::post('confirm/email', 'UserController@confirmEmail'); |
|
| 43 | - Route::post('resend/email/confirmation', 'UserController@resendEmailConfirmation'); |
|
| 44 | - }); |
|
| 32 | + Route::get('my', 'UserController@account'); |
|
| 33 | + Route::get('logout', 'UserController@logout'); |
|
| 34 | + Route::post('refresh/token', 'UserController@refreshToken'); |
|
| 35 | + Route::post('save', 'UserController@saveProfile'); |
|
| 36 | + Route::post('register', 'UserController@register'); |
|
| 37 | + Route::post('login', 'UserController@login'); |
|
| 38 | + Route::post('login/social', 'UserController@loginSocial'); |
|
| 39 | + Route::post('send/reset', 'UserController@sendReset'); |
|
| 40 | + Route::post('reset/password', 'UserController@resetPassword'); |
|
| 41 | + Route::post('change/password', 'UserController@changePassword'); |
|
| 42 | + Route::post('confirm/email', 'UserController@confirmEmail'); |
|
| 43 | + Route::post('resend/email/confirmation', 'UserController@resendEmailConfirmation'); |
|
| 44 | + }); |
|
| 45 | 45 | }); |
@@ -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', 'users'); |
|
| 17 | - $this->loadViewsFrom(__DIR__.'/../Resources/Views', 'users'); |
|
| 9 | + /** |
|
| 10 | + * Bootstrap the module services. |
|
| 11 | + * |
|
| 12 | + * @return void |
|
| 13 | + */ |
|
| 14 | + public function boot() |
|
| 15 | + { |
|
| 16 | + $this->loadTranslationsFrom(__DIR__.'/../Resources/Lang', 'users'); |
|
| 17 | + $this->loadViewsFrom(__DIR__.'/../Resources/Views', 'users'); |
|
| 18 | 18 | |
| 19 | - $this->loadMigrationsFrom(module_path('users', 'Database/Migrations', 'app')); |
|
| 20 | - $this->loadFactoriesFrom(module_path('users', 'Database/Factories', 'app')); |
|
| 21 | - } |
|
| 19 | + $this->loadMigrationsFrom(module_path('users', 'Database/Migrations', 'app')); |
|
| 20 | + $this->loadFactoriesFrom(module_path('users', '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 | } |
@@ -7,73 +7,73 @@ |
||
| 7 | 7 | |
| 8 | 8 | class RouteServiceProvider extends ServiceProvider |
| 9 | 9 | { |
| 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\Users\Http\Controllers'; |
|
| 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\Users\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('users', 'Routes/web.php', 'app'); |
|
| 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('users', 'Routes/web.php', 'app'); |
|
| 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('users', 'Routes/api.php', 'app'); |
|
| 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('users', 'Routes/api.php', 'app'); |
|
| 77 | + }); |
|
| 78 | + } |
|
| 79 | 79 | } |
@@ -1,12 +1,12 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | |
| 3 | 3 | $factory->define(App\Modules\Users\AclUser::class, function (Faker\Generator $faker) { |
| 4 | - return [ |
|
| 5 | - 'profile_picture' => 'http://lorempixel.com/400/200/', |
|
| 6 | - 'name' => $faker->name(), |
|
| 7 | - 'email' => $faker->safeEmail(), |
|
| 8 | - 'password' => 123456, |
|
| 9 | - 'created_at' => $faker->dateTimeBetween('-1 years', 'now'), |
|
| 10 | - 'updated_at' => $faker->dateTimeBetween('-1 years', 'now') |
|
| 11 | - ]; |
|
| 4 | + return [ |
|
| 5 | + 'profile_picture' => 'http://lorempixel.com/400/200/', |
|
| 6 | + 'name' => $faker->name(), |
|
| 7 | + 'email' => $faker->safeEmail(), |
|
| 8 | + 'password' => 123456, |
|
| 9 | + 'created_at' => $faker->dateTimeBetween('-1 years', 'now'), |
|
| 10 | + 'updated_at' => $faker->dateTimeBetween('-1 years', 'now') |
|
| 11 | + ]; |
|
| 12 | 12 | }); |
@@ -6,15 +6,15 @@ |
||
| 6 | 6 | |
| 7 | 7 | class UsersDatabaseSeeder extends Seeder |
| 8 | 8 | { |
| 9 | - /** |
|
| 10 | - * Run the database seeds. |
|
| 11 | - * |
|
| 12 | - * @return void |
|
| 13 | - */ |
|
| 14 | - public function run() |
|
| 15 | - { |
|
| 16 | - $this->call(ClearDataSeeder::class); |
|
| 17 | - $this->call(UsersTableSeeder::class); |
|
| 18 | - $this->call(AssignRelationsSeeder::class); |
|
| 19 | - } |
|
| 9 | + /** |
|
| 10 | + * Run the database seeds. |
|
| 11 | + * |
|
| 12 | + * @return void |
|
| 13 | + */ |
|
| 14 | + public function run() |
|
| 15 | + { |
|
| 16 | + $this->call(ClearDataSeeder::class); |
|
| 17 | + $this->call(UsersTableSeeder::class); |
|
| 18 | + $this->call(AssignRelationsSeeder::class); |
|
| 19 | + } |
|
| 20 | 20 | } |
@@ -6,27 +6,27 @@ |
||
| 6 | 6 | |
| 7 | 7 | class AssignRelationsSeeder extends Seeder |
| 8 | 8 | { |
| 9 | - /** |
|
| 10 | - * Run the database seeds. |
|
| 11 | - * |
|
| 12 | - * @return void |
|
| 13 | - */ |
|
| 14 | - public function run() |
|
| 15 | - { |
|
| 16 | - $adminGroupId = \DB::table('groups')->where('name', 'admin')->select('id')->first()->id; |
|
| 9 | + /** |
|
| 10 | + * Run the database seeds. |
|
| 11 | + * |
|
| 12 | + * @return void |
|
| 13 | + */ |
|
| 14 | + public function run() |
|
| 15 | + { |
|
| 16 | + $adminGroupId = \DB::table('groups')->where('name', 'admin')->select('id')->first()->id; |
|
| 17 | 17 | |
| 18 | - /** |
|
| 19 | - * Assign the permissions to the admin group. |
|
| 20 | - */ |
|
| 21 | - \DB::table('permissions')->orderBy('created_at', 'asc')->whereIn('model', ['user'])->each(function ($permission) use ($adminGroupId) { |
|
| 22 | - \DB::table('groups_permissions')->insert( |
|
| 23 | - [ |
|
| 24 | - 'permission_id' => $permission->id, |
|
| 25 | - 'group_id' => $adminGroupId, |
|
| 26 | - 'created_at' => \DB::raw('NOW()'), |
|
| 27 | - 'updated_at' => \DB::raw('NOW()') |
|
| 28 | - ] |
|
| 29 | - ); |
|
| 30 | - }); |
|
| 31 | - } |
|
| 18 | + /** |
|
| 19 | + * Assign the permissions to the admin group. |
|
| 20 | + */ |
|
| 21 | + \DB::table('permissions')->orderBy('created_at', 'asc')->whereIn('model', ['user'])->each(function ($permission) use ($adminGroupId) { |
|
| 22 | + \DB::table('groups_permissions')->insert( |
|
| 23 | + [ |
|
| 24 | + 'permission_id' => $permission->id, |
|
| 25 | + 'group_id' => $adminGroupId, |
|
| 26 | + 'created_at' => \DB::raw('NOW()'), |
|
| 27 | + 'updated_at' => \DB::raw('NOW()') |
|
| 28 | + ] |
|
| 29 | + ); |
|
| 30 | + }); |
|
| 31 | + } |
|
| 32 | 32 | } |