banquise/pelican-panel-mirror
3
0
Fork 1
mirror of https://github.com/pelican-dev/panel.git synced 2025-05-20 06:24:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

Use view helper instead

Browse Source
This commit is contained in:
Lance Pioch 2024-03-16 23:23:07 -04:00
parent 8808a94154
commit 38d68d8221
19 changed files with 37 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Http/Controllers/Admin/ApiController.php
View File

@ -35,7 +35,7 @@ class ApiController extends Controller
->where('key_type', ApiKey::TYPE_APPLICATION)
->get();
return $this->view->make('admin.api.index', [
return view('admin.api.index', [
'keys' => $keys,
]);
}
@ -50,7 +50,7 @@ class ApiController extends Controller
$resources = AdminAcl::getResourceList();
sort($resources);
return $this->view->make('admin.api.new', [
return view('admin.api.new', [
'resources' => $resources,
'permissions' => [
'r' => AdminAcl::READ,

2
app/Http/Controllers/Admin/BaseController.php
View File

@ -21,6 +21,6 @@ class BaseController extends Controller
*/
public function index(): View
{
return $this->view->make('admin.index', ['version' => $this->version]);
return view('admin.index', ['version' => $this->version]);
}
}

4
app/Http/Controllers/Admin/DatabaseController.php
View File

@ -38,7 +38,7 @@ class DatabaseController extends Controller
->with('node')
->get();
return $this->view->make('admin.databases.index', [
return view('admin.databases.index', [
'nodes' => Node::all(),
'hosts' => $hosts,
]);
@ -55,7 +55,7 @@ class DatabaseController extends Controller
$host = DatabaseHost::query()->findOrFail($host);
$databases = $host->databases()->with('server')->paginate(25);
return $this->view->make('admin.databases.view', [
return view('admin.databases.view', [
'nodes' => Node::all(),
'host' => $host,
'databases' => $databases,

6
app/Http/Controllers/Admin/Eggs/EggController.php
View File

@ -32,7 +32,7 @@ class EggController extends Controller
*/
public function index(): View
{
return $this->view->make('admin.eggs.index', [
return view('admin.eggs.index', [
'eggs' => Egg::all(),
]);
}
@ -47,7 +47,7 @@ class EggController extends Controller
$eggs = Egg::all();
\JavaScript::put(['eggs' => $eggs->keyBy('id')]);
return $this->view->make('admin.eggs.new', ['eggs' => $eggs]);
return view('admin.eggs.new', ['eggs' => $eggs]);
}
/**
@ -72,7 +72,7 @@ class EggController extends Controller
*/
public function view(Egg $egg): View
{
return $this->view->make('admin.eggs.view', [
return view('admin.eggs.view', [
'egg' => $egg,
'images' => array_map(
fn ($key, $value) => $key === $value ? $value : "$key|$value",

2
app/Http/Controllers/Admin/Eggs/EggScriptController.php
View File

@ -40,7 +40,7 @@ class EggScriptController extends Controller
$rely = Egg::query()->where('copy_script_from', $egg->id)->firstOrFail();
return $this->view->make('admin.eggs.scripts', [
return view('admin.eggs.scripts', [
'copyFromOptions' => $copy,
'relyOnScript' => $rely,
'egg' => $egg,

2
app/Http/Controllers/Admin/Eggs/EggVariableController.php
View File

@ -33,7 +33,7 @@ class EggVariableController extends Controller
{
$egg = Egg::with('variables')->findOrFail($egg);
return $this->view->make('admin.eggs.variables', ['egg' => $egg]);
return view('admin.eggs.variables', ['egg' => $egg]);
}
/**

4
app/Http/Controllers/Admin/MountController.php
View File

@ -30,7 +30,7 @@ class MountController extends Controller
*/
public function index(): View
{
return $this->view->make('admin.mounts.index', [
return view('admin.mounts.index', [
'mounts' => Mount::query()->withCount(['eggs', 'nodes'])->get(),
]);
}
@ -42,7 +42,7 @@ class MountController extends Controller
*/
public function view(string $id): View
{
return $this->view->make('admin.mounts.view', [
return view('admin.mounts.view', [
'mount' => Mount::with(['eggs', 'nodes'])->findOrFail($id),
'eggs' => Egg::all(),
]);

10
app/Http/Controllers/Admin/Nodes/NodeController.php
View File

@ -7,17 +7,9 @@ use Illuminate\Http\Request;
use App\Models\Node;
use Spatie\QueryBuilder\QueryBuilder;
use App\Http\Controllers\Controller;
use Illuminate\Contracts\View\Factory as ViewFactory;
class NodeController extends Controller
{
/**
* NodeController constructor.
*/
public function __construct(private ViewFactory $view)
{
}
/**
* Returns a listing of nodes on the system.
*/
@ -30,6 +22,6 @@ class NodeController extends Controller
->allowedSorts(['id'])
->paginate(25);
return $this->view->make('admin.nodes.index', ['nodes' => $nodes]);
return view('admin.nodes.index', ['nodes' => $nodes]);
}
}

12
app/Http/Controllers/Admin/Nodes/NodeViewController.php
View File

@ -8,7 +8,6 @@ use App\Models\Node;
use Illuminate\Support\Collection;
use App\Models\Allocation;
use App\Http\Controllers\Controller;
use Illuminate\Contracts\View\Factory as ViewFactory;
use App\Traits\Controllers\JavascriptInjection;
use App\Services\Helpers\SoftwareVersionService;
@ -24,7 +23,6 @@ class NodeViewController extends Controller
*/
public function __construct(
private SoftwareVersionService $versionService,
private ViewFactory $view
) {
}
@ -61,7 +59,7 @@ class NodeViewController extends Controller
})
->toArray();
return $this->view->make('admin.nodes.view.index', [
return view('admin.nodes.view.index', [
'node' => $node,
'stats' => $stats,
'version' => $this->versionService,
@ -73,7 +71,7 @@ class NodeViewController extends Controller
*/
public function settings(Request $request, Node $node): View
{
return $this->view->make('admin.nodes.view.settings', [
return view('admin.nodes.view.settings', [
'node' => $node,
]);
}
@ -83,7 +81,7 @@ class NodeViewController extends Controller
*/
public function configuration(Request $request, Node $node): View
{
return $this->view->make('admin.nodes.view.configuration', compact('node'));
return view('admin.nodes.view.configuration', compact('node'));
}
/**
@ -103,7 +101,7 @@ class NodeViewController extends Controller
$this->plainInject(['node' => Collection::wrap($node)->only(['id'])]);
return $this->view->make('admin.nodes.view.allocation', [
return view('admin.nodes.view.allocation', [
'node' => $node,
'allocations' => Allocation::query()->where('node_id', $node->id)
->groupBy('ip')
@ -122,7 +120,7 @@ class NodeViewController extends Controller
->only(['scheme', 'fqdn', 'daemonListen', 'daemon_token_id', 'daemon_token']),
]);
return $this->view->make('admin.nodes.view.servers', [
return view('admin.nodes.view.servers', [
'node' => $node,
'servers' => $node->servers()->with(['user', 'egg'])->paginate(25),
]);

2
app/Http/Controllers/Admin/NodesController.php
View File

@ -45,7 +45,7 @@ class NodesController extends Controller
*/
public function create(): View|RedirectResponse
{
return $this->view->make('admin.nodes.new');
return view('admin.nodes.new');
}
/**

2
app/Http/Controllers/Admin/Servers/CreateServerController.php
View File

@ -45,7 +45,7 @@ class CreateServerController extends Controller
'eggs' => $eggs->keyBy('id'),
]);
return $this->view->make('admin.servers.new', [
return view('admin.servers.new', [
'eggs' => $eggs,
'nodes' => Node::all(),
]);

10
app/Http/Controllers/Admin/Servers/ServerController.php
View File

@ -9,17 +9,9 @@ use Spatie\QueryBuilder\QueryBuilder;
use Spatie\QueryBuilder\AllowedFilter;
use App\Http\Controllers\Controller;
use App\Models\Filters\AdminServerFilter;
use Illuminate\Contracts\View\Factory as ViewFactory;
class ServerController extends Controller
{
/**
* ServerController constructor.
*/
public function __construct(private ViewFactory $view)
{
}
/**
* Returns all the servers that exist on the system using a paginated result set. If
* a query is passed along in the request it is also passed to the repository function.
@ -33,6 +25,6 @@ class ServerController extends Controller
])
->paginate(config()->get('panel.paginate.admin.servers'));
return $this->view->make('admin.servers.index', ['servers' => $servers]);
return view('admin.servers.index', ['servers' => $servers]);
}
}

18
app/Http/Controllers/Admin/Servers/ServerViewController.php
View File

@ -12,7 +12,6 @@ use App\Models\Server;
use App\Exceptions\DisplayException;
use App\Http\Controllers\Controller;
use App\Services\Servers\EnvironmentService;
use Illuminate\Contracts\View\Factory as ViewFactory;
use App\Traits\Controllers\JavascriptInjection;
class ServerViewController extends Controller
@ -24,7 +23,6 @@ class ServerViewController extends Controller
*/
public function __construct(
private EnvironmentService $environmentService,
private ViewFactory $view
) {
}
@ -33,7 +31,7 @@ class ServerViewController extends Controller
*/
public function index(Request $request, Server $server): View
{
return $this->view->make('admin.servers.view.index', compact('server'));
return view('admin.servers.view.index', compact('server'));
}
/**
@ -41,7 +39,7 @@ class ServerViewController extends Controller
*/
public function details(Request $request, Server $server): View
{
return $this->view->make('admin.servers.view.details', compact('server'));
return view('admin.servers.view.details', compact('server'));
}
/**
@ -51,7 +49,7 @@ class ServerViewController extends Controller
{
$allocations = $server->node->allocations->toBase();
return $this->view->make('admin.servers.view.build', [
return view('admin.servers.view.build', [
'server' => $server,
'assigned' => $allocations->where('server_id', $server->id)->sortBy('port')->sortBy('ip'),
'unassigned' => $allocations->where('server_id', null)->sortBy('port')->sortBy('ip'),
@ -74,7 +72,7 @@ class ServerViewController extends Controller
'eggs' => $eggs,
]);
return $this->view->make('admin.servers.view.startup', compact('server', 'eggs'));
return view('admin.servers.view.startup', compact('server', 'eggs'));
}
/**
@ -82,7 +80,7 @@ class ServerViewController extends Controller
*/
public function database(Request $request, Server $server): View
{
return $this->view->make('admin.servers.view.database', [
return view('admin.servers.view.database', [
'hosts' => DatabaseHost::all(),
'server' => $server,
]);
@ -100,7 +98,7 @@ class ServerViewController extends Controller
->whereHas('nodes', fn ($q) => $q->where('id', $server->node_id))
->get();
return $this->view->make('admin.servers.view.mounts', [
return view('admin.servers.view.mounts', [
'mounts' => $mounts,
'server' => $server,
]);
@ -129,7 +127,7 @@ class ServerViewController extends Controller
'nodeData' => Node::getForServerCreation(),
]);
return $this->view->make('admin.servers.view.manage', [
return view('admin.servers.view.manage', [
'nodes' => Node::all(),
'server' => $server,
'canTransfer' => $canTransfer,
@ -141,6 +139,6 @@ class ServerViewController extends Controller
*/
public function delete(Request $request, Server $server): View
{
return $this->view->make('admin.servers.view.delete', compact('server'));
return view('admin.servers.view.delete', compact('server'));
}
}

2
app/Http/Controllers/Admin/Settings/AdvancedController.php
View File

@ -38,7 +38,7 @@ class AdvancedController extends Controller
$showRecaptchaWarning = true;
}
return $this->view->make('admin.settings.advanced', [
return view('admin.settings.advanced', [
'showRecaptchaWarning' => $showRecaptchaWarning,
]);
}

2
app/Http/Controllers/Admin/Settings/IndexController.php
View File

@ -33,7 +33,7 @@ class IndexController extends Controller
*/
public function index(): View
{
return $this->view->make('admin.settings.index', [
return view('admin.settings.index', [
'version' => $this->versionService,
'languages' => $this->getAvailableLanguages(true),
]);

2
app/Http/Controllers/Admin/Settings/MailController.php
View File

@ -36,7 +36,7 @@ class MailController extends Controller
*/
public function index(): View
{
return $this->view->make('admin.settings.mail', [
return view('admin.settings.mail', [
'disabled' => $this->config->get('mail.default') !== 'smtp',
]);
}

6
app/Http/Controllers/Admin/UserController.php
View File

@ -55,7 +55,7 @@ class UserController extends Controller
->allowedSorts(['id', 'uuid'])
->paginate(50);
return $this->view->make('admin.users.index', ['users' => $users]);
return view('admin.users.index', ['users' => $users]);
}
/**
@ -63,7 +63,7 @@ class UserController extends Controller
*/
public function create(): View
{
return $this->view->make('admin.users.new', [
return view('admin.users.new', [
'languages' => $this->getAvailableLanguages(true),
]);
}
@ -73,7 +73,7 @@ class UserController extends Controller
*/
public function view(User $user): View
{
return $this->view->make('admin.users.view', [
return view('admin.users.view', [
'user' => $user,
'languages' => $this->getAvailableLanguages(true),
]);

12
app/Http/Controllers/Auth/LoginController.php
View File

@ -9,19 +9,9 @@ use App\Models\User;
use Illuminate\Http\JsonResponse;
use App\Facades\Activity;
use Illuminate\Contracts\View\View;
use Illuminate\Contracts\View\Factory as ViewFactory;
use Illuminate\Database\Eloquent\ModelNotFoundException;
class LoginController extends AbstractLoginController
{
/**
* LoginController constructor.
*/
public function __construct(private ViewFactory $view)
{
parent::__construct();
}
/**
* Handle all incoming requests for the authentication routes and render the
* base authentication view component. React will take over at this point and
@ -29,7 +19,7 @@ class LoginController extends AbstractLoginController
*/
public function index(): View
{
return $this->view->make('templates/auth.core');
return view('templates/auth.core');
}
/**

2
app/Http/Controllers/Base/IndexController.php
View File

@ -20,6 +20,6 @@ class IndexController extends Controller
*/
public function index(): View
{
return $this->view->make('templates/base.core');
return view('templates/base.core');
}
}