diff --git a/app/Http/Controllers/SearchController.php b/app/Http/Controllers/SearchController.php index 0ee59ce..1075eff 100644 --- a/app/Http/Controllers/SearchController.php +++ b/app/Http/Controllers/SearchController.php @@ -13,10 +13,10 @@ class SearchController extends Controller public function __construct() { $this->client = new Client([ - 'api_key' => env('TYPESENSE_API_KEY'), + 'api_key' => config('typesense_api_key'), 'nodes' => [ [ - 'host' => env('TYPESENSE_CONNECTION'), + 'host' => config('typesense_connection'), 'port' => '8108', 'protocol' => 'http', ], diff --git a/app/Services/TypesenseService.php b/app/Services/TypesenseService.php index af8805d..a23fad4 100644 --- a/app/Services/TypesenseService.php +++ b/app/Services/TypesenseService.php @@ -14,10 +14,10 @@ class TypesenseService public function __construct() { $this->client = new Client([ - 'api_key' => env('TYPESENSE_API_KEY'), + 'api_key' => config('typesense_api_key'), 'nodes' => [ [ - 'host' => env('TYPESENSE_CONNECTION'), + 'host' => config('typesense_connection'), 'port' => '8108', 'protocol' => 'http', ], diff --git a/config/app.php b/config/app.php index 423eed5..361c460 100644 --- a/config/app.php +++ b/config/app.php @@ -123,4 +123,15 @@ return [ 'store' => env('APP_MAINTENANCE_STORE', 'database'), ], + 'typesense_api_key' => env('TYPESENSE_API_KEY'), + 'typesense_connection' => env('TYPESENSE_CONNECTION'), + + 'dev' => env('DEV'), + + 'admin_name' => env('ADMIN_NAME') ?:'admin', + 'admin_lastname' => env('ADMIN_LASTNAME') ?: 'admin', + 'admin_email' => env('ADMIN_MAIL') ?: 'admin@gmail.com', + 'admin_password' => env('ADMIN_PASSWORD') ?: '12345678', + 'admin_phone' => env('ADMIN_PHONE_NUMBER') ?: '0909090909', + ]; diff --git a/database/seeders/DatabaseSeeder.php b/database/seeders/DatabaseSeeder.php index 8f983a2..40a9147 100644 --- a/database/seeders/DatabaseSeeder.php +++ b/database/seeders/DatabaseSeeder.php @@ -8,7 +8,7 @@ class DatabaseSeeder extends Seeder { public function run() { - if (env('DEV') == 1) { + if (config('dev') == 1) { $this->call(DevSeeder::class); } else { $this->call(ProdSeeder::class); diff --git a/database/seeders/DevSeeder.php b/database/seeders/DevSeeder.php index b76aab3..c715589 100644 --- a/database/seeders/DevSeeder.php +++ b/database/seeders/DevSeeder.php @@ -18,11 +18,11 @@ class DevSeeder extends Seeder $typesense = app(TypesenseService::class); $admin = User::factory()->create([ - 'name' => env('ADMIN_NAME') ?:'admin', - 'lastname' => env('ADMIN_LASTNAME') ?: 'admin', - 'email' => env('ADMIN_MAIL') ?: 'admin@gmail.com', - 'password' => env('ADMIN_PASSWORD') ?: '12345678', - 'phone' => env('ADMIN_PHONE_NUMBER') ?: '0909090909', + 'name' => config('admin_name'), + 'lastname' => config('admin_lastname'), + 'email' => config('admin_email'), + 'password' => config('admin_password'), + 'phone' => config('admin_phone'), 'role' => 1, 'validate' => 1 ]); diff --git a/database/seeders/ProdSeeder.php b/database/seeders/ProdSeeder.php index 7e6fefd..7f2b928 100644 --- a/database/seeders/ProdSeeder.php +++ b/database/seeders/ProdSeeder.php @@ -16,11 +16,11 @@ class ProdSeeder extends Seeder $typesense = app(TypesenseService::class); $admin = User::factory()->create([ - 'name' => env('ADMIN_NAME') ?:'admin', - 'lastname' => env('ADMIN_LASTNAME') ?: 'admin', - 'email' => env('ADMIN_MAIL') ?: 'admin@gmail.com', - 'password' => env('ADMIN_PASSWORD') ?: '12345678', - 'phone' => env('ADMIN_PHONE_NUMBER') ?: '0909090909', + 'name' => config('admin_name'), + 'lastname' => config('admin_lastname'), + 'email' => config('admin_email'), + 'password' => config('admin_password'), + 'phone' => config('admin_phone'), 'role' => 1, 'validate' => 1 ]);