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

Remove extraneous parameters

Browse Source
This commit is contained in:
Lance Pioch 2024-06-05 16:03:04 -04:00
parent 6f009ee126
commit 6f1de67523
4 changed files with 8 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,7 +3,6 @@
namespace App\Http\Controllers\Admin\Nodes; namespace App\Http\Controllers\Admin\Nodes;
use Illuminate\View\View; use Illuminate\View\View;
use Illuminate\Http\Request;
use App\Models\Node; use App\Models\Node;
use Spatie\QueryBuilder\QueryBuilder; use Spatie\QueryBuilder\QueryBuilder;
use App\Http\Controllers\Controller; use App\Http\Controllers\Controller;
@ -13,7 +12,7 @@ class NodeController extends Controller
/** /**
* Returns a listing of nodes on the system. * Returns a listing of nodes on the system.
*/ */
public function index(Request $request): View public function index(): View
{ {
$nodes = QueryBuilder::for( $nodes = QueryBuilder::for(
Node::query()->withCount('servers') Node::query()->withCount('servers')

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

@ -3,7 +3,6 @@
namespace App\Http\Controllers\Admin\Nodes; namespace App\Http\Controllers\Admin\Nodes;
use Illuminate\View\View; use Illuminate\View\View;
use Illuminate\Http\Request;
use App\Models\Node; use App\Models\Node;
use Illuminate\Support\Collection; use Illuminate\Support\Collection;
use App\Models\Allocation; use App\Models\Allocation;
@ -29,16 +28,10 @@ class NodeViewController extends Controller
/** /**
* Returns index view for a specific node on the system. * Returns index view for a specific node on the system.
*/ */
public function index(Request $request, Node $node): View public function index(Node $node): View
{ {
$node->loadCount('servers'); $node->loadCount('servers');
$stats = Node::query()
->selectRaw('IFNULL(SUM(servers.memory), 0) as sum_memory, IFNULL(SUM(servers.disk), 0) as sum_disk')
->join('servers', 'servers.node_id', '=', 'nodes.id')
->where('node_id', '=', $node->id)
->first();
return view('admin.nodes.view.index', [ return view('admin.nodes.view.index', [
'node' => $node, 'node' => $node,
'version' => $this->versionService, 'version' => $this->versionService,
@ -48,7 +41,7 @@ class NodeViewController extends Controller
/** /**
* Returns the settings page for a specific node. * Returns the settings page for a specific node.
*/ */
public function settings(Request $request, Node $node): View public function settings(Node $node): View
{ {
return view('admin.nodes.view.settings', [ return view('admin.nodes.view.settings', [
'node' => $node, 'node' => $node,
@ -58,7 +51,7 @@ class NodeViewController extends Controller
/** /**
* Return the node configuration page for a specific node. * Return the node configuration page for a specific node.
*/ */
public function configuration(Request $request, Node $node): View public function configuration(Node $node): View
{ {
return view('admin.nodes.view.configuration', compact('node')); return view('admin.nodes.view.configuration', compact('node'));
} }
@ -66,7 +59,7 @@ class NodeViewController extends Controller
/** /**
* Return the node allocation management page. * Return the node allocation management page.
*/ */
public function allocations(Request $request, Node $node): View public function allocations(Node $node): View
{ {
$node->setRelation( $node->setRelation(
'allocations', 'allocations',
@ -92,7 +85,7 @@ class NodeViewController extends Controller
/** /**
* Return a listing of servers that exist for this specific node. * Return a listing of servers that exist for this specific node.
*/ */
public function servers(Request $request, Node $node): View public function servers(Node $node): View
{ {
$this->plainInject([ $this->plainInject([
'node' => Collection::wrap($node->makeVisible(['daemon_token_id', 'daemon_token'])) 'node' => Collection::wrap($node->makeVisible(['daemon_token_id', 'daemon_token']))

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

@ -3,7 +3,6 @@
namespace App\Http\Controllers\Admin\Servers; namespace App\Http\Controllers\Admin\Servers;
use Illuminate\View\View; use Illuminate\View\View;
use Illuminate\Http\Request;
use App\Models\Server; use App\Models\Server;
use Spatie\QueryBuilder\QueryBuilder; use Spatie\QueryBuilder\QueryBuilder;
use Spatie\QueryBuilder\AllowedFilter; use Spatie\QueryBuilder\AllowedFilter;
@ -16,7 +15,7 @@ class ServerController extends Controller
* Returns all the servers that exist on the system using a paginated result set. If * 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. * a query is passed along in the request it is also passed to the repository function.
*/ */
public function index(Request $request): View public function index(): View
{ {
$servers = QueryBuilder::for(Server::query()->with('node', 'user', 'allocation')) $servers = QueryBuilder::for(Server::query()->with('node', 'user', 'allocation'))
->allowedFilters([ ->allowedFilters([

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

@ -37,7 +37,7 @@ class UserController extends Controller
/** /**
* Display user index page. * Display user index page.
*/ */
public function index(Request $request): View public function index(): View
{ {
$users = QueryBuilder::for( $users = QueryBuilder::for(
User::query()->select('users.*') User::query()->select('users.*')