Merge branch 'master' into docker

This commit is contained in:
MostafaMoradii 2022-06-09 17:02:24 +04:30 committed by GitHub
commit 2cf4f7c7b0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 6 deletions

View File

@ -94,7 +94,8 @@
"visiosoft/base-theme": "^1.0", "visiosoft/base-theme": "^1.0",
"visiosoft/advs-module": "^1.0", "visiosoft/advs-module": "^1.0",
"visiosoft/json-field_type": "^1.0", "visiosoft/json-field_type": "^1.0",
"visiosoft/language_switcher-plugin": "^1.0" "visiosoft/language_switcher-plugin": "^1.0",
"fruitcake/laravel-cors": "^2.0"
}, },
"replace": { "replace": {
"anomaly/streams-platform": "*" "anomaly/streams-platform": "*"

View File

@ -209,6 +209,7 @@ return [
*/ */
Anomaly\Streams\Platform\StreamsServiceProvider::class, Anomaly\Streams\Platform\StreamsServiceProvider::class,
Sentry\Laravel\ServiceProvider::class, Sentry\Laravel\ServiceProvider::class,
\Fruitcake\Cors\CorsServiceProvider::class
], ],
/* /*

View File

@ -3,7 +3,7 @@
use App\Exceptions\ExceptionHandler; use App\Exceptions\ExceptionHandler;
return [ return [
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
| Listeners | Listeners
@ -32,7 +32,7 @@ return [
*/ */
'bindings' => [ 'bindings' => [
'Anomaly\Streams\Platform\Exception\ExceptionHandler' => ExceptionHandler::class 'Anomaly\Streams\Platform\Exception\ExceptionHandler' => ExceptionHandler::class
], ],
/* /*
@ -90,7 +90,9 @@ return [
| |
*/ */
'middleware' => [], 'middleware' => [
\Fruitcake\Cors\HandleCors::class, # this line
],
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
@ -129,7 +131,7 @@ return [
*/ */
'middleware_priority' => [], 'middleware_priority' => [],
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
| View Overrides | View Overrides
@ -140,7 +142,7 @@ return [
*/ */
'overrides' => [], 'overrides' => [],
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
| Control Panel Customization | Control Panel Customization