diff --git a/app/Http/Controllers/ProjectController.php b/app/Http/Controllers/ProjectController.php index 17cbdf8e3..1c1b220fc 100644 --- a/app/Http/Controllers/ProjectController.php +++ b/app/Http/Controllers/ProjectController.php @@ -13,6 +13,9 @@ class ProjectController extends Controller return redirect()->route('home'); } $project->load(['environments']); + if (count($project->environments) == 1) { + return redirect()->route('project.resources', ['project_uuid' => $project->uuid, 'environment_name' => $project->environments->first()->name]); + } return view('project.environments', ['project' => $project]); } diff --git a/app/Http/Livewire/Application/Secrets.php b/app/Http/Livewire/Application/EnvironmentVariables.php similarity index 51% rename from app/Http/Livewire/Application/Secrets.php rename to app/Http/Livewire/Application/EnvironmentVariables.php index d23fd8386..29a73bb8c 100644 --- a/app/Http/Livewire/Application/Secrets.php +++ b/app/Http/Livewire/Application/EnvironmentVariables.php @@ -4,7 +4,7 @@ namespace App\Http\Livewire\Application; use Livewire\Component; -class Secrets extends Component +class EnvironmentVariables extends Component { - public array $secrets = []; + public array $envs = []; } diff --git a/database/seeders/EnvironmentSeeder.php b/database/seeders/EnvironmentSeeder.php index d3dfc8c63..b06a70c5f 100644 --- a/database/seeders/EnvironmentSeeder.php +++ b/database/seeders/EnvironmentSeeder.php @@ -20,10 +20,5 @@ class EnvironmentSeeder extends Seeder 'name' => 'production', 'project_id' => $project_1->id, ]); - Environment::create([ - 'id' => 2, - 'name' => 'staging', - 'project_id' => $project_1->id, - ]); } } diff --git a/resources/views/livewire/application/environment-variables.blade.php b/resources/views/livewire/application/environment-variables.blade.php new file mode 100644 index 000000000..648060f3a --- /dev/null +++ b/resources/views/livewire/application/environment-variables.blade.php @@ -0,0 +1,7 @@ +
+ @forelse ($envs as $env) + {{ dump($env) }} + @empty +

There are no environment variables for this application.

+ @endforelse +
diff --git a/resources/views/livewire/application/secrets.blade.php b/resources/views/livewire/application/secrets.blade.php deleted file mode 100644 index 88d549b1d..000000000 --- a/resources/views/livewire/application/secrets.blade.php +++ /dev/null @@ -1,7 +0,0 @@ -
- @forelse ($secrets as $secret) - {{ dump($secret) }} - @empty -

There are no secrets for this application.

- @endforelse -
diff --git a/resources/views/project/applications/configuration.blade.php b/resources/views/project/applications/configuration.blade.php index 3b7001a96..ee33b1b43 100644 --- a/resources/views/project/applications/configuration.blade.php +++ b/resources/views/project/applications/configuration.blade.php @@ -2,7 +2,7 @@
General - Secrets + Environment Variables Source Destination @@ -12,8 +12,8 @@
-
- +
+