Thats enough re-theming for the day...

Author: DaneEveritt

app/Http/Controllers/Admin/ServersController.php

@@ -46,8 +46,16 @@ public function __construct()
 
     public function getIndex(Request $request)
     {
+        $servers = Models\Server::withTrashed()->with(
+            'node', 'user', 'allocation'
+        );
+
+        if (! is_null($request->input('query'))) {
+            $servers->search($request->input('query'));
+        }
+
         return view('admin.servers.index', [
-            'servers' => Models\Server::withTrashed()->with('node', 'user')->paginate(25),
+            'servers' => $servers->paginate(25),
         ]);
     }
 
@@ -109,13 +117,25 @@ public function postNewServer(Request $request)
      */
     public function postNewServerGetNodes(Request $request)
     {
-        if (! $request->input('location')) {
-            return response()->json([
-                'error' => 'Missing location in request.',
-            ], 500);
-        }
-
-        return response()->json(Models\Node::select('id', 'name', 'public')->where('location_id', $request->input('location'))->get());
+        $nodes = Models\Node::with('allocations')->where('location_id', $request->input('location'))->get();
+        return $nodes->map(function ($item) {
+            $filtered = $item->allocations->map(function($map) {
+                return collect($map)->only(['ip', 'port']);
+            });
+
+            $item->ports = $filtered->unique('ip')->map(function ($map) use ($item) {
+                return [
+                    'ip' => $map['ip'],
+                    'ports' => $item->allocations->where('ip', $map['ip'])->pluck('port')->all(),
+                ];
+            })->values();
+
+            return [
+                'id' => $item->id,
+                'text' => $item->name,
+                'allocations' => $item->ports,
+            ];
+        })->values();
     }
 
     /**
@@ -126,24 +146,7 @@ public function postNewServerGetNodes(Request $request)
      */
     public function postNewServerGetIps(Request $request)
     {
-        if (! $request->input('node')) {
-            return response()->json([
-                'error' => 'Missing node in request.',
-            ], 500);
-        }
-
-        $ips = Models\Allocation::where('node_id', $request->input('node'))->whereNull('server_id')->get();
-        $listing = [];
-
-        foreach ($ips as &$ip) {
-            if (array_key_exists($ip->ip, $listing)) {
-                $listing[$ip->ip] = array_merge($listing[$ip->ip], [$ip->port]);
-            } else {
-                $listing[$ip->ip] = [$ip->port];
-            }
-        }
-
-        return response()->json($listing);
+        return Models\Allocation::select('id', 'ip')->where('node_id', $request->input('node'))->whereNull('server_id')->get()->unique('ip')->values()->all();
     }
 
     /**

app/Http/Controllers/Admin/UserController.php

@@ -124,6 +124,12 @@ public function updateUser(Request $request, $user)
 
     public function getJson(Request $request)
     {
-        return User::select('email')->get()->pluck('email');
+        return User::select('id', 'email', 'username', 'name_first', 'name_last')
+            ->search($request->input('q'))
+            ->get()->transform(function ($item) {
+                $item->md5 = md5(strtolower($item->email));
+
+                return $item;
+            });
     }
 }

app/Http/Middleware/AdminAuthenticate.php

@@ -69,9 +69,6 @@ public function handle($request, Closure $next)
             return abort(403);
         }
 
-        // @TODO: eventually update admin themes
-        Theme::set('default');
-
         return $next($request);
     }
 }

app/Http/Routes/AdminRoutes.php

@@ -136,18 +136,22 @@ public function map(Router $router)
 
             // Assorted Page Helpers
             $router->post('/new/get-nodes', [
+                'as' => 'admin.servers.new.get-nodes',
                 'uses' => 'Admin\ServersController@postNewServerGetNodes',
             ]);
 
             $router->post('/new/get-ips', [
+                'as' => 'admin.servers.new.get-ips',
                 'uses' => 'Admin\ServersController@postNewServerGetIps',
             ]);
 
             $router->post('/new/service-options', [
+                'as' => 'admin.servers.new.service-options',
                 'uses' => 'Admin\ServersController@postNewServerServiceOption',
             ]);
 
             $router->post('/new/option-details', [
+                'as' => 'admin.servers.new.option-details',
                 'uses' => 'Admin\ServersController@postNewServerOptionDetails',
             ]);
             // End Assorted Page Helpers

app/Models/Server.php

@@ -29,11 +29,12 @@
 use Javascript;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Notifications\Notifiable;
+use Nicolaslopezj\Searchable\SearchableTrait;
 use Illuminate\Database\Eloquent\SoftDeletes;
 
 class Server extends Model
 {
-    use Notifiable, SoftDeletes;
+    use Notifiable, SearchableTrait, SoftDeletes;
 
     /**
      * The table associated with the model.
@@ -85,6 +86,22 @@ class Server extends Model
          'installed' => 'integer',
      ];
 
+     protected $searchable = [
+         'columns' => [
+             'servers.name' => 10,
+             'servers.username' => 10,
+             'servers.uuidShort' => 9,
+             'servers.uuid' => 8,
+             'users.email' => 6,
+             'users.username' => 6,
+             'nodes.name' => 2,
+         ],
+         'joins' => [
+            'users' => ['users.id', 'servers.owner_id'],
+            'nodes' => ['nodes.id', 'servers.node_id'],
+         ],
+     ];
+
     /**
      * Returns a single server specified by UUID.
      * DO NOT USE THIS TO MODIFY SERVER DETAILS OR SAVE THOSE DETAILS.

app/Models/User.php

@@ -30,6 +30,7 @@
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Notifications\Notifiable;
 use Pterodactyl\Exceptions\DisplayException;
+use Nicolaslopezj\Searchable\SearchableTrait;
 use Illuminate\Auth\Passwords\CanResetPassword;
 use Illuminate\Foundation\Auth\Access\Authorizable;
 use Illuminate\Contracts\Auth\Authenticatable as AuthenticatableContract;
@@ -39,7 +40,7 @@
 
 class User extends Model implements AuthenticatableContract, AuthorizableContract, CanResetPasswordContract
 {
-    use Authenticatable, Authorizable, CanResetPassword, Notifiable;
+    use Authenticatable, Authorizable, CanResetPassword, Notifiable, SearchableTrait;
 
     /**
      * The rules for user passwords.
@@ -87,6 +88,16 @@ class User extends Model implements AuthenticatableContract, AuthorizableContrac
      */
     protected $hidden = ['password', 'remember_token', 'totp_secret'];
 
+    protected $searchable = [
+        'columns' => [
+            'email' => 10,
+            'username' => 9,
+            'name_first' => 6,
+            'name_last' => 6,
+            'uuid' => 1,
+        ],
+    ];
+
     /**
      * Enables or disables TOTP on an account if the token is valid.
      *

composer.json

@@ -29,7 +29,8 @@
         "predis/predis": "1.1.1",
         "fideloper/proxy": "3.2.0",
         "laracasts/utilities": "2.1.0",
-        "lord/laroute": "2.3.0"
+        "lord/laroute": "2.3.0",
+        "nicolaslopezj/searchable": "1.9.5"
     },
     "require-dev": {
         "fzaninotto/faker": "~1.4",

composer.lock

@@ -132,3 +132,20 @@ td.has-progress {
 .no-margin {
     margin: 0 !important;
 }
+
+li.select2-results__option--highlighted[aria-selected="false"] > .user-block > .username > a {
+    color: #fff;
+}
+
+li.select2-results__option--highlighted[aria-selected="false"] > .user-block > .description {
+    color: #eee;
+}
+
+.img-bordered-xs {
+    border: 1px solid #d2d6de;
+    padding: 1px;
+}
+
+span[aria-labelledby="select2-pOwner-container"] {
+    padding-left: 2px !important;
+}