Skynet/misc_pterodactyl-panel
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' into feature/react-admin

Browse source
This commit is contained in:
Matthew Penner 2021-07-13 15:21:16 -06:00
commit ea4bcf0b9c
23 changed files with 1073 additions and 689 deletions
Download patch file Download diff file Expand all files Collapse all files

4
database/Factories/AllocationFactory.php
View file

@ -20,8 +20,8 @@ class AllocationFactory extends Factory
public function definition(): array
{
return [
'ip' => $this->faker->ipv4,
'port' => $this->faker->randomNumber(5),
'ip' => $this->faker->unique()->ipv4,
'port' => $this->faker->unique()->randomNumber(5),
];
}
}

4
database/Factories/ApiKeyFactory.php
View file

@ -25,8 +25,8 @@ class ApiKeyFactory extends Factory
return [
'key_type' => ApiKey::TYPE_APPLICATION,
'identifier' => Str::random(\Pterodactyl\Models\ApiKey::IDENTIFIER_LENGTH),
'token' => $token ?: $token = encrypt(Str::random(\Pterodactyl\Models\ApiKey::KEY_LENGTH)),
'identifier' => Str::random(ApiKey::IDENTIFIER_LENGTH),
'token' => $token ?: $token = encrypt(Str::random(ApiKey::KEY_LENGTH)),
'allowed_ips' => null,
'memo' => 'Test Function Key',
'created_at' => Carbon::now(),

5
database/Factories/BackupFactory.php
View file

@ -3,6 +3,7 @@
namespace Database\Factories;
use Ramsey\Uuid\Uuid;
use Carbon\CarbonImmutable;
use Pterodactyl\Models\Backup;
use Illuminate\Database\Eloquent\Factories\Factory;
@ -22,9 +23,11 @@ class BackupFactory extends Factory
{
return [
'uuid' => Uuid::uuid4()->toString(),
'is_successful' => true,
'name' => $this->faker->sentence,
'disk' => Backup::ADAPTER_WINGS,
'is_successful' => true,
'created_at' => CarbonImmutable::now(),
'completed_at' => CarbonImmutable::now(),
];
}
}

2
database/Factories/EggVariableFactory.php
View file

@ -21,7 +21,7 @@ class EggVariableFactory extends Factory
public function definition(): array
{
return [
'name' => $this->faker->firstName,
'name' => $this->faker->unique()->firstName,
'description' => $this->faker->sentence(),
'env_variable' => Str::upper(Str::replaceArray(' ', ['_'], $this->faker->words(2, true))),
'default_value' => $this->faker->colorName,

4
database/Factories/NodeFactory.php
View file

@ -25,8 +25,8 @@ class NodeFactory extends Factory
return [
'uuid' => Uuid::uuid4()->toString(),
'public' => true,
'name' => $this->faker->firstName,
'fqdn' => $this->faker->ipv4,
'name' => $this->faker->unique()->firstName,
'fqdn' => $this->faker->unique()->ipv4,
'listen_port_http' => 8080,
'listen_port_sftp' => 2022,
'public_port_http' => 8080,

4
database/Factories/UserFactory.php
View file

@ -26,8 +26,8 @@ class UserFactory extends Factory
return [
'external_id' => $this->faker->unique()->isbn10,
'uuid' => Uuid::uuid4()->toString(),
'username' => $this->faker->userName,
'email' => $this->faker->safeEmail,
'username' => $this->faker->unique()->userName,
'email' => $this->faker->unique()->safeEmail,
'name_first' => $this->faker->firstName,
'name_last' => $this->faker->lastName,
'password' => $password ?: $password = bcrypt('password'),