testing php storm code cleanup and styling

This commit is contained in:
Andras Bacsai
2023-08-08 11:51:36 +02:00
parent a8ee779b31
commit f2228cec7b
368 changed files with 23834 additions and 2623 deletions

View File

@@ -5,12 +5,11 @@ namespace App\Http\Controllers;
use App\Models\ApplicationDeploymentQueue;
use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
use Illuminate\Foundation\Validation\ValidatesRequests;
use Illuminate\Http\Request;
use Spatie\Activitylog\Models\Activity;
class ApplicationController extends Controller
{
use AuthorizesRequests, ValidatesRequests;
public function configuration()
{
$project = session('currentTeam')->load(['projects'])->projects->where('uuid', request()->route('project_uuid'))->first();
@@ -28,6 +27,7 @@ class ApplicationController extends Controller
ray($application->persistentStorages()->get());
return view('project.application.configuration', ['application' => $application]);
}
public function deployments()
{
$project = session('currentTeam')->load(['projects'])->projects->where('uuid', request()->route('project_uuid'))->first();

View File

@@ -2,17 +2,15 @@
namespace App\Http\Controllers;
use App\Http\Livewire\Team\Invitations;
use App\Models\InstanceSettings;
use App\Models\Project;
use App\Models\S3Storage;
use App\Models\Server;
use App\Models\TeamInvitation;
use App\Models\User;
use App\Models\S3Storage;
use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
use Illuminate\Foundation\Validation\ValidatesRequests;
use Illuminate\Routing\Controller as BaseController;
use Illuminate\Support\Facades\DB;
class Controller extends BaseController
{
@@ -27,6 +25,7 @@ class Controller extends BaseController
'settings' => InstanceSettings::get()
]);
}
public function license()
{
if (!isCloud()) {
@@ -36,6 +35,7 @@ class Controller extends BaseController
'settings' => InstanceSettings::get()
]);
}
public function dashboard()
{
$projects = Project::ownedByCurrentTeam()->get();
@@ -55,6 +55,7 @@ class Controller extends BaseController
's3s' => $s3s,
]);
}
public function settings()
{
if (auth()->user()->isInstanceAdmin()) {
@@ -66,6 +67,7 @@ class Controller extends BaseController
return redirect()->route('dashboard');
}
}
public function emails()
{
if (auth()->user()->isInstanceAdmin()) {
@@ -77,6 +79,7 @@ class Controller extends BaseController
return redirect()->route('dashboard');
}
}
public function team()
{
$invitations = [];
@@ -87,18 +90,23 @@ class Controller extends BaseController
'invitations' => $invitations,
]);
}
public function storages() {
public function storages()
{
$s3 = S3Storage::ownedByCurrentTeam()->get();
return view('team.storages.all', [
's3' => $s3,
]);
}
public function storages_show() {
public function storages_show()
{
$storage = S3Storage::ownedByCurrentTeam()->whereUuid(request()->storage_uuid)->firstOrFail();
return view('team.storages.show', [
'storage' => $storage,
]);
}
public function members()
{
$invitations = [];
@@ -109,6 +117,7 @@ class Controller extends BaseController
'invitations' => $invitations,
]);
}
public function acceptInvitation()
{
try {
@@ -135,6 +144,7 @@ class Controller extends BaseController
throw $th;
}
}
public function revokeInvitation()
{
try {
@@ -152,4 +162,4 @@ class Controller extends BaseController
throw $th;
}
}
}
}

View File

@@ -2,15 +2,13 @@
namespace App\Http\Controllers;
use App\Models\ApplicationDeploymentQueue;
use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
use Illuminate\Foundation\Validation\ValidatesRequests;
use Illuminate\Http\Request;
use Spatie\Activitylog\Models\Activity;
class DatabaseController extends Controller
{
use AuthorizesRequests, ValidatesRequests;
public function configuration()
{
$project = session('currentTeam')->load(['projects'])->projects->where('uuid', request()->route('project_uuid'))->first();

View File

@@ -2,7 +2,6 @@
namespace App\Http\Controllers;
use App\Http\Livewire\Server\PrivateKey;
use App\Models\Environment;
use App\Models\Project;
use App\Models\Server;
@@ -16,24 +15,28 @@ class MagicController extends Controller
'servers' => Server::isUsable()->get()
]);
}
public function destinations()
{
return response()->json([
'destinations' => Server::destinationsByServer(request()->query('server_id'))->sortBy('name')
]);
}
public function projects()
{
return response()->json([
'projects' => Project::ownedByCurrentTeam()->get()
]);
}
public function environments()
{
return response()->json([
'environments' => Project::ownedByCurrentTeam()->whereUuid(request()->query('project_uuid'))->first()->environments
]);
}
public function newProject()
{
$project = Project::firstOrCreate(
@@ -44,6 +47,7 @@ class MagicController extends Controller
'project_uuid' => $project->uuid
]);
}
public function newEnvironment()
{
$environment = Environment::firstOrCreate(
@@ -54,6 +58,7 @@ class MagicController extends Controller
'environment_name' => $environment->name,
]);
}
public function newTeam()
{
$team = Team::create(

View File

@@ -25,6 +25,7 @@ class ProjectController extends Controller
}
return view('project.edit', ['project' => $project]);
}
public function show()
{
$projectUuid = request()->route('project_uuid');
@@ -55,6 +56,7 @@ class ProjectController extends Controller
'type' => $type
]);
}
public function resources()
{
$project = session('currentTeam')->load(['projects'])->projects->where('uuid', request()->route('project_uuid'))->first();