Merge branch 'develop' into fix/trusted-proxies

sorry

config/app.php

@@ -4,7 +4,7 @@ return [
 
     'env' => env('APP_ENV', 'production'),
 
-    'version' => env('APP_VERSION', 'v0.5.0'),
+    'version' => env('APP_VERSION', 'canary'),
 
     /*
     |--------------------------------------------------------------------------
@@ -159,6 +159,8 @@ return [
         Prologue\Alerts\AlertsServiceProvider::class,
         Krucas\Settings\Providers\SettingsServiceProvider::class,
         Fideloper\Proxy\TrustedProxyServiceProvider::class,
+        Laracasts\Utilities\JavaScript\JavaScriptServiceProvider::class,
+        Lord\Laroute\LarouteServiceProvider::class,
 
     ],
 
@@ -199,6 +201,7 @@ return [
         'Hash'      => Illuminate\Support\Facades\Hash::class,
         'Input'     => Illuminate\Support\Facades\Input::class,
         'Inspiring' => Illuminate\Foundation\Inspiring::class,
+        'Javascript' => Laracasts\Utilities\JavaScript\JavaScriptFacade::class,
         'Lang'      => Illuminate\Support\Facades\Lang::class,
         'Log'       => Illuminate\Support\Facades\Log::class,
         'Mail'      => Illuminate\Support\Facades\Mail::class,
@@ -218,6 +221,7 @@ return [
         'URL'       => Illuminate\Support\Facades\URL::class,
         'Uuid'      => Webpatser\Uuid\Uuid::class,
         'Validator' => Illuminate\Support\Facades\Validator::class,
+        'Version'   => Pterodactyl\Facades\Version::class,
         'View'      => Illuminate\Support\Facades\View::class,
 
     ],

config/debugbar.php

@@ -1,6 +1,6 @@
 <?php
 
-return array(
+return [
 
     /*
      |--------------------------------------------------------------------------
@@ -26,12 +26,12 @@ return array(
      | can also be used. For PDO, run the package migrations first.
      |
      */
-    'storage' => array(
+    'storage' => [
         'enabled' => true,
         'driver' => 'file', // redis, file, pdo
         'path' => storage_path() . '/debugbar', // For file driver
         'connection' => null,   // Leave null for default connection (Redis/PDO)
-    ),
+    ],
 
     /*
      |--------------------------------------------------------------------------
@@ -81,7 +81,7 @@ return array(
      |
      */
 
-    'collectors' => array(
+    'collectors' => [
         'phpinfo'         => true,  // Php version
         'messages'        => true,  // Messages
         'time'            => true,  // Time Datalogger
@@ -102,7 +102,7 @@ return array(
         'auth'            => false, // Display Laravel authentication status
         'gate'            => false, // Display Laravel Gate checks
         'session'         => true,  // Display session data
-    ),
+    ],
 
     /*
      |--------------------------------------------------------------------------
@@ -113,33 +113,33 @@ return array(
      |
      */
 
-    'options' => array(
-        'auth' => array(
+    'options' => [
+        'auth' => [
             'show_name' => false,   // Also show the users name/email in the debugbar
-        ),
-        'db' => array(
+        ],
+        'db' => [
             'with_params'       => true,   // Render SQL with the parameters substituted
             'timeline'          => false,  // Add the queries to the timeline
             'backtrace'         => false,  // EXPERIMENTAL: Use a backtrace to find the origin of the query in your files.
-            'explain' => array(            // EXPERIMENTAL: Show EXPLAIN output on queries
+            'explain' => [            // EXPERIMENTAL: Show EXPLAIN output on queries
                 'enabled' => false,
-                'types' => array('SELECT'), // array('SELECT', 'INSERT', 'UPDATE', 'DELETE'); for MySQL 5.6.3+
-            ),
+                'types' => ['SELECT'], // array('SELECT', 'INSERT', 'UPDATE', 'DELETE'); for MySQL 5.6.3+
+            ],
             'hints'             => true,    // Show hints for common mistakes
-        ),
-        'mail' => array(
-            'full_log' => false
-        ),
-        'views' => array(
+        ],
+        'mail' => [
+            'full_log' => false,
+        ],
+        'views' => [
             'data' => false,    //Note: Can slow down the application, because the data can be quite large..
-        ),
-        'route' => array(
-            'label' => true  // show complete route on bar
-        ),
-        'logs' => array(
-            'file' => null
-        ),
-    ),
+        ],
+        'route' => [
+            'label' => true,  // show complete route on bar
+        ],
+        'logs' => [
+            'file' => null,
+        ],
+    ],
 
     /*
      |--------------------------------------------------------------------------
@@ -166,4 +166,4 @@ return array(
      */
     'route_prefix' => '_debugbar',
 
-);
+];

config/javascript.php

@@ -0,0 +1,32 @@
+<?php
+
+return [
+
+    /*
+    |--------------------------------------------------------------------------
+    | View to Bind JavaScript Vars To
+    |--------------------------------------------------------------------------
+    |
+    | Set this value to the name of the view (or partial) that
+    | you want to prepend all JavaScript variables to.
+    | This can be a single view, or an array of views.
+    | Example: 'footer' or ['footer', 'bottom']
+    |
+    */
+    'bind_js_vars_to_this_view' => [
+        'layouts.master',
+    ],
+
+    /*
+    |--------------------------------------------------------------------------
+    | JavaScript Namespace
+    |--------------------------------------------------------------------------
+    |
+    | By default, we'll add variables to the global window object. However,
+    | it's recommended that you change this to some namespace - anything.
+    | That way, you can access vars, like "SomeNamespace.someVariable."
+    |
+    */
+    'js_namespace' => 'Pterodactyl',
+
+];

config/laroute.php

@@ -0,0 +1,58 @@
+<?php
+
+return [
+
+    /*
+     * The destination path for the javascript file.
+     */
+    'path' => 'public/js',
+
+    /*
+     * The destination filename for the javascript file.
+     */
+    'filename' => 'laroute',
+
+    /*
+     * The namespace for the helper functions. By default this will bind them to
+     * `window.laroute`.
+     */
+    'namespace' => 'Router',
+
+    /*
+     * Generate absolute URLs
+     *
+     * Set the Application URL in config/app.php
+     */
+    'absolute' => false,
+
+    /*
+     * The Filter Method
+     *
+     * 'all' => All routes except "'laroute' => false"
+     * 'only' => Only "'laroute' => true" routes
+     * 'force' => All routes, ignored "laroute" route parameter
+     */
+    'filter' => 'all',
+
+    /*
+     * Controller Namespace
+     *
+     * Set here your controller namespace (see RouteServiceProvider -> $namespace) for cleaner action calls
+     * e.g. 'App\Http\Controllers'
+     */
+    'action_namespace' => '',
+
+    /*
+     * The path to the template `laroute.js` file. This is the file that contains
+     * the ported helper Laravel url/route functions and the route data to go
+     * with them.
+     */
+    'template' => 'vendor/lord/laroute/src/templates/laroute.js',
+
+    /*
+     * Appends a prefix to URLs. By default the prefix is an empty string.
+    *
+    */
+    'prefix' => '',
+
+];

config/themes.php

@@ -12,5 +12,10 @@ return [
             'views-path'    => 'default',
             'asset-path'    => 'themes/default',
         ],
+        'pterodactyl' => [
+            'extends'       => null,
+            'views-path'    => 'pterodactyl',
+            'asset-path'    => 'themes/pterodactyl',
+        ],
     ],
 ];