Merge main into feature/marketplace

This commit is contained in:
Cametendo
2026-05-13 16:23:30 +02:00
29 changed files with 2940 additions and 59 deletions

View File

@@ -34,7 +34,11 @@ class Cors extends BaseConfig
* - ['http://localhost:8080']
* - ['https://www.example.com']
*/
<<<<<<< HEAD
'allowedOrigins' => ['http://localhost:5173', 'http://127.0.0.1:5173'],
=======
'allowedOrigins' => ['http://localhost:5173', 'http://127.0.0.1:5173', 'http://localhost'],
>>>>>>> main
/**
* Origin regex patterns for the `Access-Control-Allow-Origin` header.
@@ -68,7 +72,11 @@ class Cors extends BaseConfig
*
* @see https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Access-Control-Allow-Headers
*/
<<<<<<< HEAD
'allowedHeaders' => ['*'],
=======
'allowedHeaders' => ['Content-Type', 'Authorization', 'X-API-Key'],
>>>>>>> main
/**
* Set headers to expose.
@@ -93,7 +101,11 @@ class Cors extends BaseConfig
*
* @see https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Access-Control-Allow-Methods
*/
<<<<<<< HEAD
'allowedMethods' => ['*'],
=======
'allowedMethods' => ['GET', 'POST', 'PUT', 'DELETE', 'OPTIONS'],
>>>>>>> main
/**
* Set how many seconds the results of a preflight request can be cached.