Merge pull request pterodactyl#259 from Pterodactyl/feature/new-theme

Implement new AdminLTE theme for front-end of panel.

Author: DaneEveritt

.phraseapp.yml

@@ -9,18 +9,18 @@ phraseapp:
     - file: ./resources/lang/<locale_code>/auth.php
       params:
         tag: "auth"
-    - file: ./resources/lang/<locale_code>/base.php
-      params:
-        tag: "base"
+    # - file: ./resources/lang/<locale_code>/base.php
+    #   params:
+    #     tag: "base"
     - file: ./resources/lang/<locale_code>/pagination.php
       params:
         tag: "pagination"
     - file: ./resources/lang/<locale_code>/passwords.php
       params:
         tag: "passwords"
-    - file: ./resources/lang/<locale_code>/server.php
-      params:
-        tag: "server"
+    # - file: ./resources/lang/<locale_code>/server.php
+    #   params:
+    #     tag: "server"
     - file: ./resources/lang/<locale_code>/strings.php
       params:
         tag: "strings"

CHANGELOG.md

@@ -9,6 +9,7 @@ This project follows [Semantic Versioning](http://semver.org) guidelines.
 * Basic service pack implementation to allow assignment of modpacks or software to a server to pre-install applications and allow users to update.
 * Users can now have a username as well as client name assigned to their account.
 * Ability to create a node through the CLI using `pterodactyl:node` as well as locations via `pterodactyl:location`.
+* New theme (AdminLTE) for front-end with tweaks to backend files to work properly with it.
 
 ### Fixed
 * Bug causing error logs to be spammed if someone timed out on an ajax based page.

README.md

@@ -33,6 +33,8 @@ A huge thanks to [PhraseApp](https://phraseapp.com) who provide us the software
 
 Ace Editor - [license](https://github.com/ajaxorg/ace/blob/master/LICENSE) - [homepage](https://ace.c9.io)
 
+AdminLTE - [license](https://github.com/almasaeed2010/AdminLTE/blob/master/LICENSE) - [homepage](https://almsaeedstudio.com)
+
 Animate.css - [license](https://github.com/daneden/animate.css/blob/master/LICENSE) - [homepage](http://daneden.github.io/animate.css/)
 
 Async.js - [license](https://github.com/caolan/async/blob/master/LICENSE) - [homepage](https://github.com/caolan/async/)
@@ -57,8 +59,12 @@ jQuery Terminal - [license](https://github.com/jcubic/jquery.terminal/blob/maste
 
 Lodash - [license](https://github.com/lodash/lodash/blob/master/LICENSE) - [homepage](https://lodash.com/)
 
+Select2 - [license](https://github.com/select2/select2/blob/master/LICENSE.md) - [homepage](https://select2.github.io)
+
 Socket.io - [license](https://github.com/socketio/socket.io/blob/master/LICENSE) - [homepage](http://socket.io)
 
+Socket.io File Upload - [license](https://github.com/vote539/socketio-file-upload/blob/master/server.js#L1-L27) - [homepage](https://github.com/vote539/socketio-file-upload)
+
 SweetAlert - [license](https://github.com/t4t5/sweetalert/blob/master/LICENSE) - [homepage](http://t4t5.github.io/sweetalert/)
 
 Typeahead — [license](https://github.com/bassjobsen/Bootstrap-3-Typeahead/blob/master/bootstrap3-typeahead.js) — [homepage](https://github.com/bassjobsen/Bootstrap-3-Typeahead)

app/Exceptions/Handler.php

@@ -49,7 +49,7 @@ public function render($request, Exception $exception)
         if ($request->expectsJson()) {
             $response = response()->json([
                 'error' => ($exception instanceof DisplayException) ? $exception->getMessage() : 'An unhandled error occured while attempting to process this request.',
-            ], ($this->isHttpException($exception)) ? $e->getStatusCode() : 500);
+            ], ($this->isHttpException($exception)) ? $exception->getStatusCode() : 500);
 
             parent::report($exception);
         }

app/Http/Controllers/Base/SecurityController.php

@@ -79,7 +79,9 @@ public function generateTotp(Request $request)
     public function setTotp(Request $request)
     {
         if (! $request->has('token')) {
-            return response(null, 500);
+            return response()->json([
+                'error' => 'Request is missing token parameter.',
+            ], 500);
         }
 
         $user = $request->user();
@@ -101,7 +103,7 @@ public function disableTotp(Request $request)
         if (! $request->has('token')) {
             Alert::danger('Missing required `token` field in request.')->flash();
 
-            return redirect()->route('account.totp');
+            return redirect()->route('account.security');
         }
 
         $user = $request->user();

app/Http/Controllers/Server/ServerController.php

@@ -58,8 +58,11 @@ public function __construct()
     public function getIndex(Request $request)
     {
         $server = Models\Server::getByUUID($request->route()->server);
+        $node = Models\Node::find($server->node);
 
         Javascript::put([
+            'server' => collect($server->makeVisible('daemonSecret'))->only(['uuid', 'daemonSecret', 'username']),
+            'node' => collect($node)->only('fqdn', 'scheme', 'daemonListen'),
             'meta' => [
                 'saveFile' => route('server.files.save', $server->uuidShort),
                 'csrfToken' => csrf_token(),
@@ -68,8 +71,7 @@ public function getIndex(Request $request)
 
         return view('server.index', [
             'server' => $server,
-            'allocations' => Models\Allocation::where('assigned_to', $server->id)->orderBy('ip', 'asc')->orderBy('port', 'asc')->get(),
-            'node' => Models\Node::find($server->node),
+            'node' => $node,
         ]);
     }
 
@@ -120,10 +122,16 @@ public function getAddFile(Request $request, $uuid)
     {
         $server = Models\Server::getByUUID($uuid);
         $this->authorize('add-files', $server);
+        $node = Models\Node::find($server->node);
+
+        Javascript::put([
+            'server' => collect($server->makeVisible('daemonSecret'))->only(['uuid', 'uuidShort', 'daemonSecret', 'username']),
+            'node' => collect($node)->only('fqdn', 'scheme', 'daemonListen'),
+        ]);
 
         return view('server.files.add', [
             'server' => $server,
-            'node' => Models\Node::find($server->node),
+            'node' => $node,
             'directory' => (in_array($request->get('dir'), [null, '/', ''])) ? '' : trim($request->get('dir'), '/') . '/',
         ]);
     }
@@ -140,6 +148,7 @@ public function getEditFile(Request $request, $uuid, $file)
     {
         $server = Models\Server::getByUUID($uuid);
         $this->authorize('edit-files', $server);
+        $node = Models\Node::find($server->node);
 
         $fileInfo = (object) pathinfo($file);
         $controller = new FileRepository($uuid);
@@ -157,9 +166,15 @@ public function getEditFile(Request $request, $uuid, $file)
             return redirect()->route('server.files.index', $uuid);
         }
 
+        Javascript::put([
+            'server' => collect($server->makeVisible('daemonSecret'))->only(['uuid', 'uuidShort', 'daemonSecret', 'username']),
+            'node' => collect($node)->only('fqdn', 'scheme', 'daemonListen'),
+            'stat' => $fileContent['stat'],
+        ]);
+
         return view('server.files.edit', [
             'server' => $server,
-            'node' => Models\Node::find($server->node),
+            'node' => $node,
             'file' => $file,
             'stat' => $fileContent['stat'],
             'contents' => $fileContent['file']->content,
@@ -193,17 +208,36 @@ public function getDownloadFile(Request $request, $uuid, $file)
         return redirect($node->scheme . '://' . $node->fqdn . ':' . $node->daemonListen . '/server/file/download/' . $download->token);
     }
 
-    /**
-     * Renders server settings page.
-     *
-     * @param  \Illuminate\Http\Request $request
-     * @return \Illuminate\Contracts\View\View
-     */
-    public function getSettings(Request $request, $uuid)
+    public function getAllocation(Request $request, $uuid)
+    {
+        $server = Models\Server::getByUUID($uuid);
+        $this->authorize('view-allocation', $server);
+        $node = Models\Node::find($server->node);
+
+        Javascript::put([
+            'server' => collect($server->makeVisible('daemonSecret'))->only(['uuid', 'uuidShort', 'daemonSecret', 'username']),
+            'node' => collect($node)->only('fqdn', 'scheme', 'daemonListen'),
+        ]);
+
+        return view('server.settings.allocation', [
+            'server' => $server,
+            'allocations' => Models\Allocation::where('assigned_to', $server->id)->orderBy('ip', 'asc')->orderBy('port', 'asc')->get(),
+            'node' => $node,
+        ]);
+    }
+
+    public function getStartup(Request $request, $uuid)
     {
         $server = Models\Server::getByUUID($uuid);
+        $this->authorize('view-startup', $server);
+        $node = Models\Node::find($server->node);
         $allocation = Models\Allocation::findOrFail($server->allocation);
 
+        Javascript::put([
+            'server' => collect($server->makeVisible('daemonSecret'))->only(['uuid', 'uuidShort', 'daemonSecret', 'username']),
+            'node' => collect($node)->only('fqdn', 'scheme', 'daemonListen'),
+        ]);
+
         $variables = Models\ServiceVariables::select(
                 'service_variables.*',
                 DB::raw('COALESCE(server_variables.variable_value, service_variables.default_value) as a_serverValue')
@@ -231,19 +265,53 @@ public function getSettings(Request $request, $uuid)
             $processed = str_replace('{{' . $variable->env_variable . '}}', $replace, $processed);
         }
 
-        return view('server.settings', [
+        return view('server.settings.startup', [
             'server' => $server,
-            'databases' => Models\Database::select('databases.*', 'database_servers.host as a_host', 'database_servers.port as a_port')
-                ->where('server_id', $server->id)
-                ->join('database_servers', 'database_servers.id', '=', 'databases.db_server')
-                ->get(),
             'node' => Models\Node::find($server->node),
             'variables' => $variables->where('user_viewable', 1),
             'service' => $service,
             'processedStartup' => $processed,
         ]);
     }
 
+    public function getDatabases(Request $request, $uuid)
+    {
+        $server = Models\Server::getByUUID($uuid);
+        $this->authorize('view-databases', $server);
+        $node = Models\Node::find($server->node);
+
+        Javascript::put([
+            'server' => collect($server->makeVisible('daemonSecret'))->only(['uuid', 'uuidShort', 'daemonSecret', 'username']),
+            'node' => collect($node)->only('fqdn', 'scheme', 'daemonListen'),
+        ]);
+
+        return view('server.settings.databases', [
+            'server' => $server,
+            'node' => $node,
+            'databases' => Models\Database::select('databases.*', 'database_servers.host as a_host', 'database_servers.port as a_port')
+                ->where('server_id', $server->id)
+                ->join('database_servers', 'database_servers.id', '=', 'databases.db_server')
+                ->get(),
+        ]);
+    }
+
+    public function getSFTP(Request $request, $uuid)
+    {
+        $server = Models\Server::getByUUID($uuid);
+        $this->authorize('view-sftp', $server);
+        $node = Models\Node::find($server->node);
+
+        Javascript::put([
+            'server' => collect($server->makeVisible('daemonSecret'))->only(['uuid', 'daemonSecret', 'username']),
+            'node' => collect($node)->only('fqdn', 'scheme', 'daemonListen'),
+        ]);
+
+        return view('server.settings.sftp', [
+            'server' => $server,
+            'node' => $node,
+        ]);
+    }
+
     public function postSettingsSFTP(Request $request, $uuid)
     {
         $server = Models\Server::getByUUID($uuid);
@@ -254,15 +322,15 @@ public function postSettingsSFTP(Request $request, $uuid)
             $repo->updateSFTPPassword($server->id, $request->input('sftp_pass'));
             Alert::success('Successfully updated this servers SFTP password.')->flash();
         } catch (DisplayValidationException $ex) {
-            return redirect()->route('server.settings', $uuid)->withErrors(json_decode($ex->getMessage()));
+            return redirect()->route('server.settings.sftp', $uuid)->withErrors(json_decode($ex->getMessage()));
         } catch (DisplayException $ex) {
             Alert::danger($ex->getMessage())->flash();
         } catch (\Exception $ex) {
             Log::error($ex);
             Alert::danger('An unknown error occured while attempting to update this server\'s SFTP settings.')->flash();
         }
 
-        return redirect()->route('server.settings', $uuid);
+        return redirect()->route('server.settings.sftp', $uuid);
     }
 
     public function postSettingsStartup(Request $request, $uuid)

app/Http/Controllers/Server/SubuserController.php

@@ -28,6 +28,7 @@
 use Log;
 use Auth;
 use Alert;
+use Javascript;
 use Pterodactyl\Models;
 use Illuminate\Http\Request;
 use Pterodactyl\Exceptions\DisplayException;
@@ -51,11 +52,17 @@ public function getIndex(Request $request, $uuid)
     {
         $server = Models\Server::getByUUID($uuid);
         $this->authorize('list-subusers', $server);
+        $node = Models\Node::find($server->node);
+
+        Javascript::put([
+            'server' => collect($server->makeVisible('daemonSecret'))->only(['uuid', 'uuidShort', 'daemonSecret', 'username']),
+            'node' => collect($node)->only('fqdn', 'scheme', 'daemonListen'),
+        ]);
 
         return view('server.users.index', [
             'server' => $server,
-            'node' => Models\Node::find($server->node),
-            'subusers' => Models\Subuser::select('subusers.*', 'users.email as a_userEmail')
+            'node' => $node,
+            'subusers' => Models\Subuser::select('subusers.*', 'users.email', 'users.username')
                 ->join('users', 'users.id', '=', 'subusers.user_id')
                 ->where('server_id', $server->id)
                 ->get(),
@@ -66,6 +73,12 @@ public function getView(Request $request, $uuid, $id)
     {
         $server = Models\Server::getByUUID($uuid);
         $this->authorize('view-subuser', $server);
+        $node = Models\Node::find($server->node);
+
+        Javascript::put([
+            'server' => collect($server->makeVisible('daemonSecret'))->only(['uuid', 'uuidShort', 'daemonSecret', 'username']),
+            'node' => collect($node)->only('fqdn', 'scheme', 'daemonListen'),
+        ]);
 
         $subuser = Models\Subuser::select('subusers.*', 'users.email as a_userEmail')
             ->join('users', 'users.id', '=', 'subusers.user_id')
@@ -87,7 +100,7 @@ public function getView(Request $request, $uuid, $id)
 
         return view('server.users.view', [
             'server' => $server,
-            'node' => Models\Node::find($server->node),
+            'node' => $node,
             'subuser' => $subuser,
             'permissions' => $permissions,
         ]);
@@ -137,10 +150,16 @@ public function getNew(Request $request, $uuid)
     {
         $server = Models\Server::getByUUID($uuid);
         $this->authorize('create-subuser', $server);
+        $node = Models\Node::find($server->node);
+
+        Javascript::put([
+            'server' => collect($server->makeVisible('daemonSecret'))->only(['uuid', 'uuidShort', 'daemonSecret', 'username']),
+            'node' => collect($node)->only('fqdn', 'scheme', 'daemonListen'),
+        ]);
 
         return view('server.users.new', [
             'server' => $server,
-            'node' => Models\Node::find($server->node),
+            'node' => $node,
         ]);
     }